1
1
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00

udev: net_id - add builtin to retrieve data for network devices

This commit is contained in:
Kay Sievers 2012-11-09 12:37:40 +01:00
parent 59803c380d
commit a660c63c55
6 changed files with 65 additions and 8 deletions

View File

@ -1861,6 +1861,7 @@ libudev_core_la_SOURCES = \
src/udev/udev-builtin-hwdb.c \ src/udev/udev-builtin-hwdb.c \
src/udev/udev-builtin-input_id.c \ src/udev/udev-builtin-input_id.c \
src/udev/udev-builtin-kmod.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-path_id.c \
src/udev/udev-builtin-usb_id.c \ src/udev/udev-builtin-usb_id.c \
src/libsystemd-daemon/sd-daemon.c src/libsystemd-daemon/sd-daemon.c

View File

@ -3,12 +3,12 @@
ACTION=="remove", GOTO="net_end" ACTION=="remove", GOTO="net_end"
SUBSYSTEM!="net", GOTO="net_end" SUBSYSTEM!="net", GOTO="net_end"
SUBSYSTEMS=="usb", ENV{ID_MODEL}=="", IMPORT{builtin}="usb_id" IMPORT{builtin}="net_id"
SUBSYSTEMS=="usb", IMPORT{builtin}="hwdb --subsystem=usb" SUBSYSTEMS=="usb", IMPORT{builtin}="usb_id", 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", GOTO="net_end" 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}" SUBSYSTEMS=="pci", ENV{ID_BUS}="pci", ENV{ID_VENDOR_ID}="$attr{vendor}", ENV{ID_MODEL_ID}="$attr{device}"
IMPORT{builtin}="hwdb"
LABEL="net_end" LABEL="net_end"

View File

@ -3,13 +3,11 @@
ACTION=="remove", GOTO="tty_end" ACTION=="remove", GOTO="tty_end"
SUBSYSTEM!="tty", GOTO="tty_end" SUBSYSTEM!="tty", GOTO="tty_end"
SUBSYSTEMS=="usb", ENV{ID_MODEL}=="", IMPORT{builtin}="usb_id" SUBSYSTEMS=="usb", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb"
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", GOTO="tty_end" 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}" SUBSYSTEMS=="pci", ENV{ID_BUS}="pci", ENV{ID_VENDOR_ID}="$attr{vendor}", ENV{ID_MODEL_ID}="$attr{device}"
IMPORT{builtin}="hwdb"
LABEL="tty_end" LABEL="tty_end"

View File

@ -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",
};

View File

@ -36,6 +36,7 @@ static const struct udev_builtin *builtins[] = {
[UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb, [UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb,
[UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id, [UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id,
[UDEV_BUILTIN_KMOD] = &udev_builtin_kmod, [UDEV_BUILTIN_KMOD] = &udev_builtin_kmod,
[UDEV_BUILTIN_NET_ID] = &udev_builtin_net_id,
[UDEV_BUILTIN_PATH_ID] = &udev_builtin_path_id, [UDEV_BUILTIN_PATH_ID] = &udev_builtin_path_id,
[UDEV_BUILTIN_USB_ID] = &udev_builtin_usb_id, [UDEV_BUILTIN_USB_ID] = &udev_builtin_usb_id,
#ifdef HAVE_ACL #ifdef HAVE_ACL

View File

@ -140,6 +140,7 @@ enum udev_builtin_cmd {
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_PATH_ID, UDEV_BUILTIN_PATH_ID,
UDEV_BUILTIN_USB_ID, UDEV_BUILTIN_USB_ID,
#ifdef HAVE_ACL #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_hwdb;
extern const struct udev_builtin udev_builtin_input_id; extern const struct udev_builtin udev_builtin_input_id;
extern const struct udev_builtin udev_builtin_kmod; 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_path_id;
extern const struct udev_builtin udev_builtin_usb_id; extern const struct udev_builtin udev_builtin_usb_id;
extern const struct udev_builtin udev_builtin_uaccess; extern const struct udev_builtin udev_builtin_uaccess;