diff options
| author | Russ White <russ@riw.us> | 2021-10-26 11:33:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-26 11:33:44 -0400 |
| commit | a2b52cbeb43f28daea6363f2fc6962347dfab334 (patch) | |
| tree | 7d7b62d44195d08642c826a80720b97635223d6c /staticd | |
| parent | fd1aebbe776ce5ee5d5ba554bf277f820e4a27b5 (diff) | |
| parent | a243d1db93aaa123413a754fe69fbad36d810ae7 (diff) | |
Merge pull request #9854 from opensourcerouting/zapi-call-table
*: convert zclient callbacks to table
Diffstat (limited to 'staticd')
| -rw-r--r-- | staticd/static_zebra.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/staticd/static_zebra.c b/staticd/static_zebra.c index a01ecad815..538fae28aa 100644 --- a/staticd/static_zebra.c +++ b/staticd/static_zebra.c @@ -508,6 +508,13 @@ extern void static_zebra_route_add(struct static_path *pn, bool install) zclient, &api); } +static zclient_handler *const static_handlers[] = { + [ZEBRA_INTERFACE_ADDRESS_ADD] = interface_address_add, + [ZEBRA_INTERFACE_ADDRESS_DELETE] = interface_address_delete, + [ZEBRA_ROUTE_NOTIFY_OWNER] = route_notify_owner, + [ZEBRA_NEXTHOP_UPDATE] = static_zebra_nexthop_update, +}; + void static_zebra_init(void) { struct zclient_options opt = { .receive_notify = true }; @@ -515,15 +522,12 @@ void static_zebra_init(void) if_zapi_callbacks(static_ifp_create, static_ifp_up, static_ifp_down, static_ifp_destroy); - zclient = zclient_new(master, &opt); + zclient = zclient_new(master, &opt, static_handlers, + array_size(static_handlers)); zclient_init(zclient, ZEBRA_ROUTE_STATIC, 0, &static_privs); zclient->zebra_capabilities = static_zebra_capabilities; zclient->zebra_connected = zebra_connected; - zclient->interface_address_add = interface_address_add; - zclient->interface_address_delete = interface_address_delete; - zclient->route_notify_owner = route_notify_owner; - zclient->nexthop_update = static_zebra_nexthop_update; static_nht_hash = hash_create(static_nht_hash_key, static_nht_hash_cmp, |