Merge pull request #12094 from patrasar/pimv6_rp_linklocal

[mirror_frr.git] / babeld / babel_zebra.c

diff --git a/babeld/babel_zebra.c b/babeld/babel_zebra.c
index 86f8bc721e73886f9f7182760f6780459b2791fe..daaa870a646a700959f0fa11c4e84b9adcdbaa84 100644 (file)
--- a/babeld/babel_zebra.c
+++ b/babeld/babel_zebra.c
@@ -225,6 +225,8 @@ DEFUN_NOSH (show_debugging_babel,
 
        debug_babel_config_write(vty);
 
+       cmd_show_lib_debugs(vty);
+
        return CMD_SUCCESS;
 }
 
@@ -234,16 +236,20 @@ babel_zebra_connected (struct zclient *zclient)
   zclient_send_reg_requests (zclient, VRF_DEFAULT);
 }
 
+static zclient_handler *const babel_handlers[] = {
+    [ZEBRA_INTERFACE_ADDRESS_ADD] = babel_interface_address_add,
+    [ZEBRA_INTERFACE_ADDRESS_DELETE] = babel_interface_address_delete,
+    [ZEBRA_REDISTRIBUTE_ROUTE_ADD] = babel_zebra_read_route,
+    [ZEBRA_REDISTRIBUTE_ROUTE_DEL] = babel_zebra_read_route,
+};
+
 void babelz_zebra_init(void)
 {
-    zclient = zclient_new(master, &zclient_options_default);
+    zclient = zclient_new(master, &zclient_options_default, babel_handlers,
+                         array_size(babel_handlers));
     zclient_init(zclient, ZEBRA_ROUTE_BABEL, 0, &babeld_privs);
 
     zclient->zebra_connected = babel_zebra_connected;
-    zclient->interface_address_add = babel_interface_address_add;
-    zclient->interface_address_delete = babel_interface_address_delete;
-    zclient->redistribute_route_add = babel_zebra_read_route;
-    zclient->redistribute_route_del = babel_zebra_read_route;
 
     install_element(BABEL_NODE, &babel_redistribute_type_cmd);
     install_element(ENABLE_NODE, &debug_babel_cmd);
@@ -251,7 +257,7 @@ void babelz_zebra_init(void)
     install_element(CONFIG_NODE, &debug_babel_cmd);
     install_element(CONFIG_NODE, &no_debug_babel_cmd);
 
-    install_element(VIEW_NODE, &show_debugging_babel_cmd);
+    install_element(ENABLE_NODE, &show_debugging_babel_cmd);
 }
 
 void