Changeset 9584 in orxonox.OLD for branches/proxy/src/lib/network/proxy

Timestamp:

Jul 28, 2006, 10:22:09 PM (18 years ago)

Author:

patrick

Message:

proxy control center now registers joining clients to the network monitor

File:

• branches/proxy/src/lib/network/proxy/proxy_control.cc (modified) (4 diffs)

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

@@ -18 +18 @@
 
 
-#include "player.h"
 #include "state.h"
 #include "shared_network_data.h"
 #include "network_game_manager.h"
+#include "ip.h"
+#include "peer_info.h"
 
 #include "converter.h"
@@ -77 +78 @@
 /**
  *  signals new client connected to this local proxy
+ *
+ *  byte 0 - 3     :      userId
+ *  byte 4 - 7     :      ip address (IPaddress.host)
+ *
  * @param userId userId of the new client
  */
@@ -90 +95 @@
   // and the ip as an int
   PeerInfo* pInfo = SharedNetworkData::getInstance()->getNetworkMonitor()->getPeerByUserId(userId);
-  assert( Converter::intToByteArray( userId, data, INTSIZE ) == INTSIZE );
-
-  MessageManager::getInstance()->sendMessage( MSGID_PROXY_NEWCLIENT, data, INTSIZE, RT_SERVER, NET_UNASSIGNED, MP_HIGHBANDWIDTH );
+  assert(pInfo != NULL);
+  assert( Converter::intToByteArray( pInfo->ip.host(), data + INTSIZE, INTSIZE ) == INTSIZE );
+
+  MessageManager::getInstance()->sendMessage( MSGID_PROXY_NEWCLIENT, data, 2*INTSIZE, RT_SERVER, NET_UNASSIGNED, MP_HIGHBANDWIDTH );
 }
 
@@ -118 +124 @@
   int newClientId = 0;
   assert( Converter::byteArrayToInt( data, &newClientId) == INTSIZE );
+  // now read the ip address
+  int ipHost = 0;
+  assert( Converter::byteArrayToInt( data + INTSIZE, &ipHost) == INTSIZE );
+
+  // register the new node at the network monitor
+  NetworkMonitor* netMon = SharedNetworkData::getInstance()->getNetworkMonitor();
+  PeerInfo* pInfo = new PeerInfo();
+  pInfo->bLocal = false;
+  pInfo->ip = IP(ipHost, 0);
+  pInfo->nodeType = NET_CLIENT;
+  netMon->addNode(pInfo);
 
   PRINTF(0)("Got Signal: from %i new player arrived with userId: %i\n", senderId, newClientId);