Changeset 9334 in orxonox.OLD

Timestamp:

Jul 19, 2006, 10:29:14 PM (18 years ago)

Author:

patrick

Message:

work of the day in one commit:D

• switched whole network framework to ip sturcture
• extended ip structrue a little bit
• reimplemented the disconnection/reconnection algorithm
• synchronizeable ip bug discovered and solved

Location:

branches/proxy/src

Files:

• lib/network/handshake.cc (modified) (2 diffs)
• lib/network/handshake.h (modified) (3 diffs)
• lib/network/ip.cc (modified) (3 diffs)
• lib/network/ip.h (modified) (2 diffs)
• lib/network/monitor/network_monitor.cc (modified) (1 diff)
• lib/network/monitor/network_monitor.h (modified) (3 diffs)
• lib/network/monitor/network_node.cc (modified) (4 diffs)
• lib/network/netdefs.h (modified) (1 diff)
• lib/network/network_socket.h (modified) (1 diff)
• lib/network/network_stream.cc (modified) (9 diffs)
• lib/network/network_stream.h (modified) (1 diff)
• lib/network/peer_info.cc (modified) (1 diff)
• lib/network/peer_info.h (modified) (1 diff)
• lib/network/synchronizeable_var/synchronizeable_ip.cc (modified) (6 diffs)
• lib/network/synchronizeable_var/synchronizeable_ip.h (modified) (2 diffs)
• lib/network/tcp_server_socket.cc (modified) (1 diff)
• lib/network/tcp_server_socket.h (modified) (2 diffs)
• lib/network/tcp_socket.h (modified) (2 diffs)
• lib/network/udp_socket.cc (modified) (1 diff)
• lib/network/udp_socket.h (modified) (1 diff)
• subprojects/network/network_unit_test.cc (modified) (2 diffs)

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

@@ -63 +63 @@
   localState.canDel = 0;
   localState.redirectProxy = 0;
-  localState.proxy1.host = 0;
-  localState.proxy1.port = 0;
-  localState.proxy2.host = 0;
-  localState.proxy2.port = 0;
+  localState.proxy1 = IP(0, 0);
+  localState.proxy2 = IP (0, 0);
 
 
@@ -81 +79 @@
   remoteState.canDel = 0;
   remoteState.redirectProxy = 0;
-  remoteState.proxy1.host = 0;
-  remoteState.proxy1.port = 0;
-  remoteState.proxy2.host = 0;
-  remoteState.proxy2.port = 0;
+  remoteState.proxy1 = IP(0, 0);
+  remoteState.proxy2 = IP(0, 0);
 
   // activate the synchronization process

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

@@ -9 +9 @@
 
 #include "base_object.h"
+#include "ip.h"
 #include "synchronizeable.h"
 
@@ -33 +34 @@
 
   int           redirectProxy;                 //!< true if the client should reconnect to a proxy server (either 1 or 2 )
-  IPaddress     proxy1;                        //!< ip address of the first proxy (0.0.0.0 of not available)
-  IPaddress     proxy2;                        //!< ip address of the second proxy (0.0.0.0 of not available)
+  IP            proxy1;                        //!< ip address of the first proxy (0.0.0.0 of not available)
+  IP            proxy2;                        //!< ip address of the second proxy (0.0.0.0 of not available)
 };
 
@@ -82 +83 @@
 
     /** @param address: the address of the proxy server 1 if any */
-    inline void setProxy1Address(IPaddress address) { this->localState.proxy1 = address; }
+    inline void setProxy1Address(IP address) { this->localState.proxy1 = address; }
     /** @returns the address of the proxy server 1 if any */
-    inline IPaddress getProxy1Address() { return this->localState.proxy1; }
+    inline IP getProxy1Address() { return this->localState.proxy1; }
     /** @param address: the address of the proxy server 2 if any */
-    inline void setProxy2Address(IPaddress address) { this->localState.proxy2 = address; }
+    inline void setProxy2Address(IP address) { this->localState.proxy2 = address; }
     /** @returns the address of the proxy server 2 if any */
-    inline IPaddress getProxy2Address() { return this->localState.proxy2; }
+    inline IP getProxy2Address() { return this->localState.proxy2; }
 
 

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

@@ -4 +4 @@
  *
  * code taken from audiere.
+ *
+ *
+   orxonox - the future of 3D-vertical-scrollers
+
+   Copyright (C) 2004 orx
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+### File Specific:
+   main-programmer: Benjamin Grauer
+ * co-programmer: Patrick Boenzli
  */
 
