generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-14 15:05:38 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #318 from shripchenko/master

Browse Source 
2nd try wuth sock->unbind() and sock->disconnect(). now with const char*'s argument
This commit is contained in:
Pieter Hintjens
2012-04-20 09:11:56 -07:00
parent d56b75219f 2eb6b32ef7
commit 653e5854ed
7 changed files with 56 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/socket_base.cpp
View File

@@ -319,9 +319,8 @@ int zmq::socket_base_t::bind (const char *addr_)
endpoint_t endpoint = {this, options};
int rc = register_endpoint (addr_, endpoint);
if (rc == 0) {
// Save last endpoint info
options.last_endpoint.clear ();
options.last_endpoint_id = NULL;
// Save last endpoint URI
options.last_endpoint.assign (addr_);
}
return rc;
}
@@ -350,11 +349,10 @@ int zmq::socket_base_t::bind (const char *addr_)
return -1;
}
// Save last endpoint info
options.last_endpoint_id = (void *) ((own_t *) listener);
// Save last endpoint URI
listener->get_address (options.last_endpoint);
launch_child (listener);
add_endpoint (addr_, (own_t *) listener);
return 0;
}
@@ -369,11 +367,10 @@ int zmq::socket_base_t::bind (const char *addr_)
return -1;
}
// Save last endpoint info
options.last_endpoint_id = (void *) ((own_t *) listener);
// Save last endpoint URI
listener->get_address (options.last_endpoint);
launch_child (listener);
add_endpoint (addr_, (own_t *) listener);
return 0;
}
#endif
@@ -464,9 +461,8 @@ int zmq::socket_base_t::connect (const char *addr_)
// increased here.
send_bind (peer.socket, pipes [1], false);
// Save last endpoint info
options.last_endpoint.clear ();
options.last_endpoint_id = NULL;
// Save last endpoint URI
options.last_endpoint.assign (addr_);
return 0;
}
@@ -528,13 +524,42 @@ int zmq::socket_base_t::connect (const char *addr_)
// Attach remote end of the pipe to the session object later on.
session->attach_pipe (pipes [1]);
// Save last endpoint info
// Save last endpoint URI
paddr->to_string (options.last_endpoint);
options.last_endpoint_id = (void *) ((own_t *) session);
add_endpoint (addr_, (own_t *) session);
return 0;
}
void zmq::socket_base_t::add_endpoint (const char *addr_, own_t *endpoint_)
{
// Activate the session. Make it a child of this socket.
launch_child (session);
launch_child (endpoint_);
endpoints.insert (std::make_pair (std::string (addr_), endpoint_));
}
int zmq::socket_base_t::term_endpoint (const char *addr_)
{
// Check whether the library haven't been shut down yet.
if (unlikely (ctx_terminated)) {
errno = ETERM;
return -1;
}
// Check whether message passed to the function is valid.
if (unlikely (!addr_)) {
errno = EINVAL;
return -1;
}
// Find the endpoints range (if any) corresponding to the addr_ string.
std::pair <endpoints_t::iterator, endpoints_t::iterator> range = endpoints.equal_range (std::string (addr_));
if (range.first == range.second)
return -1;
for (endpoints_t::iterator it = range.first; it != range.second; ++it)
term_child (it->second);
endpoints.erase (range.first, range.second);
return 0;
}
@@ -603,16 +628,6 @@ int zmq::socket_base_t::send (msg_t *msg_, int flags_)
return 0;
}
int zmq::socket_base_t::term_endpoint (void *ep_)
{
if (unlikely (ctx_terminated)) {
errno = ETERM;
return -1;
}
term_child ((own_t *) ep_);
return 0;
}
int zmq::socket_base_t::recv (msg_t *msg_, int flags_)
{
// Check whether the library haven't been shut down yet.