diff options
| author | Martijn van Duren <martijn@cvs.openbsd.org> | 2020-08-23 07:39:58 +0000 |
|---|---|---|
| committer | Martijn van Duren <martijn@cvs.openbsd.org> | 2020-08-23 07:39:58 +0000 |
| commit | a6dfbb3a3c130690b6d6caae90eadeda30c64039 (patch) | |
| tree | 668d6451be2d7aea8572fa9d461c81803c85cab2 /usr.sbin/snmpd/snmpd.h | |
| parent | e85fc365932b27d6b39b23ce8e32cfdaecf05cd3 (diff) | |
Merge listen_sock into address, since there's a 1:1 correlation. Save some
overhead and 18LoC.
OK jan@
Diffstat (limited to 'usr.sbin/snmpd/snmpd.h')
| -rw-r--r-- | usr.sbin/snmpd/snmpd.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/usr.sbin/snmpd/snmpd.h b/usr.sbin/snmpd/snmpd.h index e9feea29ab9..1782f0fc9af 100644 --- a/usr.sbin/snmpd/snmpd.h +++ b/usr.sbin/snmpd/snmpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: snmpd.h,v 1.88 2020/08/08 13:39:57 martijn Exp $ */ +/* $OpenBSD: snmpd.h,v 1.89 2020/08/23 07:39:57 martijn Exp $ */ /* * Copyright (c) 2007, 2008, 2012 Reyk Floeter <reyk@openbsd.org> @@ -482,6 +482,9 @@ struct address { struct sockaddr_storage ss; in_port_t port; int ipproto; + int fd; + struct event ev; + struct event evt; TAILQ_ENTRY(address) entry; @@ -492,15 +495,6 @@ struct address { }; TAILQ_HEAD(addresslist, address); -struct listen_sock { - int s_fd; - int s_ipproto; - struct event s_ev; - struct event s_evt; - TAILQ_ENTRY(listen_sock) entry; -}; -TAILQ_HEAD(socklist, listen_sock); - enum usmauth { AUTH_NONE = 0, AUTH_MD5, /* HMAC-MD5-96, RFC3414 */ @@ -545,7 +539,6 @@ struct snmpd { const char *sc_confpath; struct addresslist sc_addresses; - struct socklist sc_sockets; struct timeval sc_starttime; u_int32_t sc_engine_boots; |