diff options
author | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-08-26 14:21:40 +0200 |
---|---|---|
committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-08-26 14:21:40 +0200 |
commit | 6baf7bb88b1b02221b2d213d089f1077aae4ee1d (patch) | |
tree | 12975c88bc6f3504d3ba831f3edca7cfb2993d17 /zebra/zebra_routemap.c | |
parent | Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga in... (diff) | |
download | frr-6baf7bb88b1b02221b2d213d089f1077aae4ee1d.tar.xz frr-6baf7bb88b1b02221b2d213d089f1077aae4ee1d.zip |
Create override for quagga reinstall of originated routes
Ticket: CM-7026
Reviewed by: CCR-3315
Testing: See bug
Quagga-dev suggested these changes for the quagga override of originated routes.
Diffstat (limited to 'zebra/zebra_routemap.c')
-rw-r--r-- | zebra/zebra_routemap.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c index ec8ee45cd..6648b8a4d 100644 --- a/zebra/zebra_routemap.c +++ b/zebra/zebra_routemap.c @@ -33,6 +33,7 @@ #include "zebra/zserv.h" #include "zebra/debug.h" #include "zebra/zebra_rnh.h" +#include "zebra/zebra_routemap.h" static u_int32_t zebra_rmap_update_timer = ZEBRA_RMAP_DEFAULT_UPDATE_TIMER; static struct thread *zebra_t_rmap_update = NULL; @@ -1558,16 +1559,11 @@ zebra_route_map_event (route_map_event_t event, const char *rmap_name) } /* ip protocol configuration write function */ -static int config_write_protocol(struct vty *vty) +void +zebra_routemap_config_write_protocol (struct vty *vty) { int i; - if (zebra_rnh_ip_default_route) - vty_out (vty, "ip nht resolve-via-default%s", VTY_NEWLINE); - - if (zebra_rnh_ipv6_default_route) - vty_out (vty, "ipv6 nht resolve-via-default%s", VTY_NEWLINE); - for (i=0;i<ZEBRA_ROUTE_MAX;i++) { if (proto_rm[AFI_IP][i]) @@ -1598,15 +1594,11 @@ static int config_write_protocol(struct vty *vty) if (zebra_rmap_update_timer != ZEBRA_RMAP_DEFAULT_UPDATE_TIMER) vty_out (vty, "zebra route-map delay-timer %d%s", zebra_rmap_update_timer, VTY_NEWLINE); - return 1; } -/* table node for protocol filtering */ -static struct cmd_node protocol_node = { PROTOCOL_NODE, "", 1 }; void zebra_route_map_init () { - install_node (&protocol_node, config_write_protocol); install_element (CONFIG_NODE, &ip_protocol_cmd); install_element (CONFIG_NODE, &no_ip_protocol_cmd); install_element (CONFIG_NODE, &no_ip_protocol_val_cmd); |