Skip to content

Commit

Permalink
Merge pull request #4385 from manuhalo/fix_deprecate_retain
Browse files Browse the repository at this point in the history
bgpd, ripd, ripngd: remove deprecated -r option
  • Loading branch information
qlyoung authored May 22, 2019
2 parents f136efa + f28963f commit 528628c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 24 deletions.
9 changes: 1 addition & 8 deletions bgpd/bgp_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,6 @@
static const struct option longopts[] = {
{"bgp_port", required_argument, NULL, 'p'},
{"listenon", required_argument, NULL, 'l'},
#if CONFDATE > 20190521
CPP_NOTICE("-r / --retain has reached deprecation EOL, remove")
#endif
{"retain", no_argument, NULL, 'r'},
{"no_kernel", no_argument, NULL, 'n'},
{"skip_runas", no_argument, NULL, 'S'},
{"ecmp", required_argument, NULL, 'e'},
Expand Down Expand Up @@ -367,10 +363,7 @@ FRR_DAEMON_INFO(bgpd, BGP, .vty_port = BGP_VTY_PORT,
.privs = &bgpd_privs, .yang_modules = bgpd_yang_modules,
.n_yang_modules = array_size(bgpd_yang_modules), )

#if CONFDATE > 20190521
CPP_NOTICE("-r / --retain has reached deprecation EOL, remove")
#endif
#define DEPRECATED_OPTIONS "r"
#define DEPRECATED_OPTIONS ""

/* Main routine of bgpd. Treatment of argument and start bgp finite
state machine is handled at here. */
Expand Down
10 changes: 2 additions & 8 deletions ripd/rip_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,7 @@
#include "ripd/rip_errors.h"

/* ripd options. */
#if CONFDATE > 20190521
CPP_NOTICE("-r / --retain has reached deprecation EOL, remove")
#endif
static struct option longopts[] = {{"retain", no_argument, NULL, 'r'}, {0}};
static struct option longopts[] = {{0}};

/* ripd privileges */
zebra_capabilities_t _caps_p[] = {ZCAP_NET_RAW, ZCAP_BIND, ZCAP_SYS_ADMIN};
Expand Down Expand Up @@ -129,10 +126,7 @@ FRR_DAEMON_INFO(ripd, RIP, .vty_port = RIP_VTY_PORT,
.privs = &ripd_privs, .yang_modules = ripd_yang_modules,
.n_yang_modules = array_size(ripd_yang_modules), )

#if CONFDATE > 20190521
CPP_NOTICE("-r / --retain has reached deprecation EOL, remove")
#endif
#define DEPRECATED_OPTIONS "r"
#define DEPRECATED_OPTIONS ""

/* Main routine of ripd. */
int main(int argc, char **argv)
Expand Down
10 changes: 2 additions & 8 deletions ripngd/ripng_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,7 @@
#include "ripngd/ripngd.h"

/* RIPngd options. */
#if CONFDATE > 20190521
CPP_NOTICE("-r / --retain has reached deprecation EOL, remove")
#endif
struct option longopts[] = {{"retain", no_argument, NULL, 'r'}, {0}};
struct option longopts[] = {{0}};

/* ripngd privileges */
zebra_capabilities_t _caps_p[] = {ZCAP_NET_RAW, ZCAP_BIND, ZCAP_SYS_ADMIN};
Expand Down Expand Up @@ -132,10 +129,7 @@ FRR_DAEMON_INFO(ripngd, RIPNG, .vty_port = RIPNG_VTY_PORT,
.yang_modules = ripngd_yang_modules,
.n_yang_modules = array_size(ripngd_yang_modules), )

#if CONFDATE > 20190521
CPP_NOTICE("-r / --retain has reached deprecation EOL, remove")
#endif
#define DEPRECATED_OPTIONS "r"
#define DEPRECATED_OPTIONS ""

/* RIPngd main routine. */
int main(int argc, char **argv)
Expand Down

0 comments on commit 528628c

Please sign in to comment.