asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6936 from Faless/udp_ntohs

Browse source 
Fix PacketPeerUDP get_packet_port()
This commit is contained in:
Rémi Verschelde 2016-10-27 09:34:30 +02:00 committed by GitHub
commit 6f09841e24
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/unix/packet_peer_udp_posix.cpp
View file

@ -168,7 +168,7 @@ Error PacketPeerUDPPosix::_poll(bool p_wait) {
rb.write(&type, 1); rb.write(&type, 1);
struct sockaddr_in* sin_from = (struct sockaddr_in*)&from; struct sockaddr_in* sin_from = (struct sockaddr_in*)&from;
rb.write((uint8_t*)&sin_from->sin_addr, 4); rb.write((uint8_t*)&sin_from->sin_addr, 4);
port = sin_from->sin_port; port = ntohs(sin_from->sin_port);
} else if (from.ss_family == AF_INET6) { } else if (from.ss_family == AF_INET6) {
@ -178,7 +178,7 @@ Error PacketPeerUDPPosix::_poll(bool p_wait) {
struct sockaddr_in6* s6_from = (struct sockaddr_in6*)&from; struct sockaddr_in6* s6_from = (struct sockaddr_in6*)&from;
rb.write((uint8_t*)&s6_from->sin6_addr, 16); rb.write((uint8_t*)&s6_from->sin6_addr, 16);
port = s6_from->sin6_port; port = ntohs(s6_from->sin6_port);
} else { } else {
// WARN_PRINT("Ignoring packet with unknown address family"); // WARN_PRINT("Ignoring packet with unknown address family");

4
platform/windows/packet_peer_udp_winsock.cpp
View file

@ -166,7 +166,7 @@ Error PacketPeerUDPWinsock::_poll(bool p_wait) {
rb.write(&type, 1); rb.write(&type, 1);
struct sockaddr_in* sin_from = (struct sockaddr_in*)&from; struct sockaddr_in* sin_from = (struct sockaddr_in*)&from;
rb.write((uint8_t*)&sin_from->sin_addr, 4); rb.write((uint8_t*)&sin_from->sin_addr, 4);
port = sin_from->sin_port; port = ntohs(sin_from->sin_port);
} else if (from.ss_family == AF_INET6) { } else if (from.ss_family == AF_INET6) {
@ -176,7 +176,7 @@ Error PacketPeerUDPWinsock::_poll(bool p_wait) {
struct sockaddr_in6* s6_from = (struct sockaddr_in6*)&from; struct sockaddr_in6* s6_from = (struct sockaddr_in6*)&from;
rb.write((uint8_t*)&s6_from->sin6_addr, 16); rb.write((uint8_t*)&s6_from->sin6_addr, 16);
port = s6_from->sin6_port; port = ntohs(s6_from->sin6_port);
} else { } else {
// WARN_PRINT("Ignoring packet with unknown address family"); // WARN_PRINT("Ignoring packet with unknown address family");