Changeset 7773

Timestamp:

Dec 17, 2010, 11:09:14 AM (14 years ago)

Author:

scheusso

Message:

small fix (ensure correct termination of communicationThread)

Location:

code/branches/network5/src/libraries/network

Files:

• ClientConnection.cc (modified) (4 diffs)
• GamestateManager.cc (modified) (1 diff)
• NetworkPrereqs.h (modified) (1 diff)
• Server.cc (modified) (1 diff)
• ServerConnection.cc (modified) (2 diffs)
• packet/Packet.cc (modified) (1 diff)

code/branches/network5/src/libraries/network/ClientConnection.cc

@@ -39 +39 @@
   const unsigned int NETWORK_CLIENT_CONNECTION_TIMEOUT = 3000; //millisecs
   const unsigned int NETWORK_CLIENT_MAX_CONNECTIONS = 1;
-  const unsigned int NETWORK_CLIENT_CHANNELS = 1;
 
 
@@ -71 +70 @@
     ENetEvent event;
 
-    this->host_ = enet_host_create(NULL, NETWORK_CLIENT_MAX_CONNECTIONS, 0, 0, 0);
+    this->host_ = enet_host_create(NULL, NETWORK_CLIENT_MAX_CONNECTIONS, NETWORK_CHANNEL_COUNT, 0, 0);
     if ( this->host_ == NULL )
     {
@@ -86 +85 @@
         COUT(3) << "Info: Using IPv4 and IPv6 Sockets." << std::endl;
 
-    this->server_ = enet_host_connect(this->host_, serverAddress_, NETWORK_CLIENT_CHANNELS, 0);
+    this->server_ = enet_host_connect(this->host_, serverAddress_, NETWORK_CHANNEL_COUNT, 0);
     if ( this->server_==NULL )
     {
@@ -155 +154 @@
     COUT(1) << "Received disconnect Packet from Server!" << endl;
         // server closed the connection
+    this->stopCommunicationThread();
     this->connectionClosed();
   }

code/branches/network5/src/libraries/network/GamestateManager.cc

@@ -216 +216 @@
 
 
-    bool b = gs->compressData();
-    assert(b);
+//     bool b = gs->compressData();
+//     assert(b);
       clock.capture();
       COUT(4) << "diff and compress time: " << clock.getDeltaTime() << endl;

code/branches/network5/src/libraries/network/NetworkPrereqs.h

@@ -68 +68 @@
   extern const char* LAN_DISCOVERY_MESSAGE;
   extern const char* LAN_DISCOVERY_ACK;
-  static const unsigned int LAN_DISCOVERY_PORT        = 55557;
-  static const unsigned int NETWORK_PEER_ID_SERVER    = 0;
-  static const unsigned int NETWORK_CHANNEL_DEFAULT   = 0;
-  static const unsigned int NETWORK_CHANNEL_RELIABLE  = 1;
+  static const unsigned int LAN_DISCOVERY_PORT          = 55557;
+  static const unsigned int NETWORK_PEER_ID_SERVER      = 0;
+  static const unsigned int NETWORK_CHANNEL_DEFAULT     = 0;
+  static const unsigned int NETWORK_CHANNEL_UNRELIABLE  = 1;
+  static const unsigned int NETWORK_CHANNEL_COUNT       = 2;
 }
 

code/branches/network5/src/libraries/network/Server.cc

@@ -425 +425 @@
     if(!b)
       return false; //no data for the client
-    b = g->compressData();
-    assert(b);
+//     b = g->compressData();
+//     assert(b);
     b = g->send();
     assert(b);

code/branches/network5/src/libraries/network/ServerConnection.cc

@@ -68 +68 @@
   bool ServerConnection::openListener()
   {
-    this->host_ = enet_host_create(this->bindAddress_, NETWORK_MAX_CONNECTIONS, 0, 0, 0);
+    this->host_ = enet_host_create(this->bindAddress_, NETWORK_MAX_CONNECTIONS, NETWORK_CHANNEL_COUNT, 0, 0);
     if ( this->host_ == NULL )
     {
@@ -91 +91 @@
     this->bListening_=false;
     disconnectClients();
+    Connection::stopCommunicationThread();
     enet_host_destroy(this->host_);
     return true;

code/branches/network5/src/libraries/network/packet/Packet.cc

@@ -169 +169 @@
 //  enetPacket_ = 0; // otherwise we have a double free because enet already handles the deallocation of the packet
   if( this->flags_ & PacketFlag::Reliable )
-    Host::addPacket( enetPacket_, clientID_, 0);
+    Host::addPacket( enetPacket_, clientID_, NETWORK_CHANNEL_DEFAULT);
   else
-    Host::addPacket( enetPacket_, clientID_, 0);
+    Host::addPacket( enetPacket_, clientID_, NETWORK_CHANNEL_UNRELIABLE);
   return true;
 }