Changeset 6043 in orxonox.OLD

Timestamp:

Dec 11, 2005, 2:07:08 PM (18 years ago)

Author:

rennerc

Message:

added handshake

Location:

branches/network/src

Files:

• defs/class_id.h (modified) (2 diffs)
• lib/network/Makefile.am (modified) (2 diffs)
• lib/network/handshake.cc (added)
• lib/network/handshake.h (added)
• lib/network/network_protocol.cc (modified) (4 diffs)
• lib/network/network_protocol.h (modified) (2 diffs)
• lib/network/network_stream.cc (modified) (8 diffs)
• lib/network/network_stream.h (modified) (4 diffs)
• lib/network/synchronizeable.cc (modified) (5 diffs)
• lib/network/synchronizeable.h (modified) (1 diff)
• subprojects/network/network_unit_test.cc (modified) (2 diffs)
• subprojects/network/read_sync.cc (modified) (1 diff)
• subprojects/network/read_sync.h (modified) (1 diff)
• subprojects/network/simple_sync.cc (modified) (1 diff)
• subprojects/network/simple_sync.h (modified) (1 diff)
• subprojects/network/write_sync.cc (modified) (1 diff)
• subprojects/network/write_sync.h (modified) (1 diff)

branches/network/src/defs/class_id.h

@@ -220 +220 @@
 
   // network stuff (range from 0x00000b00 to 0x00000bff)
-  CL_DATA_STREAM                =    0x00b01000,
+  CL_DATA_STREAM                =    0x00b00b00,
   CL_NETWORK_STREAM             =    0x00000b01,
   CL_NETWORK_PROTOCOL           =    0x00000b02,
@@ -226 +226 @@
   CL_SERVER_SOCKET              =    0X00000b04,
   CL_CONNECTION_MONITOR         =    0x00000b05,
+  CL_HANDSHAKE                  =    0x00000b06,
 
 

branches/network/src/lib/network/Makefile.am

@@ -11 +11 @@
                       data_stream.cc \
                       network_protocol.cc \
-                      server_socket.cc
+                      server_socket.cc \
+                      handshake.cc
 
 
@@ -22 +23 @@
                  data_stream.h \
                  network_protocol.h \
-                 server_socket.h
+                 server_socket.h \
+                 handshake.h
 

branches/network/src/lib/network/network_protocol.cc

@@ -57 +57 @@
     * @arg bufferLength: the length of the internal buffer
     * @arg source: reference to the source Synchronizeable object
-    * @arg remoteID: id number of the remote Synchronizeable object
     * @return: the new data length with header (the header data is included into byte* data)
     *          -1 if there isn't enough space in the buffer for the header
 */
-int NetworkProtocol::createHeader(byte* data, int length, int bufferLength, const Synchronizeable& source, unsigned int remoteID)
+int NetworkProtocol::createHeader(byte* data, int length, int bufferLength, const Synchronizeable& source)
 {
-  printf("NetworkProtocol: create header length = %i, bufferLength = %i\n", length, bufferLength);
+  PRINTF(0)("create header length = %i, bufferLength = %i\n", length, bufferLength);
   //If there isn't enough space for the header return -1
   if (length + this->headerLength > bufferLength)
@@ -82 +81 @@
   data[1] = 0;
   /* sender ID: FIXME: there will be a better ID (for example unique:D)*/
-  data[2] = (byte)source.getClassID();
-  /* receiver ID */
-  data[3] = remoteID;
+  data[2] = (byte)(source.getUniqueID());
   /* data length*/
-  data[4] = length;
+  data[3] = length;
 
 
@@ -104 +101 @@
   if (length < headerLength)
   {
-    PRINTF(0)("Received data is to short; it can't contain a header!");
+    PRINTF(0)("Received data is to short; it can't contain a header!\n");
     Header h;
     h.protocol = 0;
@@ -117 +114 @@
   /* version number */
   h.version = data[1];
-  /* sender ID: FIXME: there will be a better ID (for example unique:D)*/
-  h.senderID = data[2];
-  /* receiver ID */
-  h.receiverID = data[3];
+  /* unique ID */
+  h.uniqueID = data[2];
   /* data length*/
-  h.length = data[4];
+  h.length = data[3];
 
 

branches/network/src/lib/network/network_protocol.h

@@ -17 +17 @@
   byte protocol;
   byte version;
-  byte senderID;
-  byte receiverID;
+  byte uniqueID;
   byte length;
 };
@@ -33 +32 @@
     ~NetworkProtocol();
 
-    int createHeader(byte* data, int length, int bufferLength, const Synchronizeable& source, unsigned int remoteID);
+    int createHeader(byte* data, int length, int bufferLength, const Synchronizeable& source);
     Header extractHeader(byte* data, int length);
 

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

@@ -26 +26 @@
 #include "connection_monitor.h"
 #include "synchronizeable.h"
+#include "network_manager.h"
 #include "list.h"
 #include "debug.h"
@@ -56 +57 @@
   this->networkProtocol = new NetworkProtocol();
   this->connectionMonitor = new ConnectionMonitor();
+
+  Handshake* hs = new Handshake(false);
+  this->handshakes.push_back(hs);
+  this->connectSynchronizeable(*hs);
+  PRINTF(0)("NetworkStream: %s\n", hs->getName());
 }
 
