From 7198cd81e1db3c92f99a7079e7820a6cdc51c40a Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Fri, 26 Jun 2020 21:46:42 +0200 Subject: Do not do anything when unsubscribing an id that isn't in the subscription list. --- src/connectionhandler.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/connectionhandler.cc') diff --git a/src/connectionhandler.cc b/src/connectionhandler.cc index 26cce46..8b48c03 100644 --- a/src/connectionhandler.cc +++ b/src/connectionhandler.cc @@ -80,9 +80,16 @@ void ConnectionHandler::subscribe(clientid_t clientid, nodeid_t nodeid) DEBUG(conn, "Added subscriber of %d\n", (int)nodeid); } -void ConnectionHandler::unsubscribe(clientid_t clientid, nodeid_t nodeid) +bool ConnectionHandler::unsubscribe(clientid_t clientid, nodeid_t nodeid) { + if(connlist[clientid].find(nodeid) == connlist[clientid].end()) + { + // Trying to unsubscribe from a node that is not subscribed. + return false; + } + connlist[clientid].erase(nodeid); + return true; } SubscriberList ConnectionHandler::subscriberlist(NodeIdList nodes) -- cgit v1.2.3