diff options
| author |   reyk <reyk@openbsd.org> | 2009-11-26 17:32:47 +0000 |
|---|---|---|
| committer | reyk <reyk@openbsd.org> | 2009-11-26 17:32:47 +0000 |
| commit | b412399c299193beeddffec821257a8e1f98f6ef (patch) | |
| tree | d339bab5320873dbb58e873e585880c733eaab03 | |
| parent | Fix an issue where 82573L based em(4) devices had long latencies on the (diff) | |
| download | wireguard-openbsd-b412399c299193beeddffec821257a8e1f98f6ef.tar.xz wireguard-openbsd-b412399c299193beeddffec821257a8e1f98f6ef.zip | |
sync snmp_imsg_hdr with imsg_hdr and unbreak the snmp trap interface
| -rw-r--r-- | usr.sbin/snmpd/control.c | 3 | ||||
| -rw-r--r-- | usr.sbin/snmpd/snmp.h | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/usr.sbin/snmpd/control.c b/usr.sbin/snmpd/control.c index 634ded674dd..bff03ef00d2 100644 --- a/usr.sbin/snmpd/control.c +++ b/usr.sbin/snmpd/control.c @@ -1,4 +1,4 @@ -/* $OpenBSD: control.c,v 1.10 2009/06/06 05:52:01 pyr Exp $ */ +/* $OpenBSD: control.c,v 1.11 2009/11/26 17:32:47 reyk Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -240,6 +240,7 @@ control_dispatch_imsg(int fd, short event, void *arg) case IMSG_SNMP_TRAP: case IMSG_SNMP_ELEMENT: case IMSG_SNMP_END: + case IMSG_SNMP_LOCK: break; default: log_debug("control_dispatch_imsg: " diff --git a/usr.sbin/snmpd/snmp.h b/usr.sbin/snmpd/snmp.h index 90ce181a13f..e44f6758fb3 100644 --- a/usr.sbin/snmpd/snmp.h +++ b/usr.sbin/snmpd/snmp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: snmp.h,v 1.7 2008/02/07 11:33:26 reyk Exp $ */ +/* $OpenBSD: snmp.h,v 1.8 2009/11/26 17:32:47 reyk Exp $ */ /* * Copyright (c) 2007, 2008 Reyk Floeter <reyk@vantronix.net> @@ -52,10 +52,11 @@ enum snmp_imsg_ctl { }; struct snmp_imsg_hdr { - u_int16_t imsg_type; + u_int32_t imsg_type; u_int16_t imsg_len; + u_int16_t imsg_flags; u_int32_t imsg_peerid; - pid_t imsg_pid; + u_int32_t imsg_pid; }; struct snmp_imsg { |