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

nhrpd: Make some debug prints more informative

Browse Source 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
This commit is contained in:
Philippe Guibert 2021-03-29 10:21:16 +13:00 committed by Reuben Dowle
parent bcf5673d61
commit 0551aeadff
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nhrpd/nhrp_peer.c
View File

@ -412,7 +412,7 @@ static void nhrp_process_nat_extension(struct nhrp_packet_parser *pp,
* since it is behind a NAT device * since it is behind a NAT device
*/ */
debugf(NHRP_DEBUG_COMMON, debugf(NHRP_DEBUG_COMMON,
"Processing NAT Extension for %pSU", "shortcut res_resp: Processing NAT Extension for %pSU",
proto); proto);
while (nhrp_cie_pull(&payload, pp->hdr, while (nhrp_cie_pull(&payload, pp->hdr,
cie_nbma, &cie_proto)) { cie_nbma, &cie_proto)) {
@ -422,7 +422,7 @@ static void nhrp_process_nat_extension(struct nhrp_packet_parser *pp,
if (!sockunion_cmp(proto, &cie_proto)) { if (!sockunion_cmp(proto, &cie_proto)) {
debugf(NHRP_DEBUG_COMMON, debugf(NHRP_DEBUG_COMMON,
"cie_nbma for proto %pSU is %pSU", "\tcie_nbma for proto %pSU is %pSU",
proto, cie_nbma); proto, cie_nbma);
break; break;
} }
@ -507,18 +507,16 @@ static void nhrp_handle_resolution_req(struct nhrp_packet_parser *pp)
* coming directly from NATTED Spoke and there is not * coming directly from NATTED Spoke and there is not
* NAT Extension present * NAT Extension present
*/ */
debugf(NHRP_DEBUG_COMMON, "No NAT Extension for %pSU", debugf(NHRP_DEBUG_COMMON, "shortcut res_rep: No NAT Extension for %pSU",
proto_addr); proto_addr);
if (!sockunion_same(&pp->src_nbma, if (!sockunion_same(&pp->src_nbma,
&pp->peer->vc->remote.nbma) &pp->peer->vc->remote.nbma)
&& !nhrp_nhs_match_ip(&pp->peer->vc->remote.nbma, && !nhrp_nhs_match_ip(&pp->peer->vc->remote.nbma,
nifp)) { nifp)) {
debugf(NHRP_DEBUG_COMMON,
"Remote Device is NATTED");
cie_nbma_nat = pp->peer->vc->remote.nbma; cie_nbma_nat = pp->peer->vc->remote.nbma;
debugf(NHRP_DEBUG_COMMON, debugf(NHRP_DEBUG_COMMON,
"Device is natted using %pSU as cie_nbma", "shortcut res_rep: NAT detected using %pSU as cie_nbma",
&cie_nbma_nat); &cie_nbma_nat);
} }
} }

4
nhrpd/nhrp_shortcut.c
View File

@ -301,7 +301,7 @@ static void nhrp_shortcut_recv_resolution_rep(struct nhrp_reqid *reqid,
/* Update cache entry for the protocol to nbma binding */ /* Update cache entry for the protocol to nbma binding */
if (sockunion_family(&nat_nbma) != AF_UNSPEC) { if (sockunion_family(&nat_nbma) != AF_UNSPEC) {
debugf(NHRP_DEBUG_COMMON, debugf(NHRP_DEBUG_COMMON,
"Remote Device is NATed (NAT extension) proto %pSU NBMA %pSU claimed-NBMA %pSU", "Shortcut: NAT detected (NAT extension) proto %pSU NBMA %pSU claimed-NBMA %pSU",
proto, &nat_nbma, &cie_nbma); proto, &nat_nbma, &cie_nbma);
nbma = &nat_nbma; nbma = &nat_nbma;
} }
@ -311,7 +311,7 @@ static void nhrp_shortcut_recv_resolution_rep(struct nhrp_reqid *reqid,
else if (!sockunion_same(&cie_nbma, &pp->peer->vc->remote.nbma) else if (!sockunion_same(&cie_nbma, &pp->peer->vc->remote.nbma)
&& !nhrp_nhs_match_ip(&pp->peer->vc->remote.nbma, nifp)) { && !nhrp_nhs_match_ip(&pp->peer->vc->remote.nbma, nifp)) {
debugf(NHRP_DEBUG_COMMON, debugf(NHRP_DEBUG_COMMON,
"Remote Device is NATed (no NAT Extension) proto %pSU NBMA %pSU claimed-NBMA %pSU", "Shortcut: NAT detected (no NAT Extension) proto %pSU NBMA %pSU claimed-NBMA %pSU",
proto, &pp->peer->vc->remote.nbma, &cie_nbma); proto, &pp->peer->vc->remote.nbma, &cie_nbma);
nbma = &pp->peer->vc->remote.nbma; nbma = &pp->peer->vc->remote.nbma;
nat_nbma = *nbma; nat_nbma = *nbma;