Changeset 7295 for code/branches

Timestamp:

Aug 31, 2010, 6:13:21 PM (14 years ago)

Author:

adrfried

Message:

some compatability changes for ipv6-patched enet

Location:

code/branches/ipv6/src/libraries/network

Files:

• ClientInformation.cc (modified) (2 diffs)
• LANDiscoverable.cc (modified) (1 diff)
• LANDiscovery.cc (modified) (1 diff)
• ServerConnection.cc (modified) (1 diff)

code/branches/ipv6/src/libraries/network/ClientInformation.cc

@@ -216 +216 @@
     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();
@@ -250 +250 @@
     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();

code/branches/ipv6/src/libraries/network/LANDiscoverable.cc

@@ -64 +64 @@
     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 );

code/branches/ipv6/src/libraries/network/LANDiscovery.cc

@@ -67 +67 @@
         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);

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

@@ -44 +44 @@
   {
     this->bindAddress_ = new ENetAddress();
+    memset(this->bindAddress_, 0, sizeof(ENetAddress));
     this->bindAddress_->host = ENET_HOST_ANY;
     this->bindAddress_->port = NETWORK_PORT;