isisd: fix ip/ipv6 reachability tlvs

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 c3d34b84f3e1b789b78b6ee93068f074eb884af1)

diff --git a/isisd/isis_tlvs.c b/isisd/isis_tlvs.c
index e871ae8c4f99404e81566dbce520b6b6c9515495..10223992585f2c0a0332fe8e9f4fe2ee110a38b0 100644 (file)
--- a/isisd/isis_tlvs.c
+++ b/isisd/isis_tlvs.c
@@ -6771,7 +6771,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];
@@ -6781,6 +6780,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);
                }
@@ -6799,7 +6802,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];
@@ -6809,6 +6811,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);
                }