Merge pull request #1640 from dkruempe/v1.x

tcp_client.h bugfix for macOS and add tcp example
pull/1645/head
Gabi Melman 5 years ago committed by GitHub
commit 83b40b8cda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -75,7 +75,11 @@ public:
int last_errno = 0; int last_errno = 0;
for (auto *rp = addrinfo_result; rp != nullptr; rp = rp->ai_next) for (auto *rp = addrinfo_result; rp != nullptr; rp = rp->ai_next)
{ {
int const flags = SOCK_CLOEXEC; #if defined(SOCK_CLOEXEC)
const int flags = SOCK_CLOEXEC;
#else
const int flags = 0;
#endif
socket_ = ::socket(rp->ai_family, rp->ai_socktype | flags, rp->ai_protocol); socket_ = ::socket(rp->ai_family, rp->ai_socktype | flags, rp->ai_protocol);
if (socket_ == -1) if (socket_ == -1)
{ {
@ -87,12 +91,9 @@ public:
{ {
break; break;
} }
else last_errno = errno;
{ ::close(socket_);
last_errno = errno; socket_ = -1;
::close(socket_);
socket_ = -1;
}
} }
::freeaddrinfo(addrinfo_result); ::freeaddrinfo(addrinfo_result);
if (socket_ == -1) if (socket_ == -1)

Loading…
Cancel
Save