@@ -97 +111 @@
 }
 
+
+/**
+ * @brief copy operator
+ * @param ip the IP to copy.
+ * @return self.
+ */
+const IP& IP::operator=(const IPaddress& ip)
+{
+  this->_ip = ip.host;
+  this->_port = ip.port;
+  return *this;
+}
+
+
 /**
  * @brief comparison operator
@@ -106 +134 @@
   return (this->_ip == ip.ip() &&
           this->_port == ip.port());
+}
+
+
+/**
+ * @brief comparison operator
+ * @param ip the IP to compare
+ * @return true if ip _and_ port do not match.
+ */
+bool IP::operator!=(const IP& ip)
+{
+  return (this->_ip != ip.ip() ||
+      this->_port != ip.port());
 }
 

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

@@ -29 +29 @@
     /// OPERATORS
     const IP& operator=(const IP& ip);
+    const IP& operator=(const IPaddress& ip);
     bool operator==(const IP& ip);
+    bool operator!=(const IP& up);
 
     /// RETRIVEAL
@@ -36 +38 @@
     /** @returns the Port */
     short port() const { return this->_port; };
+    inline IPaddress getSDLNotation() { IPaddress sdlIP; sdlIP.host = this->_ip; sdlIP.port = this->_port; return sdlIP; }
 
     int ipPart(unsigned int part) const;

branches/proxy/src/lib/network/monitor/network_monitor.cc

@@ -117 +117 @@
  * @param ip ip of the new node
  */
-void NetworkMonitor::addNode(IPaddress ip, int nodeType)
+void NetworkMonitor::addNode(IP ip, int nodeType)
 {
   PeerInfo* pInfo = new PeerInfo();

branches/proxy/src/lib/network/monitor/network_monitor.h

@@ -10 +10 @@
 #include "synchronizeable.h"
 #include "shared_network_data.h"
+#include "ip.h"
 
 #include "network_node.h"
@@ -36 +37 @@
 
     void addNode(PeerInfo* pInfo);
-    void addNode(IPaddress ip, int nodeType);
+    void addNode(IP ip, int nodeType);
     void addNode(NetworkNode* node) { this->nodeList.push_back(node); }
     void addNode(NetworkNode* node, PeerInfo* pInfo);
@@ -65 +66 @@
     PeerInfo* getSecondChoiceProxy();
     /** @returns true if the next client should be reconnected to some other proxy server with more connections */
-    inline bool reconnectNextClient() { return (this->localNode->getPlayerNumber() >= SharedNetworkData::getInstance()->getMaxPlayer())?true:false; }
+    inline bool isReconnectNextClient() { return (this->localNode->getPlayerNumber() >= SharedNetworkData::getInstance()->getMaxPlayer())?true:false; }
 
 

branches/proxy/src/lib/network/monitor/network_node.cc

@@ -239 +239 @@
   for(; it != this->masterServerList.end(); it++)
   {
-    int ip = (*it)->ip.host;
-    PRINT(0)("     - ms, id: %i (%d.%d.%d.%d:9999)\n", (*it)->userId, (ip & 0x000000FF), (ip & 0x0000FF00) >> 8, (ip & 0x00FF0000) >> 16, (ip & 0xFF000000)>>24);
+    IP* ip = &(*it)->ip;
+    PRINT(0)("     - ms, id: %i (%s:9999)\n", (*it)->userId, ip->ipString().c_str());
   }
 
@@ -247 +247 @@
   for(; it != this->activeProxyServerList.end(); it++)
   {
-    int ip = (*it)->ip.host;
-    PRINT(0)("     - ps-a, id: %i (%d.%d.%d.%d:9999)\n", (*it)->userId, (ip & 0x000000FF), (ip & 0x0000FF00) >> 8, (ip & 0x00FF0000) >> 16, (ip & 0xFF000000)>>24);
+    IP* ip = &(*it)->ip;
+    PRINT(0)("     - ps-a, id: %i (%s:9999)\n", (*it)->userId, ip->ipString().c_str());
   }
 
@@ -255 +255 @@
   for(; it != this->passiveProxyServerList.end(); it++)
   {
-    int ip = (*it)->ip.host;
-    PRINT(0)("     - ps-p, id: %i (%d.%d.%d.%d:9999)\n", (*it)->userId, (ip & 0x000000FF), (ip & 0x0000FF00) >> 8, (ip & 0x00FF0000) >> 16, (ip & 0xFF000000)>>24);
+    IP* ip = &(*it)->ip;
+    PRINT(0)("     - ps-p, id: %i (%s:9999)\n", (*it)->userId, ip->ipString().c_str());
   }
 
@@ -263 +263 @@
   for(; it != this->clientList.end(); it++)
   {
-    int ip = (*it)->ip.host;
-    PRINT(0)("     - client, id: %i (%d.%d.%d.%d:9999)\n", (*it)->userId, (ip & 0x000000FF), (ip & 0x0000FF00) >> 8, (ip & 0x00FF0000) >> 16, (ip & 0xFF000000)>>24);
-  }
-}
-
+    IP* ip = &(*it)->ip;
+    PRINT(0)("     - client, id: %i (%s:9999)\n", (*it)->userId, ip->ipString().c_str());
+  }
+}
+

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

