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

Problem: lingering subscriptions on XPUB sockets (#1566)

Browse Source 
The patch fixes lingering subscriptions that occur upon disconnection
on XPUB sockets with option XPUB_MANUAL when used in a XPUB-XSUB
proxies.
This commit is contained in:
David Jelenc
2015-09-05 12:07:50 +02:00
parent 9e8e81cf9a
commit dd35e1db0f
2 changed files with 160 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/xpub.cpp
View File

@@ -153,11 +153,17 @@ int zmq::xpub_t::xsetsockopt (int option_, const void *optval_,
manual = (*static_cast <const int*> (optval_) != 0);
}
else
if (option_ == ZMQ_SUBSCRIBE && manual && last_pipe != NULL)
subscriptions.add((unsigned char *)optval_, optvallen_, last_pipe);
if (option_ == ZMQ_SUBSCRIBE && manual) {
if (last_pipe != NULL) {
subscriptions.add((unsigned char *)optval_, optvallen_, last_pipe);
}
}
else
if (option_ == ZMQ_UNSUBSCRIBE && manual && last_pipe != NULL)
subscriptions.rm((unsigned char *)optval_, optvallen_, last_pipe);
if (option_ == ZMQ_UNSUBSCRIBE && manual) {
if (last_pipe != NULL) {
subscriptions.rm((unsigned char *)optval_, optvallen_, last_pipe);
}
}
else
if (option_ == ZMQ_XPUB_WELCOME_MSG) {
welcome_msg.close();
@@ -183,7 +189,7 @@ void zmq::xpub_t::xpipe_terminated (pipe_t *pipe_)
// Remove the pipe from the trie. If there are topics that nobody
// is interested in anymore, send corresponding unsubscriptions
// upstream.
subscriptions.rm (pipe_, send_unsubscription, this, !verbose_unsubs);
subscriptions.rm (pipe_, send_unsubscription, this, !(verbose_unsubs || manual));
dist.pipe_terminated (pipe_);
}
@@ -274,6 +280,7 @@ void zmq::xpub_t::send_unsubscription (unsigned char *data_, size_t size_,
unsub [0] = 0;
if (size_ > 0)
memcpy (&unsub [1], data_, size_);
self->last_pipe = NULL;
self->pending_data.push_back (unsub);
self->pending_metadata.push_back (NULL);
self->pending_flags.push_back (0);