Changeset 7414

Timestamp:

Sep 11, 2010, 5:47:47 PM (14 years ago)

Author:

adrfried

Message:

some debug output fixed

Location:

code/branches/ipv6/src/libraries/network

Files:

• LANDiscoverable.cc (modified) (2 diffs)
• LANDiscovery.cc (modified) (2 diffs)

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

@@ -94 +94 @@
       {
         case ENET_EVENT_TYPE_CONNECT:
+            COUT(4) << "Received LAN discovery connect from client " << event.peer->host->receivedAddress << std::endl;
+            break;
         case ENET_EVENT_TYPE_DISCONNECT:
         case ENET_EVENT_TYPE_NONE:
@@ -100 +102 @@
           if( strcmp( LAN_DISCOVERY_MESSAGE, (char*)event.packet->data ) == 0 )      // check for a suitable orxonox client
           {
-            COUT(4) << "Received LAN discovery message from " << event.peer->host << std::endl;
+            COUT(3) << "Received LAN discovery message from client " << event.peer->host->receivedAddress << std::endl;
             packet::ServerInformation info;
             info.setServerName("Orxonox Server");

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

@@ -80 +80 @@
         case ENET_EVENT_TYPE_CONNECT:
         {
-          COUT(4) << "connect from server: " << event.peer->address << endl;
+          COUT(4) << "Received LAN discovery connect from server " << event.peer->host->receivedAddress << std::endl;
           ENetPacket* packet = enet_packet_create(LAN_DISCOVERY_MESSAGE, strlen(LAN_DISCOVERY_MESSAGE)+1, ENET_PACKET_FLAG_RELIABLE);
           enet_peer_send(event.peer, 0, packet);
@@ -88 +88 @@
           {
             packet::ServerInformation info(&event);
-            COUT(3) << "received server information; Name: " << info.getServerName() << ", Address: " << info.getServerIP() << ", RTT: " << info.getServerRTT() << endl;
+            COUT(3) << "Received LAN discovery server information; Name: " << info.getServerName() << ", Address: " << info.getServerIP() << ", RTT: " << info.getServerRTT() << endl;
             std::vector<packet::ServerInformation>::iterator it;
             for( it=this->servers_.begin(); it!=this->servers_.end(); ++it )