From: Lou Berger <lberger@labn.net>
Date: Sun, 2 Apr 2017 17:55:58 +0000 (-0400)
Subject: bgp: fix a couple of instances of bm being used before init'ed
X-Git-Tag: reindent-master-before~220^2~2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=508f9997f271c066b0ffc4fe0d5861ef20430317;p=mirror%2Ffrr.git

bgp: fix a couple of instances of bm being used before init'ed

Signed-off-by: Lou Berger <lberger@labn.net>
---

diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index 423c9453eb..55bf410628 100644
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -363,6 +363,7 @@ main (int argc, char **argv)
 
   int bgp_port = BGP_PORT_DEFAULT;
   char *bgp_address = NULL;
+  int no_fib_flag = 0;
 
   frr_preinit(&bgpd_di, argc, argv);
   frr_opt_add("p:l:rne:", longopts,
@@ -389,7 +390,7 @@ main (int argc, char **argv)
 	  if (tmp_port <= 0 || tmp_port > 0xffff)
 	    bgp_port = BGP_PORT_DEFAULT;
 	  else
-	    bm->port = tmp_port;
+	    bgp_port = tmp_port;
 	  break;
         case 'e':
           multipath_num = atoi (optarg);
@@ -406,7 +407,7 @@ main (int argc, char **argv)
 	  bgp_address = optarg;
 	  /* listenon implies -n */
 	case 'n':
-	  bgp_option_set (BGP_OPT_NO_FIB);
+          no_fib_flag = 1;
 	  break;
 	default:
 	  frr_help_exit (1);
@@ -418,6 +419,8 @@ main (int argc, char **argv)
   bgp_master_init (frr_init ());
   bm->port = bgp_port;
   bm->address = bgp_address;
+  if (no_fib_flag)
+    bgp_option_set (BGP_OPT_NO_FIB);
 
   /* Initializations. */
   bgp_vrf_init ();