diff options
Diffstat (limited to 'zebra')
| -rw-r--r-- | zebra/ChangeLog | 15 | ||||
| -rw-r--r-- | zebra/zebra_vty.c | 70 |
2 files changed, 19 insertions, 66 deletions
diff --git a/zebra/ChangeLog b/zebra/ChangeLog index 9f4bd183..22adfeb2 100644 --- a/zebra/ChangeLog +++ b/zebra/ChangeLog @@ -1,5 +1,20 @@ 2005-10-01 Andrew J. Schorr <ajschorr@alumni.princeton.edu> + * zebra_vty.c: (route_type_str) Remove obsolete function: use new + library function zebra_route_string() instead. Note that there + are a few differences: for IPv6 routes, we now get "ripng" and + "ospf6" instead of the old behavior ("rip" and "ospf"). + (route_type_char) Remove obsolete function: ues new library function + zebra_route_char() instead. Note that there is one difference: + the old function returned 'S' for a ZEBRA_ROUTE_SYSTEM route, + whereas the new one returns 'X'. + (vty_show_ip_route_detail,vty_show_ipv6_route_detail) Replace + route_type_str() with zebra_route_string(). + (vty_show_ip_route,vty_show_ipv6_route) Replace route_type_char() + with zebra_route_char(). + +2005-10-01 Andrew J. Schorr <ajschorr@alumni.princeton.edu> + * rt_netlink.c: (netlink_request) Use memset to clear structure before calling sendto (eliminates a valgrind error message about uninitialized data). diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index ad91d959..68e6f920 100644 --- a/zebra/zebra_vty.c +++ b/zebra/zebra_vty.c @@ -29,68 +29,6 @@ #include "zebra/zserv.h" -/* Return route type string for VTY output. */ -static const char * -route_type_str (u_char type) -{ - switch (type) - { - case ZEBRA_ROUTE_SYSTEM: - return "system"; - case ZEBRA_ROUTE_KERNEL: - return "kernel"; - case ZEBRA_ROUTE_CONNECT: - return "connected"; - case ZEBRA_ROUTE_STATIC: - return "static"; - case ZEBRA_ROUTE_RIP: - return "rip"; - case ZEBRA_ROUTE_RIPNG: - return "rip"; - case ZEBRA_ROUTE_OSPF: - return "ospf"; - case ZEBRA_ROUTE_OSPF6: - return "ospf"; - case ZEBRA_ROUTE_ISIS: - return "isis"; - case ZEBRA_ROUTE_BGP: - return "bgp"; - default: - return "unknown"; - } -}; - -/* Return route type string for VTY output. */ -static const char -route_type_char (u_char type) -{ - switch (type) - { - case ZEBRA_ROUTE_SYSTEM: - return 'S'; - case ZEBRA_ROUTE_KERNEL: - return 'K'; - case ZEBRA_ROUTE_CONNECT: - return 'C'; - case ZEBRA_ROUTE_STATIC: - return 'S'; - case ZEBRA_ROUTE_RIP: - return 'R'; - case ZEBRA_ROUTE_RIPNG: - return 'R'; - case ZEBRA_ROUTE_OSPF: - return 'O'; - case ZEBRA_ROUTE_OSPF6: - return 'O'; - case ZEBRA_ROUTE_ISIS: - return 'I'; - case ZEBRA_ROUTE_BGP: - return 'B'; - default: - return '?'; - } -}; - /* General fucntion for static route. */ static int zebra_static_ipv4 (struct vty *vty, int add_cmd, const char *dest_str, @@ -548,7 +486,7 @@ vty_show_ip_route_detail (struct vty *vty, struct route_node *rn) vty_out (vty, "Routing entry for %s/%d%s", inet_ntoa (rn->p.u.prefix4), rn->p.prefixlen, VTY_NEWLINE); - vty_out (vty, " Known via \"%s\"", route_type_str (rib->type)); + vty_out (vty, " Known via \"%s\"", zebra_route_string (rib->type)); vty_out (vty, ", distance %d, metric %d", rib->distance, rib->metric); if (CHECK_FLAG (rib->flags, ZEBRA_FLAG_SELECTED)) vty_out (vty, ", best"); @@ -657,7 +595,7 @@ vty_show_ip_route (struct vty *vty, struct route_node *rn, struct rib *rib) { /* Prefix information. */ len = vty_out (vty, "%c%c%c %s/%d", - route_type_char (rib->type), + zebra_route_char (rib->type), CHECK_FLAG (rib->flags, ZEBRA_FLAG_SELECTED) ? '>' : ' ', CHECK_FLAG (nexthop->flags, NEXTHOP_FLAG_FIB) @@ -1435,7 +1373,7 @@ vty_show_ipv6_route_detail (struct vty *vty, struct route_node *rn) inet_ntop (AF_INET6, &rn->p.u.prefix6, buf, BUFSIZ), rn->p.prefixlen, VTY_NEWLINE); - vty_out (vty, " Known via \"%s\"", route_type_str (rib->type)); + vty_out (vty, " Known via \"%s\"", zebra_route_string (rib->type)); vty_out (vty, ", distance %d, metric %d", rib->distance, rib->metric); if (CHECK_FLAG (rib->flags, ZEBRA_FLAG_SELECTED)) vty_out (vty, ", best"); @@ -1552,7 +1490,7 @@ vty_show_ipv6_route (struct vty *vty, struct route_node *rn, { /* Prefix information. */ len = vty_out (vty, "%c%c%c %s/%d", - route_type_char (rib->type), + zebra_route_char (rib->type), CHECK_FLAG (rib->flags, ZEBRA_FLAG_SELECTED) ? '>' : ' ', CHECK_FLAG (nexthop->flags, NEXTHOP_FLAG_FIB) |