PROTON-1601: Windows proactor connections to "::" and "0.0.0.0", fix as per comment by Andrew Stitcher, reflect change in test
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/00dda181 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/00dda181 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/00dda181 Branch: refs/heads/go1 Commit: 00dda18194d0640a2adfe0c5eb27b0807d4f0acb Parents: 8d22ffb Author: Clifford Jansen <cliffjan...@apache.org> Authored: Tue Oct 10 17:08:03 2017 -0700 Committer: Clifford Jansen <cliffjan...@apache.org> Committed: Tue Oct 10 17:08:03 2017 -0700 ---------------------------------------------------------------------- proton-c/src/proactor/win_iocp.c | 14 +------------- proton-c/src/tests/proactor.c | 2 +- 2 files changed, 2 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/00dda181/proton-c/src/proactor/win_iocp.c ---------------------------------------------------------------------- diff --git a/proton-c/src/proactor/win_iocp.c b/proton-c/src/proactor/win_iocp.c index 0b78075..9a27ae6 100644 --- a/proton-c/src/proactor/win_iocp.c +++ b/proton-c/src/proactor/win_iocp.c @@ -2727,19 +2727,7 @@ void pn_proactor_connect(pn_proactor_t *p, pn_connection_t *c, const char *addr) proactor_add(&pc->context); pn_connection_open(pc->driver.connection); /* Auto-open */ - const char *host = pc->psocket.host; - if (host) { - static const char *ipv4loopback = "127.0.0.1"; - static const char *ipv6loopback = "::1"; - // Convert "0.0.0.0" or "::" to loopback on Windows for outgoing sockets. - // This approximates posix behavior for the unspecified address. - if (!strcmp("0.0.0.0", host)) - host = ipv4loopback; - else if (!strcmp("::", host)) - host = ipv6loopback; - } - - if (!pgetaddrinfo(host, pc->psocket.port, 0, &pc->addrinfo)) { + if (!pgetaddrinfo(pc->psocket.host, pc->psocket.port, 0, &pc->addrinfo)) { pc->ai = pc->addrinfo; if (connect_step(pc)) { return; http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/00dda181/proton-c/src/tests/proactor.c ---------------------------------------------------------------------- diff --git a/proton-c/src/tests/proactor.c b/proton-c/src/tests/proactor.c index 9e3b8db..2a71f6f 100644 --- a/proton-c/src/tests/proactor.c +++ b/proton-c/src/tests/proactor.c @@ -703,7 +703,7 @@ static void test_ipv4_ipv6(test_t *t) { EXPECT_CONNECT(l.port, ""); /* local->all */ if (has_ipv6) { - EXPECT_CONNECT(l6.port, "::"); /* v6->v6 */ + EXPECT_CONNECT(l6.port, "::1"); /* v6->v6 */ EXPECT_CONNECT(l6.port, ""); /* local->v6 */ EXPECT_CONNECT(l.port, "::1"); /* v6->all */ --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
