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

REQ: Unset reply_pipe if it terminates.

Browse Source 
* Fixes a terminate() call on a dangling pointer in the SEND_RESETS
  case.
* Fixes recv_reply_pipe() never receiving a message once the pipe it is
  waiting on is terminated.
This commit is contained in:
Christian Kamm
2013-07-29 09:33:10 +02:00
parent a0cc87a9d9
commit f5c59556bd
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/req.cpp
View File

@@ -193,7 +193,7 @@ bool zmq::req_t::xhas_out ()
return dealer_t::xhas_out (); return dealer_t::xhas_out ();
} }
int zmq::req_t::xsetsockopt(int option_, const void *optval_, size_t optvallen_) int zmq::req_t::xsetsockopt (int option_, const void *optval_, size_t optvallen_)
{ {
bool is_int = (optvallen_ == sizeof (int)); bool is_int = (optvallen_ == sizeof (int));
int value = is_int? *((int *) optval_): 0; int value = is_int? *((int *) optval_): 0;
@@ -216,17 +216,24 @@ int zmq::req_t::xsetsockopt(int option_, const void *optval_, size_t optvallen_)
break; break;
} }
return dealer_t::xsetsockopt(option_, optval_, optvallen_); return dealer_t::xsetsockopt (option_, optval_, optvallen_);
}
void zmq::req_t::xpipe_terminated (pipe_t *pipe_)
{
if (reply_pipe == pipe_)
reply_pipe = NULL;
dealer_t::xpipe_terminated (pipe_);
} }
int zmq::req_t::recv_reply_pipe (msg_t *msg_) int zmq::req_t::recv_reply_pipe (msg_t *msg_)
{ {
while (true) { while (true) {
pipe_t *pipe = NULL; pipe_t *pipe = NULL;
int rc = dealer_t::recvpipe(msg_, &pipe); int rc = dealer_t::recvpipe (msg_, &pipe);
if (rc != 0) if (rc != 0)
return rc; return rc;
if (pipe == reply_pipe) if (!reply_pipe || pipe == reply_pipe)
return 0; return 0;
} }
} }

1
src/req.hpp
View File

@@ -44,6 +44,7 @@ namespace zmq
bool xhas_in (); bool xhas_in ();
bool xhas_out (); bool xhas_out ();
int xsetsockopt (int option_, const void *optval_, size_t optvallen_); int xsetsockopt (int option_, const void *optval_, size_t optvallen_);
void xpipe_terminated (zmq::pipe_t *pipe_);
protected: protected: