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

More fixes for ZMQ_LAST_ENDPOINT. Added a test

Browse Source
This commit is contained in:
Mikko Koppanen
2012-02-18 20:44:41 +00:00
parent b0573486c7
commit d00d4843be
7 changed files with 84 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/ipc_listener.cpp
View File

@@ -95,32 +95,34 @@ void zmq::ipc_listener_t::in_event ()
send_attach (session, engine, false);
}
int zmq::ipc_listener_t::get_address (std::string *addr_)
int zmq::ipc_listener_t::get_address (std::string &addr_)
{
struct sockaddr_un saddr;
struct sockaddr_storage ss;
int rc;
// Get the details of the IPC socket
socklen_t sl = sizeof(sockaddr_un);
rc = getsockname (s, (sockaddr *)&saddr, &sl);
socklen_t sl = sizeof (ss);
rc = getsockname (s, (sockaddr *) &ss, &sl);
if (rc != 0) {
return rc;
}
// Store the address for retrieval by users using wildcards
*addr_ = std::string("ipc://") + std::string(saddr.sun_path);
addr_ = std::string ("ipc://");
struct sockaddr_un saddr;
memcpy (&saddr, &ss, sizeof (saddr));
addr_.append (saddr.sun_path);
return 0;
}
int zmq::ipc_listener_t::set_address (const char *addr_)
{
// Allow wildcard file
if(*addr_ == '*') {
if (*addr_ == '*') {
addr_ = tempnam(NULL, NULL);
}
// Get rid of the file associated with the UNIX domain socket that
// may have been left behind by the previous run of the application.
::unlink (addr_);
@@ -148,8 +150,8 @@ int zmq::ipc_listener_t::set_address (const char *addr_)
rc = listen (s, options.backlog);
if (rc != 0)
return -1;
return 0;
return 0;
}
int zmq::ipc_listener_t::close ()