diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | rules/75-net-description.rules | 8 | ||||
| -rw-r--r-- | rules/75-tty-description.rules | 6 | ||||
| -rw-r--r-- | src/udev/udev-builtin-net_id.c | 55 | ||||
| -rw-r--r-- | src/udev/udev-builtin.c | 1 | ||||
| -rw-r--r-- | src/udev/udev.h | 2 |
6 files changed, 65 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 2898602dc2..6e07a169ca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1861,6 +1861,7 @@ libudev_core_la_SOURCES = \ src/udev/udev-builtin-hwdb.c \ src/udev/udev-builtin-input_id.c \ src/udev/udev-builtin-kmod.c \ + src/udev/udev-builtin-net_id.c \ src/udev/udev-builtin-path_id.c \ src/udev/udev-builtin-usb_id.c \ src/libsystemd-daemon/sd-daemon.c diff --git a/rules/75-net-description.rules b/rules/75-net-description.rules index b127757d0c..fe9fca14db 100644 --- a/rules/75-net-description.rules +++ b/rules/75-net-description.rules @@ -3,12 +3,12 @@ ACTION=="remove", GOTO="net_end" SUBSYSTEM!="net", GOTO="net_end" -SUBSYSTEMS=="usb", ENV{ID_MODEL}=="", IMPORT{builtin}="usb_id" -SUBSYSTEMS=="usb", IMPORT{builtin}="hwdb --subsystem=usb" -SUBSYSTEMS=="usb", ATTRS{idVendor}!="", ATTRS{idProduct}!="", ENV{ID_VENDOR_ID}="$attr{idVendor}", ENV{ID_MODEL_ID}="$attr{idProduct}" +IMPORT{builtin}="net_id" +SUBSYSTEMS=="usb", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb" SUBSYSTEMS=="usb", GOTO="net_end" -IMPORT{builtin}="hwdb" SUBSYSTEMS=="pci", ENV{ID_BUS}="pci", ENV{ID_VENDOR_ID}="$attr{vendor}", ENV{ID_MODEL_ID}="$attr{device}" +IMPORT{builtin}="hwdb" + LABEL="net_end" diff --git a/rules/75-tty-description.rules b/rules/75-tty-description.rules index bfa6de39e9..83083d93ea 100644 --- a/rules/75-tty-description.rules +++ b/rules/75-tty-description.rules @@ -3,13 +3,11 @@ ACTION=="remove", GOTO="tty_end" SUBSYSTEM!="tty", GOTO="tty_end" -SUBSYSTEMS=="usb", ENV{ID_MODEL}=="", IMPORT{builtin}="usb_id" -SUBSYSTEMS=="usb", IMPORT{builtin}="hwdb --subsystem=usb" -SUBSYSTEMS=="usb", ATTRS{idVendor}!="", ATTRS{idProduct}!="", ENV{ID_VENDOR_ID}="$attr{idVendor}", ENV{ID_MODEL_ID}="$attr{idProduct}" +SUBSYSTEMS=="usb", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb" SUBSYSTEMS=="usb", GOTO="tty_end" -SUBSYSTEMS=="pci", IMPORT{builtin}="hwdb --subsystem=usb" SUBSYSTEMS=="pci", ENV{ID_BUS}="pci", ENV{ID_VENDOR_ID}="$attr{vendor}", ENV{ID_MODEL_ID}="$attr{device}" +IMPORT{builtin}="hwdb" LABEL="tty_end" diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c new file mode 100644 index 0000000000..eff4552778 --- /dev/null +++ b/src/udev/udev-builtin-net_id.c @@ -0,0 +1,55 @@ +/*** + This file is part of systemd. + + Copyright 2012 Kay Sievers <kay@vrfy.org> + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see <http://www.gnu.org/licenses/>. +***/ + +#include <stdio.h> +#include <stdlib.h> +#include <stdarg.h> +#include <unistd.h> +#include <string.h> +#include <errno.h> + +#include "udev.h" + +/* IEEE Organizationally Unique Identifier */ +static int lookup_OUI(struct udev_device *dev, bool test) { + const char *addr; + unsigned int a1, a2, a3; + char oui[16]; + + addr = udev_device_get_sysattr_value(dev, "address"); + if (!addr) + return -ENOENT; + + if (sscanf(addr, "%x:%x:%x:", &a1, &a2, &a3) != 3) + return -EINVAL; + + snprintf(oui, sizeof(oui), "OUI:%X%X%X", a1, a2, a3); + return udev_builtin_hwdb_lookup(dev, oui, test); +} + +static int builtin_net_id(struct udev_device *dev, int argc, char *argv[], bool test) { + lookup_OUI(dev, test); + return EXIT_SUCCESS; +} + +const struct udev_builtin udev_builtin_net_id = { + .name = "net_id", + .cmd = builtin_net_id, + .help = "network device properties", +}; diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c index de426a379a..ee81b2d713 100644 --- a/src/udev/udev-builtin.c +++ b/src/udev/udev-builtin.c @@ -36,6 +36,7 @@ static const struct udev_builtin *builtins[] = { [UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb, [UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id, [UDEV_BUILTIN_KMOD] = &udev_builtin_kmod, + [UDEV_BUILTIN_NET_ID] = &udev_builtin_net_id, [UDEV_BUILTIN_PATH_ID] = &udev_builtin_path_id, [UDEV_BUILTIN_USB_ID] = &udev_builtin_usb_id, #ifdef HAVE_ACL diff --git a/src/udev/udev.h b/src/udev/udev.h index a361c653fe..b0bd4d1961 100644 --- a/src/udev/udev.h +++ b/src/udev/udev.h @@ -140,6 +140,7 @@ enum udev_builtin_cmd { UDEV_BUILTIN_HWDB, UDEV_BUILTIN_INPUT_ID, UDEV_BUILTIN_KMOD, + UDEV_BUILTIN_NET_ID, UDEV_BUILTIN_PATH_ID, UDEV_BUILTIN_USB_ID, #ifdef HAVE_ACL @@ -162,6 +163,7 @@ extern const struct udev_builtin udev_builtin_firmware; extern const struct udev_builtin udev_builtin_hwdb; extern const struct udev_builtin udev_builtin_input_id; extern const struct udev_builtin udev_builtin_kmod; +extern const struct udev_builtin udev_builtin_net_id; extern const struct udev_builtin udev_builtin_path_id; extern const struct udev_builtin udev_builtin_usb_id; extern const struct udev_builtin udev_builtin_uaccess; |