proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-26 23:23:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

isisd: fix ip/ipv6 reachability tlvs

Browse Source 
Don't allocate subtlvs container if there's nothing to add to it. If the
container is allocated, the "sub-TLVs presence" bit is set in the TLVs
even if there's no actual sub-TLVs, what violates the RFC.

Fixes #14514.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
(cherry picked from commit c3d34b84f3)
This commit is contained in:
Igor Ryzhov 2024-04-02 00:56:17 +03:00 committed by Mergify
parent 629118a812
commit b6e5b5ff5c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
isisd/isis_tlvs.c
View File

@ -8011,7 +8011,6 @@ void isis_tlvs_add_extended_ip_reach(struct isis_tlvs *tlvs,
apply_mask_ipv4(&r->prefix);
if (pcfgs) {
r->subtlvs = isis_alloc_subtlvs(ISIS_CONTEXT_SUBTLV_IP_REACH);
for (int i = 0; i < SR_ALGORITHM_COUNT; i++) {
struct isis_prefix_sid *psid;
struct sr_prefix_cfg *pcfg = pcfgs[i];
@ -8021,6 +8020,10 @@ void isis_tlvs_add_extended_ip_reach(struct isis_tlvs *tlvs,
psid = XCALLOC(MTYPE_ISIS_SUBTLV, sizeof(*psid));
isis_sr_prefix_cfg2subtlv(pcfg, external, psid);
if (!r->subtlvs)
r->subtlvs = isis_alloc_subtlvs(
ISIS_CONTEXT_SUBTLV_IP_REACH);
append_item(&r->subtlvs->prefix_sids,
(struct isis_item *)psid);
}
@ -8039,7 +8042,6 @@ void isis_tlvs_add_ipv6_reach(struct isis_tlvs *tlvs, uint16_t mtid,
memcpy(&r->prefix, dest, sizeof(*dest));
apply_mask_ipv6(&r->prefix);
if (pcfgs) {
r->subtlvs = isis_alloc_subtlvs(ISIS_CONTEXT_SUBTLV_IP_REACH);
for (int i = 0; i < SR_ALGORITHM_COUNT; i++) {
struct isis_prefix_sid *psid;
struct sr_prefix_cfg *pcfg = pcfgs[i];
@ -8049,6 +8051,10 @@ void isis_tlvs_add_ipv6_reach(struct isis_tlvs *tlvs, uint16_t mtid,
psid = XCALLOC(MTYPE_ISIS_SUBTLV, sizeof(*psid));
isis_sr_prefix_cfg2subtlv(pcfg, external, psid);
if (!r->subtlvs)
r->subtlvs = isis_alloc_subtlvs(
ISIS_CONTEXT_SUBTLV_IPV6_REACH);
append_item(&r->subtlvs->prefix_sids,
(struct isis_item *)psid);
}