[Orxonox-commit 2590] r7295 - code/branches/ipv6/src/libraries/network

[adrfried at orxonox.net]

Author: adrfried
Date: 2010-08-31 18:13:21 +0200 (Tue, 31 Aug 2010)
New Revision: 7295

Modified:
   code/branches/ipv6/src/libraries/network/ClientInformation.cc
   code/branches/ipv6/src/libraries/network/LANDiscoverable.cc
   code/branches/ipv6/src/libraries/network/LANDiscovery.cc
   code/branches/ipv6/src/libraries/network/ServerConnection.cc
Log:
some compatability changes for ipv6-patched enet

Modified: code/branches/ipv6/src/libraries/network/ClientInformation.cc
===================================================================
--- code/branches/ipv6/src/libraries/network/ClientInformation.cc	2010-08-31 16:13:18 UTC (rev 7294)
+++ code/branches/ipv6/src/libraries/network/ClientInformation.cc	2010-08-31 16:13:21 UTC (rev 7295)
@@ -215,7 +215,7 @@
       return false;
     ClientInformation *temp = head_;
     while(temp!=0){
-      if(temp->getPeer()->address.host==peer->address.host && temp->getPeer()->address.port==peer->address.port)
+      if(!memcmp(& temp->getPeer()->address, & peer->address, sizeof(peer->address)))
         break;
       temp = temp->next();
     }
@@ -249,7 +249,7 @@
   ClientInformation *ClientInformation::findClient(ENetAddress *address, bool look_backwards) {
     ClientInformation *temp = head_;
     while(temp!=0){
-      if(temp->getPeer()->address.host==address->host && temp->getPeer()->address.port == address->port)
+      if(!memcmp(& temp->getPeer()->address, address, sizeof(*address)))
         break;
       temp = temp->next();
     }

Modified: code/branches/ipv6/src/libraries/network/LANDiscoverable.cc
===================================================================
--- code/branches/ipv6/src/libraries/network/LANDiscoverable.cc	2010-08-31 16:13:18 UTC (rev 7294)
+++ code/branches/ipv6/src/libraries/network/LANDiscoverable.cc	2010-08-31 16:13:21 UTC (rev 7295)
@@ -63,7 +63,10 @@
     
     if( bActive )
     {
-      ENetAddress bindAddress = { ENET_HOST_ANY, LAN_DISCOVERY_PORT };
+      ENetAddress bindAddress;
+      memset(& bindAddress, 0, sizeof(ENetAddress));
+      bindAddress.host = ENET_HOST_ANY;
+      bindAddress.port = LAN_DISCOVERY_PORT;
       assert( this->host_ == 0 );
       this->host_ = enet_host_create( &bindAddress, 10, 0, 0, 0 );
     }

Modified: code/branches/ipv6/src/libraries/network/LANDiscovery.cc
===================================================================
--- code/branches/ipv6/src/libraries/network/LANDiscovery.cc	2010-08-31 16:13:18 UTC (rev 7294)
+++ code/branches/ipv6/src/libraries/network/LANDiscovery.cc	2010-08-31 16:13:21 UTC (rev 7295)
@@ -66,7 +66,7 @@
       {
         case ENET_EVENT_TYPE_CONNECT:
         {
-          COUT(0) << "connect from server: " << event.peer->address.host << endl;
+          //COUT(0) << "connect from server: " << event.peer->address.host << endl; FIXME
           ENetPacket* packet = enet_packet_create(LAN_DISCOVERY_MESSAGE, strlen(LAN_DISCOVERY_MESSAGE)+1, ENET_PACKET_FLAG_RELIABLE);
           enet_peer_send(event.peer, 0, packet);
           break;

Modified: code/branches/ipv6/src/libraries/network/ServerConnection.cc
===================================================================
--- code/branches/ipv6/src/libraries/network/ServerConnection.cc	2010-08-31 16:13:18 UTC (rev 7294)
+++ code/branches/ipv6/src/libraries/network/ServerConnection.cc	2010-08-31 16:13:21 UTC (rev 7295)
@@ -43,6 +43,7 @@
     bListening_(false)
   {
     this->bindAddress_ = new ENetAddress();
+    memset(this->bindAddress_, 0, sizeof(ENetAddress));
     this->bindAddress_->host = ENET_HOST_ANY;
     this->bindAddress_->port = NETWORK_PORT;
   }