diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2022-12-11 17:20:40 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2023-03-24 13:32:17 +0100 |
| commit | 2453d15dbf7fff2d897c2182886486732be8ac35 (patch) | |
| tree | 7a054859acf25689f67d5df7aa9d50b20bca4b62 /ripd | |
| parent | *: Convert a bunch of thread_XX to event_XX (diff) | |
| download | frr-2453d15dbf7fff2d897c2182886486732be8ac35.tar.xz frr-2453d15dbf7fff2d897c2182886486732be8ac35.zip | |
*: Convert struct thread_master to struct event_master and it's ilk
Convert the `struct thread_master` to `struct event_master`
across the code base.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'ripd')
| -rw-r--r-- | ripd/rip_main.c | 2 | ||||
| -rw-r--r-- | ripd/rip_snmp.c | 4 | ||||
| -rw-r--r-- | ripd/rip_zebra.c | 2 | ||||
| -rw-r--r-- | ripd/ripd.h | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/ripd/rip_main.c b/ripd/rip_main.c index b6166b14c..f5743d814 100644 --- a/ripd/rip_main.c +++ b/ripd/rip_main.c @@ -47,7 +47,7 @@ struct zebra_privs_t ripd_privs = { .cap_num_i = 0}; /* Master of threads. */ -struct thread_master *master; +struct event_master *master; static struct frr_daemon_info ripd_di; diff --git a/ripd/rip_snmp.c b/ripd/rip_snmp.c index ab80dd1b8..d6db7f982 100644 --- a/ripd/rip_snmp.c +++ b/ripd/rip_snmp.c @@ -135,7 +135,7 @@ static struct variable rip_variables[] = { {RIP2PEERRCVBADPACKETS, COUNTER, RONLY, rip2PeerTable, 3, {4, 1, 5}}, {RIP2PEERRCVBADROUTES, COUNTER, RONLY, rip2PeerTable, 3, {4, 1, 6}}}; -extern struct thread_master *master; +extern struct event_master *master; static uint8_t *rip2Globals(struct variable *v, oid name[], size_t *length, int exact, size_t *var_len, @@ -553,7 +553,7 @@ static uint8_t *rip2PeerTable(struct variable *v, oid name[], size_t *length, } /* Register RIPv2-MIB. */ -static int rip_snmp_init(struct thread_master *master) +static int rip_snmp_init(struct event_master *master) { rip_ifaddr_table = route_table_init(); diff --git a/ripd/rip_zebra.c b/ripd/rip_zebra.c index 4a58d1225..3904c9e4b 100644 --- a/ripd/rip_zebra.c +++ b/ripd/rip_zebra.c @@ -223,7 +223,7 @@ zclient_handler *const rip_handlers[] = { [ZEBRA_REDISTRIBUTE_ROUTE_DEL] = rip_zebra_read_route, }; -void rip_zclient_init(struct thread_master *master) +void rip_zclient_init(struct event_master *master) { /* Set default value to the zebra client structure. */ zclient = zclient_new(master, &zclient_options_default, rip_handlers, diff --git a/ripd/ripd.h b/ripd/ripd.h index 4ae13e0d1..1b41ffab1 100644 --- a/ripd/ripd.h +++ b/ripd/ripd.h @@ -418,7 +418,7 @@ extern void rip_if_init(void); extern void rip_route_map_init(void); extern void rip_zebra_vrf_register(struct vrf *vrf); extern void rip_zebra_vrf_deregister(struct vrf *vrf); -extern void rip_zclient_init(struct thread_master *); +extern void rip_zclient_init(struct event_master *); extern void rip_zclient_stop(void); extern int if_check_address(struct rip *rip, struct in_addr addr); extern struct rip *rip_lookup_by_vrf_id(vrf_id_t vrf_id); @@ -509,7 +509,7 @@ extern struct zebra_privs_t ripd_privs; extern struct rip_instance_head rip_instances; /* Master thread structure. */ -extern struct thread_master *master; +extern struct event_master *master; DECLARE_HOOK(rip_ifaddr_add, (struct connected * ifc), (ifc)); DECLARE_HOOK(rip_ifaddr_del, (struct connected * ifc), (ifc)); |