proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 03:53:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Lou Berger <lberger@labn.net>
This commit is contained in:
Lou Berger 2017-04-02 13:55:58 -04:00
parent 2b5c7fa46d
commit 508f9997f2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bgpd/bgp_main.c
View File

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