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

Merge pull request #321 from shripchenko/master

Browse Source 
add process_commands() to the beginning of zmq_connect() and zmq_bind()
This commit is contained in:
Pieter Hintjens 2012-04-21 16:06:06 -07:00
commit c120f02dc9
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/socket_base.cpp
View File

@ -304,10 +304,15 @@ int zmq::socket_base_t::bind (const char *addr_)
return -1; return -1;
} }
// Process pending commands, if any.
int rc = process_commands (0, false);
if (unlikely (rc != 0))
return -1;
// Parse addr_ string. // Parse addr_ string.
std::string protocol; std::string protocol;
std::string address; std::string address;
int rc = parse_uri (addr_, protocol, address); rc = parse_uri (addr_, protocol, address);
if (rc != 0) if (rc != 0)
return -1; return -1;
@ -386,10 +391,15 @@ int zmq::socket_base_t::connect (const char *addr_)
return -1; return -1;
} }
// Process pending commands, if any.
int rc = process_commands (0, false);
if (unlikely (rc != 0))
return -1;
// Parse addr_ string. // Parse addr_ string.
std::string protocol; std::string protocol;
std::string address; std::string address;
int rc = parse_uri (addr_, protocol, address); rc = parse_uri (addr_, protocol, address);
if (rc != 0) if (rc != 0)
return -1; return -1;