diff options
| author | Stuart Henderson <sthen@cvs.openbsd.org> | 2019-08-13 12:52:42 +0000 |
|---|---|---|
| committer | Stuart Henderson <sthen@cvs.openbsd.org> | 2019-08-13 12:52:42 +0000 |
| commit | a748a0a28f4d1ca4c081f5fdb33f797d70c5bea2 (patch) | |
| tree | be57ca8fede079e21a7eee9140784b99ea77e953 /usr.sbin/snmpd | |
| parent | feb85afc57f5770d145648a381226567d4e7325a (diff) | |
snmpd was using ifq_len for ifOutQLen, apart from being the wrong variable
for this MIB in the first place, this has now been removed in ifq changes.
Since the MIB is marked as deprecated anyway, simply return 0. ok claudio@
Diffstat (limited to 'usr.sbin/snmpd')
| -rw-r--r-- | usr.sbin/snmpd/mib.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/usr.sbin/snmpd/mib.c b/usr.sbin/snmpd/mib.c index 7033093e670..831344d2621 100644 --- a/usr.sbin/snmpd/mib.c +++ b/usr.sbin/snmpd/mib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mib.c,v 1.95 2019/08/13 12:46:19 claudio Exp $ */ +/* $OpenBSD: mib.c,v 1.96 2019/08/13 12:52:41 sthen Exp $ */ /* * Copyright (c) 2012 Joel Knight <joel@openbsd.org> @@ -1106,9 +1106,6 @@ mib_iftable(struct oid *oid, struct ber_oid *o, struct ber_element **elm) u_int32_t idx = 0; struct kif *kif; long long i; - size_t len; - int ifq; - int mib[] = { CTL_NET, PF_INET, IPPROTO_IP, 0, 0 }; /* Get and verify the current row index */ idx = o->bo_id[OIDIDX_ifEntry]; @@ -1227,15 +1224,7 @@ mib_iftable(struct oid *oid, struct ber_oid *o, struct ber_element **elm) ber_set_header(ber, BER_CLASS_APPLICATION, SNMP_T_COUNTER32); break; case 21: - mib[3] = IPCTL_IFQUEUE; - mib[4] = IFQCTL_LEN; - len = sizeof(ifq); - if (sysctl(mib, sizeofa(mib), &ifq, &len, 0, 0) == -1) { - log_info("mib_iftable: %s: invalid ifq: %s", - kif->if_name, strerror(errno)); - return (-1); - } - ber = ber_add_integer(ber, ifq); + ber = ber_add_integer(ber, 0); ber_set_header(ber, BER_CLASS_APPLICATION, SNMP_T_GAUGE32); break; case 22: |