diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2022-08-31 15:51:45 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2022-08-31 15:51:45 +0000 |
| commit | a40e21c32c258fa36087de5a95867f4c8a76fc02 (patch) | |
| tree | 264fa8cf36a27c6d1731f6954299657279fc43ab | |
| parent | b935f588d2a0b7de4db6488977d845abdc40ae50 (diff) | |
Remove IMSG_CTL_SHOW_RIB_HASH and struct rde_hashstats which are no
longer used. Also cleanup some hash sizes which are also no longer used.
OK tb@
| -rw-r--r-- | usr.sbin/bgpd/bgpd.h | 12 | ||||
| -rw-r--r-- | usr.sbin/bgpd/rde.c | 7 | ||||
| -rw-r--r-- | usr.sbin/bgpd/session.c | 3 |
3 files changed, 3 insertions, 19 deletions
diff --git a/usr.sbin/bgpd/bgpd.h b/usr.sbin/bgpd/bgpd.h index 86c09676c57..115b93d9c23 100644 --- a/usr.sbin/bgpd/bgpd.h +++ b/usr.sbin/bgpd/bgpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bgpd.h,v 1.451 2022/08/29 18:18:55 claudio Exp $ */ +/* $OpenBSD: bgpd.h,v 1.452 2022/08/31 15:51:44 claudio Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -547,7 +547,6 @@ enum imsg_type { IMSG_CTL_SHOW_RIB_ATTR, IMSG_CTL_SHOW_NETWORK, IMSG_CTL_SHOW_RIB_MEM, - IMSG_CTL_SHOW_RIB_HASH, IMSG_CTL_SHOW_TERSE, IMSG_CTL_SHOW_TIMER, IMSG_CTL_LOG_VERBOSE, @@ -1208,15 +1207,6 @@ struct rde_memstats { long long pset_size; }; -struct rde_hashstats { - char name[16]; - long long num; - long long min; - long long max; - long long sum; - long long sumq; -}; - #define MRT_FILE_LEN 512 #define MRT2MC(x) ((struct mrt_config *)(x)) diff --git a/usr.sbin/bgpd/rde.c b/usr.sbin/bgpd/rde.c index c43a21262a6..6aa47b9037d 100644 --- a/usr.sbin/bgpd/rde.c +++ b/usr.sbin/bgpd/rde.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.c,v 1.572 2022/08/31 14:29:36 claudio Exp $ */ +/* $OpenBSD: rde.c,v 1.573 2022/08/31 15:51:44 claudio Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -146,9 +146,6 @@ rde_sighdlr(int sig) } uint32_t peerhashsize = 1024; -uint32_t pathhashsize = 128 * 1024; -uint32_t attrhashsize = 16 * 1024; -uint32_t nexthophashsize = 1024; void rde_main(int debug, int verbose) @@ -626,8 +623,6 @@ badnetdel: case IMSG_CTL_SHOW_RIB_MEM: imsg_compose(ibuf_se_ctl, IMSG_CTL_SHOW_RIB_MEM, 0, imsg.hdr.pid, -1, &rdemem, sizeof(rdemem)); - imsg_compose(ibuf_se_ctl, IMSG_CTL_END, 0, imsg.hdr.pid, - -1, NULL, 0); break; case IMSG_CTL_SHOW_SET: /* first roa set */ diff --git a/usr.sbin/bgpd/session.c b/usr.sbin/bgpd/session.c index 204e64b2ee6..b548455de3c 100644 --- a/usr.sbin/bgpd/session.c +++ b/usr.sbin/bgpd/session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.434 2022/08/26 14:10:52 claudio Exp $ */ +/* $OpenBSD: session.c,v 1.435 2022/08/31 15:51:44 claudio Exp $ */ /* * Copyright (c) 2003, 2004, 2005 Henning Brauer <henning@openbsd.org> @@ -3141,7 +3141,6 @@ session_dispatch_imsg(struct imsgbuf *ibuf, int idx, u_int *listener_cnt) case IMSG_CTL_SHOW_RIB_COMMUNITIES: case IMSG_CTL_SHOW_RIB_ATTR: case IMSG_CTL_SHOW_RIB_MEM: - case IMSG_CTL_SHOW_RIB_HASH: case IMSG_CTL_SHOW_NETWORK: case IMSG_CTL_SHOW_NEIGHBOR: case IMSG_CTL_SHOW_SET: |