diff options
| author |   claudio <claudio@openbsd.org> | 2019-06-28 12:12:06 +0000 |
|---|---|---|
| committer | claudio <claudio@openbsd.org> | 2019-06-28 12:12:06 +0000 |
| commit | 989b70ca64ee2426abbc94468c551fcae46982b8 (patch) | |
| tree | 600682229e7e0790cc20dc910eab061a0f10c0a8 | |
| parent | Reset rpending (read pending) indicator for a peer when the peer goes down (diff) | |
| download | wireguard-openbsd-989b70ca64ee2426abbc94468c551fcae46982b8.tar.xz wireguard-openbsd-989b70ca64ee2426abbc94468c551fcae46982b8.zip | |
The bgpctl parser can not handle neighbor and neighbors at the same time.
It will always complain that neighbor is ambiguous. Switch neighbors to
peers to resolve the issue.
| -rw-r--r-- | usr.sbin/bgpctl/bgpctl.8 | 6 | ||||
| -rw-r--r-- | usr.sbin/bgpctl/parser.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/bgpctl/bgpctl.8 b/usr.sbin/bgpctl/bgpctl.8 index 254cb2fefe4..70e5010c977 100644 --- a/usr.sbin/bgpctl/bgpctl.8 +++ b/usr.sbin/bgpctl/bgpctl.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: bgpctl.8,v 1.88 2019/06/25 07:44:20 claudio Exp $ +.\" $OpenBSD: bgpctl.8,v 1.89 2019/06/28 12:12:06 claudio Exp $ .\" .\" Copyright (c) 2003 Henning Brauer <henning@openbsd.org> .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: June 25 2019 $ +.Dd $Mdocdate: June 28 2019 $ .Dt BGPCTL 8 .Os .Sh NAME @@ -267,7 +267,7 @@ Show more detailed output for matching routes. Limit the output to the given address family. .It Cm file Ar name Read the MRT dump from file -.It Cm neighbors +.It Cm peers Print the neighbor table of MRT TABLE_DUMP_V2 dumps. Using this on other table dumps will only show the neighbor of the first entry. .Ar name diff --git a/usr.sbin/bgpctl/parser.c b/usr.sbin/bgpctl/parser.c index 5e56ed2722d..e984596d4d9 100644 --- a/usr.sbin/bgpctl/parser.c +++ b/usr.sbin/bgpctl/parser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parser.c,v 1.97 2019/06/25 07:44:20 claudio Exp $ */ +/* $OpenBSD: parser.c,v 1.98 2019/06/28 12:12:06 claudio Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -202,7 +202,7 @@ static const struct token t_show_mrt[] = { { FLAG, "detail", F_CTL_DETAIL, t_show_mrt}, { FLAG, "ssv", F_CTL_SSV, t_show_mrt}, { KEYWORD, "neighbor", NONE, t_show_mrt_neigh}, - { FLAG, "neighbors", F_CTL_NEIGHBORS,t_show_mrt}, + { FLAG, "peers", F_CTL_NEIGHBORS,t_show_mrt}, { KEYWORD, "file", NONE, t_show_mrt_file}, { FAMILY, "", NONE, t_show_mrt}, { PREFIX, "", NONE, t_show_prefix}, |