854dc63198cb3c704ddd48a95cd75019d79ff961 galt Tue Aug 6 12:56:55 2019 -0700 feedback from code review diff --git src/lib/net.c src/lib/net.c index db0b56a..268ae00 100644 --- src/lib/net.c +++ src/lib/net.c @@ -204,41 +204,42 @@ } if (!internetGetAddrInfo6n4(hostName, portStr, &addressList)) return -1; struct dyString *errMsg = newDyString(256); for (address = addressList; address; address = address->ai_next) { if ((sd = netStreamSocketFromAddrInfo(address)) < 0) continue; if (netConnectWithTimeoutOneAddr(sd, address, msTimeout, hostName, port, errMsg) == 0) break; close(sd); } +boolean connected = (address != NULL); // one of the addresses connected successfully freeaddrinfo(addressList); -if (!address) // none of the addresses connected successfully +if (!connected) { if (!sameString(errMsg->string, "")) { warn("%s", errMsg->string); } } dyStringFree(&errMsg); -if (!address) +if (!connected) return -1; // Set to blocking mode again if (setSocketNonBlocking(sd, FALSE) < 0) { close(sd); return -1; } if (setReadWriteTimeouts(sd, DEFAULTREADWRITETTIMEOUTSEC) < 0) { close(sd); return -1; }