From 410d3bb916c50cc7d8b609995278a30825981b3b Mon Sep 17 00:00:00 2001 From: William Brown Date: Jan 08 2019 03:55:55 +0000 Subject: Ticket 50128 - NS Stress fails without ipv6 Bug Description: Docker for osx doesn't support ipv6, which means that in ipv4 only environments this test fails. We aren't trying to test ipv4/ipv6 here, only that NS handles load, so swapping to ipv4 is not a change to the test Fix Description: Change the PR_AF_INET6 to PR_AF_INET https://pagure.io/389-ds-base/issue/50128 Author: William Brown Review by: ??? --- diff --git a/src/nunc-stans/test/test_nuncstans_stress_core.c b/src/nunc-stans/test/test_nuncstans_stress_core.c index ae6c4a3..0b84540 100644 --- a/src/nunc-stans/test/test_nuncstans_stress_core.c +++ b/src/nunc-stans/test/test_nuncstans_stress_core.c @@ -352,7 +352,7 @@ client_initiate_connection_cb(struct ns_job_t *job) PRNetAddr netaddr = {{0}}; char *data = "this is a test!\n"; - sock = PR_OpenTCPSocket(PR_AF_INET6); + sock = PR_OpenTCPSocket(PR_AF_INET); if (sock == NULL) { char *err = NULL; PR_GetErrorText(err); @@ -361,7 +361,7 @@ client_initiate_connection_cb(struct ns_job_t *job) goto done; } - PR_SetNetAddr(PR_IpAddrLoopback, PR_AF_INET6, 12345, &netaddr); + PR_SetNetAddr(PR_IpAddrLoopback, PR_AF_INET, 12345, &netaddr); /* Connect */ /* */ @@ -459,7 +459,7 @@ ns_stress_test(void **state) PRNetAddr netaddr; PRSocketOptionData prsod = {PR_SockOpt_Nonblocking, {PR_TRUE}}; - PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, 12345, &netaddr); + PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET, 12345, &netaddr); listenfd = PR_OpenTCPSocket(PR_NetAddrFamily(&netaddr)); PR_SetSocketOption(listenfd, &prsod);