Date: Thursday, December 21, 2006 @ 20:26:28
Author: marc
Path: /cvsroot/carob/carob/src
Modified: SocketAddress.cpp (1.2 -> 1.3)
Fixed port endianness in printer (missing htons)
-------------------+
SocketAddress.cpp | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
Index: carob/src/SocketAddress.cpp
diff -u carob/src/SocketAddress.cpp:1.2 carob/src/SocketAddress.cpp:1.3
--- carob/src/SocketAddress.cpp:1.2 Thu Dec 21 19:56:26 2006
+++ carob/src/SocketAddress.cpp Thu Dec 21 20:26:28 2006
@@ -22,7 +22,7 @@
#ifdef __MINGW32__
#include <ws2tcpip.h>
#else
- #include <netinet/in.h> // in_port_t
+ #include <netinet/in.h> // in_port_t, ntohs
#endif
@@ -142,7 +142,7 @@
{
const sockaddr_in& inet4addr(reinterpret_cast<const
sockaddr_in&>(sock));
winet_ntop_or_error(oss, inet4addr.sin_family, & inet4addr.sin_addr);
- oss << L":" << inet4addr.sin_port;
+ oss << L":" << ntohs(inet4addr.sin_port);
}
break;
@@ -151,7 +151,7 @@
const sockaddr_in6& inet6addr(reinterpret_cast<const
sockaddr_in6&>(sock));
oss << L"[";
winet_ntop_or_error(oss, inet6addr.sin6_family, & inet6addr.sin6_addr);
- oss << L"]:" << inet6addr.sin6_port;
+ oss << L"]:" << ntohs(inet6addr.sin6_port);
}
break;
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits