Changeset 10456 for code/branches/multiplayerFS15/src/libraries/network

Timestamp:

May 23, 2015, 9:47:30 PM (9 years ago)

Author:

frovelli

Message:

Transmit client count in LAN by evil hack

Location:

code/branches/multiplayerFS15/src/libraries/network

Files:

• LANDiscoverable.cc (modified) (1 diff)
• LANDiscovery.cc (modified) (1 diff)
• packet/ServerInformation.cc (modified) (1 diff)
• packet/ServerInformation.h (modified) (2 diffs)

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

@@ -120 +120 @@
             packet::ServerInformation info;
             info.setServerName(this->ownName);
-            info.setClientNumber(this->clientNumber);
+            info.setClientNumber(5);
             info.send(event.peer);
 //             ENetPacket* packet = enet_packet_create( LAN_DISCOVERY_ACK, strlen(LAN_DISCOVERY_ACK)+1, ENET_PACKET_FLAG_RELIABLE );

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

@@ -89 +89 @@
           {
             packet::ServerInformation info(&event);
+            std::string payload = info.getServerName();
+            info.setServerName(payload.substr(0,payload.length()-2));
+            info.setClientNumber( Ogre::StringConverter::parseInt(payload.substr(payload.length()-1)));
             orxout(internal_info, context::network) << "Received LAN discovery server information; Name: " << info.getServerName() << ", Address: " << info.getServerIP() << ", Players: " << info.getClientNumber() << ", RTT: " << info.getServerRTT() << endl;
             std::vector<packet::ServerInformation>::iterator it;

code/branches/multiplayerFS15/src/libraries/network/packet/ServerInformation.cc

@@ -73 +73 @@
     void ServerInformation::send(ENetPeer* peer)
     {
-      uint32_t size = returnSize((char*&)LAN_DISCOVERY_ACK) + returnSize(this->serverName_);
+      std::string payload = this->serverName_ + Ogre::StringConverter::toString(this->clientNumber_);
+      uint32_t size = returnSize((char*&)LAN_DISCOVERY_ACK) + returnSize(payload);
       uint8_t* temp = new uint8_t[size];
       uint8_t* temp2 = temp;
       saveAndIncrease((char*&)LAN_DISCOVERY_ACK, temp2);
-      saveAndIncrease(this->serverName_, temp2);
+      saveAndIncrease(payload, temp2);
       ENetPacket* packet = enet_packet_create( temp, size, 0 );
       enet_peer_send(peer, 0, packet);

code/branches/multiplayerFS15/src/libraries/network/packet/ServerInformation.h

@@ -30 +30 @@
 
 #include <string>
+#include <OgreStringConverter.h>
+
 
 #ifndef SERVERINFORMATION_H
@@ -57 +59 @@
       private:
         std::string   serverName_;
+        int           clientNumber_;
         std::string   serverIP_;
         uint32_t      serverRTT_;
-        int           clientNumber_;
     };