Changeset 9625 in orxonox.OLD for branches/proxy/src/lib/network/network_stream.cc

Timestamp:

Jul 30, 2006, 11:19:24 PM (18 years ago)

Author:

patrick

Message:

yet another weekend commit, quite much work done:

• introduced a new PERMISSION layer: PERMISSION_SERVER: the nearest server hast authority
• tightening up permissions: brand new implementation to prevent sending unused variables in the network (less smog in the net:D_
• removed some compiler warnings from some central modules
• networkmonitor interface changed to work with networknodes mainly
• better debug output for the network monitor
• networnode inteface standardisation
• force reconnection commands integration

File:

• branches/proxy/src/lib/network/network_stream.cc (modified) (3 diffs)

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

@@ -81 +81 @@
       // init the shared network data
       SharedNetworkData::getInstance()->setHostID(NET_ID_MASTER_SERVER);
+      this->pInfo->userId = NET_ID_MASTER_SERVER;
+      this->pInfo->nodeType = NET_MASTER_SERVER;
+
       break;
     case NET_PROXY_SERVER_ACTIVE:
       // init the shared network data
       SharedNetworkData::getInstance()->setHostID(NET_ID_PROXY_SERVER_01);
+      this->pInfo->nodeType = NET_PROXY_SERVER_ACTIVE;
+
       break;
     case NET_PROXY_SERVER_PASSIVE:
       // init the shared network data
       SharedNetworkData::getInstance()->setHostID(NET_ID_PROXY_SERVER_01);
+      this->pInfo->nodeType = NET_PROXY_SERVER_PASSIVE;
+
       break;
     case NET_CLIENT:
       SharedNetworkData::getInstance()->setHostID(NET_ID_UNASSIGNED);
+      this->pInfo->nodeType = NET_CLIENT;
       break;
   }
@@ -526 +534 @@
     it++;
   }
-
-
 }
 
@@ -685 +691 @@
 //               it->second.ip = it->second.socket->getRemoteAddress();
 
-              // it->second.nodeType = it->second.handshake->getRemoteNodeType();
+              it->second.nodeType = it->second.handshake->getRemoteNodeType();
               // it->second.ip = it->second.socket->getRemoteAddress();
               // add the new server to the nodes list (it can be a NET_MASTER_SERVER or NET_PROXY_SERVER)