proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 14:34:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7214 from donaldsharp/more_vrf_usefulness

Browse Source 
zebra: cleanup zebra_rnh.c debugs
This commit is contained in:
Mark Stapp 2020-10-06 08:29:45 -04:00 committed by GitHub
commit 628995a30c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 65 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
zebra/zebra_rnh.c
View File

@ -86,12 +86,6 @@ static inline struct route_table *get_rnh_table(vrf_id_t vrfid, afi_t afi,
return t; return t;
} }
char *rnh_str(struct rnh *rnh, char *buf, int size)
{
prefix2str(&(rnh->node->p), buf, size);
return buf;
}
static void zebra_rnh_remove_from_routing_table(struct rnh *rnh) static void zebra_rnh_remove_from_routing_table(struct rnh *rnh)
{ {
struct zebra_vrf *zvrf = zebra_vrf_lookup_by_id(rnh->vrf_id); struct zebra_vrf *zvrf = zebra_vrf_lookup_by_id(rnh->vrf_id);
@ -106,15 +100,10 @@ static void zebra_rnh_remove_from_routing_table(struct rnh *rnh)
if (!rn) if (!rn)
return; return;
if (IS_ZEBRA_DEBUG_NHT_DETAILED) { if (IS_ZEBRA_DEBUG_NHT_DETAILED)
char buf[PREFIX_STRLEN]; zlog_debug("%s: %s(%u):%pRN removed from tracking on %pRN",
char buf1[PREFIX_STRLEN]; __func__, VRF_LOGNAME(zvrf->vrf), rnh->vrf_id,
rnh->node, rn);
zlog_debug("%s: %u:%s removed from tracking on %s", __func__,
rnh->vrf_id,
prefix2str(&rnh->node->p, buf, sizeof(buf)),
srcdest_rnode2str(rn, buf1, sizeof(buf)));
}
dest = rib_dest_from_rnode(rn); dest = rib_dest_from_rnode(rn);
rnh_list_del(&dest->nht, rnh); rnh_list_del(&dest->nht, rnh);
@ -132,15 +121,10 @@ static void zebra_rnh_store_in_routing_table(struct rnh *rnh)
if (!rn) if (!rn)
return; return;
if (IS_ZEBRA_DEBUG_NHT_DETAILED) { if (IS_ZEBRA_DEBUG_NHT_DETAILED)
char buf[PREFIX_STRLEN]; zlog_debug("%s: %s(%u):%pRN added for tracking on %pRN",
char buf1[PREFIX_STRLEN]; __func__, VRF_LOGNAME(zvrf->vrf), rnh->vrf_id,
rnh->node, rn);
zlog_debug("%s: %u:%s added for tracking on %s", __func__,
rnh->vrf_id,
prefix2str(&rnh->node->p, buf, sizeof(buf)),
srcdest_rnode2str(rn, buf1, sizeof(buf)));
}
dest = rib_dest_from_rnode(rn); dest = rib_dest_from_rnode(rn);
rnh_list_add_tail(&dest->nht, rnh); rnh_list_add_tail(&dest->nht, rnh);
@ -153,20 +137,21 @@ struct rnh *zebra_add_rnh(struct prefix *p, vrf_id_t vrfid, enum rnh_type type,
struct route_table *table; struct route_table *table;
struct route_node *rn; struct route_node *rn;
struct rnh *rnh = NULL; struct rnh *rnh = NULL;
char buf[PREFIX2STR_BUFFER];
afi_t afi = family2afi(p->family); afi_t afi = family2afi(p->family);
if (IS_ZEBRA_DEBUG_NHT) { if (IS_ZEBRA_DEBUG_NHT) {
prefix2str(p, buf, sizeof(buf)); struct vrf *vrf = vrf_lookup_by_id(vrfid);
zlog_debug("%u: Add RNH %s type %s", vrfid, buf,
rnh_type2str(type)); zlog_debug("%s(%u): Add RNH %pFX type %s", VRF_LOGNAME(vrf),
vrfid, p, rnh_type2str(type));
} }
table = get_rnh_table(vrfid, afi, type); table = get_rnh_table(vrfid, afi, type);
if (!table) { if (!table) {
prefix2str(p, buf, sizeof(buf)); struct vrf *vrf = vrf_lookup_by_id(vrfid);
flog_warn(EC_ZEBRA_RNH_NO_TABLE, flog_warn(EC_ZEBRA_RNH_NO_TABLE,
"%u: Add RNH %s type %s - table not found", vrfid, "%s(%u): Add RNH %pFX type %s - table not found",
buf, rnh_type2str(type)); VRF_LOGNAME(vrf), vrfid, p, rnh_type2str(type));
exists = false; exists = false;
return NULL; return NULL;
} }
@ -270,9 +255,10 @@ static void zebra_delete_rnh(struct rnh *rnh, enum rnh_type type)
return; return;
if (IS_ZEBRA_DEBUG_NHT) { if (IS_ZEBRA_DEBUG_NHT) {
char buf[PREFIX2STR_BUFFER]; struct vrf *vrf = vrf_lookup_by_id(rnh->vrf_id);
zlog_debug("%u: Del RNH %s type %s", rnh->vrf_id,
rnh_str(rnh, buf, sizeof(buf)), rnh_type2str(type)); zlog_debug("%s(%u): Del RNH %pRN type %s", VRF_LOGNAME(vrf),
rnh->vrf_id, rnh->node, rnh_type2str(type));
} }
zebra_free_rnh(rnh); zebra_free_rnh(rnh);
@ -292,10 +278,12 @@ void zebra_add_rnh_client(struct rnh *rnh, struct zserv *client,
enum rnh_type type, vrf_id_t vrf_id) enum rnh_type type, vrf_id_t vrf_id)
{ {
if (IS_ZEBRA_DEBUG_NHT) { if (IS_ZEBRA_DEBUG_NHT) {
char buf[PREFIX2STR_BUFFER]; struct vrf *vrf = vrf_lookup_by_id(vrf_id);
zlog_debug("%u: Client %s registers for RNH %s type %s", vrf_id,
zebra_route_string(client->proto), zlog_debug("%s(%u): Client %s registers for RNH %pRN type %s",
rnh_str(rnh, buf, sizeof(buf)), rnh_type2str(type)); VRF_LOGNAME(vrf), vrf_id,
zebra_route_string(client->proto), rnh->node,
rnh_type2str(type));
} }
if (!listnode_lookup(rnh->client_list, client)) if (!listnode_lookup(rnh->client_list, client))
listnode_add(rnh->client_list, client); listnode_add(rnh->client_list, client);
@ -311,10 +299,11 @@ void zebra_remove_rnh_client(struct rnh *rnh, struct zserv *client,
enum rnh_type type) enum rnh_type type)
{ {
if (IS_ZEBRA_DEBUG_NHT) { if (IS_ZEBRA_DEBUG_NHT) {
char buf[PREFIX2STR_BUFFER]; struct vrf *vrf = vrf_lookup_by_id(rnh->vrf_id);
zlog_debug("Client %s unregisters for RNH %s type %s",
zebra_route_string(client->proto), zlog_debug("Client %s unregisters for RNH %s(%u)%pRN type %s",
rnh_str(rnh, buf, sizeof(buf)), rnh_type2str(type)); zebra_route_string(client->proto), VRF_LOGNAME(vrf),
vrf->vrf_id, rnh->node, rnh_type2str(type));
} }
listnode_delete(rnh->client_list, client); listnode_delete(rnh->client_list, client);
zebra_delete_rnh(rnh, type); zebra_delete_rnh(rnh, type);
@ -456,13 +445,9 @@ zebra_rnh_resolve_import_entry(struct zebra_vrf *zvrf, afi_t afi,
return NULL; return NULL;
if (IS_ZEBRA_DEBUG_NHT_DETAILED) { if (IS_ZEBRA_DEBUG_NHT_DETAILED) {
char buf[PREFIX_STRLEN]; zlog_debug("%s: %s(%u):%pRN Resolved Import Entry to %pRN",
char buf1[SRCDEST2STR_BUFFER]; __func__, VRF_LOGNAME(zvrf->vrf), rnh->vrf_id,
rnh->node, rn);
zlog_debug("%s: %u:%s Resolved Import Entry to %s", __func__,
rnh->vrf_id,
prefix2str(&rnh->node->p, buf, sizeof(buf)),
srcdest_rnode2str(rn, buf1, sizeof(buf1)));
} }
/* Identify appropriate route entry. */ /* Identify appropriate route entry. */
@ -523,9 +508,9 @@ static void zebra_rnh_eval_import_check_entry(struct zebra_vrf *zvrf, afi_t afi,
if (state_changed || force) { if (state_changed || force) {
if (IS_ZEBRA_DEBUG_NHT) { if (IS_ZEBRA_DEBUG_NHT) {
prefix2str(&nrn->p, bufn, INET6_ADDRSTRLEN); prefix2str(&nrn->p, bufn, INET6_ADDRSTRLEN);
zlog_debug("%u:%s: Route import check %s %s", zlog_debug("%s(%u):%pRN: Route import check %s %s",
zvrf->vrf->vrf_id, VRF_LOGNAME(zvrf->vrf), zvrf->vrf->vrf_id,
bufn, rnh->state ? "passed" : "failed", nrn, rnh->state ? "passed" : "failed",
state_changed ? "(state changed)" : ""); state_changed ? "(state changed)" : "");
} }
/* state changed, notify clients */ /* state changed, notify clients */
@ -548,19 +533,17 @@ static void zebra_rnh_notify_protocol_clients(struct zebra_vrf *zvrf, afi_t afi,
{ {
struct listnode *node; struct listnode *node;
struct zserv *client; struct zserv *client;
char bufn[INET6_ADDRSTRLEN];
char bufp[INET6_ADDRSTRLEN];
int num_resolving_nh; int num_resolving_nh;
if (IS_ZEBRA_DEBUG_NHT) { if (IS_ZEBRA_DEBUG_NHT) {
prefix2str(&nrn->p, bufn, INET6_ADDRSTRLEN);
if (prn && re) { if (prn && re) {
srcdest_rnode2str(prn, bufp, INET6_ADDRSTRLEN); zlog_debug("%s(%u):%pRN: NH resolved over route %pRN",
zlog_debug("%u:%s: NH resolved over route %s", VRF_LOGNAME(zvrf->vrf), zvrf->vrf->vrf_id,
zvrf->vrf->vrf_id, bufn, bufp); nrn, prn);
} else } else
zlog_debug("%u:%s: NH has become unresolved", zlog_debug("%s(%u):%pRN: NH has become unresolved",
zvrf->vrf->vrf_id, bufn); VRF_LOGNAME(zvrf->vrf), zvrf->vrf->vrf_id,
nrn);
} }
for (ALL_LIST_ELEMENTS_RO(rnh->client_list, node, client)) { for (ALL_LIST_ELEMENTS_RO(rnh->client_list, node, client)) {
@ -579,8 +562,9 @@ static void zebra_rnh_notify_protocol_clients(struct zebra_vrf *zvrf, afi_t afi,
if (IS_ZEBRA_DEBUG_NHT) if (IS_ZEBRA_DEBUG_NHT)
zlog_debug( zlog_debug(
"%u:%s: Notifying client %s about NH %s", "%s(%u):%pRN: Notifying client %s about NH %s",
zvrf->vrf->vrf_id, bufn, VRF_LOGNAME(zvrf->vrf),
zvrf->vrf->vrf_id, nrn,
zebra_route_string(client->proto), zebra_route_string(client->proto),
num_resolving_nh num_resolving_nh
? "" ? ""
@ -589,8 +573,9 @@ static void zebra_rnh_notify_protocol_clients(struct zebra_vrf *zvrf, afi_t afi,
rnh->filtered[client->proto] = 0; rnh->filtered[client->proto] = 0;
if (IS_ZEBRA_DEBUG_NHT) if (IS_ZEBRA_DEBUG_NHT)
zlog_debug( zlog_debug(
"%u:%s: Notifying client %s about NH (unreachable)", "%s(%u):%pRN: Notifying client %s about NH (unreachable)",
zvrf->vrf->vrf_id, bufn, VRF_LOGNAME(zvrf->vrf),
zvrf->vrf->vrf_id, nrn,
zebra_route_string(client->proto)); zebra_route_string(client->proto));
} }
@ -648,15 +633,10 @@ zebra_rnh_resolve_nexthop_entry(struct zebra_vrf *zvrf, afi_t afi,
* most-specific match. Do similar logic as in zebra_rib.c * most-specific match. Do similar logic as in zebra_rib.c
*/ */
while (rn) { while (rn) {
if (IS_ZEBRA_DEBUG_NHT_DETAILED) { if (IS_ZEBRA_DEBUG_NHT_DETAILED)
char buf[PREFIX_STRLEN]; zlog_debug("%s: %s(%u):%pRN Possible Match to %pRN",
char buf1[PREFIX_STRLEN]; __func__, VRF_LOGNAME(zvrf->vrf),
rnh->vrf_id, rnh->node, rn);
zlog_debug("%s: %u:%s Possible Match to %s", __func__,
rnh->vrf_id,
prefix2str(&rnh->node->p, buf, sizeof(buf)),
srcdest_rnode2str(rn, buf1, sizeof(buf)));
}
/* Do not resolve over default route unless allowed && /* Do not resolve over default route unless allowed &&
* match route to be exact if so specified * match route to be exact if so specified
@ -819,12 +799,11 @@ static void zebra_rnh_evaluate_entry(struct zebra_vrf *zvrf, afi_t afi,
struct rnh *rnh; struct rnh *rnh;
struct route_entry *re; struct route_entry *re;
struct route_node *prn; struct route_node *prn;
char bufn[INET6_ADDRSTRLEN];
if (IS_ZEBRA_DEBUG_NHT) { if (IS_ZEBRA_DEBUG_NHT) {
prefix2str(&nrn->p, bufn, INET6_ADDRSTRLEN); zlog_debug("%s(%u):%pRN: Evaluate RNH, type %s %s",
zlog_debug("%u:%s: Evaluate RNH, type %s %s", zvrf->vrf->vrf_id, VRF_LOGNAME(zvrf->vrf), zvrf->vrf->vrf_id, nrn,
bufn, rnh_type2str(type), force ? "(force)" : ""); rnh_type2str(type), force ? "(force)" : "");
} }
rnh = nrn->info; rnh = nrn->info;
@ -1289,10 +1268,15 @@ static int zebra_cleanup_rnh_client(vrf_id_t vrf_id, afi_t afi,
struct route_node *nrn; struct route_node *nrn;
struct rnh *rnh; struct rnh *rnh;
if (IS_ZEBRA_DEBUG_NHT) if (IS_ZEBRA_DEBUG_NHT) {
zlog_debug("%u: Client %s RNH cleanup for family %s type %s", struct vrf *vrf = vrf_lookup_by_id(vrf_id);
vrf_id, zebra_route_string(client->proto),
afi2str(afi), rnh_type2str(type)); zlog_debug(
"%s(%u): Client %s RNH cleanup for family %s type %s",
VRF_LOGNAME(vrf), vrf_id,
zebra_route_string(client->proto), afi2str(afi),
rnh_type2str(type));
}
ntable = get_rnh_table(vrf_id, afi, type); ntable = get_rnh_table(vrf_id, afi, type);
if (!ntable) { if (!ntable) {

1
zebra/zebra_rnh.h
View File

@ -61,7 +61,6 @@ extern void zebra_evaluate_rnh(struct zebra_vrf *zvrf, afi_t afi, int force,
enum rnh_type type, struct prefix *p); enum rnh_type type, struct prefix *p);
extern void zebra_print_rnh_table(vrf_id_t vrfid, afi_t afi, struct vty *vty, extern void zebra_print_rnh_table(vrf_id_t vrfid, afi_t afi, struct vty *vty,
enum rnh_type type, struct prefix *p); enum rnh_type type, struct prefix *p);
extern char *rnh_str(struct rnh *rnh, char *buf, int size);
extern int rnh_resolve_via_default(struct zebra_vrf *zvrf, int family); extern int rnh_resolve_via_default(struct zebra_vrf *zvrf, int family);