common UPDATE report NC SID in RPC notifications

Fixes sysrepo/sysrepo#3682

Author: michalvasko

…s/[email protected] …s/[email protected]modules/[email protected] renamed to modules/[email protected] modules/[email protected] renamed to modules/[email protected]

@@ -26,6 +26,11 @@ module netopeer-notifications {
     description
         "Netopeer2 NETCONF server YANG notifications.";
 
+    revision "2025-10-10" {
+        description
+            "Added 'netconf-sid' node.";
+    }
+
     revision "2025-06-13" {
         description
             "Added 'netconf-user' and 'notification-stream' nodes.";
@@ -189,6 +194,13 @@ module netopeer-notifications {
                 "Name of the executed RPC.";
         }
 
+        leaf netconf-sid {
+            type uint32;
+            mandatory true;
+            description
+                "NETCONF ID of the session executing the PRC.";
+        }
+
         leaf netconf-user {
             type string;
             mandatory true;

scripts/common.sh

@@ -12,7 +12,7 @@ NP2_MODULES=(
 "[email protected]"
 "[email protected] -e encode-xml -e replay -e subtree -e xpath"
 "[email protected] -e on-change"
-"netopeer-notifications@2025-06-13.yang"
+"netopeer-notifications@2025-10-10.yang"
 "[email protected]"
 "[email protected]"
 )

src/common.c

@@ -580,7 +580,7 @@ np_send_notif_confirmed_commit(const struct nc_session *session, sr_session_ctx_
 }
 
 int
-np_send_notif_rpc(sr_session_ctx_t *sr_session, enum np_rpc_exec_stage stage, const char *rpc_name,
+np_send_notif_rpc(sr_session_ctx_t *sr_session, enum np_rpc_exec_stage stage, const char *rpc_name, uint32_t netconf_sid,
         const char *netconf_user, const char *ds_str, const struct lyd_node *filter_subtree, const char *filter_xpath,
         const char *sub_stream, uint32_t sr_timeout)
 {
@@ -631,6 +631,12 @@ np_send_notif_rpc(sr_session_ctx_t *sr_session, enum np_rpc_exec_stage stage, co
         goto cleanup;
     }
 
+    /* NETCONF SID */
+    if (lyd_new_term_bin(notif, NULL, "netconf-sid", &netconf_sid, sizeof netconf_sid * 8, 0, NULL)) {
+        rc = -1;
+        goto cleanup;
+    }
+
     /* NETCONF user */
     if (lyd_new_term(notif, NULL, "netconf-user", netconf_user, 0, NULL)) {
         rc = -1;

src/common.h

@@ -250,6 +250,7 @@ enum np_rpc_exec_stage {
  * @param[in] sr_session Sysrepo session.
  * @param[in] stage RPC execution stage.
  * @param[in] rpc_name Executed RPC name.
+ * @param[in] netconf_sid NETCONF SID of the session that executed the RPC.
  * @param[in] netconf_user NETCONF user that executed the RPC.
  * @param[in] ds_str Optional relevant RPC datastore.
  * @param[in] filter_subtree Optional RPC subtree filter.
@@ -260,8 +261,8 @@ enum np_rpc_exec_stage {
  * @return -1 on error.
  */
 int np_send_notif_rpc(sr_session_ctx_t *sr_session, enum np_rpc_exec_stage stage, const char *rpc_name,
-        const char *netconf_user, const char *ds_str, const struct lyd_node *filter_subtree, const char *filter_xpath,
-        const char *sub_stream, uint32_t sr_timeout);
+        uint32_t netconf_sid, const char *netconf_user, const char *ds_str, const struct lyd_node *filter_subtree,
+        const char *filter_xpath, const char *sub_stream, uint32_t sr_timeout);
 
 /**
  * @brief NP2 callback for acquiring context.

src/main.c

@@ -378,8 +378,8 @@ np2srv_rpc_cb(struct lyd_node *rpc, struct nc_session *ncs)
         np_rpc_get_stream(rpc, &sub_stream);
 
         /* pre-NETCONF RPC */
-        np_send_notif_rpc(user_sess->sess, NP_RPC_STAGE_PRE, LYD_NAME(rpc), nc_session_get_username(ncs), ds_str,
-                filter_subtree, filter_xpath, sub_stream, np2srv.sr_timeout);
+        np_send_notif_rpc(user_sess->sess, NP_RPC_STAGE_PRE, LYD_NAME(rpc), nc_session_get_id(ncs),
+                nc_session_get_username(ncs), ds_str, filter_subtree, filter_xpath, sub_stream, np2srv.sr_timeout);
 
         /* netopeer2 RPC execution */
         reply = rpc_cb(rpc, user_sess);
@@ -390,8 +390,8 @@ np2srv_rpc_cb(struct lyd_node *rpc, struct nc_session *ncs)
         /* post-NETCONF RPC */
         rpl_type = nc_server_reply_type(reply);
         np_send_notif_rpc(user_sess->sess, (rpl_type == NC_RPL_ERROR) ? NP_RPC_STAGE_POST_FAIL : NP_RPC_STAGE_POST_SUCCESS,
-                LYD_NAME(rpc), nc_session_get_username(ncs), ds_str, filter_subtree, filter_xpath, sub_stream,
-                np2srv.sr_timeout);
+                LYD_NAME(rpc), nc_session_get_id(ncs), nc_session_get_username(ncs), ds_str, filter_subtree,
+                filter_xpath, sub_stream, np2srv.sr_timeout);
     } else {
         /* sysrepo RPC, use the default timeout or slightly higher than the configured one */
         rc = sr_rpc_send_tree(user_sess->sess, rpc, np2srv.sr_timeout ? np2srv.sr_timeout + 2000 : 0, &output);