diff options
| author | Martijn van Duren <martijn@cvs.openbsd.org> | 2022-01-19 10:25:05 +0000 |
|---|---|---|
| committer | Martijn van Duren <martijn@cvs.openbsd.org> | 2022-01-19 10:25:05 +0000 |
| commit | 4a5400bb1f778bad8aaa3e2117901e40c262b47c (patch) | |
| tree | eb4723157aa040343140deecdcbc038398ef7b4e /usr.sbin/snmpd | |
| parent | c8679035f351dba73e98e66d01cc3acce4ca9e79 (diff) | |
Move some smi.c functions to their own header.
These are needed for a new application layer, where a lot of the snmpd.h
stuff just clutter.
OK jmatthew@
tested as part of larger diff by sthen@ and Joel Carnat
Diffstat (limited to 'usr.sbin/snmpd')
| -rw-r--r-- | usr.sbin/snmpd/smi.h | 27 | ||||
| -rw-r--r-- | usr.sbin/snmpd/snmpd.h | 6 |
2 files changed, 29 insertions, 4 deletions
diff --git a/usr.sbin/snmpd/smi.h b/usr.sbin/snmpd/smi.h new file mode 100644 index 00000000000..594aededf5a --- /dev/null +++ b/usr.sbin/snmpd/smi.h @@ -0,0 +1,27 @@ +/* $OpenBSD: smi.h,v 1.1 2022/01/19 10:25:04 martijn Exp $ */ + +/* + * Copyright (c) 2021 Martijn van Duren <martijn@openbsd.org> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include <ber.h> +#include <stdint.h> + +#define BER_OID(...) (struct ber_oid) { { __VA_ARGS__ }, \ + (sizeof((u_int32_t []) { __VA_ARGS__ }) / sizeof(u_int32_t)) } + +char *smi_oid2string(struct ber_oid *, char *, size_t, size_t); +u_long smi_getticks(void); +char *smi_print_element(struct ber_element *); diff --git a/usr.sbin/snmpd/snmpd.h b/usr.sbin/snmpd/snmpd.h index 3ed39b3a9b7..e86a8d376b1 100644 --- a/usr.sbin/snmpd/snmpd.h +++ b/usr.sbin/snmpd/snmpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: snmpd.h,v 1.101 2022/01/19 10:19:27 martijn Exp $ */ +/* $OpenBSD: snmpd.h,v 1.102 2022/01/19 10:25:04 martijn Exp $ */ /* * Copyright (c) 2007, 2008, 2012 Reyk Floeter <reyk@openbsd.org> @@ -36,6 +36,7 @@ #include <imsg.h> #include "log.h" +#include "smi.h" #include "snmp.h" #ifndef nitems @@ -698,7 +699,6 @@ int pfta_get_first(struct pfr_astats *); /* smi.c */ int smi_init(void); -u_long smi_getticks(void); void smi_mibtree(struct oid *); struct oid *smi_find(struct oid *); struct oid *smi_nfind(struct oid *); @@ -707,7 +707,6 @@ struct oid *smi_next(struct oid *); struct oid *smi_foreach(struct oid *, u_int); void smi_oidlen(struct ber_oid *); void smi_scalar_oidlen(struct ber_oid *); -char *smi_oid2string(struct ber_oid *, char *, size_t, size_t); int smi_string2oid(const char *, struct ber_oid *); void smi_delete(struct oid *); int smi_insert(struct oid *); @@ -715,7 +714,6 @@ int smi_oid_cmp(struct oid *, struct oid *); int smi_key_cmp(struct oid *, struct oid *); unsigned int smi_application(struct ber_element *); void smi_debug_elements(struct ber_element *); -char *smi_print_element(struct ber_element *); /* timer.c */ void timer_init(void); |