diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2016-11-15 08:38:58 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2016-11-15 08:38:58 +0000 |
| commit | 600922eb63c771b004b75f1fc4e23b19a0464938 (patch) | |
| tree | feda39942276354b7ce0bb75f1b27b52dbfd6466 /usr.sbin | |
| parent | 30e35202c19e7e9e19578677d1bbca3dd554a285 (diff) | |
swap dump arguments to expect the address first
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/switchctl/parser.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/usr.sbin/switchctl/parser.c b/usr.sbin/switchctl/parser.c index 57ced7b967e..7826ae70b8b 100644 --- a/usr.sbin/switchctl/parser.c +++ b/usr.sbin/switchctl/parser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parser.c,v 1.4 2016/11/15 08:15:07 reyk Exp $ */ +/* $OpenBSD: parser.c,v 1.5 2016/11/15 08:38:57 reyk Exp $ */ /* * Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org> @@ -58,6 +58,7 @@ static const struct token t_log[]; static const struct token t_load[]; static const struct token t_show[]; static const struct token t_dump[]; +static const struct token t_dumpreq[]; static const struct token t_connect[]; static const struct token t_disconnect[]; static const struct token t_forward_to[]; @@ -92,11 +93,16 @@ static const struct token t_load[] = { { ENDTOKEN, "", NONE, NULL } }; -static const struct token t_dump[] = { - { KEYWORD, "desc", DUMP_DESC, t_uri }, - { KEYWORD, "features", DUMP_FEATURES, t_uri }, - { KEYWORD, "flows", DUMP_FLOWS, t_uri }, - { KEYWORD, "tables", DUMP_TABLES, t_uri }, +static const struct token t_dump[] = { + { URI, "", NONE, t_dumpreq }, + { ENDTOKEN, "", NONE, NULL } +}; + +static const struct token t_dumpreq[] = { + { KEYWORD, "desc", DUMP_DESC, NULL }, + { KEYWORD, "features", DUMP_FEATURES, NULL }, + { KEYWORD, "flows", DUMP_FLOWS, NULL }, + { KEYWORD, "tables", DUMP_TABLES, NULL }, { ENDTOKEN, "", NONE, NULL } }; |