break;
case ZEBRA_DPLANE_REQUEST_FAILURE:
{
- char str[SRCDEST2STR_BUFFER];
-
- srcdest_rnode2str(rn, str, sizeof(str));
flog_err(EC_ZEBRA_DP_INSTALL_FAIL,
- "%u:%u:%s: Failed to enqueue dataplane install",
- re->vrf_id, re->table, str);
+ "%u:%u:%pRN: Failed to enqueue dataplane install",
+ re->vrf_id, re->table, rn);
break;
}
case ZEBRA_DPLANE_REQUEST_SUCCESS:
zvrf->removals_queued++;
break;
case ZEBRA_DPLANE_REQUEST_FAILURE:
- {
- char str[SRCDEST2STR_BUFFER];
-
- srcdest_rnode2str(rn, str, sizeof(str));
flog_err(EC_ZEBRA_DP_INSTALL_FAIL,
- "%u:%s: Failed to enqueue dataplane uninstall",
- re->vrf_id, str);
+ "%u:%pRN: Failed to enqueue dataplane uninstall",
+ re->vrf_id, rn);
break;
- }
case ZEBRA_DPLANE_REQUEST_SUCCESS:
if (zvrf)
zvrf->removals++;
* would match a more specific route
*/
while (rn) {
- if (IS_ZEBRA_DEBUG_NHT_DETAILED) {
- char buf[PREFIX_STRLEN];
-
+ if (IS_ZEBRA_DEBUG_NHT_DETAILED)
zlog_debug(
- "%s: %s Being examined for Nexthop Tracking Count: %zd",
- __func__,
- srcdest_rnode2str(rn, buf, sizeof(buf)),
+ "%s: %pRN Being examined for Nexthop Tracking Count: %zd",
+ __func__, rn,
dest ? rnh_list_count(&dest->nht) : 0);
- }
+
if (!dest) {
rn = rn->parent;
if (rn)
zebra_vrf_lookup_by_id(rnh->vrf_id);
struct prefix *p = &rnh->node->p;
- if (IS_ZEBRA_DEBUG_NHT_DETAILED) {
- char buf1[PREFIX_STRLEN];
-
+ if (IS_ZEBRA_DEBUG_NHT_DETAILED)
zlog_debug(
- "%s(%u):%s has Nexthop(%pFX) Type: %s depending on it, evaluating %u:%u",
+ "%s(%u):%pRN has Nexthop(%pFX) Type: %s depending on it, evaluating %u:%u",
zvrf_name(zvrf), zvrf_id(zvrf),
- srcdest_rnode2str(rn, buf1,
- sizeof(buf1)),
- p, rnh_type2str(rnh->type), seq,
+ rn, p, rnh_type2str(rnh->type), seq,
rnh->seqno);
- }
/*
* If we have evaluated this node on this pass
return;
}
- if (IS_ZEBRA_DEBUG_RIB) {
- char buf[SRCDEST2STR_BUFFER];
- srcdest_rnode2str(rn, buf, sizeof(buf));
- zlog_debug("%s(%u:%u):%s: Adding route rn %p, re %p (%s)",
- zvrf_name(zvrf), zvrf_id(zvrf), new->table, buf, rn,
+ if (IS_ZEBRA_DEBUG_RIB)
+ zlog_debug("%s(%u:%u):%pRN: Adding route rn %p, re %p (%s)",
+ zvrf_name(zvrf), zvrf_id(zvrf), new->table, rn, rn,
new, zebra_route_string(new->type));
- }
/* If labeled-unicast route, install transit LSP. */
if (zebra_rib_labeled_unicast(new))
hook_call(rib_update, rn, "removing existing route");
/* Uninstall from kernel. */
- if (IS_ZEBRA_DEBUG_RIB) {
- char buf[SRCDEST2STR_BUFFER];
- srcdest_rnode2str(rn, buf, sizeof(buf));
- zlog_debug("%s(%u:%u):%s: Deleting route rn %p, re %p (%s)",
- zvrf_name(zvrf), zvrf_id(zvrf), old->table, buf, rn,
+ if (IS_ZEBRA_DEBUG_RIB)
+ zlog_debug("%s(%u:%u):%pRN: Deleting route rn %p, re %p (%s)",
+ zvrf_name(zvrf), zvrf_id(zvrf), old->table, rn, rn,
old, zebra_route_string(old->type));
- }
/* If labeled-unicast route, uninstall transit LSP. */
if (zebra_rib_labeled_unicast(old))
*/
if (nh_active) {
if (IS_ZEBRA_DEBUG_RIB) {
- char buf[SRCDEST2STR_BUFFER];
-
- srcdest_rnode2str(rn, buf, sizeof(buf));
if (new != old)
zlog_debug(
- "%s(%u:%u):%s: Updating route rn %p, re %p (%s) old %p (%s)",
+ "%s(%u:%u):%pRN: Updating route rn %p, re %p (%s) old %p (%s)",
zvrf_name(zvrf), zvrf_id(zvrf),
- new->table, buf, rn, new,
+ new->table, rn, rn, new,
zebra_route_string(new->type),
old,
zebra_route_string(old->type));
else
zlog_debug(
- "%s(%u:%u):%s: Updating route rn %p, re %p (%s)",
+ "%s(%u:%u):%pRN: Updating route rn %p, re %p (%s)",
zvrf_name(zvrf), zvrf_id(zvrf),
- new->table, buf, rn, new,
+ new->table, rn, rn, new,
zebra_route_string(new->type));
}
*/
if (!nh_active) {
if (IS_ZEBRA_DEBUG_RIB) {
- char buf[SRCDEST2STR_BUFFER];
- srcdest_rnode2str(rn, buf, sizeof(buf));
if (new != old)
zlog_debug(
- "%s(%u:%u):%s: Deleting route rn %p, re %p (%s) old %p (%s) - nexthop inactive",
+ "%s(%u:%u):%pRN: Deleting route rn %p, re %p (%s) old %p (%s) - nexthop inactive",
zvrf_name(zvrf), zvrf_id(zvrf),
- new->table, buf, rn, new,
+ new->table, rn, rn, new,
zebra_route_string(new->type),
old,
zebra_route_string(old->type));
else
zlog_debug(
- "%s(%u:%u):%s: Deleting route rn %p, re %p (%s) - nexthop inactive",
+ "%s(%u:%u):%pRN: Deleting route rn %p, re %p (%s) - nexthop inactive",
zvrf_name(zvrf), zvrf_id(zvrf),
- new->table, buf, rn, new,
+ new->table, rn, rn, new,
zebra_route_string(new->type));
}
struct route_entry *old_fib = NULL;
struct route_entry *new_fib = NULL;
struct route_entry *best = NULL;
- char buf[SRCDEST2STR_BUFFER];
rib_dest_t *dest;
struct zebra_vrf *zvrf = NULL;
struct vrf *vrf;
vrf = vrf_lookup_by_id(vrf_id);
- if (IS_ZEBRA_DEBUG_RIB)
- srcdest_rnode2str(rn, buf, sizeof(buf));
-
/*
* we can have rn's that have a NULL info pointer
* (dest). As such let's not let the deref happen
if (IS_ZEBRA_DEBUG_RIB_DETAILED) {
struct route_entry *re = re_list_first(&dest->routes);
- zlog_debug("%s(%u:%u):%s: Processing rn %p",
- VRF_LOGNAME(vrf), vrf_id, re->table, buf,
+ zlog_debug("%s(%u:%u):%pRN: Processing rn %p",
+ VRF_LOGNAME(vrf), vrf_id, re->table, rn,
rn);
}
char status_buf[128];
zlog_debug(
- "%s(%u:%u):%s: Examine re %p (%s) status: %sflags: %sdist %d metric %d",
- VRF_LOGNAME(vrf), vrf_id, re->table, buf, re,
+ "%s(%u:%u):%pRN: Examine re %p (%s) status: %sflags: %sdist %d metric %d",
+ VRF_LOGNAME(vrf), vrf_id, re->table, rn, re,
zebra_route_string(re->type),
_dump_re_status(re, status_buf,
sizeof(status_buf)),
if (re != old_selected) {
if (IS_ZEBRA_DEBUG_RIB)
zlog_debug(
- "%s: %s(%u):%s: imported via import-table but denied by the ip protocol table route-map",
+ "%s: %s(%u):%pRN: imported via import-table but denied by the ip protocol table route-map",
__func__,
VRF_LOGNAME(
vrf),
- vrf_id, buf);
+ vrf_id, rn);
rib_unlink(rn, re);
} else
SET_FLAG(re->status,
: new_fib ? new_fib : NULL;
zlog_debug(
- "%s(%u:%u):%s: After processing: old_selected %p new_selected %p old_fib %p new_fib %p",
- VRF_LOGNAME(vrf), vrf_id, entry ? entry->table : 0, buf,
+ "%s(%u:%u):%pRN: After processing: old_selected %p new_selected %p old_fib %p new_fib %p",
+ VRF_LOGNAME(vrf), vrf_id, entry ? entry->table : 0, rn,
(void *)old_selected, (void *)new_selected,
(void *)old_fib, (void *)new_fib);
}
if (IS_ZEBRA_DEBUG_RIB_DETAILED) {
struct route_entry *re = NULL;
- char buf[SRCDEST2STR_BUFFER];
/*
* rib_process may have freed the dest
if (dest)
re = re_list_first(&dest->routes);
- srcdest_rnode2str(rnode, buf, sizeof(buf));
- zlog_debug("%s(%u:%u):%s: rn %p dequeued from sub-queue %u",
+ zlog_debug("%s(%u:%u):%pRN rn %p dequeued from sub-queue %u",
zvrf_name(zvrf), zvrf_id(zvrf), re ? re->table : 0,
- buf, rnode, qindex);
+ rnode, rnode, qindex);
}
if (rnode->info)
zebra_del_import_table_entry(zvrf, rn, re);
/* Just clean up if non main table */
- if (IS_ZEBRA_DEBUG_RIB) {
- char buf[SRCDEST2STR_BUFFER];
- srcdest_rnode2str(rn, buf, sizeof(buf));
- zlog_debug("%s(%u):%s: Freeing route rn %p, re %p (%s)",
- vrf_id_to_name(re->vrf_id), re->vrf_id, buf,
+ if (IS_ZEBRA_DEBUG_RIB)
+ zlog_debug("%s(%u):%pRN: Freeing route rn %p, re %p (%s)",
+ vrf_id_to_name(re->vrf_id), re->vrf_id, rn,
rn, re, zebra_route_string(re->type));
- }
rib_unlink(rn, re);
} else {