Changeset 9460 in orxonox.OLD for branches

Timestamp:

Jul 25, 2006, 5:14:53 PM (18 years ago)

Author:

patrick

Message:

working on proxy server connection acception

Location:

branches/proxy/src/lib/network

Files:

• tcp_server_socket.cc (modified) (1 diff)
• tcp_server_socket.h (modified) (1 diff)
• udp_server_socket.cc (modified) (5 diffs)
• udp_server_socket.h (modified) (1 diff)

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

@@ -126 +126 @@
 }
 
+
+NetworkSocket* TcpServerSocket::getNewProxySocket( )
+{
+    return NULL;
+}
+
+
 void TcpServerSocket::close( )
 {

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

@@ -26 +26 @@
     virtual bool listen( unsigned int port );
     virtual NetworkSocket* getNewClientSocket( void );
+    virtual NetworkSocket* getNewProxySocket( void );
     virtual void close();
     virtual void update() {};

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

@@ -77 +77 @@
 
 /**
- * get newly connected socket. note
+ * get newly connected client socket. note
  * @return new socket or NULL if no new socket exists
+ *
+ *  only clients connect to this socket
  */
 NetworkSocket * UdpServerSocket::getNewClientSocket( void )
@@ -93 +95 @@
   return result;
 }
+
+
+/**
+ * get newly connected proxy socket. note
+ * @return new socket or NULL if no new socket exists
+ *
+ * only proxy servers connect to this socket
+ */
+NetworkSocket * UdpServerSocket::getNewProxySocket( void )
+{
+  NetworkSocket * result = NULL;
+
+  if ( newSocketList.size() > 0 )
+  {
+    result = newSocketList.front();
+
+    newSocketList.pop_front();
+  }
+
+  return result;
+}
+
+
 
 /**
@@ -220 +245 @@
   if ( !socket )
     return false;
-  
+
   assert( networkPacket.length <= UDP_PACKET_SIZE );
 
@@ -232 +257 @@
     return false;
   }
-  
+
   return true;
 }
@@ -250 +275 @@
 
     if ( packet->len <= 0 )
-      continue; 
-        
+      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 ) )

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

@@ -52 +52 @@
 
     virtual NetworkSocket* getNewClientSocket( void );
+    virtual NetworkSocket* getNewProxySocket( void );
 
     virtual void close();