fix(pubsub): Always update the timed callback in UA_PubSubKeyStorage_…

…addKeyRolloverCallback
GoetzGoerisch · Dec 22, 2024 · efecf53 · efecf53
1 parent e391342
commit efecf53
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/pubsub/ua_pubsub_keystorage.c b/src/pubsub/ua_pubsub_keystorage.c
@@ -208,16 +208,14 @@ UA_PubSubKeyStorage_addKeyRolloverCallback(UA_Server *server,
     if(!server || !keyStorage || !callback || timeToNextMs <= 0)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
-    // Check if the callback already exist
-    if(*callbackID != 0) {
-        return UA_STATUSCODE_GOOD;
-    }
-
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
+    UA_EventLoop *el = server->config.eventLoop;
+    if(*callbackID != 0)
+        el->removeCyclicCallback(el, *callbackID);
+
     UA_DateTime dateTimeToNextKey = UA_DateTime_nowMonotonic() +
         (UA_DateTime)(UA_DATETIME_MSEC * timeToNextMs);
-    UA_EventLoop *el = server->config.eventLoop;
     return el->addTimedCallback(el, (UA_Callback)callback, server, keyStorage,
                                 dateTimeToNextKey, callbackID);
 }