Merge pull request #5081 from pguibert6WIND/show_brief_doc

[mirror_frr.git] / ospf6d / ospf6_zebra.c

diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c
index 8db4ffef18c603f52b5e3d74a7782a678d293d4f..d8a6a39e1e9fd7de3faabc175580ed32c8cee0e0 100644 (file)
--- a/ospf6d/ospf6_zebra.c
+++ b/ospf6d/ospf6_zebra.c
@@ -97,57 +97,6 @@ void ospf6_zebra_no_redistribute(int type)
                                        AFI_IP6, type, 0, VRF_DEFAULT);
 }
 
-/* Inteface addition message from zebra. */
-static int ospf6_zebra_if_add(ZAPI_CALLBACK_ARGS)
-{
-       struct interface *ifp;
-
-       ifp = zebra_interface_add_read(zclient->ibuf, vrf_id);
-       if (IS_OSPF6_DEBUG_ZEBRA(RECV))
-               zlog_debug("Zebra Interface add: %s index %d mtu %d", ifp->name,
-                          ifp->ifindex, ifp->mtu6);
-       ospf6_interface_if_add(ifp);
-       return 0;
-}
-
-static int ospf6_zebra_if_del(ZAPI_CALLBACK_ARGS)
-{
-       struct interface *ifp;
-
-       if (!(ifp = zebra_interface_state_read(zclient->ibuf, vrf_id)))
-               return 0;
-
-       if (if_is_up(ifp))
-               zlog_warn("Zebra: got delete of %s, but interface is still up",
-                         ifp->name);
-
-       if (IS_OSPF6_DEBUG_ZEBRA(RECV))
-               zlog_debug("Zebra Interface delete: %s index %d mtu %d",
-                          ifp->name, ifp->ifindex, ifp->mtu6);
-
-       if_set_index(ifp, IFINDEX_INTERNAL);
-       return 0;
-}
-
-static int ospf6_zebra_if_state_update(ZAPI_CALLBACK_ARGS)
-{
-       struct interface *ifp;
-
-       ifp = zebra_interface_state_read(zclient->ibuf, vrf_id);
-       if (ifp == NULL)
-               return 0;
-
-       if (IS_OSPF6_DEBUG_ZEBRA(RECV))
-               zlog_debug(
-                       "Zebra Interface state change: "
-                       "%s index %d flags %llx metric %d mtu %d bandwidth %d",
-                       ifp->name, ifp->ifindex, (unsigned long long)ifp->flags,
-                       ifp->metric, ifp->mtu6, ifp->bandwidth);
-
-       ospf6_interface_state_update(ifp);
-       return 0;
-}
-
 static int ospf6_zebra_if_address_update_add(ZAPI_CALLBACK_ARGS)
 {
        struct connected *c;
@@ -258,7 +207,7 @@ DEFUN (show_zebra,
                return CMD_SUCCESS;
        }
 
-       vty_out(vty, "Zebra Infomation\n");
+       vty_out(vty, "Zebra Information\n");
        vty_out(vty, "  fail: %d\n", zclient->fail);
        vty_out(vty, "  redistribute default: %d\n",
                vrf_bitmap_check(zclient->default_information[AFI_IP6],
@@ -571,7 +520,7 @@ uint8_t ospf6_distance_apply(struct prefix_ipv6 *p, struct ospf6_route * or)
 static void ospf6_zebra_connected(struct zclient *zclient)
 {
        /* Send the client registration */
-       bfd_client_sendmsg(zclient, ZEBRA_BFD_CLIENT_REGISTER);
+       bfd_client_sendmsg(zclient, ZEBRA_BFD_CLIENT_REGISTER, VRF_DEFAULT);
 
        zclient_send_reg_requests(zclient, VRF_DEFAULT);
 }
@@ -583,10 +532,6 @@ void ospf6_zebra_init(struct thread_master *master)
        zclient_init(zclient, ZEBRA_ROUTE_OSPF6, 0, &ospf6d_privs);
        zclient->zebra_connected = ospf6_zebra_connected;
        zclient->router_id_update = ospf6_router_id_update_zebra;
-       zclient->interface_add = ospf6_zebra_if_add;
-       zclient->interface_delete = ospf6_zebra_if_del;
-       zclient->interface_up = ospf6_zebra_if_state_update;
-       zclient->interface_down = ospf6_zebra_if_state_update;
        zclient->interface_address_add = ospf6_zebra_if_address_update_add;
        zclient->interface_address_delete =
                ospf6_zebra_if_address_update_delete;