Revert "bgpd: Make sure default-originate works without route-map as well"

This reverts commit c2e10422033771da9f12a4a283b0bc767240a3d8.

diff --git a/bgpd/bgp_updgrp_adv.c b/bgpd/bgp_updgrp_adv.c
index 6ffb1d448b2009b64ab02f7fff66368b6a2479de..660d0ee0e681eed18a93155d8848b0075410e091 100644 (file)
--- a/bgpd/bgp_updgrp_adv.c
+++ b/bgpd/bgp_updgrp_adv.c
@@ -662,7 +662,6 @@ void subgroup_announce_route(struct update_subgroup *subgrp)
 void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw)
 {
        struct bgp *bgp;
-       struct attr attr;
        struct bgp_info *info, init_info, tmp_info;
        struct prefix p;
        struct peer *from;
@@ -686,23 +685,8 @@ void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw)
        bgp = peer->bgp;
        from = bgp->peer_self;
 
-       bgp_attr_default_set(&attr, BGP_ORIGIN_IGP);
-       attr.local_pref = bgp->default_local_pref;
-
-       if ((afi == AFI_IP6) || peer_cap_enhe(peer, afi, safi)) {
-               /* IPv6 global nexthop must be included.
-                */
-               attr.mp_nexthop_len = BGP_ATTR_NHLEN_IPV6_GLOBAL;
-
-               /* If the peer is on shared nextwork and
-                * we have link-local nexthop set it. */
-               if (peer->shared_network
-                   && !IN6_IS_ADDR_UNSPECIFIED(&peer->nexthop.v6_local))
-                       attr.mp_nexthop_len = BGP_ATTR_NHLEN_IPV6_GLOBAL_AND_LL;
-       }
-       init_info.attr = &attr;
+       init_info.attr = NULL;
        info = &init_info;
-       bgp_attr_intern(info->attr);
 
        memset(&p, 0, sizeof(p));
        p.family = afi2family(afi);
@@ -723,9 +707,13 @@ void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw)
 
                                if ((afi == AFI_IP6)
                                    || peer_cap_enhe(peer, afi, safi)) {
+                                       /* IPv6 global nexthop must be included.
+                                        */
                                        tmp_info.attr->mp_nexthop_len =
                                                BGP_ATTR_NHLEN_IPV6_GLOBAL;
 
+                                       /* If the peer is on shared nextwork and
+                                        * we have link-local nexthop set it. */
                                        if (peer->shared_network
                                            && !IN6_IS_ADDR_UNSPECIFIED(
                                                       &peer->nexthop.v6_local))
@@ -738,7 +726,6 @@ void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw)
                                        &rn->p, RMAP_BGP, &tmp_info);
 
                                info = &tmp_info;
-                               bgp_attr_intern(info->attr);
 
                                if (ret != RMAP_DENYMATCH)
                                        break;
@@ -787,7 +774,6 @@ void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw)
                                BGP_ADDPATH_TX_ID_FOR_DEFAULT_ORIGINATE);
                }
        }
-       aspath_unintern(&info->attr->aspath);
 }
 
 /*