Changeset 9441 in orxonox.OLD

Timestamp:

Jul 24, 2006, 5:39:17 PM (18 years ago)

Author:

patrick

Message:

reconnection does not segfault anymore now! betta

Location:

branches/proxy/src/lib/network

Files:

• ip.cc (modified) (1 diff)
• network_stream.cc (modified) (3 diffs)

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

@@ -269 +269 @@
                      part1.getString() + "." + part0.getString();
 
-  if (port != -1)
-    addr += ":" + MultiType(port).getString();
+#warning ip and ports are not handled correctly
+//   if (port != -1)
+//     addr += ":" + MultiType(port).getString();
   return addr;
 }

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

@@ -204 +204 @@
   PRINTF(0)("connect to proxy %s, this is node %i\n", host.c_str(), node);
 
-  if( this->peers[node].socket != NULL)
-    delete this->peers[node].socket;
-
   this->peers[node].socket = new UdpSocket( host, port );
   this->peers[node].userId = 0;
@@ -451 +448 @@
       this->handleDisconnect( it->second.userId);
 
-#warning this is some more disconnct handling, consider doing it in the handleDisconnect() funciton
-      // and cleanup the user infos
-//       for ( SynchronizeableList::iterator it2 = synchronizeables.begin(); it2 != synchronizeables.end(); it2++ )
-//       {
-//         (*it2)->cleanUpUser( it->second.userId );
-//       }
-//
-//       NetworkGameManager::getInstance()->signalLeftPlayer(it->second.userId);
-//
-//       freeSocketSlots.push_back( it->second.userId );
-
-//       PeerList::iterator delit = it;
       it++;
-
-//       peers.erase( delit );
-
       continue;
     }
@@ -643 +625 @@
 //   pInfo->socket->reconnectToServer( proxyIP.ipString(), proxyIP.port());
   this->handleDisconnect( userId);
-//   this->connectToProxyServer(proxyIP.ipString(), 9999);
+  this->connectToProxyServer(proxyIP.ipString(), 9999);
 #warning the ports are not yet integrated correctly in the ip class