From 28b11f81061b12f599daf8016d948ca59a2f38cc Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 23 Feb 2018 14:40:46 -0500 Subject: [PATCH] *: Modify notify_owner to route_notify_owner In the future we are going to have a rule_notify_owner so make the distinction between the two types of notification clearer. Signed-off-by: Donald Sharp --- eigrpd/eigrp_zebra.c | 6 +++--- lib/zclient.c | 6 +++--- lib/zclient.h | 4 ++-- sharpd/sharp_zebra.c | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eigrpd/eigrp_zebra.c b/eigrpd/eigrp_zebra.c index 513fda06f3..e8392f50b4 100644 --- a/eigrpd/eigrp_zebra.c +++ b/eigrpd/eigrp_zebra.c @@ -94,8 +94,8 @@ static int eigrp_router_id_update_zebra(int command, struct zclient *zclient, return 0; } -static int eigrp_zebra_notify_owner(int command, struct zclient *zclient, - zebra_size_t length, vrf_id_t vrf_id) +static int eigrp_zebra_route_notify_owner(int command, struct zclient *zclient, + zebra_size_t length, vrf_id_t vrf_id) { struct prefix p; enum zapi_route_notify_owner note; @@ -129,7 +129,7 @@ void eigrp_zebra_init(void) zclient->interface_address_delete = eigrp_interface_address_delete; zclient->redistribute_route_add = eigrp_zebra_read_route; zclient->redistribute_route_del = eigrp_zebra_read_route; - zclient->notify_owner = eigrp_zebra_notify_owner; + zclient->route_notify_owner = eigrp_zebra_route_notify_owner; } diff --git a/lib/zclient.c b/lib/zclient.c index d6a6cee731..d11457a859 100644 --- a/lib/zclient.c +++ b/lib/zclient.c @@ -2369,9 +2369,9 @@ static int zclient_read(struct thread *thread) vrf_id); break; case ZEBRA_ROUTE_NOTIFY_OWNER: - if (zclient->notify_owner) - (*zclient->notify_owner)(command, zclient, - length, vrf_id); + if (zclient->route_notify_owner) + (*zclient->route_notify_owner)(command, zclient, length, + vrf_id); break; default: break; diff --git a/lib/zclient.h b/lib/zclient.h index 21785abfbc..4c84af1f61 100644 --- a/lib/zclient.h +++ b/lib/zclient.h @@ -213,8 +213,8 @@ struct zclient { int (*local_macip_add)(int, struct zclient *, uint16_t, vrf_id_t); int (*local_macip_del)(int, struct zclient *, uint16_t, vrf_id_t); int (*pw_status_update)(int, struct zclient *, uint16_t, vrf_id_t); - int (*notify_owner)(int command, struct zclient *zclient, - uint16_t length, vrf_id_t vrf_id); + int (*route_notify_owner)(int command, struct zclient *zclient, + uint16_t length, vrf_id_t vrf_id); }; /* Zebra API message flag. */ diff --git a/sharpd/sharp_zebra.c b/sharpd/sharp_zebra.c index b39fc47d3d..3b22db20aa 100644 --- a/sharpd/sharp_zebra.c +++ b/sharpd/sharp_zebra.c @@ -131,8 +131,8 @@ static int interface_state_down(int command, struct zclient *zclient, extern uint32_t total_routes; extern uint32_t installed_routes; -static int notify_owner(int command, struct zclient *zclient, - zebra_size_t length, vrf_id_t vrf_id) +static int route_notify_owner(int command, struct zclient *zclient, + zebra_size_t length, vrf_id_t vrf_id) { struct prefix p; enum zapi_route_notify_owner note; @@ -211,5 +211,5 @@ void sharp_zebra_init(void) zclient->interface_down = interface_state_down; zclient->interface_address_add = interface_address_add; zclient->interface_address_delete = interface_address_delete; - zclient->notify_owner = notify_owner; + zclient->route_notify_owner = route_notify_owner; } -- 2.39.5