generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-30 05:29:43 +01:00
Code Issues Projects Releases Wiki Activity

fix overwriting errno on bind failure

Browse Source 
Signed-off-by: Dhammika Pathirana <dhammika@gmail.com>
This commit is contained in:
Dhammika Pathirana
2010-12-13 14:18:47 +01:00
committed by Martin Sustrik
parent a9d969a73e
commit 22b2b9a2b6
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/tcp_listener.cpp
View File

@@ -30,6 +30,7 @@
#ifdef ZMQ_HAVE_WINDOWS #ifdef ZMQ_HAVE_WINDOWS
zmq::tcp_listener_t::tcp_listener_t () : zmq::tcp_listener_t::tcp_listener_t () :
has_file (false),
s (retired_fd) s (retired_fd)
{ {
memset (&addr, 0, sizeof (addr)); memset (&addr, 0, sizeof (addr));
@@ -151,6 +152,7 @@ zmq::fd_t zmq::tcp_listener_t::accept ()
#endif #endif
zmq::tcp_listener_t::tcp_listener_t () : zmq::tcp_listener_t::tcp_listener_t () :
has_file (false),
s (retired_fd) s (retired_fd)
{ {
memset (&addr, 0, sizeof (addr)); memset (&addr, 0, sizeof (addr));
@@ -236,11 +238,12 @@ int zmq::tcp_listener_t::set_address (const char *protocol_, const char *addr_,
errno_assert (rc != -1); errno_assert (rc != -1);
// Bind the socket to the file path. // Bind the socket to the file path.
rc = bind (s, (struct sockaddr*) &addr, sizeof (sockaddr_un)); rc = bind (s, (struct sockaddr*) &addr, addr_len);
if (rc != 0) { if (rc != 0) {
close (); close ();
return -1; return -1;
} }
has_file = true;
// Listen for incomming connections. // Listen for incomming connections.
rc = listen (s, backlog_); rc = listen (s, backlog_);
@@ -270,7 +273,7 @@ int zmq::tcp_listener_t::close ()
// If there's an underlying UNIX domain socket, get rid of the file it // If there's an underlying UNIX domain socket, get rid of the file it
// is associated with. // is associated with.
struct sockaddr_un *su = (struct sockaddr_un*) &addr; struct sockaddr_un *su = (struct sockaddr_un*) &addr;
if (AF_UNIX == su->sun_family) { if (AF_UNIX == su->sun_family && has_file) {
rc = ::unlink(su->sun_path); rc = ::unlink(su->sun_path);
if (rc != 0) if (rc != 0)
return -1; return -1;

3
src/tcp_listener.hpp
View File

@@ -57,6 +57,9 @@ namespace zmq
sockaddr_storage addr; sockaddr_storage addr;
socklen_t addr_len; socklen_t addr_len;
// True, if the undelying file for UNIX domain socket exists.
bool has_file;
// Underlying socket. // Underlying socket.
fd_t s; fd_t s;