Commit 231ecb1087 for frr
commit 231ecb1087628eec248d7eb1389bf7d866124acf
Author: Russ White <russ@riw.us>
Date: Tue Nov 17 06:54:28 2026 -0700
Update nhrpd/nhrp_peer.c
Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
Signed-off-by: Russ White <russ@riw.us>
diff --git a/nhrpd/nhrp_peer.c b/nhrpd/nhrp_peer.c
index 7587decacf..9ee9ade769 100644
--- a/nhrpd/nhrp_peer.c
+++ b/nhrpd/nhrp_peer.c
@@ -570,10 +570,13 @@ static void nhrp_handle_resolution_req(struct nhrp_packet_parser *pp)
debugf(NHRP_DEBUG_COMMON,
"shortcut res_rep: U-bit set but binding not unique, returning Code 13");
hdr->flags &= ~htons(NHRP_FLAG_RESOLUTION_UNIQUE);
+ hdr->u.request_id = pp->hdr->u.request_id;
cie = nhrp_cie_push(zb, NHRP_CODE_BINDING_NON_UNIQUE,
&nifp->nbma, &pp->if_ad->addr);
- if (cie)
- cie->code = NHRP_CODE_BINDING_NON_UNIQUE;
+ if (!cie)
+ goto err;
+ nhrp_packet_complete(zb, hdr, ifp);
+ nhrp_peer_send(peer, zb);
goto err;
}
}