Merge pull request #15244 from idryzhov/mgmtd-fixes

A couple of mgmtd fixes
FRRouting · Jan 28, 2024 · c62d77d · c62d77d
2 parents 03fd7d5 + 8785a3a
commit c62d77d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/mgmtd/mgmt_be_adapter.c b/mgmtd/mgmt_be_adapter.c
@@ -90,7 +90,7 @@ static const char *const ripngd_config_xpaths[] = {
 	NULL,
 };
 static const char *const ripngd_oper_xpaths[] = {
-	"/frr-ripd:ripd",
+	"/frr-ripngd:ripngd",
 	NULL,
 };
 #endif

diff --git a/mgmtd/mgmt_txn.c b/mgmtd/mgmt_txn.c
@@ -2441,6 +2441,10 @@ int mgmt_txn_send_get_tree_oper(uint64_t txn_id, uint64_t req_id,
 
 	mgmt_msg_native_free_msg(msg);
 
+	/* Return if we didn't send any messages to backends */
+	if (!get_tree->sent_clients)
+		return txn_get_tree_data_done(txn, txn_req);
+
 	/* Start timeout timer - pulled out of register event code so we can
 	 * pass a different arg
 	 */
-Original file line number
+Diff line change
@@ Expand Up / @@ -90,7 +90,7 @@ static const char *const ripngd_config_xpaths[] = { @@
     	NULL,
     };
     static const char *const ripngd_oper_xpaths[] = {
-    	"/frr-ripd:ripd",
+    	"/frr-ripngd:ripngd",
     	NULL,
     };
     #endif
@@ Expand Down @@