Merge pull request #12513 from Pdoijode/master

[mirror_frr.git] / bgpd / bgp_updgrp_packet.c

diff --git a/bgpd/bgp_updgrp_packet.c b/bgpd/bgp_updgrp_packet.c
index cf24e1d6898137bb144c9462cfc7ac024656cace..346a3e7806ca21068a5cba85218c929f2ff5480a 100644 (file)
--- a/bgpd/bgp_updgrp_packet.c
+++ b/bgpd/bgp_updgrp_packet.c
@@ -379,10 +379,11 @@ struct stream *bpacket_reformat_for_peer(struct bpacket *pkt,
 
                route_map_sets_nh =
                        (CHECK_FLAG(vec->flags,
-                                   BPKT_ATTRVEC_FLAGS_RMAP_IPV4_NH_CHANGED)
-                        || CHECK_FLAG(
-                                vec->flags,
-                                BPKT_ATTRVEC_FLAGS_RMAP_NH_PEER_ADDRESS));
+                                   BPKT_ATTRVEC_FLAGS_RMAP_IPV4_NH_CHANGED) ||
+                        CHECK_FLAG(vec->flags,
+                                   BPKT_ATTRVEC_FLAGS_RMAP_VPNV4_NH_CHANGED) ||
+                        CHECK_FLAG(vec->flags,
+                                   BPKT_ATTRVEC_FLAGS_RMAP_NH_PEER_ADDRESS));
 
                switch (nhlen) {
                case BGP_ATTR_NHLEN_IPV4:
@@ -468,10 +469,12 @@ struct stream *bpacket_reformat_for_peer(struct bpacket *pkt,
 
                route_map_sets_nh =
                        (CHECK_FLAG(vec->flags,
-                                   BPKT_ATTRVEC_FLAGS_RMAP_IPV6_GNH_CHANGED)
-                        || CHECK_FLAG(
+                                   BPKT_ATTRVEC_FLAGS_RMAP_IPV6_GNH_CHANGED) ||
+                        CHECK_FLAG(
                                 vec->flags,
-                                BPKT_ATTRVEC_FLAGS_RMAP_NH_PEER_ADDRESS));
+                                BPKT_ATTRVEC_FLAGS_RMAP_VPNV6_GNH_CHANGED) ||
+                        CHECK_FLAG(vec->flags,
+                                   BPKT_ATTRVEC_FLAGS_RMAP_NH_PEER_ADDRESS));
 
                /*
                 * The logic here is rather similar to that for IPv4, the
@@ -527,7 +530,7 @@ struct stream *bpacket_reformat_for_peer(struct bpacket *pkt,
                           && !CHECK_FLAG(vec->flags,
                                          BPKT_ATTRVEC_FLAGS_RMAP_NH_UNCHANGED)
                           && !peer_af_flag_check(
-                                  peer, nhafi, paf->safi,
+                                  peer, paf->afi, paf->safi,
                                   PEER_FLAG_NEXTHOP_UNCHANGED)) {
                        /* NOTE: not handling case where NH has new AFI
                         */
@@ -752,7 +755,7 @@ struct bpacket *subgroup_update_packet(struct update_subgroup *subgrp)
                         * attr. */
                        total_attr_len = bgp_packet_attribute(
                                NULL, peer, s, adv->baa->attr, &vecarr, NULL,
-                               afi, safi, from, NULL, NULL, 0, 0, 0);
+                               afi, safi, from, NULL, NULL, 0, 0, 0, path);
 
                        space_remaining =
                                STREAM_CONCAT_REMAIN(s, snlri, STREAM_SIZE(s))
