generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-27 11:06:52 +01:00
Code Issues Projects Releases Wiki Activity

Problem: socks_connecter_t duplicates code around opening and configuring a TCP socket

Browse Source 
Solution: use tcp_open_socket function
This commit is contained in:
Simon Giesecke
2019-02-04 07:58:56 -05:00
parent 68d520ef68
commit 2f7a450294
5 changed files with 22 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/tcp.cpp
View File

@@ -385,6 +385,7 @@ void zmq::tcp_tune_loopback_fast_path (const fd_t socket_)
zmq::fd_t zmq::tcp_open_socket (const char *address_,
const zmq::options_t &options_,
bool fallback_to_ipv4_,
zmq::tcp_address_t *out_tcp_addr_)
{
// Convert the textual address into address structure.
@@ -396,8 +397,9 @@ zmq::fd_t zmq::tcp_open_socket (const char *address_,
fd_t s = open_socket (out_tcp_addr_->family (), SOCK_STREAM, IPPROTO_TCP);
// IPv6 address family not supported, try automatic downgrade to IPv4.
if (s == retired_fd && out_tcp_addr_->family () == AF_INET6
&& errno == EAFNOSUPPORT && options_.ipv6) {
if (s == retired_fd && fallback_to_ipv4_
&& out_tcp_addr_->family () == AF_INET6 && errno == EAFNOSUPPORT
&& options_.ipv6) {
rc = out_tcp_addr_->resolve (address_, false, false);
if (rc != 0) {
return retired_fd;