@@ -24 +24 @@
 #ifndef _NETDEFS
 #define _NETDEFS
+
 
 #ifdef HAVE_SDL_NET_H

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

@@ -32 +32 @@
      */
     virtual void disconnectServer() = 0;
+
+    /**
+     * reconnecting to another server by terminating old connection and init a new connection
+     */
+    virtual void reconnectToServer( std::string host, int port) = 0;
+
+    /**
+     * reconnecting to anoter server softly
+     */
+    virtual void reconnectToServerSoft( std::string host, int port) = 0;
 
     /**

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

@@ -28 +28 @@
 #include "monitor/network_monitor.h"
 #include "synchronizeable.h"
+#include "ip.h"
 #include "network_game_manager.h"
 #include "shared_network_data.h"
@@ -85 +86 @@
   this->pInfo->nodeType = NET_CLIENT;
   // get the local ip address
-  SDLNet_ResolveHost( &this->pInfo->ip, NULL, port );
+  IPaddress ip;
+  SDLNet_ResolveHost( &ip, NULL, port );
+  this->pInfo->ip = ip;
 }
 
@@ -99 +102 @@
   this->pInfo->nodeType = NET_MASTER_SERVER;
   // get the local ip address
-  SDLNet_ResolveHost( &this->pInfo->ip, NULL, port );
+  IPaddress ip;
+  SDLNet_ResolveHost( &ip, NULL, port );
+  this->pInfo->ip = ip;
 }
 
@@ -356 +361 @@
 
     // check if the connecting client should reconnect to a proxy server
-    peers[clientId].handshake->setRedirect(this->networkMonitor->reconnectNextClient());
+    peers[clientId].handshake->setRedirect(this->networkMonitor->isReconnectNextClient());
 
 
@@ -364 +369 @@
 
     // check if there are too many clients connected (DEPRECATED: new: the masterserver sends a list of proxy servers)
-    if ( clientId > SharedNetworkData::getInstance()->getMaxPlayer() )
-    {
-//       peers[clientId].handshake->setRedirect(true);
-//
-//       peers[clientId].handshake->doReject( "too many connections" );
-      PRINTF(0)("Will reject client %d because there are to many connections!\n", clientId);
-    }
-    else
-    {
-      PRINTF(0)("New Client: %d\n", clientId);
-    }
-
-    //this->connectSynchronizeable(*handshakes[clientId]);
+//     if ( clientId > SharedNetworkData::getInstance()->getMaxPlayer() )
+//     {
+// //       peers[clientId].handshake->setRedirect(true);
+// //
+// //       peers[clientId].handshake->doReject( "too many connections" );
+//       PRINTF(0)("Will reject client %d because there are to many connections!\n", clientId);
+//     }
+//     else
+//     {
+//       PRINTF(0)("New Client: %d\n", clientId);
+//     }
+    PRINTF(0)("New Client: %d\n", clientId);
+
+
   }
 
@@ -493 +499 @@
               it->second.nodeType = it->second.handshake->getRemoteNodeType();
               it->second.ip = it->second.socket->getRemoteAddress();
+              // add the new server to the nodes list (it can be a NET_MASTER_SERVER or NET_PROXY_SERVER)
               this->networkMonitor->addNode(&it->second);
-
               // get proxy 1 address and add it
               this->networkMonitor->addNode(it->second.handshake->getProxy1Address(), NET_PROXY_SERVER_ACTIVE);
@@ -500 +506 @@
               this->networkMonitor->addNode(it->second.handshake->getProxy2Address(), NET_PROXY_SERVER_ACTIVE);
 
-
-              // now check if there server accepted the connection
+              // now check if the server accepted the connection
               if( it->second.handshake->redirect())
-              {
-                // handle the redirection
-                PRINTF(0)("===============================================\n");
-                PRINTF(0)("Client is redirected to the other proxy servers\n");
-                PRINTF(0)("===============================================\n");
-
-                // disconnect from the current server and reconnect to proxy server
-//                 it->second.socket->disconnectServer();
-              }
+                this->handleReconnect( it->second.userId);
 
               // create the new network game manager and init it
@@ -537 +534 @@
                 this->networkMonitor->addNode(&it->second);
 
-                handleNewClient( it->second.userId );
+                this->handleNewClient( it->second.userId );
 
                 if ( PlayerStats::getStats( it->second.userId ) && it->second.handshake->getPreferedNickName() != "" )
@@ -560 +557 @@
     }
   }
+}
+
+
+/**
+ * this functions handles a reconnect event received from the a NET_MASTER_SERVER or NET_PROXY_SERVER
+ */
+void NetworkStream::handleReconnect(int userId)
+{
+  PRINTF(0)("===============================================\n");
+  PRINTF(0)("Client is redirected to the other proxy servers\n");
+  PRINTF(0)("===============================================\n");
+
+  PeerInfo* pInfo = &this->peers[userId];
+
+  // reject the server
+  pInfo->handshake->doReject( "redirected to different server");
+
+  // flush the old synchronization states, since the numbering could be completely different
+  pInfo->lastAckedState = 0;
+  pInfo->lastRecvedState = 0;
+  // not sure if this works as expected
+  if( pInfo->handshake)
+    delete pInfo->handshake;
+
+  // disconnect from the current server and reconnect to proxy server
+  pInfo->socket->reconnectToServer( pInfo->handshake->getProxy1Address().ipString(), pInfo->handshake->getProxy1Address().port());
+
+  // and restart the handshake
+  this->startHandshake();
 }
 

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

