Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pubsub config updating part 2 #7129

Merged
merged 16 commits into from
Feb 23, 2025
Merged

Pubsub config updating part 2 #7129

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
588af3d
feat(pubsub): Add beforeStateChangeCallback to the PubSub config
jpfr Feb 22, 2025
e7780ac
refactor(pubsub): Make UA_PubSubComponentType public
jpfr Feb 22, 2025
ddb9c63
feat(pubsub): Add componentLifecycleCallback to the PubSub config
jpfr Feb 22, 2025
dfa20b0
fix(server): Do a normal iteration during _shutdown to unlock threads…
jpfr Feb 22, 2025
d8402e0
refactor(pubsub): Cosmetic improvements to DataSetReader
jpfr Feb 22, 2025
3782118
refactor(pubsub): Pull out functionality from UA_DataSetReader_create…
jpfr Feb 22, 2025
70f90da
refactor(pubsub): Simplify connectDataSetReaderToDataSet
jpfr Feb 22, 2025
c0fb6cb
feat(pubsub): Add UA_Server_updateDataSetReaderConfig
jpfr Feb 22, 2025
ef63023
feat(core): Add UA_NODEID2EXPANDEDNODEID for ad-hoc ExpandedNodeIds f…
jpfr Feb 22, 2025
8a4b16f
fix(pubsub): Fix typos in comments
jpfr Feb 22, 2025
c68cf6c
refactor(pubsub): Pull out SKS Keystorage configuration for ReaderGro…
jpfr Feb 22, 2025
68d7c45
refactor(pubsub): Only reattach WriterGroup's SKS Keystorage when the…
jpfr Feb 22, 2025
ad4d79d
feat(pubsub): Expose UA_PubSubConnectionConfig_copy and UA_PubSubConn…
jpfr Feb 22, 2025
028503d
feat(pubsub): Add UA_Server_updateReaderGroupConfig
jpfr Feb 22, 2025
71014ab
refactor(pubsub): Consistently move from ERROR to DISABLED after upda…
jpfr Feb 22, 2025
31f2edb
feat(tests): Add testing of UA_Server_updatePubSubConnectionConfig
jpfr Feb 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor(pubsub): Simplify connectDataSetReaderToDataSet
  • Loading branch information
@jpfr
jpfr committed Feb 22, 2025
commit 70f90da3874da769eb98799d48012251715340df
10 changes: 3 additions & 7 deletions src/pubsub/ua_pubsub_ns0.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2467,8 +2467,6 @@ UA_StatusCode
connectDataSetReaderToDataSet(UA_Server *server, UA_NodeId dsrId, UA_NodeId sdsId) {
UA_LOCK_ASSERT(&server->serviceMutex);

UA_StatusCode retVal = UA_STATUSCODE_GOOD;

UA_NodeId dataSetMetaDataOnDsrId =
findSingleChildNode(server, UA_QUALIFIEDNAME(0, "DataSetMetaData"),
UA_NS0ID(HASPROPERTY), dsrId);
Expand All @@ -2491,13 +2489,11 @@ connectDataSetReaderToDataSet(UA_Server *server, UA_NodeId dsrId, UA_NodeId sdsI
UA_NODESTORE_REMOVE(server, &dataSetMetaDataOnDsrId);
UA_NODESTORE_REMOVE(server, &subscribedDataSetOnDsrId);

UA_StatusCode retVal = UA_STATUSCODE_GOOD;
retVal |= addRef(server, dsrId, UA_NS0ID(HASPROPERTY),
UA_NODEID_NUMERIC(dataSetMetaDataOnSdsId.namespaceIndex,
dataSetMetaDataOnSdsId.identifier.numeric), true);
dataSetMetaDataOnSdsId, true);
retVal |= addRef(server, dsrId, UA_NS0ID(HASPROPERTY),
UA_NODEID_NUMERIC(subscribedDataSetOnSdsId.namespaceIndex,
subscribedDataSetOnSdsId.identifier.numeric), true);

subscribedDataSetOnSdsId, true);
return retVal;
}

Expand Down