Changeset 9396 in orxonox.OLD for branches/proxy/src/lib/network/network_manager.h

Timestamp:

Jul 23, 2006, 10:07:23 PM (18 years ago)

Author:

patrick

Message:

committing my weekends work: 2100 lines

• proxy server now accepts and synchronizes clients like a master server
• network manager got different network setup interface
• network stream got different constructure scheme
• permissions checking and algorithm extended and changed
• starting ability to connect to multiple network nodes at the same time
• some very much smaller changes here and there

File:

• branches/proxy/src/lib/network/network_manager.h (modified) (2 diffs)

branches/proxy/src/lib/network/network_manager.h

@@ -36 +36 @@
     void shutdown();
 
-    int establishConnection( const std::string & name, unsigned int port);
-    int createServer(unsigned int port);
-
-    /** Returns the hostID @return The hostID of the object */
-    inline int getHostID() { return SharedNetworkData::getInstance()->getHostID(); }
-    inline bool isMasterServer() { return SharedNetworkData::getInstance()->isMasterServer(); }
-    inline bool isProxyServer() { return SharedNetworkData::getInstance()->isProxyServer(); }
-    inline bool isClient() { return SharedNetworkData::getInstance()->isClient(); }
-
+    int createClient( const std::string & name, unsigned int port);
+    int createMasterServer( unsigned int port);
+    int createProxyServer( unsigned int port);
 
     void connectSynchronizeable(Synchronizeable& sync);
@@ -58 +52 @@
   private:
     static NetworkManager*           singletonRef;            //!< Pointer to the only instance of this Class
-    NetworkStream*                   networkStream;       //!< pointer to network stream
+    NetworkStream*                   networkStream;           //!< pointer to network stream
 
     float                            elapsedTime;             //!< elapsed time since the last network update