@@ -82 +82 @@
 
     void updateConnectionList();
-
+    /* handle processes */
     void handleHandshakes();
     void handleUpstream( int tick );
     void handleDownstream(int tick );
+
+    /* handle events*/
     void handleNewClient( int userId );
-
+    void handleReconnect( int userId );
 
     void writeToNewDict( byte * data, int length, bool upstream );

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

@@ -50 +50 @@
   this->connectionMonitor = NULL;
 
-  this->ip.host = 0;
-  this->ip.port = 0;
+  this->ip = IP(0,0);
 }
 

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

@@ -32 +32 @@
     int                 userId;
     int                 nodeType;
-    IPaddress           ip;
+    IP                  ip;
 
     NetworkSocket *     socket;

branches/proxy/src/lib/network/synchronizeable_var/synchronizeable_ip.cc

@@ -16 +16 @@
 #include "synchronizeable_ip.h"
 #include "converter.h"
-
+// #include "ip.h"
 
 /**
@@ -22 +22 @@
  * @todo this constructor is not jet implemented - do it
 */
-SynchronizeableIP::SynchronizeableIP( IPaddress * ptrIn, IPaddress * ptrOut, std::string name, int permission, int priority) : SynchronizeableVar( ptrIn, ptrOut, name, 2*INTSIZE, permission, priority )
+SynchronizeableIP::SynchronizeableIP( IP * ptrIn, IP * ptrOut, std::string name, int permission, int priority) : SynchronizeableVar( ptrIn, ptrOut, name, 2*INTSIZE, permission, priority )
 {
   this->vPtrIn = ptrIn;
@@ -47 +47 @@
   int res;
 
-  res = Converter::intToByteArray( (int)vPtrIn->host, buf, maxLength );
+  res = Converter::intToByteArray( (int)vPtrIn->ip(), buf, maxLength );
   assert(res > 0);
   n += res;
 
-  res = Converter::intToByteArray( (int)vPtrIn->port, buf, maxLength);
+  res = Converter::intToByteArray( (int)vPtrIn->port(), buf, maxLength);
   assert(res > 0);
   n += res;
@@ -75 +75 @@
   int n = 0;
 
-  IPaddress oldIP = *vPtrOut;
-  IPaddress newIP;
+  IP oldIP = *vPtrOut;
 
   res = Converter::byteArrayToInt( buf + n, &host);
@@ -87 +86 @@
   n += res;
 
-  newIP.host = host;
-  newIP.port = port;
+  *this->vPtrOut = IP(host, port);
 
-  setHasChanged( (newIP.host != oldIP.host || newIP.port != oldIP.port) );
+  setHasChanged( *this->vPtrOut != oldIP);
 
   assert( n == 2 * INTSIZE);
@@ -103 +101 @@
 void SynchronizeableIP::SynchronizeableIP::debug( )
 {
-  printf("SYNCHRONIZEABLE_VAR: %s IN: %i, %i OUT: %i, %i\n", name.c_str(), vPtrIn->host, vPtrIn->port, vPtrOut->host, vPtrOut->port);
+  printf("SYNCHRONIZEABLE_VAR: %s IN: %i, %i OUT: %i, %i\n", name.c_str(), vPtrIn->ip(), vPtrIn->port(), vPtrOut->ip(), vPtrOut->port());
 }
 

branches/proxy/src/lib/network/synchronizeable_var/synchronizeable_ip.h

@@ -12 +12 @@
 
 #include "netdefs.h"
+#include "ip.h"
 
 class SynchronizeableIP : public SynchronizeableVar {
 
   public:
-    SynchronizeableIP( IPaddress *ptrIn, IPaddress * ptrOut, std::string name, int permission = PERMISSION_MASTER_SERVER, int priority = 0 );
+    SynchronizeableIP( IP *ptrIn, IP * ptrOut, std::string name, int permission = PERMISSION_MASTER_SERVER, int priority = 0 );
     virtual ~SynchronizeableIP();
 
@@ -32 +33 @@
 
   private:
-    IPaddress * vPtrIn;       //!< pointer to data (read)
-    IPaddress * vPtrOut;      //!< pointer to data (write)
+    IP * vPtrIn;       //!< pointer to data (read)
+    IP * vPtrOut;      //!< pointer to data (write)
 
 };

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

@@ -136 +136 @@
   _isListening = false;
 }
