[Git][NTPsec/ntpsec][master] Fix misleading error mesages from ./waf check

[Hal Murray]

Hal Murray pushed to branch master at NTPsec / ntpsec


Commits:
fecbe68c by Hal Murray at 2016-01-16T18:44:54-08:00
Fix misleading error mesages from ./waf check

- - - - -


4 changed files:

- tests/common/sockaddrtest.c
- tests/common/sockaddrtest.h
- tests/libntp/decodenetnum.c
- tests/libntp/socktoa.c


Changes:

=====================================
tests/common/sockaddrtest.c
=====================================
--- a/tests/common/sockaddrtest.c
+++ b/tests/common/sockaddrtest.c
@@ -35,6 +35,36 @@ bool IsEqualS(const sockaddr_u *expected, const sockaddr_u *actual) {
 	}
 }
 
+/* Similar to IsEqualS, but doesn't print misleading messages */
+bool IsDiffS(const sockaddr_u *expected, const sockaddr_u *actual) {
+	if (expected->sa.sa_family != actual->sa.sa_family) {
+		return true;
+	}
+
+	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_addr_t)) == 0) {
+			printf("IPv4 address matches: %u (%s)\n", expected->sa4.sin_addr.s_addr, socktoa(expected));
+			return false;
+		} else {
+			return true;
+		}
+	} 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(struct in6_addr)) == 0) {
+			printf("IPv6 address matches\n");
+			return false;
+		} else {
+			return true;
+		}
+	} else { // Unknown family
+		printf("Can't compare unknown address family\n");
+		return false;
+	}
+}
+
 sockaddr_u CreateSockaddr4(const char* address, unsigned int port) {
 	sockaddr_u s;
 	s.sa4.sin_family = AF_INET;


=====================================
tests/common/sockaddrtest.h
=====================================
--- a/tests/common/sockaddrtest.h
+++ b/tests/common/sockaddrtest.h
@@ -4,6 +4,7 @@
 #include "ntp.h"
 
 bool IsEqualS(const sockaddr_u *expected, const sockaddr_u *actual);
+bool IsDiffS(const sockaddr_u *expected, const sockaddr_u *actual);
 sockaddr_u CreateSockaddr4(const char* address, unsigned int port);
 
 


=====================================
tests/libntp/decodenetnum.c
=====================================
--- a/tests/libntp/decodenetnum.c
+++ b/tests/libntp/decodenetnum.c
@@ -99,7 +99,7 @@ TEST(decodenetnum, IllegalCharInPort) {
 	SET_PORT(&expected, NTP_PORT);
 
 	TEST_ASSERT_FALSE(decodenetnum(str, &actual));
-	TEST_ASSERT_FALSE(IsEqualS(&expected, &actual));
+	TEST_ASSERT_TRUE(IsDiffS(&expected, &actual));
 }
 
 TEST_GROUP_RUNNER(decodenetnum) {


=====================================
tests/libntp/socktoa.c
=====================================
--- a/tests/libntp/socktoa.c
+++ b/tests/libntp/socktoa.c
@@ -82,7 +82,7 @@ TEST(socktoa, HashNotEqual) {
 	sockaddr_u input1 = CreateSockaddr4("192.0.2.1", 123);
 	sockaddr_u input2 = CreateSockaddr4("192.0.2.2", 123);
 
-	TEST_ASSERT_FALSE(IsEqualS(&input1, &input2));
+	TEST_ASSERT_TRUE(IsDiffS(&input1, &input2));
 	TEST_ASSERT_NOT_EQUAL(sock_hash(&input1), sock_hash(&input2));
 }
 



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/fecbe68c35db3853ae06ba376e2ea03dee88e2ce
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20160117/22f0ee92/attachment.html>