Changeset 9582 in orxonox.OLD

Timestamp:

Jul 28, 2006, 9:56:44 PM (18 years ago)

Author:

patrick

Message:

extending networknode interface, removed some compiler warnings and some old network stuff

Location:

branches/proxy/src/lib/network

Files:

• monitor/network_node.cc (modified) (5 diffs)
• monitor/network_node.h (modified) (1 diff)
• network_game_manager.h (modified) (1 diff)
• proxy/proxy_control.cc (modified) (2 diffs)

branches/proxy/src/lib/network/monitor/network_node.cc

@@ -148 +148 @@
 
 
+
+/**
+ *  gets the peer info by user id
+ * @param userId  the user id of the node to look up
+ * @return the peer info of this node NULL if nothing found
+ */
+PeerInfo* NetworkNode::getNodeByUserId( int userId)
+{
+  // look through the master server lists
+  std::list<PeerInfo*>::const_iterator it = this->masterServerList.begin();
+  for( ;it != this->masterServerList.end(); it++)
+  {
+    if( (*it)->userId == userId)
+      return (*it);
+  }
+
+  // look through the active proxy server list
+  it = this->activeProxyServerList.begin();
+  for( ; it != this->activeProxyServerList.end(); it++)
+  {
+    if( (*it)->userId == userId)
+      return (*it);
+  }
+
+  // look through the passive server list
+  it = this->passiveProxyServerList.begin();
+  for( ; it != this->passiveProxyServerList.end(); it++)
+  {
+    if( (*it)->userId == userId)
+      return (*it);
+  }
+
+  // look through the client list
+  it = this->clientList.begin();
+  for( ; it != this->clientList.end(); it++)
+  {
+    if( (*it)->userId == userId)
+      return (*it);
+  }
+
+  return NULL;
+}
+
+
 /**
  * @param index index to the client
@@ -154 +198 @@
 PeerInfo* NetworkNode::getClient(int index) const
 {
-  if( this->clientList.size() < index)
+  if( (int)this->clientList.size() < index)
     return NULL;
 
@@ -174 +218 @@
 PeerInfo* NetworkNode::getActiveProxyServer(int index) const
 {
-  if( this->activeProxyServerList.size() < index)
+  if( (int)this->activeProxyServerList.size() < index)
     return NULL;
 
@@ -194 +238 @@
 PeerInfo* NetworkNode::getPassiveProxyServer(int index) const
 {
-  if( this->passiveProxyServerList.size() < index)
+  if( (int)this->passiveProxyServerList.size() < index)
     return NULL;
 
@@ -214 +258 @@
 PeerInfo* NetworkNode::getMasterServer(int index) const
 {
-  if( this->masterServerList.size() < index)
+  if( (int)this->masterServerList.size() < index)
     return NULL;
 

branches/proxy/src/lib/network/monitor/network_node.h

@@ -46 +46 @@
     inline std::list<PeerInfo*> getClient() const { return this->clientList; }
 
+    PeerInfo* getNodeByUserId( int userId);
 
     /** @returns the number of players */

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

@@ -19 +19 @@
 class PNode;
 
-typedef enum NetworkGameManagerProtocol {
-  NET_CREATE_ENTITY = 0,
-  NET_REMOVE_ENTITY,
-  NET_CREATE_ENTITY_LIST,
-  NET_REMOVE_ENTITY_LIST,
-  NET_REQUEST_CREATE,
-  NET_REQUEST_REMOVE,
-  NET_YOU_ARE_ENTITY,
-  NET_REQUEST_ENTITY_LIST,
 
-  NET_NUMBER
-};
 
 struct clientBuffer

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

@@ -29 +29 @@
 #include "debug.h"
 
-
+#include "monitor/network_monitor.h"
 
 
@@ -85 +85 @@
   assert(SharedNetworkData::getInstance()->isProxyServerActive());
 
-  byte data[INTSIZE];
+  byte data[2 * INTSIZE];
+  // write the userId in the message
+  assert( Converter::intToByteArray( userId, data, INTSIZE ) == INTSIZE );
+  // and the ip as an int
 
   assert( Converter::intToByteArray( userId, data, INTSIZE ) == INTSIZE );