+

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

@@ -28 +28 @@
     virtual void close();
     virtual void update() {};
-    
+
   private:
     TCPsocket listenSocket;
@@ -36 +36 @@
 
     void init();
- 
+
 };
 

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

@@ -1 +1 @@
 /*!
- * @file network_socket.h
-  *  Main interface for the network module. Manages all the modules
+ * @file tcp_socket.h
+  *  tcp socket network interface
 
 */
@@ -47 +47 @@
 
     virtual void connectToServer( std::string host, int port );
-    
+
     virtual void disconnectServer();
+    virtual void reconnectToServer( std::string host, int port);
+    virtual void reconnectToServerSoft( std::string host, int port);
 
     virtual bool writePacket(byte * data, int length);

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

@@ -151 +151 @@
 }
 
+
+/**
+ * reconnects to
+ * @param host new server address
+ * @param port new port number
+ *
+ * this terminates the current connection and starts a new connection to the new server
+ */
+void UdpSocket::reconnectToServer( std::string host, int port)
+{
+  // first disconnect the old server
+  this->disconnectServer();
+
+  // now connect to the new
+  this->connectToServer( host, port);
+}
+
+
+/**
+ * reconnects to
+ * @param host new server address
+ * @param port new port number
+ *
+ * this terminates the current connection and starts a new connection to the new server
+ */
+void UdpSocket::reconnectToServerSoft( std::string host, int port)
+{}
+
+
 /**
  * send one packet to other host

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

@@ -31 +31 @@
 
     virtual void connectToServer( std::string host, int port );
-
     virtual void disconnectServer();
 
+    virtual void reconnectToServer( std::string host, int port);
+    virtual void reconnectToServerSoft( std::string host, int port);
+
     virtual bool writePacket(byte * data, int length );
-
     virtual int readPacket(byte * data, int maxLength);
 

branches/proxy/src/subprojects/network/network_unit_test.cc

@@ -208 +208 @@
 
   /* esatblish a connection */
-  IPaddress ip;
+  IP ip;
   int error = SDLNet_ResolveHost(&ip, "127.0.0.1", port);
   //SDLNet_ResolveHost(&ip, "localhost", port);
@@ -353 +353 @@
   printf("Connecting to %s, on port %i\n", name, port);
 
-  IPaddress ip;
+  IP ip;
   int error = SDLNet_ResolveHost(&ip, name, port);
   if(error == -1)