@@ -77 +83 @@
   this->bActive = false;
   this->serverSocket = NULL;
+  myHostId = 0;
 }
 
@@ -94 +101 @@
       (*i)->disconnectServer();
       (*i)->destroy();
+    }
+  }
+
+  for (HandshakeVector::iterator i = handshakes.begin(); i!=handshakes.end(); i++)
+  {
+    if ( *i )
+    {
+      delete (*i);
     }
   }
@@ -116 +131 @@
   if ( this->type == NET_SERVER )
     this->updateConnectionList();
+
+  for (HandshakeVector::iterator it = handshakes.begin(); it!=handshakes.end(); it++)
+  {
+    if ( *it )
+    {
+      if ( (*it)->completed() )
+      {
+        if ( (*it)->ok() )
+        {
+          NetworkManager::getInstance()->setHostID( (*it)->getHostId() );
+          myHostId = NetworkManager::getInstance()->getHostID();
+          delete *it;
+          *it = NULL;
+          PRINT(0)("handshake finished\n");
+        }
+        else
+        {
+          PRINT(1)("handshake failed!\n");
+          delete *it;
+          *it = NULL;
+          //TODO: handle error
+        }
+      }
+    }
+  }
+
+
+  /* DOWNSTREAM */
+
+  int dataLength;
+  int reciever;
+  Header header;
+  for (SynchronizeableList::iterator it = synchronizeables.begin(); it!=synchronizeables.end(); it++)
+  {
+    if ( (*it)->getOwner() == myHostId )
+    {
+      PRINTF(0)("sync: %s\n", (*it)->getName());
+      reciever = 0;
+      do {
+        dataLength = (*it)->readBytes(downBuffer, DATA_STREAM_BUFFER_SIZE, reciever);
+
+        if ( dataLength<=0 ){
+          reciever = 0;
+          continue;
+        }
+
+        PRINTF(0)("read %d bytes\n", dataLength);
+
+        dataLength = networkProtocol->createHeader((byte*)downBuffer, dataLength, DATA_STREAM_BUFFER_SIZE, static_cast<const Synchronizeable&>(*(*it)));
+
+        if ( dataLength<=0 )
+          continue;
+
+        if ( reciever!=0 )
+        {
+          if ( networkSockets[reciever] )
+          {
+            PRINTF(0)("write %d bytes to socket\n", dataLength);
+            networkSockets[reciever]->writePacket(downBuffer, dataLength);
+          }
+          else
+          {
+            PRINTF(1)("networkSockets[reciever] == NULL\n");
+          }
+        }
+        else
+        {
+          for ( int i = 1; i<networkSockets.size(); i++)
+          {
+            if ( networkSockets[i] )
+              networkSockets[i]->writePacket(downBuffer, dataLength);
+          }
+        }
+
+      } while( reciever!=0 );
+    }
+  }
+
+  /* UPSTREAM */
+
+  for ( int i = 1; i<networkSockets.size(); i++)
+  {
+    if ( networkSockets[i] )
+    {
+      do {
+        dataLength = networkSockets[i]->readPacket(upBuffer, DATA_STREAM_BUFFER_SIZE);
+
+        if ( dataLength<=0 )
+          continue;
+
+        PRINTF(0)("read %d bytes from socket\n", dataLength);
+        header = networkProtocol->extractHeader(upBuffer, dataLength);
+        dataLength -= sizeof(header);
+
+        if ( dataLength != header.length )
+        {
+          PRINTF(1)("packetsize in header and real packetsize do not match! %d:%d\n", dataLength, header.length);
+          continue;
+        }
+
+        for (SynchronizeableList::iterator it = synchronizeables.begin(); it!=synchronizeables.end(); it++)
+        {
+          if ( *it && (*it)->getUniqueID()==header.uniqueID )
+            (*it)->writeBytes(upBuffer+sizeof(header), dataLength);
+        }
+
+      } while ( dataLength>0 );
+    }
+  }
 
 #if 0
@@ -199 +323 @@
       freeSocketSlots.pop_back();
       networkSockets[clientId] = tempNetworkSocket;
+      handshakes[clientId] = new Handshake(true, clientId);
     } else
     {
       clientId = networkSockets.size();
       networkSockets.push_back(tempNetworkSocket);
+      handshakes.push_back(new Handshake(true, clientId));
     }
 
     PRINTF(0)("New Client: %d\n", clientId);
-    //TODO: start handshake
-    //new Handshake(true, clientId);
+
+    this->connectSynchronizeable(*handshakes[clientId]);
   }
 
@@ -223 +349 @@
       networkSockets[i]->destroy();
       networkSockets[i] = NULL;
+      delete handshakes[i];
+      handshakes[i] = NULL;
 
       if ( i == networkSockets.size()-1 )
       {
         networkSockets.pop_back();
+        handshakes.pop_back();
       }
       else
