generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-01 02:56:56 +01:00
Code Issues Projects Releases Wiki Activity

Fix issues with SOCKS5 proxy connection

Browse Source 
Two issues where introduced by commit 12c4b55a:
- the proxy connection was done to the target address instead of
the proxy address
- on error the proxy connection status was not reset to unplugged
This commit is contained in:
Christophe Guillon 2019-06-10 14:32:20 +02:00
parent 9736f57f08
commit 42cfa697f2
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/socks_connecter.cpp
View File

@ -207,6 +207,7 @@ void zmq::socks_connecter_t::error ()
_choice_decoder.reset (); _choice_decoder.reset ();
_request_encoder.reset (); _request_encoder.reset ();
_response_decoder.reset (); _response_decoder.reset ();
_status = unplugged;
add_reconnect_timer (); add_reconnect_timer ();
} }
@ -215,29 +216,28 @@ int zmq::socks_connecter_t::connect_to_proxy ()
zmq_assert (_s == retired_fd); zmq_assert (_s == retired_fd);
// Resolve the address // Resolve the address
if (_addr->resolved.tcp_addr != NULL) { if (_proxy_addr->resolved.tcp_addr != NULL) {
LIBZMQ_DELETE (_addr->resolved.tcp_addr); LIBZMQ_DELETE (_proxy_addr->resolved.tcp_addr);
} }
_addr->resolved.tcp_addr = new (std::nothrow) tcp_address_t (); _proxy_addr->resolved.tcp_addr = new (std::nothrow) tcp_address_t ();
alloc_assert (_addr->resolved.tcp_addr); alloc_assert (_proxy_addr->resolved.tcp_addr);
// Automatic fallback to ipv4 is disabled here since this was the existing // Automatic fallback to ipv4 is disabled here since this was the existing
// behaviour, however I don't see a real reason for this. Maybe this can // behaviour, however I don't see a real reason for this. Maybe this can
// be changed to true (and then the parameter can be removed entirely). // be changed to true (and then the parameter can be removed entirely).
_s = tcp_open_socket (_addr->address.c_str (), options, false, false, _s = tcp_open_socket (_proxy_addr->address.c_str (), options, false, false,
_addr->resolved.tcp_addr); _proxy_addr->resolved.tcp_addr);
if (_s == retired_fd) { if (_s == retired_fd) {
// TODO we should emit some event in this case! // TODO we should emit some event in this case!
LIBZMQ_DELETE (_proxy_addr->resolved.tcp_addr);
LIBZMQ_DELETE (_addr->resolved.tcp_addr);
return -1; return -1;
} }
zmq_assert (_addr->resolved.tcp_addr != NULL); zmq_assert (_proxy_addr->resolved.tcp_addr != NULL);
// Set the socket to non-blocking mode so that we get async connect(). // Set the socket to non-blocking mode so that we get async connect().
unblock_socket (_s); unblock_socket (_s);
const tcp_address_t *const tcp_addr = _addr->resolved.tcp_addr; const tcp_address_t *const tcp_addr = _proxy_addr->resolved.tcp_addr;
int rc; int rc;