From 580f8636be44e2c07679f4a5f6d919cb9de29258 Mon Sep 17 00:00:00 2001 From: kishiguro Date: Fri, 6 Apr 2018 14:01:05 -0700 Subject: [PATCH 1/2] bgpd option '-p 0' means do not listen BGP port. Signed-off-by: Kunihiro Ishiguro --- bgpd/bgp_main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c index bf60f9c118..5158717b5d 100644 --- a/bgpd/bgp_main.c +++ b/bgpd/bgp_main.c @@ -337,7 +337,7 @@ int main(int argc, char **argv) frr_preinit(&bgpd_di, argc, argv); frr_opt_add( "p:l:rSne:", longopts, - " -p, --bgp_port Set bgp protocol's port number\n" + " -p, --bgp_port Set BGP listen port number (0 means do not listen).\n" " -l, --listenon Listen on specified address (implies -n)\n" " -r, --retain When program terminates, retain added route by bgpd.\n" " -n, --no_kernel Do not install route to kernel.\n" @@ -356,7 +356,7 @@ int main(int argc, char **argv) break; case 'p': tmp_port = atoi(optarg); - if (tmp_port <= 0 || tmp_port > 0xffff) + if (tmp_port < 0 || tmp_port > 0xffff) bgp_port = BGP_PORT_DEFAULT; else bgp_port = tmp_port; @@ -395,6 +395,8 @@ int main(int argc, char **argv) /* BGP master init. */ bgp_master_init(frr_init()); bm->port = bgp_port; + if (bgp_port == 0) + bgp_option_set(BGP_OPT_NO_LISTEN); bm->address = bgp_address; if (no_fib_flag) bgp_option_set(BGP_OPT_NO_FIB); From db759bb0090cef039104d07a0730ba1de3e34c8a Mon Sep 17 00:00:00 2001 From: kishiguro Date: Fri, 6 Apr 2018 14:43:36 -0700 Subject: [PATCH 2/2] Update document about -p 0. When port number is 0, that means do not listen bgp port. Signed-off-by: Kunihiro Ishiguro --- doc/user/bgp.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/user/bgp.rst b/doc/user/bgp.rst index 6504e7d206..7a508b0df6 100644 --- a/doc/user/bgp.rst +++ b/doc/user/bgp.rst @@ -29,7 +29,8 @@ be specified (:ref:`common-invocation-options`). .. option:: -p .. option:: --bgp_port - Set the bgp protocol's port number. + Set the bgp protocol's port number. When port number is 0, that means do not + listen bgp port. .. option:: -r .. option:: --retain