From f5372fb1242a40ad61163ec4e1b8fc6349372278 Mon Sep 17 00:00:00 2001
From: Mico Micic <m.micic@mobatime.com>
Date: Mon, 2 Sep 2024 10:10:39 +0200
Subject: [PATCH] Add username when reading and subscribing streams

---
 apps/snmp/snmp_stream.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/apps/snmp/snmp_stream.c b/apps/snmp/snmp_stream.c
index 09831e6d..6e8a95e8 100644
--- a/apps/snmp/snmp_stream.c
+++ b/apps/snmp/snmp_stream.c
@@ -358,8 +358,12 @@ snmp_stream_subscribe(clixon_handle  h,
         clixon_err(OE_SNMP, errno, "cbuf_new");
         goto done;
     }
-    cprintf(cb, "<rpc xmlns=\"%s\" %s><create-subscription xmlns=\"%s\"><stream>%s</stream>",
-            NETCONF_BASE_NAMESPACE, NETCONF_MESSAGE_ID_ATTR, EVENT_RFC5277_NAMESPACE, stream);
+    cprintf(cb, "<rpc xmlns=\"%s\" username=\"%s\" %s><create-subscription xmlns=\"%s\"><stream>%s</stream>",
+            NETCONF_BASE_NAMESPACE,
+            clicon_username_get(h),
+            NETCONF_MESSAGE_ID_ATTR,
+            EVENT_RFC5277_NAMESPACE,
+            stream);
     cprintf(cb, "</create-subscription></rpc>]]>]]>");
     if (clicon_rpc_netconf(h, cbuf_get(cb), &xret, &s) < 0)
         goto done;
@@ -421,9 +425,13 @@ get_all_streams_from_backend(clixon_handle    h,
         clixon_err(OE_SNMP, errno, "cbuf_new");
         goto done;
     }
-    /* get alle streams from backend */
-    cprintf(cb, "<rpc xmlns=\"%s\" %s><get><filter type=\"subtree\"><netconf xmlns=\"%s\"><streams/></netconf></filter></get></rpc>]]>]]>",
-            NETCONF_BASE_NAMESPACE, NETCONF_MESSAGE_ID_ATTR, EVENT_RFC5277_NAMESPACE);
+    /* get all streams from backend */
+    cprintf(cb, "<rpc xmlns=\"%s\" username=\"%s\" %s><get><filter type=\"subtree\">"
+            "<netconf xmlns=\"%s\"><streams/></netconf></filter></get></rpc>]]>]]>",
+            NETCONF_BASE_NAMESPACE,
+            clicon_username_get(h),
+            NETCONF_MESSAGE_ID_ATTR,
+            EVENT_RFC5277_NAMESPACE);
     if (clicon_rpc_netconf(h, cbuf_get(cb), &xret, NULL) < 0)
         goto done;
     if ((xe = xpath_first(xret, NULL, "rpc-reply/rpc-error")) != NULL)