generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-13 22:50:19 +02:00
Code Issues Projects Releases Wiki Activity

Problem: code duplication in session_base_t::start_connecting

Browse Source 
Solution: extract common code
This commit is contained in:
Simon Giesecke
2018-08-15 13:37:55 +02:00
parent 799fae44fe
commit 2cd34da1b0
1 changed files with 17 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/session_base.cpp
View File

@@ -560,46 +560,44 @@ void zmq::session_base_t::start_connecting (bool wait_)
zmq_assert (io_thread); zmq_assert (io_thread);
// Create the connecter object. // Create the connecter object.
own_t *connecter = NULL;
if (_addr->protocol == protocol_name::tcp) { if (_addr->protocol == protocol_name::tcp) {
if (!options.socks_proxy_address.empty ()) { if (!options.socks_proxy_address.empty ()) {
address_t *proxy_address = new (std::nothrow) address_t *proxy_address = new (std::nothrow)
address_t (protocol_name::tcp, options.socks_proxy_address, address_t (protocol_name::tcp, options.socks_proxy_address,
this->get_ctx ()); this->get_ctx ());
alloc_assert (proxy_address); alloc_assert (proxy_address);
socks_connecter_t *connecter = new (std::nothrow) connecter = new (std::nothrow) socks_connecter_t (
socks_connecter_t (io_thread, this, options, _addr, proxy_address, io_thread, this, options, _addr, proxy_address, wait_);
wait_);
alloc_assert (connecter);
launch_child (connecter);
} else { } else {
tcp_connecter_t *connecter = new (std::nothrow) connecter = new (std::nothrow)
tcp_connecter_t (io_thread, this, options, _addr, wait_); tcp_connecter_t (io_thread, this, options, _addr, wait_);
alloc_assert (connecter);
launch_child (connecter);
} }
return;
} }
#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS \ #if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS \
&& !defined ZMQ_HAVE_VXWORKS && !defined ZMQ_HAVE_VXWORKS
if (_addr->protocol == protocol_name::ipc) { else if (_addr->protocol == protocol_name::ipc) {
ipc_connecter_t *connecter = new (std::nothrow) connecter = new (std::nothrow)
ipc_connecter_t (io_thread, this, options, _addr, wait_); ipc_connecter_t (io_thread, this, options, _addr, wait_);
alloc_assert (connecter);
launch_child (connecter);
return;
} }
#endif #endif
#if defined ZMQ_HAVE_TIPC #if defined ZMQ_HAVE_TIPC
if (_addr->protocol == protocol_name::tipc) { else if (_addr->protocol == protocol_name::tipc) {
tipc_connecter_t *connecter = new (std::nothrow) connecter = new (std::nothrow)
tipc_connecter_t (io_thread, this, options, _addr, wait_); tipc_connecter_t (io_thread, this, options, _addr, wait_);
}
#endif
#if defined ZMQ_HAVE_VMCI
else if (_addr->protocol == protocol_name::vmci) {
connecter = new (std::nothrow)
vmci_connecter_t (io_thread, this, options, _addr, wait_);
}
#endif
if (connecter != NULL) {
alloc_assert (connecter); alloc_assert (connecter);
launch_child (connecter); launch_child (connecter);
return; return;
} }
#endif
if (_addr->protocol == protocol_name::udp) { if (_addr->protocol == protocol_name::udp) {
zmq_assert (options.type == ZMQ_DISH || options.type == ZMQ_RADIO zmq_assert (options.type == ZMQ_DISH || options.type == ZMQ_RADIO
@@ -702,15 +700,5 @@ void zmq::session_base_t::start_connecting (bool wait_)
} }
#endif // ZMQ_HAVE_NORM #endif // ZMQ_HAVE_NORM
#if defined ZMQ_HAVE_VMCI
if (_addr->protocol == protocol_name::vmci) {
vmci_connecter_t *connecter = new (std::nothrow)
vmci_connecter_t (io_thread, this, options, _addr, wait_);
alloc_assert (connecter);
launch_child (connecter);
return;
}
#endif
zmq_assert (false); zmq_assert (false);
} }