Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix zebra route flags #34

Closed
wants to merge 2 commits into from
Closed

Fix zebra route flags #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
271ad8d
bgpd, ospfd, zebra: remove duplicate cli installs
qlyoung Dec 29, 2016
c868d9a
zebra: check route flags when deciding whether to update existing route
qlyoung Dec 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions bgpd/bgp_route.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10556,17 +10556,6 @@ bgp_route_init (void)
install_element (VIEW_NODE, &show_ip_bgp_ipv4_cmd);
install_element (VIEW_NODE, &show_ip_bgp_route_cmd);
install_element (VIEW_NODE, &show_ip_bgp_regexp_cmd);

install_element (VIEW_NODE, &show_ip_bgp_instance_neighbor_advertised_route_cmd);
install_element (VIEW_NODE, &show_ip_bgp_neighbor_routes_cmd);
install_element (VIEW_NODE, &show_ip_bgp_neighbor_received_prefix_filter_cmd);
install_element (VIEW_NODE, &show_ip_bgp_dampening_params_cmd);
install_element (VIEW_NODE, &show_ip_bgp_ipv4_dampening_parameters_cmd);

/* Restricted node: VIEW_NODE - (set of dangerous commands) */
install_element (VIEW_NODE, &show_ip_bgp_instance_all_cmd);
install_element (VIEW_NODE, &show_ip_bgp_ipv4_cmd);
install_element (VIEW_NODE, &show_ip_bgp_route_cmd);
install_element (VIEW_NODE, &show_ip_bgp_instance_neighbor_advertised_route_cmd);
install_element (VIEW_NODE, &show_ip_bgp_neighbor_routes_cmd);
install_element (VIEW_NODE, &show_ip_bgp_neighbor_received_prefix_filter_cmd);
Expand Down
28 changes: 8 additions & 20 deletions bgpd/bgp_vty.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10602,33 +10602,21 @@ bgp_vty_init (void)
install_element (ENABLE_NODE, &clear_bgp_instance_ipv6_safi_prefix_cmd);

/* "show [ip] bgp summary" commands. */
install_element (VIEW_NODE, &show_ip_bgp_summary_cmd);
install_element (VIEW_NODE, &show_ip_bgp_updgrps_cmd);
install_element (VIEW_NODE, &show_bgp_instance_all_ipv6_updgrps_cmd);
install_element (VIEW_NODE, &show_ip_bgp_updgrps_adj_cmd);
install_element (VIEW_NODE, &show_ip_bgp_instance_updgrps_adj_cmd);
install_element (VIEW_NODE, &show_bgp_updgrps_adj_cmd);
install_element (VIEW_NODE, &show_bgp_instance_updgrps_adj_cmd);
install_element (VIEW_NODE, &show_bgp_updgrps_afi_adj_cmd);
install_element (VIEW_NODE, &show_ip_bgp_updgrps_adj_s_cmd);
install_element (VIEW_NODE, &show_ip_bgp_instance_updgrps_adj_s_cmd);
install_element (VIEW_NODE, &show_bgp_updgrps_adj_s_cmd);
install_element (VIEW_NODE, &show_bgp_instance_updgrps_adj_s_cmd);
install_element (VIEW_NODE, &show_bgp_updgrps_afi_adj_s_cmd);
install_element (VIEW_NODE, &show_ip_bgp_updgrps_cmd);
install_element (VIEW_NODE, &show_bgp_instance_all_ipv6_updgrps_cmd);
install_element (VIEW_NODE, &show_ip_bgp_updgrps_adj_cmd);
install_element (VIEW_NODE, &show_ip_bgp_instance_updgrps_adj_cmd);
install_element (VIEW_NODE, &show_bgp_instance_updgrps_stats_cmd);
install_element (VIEW_NODE, &show_bgp_updgrps_adj_cmd);
install_element (VIEW_NODE, &show_bgp_instance_updgrps_adj_cmd);
install_element (VIEW_NODE, &show_bgp_updgrps_afi_adj_cmd);
install_element (VIEW_NODE, &show_ip_bgp_updgrps_adj_s_cmd);
install_element (VIEW_NODE, &show_ip_bgp_instance_updgrps_adj_s_cmd);
install_element (VIEW_NODE, &show_bgp_updgrps_adj_s_cmd);
install_element (VIEW_NODE, &show_bgp_instance_updgrps_adj_s_cmd);
install_element (VIEW_NODE, &show_bgp_updgrps_afi_adj_cmd);
install_element (VIEW_NODE, &show_bgp_updgrps_afi_adj_s_cmd);
install_element (VIEW_NODE, &show_bgp_updgrps_stats_cmd);
install_element (VIEW_NODE, &show_bgp_instance_updgrps_stats_cmd);
install_element (VIEW_NODE, &show_ip_bgp_instance_updgrps_adj_cmd);
install_element (VIEW_NODE, &show_ip_bgp_instance_updgrps_adj_s_cmd);
install_element (VIEW_NODE, &show_ip_bgp_summary_cmd);
install_element (VIEW_NODE, &show_ip_bgp_updgrps_adj_cmd);
install_element (VIEW_NODE, &show_ip_bgp_updgrps_adj_s_cmd);
install_element (VIEW_NODE, &show_ip_bgp_updgrps_cmd);

