summaryrefslogtreecommitdiffstats
path: root/contrib/ntp/tests/libntp/sockaddrtest.h
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/ntp/tests/libntp/sockaddrtest.h')
-rw-r--r--contrib/ntp/tests/libntp/sockaddrtest.h50
1 files changed, 3 insertions, 47 deletions
diff --git a/contrib/ntp/tests/libntp/sockaddrtest.h b/contrib/ntp/tests/libntp/sockaddrtest.h
index f9a9fde..8450fb6 100644
--- a/contrib/ntp/tests/libntp/sockaddrtest.h
+++ b/contrib/ntp/tests/libntp/sockaddrtest.h
@@ -1,57 +1,13 @@
#ifndef TESTS_SOCKADDRTEST_H
#define TESTS_SOCKADDRTEST_H
+#include "config.h"
#include "ntp.h"
#include "ntp_stdlib.h"
-sockaddr_u CreateSockaddr4(const char* address, unsigned int port) {
- sockaddr_u s;
- s.sa4.sin_family = AF_INET;
- s.sa4.sin_addr.s_addr = inet_addr(address);
- SET_PORT(&s, port);
- return s;
-}
-
-int IsEqual(const sockaddr_u expected, const sockaddr_u actual) {
- struct in_addr in;
- 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;
- return FALSE;
- }
-
- if (actual.sa.sa_family == AF_INET) { // IPv4
- if (expected.sa4.sin_port == actual.sa4.sin_port &&
- memcmp(&expected.sa4.sin_addr, &actual.sa4.sin_addr,
- 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) << ")";
- return FALSE;
- }
- } else if (actual.sa.sa_family == AF_INET6) { //IPv6
- if (expected.sa6.sin6_port == actual.sa6.sin6_port &&
- memcmp(&expected.sa6.sin6_addr, &actual.sa6.sin6_addr,
- sizeof(in6)) == 0) {
- return TRUE;
- } else {
- printf("IPv6 comparision failed");
- return FALSE;
- }
- } else { // Unknown family
- printf("Unknown sa_family: ");// << actual.sa.sa_family;
- return FALSE;
- }
-}
+sockaddr_u CreateSockaddr4(const char* address, unsigned int port);
+int IsEqual(const sockaddr_u expected, const sockaddr_u actual);
#endif // TESTS_SOCKADDRTEST_H
-
-
-
OpenPOWER on IntegriCloud