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

Timestamp:

Jul 23, 2006, 10:07:23 PM (19 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_stream.h (modified) (2 diffs)

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

@@ -36 +36 @@
   public:
     NetworkStream();
-    NetworkStream( std::string host, int port);
-    NetworkStream( int port );
+    NetworkStream(int nodeType);
+    virtual ~NetworkStream();
 
-    virtual ~NetworkStream();
     void init();
+
+    void connectToMasterServer(std::string host, int port);
+    void connectToProxyServer(std::string host, int port);
+    void createServer(int port);
 
     void createNetworkGameManager();
@@ -49 +52 @@
     void disconnectSynchronizeable(Synchronizeable& sync);
 
-    /* functions for the localhost settings */
-    inline bool isMasterServer() const { return (this->pInfo->nodeType == NET_MASTER_SERVER)? true:false; }
-    inline bool isProxyServer() const { return (this->pInfo->nodeType == NET_PROXY_SERVER_ACTIVE)? true:false; }
-    inline bool isClient() const { return (this->pInfo->nodeType == NET_CLIENT)? true:false; }
-//     inline bool isActive() const { return this->bActive; }
     inline int getMaxConnections(){ return SharedNetworkData::getInstance()->getMaxPlayer(); }