diff options
Diffstat (limited to 'pimd/pim_zlookup.c')
| -rw-r--r-- | pimd/pim_zlookup.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/pimd/pim_zlookup.c b/pimd/pim_zlookup.c index 05a72269d6..c19119fa47 100644 --- a/pimd/pim_zlookup.c +++ b/pimd/pim_zlookup.c @@ -122,10 +122,7 @@ void zclient_lookup_free(void) void zclient_lookup_new(void) { - struct zclient_options options = zclient_options_default; - options.synchronous = true; - - zlookup = zclient_new(router->master, &options, NULL, 0); + zlookup = zclient_new(router->master, &zclient_options_sync, NULL, 0); if (!zlookup) { flog_err(EC_LIB_ZAPI_SOCKET, "%s: zclient_new() failure", __func__); @@ -497,14 +494,14 @@ int pim_zlookup_sg_statistics(struct channel_oil *c_oil) int ret; pim_sgaddr more = {}; struct interface *ifp = - pim_if_find_by_vif_index(c_oil->pim, *oil_parent(c_oil)); + pim_if_find_by_vif_index(c_oil->pim, *oil_incoming_vif(c_oil)); if (PIM_DEBUG_ZEBRA) { more.src = *oil_origin(c_oil); more.grp = *oil_mcastgrp(c_oil); - zlog_debug( - "Sending Request for New Channel Oil Information%pSG VIIF %d(%s)", - &more, *oil_parent(c_oil), c_oil->pim->vrf->name); + zlog_debug("Sending Request for New Channel Oil Information%pSG VIIF %d(%s:%s)", + &more, *oil_incoming_vif(c_oil), + ifp ? ifp->name : "Unknown", c_oil->pim->vrf->name); } if (!ifp) |