From 4f266697a1a55a847cc9cdf0895b70d7110a885b Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Sat, 29 Dec 2012 18:48:46 +0100 Subject: [PATCH] freebsd: add DMI support --- src/daemon/Makefile.am | 16 ++++-- src/daemon/dmi-dummy.c | 57 +++++++++++++++++++++ src/daemon/dmi-freebsd.c | 83 +++++++++++++++++++++++++++++++ src/daemon/{dmi.c => dmi-linux.c} | 11 +--- 4 files changed, 152 insertions(+), 15 deletions(-) create mode 100644 src/daemon/dmi-dummy.c create mode 100644 src/daemon/dmi-freebsd.c rename src/daemon/{dmi.c => dmi-linux.c} (96%) diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index 8d028633..10962eb8 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -14,7 +14,6 @@ liblldpd_la_SOURCES = \ edp.c edp.h \ client.c \ priv.c privsep_fdpass.c \ - dmi.c \ interfaces.c \ event.c lldpd.c liblldpd_la_CFLAGS = $(AM_CFLAGS) @LIBEVENT_CFLAGS@ @@ -25,16 +24,23 @@ liblldpd_la_LIBADD = \ if HOST_OS_LINUX liblldpd_la_SOURCES += \ interfaces-linux.c \ - netlink.c + netlink.c \ + dmi-linux.c endif if HOST_OS_FREEBSD -liblldpd_la_SOURCES += interfaces-bsd.c +liblldpd_la_SOURCES += \ + interfaces-bsd.c \ + dmi-freebsd.c endif if HOST_OS_OPENBSD -liblldpd_la_SOURCES += interfaces-bsd.c +liblldpd_la_SOURCES += \ + interfaces-bsd.c \ + dmi-dummy.c endif if HOST_OS_NETBSD -liblldpd_la_SOURCES += interfaces-bsd.c +liblldpd_la_SOURCES += \ + interfaces-bsd.c \ + dmi-dummy.c endif # Add SNMP support if needed diff --git a/src/daemon/dmi-dummy.c b/src/daemon/dmi-dummy.c new file mode 100644 index 00000000..65a68b89 --- /dev/null +++ b/src/daemon/dmi-dummy.c @@ -0,0 +1,57 @@ +/* -*- mode: c; c-file-style: "openbsd" -*- */ +/* + * Copyright (c) 2012 Vincent Bernat + * + * Permission to use, copy, modify, and/or 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 "lldpd.h" + +#ifdef ENABLE_LLDPMED + +char* +dmi_hw() +{ + return NULL; +} + +char* +dmi_fw() +{ + return NULL; +} + +char* +dmi_sn() +{ + return NULL; +} + +char* +dmi_manuf() +{ + return NULL; +} + +char* +dmi_model() +{ + return NULL; +} + +char* +dmi_asset() +{ + return NULL; +} +#endif diff --git a/src/daemon/dmi-freebsd.c b/src/daemon/dmi-freebsd.c new file mode 100644 index 00000000..7c4a0afb --- /dev/null +++ b/src/daemon/dmi-freebsd.c @@ -0,0 +1,83 @@ +/* -*- mode: c; c-file-style: "openbsd" -*- */ +/* + * Copyright (c) 2012 Vincent Bernat + * + * Permission to use, copy, modify, and/or 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 "lldpd.h" +#include +#include + +#ifdef ENABLE_LLDPMED + /* Fill in inventory stuff: + - hardware version: smbios.system.version + - firmware version: smbios.bios.version + - software version: `uname -r` + - serial number: smbios.system.serial + - manufacturer: smbios.system.maker + - model: smbios.system.product + - asset: smbios.chassis.tag + */ + +static char* +dmi_get(char *file) +{ + char buffer[100] = {}; + + log_debug("localchassis", "DMI request for %s", file); + if (kenv(KENV_GET, file, buffer, sizeof(buffer) - 1) == -1) { + log_debug("localchassis", "cannot get %s", file); + return NULL; + } + if (strlen(buffer)) + return strdup(buffer); + return NULL; +} + +char* +dmi_hw() +{ + return dmi_get("smbios.system.version"); +} + +char* +dmi_fw() +{ + return dmi_get("smbios.bios.version"); +} + +char* +dmi_sn() +{ + return dmi_get("smbios.system.serial"); +} + +char* +dmi_manuf() +{ + return dmi_get("smbios.system.maker"); +} + +char* +dmi_model() +{ + return dmi_get("smibios.system.product"); +} + +char* +dmi_asset() +{ + return dmi_get("smibios.chassis.tag"); +} +#endif diff --git a/src/daemon/dmi.c b/src/daemon/dmi-linux.c similarity index 96% rename from src/daemon/dmi.c rename to src/daemon/dmi-linux.c index b8d242f3..9fe2801f 100644 --- a/src/daemon/dmi.c +++ b/src/daemon/dmi-linux.c @@ -29,8 +29,7 @@ - asset: /sys/class/dmi/id/chassis_asset_tag */ -#ifdef HOST_OS_LINUX -char* +static char* dmi_get(char *file) { int dmi, s; @@ -55,14 +54,6 @@ dmi_get(char *file) return strdup(buffer); return NULL; } -#else -char * -dmi_get(char *file) -{ - return NULL; -} -#endif - char* dmi_hw() -- 2.39.5