Changeset 7459 for code/trunk/src/libraries/network/packet
- Timestamp:
- Sep 17, 2010, 12:48:29 AM (14 years ago)
- Location:
- code/trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/ipv6 (added) merged: 7293-7295,7320,7322,7328-7330,7376-7378,7381-7382,7384-7387,7389-7394,7396-7397,7402,7411,7414,7433,7435,7437-7438,7442-7443,7453-7454
- Property svn:mergeinfo changed
-
code/trunk/src/libraries/network/packet/ServerInformation.cc
r7321 r7459 47 47 ServerInformation::ServerInformation(ENetEvent* event) 48 48 { 49 char serverIP[64]; 50 49 51 // Save Server Round Trip Time 50 52 this->serverRTT_ = event->peer->roundTripTime; 51 // Save Server IP 52 char* serverIP = new char[16]; 53 enet_address_get_host_ip(&event->peer->address, serverIP, 16); 53 // Save Server Address, leave some space for scope ID 54 enet_address_get_host_ip(&event->peer->address, serverIP, 64); 54 55 this->serverIP_ = std::string(serverIP); 55 56 // Save ACK … … 83 84 84 85 } // namespace packet 86 87 std::ostream& operator<<(std::ostream& out, const ENetAddress& address) 88 { 89 char addr[64]; 90 if (!enet_address_get_host_ip(&address, addr, 64)) 91 out << addr; 92 return out; 93 } 85 94 } // namespace orxonox 86 95 -
code/trunk/src/libraries/network/packet/ServerInformation.h
r7163 r7459 59 59 60 60 } 61 62 _NetworkExport std::ostream& operator<<(std::ostream& out, const ENetAddress& address); 61 63 } 62 64
Note: See TracChangeset
for help on using the changeset viewer.