Changeset 7565 in orxonox.OLD for branches/network/src/lib/network/udp_server_socket.cc

Timestamp:

May 10, 2006, 1:13:49 PM (18 years ago)

Author:

rennerc

Message:

reimplemented NetworkStream

File:

• branches/network/src/lib/network/udp_server_socket.cc (modified) (5 diffs)

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

@@ -72 +72 @@
 
 /**
- * get newly connected socket. note: this function will also recieve
- * packets and create new sockets
+ * get newly connected socket. note
  * @return new socket or NULL if no new socket exists
  */
 NetworkSocket * UdpServerSocket::getNewSocket( void )
+{
+  NetworkSocket * result = NULL;
+  
+  if ( newSocketList.size() > 0 )
+  {
+    result = newSocketList.front();
+  
+    newSocketList.pop_front();
+  }
+  
+  return result;
+}
+
+/**
+ * stop listening on server
+ */
+void UdpServerSocket::close( )
+{
+  
+  for ( int i = 0; i < packetBuffer.size(); i++ )
+    removeUserPackets( i );
+  
+  packetBuffer.clear();
+  userList.clear();
+  
+  SDLNet_UDP_Close( socket );
+  socket = NULL;
+}
+
+/**
+ * clean up users buffer
+ * @param userId users userid
+ */
+void UdpServerSocket::removeUserPackets( int userId )
+{
+  if ( userId >= packetBuffer.size() )
+    return;
+  
+  for ( NetworkPacketList::iterator it = packetBuffer[userId].begin(); it!=packetBuffer[userId].end(); it++ )
+  {
+    if ( it->data )
+    {
+      free( it->data );
+      it->data = NULL;
+    }
+  }
+  
+  packetBuffer[userId].clear();
+}
+
+/**
+ * get next packet for user
+ * @param userId user id
+ * @return recieved packet or packet with length 0 if no packet available
+ */
+NetworkPacket UdpServerSocket::getPacket( int userId )
+{
+  NetworkPacket res;
+  res.data = NULL;
+  res.length = 0;
+  
+  if ( packetBuffer.size() > userId && packetBuffer[userId].size() > 0 )
+  {
+    res.data = packetBuffer[userId].front().data;
+    res.length = packetBuffer[userId].front().length;
+    packetBuffer[userId].pop_front();
+  }
+  
+  return res;
+}
+
+/**
+ * get number of packets recieved for user
+ * @param userId user id
+ * @return number of packets in buffer
+ */
+int UdpServerSocket::getPacketCount( int userId )
+{
+  if ( userId >= packetBuffer.size() )
+    return -1;
+  
+  return packetBuffer[userId].size();
+}
+
+/**
+ * will set user state 
+ * @param userId users id
+ * @param ip users host / port
+ */
+void UdpServerSocket::initUser( int userId, IPaddress ip )
+{
+  int channel = SDLNet_UDP_Bind( socket, userId, &ip );
+  if( channel != userId ) 
+  {
+    PRINTF(1)("SDLNet_UDP_Bind: %s\n", SDLNet_GetError());
+    assert(false);
+    return;
+  }
+  
+  if ( userId < packetBuffer.size() )
+    removeUserPackets( userId );
+  
+  if ( packetBuffer.size() <= userId )
+    packetBuffer.resize( userId + 1 );
+  
+  if ( userList.size() <= userId )
+    userList.resize( userId + 1 );
+  
+  userList[ userId ] = ip;
+}
+
+/**
+ * remove user from list
+ * @param userId user id
+ */
+void UdpServerSocket::removeUser( int userId )
+{
+  removeUserPackets( userId );
+  
+  if ( userId >= userList.size() )
+    return;
+  
+  userList[userId].host = 0;
+  userList[userId].port = 0;
+  
+  SDLNet_UDP_Unbind( socket, userId );
+}
+
+/**
+ * send one packet to client associated to userId
+ * @param networkPacket packet to send
+ * @param userId users id
+ * @return true on success
+ */
+bool UdpServerSocket::sendPacket( NetworkPacket networkPacket , int userId )
+{
+  assert( networkPacket.length <= UDP_PACKET_SIZE );
+  
+  memcpy( packet->data, networkPacket.data, networkPacket.length );
+  packet->len = networkPacket.length;
+  packet->channel = -1;
+  
+  if ( SDLNet_UDP_Send( socket, userId, packet ) == 0 )
+  {
+    PRINTF(1)("SDLNet_UDP_Send: %s\n", SDLNet_GetError());
+    return false;
+  }
+  
+  return true;
+}
+
+/**
+ * do periodically things
+ */
+void UdpServerSocket::update( )
 {
   int res;
@@ -84 +238 @@
   {
     int userId;
+    bool isNewConnection = false;
     
     for ( userId =0; userId < userList.size(); userId++ )
@@ -92 +247 @@
     {
       newConn++;
+      isNewConnection = true;
       
       if ( newConn > MAX_NEW_CONNECTIONS )
@@ -118 +274 @@
     }
     else
+    {
+      if ( isNewConnection )
+        continue;
+      
       networkPacket.data = NULL;
+    }
     memcpy( networkPacket.data, packet->data, packet->len );
     packetBuffer[userId].push_back( networkPacket );
@@ -124 +285 @@
   
   assert( res == 0 );
-  
-  NetworkSocket * result = NULL;
-  
-  if ( newSocketList.size() > 0 )
-  {
-    result = newSocketList.front();
-  
-    newSocketList.pop_front();
-  }
-  
-  return result;
-}
-
-/**
- * stop listening on server
- */
-void UdpServerSocket::close( )
-{
-  
-  for ( int i = 0; i < packetBuffer.size(); i++ )
-    removeUserPackets( i );
-  
-  packetBuffer.clear();
-  userList.clear();
-  
-  SDLNet_UDP_Close( socket );
-  socket = NULL;
-}
-
-/**
- * clean up users buffer
- * @param userId users userid
- */
-void UdpServerSocket::removeUserPackets( int userId )
-{
-  if ( userId >= packetBuffer.size() )
-    return;
-  
-  for ( NetworkPacketList::iterator it = packetBuffer[userId].begin(); it!=packetBuffer[userId].end(); it++ )
-  {
-    if ( it->data )
-    {
-      free( it->data );
-      it->data = NULL;
-    }
-  }
-  
-  packetBuffer[userId].clear();
-}
-
-/**
- * get next packet for user
- * @param userId user id
- * @return recieved packet or packet with length 0 if no packet available
- */
-NetworkPacket UdpServerSocket::getPacket( int userId )
-{
-  NetworkPacket res;
-  res.data = NULL;
-  res.length = 0;
-  
-  if ( packetBuffer.size() > userId && packetBuffer[userId].size() > 0 )
-  {
-    res.data = packetBuffer[userId].front().data;
-    res.length = packetBuffer[userId].front().length;
-    packetBuffer[userId].pop_front();
-  }
-  
-  return res;
-}
-
-/**
- * get number of packets recieved for user
- * @param userId user id
- * @return number of packets in buffer
- */
-int UdpServerSocket::getPacketCount( int userId )
-{
-  if ( userId >= packetBuffer.size() )
-    return -1;
-  
-  return packetBuffer[userId].size();
-}
-
-/**
- * will set user state 
- * @param userId users id
- * @param ip users host / port
- */
-void UdpServerSocket::initUser( int userId, IPaddress ip )
-{
-  int channel = SDLNet_UDP_Bind( socket, userId, &ip );
-  if( channel != userId ) 
-  {
-    PRINTF(1)("SDLNet_UDP_Bind: %s\n", SDLNet_GetError());
-    assert(false);
-    return;
-  }
-  
-  if ( userId < packetBuffer.size() )
-    removeUserPackets( userId );
-  
-  if ( packetBuffer.size() <= userId )
-    packetBuffer.resize( userId + 1 );
-  
-  if ( userList.size() <= userId )
-    userList.resize( userId + 1 );
-  
-  userList[ userId ] = ip;
-}
-
-/**
- * remove user from list
- * @param userId user id
- */
-void UdpServerSocket::removeUser( int userId )
-{
-  removeUserPackets( userId );
-  
-  if ( userId >= userList.size() )
-    return;
-  
-  userList[userId].host = 0;
-  userList[userId].port = 0;
-  
-  SDLNet_UDP_Unbind( socket, userId );
-}
-
-/**
- * send one packet to client associated to userId
- * @param networkPacket packet to send
- * @param userId users id
- * @return true on success
- */
-bool UdpServerSocket::sendPacket( NetworkPacket networkPacket , int userId )
-{
-  assert( networkPacket.length <= UDP_PACKET_SIZE );
-  
-  memcpy( packet->data, networkPacket.data, networkPacket.length );
-  packet->len = networkPacket.length;
-  packet->channel = -1;
-  
-  if ( SDLNet_UDP_Send( socket, userId, packet ) == 0 )
-  {
-    PRINTF(1)("SDLNet_UDP_Send: %s\n", SDLNet_GetError());
-    return false;
-  }
-  
-  return true;
-}
+}