Changeset 8727 in orxonox.OLD

Timestamp:

Jun 22, 2006, 3:17:53 PM (18 years ago)

Author:

rennerc

Message:

server identifies user by his random byte

Location:

branches/network/src/lib/network

Files:

• udp_server_socket.cc (modified) (5 diffs)
• udp_server_socket.h (modified) (2 diffs)

branches/network/src/lib/network/udp_server_socket.cc

@@ -170 +170 @@
  * @param ip users host / port
  */
-void UdpServerSocket::initUser( int userId, IPaddress ip )
+void UdpServerSocket::initUser( int userId, IPaddress ip, byte randomByte )
 {
   int channel = SDLNet_UDP_Bind( socket, userId, &ip );
@@ -189 +189 @@
     userList.resize( userId + 1 );
 
-  userList[ userId ] = ip;
+  userList[ userId ].addr = ip;
+  userList[ userId ].randomByte = randomByte;
 }
 
@@ -203 +204 @@
     return;
 
-  userList[userId].host = 0;
-  userList[userId].port = 0;
+  userList[userId].addr.host = 0;
+  userList[userId].addr.port = 0;
 
   SDLNet_UDP_Unbind( socket, userId );
@@ -248 +249 @@
     bool isNewConnection = false;
 
+    if ( packet->len <= 0 )
+      continue; 
+        
     for ( userId =0; userId < (int)userList.size(); userId++ )
-      if ( userList[userId].host == packet->address.host && userList[userId].port == packet->address.port )
+      if ( userList[userId].addr.host == packet->address.host && userList[userId].addr.port == packet->address.port && userList[userId].randomByte == ( packet->data[0] & 0xFC ) )
         break;
 
     if ( userId >= (int)userList.size() )
     {
-      if ( packet->len <= 0 )
-        continue; 
-        
       newConn++;
       isNewConnection = true;
@@ -267 +268 @@
 
       for ( userId =0; userId < (int)userList.size(); userId++ )
-        if ( userList[userId].host == 0 && userList[userId].port == 0 )
+        if ( userList[userId].addr.host == 0 && userList[userId].addr.port == 0 )
           break;
 
-      initUser( userId, packet->address );
+      initUser( userId, packet->address, packet->data[0] & 0xFC );
       UdpSocket * sock = new UdpSocket( this, packet->address, userId, packet->data[0] & 0xFC );
       newSocketList.push_back( sock );

branches/network/src/lib/network/udp_server_socket.h

@@ -33 +33 @@
 typedef std::vector<NetworkPacketList> PacketBuffer;
 
-typedef std::vector<IPaddress> UserList;
+struct UserInfo
+{
+  IPaddress addr;
+  byte randomByte;
+};
+
+typedef std::vector<UserInfo> UserList;
 
 typedef std::list<UdpSocket*> UdpSocketList;
@@ -57 +63 @@
     bool sendPacket( NetworkPacket networkPacket, int userId );
     int getPacketCount( int childId );
-    void initUser( int childId, IPaddress ip );
+    void initUser( int childId, IPaddress ip, byte randomByte );
     
   private: