From a03ec1fdc62843c2dc8b96ee9fc27bcf5a899173 Mon Sep 17 00:00:00 2001 From: claudio Date: Mon, 29 Aug 2022 18:19:21 +0000 Subject: [PATCH] aspath_refs is gone, adjust code --- usr.sbin/bgpctl/output.c | 6 ++---- usr.sbin/bgpctl/output_json.c | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/usr.sbin/bgpctl/output.c b/usr.sbin/bgpctl/output.c index b5fadec0668..5483584a2b6 100644 --- a/usr.sbin/bgpctl/output.c +++ b/usr.sbin/bgpctl/output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: output.c,v 1.27 2022/08/29 14:58:15 claudio Exp $ */ +/* $OpenBSD: output.c,v 1.28 2022/08/29 18:19:21 claudio Exp $ */ /* * Copyright (c) 2003 Henning Brauer @@ -1003,9 +1003,7 @@ show_rib_mem(struct rde_memstats *stats) printf("\t and holding %lld references\n", stats->path_refs); printf("%10lld BGP AS-PATH attribute entries using " - "%s of memory\n\t and holding %lld references\n", - stats->aspath_cnt, fmt_mem(stats->aspath_size), - stats->aspath_refs); + "%s of memory\n", stats->aspath_cnt, fmt_mem(stats->aspath_size)); printf("%10lld entries for %lld BGP communities " "using %s of memory\n", stats->comm_cnt, stats->comm_nmemb, fmt_mem(stats->comm_cnt * sizeof(struct rde_community) + diff --git a/usr.sbin/bgpctl/output_json.c b/usr.sbin/bgpctl/output_json.c index e960da98d4c..3ed9f941e80 100644 --- a/usr.sbin/bgpctl/output_json.c +++ b/usr.sbin/bgpctl/output_json.c @@ -1,4 +1,4 @@ -/* $OpenBSD: output_json.c,v 1.21 2022/08/29 14:58:15 claudio Exp $ */ +/* $OpenBSD: output_json.c,v 1.22 2022/08/29 18:19:21 claudio Exp $ */ /* * Copyright (c) 2020 Claudio Jeker @@ -936,7 +936,7 @@ json_rib_mem(struct rde_memstats *stats) stats->path_cnt * sizeof(struct rde_aspath), stats->path_refs); json_rib_mem_element("aspath", stats->aspath_cnt, - stats->aspath_size, stats->aspath_refs); + stats->aspath_size, UINT64_MAX); json_rib_mem_element("community_entries", stats->comm_cnt, stats->comm_cnt * sizeof(struct rde_community), UINT64_MAX); json_rib_mem_element("community", stats->comm_nmemb, -- 2.20.1