sharpd: fix deleting nhid when suppressing nexthop from nh group

When no nexthops are in a nexthop group, two successive events are sent: NHG_DEL and NHG_ADD, but only the NHG_DEL one is necessary. Fixes this by returning in the nhg_add() function. Fixes: 82beaf6 ("sharpd: fix deleting nhid when suppressing nexthop from nh group") Signed-off-by: Philippe Guibert <[email protected]>
FRRouting · Dec 5, 2023 · 82c1d82 · 82c1d82
1 parent 3f4c682
commit 82c1d82
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/sharpd/sharp_zebra.c b/sharpd/sharp_zebra.c
@@ -567,11 +567,11 @@ void nhg_add(uint32_t id, const struct nexthop_group *nhg,
 			zlog_debug("%s: nhg %u: no nexthops, deleting nexthop group", __func__,
 				   id);
 			zclient_nhg_send(zclient, ZEBRA_NHG_DEL, &api_nhg);
-		} else {
-			zlog_debug("%s: nhg %u not sent: no valid nexthops", __func__,
-				   id);
-			is_valid = false;
+			return;
 		}
+		zlog_debug("%s: nhg %u not sent: no valid nexthops", __func__,
+			   id);
+		is_valid = false;
 		goto done;
 	}