@@ -1069,6 +1072,9 @@ void subgroup_default_update_packet(struct update_subgroup *subgrp,
        safi_t safi;
        struct bpacket_attr_vec_arr vecarr;
        bool addpath_capable = false;
+       uint8_t default_originate_label[4] = {0x80, 0x00, 0x00};
+       mpls_label_t *label = NULL;
+       uint32_t num_labels = 0;
 
        if (DISABLE_BGP_ANNOUNCE)
                return;
@@ -1082,6 +1088,11 @@ void subgroup_default_update_packet(struct update_subgroup *subgrp,
        bpacket_attr_vec_arr_reset(&vecarr);
        addpath_capable = bgp_addpath_encode_tx(peer, afi, safi);
 
+       if (safi == SAFI_LABELED_UNICAST) {
+               label = (mpls_label_t *)default_originate_label;
+               num_labels = 1;
+       }
+
        memset(&p, 0, sizeof(p));
        p.family = afi2family(afi);
        p.prefixlen = 0;
@@ -1124,8 +1135,9 @@ void subgroup_default_update_packet(struct update_subgroup *subgrp,
        pos = stream_get_endp(s);
        stream_putw(s, 0);
        total_attr_len = bgp_packet_attribute(
-               NULL, peer, s, attr, &vecarr, &p, afi, safi, from, NULL, NULL,
-               0, addpath_capable, BGP_ADDPATH_TX_ID_FOR_DEFAULT_ORIGINATE);
+               NULL, peer, s, attr, &vecarr, &p, afi, safi, from, NULL, label,
+               num_labels, addpath_capable,
+               BGP_ADDPATH_TX_ID_FOR_DEFAULT_ORIGINATE, NULL);
 
        /* Set Total Path Attribute Length. */
        stream_putw_at(s, pos, total_attr_len);
@@ -1142,7 +1154,12 @@ void subgroup_default_update_packet(struct update_subgroup *subgrp,
 
        (void)bpacket_queue_add(SUBGRP_PKTQ(subgrp), s, &vecarr);
        subgroup_trigger_write(subgrp);
-       subgrp->scount++;
+
+       if (!CHECK_FLAG(subgrp->sflags,
+                       SUBGRP_STATUS_PEER_DEFAULT_ORIGINATED)) {
+               subgrp->scount++;
+               SET_FLAG(subgrp->sflags, SUBGRP_STATUS_PEER_DEFAULT_ORIGINATED);
+       }
 }
 
 void subgroup_default_withdraw_packet(struct update_subgroup *subgrp)
@@ -1235,12 +1252,17 @@ void subgroup_default_withdraw_packet(struct update_subgroup *subgrp)
 
        (void)bpacket_queue_add(SUBGRP_PKTQ(subgrp), s, NULL);
        subgroup_trigger_write(subgrp);
-       subgrp->scount--;
+
+       if (CHECK_FLAG(subgrp->sflags, SUBGRP_STATUS_PEER_DEFAULT_ORIGINATED)) {
+               subgrp->scount--;
+               UNSET_FLAG(subgrp->sflags,
+                          SUBGRP_STATUS_PEER_DEFAULT_ORIGINATED);
+       }
 }
 
 static void
 bpacket_vec_arr_inherit_attr_flags(struct bpacket_attr_vec_arr *vecarr,
-                                  bpacket_attr_vec_type type,
+                                  enum bpacket_attr_vec_type type,
                                   struct attr *attr)
 {
        if (CHECK_FLAG(attr->rmap_change_flags,
@@ -1265,6 +1287,15 @@ bpacket_vec_arr_inherit_attr_flags(struct bpacket_attr_vec_arr *vecarr,
                SET_FLAG(vecarr->entries[BGP_ATTR_VEC_NH].flags,
                         BPKT_ATTRVEC_FLAGS_RMAP_IPV6_GNH_CHANGED);
 
+       if (CHECK_FLAG(attr->rmap_change_flags, BATTR_RMAP_VPNV4_NHOP_CHANGED))
+               SET_FLAG(vecarr->entries[BGP_ATTR_VEC_NH].flags,
+                        BPKT_ATTRVEC_FLAGS_RMAP_VPNV4_NH_CHANGED);
+
+       if (CHECK_FLAG(attr->rmap_change_flags,
+                      BATTR_RMAP_VPNV6_GLOBAL_NHOP_CHANGED))
+               SET_FLAG(vecarr->entries[BGP_ATTR_VEC_NH].flags,
+                        BPKT_ATTRVEC_FLAGS_RMAP_VPNV6_GNH_CHANGED);
+
        if (CHECK_FLAG(attr->rmap_change_flags,
                       BATTR_RMAP_IPV6_LL_NHOP_CHANGED))
                SET_FLAG(vecarr->entries[BGP_ATTR_VEC_NH].flags,
@@ -1291,8 +1322,8 @@ void bpacket_attr_vec_arr_reset(struct bpacket_attr_vec_arr *vecarr)
 
 /* Setup a particular node entry in the vecarr */
 void bpacket_attr_vec_arr_set_vec(struct bpacket_attr_vec_arr *vecarr,
-                                 bpacket_attr_vec_type type, struct stream *s,
-                                 struct attr *attr)
+                                 enum bpacket_attr_vec_type type,
+                                 struct stream *s, struct attr *attr)
 {
        if (!vecarr)
                return;