From 2e3b2e474ed5ba04744b167132a84f9954485af4 Mon Sep 17 00:00:00 2001 From: paul Date: Fri, 13 Dec 2002 21:03:13 +0000 Subject: zebra link state detection support --- zebra/interface.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++------- zebra/rt_netlink.c | 6 ++-- zebra/zserv.c | 4 +++ 3 files changed, 82 insertions(+), 14 deletions(-) (limited to 'zebra') diff --git a/zebra/interface.c b/zebra/interface.c index 9846805b..ac064992 100644 --- a/zebra/interface.c +++ b/zebra/interface.c @@ -147,7 +147,7 @@ if_addr_wakeup (struct interface *ifp) zebra_interface_address_add_update (ifp, ifc); - if (if_is_up(ifp)) + if (if_is_operative(ifp)) connected_up_ipv4 (ifp, ifc); } #ifdef HAVE_IPV6 @@ -170,7 +170,7 @@ if_addr_wakeup (struct interface *ifp) zebra_interface_address_add_update (ifp, ifc); - if (if_is_up(ifp)) + if (if_is_operative(ifp)) connected_up_ipv6 (ifp, ifc); } #endif /* HAVE_IPV6 */ @@ -334,16 +334,16 @@ if_down (struct interface *ifp) void if_refresh (struct interface *ifp) { - if (if_is_up (ifp)) + if (if_is_operative (ifp)) { if_get_flags (ifp); - if (! if_is_up (ifp)) + if (! if_is_operative (ifp)) if_down (ifp); } else { if_get_flags (ifp); - if (if_is_up (ifp)) + if (if_is_operative (ifp)) if_up (ifp); } } @@ -479,8 +479,22 @@ if_dump_vty (struct vty *vty, struct interface *ifp) struct connected *connected; listnode node; - vty_out (vty, "Interface %s%s", ifp->name, - VTY_NEWLINE); + vty_out (vty, "Interface %s is ", ifp->name); + if (if_is_up(ifp)) { + vty_out (vty, "up, line protocol "); + + if (CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_LINKDETECTION)) { + if (if_is_running(ifp)) + vty_out (vty, "is up%s", VTY_NEWLINE); + else + vty_out (vty, "is down%s", VTY_NEWLINE); + } else { + vty_out (vty, "detection is disabled%s", VTY_NEWLINE); + } + } else { + vty_out (vty, "down%s", VTY_NEWLINE); + } + if (ifp->desc) vty_out (vty, " Description: %s%s", ifp->desc, VTY_NEWLINE); @@ -790,6 +804,51 @@ DEFUN (no_multicast, return CMD_SUCCESS; } +DEFUN (linkdetect, + linkdetect_cmd, + "link-detect", + "Enable link detection on interface\n") +{ + int ret; + struct interface *ifp; + int if_was_operative; + + ifp = (struct interface *) vty->index; + if_was_operative = if_is_operative(ifp); + SET_FLAG(ifp->status, ZEBRA_INTERFACE_LINKDETECTION); + + /* When linkdetection is enabled, if might come down */ + if (!if_is_operative(ifp) && if_was_operative) if_down(ifp); + + /* FIXME: Will defer status change forwarding if interface + does not come down! */ + + return CMD_SUCCESS; +} + + +DEFUN (no_linkdetect, + no_linkdetect_cmd, + "no link-detect", + NO_STR + "Disable link detection on interface\n") +{ + int ret; + struct interface *ifp; + int if_was_operative; + + ifp = (struct interface *) vty->index; + if_was_operative = if_is_operative(ifp); + UNSET_FLAG(ifp->status, ZEBRA_INTERFACE_LINKDETECTION); + + /* Interface may come up after disabling link detection */ + if (if_is_operative(ifp) && !if_was_operative) if_up(ifp); + + /* FIXME: see linkdetect_cmd */ + + return CMD_SUCCESS; +} + DEFUN (shutdown_if, shutdown_if_cmd, "shutdown", @@ -859,7 +918,7 @@ DEFUN (bandwidth_if, ifp->bandwidth = bandwidth; /* force protocols to recalculate routes due to cost change */ - if (if_is_up (ifp)) + if (if_is_operative (ifp)) zebra_interface_up_update (ifp); return CMD_SUCCESS; @@ -878,7 +937,7 @@ DEFUN (no_bandwidth_if, ifp->bandwidth = 0; /* force protocols to recalculate routes due to cost change */ - if (if_is_up (ifp)) + if (if_is_operative (ifp)) zebra_interface_up_update (ifp); return CMD_SUCCESS; @@ -971,7 +1030,7 @@ ip_address_install (struct vty *vty, struct interface *ifp, char *addr_str, zebra_interface_address_add_update (ifp, ifc); /* If interface is up register connected route. */ - if (if_is_up(ifp)) + if (if_is_operative(ifp)) connected_up_ipv4 (ifp, ifc); } @@ -1179,7 +1238,7 @@ ipv6_address_install (struct vty *vty, struct interface *ifp, char *addr_str, zebra_interface_address_add_update (ifp, ifc); /* If interface is up register connected route. */ - if (if_is_up(ifp)) + if (if_is_operative(ifp)) connected_up_ipv6 (ifp, ifc); } @@ -1315,6 +1374,9 @@ if_config_write (struct vty *vty) if (ifp->bandwidth != 0) vty_out(vty, " bandwidth %u%s", ifp->bandwidth, VTY_NEWLINE); + if (CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_LINKDETECTION)) + vty_out(vty, " link-detect%s", VTY_NEWLINE); + for (addrnode = listhead (ifp->connected); addrnode; nextnode (addrnode)) { ifc = getdata (addrnode); @@ -1377,6 +1439,8 @@ zebra_if_init () install_element (INTERFACE_NODE, &no_interface_desc_cmd); install_element (INTERFACE_NODE, &multicast_cmd); install_element (INTERFACE_NODE, &no_multicast_cmd); + install_element (INTERFACE_NODE, &linkdetect_cmd); + install_element (INTERFACE_NODE, &no_linkdetect_cmd); install_element (INTERFACE_NODE, &shutdown_if_cmd); install_element (INTERFACE_NODE, &no_shutdown_if_cmd); install_element (INTERFACE_NODE, &bandwidth_if_cmd); diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c index baca1751..fa4dc54f 100644 --- a/zebra/rt_netlink.c +++ b/zebra/rt_netlink.c @@ -787,16 +787,16 @@ netlink_link_change (struct sockaddr_nl *snl, struct nlmsghdr *h) ifp->mtu = *(int *)RTA_DATA (tb[IFLA_MTU]); ifp->metric = 1; - if (if_is_up (ifp)) + if (if_is_operative (ifp)) { ifp->flags = ifi->ifi_flags & 0x0000fffff; - if (! if_is_up (ifp)) + if (! if_is_operative (ifp)) if_down (ifp); } else { ifp->flags = ifi->ifi_flags & 0x0000fffff; - if (if_is_up (ifp)) + if (if_is_operative (ifp)) if_up (ifp); } } diff --git a/zebra/zserv.c b/zebra/zserv.c index 47114ab3..d447d065 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -96,6 +96,7 @@ zsend_interface_add (struct zserv *client, struct interface *ifp) /* Interface information. */ stream_put (s, ifp->name, INTERFACE_NAMSIZ); stream_putl (s, ifp->ifindex); + stream_putc (s, ifp->status); stream_putl (s, ifp->flags); stream_putl (s, ifp->metric); stream_putl (s, ifp->mtu); @@ -134,6 +135,7 @@ zsend_interface_delete (struct zserv *client, struct interface *ifp) stream_putc (s, ZEBRA_INTERFACE_DELETE); stream_put (s, ifp->name, INTERFACE_NAMSIZ); stream_putl (s, ifp->ifindex); + stream_putc (s, ifp->status); stream_putl (s, ifp->flags); stream_putl (s, ifp->metric); stream_putl (s, ifp->mtu); @@ -256,6 +258,7 @@ zsend_interface_up (struct zserv *client, struct interface *ifp) /* Interface information. */ stream_put (s, ifp->name, INTERFACE_NAMSIZ); stream_putl (s, ifp->ifindex); + stream_putc (s, ifp->status); stream_putl (s, ifp->flags); stream_putl (s, ifp->metric); stream_putl (s, ifp->mtu); @@ -288,6 +291,7 @@ zsend_interface_down (struct zserv *client, struct interface *ifp) /* Interface information. */ stream_put (s, ifp->name, INTERFACE_NAMSIZ); stream_putl (s, ifp->ifindex); + stream_putc (s, ifp->status); stream_putl (s, ifp->flags); stream_putl (s, ifp->metric); stream_putl (s, ifp->mtu); -- cgit v1.2.1