matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

*: Modify notify_owner to route_notify_owner

Browse source 
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 <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2018-02-23 14:40:46 -05:00
parent 9a9f89267a
commit 28b11f8106
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
eigrpd/eigrp_zebra.c
View file

@ -94,8 +94,8 @@ static int eigrp_router_id_update_zebra(int command, struct zclient *zclient,
return 0; return 0;
} }
static int eigrp_zebra_notify_owner(int command, struct zclient *zclient, static int eigrp_zebra_route_notify_owner(int command, struct zclient *zclient,
zebra_size_t length, vrf_id_t vrf_id) zebra_size_t length, vrf_id_t vrf_id)
{ {
struct prefix p; struct prefix p;
enum zapi_route_notify_owner note; enum zapi_route_notify_owner note;
@ -129,7 +129,7 @@ void eigrp_zebra_init(void)
zclient->interface_address_delete = eigrp_interface_address_delete; zclient->interface_address_delete = eigrp_interface_address_delete;
zclient->redistribute_route_add = eigrp_zebra_read_route; zclient->redistribute_route_add = eigrp_zebra_read_route;
zclient->redistribute_route_del = 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;
} }

6
lib/zclient.c
View file

@ -2369,9 +2369,9 @@ static int zclient_read(struct thread *thread)
vrf_id); vrf_id);
break; break;
case ZEBRA_ROUTE_NOTIFY_OWNER: case ZEBRA_ROUTE_NOTIFY_OWNER:
if (zclient->notify_owner) if (zclient->route_notify_owner)
(*zclient->notify_owner)(command, zclient, (*zclient->route_notify_owner)(command, zclient, length,
length, vrf_id); vrf_id);
break; break;
default: default:
break; break;

4
lib/zclient.h
View file

@ -213,8 +213,8 @@ struct zclient {
int (*local_macip_add)(int, struct zclient *, uint16_t, vrf_id_t); 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 (*local_macip_del)(int, struct zclient *, uint16_t, vrf_id_t);
int (*pw_status_update)(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, int (*route_notify_owner)(int command, struct zclient *zclient,
uint16_t length, vrf_id_t vrf_id); uint16_t length, vrf_id_t vrf_id);
}; };
/* Zebra API message flag. */ /* Zebra API message flag. */

6
sharpd/sharp_zebra.c
View file

@ -131,8 +131,8 @@ static int interface_state_down(int command, struct zclient *zclient,
extern uint32_t total_routes; extern uint32_t total_routes;
extern uint32_t installed_routes; extern uint32_t installed_routes;
static int notify_owner(int command, struct zclient *zclient, static int route_notify_owner(int command, struct zclient *zclient,
zebra_size_t length, vrf_id_t vrf_id) zebra_size_t length, vrf_id_t vrf_id)
{ {
struct prefix p; struct prefix p;
enum zapi_route_notify_owner note; enum zapi_route_notify_owner note;
@ -211,5 +211,5 @@ void sharp_zebra_init(void)
zclient->interface_down = interface_state_down; zclient->interface_down = interface_state_down;
zclient->interface_address_add = interface_address_add; zclient->interface_address_add = interface_address_add;
zclient->interface_address_delete = interface_address_delete; zclient->interface_address_delete = interface_address_delete;
zclient->notify_owner = notify_owner; zclient->route_notify_owner = route_notify_owner;
} }