In bgpctl argument parser, re-arrange 'reason' parsing ('nei action [reason]')

to be more generic,  then change 'reload' to take take a '[reason]' also,
which will be logged by bgpd.
ok kn claudio

1 files changed, 14 insertions, 13 deletions

diff --git a/usr.sbin/bgpctl/parser.c b/usr.sbin/bgpctl/parser.c
index 2c61bec6826..7a4b478f6f8 100644
--- a/usr.sbin/bgpctl/parser.c
+++ b/usr.sbin/bgpctl/parser.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parser.c,v 1.101 2020/01/22 07:52:38 deraadt Exp $ */
+/*	$OpenBSD: parser.c,v 1.102 2020/05/10 13:38:46 deraadt Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -46,7 +46,7 @@ enum token_type {
 	PEERDESC,
 	GROUPDESC,
 	RIBNAME,
-	SHUTDOWN_COMMUNICATION,
+	COMMUNICATION,
 	COMMUNITY,
 	EXTCOMMUNITY,
 	EXTCOM_SUBTYPE,
@@ -114,9 +114,10 @@ static const struct token t_weight[];
 static const struct token t_log[];
 static const struct token t_fib_table[];
 static const struct token t_show_fib_table[];
+static const struct token t_communication[];
 
 static const struct token t_main[] = {
-	{ KEYWORD,	"reload",	RELOAD,		NULL},
+	{ KEYWORD,	"reload",	RELOAD,		t_communication},
 	{ KEYWORD,	"show",		SHOW,		t_show},
 	{ KEYWORD,	"fib",		FIB,		t_fib},
 	{ KEYWORD,	"neighbor",	NEIGHBOR,	t_neighbor},
@@ -276,16 +277,16 @@ static const struct token t_neighbor[] = {
 	{ ENDTOKEN,	"",		NONE,		NULL}
 };
 
-static const struct token t_nei_mod_shutc[] = {
+static const struct token t_communication[] = {
 	{ NOTOKEN,	"",		NONE,		NULL},
-	{ SHUTDOWN_COMMUNICATION, "",	NONE,		NULL},
+	{ COMMUNICATION, "",		NONE,		NULL},
 	{ ENDTOKEN,	"",		NONE,		NULL}
 };
 
 static const struct token t_neighbor_modifiers[] = {
 	{ KEYWORD,	"up",		NEIGHBOR_UP,		NULL},
-	{ KEYWORD,	"down",		NEIGHBOR_DOWN,		t_nei_mod_shutc},
-	{ KEYWORD,	"clear",	NEIGHBOR_CLEAR,		t_nei_mod_shutc},
+	{ KEYWORD,	"down",		NEIGHBOR_DOWN,		t_communication},
+	{ KEYWORD,	"clear",	NEIGHBOR_CLEAR,		t_communication},
 	{ KEYWORD,	"refresh",	NEIGHBOR_RREFRESH,	NULL},
 	{ KEYWORD,	"destroy",	NEIGHBOR_DESTROY,	NULL},
 	{ ENDTOKEN,	"",		NONE,			NULL}
@@ -644,11 +645,11 @@ match_token(int *argc, char **argv[], const struct token table[])
 				t = &table[i];
 			}
 			break;
-		case SHUTDOWN_COMMUNICATION:
+		case COMMUNICATION:
 			if (!match && word != NULL && wordlen > 0) {
-				if (strlcpy(res.shutcomm, word,
-				    sizeof(res.shutcomm)) >=
-				    sizeof(res.shutcomm))
+				if (strlcpy(res.reason, word,
+				    sizeof(res.reason)) >=
+				    sizeof(res.reason))
 					errx(1, "shutdown reason too long");
 				match++;
 				t = &table[i];
@@ -846,8 +847,8 @@ show_valid_args(const struct token table[])
 		case RIBNAME:
 			fprintf(stderr, "  <rib name>\n");
 			break;
-		case SHUTDOWN_COMMUNICATION:
-			fprintf(stderr, "  <shutdown reason>\n");
+		case COMMUNICATION:
+			fprintf(stderr, "  <reason>\n");
 			break;
 		case COMMUNITY:
 			fprintf(stderr, "  <community>\n");