Compare commits
6 Commits
v11.3.1
...
bsergean-p
Author | SHA1 | Date | |
---|---|---|---|
317e3c44bf | |||
61b90251af | |||
851157f252 | |||
69541cf750 | |||
1e166eee57 | |||
6860b2d09d |
@ -278,17 +278,4 @@ namespace ix
|
||||
#endif
|
||||
}
|
||||
|
||||
// Convert network bytes to host bytes. Copied from the ASIO library
|
||||
unsigned short network_to_host_short(unsigned short value)
|
||||
{
|
||||
#if defined(_WIN32)
|
||||
unsigned char* value_p = reinterpret_cast<unsigned char*>(&value);
|
||||
unsigned short result = (static_cast<unsigned short>(value_p[0]) << 8)
|
||||
| static_cast<unsigned short>(value_p[1]);
|
||||
return result;
|
||||
#else // defined(_WIN32)
|
||||
return ntohs(value);
|
||||
#endif // defined(_WIN32)
|
||||
}
|
||||
|
||||
} // namespace ix
|
||||
|
@ -81,6 +81,4 @@ namespace ix
|
||||
|
||||
const char* inet_ntop(int af, const void* src, char* dst, socklen_t size);
|
||||
int inet_pton(int af, const char* src, void* dst);
|
||||
|
||||
unsigned short network_to_host_short(unsigned short value);
|
||||
} // namespace ix
|
||||
|
@ -351,7 +351,7 @@ namespace ix
|
||||
continue;
|
||||
}
|
||||
|
||||
remotePort = ix::network_to_host_short(client.sin_port);
|
||||
remotePort = client.sin_port;
|
||||
remoteIp = remoteIp4;
|
||||
}
|
||||
else // AF_INET6
|
||||
@ -371,7 +371,7 @@ namespace ix
|
||||
continue;
|
||||
}
|
||||
|
||||
remotePort = ix::network_to_host_short(client.sin_port);
|
||||
remotePort = client.sin_port;
|
||||
remoteIp = remoteIp6;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user