@@ -237 +366 @@
 
 }
+
+

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

@@ -13 +13 @@
 #include "network_protocol.h"
 #include "server_socket.h"
+#include "handshake.h"
 
 class Synchronizeable;
@@ -21 +22 @@
 
 typedef std::list<Synchronizeable*>  SynchronizeableList;
-typedef std::vector<NetworkSocket*> NetworkSocketVector;
+typedef std::vector<NetworkSocket*>  NetworkSocketVector;
+typedef std::vector<Handshake*>      HandshakeVector;
 
 
@@ -47 +49 @@
     SynchronizeableList    synchronizeables;
     NetworkSocketVector    networkSockets;
+    HandshakeVector        handshakes;
     ServerSocket*          serverSocket;
     int                    type;
@@ -53 +56 @@
     std::list<int>         freeSocketSlots;
 
+    int                    myHostId;
+
     void updateConnectionList();
 };

branches/network/src/lib/network/synchronizeable.cc

@@ -17 +17 @@
 #include "synchronizeable.h"
 #include "netdefs.h"
+#include "network_manager.h"
 
 
@@ -26 +27 @@
 
   //owner = ?;
-  //hostID = ?;
+  hostID = NetworkManager::getInstance()->getHostID();
   //state = ?;
 
@@ -55 +56 @@
  *  read data from NetworkStream
  */
-int Synchronizeable::readBytes(byte* data)
+int Synchronizeable::readBytes(byte* data, int maxLength, int& reciever)
 {}
 
@@ -65 +66 @@
 void Synchronizeable::readDebug() const
 {}
-
-
-
 
 
@@ -111 +109 @@
   return this->state & STATE_OUTOFSYNC == STATE_OUTOFSYNC;
 }
+
+
+

branches/network/src/lib/network/synchronizeable.h

@@ -29 +29 @@
 
     virtual void      writeBytes(const byte* data, int length);
-    virtual int       readBytes(byte* data);
+    virtual int       readBytes(byte* data, int maxLength, int& reciever);
     virtual void      writeDebug() const;
     virtual void      readDebug() const;
-    
-    
-    
-    
-    
-    void setIsServer(bool isServer);
-    void setIsOutOfSync(bool outOfSync);
+
+    void setIsServer( bool isServer );
+    void setIsOutOfSync( bool outOfSync );
     bool isServer();
     bool isOutOfSync();
+    void setUniqueId( int id ){ uniqueID = id; }
+    int  getUniqueID() const { return uniqueID; };
+    void requestSync( int hostID ){ this->synchronizeRequests.push_back( hostID ); }
+
+    inline int getOwner(){ return owner; }
+    inline void setOwner(int owner){ this->owner = owner; }
 
   private:
 
     int               uniqueID;
-    
-    
-    
+
+
+
     //static std::vector<Synchronizeable*> classList;
     int owner;

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

@@ -190 +190 @@
   Synchronizeable* ss = new SimpleSync("Server\0");
 
-  netMan->createServer(*ss, port);
+  netMan->createServer(/**ss, */port);
   SDL_Delay(20);
 
@@ -229 +229 @@
   Synchronizeable* ss = new SimpleSync("Client\0");
 
-  netMan->establishConnection(ip, *ss);
+  netMan->establishConnection((const char*)"localhost", port/*,ip, *ss*/);
 
   for(;;)

branches/network/src/subprojects/network/read_sync.cc

@@ -80 +80 @@
  *  read data from Synchronizeable
  */
-int ReadSync::readBytes(byte* data)
+int ReadSync::readBytes(byte* data, int maxLength, int& reciever)
 {
   return 0;

branches/network/src/subprojects/network/read_sync.h

@@ -17 +17 @@
 
     virtual void writeBytes(const byte* data, int length);
-    virtual int readBytes(byte* data);
+    virtual int readBytes(byte* data, int maxLength, int& reciever);
 
 

branches/network/src/subprojects/network/simple_sync.cc

@@ -86 +86 @@
  *  read data from Synchronizeable
  */
-int SimpleSync::readBytes(byte* data)
+int SimpleSync::readBytes(byte* data, int maxLength, int& reciever)
 {
   PRINTF(0)("SimpleSync: sent %i bytes of data\n", this->outLength);

branches/network/src/subprojects/network/simple_sync.h

@@ -17 +17 @@
 
     virtual void writeBytes(const byte* data, int length);
-    virtual int readBytes(byte* data);
+    virtual int readBytes(byte* data, int maxLength, int& reciever);
 
 

branches/network/src/subprojects/network/write_sync.cc

@@ -86 +86 @@
  *  read data from Synchronizeable
  */
-int WriteSync::readBytes(byte* data)
+int WriteSync::readBytes(byte* data, int maxLength, int& reciever)
 {
   PRINTF(0)("WriteSync: sent %i bytes of data\n", this->outLength);

branches/network/src/subprojects/network/write_sync.h

@@ -17 +17 @@
 
     virtual void writeBytes(const byte* data, int length);
-    virtual int readBytes(byte* data);
+    virtual int readBytes(byte* data, int maxLength, int& reciever);