3 @@ -327,7 +327,9 @@ main (int argc, char **argv)
17 #include "zebra/interface.h"
19 +/* NB: RTADV is defined in zebra/interface.h above */
22 /* Router advertisement prefix. */
25 @@ -96,4 +99,6 @@ struct nd_opt_homeagent_info { /* Home
27 extern const char *rtadv_pref_strs[];
31 #endif /* _ZEBRA_RTADV_H */
32 --- a/zebra/zebra_vty.c
33 +++ b/zebra/zebra_vty.c
34 @@ -1197,6 +1197,40 @@ DEFUN (show_ip_protocol,
39 + * Show IP mroute command to dump the BGP Multicast
42 +DEFUN (show_ip_mroute,
47 + "IP Multicast routing table\n")
49 + struct route_table *table;
50 + struct route_node *rn;
54 + table = vrf_table (AFI_IP, SAFI_MULTICAST, 0);
58 + /* Show all IPv4 routes. */
59 + for (rn = route_top (table); rn; rn = route_next (rn))
60 + for (rib = rn->info; rib; rib = rib->next)
64 + vty_out (vty, SHOW_ROUTE_V4_HEADER);
67 + vty_show_ip_route (vty, rn, rib);
74 /* General fucntion for IPv6 static route. */
75 @@ -1952,40 +1986,6 @@ DEFUN (show_ipv6_route_summary,
79 - * Show IP mroute command to dump the BGP Multicast
82 -DEFUN (show_ip_mroute,
87 - "IP Multicast routing table\n")
89 - struct route_table *table;
90 - struct route_node *rn;
94 - table = vrf_table (AFI_IP, SAFI_MULTICAST, 0);
98 - /* Show all IPv4 routes. */
99 - for (rn = route_top (table); rn; rn = route_next (rn))
100 - for (rib = rn->info; rib; rib = rib->next)
104 - vty_out (vty, SHOW_ROUTE_V4_HEADER);
107 - vty_show_ip_route (vty, rn, rib);
109 - return CMD_SUCCESS;
113 * Show IPv6 mroute command.Used to dump
114 * the Multicast routing table.
116 @@ -2020,11 +2020,6 @@ DEFUN (show_ipv6_mroute,
125 /* Write IPv6 static route configuration. */
127 static_config_ipv6 (struct vty *vty)