Changeset 9396 in orxonox.OLD for branches/proxy/src/lib/network/peer_info.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/peer_info.h (modified) (2 diffs)

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

@@ -24 +24 @@
     inline bool isMasterServer() { return this->nodeType == NET_MASTER_SERVER; }
     inline bool isProxyServer() { return this->nodeType == NET_PROXY_SERVER_ACTIVE; }
+    inline bool isProxyServerPassive() { return this->nodeType == NET_PROXY_SERVER_PASSIVE; }
     inline bool isClient() { return this->nodeType == NET_CLIENT; }
 
@@ -30 +31 @@
 
   public:
-    int                 userId;
-    int                 nodeType;
-    IP                  ip;
+    int                 userId;                  //!< id of this network node
+    int                 nodeType;                //!< type of this network node
+    IP                  ip;                      //!> the ip address of this network node
 
-    NetworkSocket *     socket;
-    Handshake *         handshake;
-    ConnectionMonitor * connectionMonitor;
+    NetworkSocket *     socket;                  //!< socket connecting to this node
+    Handshake *         handshake;               //!< the handshake object, active on connection setup
+    ConnectionMonitor * connectionMonitor;       //!< ConnectionMonitor monitoring the current network traffic
 
-    int                 lastAckedState;
-    int                 lastRecvedState;
+    int                 lastAckedState;          //!< last acked state synchronized state
+    int                 lastRecvedState;         //!< last received state
 };