From a3da53d5e37dcb9186100a81c7bff89bcf425802 Mon Sep 17 00:00:00 2001 From: Olaf Bergmann Date: Wed, 14 Feb 2018 16:00:24 +0100 Subject: [PATCH] tests: use IPv4 in unit tests for robustness As unit tests with IPv6 addresses keep failing on docker-based travis CI, this changes reverts to IPv4 usage in following files: test_wellknown.c test_sendqueue.c --- tests/test_sendqueue.c | 10 +++++----- tests/test_wellknown.c | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/test_sendqueue.c b/tests/test_sendqueue.c index 37630676..ea572815 100644 --- a/tests/test_sendqueue.c +++ b/tests/test_sendqueue.c @@ -277,14 +277,14 @@ t_sendqueue_tests_create(void) { coap_address_t addr; coap_address_init(&addr); - addr.size = sizeof(struct sockaddr_in6); - addr.addr.sin6.sin6_family = AF_INET6; - addr.addr.sin6.sin6_addr = in6addr_any; - addr.addr.sin6.sin6_port = htons(COAP_DEFAULT_PORT); + addr.size = sizeof(struct sockaddr_in); + addr.addr.sin.sin_family = AF_INET; + addr.addr.sin.sin_addr.s_addr = htonl(INADDR_ANY); + addr.addr.sin.sin_port = htons(COAP_DEFAULT_PORT); ctx = coap_new_context(&addr); - addr.addr.sin6.sin6_addr = in6addr_loopback; + addr.addr.sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); session = coap_new_client_session(ctx, NULL, &addr, COAP_PROTO_UDP); coap_ticks(×tamp[0]); diff --git a/tests/test_wellknown.c b/tests/test_wellknown.c index 9afc3f72..7d3f52bc 100644 --- a/tests/test_wellknown.c +++ b/tests/test_wellknown.c @@ -254,14 +254,14 @@ t_wkc_tests_create(void) { coap_address_init(&addr); - addr.size = sizeof(struct sockaddr_in6); - addr.addr.sin6.sin6_family = AF_INET6; - addr.addr.sin6.sin6_addr = in6addr_any; - addr.addr.sin6.sin6_port = htons(COAP_DEFAULT_PORT); + addr.size = sizeof(struct sockaddr_in); + addr.addr.sin.sin_family = AF_INET; + addr.addr.sin.sin_addr.s_addr = htonl(INADDR_ANY); + addr.addr.sin.sin_port = htons(COAP_DEFAULT_PORT); ctx = coap_new_context(&addr); - addr.addr.sin6.sin6_addr = in6addr_loopback; + addr.addr.sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); session = coap_new_client_session(ctx, NULL, &addr, COAP_PROTO_UDP); pdu = coap_pdu_init(0, 0, 0, TEST_PDU_SIZE);