Merge branch 'Opendirect_rawdata' of github.com:gururaajar/rbus into …

…Opendirect_rawdata
rdkcentral · Nov 21, 2023 · cbe4779 · cbe4779
2 parents c2ad9fa + 280e5c5
commit cbe4779
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/src/core/rbuscore.c b/src/core/rbuscore.c
@@ -957,7 +957,7 @@ rbusCoreError_t rbus_unregisterObj(const char * object_name)
         return RBUSCORE_ERROR_INVALID_PARAM;
     }
 
-    err = rtConnection_RemoveListener(g_connection, RBUS_REGISTER_OBJECT_EXPRESSION_ID);
+    err = rtConnection_RemoveListener(g_connection, object_name, RBUS_REGISTER_OBJECT_EXPRESSION_ID);
     if(RT_OK != err)
     {
         RBUSCORELOG_ERROR("rtConnection_RemoveListener %s failed: Err=%d", object_name, err);
@@ -1718,7 +1718,7 @@ rbusCoreError_t rbus_unregisterClientDisconnectHandler()
     lock();
     if(g_advisory_listener_installed)
     {
-        rtConnection_RemoveListener(g_connection, RBUS_ADVISORY_EXPRESSION_ID);
+        rtConnection_RemoveListener(g_connection, RTMSG_ADVISORY_TOPIC, RBUS_ADVISORY_EXPRESSION_ID);
         g_advisory_listener_installed = false;
     }
     unlock();

diff --git a/src/rbus/rbus_message.c b/src/rbus/rbus_message.c
@@ -207,7 +207,7 @@ rbusError_t rbusMessage_RemovePrivateListener(
     RBUS_MESSAGE_MUTEX_LOCK();
     rtVector_RemoveItemByCompare(handle->messageCallbacks, rawDataTopic, compareContextExpression, cleanupContext);
 
-    rtError e = rtConnection_RemoveListener(myConn, subscriptionId);
+    rtError e = rtConnection_RemoveListener(myConn, rawDataTopic, subscriptionId);
     RBUS_MESSAGE_MUTEX_UNLOCK();
     if (e != RT_OK)
     {
@@ -229,7 +229,7 @@ rbusError_t rbusMessage_RemoveListener(
     RBUS_MESSAGE_MUTEX_LOCK();
     rtVector_RemoveItemByCompare(handle->messageCallbacks, expression, compareContextExpression, cleanupContext);
 
-    rtError e = rtConnection_RemoveListener(con, subscriptionId);
+    rtError e = rtConnection_RemoveListener(con, expression, subscriptionId);
     RBUS_MESSAGE_MUTEX_UNLOCK();
     if (e != RT_OK)
     {
@@ -252,7 +252,7 @@ rbusError_t rbusMessage_RemoveAllListeners(
     {
         rbusMessageHandlerContext_t* ctx = rtVector_At(handle->messageCallbacks, i);
         VERIFY_NULL(ctx);
-        rtError e = rtConnection_RemoveListener(con, ctx->subscriptionId);
+        rtError e = rtConnection_RemoveListener(con, ctx->expression, ctx->subscriptionId);
         if (e != RT_OK)
         {
             RBUSLOG_WARN("rbusMessage_RemoveAllListener %s :%s", ctx->expression, rtStrError(e));

diff --git a/src/rtmessage/rtConnection.c b/src/rtmessage/rtConnection.c
@@ -1264,11 +1264,10 @@ rtConnection_AddListener(rtConnection con, char const* expression, uint32_t expr
 }
 
 rtError
-rtConnection_RemoveListener(rtConnection con, uint32_t expressionId)
+rtConnection_RemoveListener(rtConnection con, char const* expression, uint32_t expressionId)
 {
   int i;
   int route_id = 0;
-  char expression[RTMSG_HEADER_MAX_TOPIC_LENGTH] = {0};
 
   if (!con)
     return rtErrorFromErrno(EINVAL);
@@ -1278,7 +1277,6 @@ rtConnection_RemoveListener(rtConnection con, uint32_t expressionId)
   {
     if ((con->listeners[i].in_use) && (expressionId == con->listeners[i].subscription_id))
     {
-        strncpy(expression, con->listeners[i].expression, RTMSG_HEADER_MAX_TOPIC_LENGTH);
         con->listeners[i].in_use = 0;
         route_id = con->listeners[i].subscription_id;
         con->listeners[i].subscription_id = 0;

diff --git a/src/rtmessage/rtConnection.h b/src/rtmessage/rtConnection.h
@@ -195,7 +195,7 @@ rtConnection_AddListener(rtConnection con, char const* expression,
  * @return error
  */
 rtError
-rtConnection_RemoveListener(rtConnection con, uint32_t expressionId);
+rtConnection_RemoveListener(rtConnection con, char const* expression, uint32_t expressionId);
 
 /**
  * Add an alias to an existing listener