/* "show [ip] bgp neighbors" commands. */
install_element (VIEW_NODE, &show_ip_bgp_neighbors_cmd);
Expand Down
5 changes: 0 additions & 5 deletions ospfd/ospf_dump.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1979,8 +1979,6 @@ debug_init ()
install_element (ENABLE_NODE, &show_debugging_ospf_instance_cmd);
install_element (ENABLE_NODE, &debug_ospf_packet_cmd);
install_element (ENABLE_NODE, &no_debug_ospf_packet_cmd);
install_element (ENABLE_NODE, &debug_ospf_ism_cmd);
install_element (ENABLE_NODE, &no_debug_ospf_ism_cmd);

install_element (ENABLE_NODE, &debug_ospf_instance_nsm_cmd);
install_element (ENABLE_NODE, &debug_ospf_instance_lsa_cmd);
Expand All @@ -1994,8 +1992,6 @@ debug_init ()
install_element (ENABLE_NODE, &no_debug_ospf_instance_nssa_cmd);
install_element (ENABLE_NODE, &no_debug_ospf_cmd);



install_element (CONFIG_NODE, &debug_ospf_packet_cmd);
install_element (CONFIG_NODE, &no_debug_ospf_packet_cmd);
install_element (CONFIG_NODE, &debug_ospf_ism_cmd);
Expand All @@ -2007,7 +2003,6 @@ debug_init ()
install_element (CONFIG_NODE, &debug_ospf_event_cmd);
install_element (CONFIG_NODE, &debug_ospf_nssa_cmd);
install_element (CONFIG_NODE, &debug_ospf_te_cmd);
install_element (CONFIG_NODE, &no_debug_ospf_ism_cmd);
install_element (CONFIG_NODE, &no_debug_ospf_nsm_cmd);
install_element (CONFIG_NODE, &no_debug_ospf_lsa_cmd);
install_element (CONFIG_NODE, &no_debug_ospf_zebra_cmd);
Expand Down
3 changes: 2 additions & 1 deletion zebra/zebra_static.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,8 @@ static_add_route (afi_t afi, safi_t safi, u_char type, struct prefix *p,
&& (! ifindex || ifindex == si->ifindex))
{
if ((distance == si->distance) && (tag == si->tag) &&
!memcmp (&si->snh_label, snh_label, sizeof (struct static_nh_label)))
!memcmp (&si->snh_label, snh_label, sizeof (struct static_nh_label)) &&
si->flags == flags)
{
route_unlock_node (rn);
return 0;
Expand Down
1 change: 0 additions & 1 deletion zebra/zebra_vty.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3858,7 +3858,6 @@ zebra_vty_init (void)
install_element (CONFIG_NODE, &no_ip_route_flags_cmd);
install_element (CONFIG_NODE, &no_ip_route_mask_flags_cmd);

install_element (VIEW_NODE, &show_ip_route_vrf_cmd);
install_element (VIEW_NODE, &show_ip_route_vrf_cmd);

install_element (VIEW_NODE, &show_ip_route_vrf_all_cmd);
Expand Down