bgpd: Revert --enable-bgp-standalone

Reverts the --enable-bgp-standalone and makes it so that you
need to use --enable-cumulus to get the cumulus behavior.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
index f63c9aa71348b6a1915897d6784d1cf82a8c0828..f775bd048f211897fb8a7c7b13f2f3537c9005da 100644 (file)
--- a/bgpd/bgp_fsm.c
+++ b/bgpd/bgp_fsm.c
@@ -1330,10 +1330,10 @@ bgp_start (struct peer *peer)
   if (!bgp_find_or_add_nexthop(peer->bgp, family2afi(peer->su.sa.sa_family),
                               NULL, peer, connected))
     {
+#if defined (HAVE_CUMULUS)
       if (bgp_debug_neighbor_events(peer))
        zlog_debug ("%s [FSM] Waiting for NHT", peer->host);
 
-#if !defined (HAVE_BGP_STANDALONE)
       BGP_EVENT_ADD(peer, TCP_connection_open_failed);
       return 0;
 #endif

diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c
index a6e9b7de00d5f9b94606d4f30d549f3716723dd9..bceeea6489decbf7c7f6a78bf97921c012bad92a 100644 (file)
--- a/bgpd/bgp_network.c
+++ b/bgpd/bgp_network.c
@@ -253,7 +253,7 @@ bgp_get_instance_for_inc_conn (int sock, struct bgp **bgp_inst)
   rc = getsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, name, &name_len);
   if (rc != 0)
     {
-#if !defined (HAVE_BGP_STANDALONE)
+#if defined (HAVE_CUMULUS)
       zlog_err ("[Error] BGP SO_BINDTODEVICE get failed (%s), sock %d",
                 safe_strerror (errno), sock);
       return -1;
@@ -674,9 +674,9 @@ bgp_getsockname (struct peer *peer)
   if (bgp_nexthop_set (peer->su_local, peer->su_remote,
                        &peer->nexthop, peer))
     {
+#if defined (HAVE_CUMULUS)
       zlog_err ("%s: nexthop_set failed, resetting connection - intf %p",
                 peer->host, peer->nexthop.ifp);
-#if !defined (HAVE_BGP_STANDALONE)
       return -1;
 #endif
     }

diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
index 2f9fdd5a75439979beafca46399ec46f7963b8ac..ae54cd43d35a375a8fbcafd38ba72da6a4cb3cf8 100644 (file)
--- a/bgpd/bgp_packet.c
+++ b/bgpd/bgp_packet.c
@@ -1163,7 +1163,7 @@ bgp_open_receive (struct peer *peer, bgp_size_t size)
     {
       if (!peer->nexthop.v4.s_addr)
         {
-#if !defined (HAVE_BGP_STANDALONE)
+#if defined (HAVE_CUMULUS)
           zlog_err ("%s: No local IPv4 addr resetting connection, fd %d",
                     peer->host, peer->fd);
           bgp_notify_send (peer, BGP_NOTIFY_CEASE, BGP_NOTIFY_SUBCODE_UNSPECIFIC);
@@ -1178,7 +1178,7 @@ bgp_open_receive (struct peer *peer, bgp_size_t size)
     {
       if (IN6_IS_ADDR_UNSPECIFIED (&peer->nexthop.v6_global))
         {
-#if !defined (HAVE_BGP_STANDALONE)
+#if defined (HAVE_CUMULUS)
           zlog_err ("%s: No local IPv6 addr resetting connection, fd %d",
                     peer->host, peer->fd);
           bgp_notify_send (peer, BGP_NOTIFY_CEASE, BGP_NOTIFY_SUBCODE_UNSPECIFIC);

diff --git a/configure.ac b/configure.ac
index 978aaf2c755207195a6bf542fa668bb58109c8eb..937d7b8d0f3ca38b05e35ca44388e29bda18f1e6 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -311,8 +311,6 @@ AC_ARG_ENABLE(werror,
   AS_HELP_STRING([--enable-werror], [enable -Werror (recommended for developers only)]))
 AC_ARG_ENABLE(cumulus,
   AS_HELP_STRING([--enable-cumulus], [enable Cumulus Switch Special Extensions]))
-AC_ARG_ENABLE(bgp-standalone,
-  AS_HELP_STRING([--enable-bgp-standalone], [Modify code to allow BGP to work without Zebra]))
 AC_ARG_ENABLE(rr-semantics,
   AS_HELP_STRING([--disable-rr-semantics], [disable the v6 Route Replace semantics]))
 
@@ -364,10 +362,6 @@ if test "${enable_cumulus}" = "yes" ; then
   AC_DEFINE(HAVE_CUMULUS,,Compile Special Cumulus Code in)
 fi
 
-if test "${enable_bgp_standalone}" = "yes" ; then
-  AC_DEFINE(HAVE_BGP_STANDALONE,,Allow BGP to work without Zebra)
-fi
-
 if test "${enable_shell_access}" = "yes"; then
    AC_DEFINE(HAVE_SHELL_ACCESS,,Allow user to use ssh/telnet/bash)
 fi