Changeset 11842 for code/branches/Masterserver_FS18/src/libraries/network/packet/ServerInformation.cc

Timestamp:

Mar 29, 2018, 4:04:35 PM (7 years ago)

Author:

mdedial

Message:

Clean up some code, add lots of comments

File:

• code/branches/Masterserver_FS18/src/libraries/network/packet/ServerInformation.cc (modified) (3 diffs)

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

@@ -50 +50 @@
       // Save Server Round Trip Time
       this->serverRTT_ = event->peer->roundTripTime;
+
       // Save Server Address, leave some space for scope ID
       enet_address_get_host_ip(&event->peer->address, serverIP, 64);
+
       this->serverIP_ = std::string(serverIP);
       // Save ACK
@@ -57 +59 @@
       char* ack = nullptr;
       loadAndIncrease((char*&)ack, temp);
-
-      /* Fabian, what is this used for? it crashes the masterserver, hence commenting it */
-      // written by Oli: this is just to make sure that loadAndIncrease really writes the whole ACK string into char* ack
-//       assert(strcmp(ack, (const char*)LAN_DISCOVERY_ACK)==0);
-
       // Save Server Name
       loadAndIncrease(this->serverName_, temp);
@@ -74 +71 @@
     void ServerInformation::send(ENetPeer* peer)
     {
-      std::string payload = this->serverName_ + Ogre::StringConverter::toString(this->clientNumber_);
+      std::string payload = this->serverName_ + std::to_string(this->clientNumber_);
       uint32_t size = returnSize(LAN_DISCOVERY_ACK) + returnSize(payload);
       uint8_t* temp = new uint8_t[size];