diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2025-04-09 09:59:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-09 09:59:06 +0200 |
| commit | 8418e57791eabc9feba637b69bd9ee35bed6860a (patch) | |
| tree | 48b9c05795135606782f9ec359c3f319f5d534dc /pimd/pim_zebra.c | |
| parent | 1d426d99619b7818f4b63b52f83fadfe902b9854 (diff) | |
| parent | 27ba9956a15c17b7e8a6ba38aa8bbb4514fa90df (diff) | |
Merge pull request #17915 from mjstapp/compile_wshadow
Diffstat (limited to 'pimd/pim_zebra.c')
| -rw-r--r-- | pimd/pim_zebra.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c index f0ec3c6b6e..1f7e2b255f 100644 --- a/pimd/pim_zebra.c +++ b/pimd/pim_zebra.c @@ -38,7 +38,7 @@ #undef PIM_DEBUG_IFADDR_DUMP #define PIM_DEBUG_IFADDR_DUMP -struct zclient *zclient; +struct zclient *pim_zclient; /* Router-id update message from zebra. */ @@ -349,16 +349,16 @@ static void pim_zebra_vxlan_replay(void) struct stream *s = NULL; /* Check socket. */ - if (!zclient || zclient->sock < 0) + if (!pim_zclient || pim_zclient->sock < 0) return; - s = zclient->obuf; + s = pim_zclient->obuf; stream_reset(s); zclient_create_header(s, ZEBRA_VXLAN_SG_REPLAY, VRF_DEFAULT); stream_putw_at(s, 0, stream_get_endp(s)); - zclient_send_message(zclient); + zclient_send_message(pim_zclient); } void pim_scan_oil(struct pim_instance *pim) @@ -448,14 +448,14 @@ static zclient_handler *const pim_handlers[] = { void pim_zebra_init(void) { /* Socket for receiving updates from Zebra daemon */ - zclient = zclient_new(router->master, &zclient_options_default, - pim_handlers, array_size(pim_handlers)); + pim_zclient = zclient_new(router->master, &zclient_options_default, + pim_handlers, array_size(pim_handlers)); - zclient->zebra_capabilities = pim_zebra_capabilities; - zclient->zebra_connected = pim_zebra_connected; - zclient->nexthop_update = pim_nexthop_update; + pim_zclient->zebra_capabilities = pim_zebra_capabilities; + pim_zclient->zebra_connected = pim_zebra_connected; + pim_zclient->nexthop_update = pim_nexthop_update; - zclient_init(zclient, ZEBRA_ROUTE_PIM, 0, &pimd_privs); + zclient_init(pim_zclient, ZEBRA_ROUTE_PIM, 0, &pimd_privs); if (PIM_DEBUG_PIM_TRACE) { zlog_notice("%s: zclient socket initialized", __func__); } @@ -508,8 +508,8 @@ void pim_zebra_zclient_update(struct vty *vty) { vty_out(vty, "Zclient update socket: "); - if (zclient) { - vty_out(vty, "%d failures=%d\n", zclient->sock, zclient->fail); + if (pim_zclient) { + vty_out(vty, "%d failures=%d\n", pim_zclient->sock, pim_zclient->fail); } else { vty_out(vty, "<null zclient>\n"); } @@ -517,8 +517,8 @@ void pim_zebra_zclient_update(struct vty *vty) struct zclient *pim_zebra_zclient_get(void) { - if (zclient) - return zclient; + if (pim_zclient) + return pim_zclient; else return NULL; } @@ -526,5 +526,5 @@ struct zclient *pim_zebra_zclient_get(void) void pim_zebra_interface_set_master(struct interface *vrf, struct interface *ifp) { - zclient_interface_set_master(zclient, vrf, ifp); + zclient_interface_set_master(pim_zclient, vrf, ifp); } |