Changeset 8184 in orxonox.OLD for branches/network/src/lib/network/udp_server_socket.cc
- Timestamp:
- Jun 7, 2006, 1:16:12 PM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/network/src/lib/network/udp_server_socket.cc
r7954 r8184 44 44 UdpServerSocket::~UdpServerSocket( ) 45 45 { 46 for ( int i = 0; i < packetBuffer.size(); i++ )46 for ( int i = 0; i < (int)packetBuffer.size(); i++ ) 47 47 removeUserPackets( i ); 48 48 … … 99 99 { 100 100 101 for ( int i = 0; i < packetBuffer.size(); i++ )101 for ( int i = 0; i < (int)packetBuffer.size(); i++ ) 102 102 removeUserPackets( i ); 103 103 … … 115 115 void UdpServerSocket::removeUserPackets( int userId ) 116 116 { 117 if ( userId >= packetBuffer.size() )117 if ( userId >= (int)packetBuffer.size() ) 118 118 return; 119 119 … … 141 141 res.length = 0; 142 142 143 if ( packetBuffer.size() > userId &&packetBuffer[userId].size() > 0 )143 if ( (int)packetBuffer.size() > userId && (int)packetBuffer[userId].size() > 0 ) 144 144 { 145 145 res.data = packetBuffer[userId].front().data; 146 146 res.length = packetBuffer[userId].front().length; 147 147 packetBuffer[userId].pop_front(); 148 149 if ( res.length == 0 ) 150 res.length = -1; 148 151 } 149 152 … … 158 161 int UdpServerSocket::getPacketCount( int userId ) 159 162 { 160 if ( userId >= packetBuffer.size() )163 if ( userId >= (int)packetBuffer.size() ) 161 164 return -1; 162 165 … … 179 182 } 180 183 181 if ( userId < packetBuffer.size() )184 if ( userId < (int)packetBuffer.size() ) 182 185 removeUserPackets( userId ); 183 186 184 if ( packetBuffer.size() <= userId )187 if ( (int)packetBuffer.size() <= userId ) 185 188 packetBuffer.resize( userId + 1 ); 186 189 187 if ( userList.size() <= userId )190 if ( (int)userList.size() <= userId ) 188 191 userList.resize( userId + 1 ); 189 192 … … 199 202 removeUserPackets( userId ); 200 203 201 if ( userId >= userList.size() )204 if ( userId >= (int)userList.size() ) 202 205 return; 203 206 … … 244 247 bool isNewConnection = false; 245 248 246 for ( userId =0; userId < userList.size(); userId++ )249 for ( userId =0; userId < (int)userList.size(); userId++ ) 247 250 if ( userList[userId].host == packet->address.host && userList[userId].port == packet->address.port ) 248 251 break; 249 252 250 if ( userId >= userList.size() )253 if ( userId >= (int)userList.size() ) 251 254 { 252 255 … … 260 263 } 261 264 262 for ( userId =0; userId < userList.size(); userId++ )265 for ( userId =0; userId < (int)userList.size(); userId++ ) 263 266 if ( userList[userId].host == 0 && userList[userId].port == 0 ) 264 267 break; … … 281 284 else 282 285 { 283 if ( isNewConnection )284 continue;285 286 286 networkPacket.data = NULL; 287 287 }
Note: See TracChangeset
for help on using the changeset viewer.