sockaddrtest.h:

  fully converted some tricky cout to printf (af_inet, sockaddr etc.)

bk: 5597a6e8VVTHvg9BuR42ZcUWN6O_Zg

diff --git a/tests/libntp/sockaddrtest.h b/tests/libntp/sockaddrtest.h
index f9a9fde41ee8f94a8f095d288c8fa5252035163e..eb1a3b5093162bd7aaeb61487902cb065dd35f4d 100644 (file)
--- a/tests/libntp/sockaddrtest.h
+++ b/tests/libntp/sockaddrtest.h
@@ -18,8 +18,7 @@ int IsEqual(const sockaddr_u expected, const sockaddr_u actual) {
        struct in6_addr in6;
 
        if (expected.sa.sa_family != actual.sa.sa_family) {
-               //<< "Expected sa_family: " << expected.sa.sa_family
-               //<< " but got: " << actual.sa.sa_family;
+               printf("Expected sa_family: %d but got: %d", expected.sa.sa_family, actual.sa.sa_family);
                return FALSE;
        }
 
@@ -29,10 +28,7 @@ int IsEqual(const sockaddr_u expected, const sockaddr_u actual) {
                                   sizeof( in )) == 0) {
                        return TRUE;
                } else {
-                       //<< "IPv4 comparision failed, expected: "
-                       //<< expected.sa4.sin_addr.s_addr
-                       //<< "(" << socktoa(&expected) << ") but was: "
-                       //<< actual.sa4.sin_addr.s_addr "(" << socktoa(&actual) << ")";
+                       printf("IPv4 comparision failed, expected: %s(%s) but was: %s(%s)",inet_ntoa(expected.sa4.sin_addr), socktoa(&expected), inet_ntoa(actual.sa4.sin_addr),socktoa(&actual));
                        return FALSE;
                }
        } else if (actual.sa.sa_family == AF_INET6) { //IPv6
@@ -45,7 +41,7 @@ int IsEqual(const sockaddr_u expected, const sockaddr_u actual) {
                        return FALSE;
                }
        } else { // Unknown family
-               printf("Unknown sa_family: ");// << actual.sa.sa_family;
+               printf("Unknown sa_family: %d",actual.sa.sa_family);
                return FALSE;
        }
 }