Revert "bgpd: update AS value of a hidden bgp instance"

This reverts commit 8e04277fff9597412198da123250e1951bfc580d.

Signed-off-by: Jafar Al-Gharaibeh <jafar@atcorp.com>

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index d90875b78c2571f1f03721b94b7098384ed85fc5..8a3ae538dcd30ac70501d47d04645331b34f45cc 100644 (file)
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -3404,15 +3404,13 @@ static struct bgp *bgp_create(as_t *as, const char *name,
        afi_t afi;
        safi_t safi;
 
-       if (hidden)
+       if (hidden) {
                bgp = bgp_old;
-       else
-               bgp = XCALLOC(MTYPE_BGP, sizeof(struct bgp));
+               goto peer_init;
+       }
 
+       bgp = XCALLOC(MTYPE_BGP, sizeof(struct bgp));
        bgp->as = *as;
-
-       if (bgp->as_pretty)
-               XFREE(MTYPE_BGP_NAME, bgp->as_pretty);
        if (as_pretty)
                bgp->as_pretty = XSTRDUP(MTYPE_BGP_NAME, as_pretty);
        else
@@ -3424,9 +3422,6 @@ static struct bgp *bgp_create(as_t *as, const char *name,
        } else
                asn_str2asn_notation(bgp->as_pretty, NULL, &bgp->asnotation);
 
-       if (hidden)
-               goto peer_init;
-
        if (BGP_DEBUG(zebra, ZEBRA)) {
                if (inst_type == BGP_INSTANCE_TYPE_DEFAULT)
                        zlog_debug("Creating Default VRF, AS %s",