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

Fixed missing subscriptions on XPUB with manual subscriptions

Browse Source 
The patch fixes the issue #1568.
This commit is contained in:
David Jelenc
2015-09-05 14:59:52 +02:00
parent 47e1216e1e
commit 8fd71d631d
3 changed files with 128 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/xpub.cpp
View File

@@ -41,6 +41,7 @@ zmq::xpub_t::xpub_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
more (false),
lossy (true),
manual(false),
pending_pipes (),
welcome_msg ()
{
last_pipe = NULL;
@@ -90,7 +91,7 @@ void zmq::xpub_t::xread_activated (pipe_t *pipe_)
if (size > 0 && (*data == 0 || *data == 1)) {
if (manual)
{
last_pipe = pipe_;
pending_pipes.push_back(pipe_);
pending_data.push_back(blob_t(data, size));
pending_metadata.push_back(sub.metadata());
pending_flags.push_back(0);
@@ -243,6 +244,10 @@ int zmq::xpub_t::xrecv (msg_t *msg_)
return -1;
}
// User is reading a message, set last_pipe and remove it from the deque
last_pipe = pending_pipes.front ();
pending_pipes.pop_front ();
int rc = msg_->close ();
errno_assert (rc == 0);
rc = msg_->init_size (pending_data.front ().size ());
@@ -281,6 +286,7 @@ void zmq::xpub_t::send_unsubscription (unsigned char *data_, size_t size_,
if (size_ > 0)
memcpy (&unsub [1], data_, size_);
self->last_pipe = NULL;
self->pending_pipes.push_back (NULL);
self->pending_data.push_back (unsub);
self->pending_metadata.push_back (NULL);
self->pending_flags.push_back (0);