diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-12-09 04:26:55 -0800 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-12-09 04:26:55 -0800 |
| commit | 451e7cd49e081de307b682dc24b0ed850e22edfb (patch) | |
| tree | 9cd6f76b39523cd35703a1583a6ec32bac8849a6 /zebra/zebra_routemap.c | |
| parent | f6b66ab319e8afd125f3f8eda69fe0dbf132d513 (diff) | |
| parent | 3d63d59fd1ac70e3bdfc243a40d1cfbc5c547ac6 (diff) | |
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
Diffstat (limited to 'zebra/zebra_routemap.c')
| -rw-r--r-- | zebra/zebra_routemap.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c index 4833fa2182..613b817481 100644 --- a/zebra/zebra_routemap.c +++ b/zebra/zebra_routemap.c @@ -784,9 +784,10 @@ DEFUN (ip_protocol, proto_rm[AFI_IP][i] = XSTRDUP (MTYPE_ROUTE_MAP_NAME, argv[1]); if (IS_ZEBRA_DEBUG_RIB_DETAILED) - zlog_debug ("%s: calling rib_update", __func__); + zlog_debug ("%u: IPv4 Routemap config for protocol %s, scheduling RIB processing", + VRF_DEFAULT, argv[0]); - rib_update(VRF_DEFAULT); + rib_update(VRF_DEFAULT, RIB_UPDATE_RMAP_CHANGE); return CMD_SUCCESS; } @@ -821,9 +822,9 @@ DEFUN (no_ip_protocol, proto_rm[AFI_IP][i] = NULL; if (IS_ZEBRA_DEBUG_RIB_DETAILED) - zlog_debug ("%s: calling rib_update", __func__); - - rib_update(VRF_DEFAULT); + zlog_debug ("%u: IPv4 Routemap unconfig for protocol %s, scheduling RIB processing", + VRF_DEFAULT, argv[0]); + rib_update(VRF_DEFAULT, RIB_UPDATE_RMAP_CHANGE); } return CMD_SUCCESS; } @@ -896,9 +897,10 @@ DEFUN (ipv6_protocol, proto_rm[AFI_IP6][i] = XSTRDUP (MTYPE_ROUTE_MAP_NAME, argv[1]); if (IS_ZEBRA_DEBUG_RIB_DETAILED) - zlog_debug ("%s: calling rib_update", __func__); + zlog_debug ("%u: IPv6 Routemap config for protocol %s, scheduling RIB processing", + VRF_DEFAULT, argv[0]); - rib_update(VRF_DEFAULT); + rib_update(VRF_DEFAULT, RIB_UPDATE_RMAP_CHANGE); return CMD_SUCCESS; } @@ -933,9 +935,10 @@ DEFUN (no_ipv6_protocol, proto_rm[AFI_IP6][i] = NULL; if (IS_ZEBRA_DEBUG_RIB_DETAILED) - zlog_debug ("%s: calling rib_update", __func__); + zlog_debug ("%u: IPv6 Routemap unconfig for protocol %s, scheduling RIB processing", + VRF_DEFAULT, argv[0]); - rib_update(VRF_DEFAULT); + rib_update(VRF_DEFAULT, RIB_UPDATE_RMAP_CHANGE); } return CMD_SUCCESS; } @@ -1605,9 +1608,10 @@ zebra_route_map_update_timer (struct thread *thread) zlog_debug("Event driven route-map update triggered"); if (IS_ZEBRA_DEBUG_RIB_DETAILED) - zlog_debug ("%s: calling rib_update", __func__); + zlog_debug ("%u: Routemap update-timer fired, scheduling RIB processing", + VRF_DEFAULT); - rib_update(VRF_DEFAULT); + rib_update(VRF_DEFAULT, RIB_UPDATE_RMAP_CHANGE); zebra_evaluate_rnh(0, AF_INET, 1, RNH_NEXTHOP_TYPE, NULL); zebra_evaluate_rnh(0, AF_INET6, 1, RNH_NEXTHOP_TYPE, NULL); |