Changeset 9461 in orxonox.OLD

Timestamp:

Jul 25, 2006, 5:39:49 PM (18 years ago)

Author:

patrick

Message:

working on a dual connection server socket

Location:

branches/proxy/src/lib/network

Files:

• udp_server_socket.cc (modified) (3 diffs)
• udp_server_socket.h (modified) (3 diffs)

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

@@ -269 +269 @@
   int newConn = 0;
 
+  // iterate through all newly received packets and assign them to the users packet buffer
   for ( res = SDLNet_UDP_Recv( socket, packet ); res == 1; res = SDLNet_UDP_Recv( socket, packet ) )
   {
@@ -277 +278 @@
       continue;
 
-    for ( userId =0; userId < (int)userList.size(); userId++ )
-      if ( userList[userId].addr.host == packet->address.host && userList[userId].addr.port == packet->address.port && userList[userId].randomByte == ( packet->data[0] & 0xFC ) )
+    // search the user id this backet belongs to
+    for ( userId = 0; userId < (int)userList.size(); userId++ )
+    {
+      if ( userList[userId].addr.host == packet->address.host &&
+           userList[userId].addr.port == packet->address.port &&
+           userList[userId].randomByte == ( packet->data[0] & 0xFC ) )
         break;
-
+    }
+
+    // is it a new packet initializing a new connecion?
     if ( userId >= (int)userList.size() )
     {
@@ -302 +309 @@
     }
 
-    //add new packet to packetbuffer
-
+
+    // add new packet to packetbuffer
     NetworkPacket networkPacket;
     networkPacket.length = packet->len;

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

@@ -33 +33 @@
 typedef std::vector<NetworkPacketList> PacketBuffer;
 
+
+//!< informations struct for each user
 struct UserInfo
 {
-  IPaddress addr;
-  byte randomByte;
+  IPaddress     addr;            //!< ip address of this user
+  byte          randomByte;      //!< random byte of this user
 };
+
 
 typedef std::vector<UserInfo> UserList;
@@ -43 +46 @@
 typedef std::list<UdpSocket*> UdpSocketList;
 
+
+//!< the upd server socket listening for incoming connections
 class UdpServerSocket : public ServerSocket
 {
@@ -49 +54 @@
     virtual ~UdpServerSocket();
 
+    /* server socket manipulations */
     virtual bool listen( unsigned int port );
-
     virtual NetworkSocket* getNewClientSocket( void );
     virtual NetworkSocket* getNewProxySocket( void );
+    virtual void close();
 
-    virtual void close();
 
     virtual void update();
 
+    /* network traffic interface */
+    NetworkPacket getPacket( int userId );
+    void removeUser( int userId );
+    bool sendPacket( NetworkPacket networkPacket, int userId );
+
+
+  private:
     void removeUserPackets( int userId );
-    void removeUser( int userId );
-    NetworkPacket getPacket( int userId );
-    bool sendPacket( NetworkPacket networkPacket, int userId );
     int getPacketCount( int childId );
     void initUser( int childId, IPaddress ip, byte randomByte );
 
+
   private:
-    UDPsocket     socket;           //!< will be uses to send/recieve data
-    UDPpacket *   packet;           //!< packet structure to recieve packet
-    PacketBuffer  packetBuffer;     //!< will store recieved packets for UdpSockets
-    UserList      userList;         //!< contains information about clients
-    UdpSocketList newSocketList;    //!< contains new socket
+    UDPsocket          socket;           //!< will be uses to send/recieve data
+    UDPpacket *        packet;           //!< packet structure to recieve packet
+    PacketBuffer       packetBuffer;     //!< will store recieved packets for UdpSockets
+    UserList           userList;         //!< contains information about clients
+    UdpSocketList      newSocketList;    //!< contains new socket
 
 };