summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorClaudio Jeker <claudio@cvs.openbsd.org>2006-06-14 17:10:43 +0000
committerClaudio Jeker <claudio@cvs.openbsd.org>2006-06-14 17:10:43 +0000
commit9330edf9121f61eccafacb7d9438c6c84c598fb6 (patch)
tree9d847f58fcfe7bfd49c4fafbd5ec9fe8639efbcc /usr.sbin
parent5557950a35f921083f934651de5938568b91bdc0 (diff)
bgpctl show rib shows now the exit nexthop per default and not the true
nexthop as before. The detailed output includes both nexthops. OK henning@
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/bgpctl/bgpctl.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/bgpctl/bgpctl.c b/usr.sbin/bgpctl/bgpctl.c
index a2d0020a3f7..b006b86ed5b 100644
--- a/usr.sbin/bgpctl/bgpctl.c
+++ b/usr.sbin/bgpctl/bgpctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bgpctl.c,v 1.105 2006/05/27 21:25:06 claudio Exp $ */
+/* $OpenBSD: bgpctl.c,v 1.106 2006/06/14 17:10:42 claudio Exp $ */
/*
* Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
@@ -1039,7 +1039,7 @@ show_rib_summary_msg(struct imsg *imsg)
memcpy(&rib, imsg->data, sizeof(rib));
print_prefix(&rib.prefix, rib.prefixlen, rib.flags);
- printf("%-15s ", log_addr(&rib.nexthop));
+ printf("%-15s ", log_addr(&rib.exit_nexthop));
printf(" %5u %5u ", rib.local_pref, rib.med);
@@ -1089,7 +1089,8 @@ show_rib_detail_msg(struct imsg *imsg, int nodescr)
free(aspath);
s = fmt_peer(rib.descr, &rib.remote_addr, -1, nodescr);
- printf(" Nexthop %s from %s (", log_addr(&rib.nexthop), s);
+ printf(" Nexthop %s ", log_addr(&rib.exit_nexthop));
+ printf("(via %s) from %s (", log_addr(&rib.true_nexthop), s);
free(s);
id.s_addr = htonl(rib.remote_id);
printf("%s)\n", inet_ntoa(id));