From be62f5700a60d24b5981b8fecfbbc678603668be Mon Sep 17 00:00:00 2001 From: Julius Pfrommer Date: Wed, 4 Jun 2025 13:11:17 +0200 Subject: [PATCH] refactor(client): Also timeout subscriptions when the Session is not activated --- src/client/ua_client_subscriptions.c | 7 ------- tests/client/check_client_subscriptions.c | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/client/ua_client_subscriptions.c b/src/client/ua_client_subscriptions.c index 062aa1f3e..36c88fea5 100644 --- a/src/client/ua_client_subscriptions.c +++ b/src/client/ua_client_subscriptions.c @@ -1442,13 +1442,6 @@ void __Client_Subscriptions_backgroundPublishInactivityCheck(UA_Client *client) { UA_LOCK_ASSERT(&client->clientMutex); - if(client->sessionState < UA_SESSIONSTATE_ACTIVATED) - return; - - /* Is the lack of responses the client's fault? */ - if(client->currentlyOutStandingPublishRequests == 0) - return; - UA_EventLoop *el = client->config.eventLoop; UA_DateTime nowm = el->dateTime_nowMonotonic(el); diff --git a/tests/client/check_client_subscriptions.c b/tests/client/check_client_subscriptions.c index 255d26581..b11378897 100644 --- a/tests/client/check_client_subscriptions.c +++ b/tests/client/check_client_subscriptions.c @@ -1389,7 +1389,7 @@ START_TEST(Client_subscription_async_sub) { /* Simulate network cable unplugged (no response from server) */ UA_ConnectionManager *cm = client->channel.connectionManager; cm->closeConnection(cm, client->channel.connectionId); - UA_fakeSleep((UA_UInt32)publishingInterval * 100); + UA_fakeSleep((UA_UInt32)cc->timeout * 2); ck_assert_uint_lt(client->config.outStandingPublishRequests, 10); ck_assert_uint_eq(inactivityCallbackCalled, false);