From: Donald Sharp <sharpd@nvidia.com>
Date: Sun, 27 Mar 2022 00:46:36 +0000 (-0400)
Subject: babeld: Rehook up interface up events
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=294208c01f322810aee395975bcdfdb95cdb81eb;p=matthieu%2Ffrr.git

babeld: Rehook up interface up events

When babeld was switched over to the zapi
interface up/down callbacks the interface up
event was not properly put back in.

Fixes: #10893
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
(cherry picked from commit 93d9b1afbec6e63d78ca087833d52036b294ed58)
---

diff --git a/babeld/babel_interface.c b/babeld/babel_interface.c
index 98c5d21196..00fb58e576 100644
--- a/babeld/babel_interface.c
+++ b/babeld/babel_interface.c
@@ -60,21 +60,10 @@ static void babel_interface_free (babel_interface_nfo *bi);
 
 static vector babel_enable_if;                 /* enable interfaces (by cmd). */
 
-int
-babel_interface_up (ZAPI_CALLBACK_ARGS)
+int babel_ifp_up(struct interface *ifp)
 {
-    struct stream *s = NULL;
-    struct interface *ifp = NULL;
-
     debugf(BABEL_DEBUG_IF, "receive a 'interface up'");
 
-    s = zclient->ibuf;
-    ifp = zebra_interface_state_read(s, vrf_id); /* it updates iflist */
-
-    if (ifp == NULL) {
-        return 0;
-    }
-
     interface_recalculate(ifp);
     return 0;
 }
@@ -1235,11 +1224,6 @@ DEFUN (show_babel_parameters,
     return CMD_SUCCESS;
 }
 
-int babel_ifp_up(struct interface *ifp)
-{
-	return 0;
-}
-
 void
 babel_if_init(void)
 {