Changeset 6018 in orxonox.OLD

Timestamp:

Dec 10, 2005, 6:48:01 PM (18 years ago)

Author:

rennerc

Message:

NetworkStream should now accept net connections

Location:

branches/network/src

Files:

• lib/network/network_manager.h (modified) (1 diff)
• lib/network/network_socket.h (modified) (1 diff)
• lib/network/network_stream.cc (modified) (3 diffs)
• lib/network/network_stream.h (modified) (1 diff)
• lib/network/server_socket.cc (modified) (2 diffs)
• lib/network/server_socket.h (modified) (1 diff)
• subprojects/network/network_unit_test.cc (modified) (4 diffs)
• util/loading/game_loader.h (modified) (2 diffs)

branches/network/src/lib/network/network_manager.h

@@ -47 +47 @@
     inline int getHostID() { return this->hostID; };
 
-  private:
+
     void connectSynchronizeable(Synchronizeable& sync);
     void synchronize();
 
+  private:
     NetworkManager();
 

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

@@ -87 +87 @@
   int readPacket(byte * data, int maxLength);
 
+  inline bool isOk() { return tcpSocket!=NULL; }
+
 };
 

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

@@ -66 +66 @@
   this->networkProtocol = new NetworkProtocol();
   this->connectionMonitor = new ConnectionMonitor();
+  this->networkSockets.push_back( NULL );
+  this->bActive = true;
 }
 
@@ -111 +113 @@
 void NetworkStream::processData()
 {
+  printf("processData()");
+  if ( this->type == NET_SERVER )
+    this->updateConnectionList();
+
 #if 0
   int dataLength = 0;
@@ -178 +184 @@
 #endif
 }
+
+void NetworkStream::updateConnectionList( )
+{
+  //check for new connections
+  NetworkSocket* tempNetworkSocket = serverSocket->getNewSocket();
+
+  if ( tempNetworkSocket )
+  {
+    int clientId;
+    if ( freeSocketSlots.size() >0 )
+    {
+      clientId = freeSocketSlots.back();
+      freeSocketSlots.pop_back();
+      networkSockets[clientId] = tempNetworkSocket;
+    } else
+    {
+      networkSockets.push_back(tempNetworkSocket);
+      clientId = networkSockets.size();
+    }
+
+    PRINTF(0)("New Client: %s", clientId);
+    //TODO: start handshake
+    //new Handshake(true, clientId);
+  }
+
+
+  //check if connections are ok else remove them
+  for ( int i = 1; i<networkSockets.size(); i++)
+  {
+    if ( networkSockets[i] && !networkSockets[i]->isOk() )
+    {
+      //TODO: tell EntityManager that this player left the game
+
+      delete networkSockets[i];
+      networkSockets[i] = NULL;
+
+      if ( i == networkSockets.size()-1 )
+      {
+        networkSockets.pop_back();
+      }
+      else
+      {
+        freeSocketSlots.push_back(i);
+      }
+    }
+  }
+
+}

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

@@ -51 +51 @@
     Header                 packetHeader;
     bool                   bActive;
+    std::list<int>         freeSocketSlots;
+
+    void updateConnectionList();
 };
 #endif /* _NETWORK_STREAM */

branches/network/src/lib/network/server_socket.cc

@@ -110 +110 @@
 
 
-NetworkSocket ServerSocket::getNewSocket( )
+NetworkSocket* ServerSocket::getNewSocket( )
 {
   if ( !listenSocket )
@@ -127 +127 @@
   else
   {
-    return NetworkSocket(sock);
+    return new NetworkSocket(sock);
   }
 }

branches/network/src/lib/network/server_socket.h

@@ -39 +39 @@
     ~ServerSocket();
     bool listen( unsigned int port );
-    NetworkSocket getNewSocket( void );
+    NetworkSocket* getNewSocket( void );
     void close();
+    inline bool isOk(){ return listenSocket!=NULL; }
 };
 

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

@@ -42 +42 @@
   NetworkSocket client1(ip);
 
-  NetworkSocket server1 = server.getNewSocket();
+  NetworkSocket* server1 = server.getNewSocket();
 
   NetworkSocket client2(ip);
 
-  NetworkSocket server2 = server.getNewSocket();
+  NetworkSocket* server2 = server.getNewSocket();
 
   char buf[1024];
@@ -63 +63 @@
   n = client1.writePacket((byte*)str1, strlen(str1)+1);
   printf("%d bytes send from client1\n", n);
-  n = server1.writePacket((byte*)str2, strlen(str2)+1);
+  n = server1->writePacket((byte*)str2, strlen(str2)+1);
   printf("%d bytes send from server1\n", n);
   n = client2.writePacket((byte*)str3, strlen(str3)+1);
   printf("%d bytes send from client2\n", n);
-  n = server2.writePacket((byte*)str4, strlen(str4)+1);
+  n = server2->writePacket((byte*)str4, strlen(str4)+1);
   printf("%d bytes send from server2\n", n);
   SDL_Delay(1000);
 
   printf("read from server1\n");
-  n = server1.readPacket((byte*)buf, 1024);
+  n = server1->readPacket((byte*)buf, 1024);
   printf("read %d bytes\n", n);
   if (n<0)
@@ -80 +80 @@
 
   printf("read from server2\n");
-  n = server2.readPacket((byte*)buf, 1024);
+  n = server2->readPacket((byte*)buf, 1024);
   printf("read %d bytes\n", n);
   if (n<0)
@@ -108 +108 @@
   printf("result: %d\n", client1.writePacket((byte*)buf, 1000));
 
-  server1.writePacket((byte*)str1, strlen(str1)+1);
+  server1->writePacket((byte*)str1, strlen(str1)+1);
   SDL_Delay(500);
   printf("try to read with a too small buffer\n");

branches/network/src/util/loading/game_loader.h

@@ -47 +47 @@
   ErrorMessage init();
   ErrorMessage loadCampaign(const char* name);
+  ErrorMessage loadNetworkCampaign(const char* fileName);
   ErrorMessage start();
   void stop();
@@ -66 +67 @@
 
   Campaign* fileToCampaign(const char* name);
+  Campaign* fileToNetworkCampaign(const char* fileName);
 
  private: