SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-01-12 01:27:06 +00:00
parent caf62be22c
commit b3ecf9fa9a
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
56 changed files with 383 additions and 289 deletions
Download patch file Download diff file Expand all files Collapse all files

13
usr.sbin/bgpctl/output.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: output.c,v 1.44 2024/01/10 14:59:41 claudio Exp $ */
/* $OpenBSD: output.c,v 1.46 2024/01/11 14:34:49 claudio Exp $ */
/*
* Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
@ -388,10 +388,6 @@ show_neighbor_full(struct peer *p, struct parse_result *res)
show_neighbor_msgstats(p);
printf("\n");
if (p->stats.last_reason[0]) {
printf(" Last received shutdown reason: \"%s\"\n",
log_reason(p->stats.last_reason));
}
errstr = fmt_errstr(p->stats.last_sent_errcode,
p->stats.last_sent_suberr);
@ -401,6 +397,10 @@ show_neighbor_full(struct peer *p, struct parse_result *res)
p->stats.last_rcvd_suberr);
if (errstr)
printf(" Last error received: %s\n", errstr);
if (p->stats.last_reason[0]) {
printf(" Last received shutdown reason: \"%s\"\n",
log_reason(p->stats.last_reason));
}
if (p->state >= STATE_OPENSENT) {
printf(" Local host: %20s, Local port: %5u\n",
@ -1171,12 +1171,13 @@ show_rtr(struct ctl_show_rtr *rtr)
printf("RTR neighbor is %s, port %u\n",
log_addr(&rtr->remote_addr), rtr->remote_port);
printf(" State: %s\n", rtr->state);
if (rtr->descr[0])
printf(" Description: %s\n", rtr->descr);
if (rtr->local_addr.aid != AID_UNSPEC)
printf(" Local Address: %s\n", log_addr(&rtr->local_addr));
if (rtr->session_id != -1)
printf("Version: %u Session ID: %d Serial #: %u\n",
printf(" Version: %u Session ID: %d Serial #: %u\n",
rtr->version, rtr->session_id, rtr->serial);
printf(" Refresh: %u, Retry: %u, Expire: %u\n",
rtr->refresh, rtr->retry, rtr->expire);

3
usr.sbin/bgpctl/output_json.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: output_json.c,v 1.37 2023/12/19 10:32:20 claudio Exp $ */
/* $OpenBSD: output_json.c,v 1.38 2024/01/11 13:09:41 claudio Exp $ */
/*
* Copyright (c) 2020 Claudio Jeker <claudio@openbsd.org>
@ -1007,6 +1007,7 @@ json_rtr(struct ctl_show_rtr *rtr)
json_do_uint("remote_port", rtr->remote_port);
if (rtr->local_addr.aid != AID_UNSPEC)
json_do_string("local_addr", log_addr(&rtr->local_addr));
json_do_string("state", rtr->state);
if (rtr->session_id != -1) {
json_do_uint("version", rtr->version);