summaryrefslogtreecommitdiff
path: root/src/udev
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2012-11-20 18:10:45 +0100
committerKay Sievers <kay@vrfy.org>2012-11-20 18:10:45 +0100
commitd23965a64eb5c2c97b839dc2e3e79fc1613994f1 (patch)
tree228eb07f41a58b7d9f9c28bf9d901d61acebb060 /src/udev
parent66128b2b4d9a1fe3d65ccad3d916f5db07a765ca (diff)
udev: net - add device naming properties
Diffstat (limited to 'src/udev')
-rw-r--r--src/udev/udev-builtin-net_id.c118
1 files changed, 107 insertions, 11 deletions
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
index eff4552778..72237bf31a 100644
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -17,6 +17,17 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+/*
+ * eno<index> -- ethernet on-board
+ * ID_NET_NAME_FIRMWARE=eno1
+ *
+ * enp<pci bus number>s<slot>f<function> -- physical location/path
+ * ID_NET_NAME_PATH=enp19s0f0
+ *
+ * enm<MAC address> -- MAC address
+ * ID_NET_NAME_MAC=enxf0def180d479
+ */
+
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
@@ -26,25 +37,110 @@
#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];
+static int dev_pci(struct udev_device *dev, const char *prefix, bool test) {
+ struct udev_device *d;
+ unsigned int bus;
+ unsigned int slot;
+ unsigned int func;
+ const char *index;
+ int err;
- addr = udev_device_get_sysattr_value(dev, "address");
- if (!addr)
+ /* skip other buses than direct PCI parents */
+ d = udev_device_get_parent(dev);
+ if (!d || !streq("pci", udev_device_get_subsystem(d)))
return -ENOENT;
- if (sscanf(addr, "%x:%x:%x:", &a1, &a2, &a3) != 3)
+ /* find SMBIOS type 41 entries for on-board devices */
+ index = udev_device_get_sysattr_value(d, "index");
+ if (index) {
+ unsigned int idx;
+
+ idx = strtoul(index, NULL, 0);
+ if (idx > 0) {
+ const char *label;
+ char s[16];
+
+ snprintf(s, sizeof(s), "%so%d", prefix, idx);
+ udev_builtin_add_property(dev, test, "ID_NET_NAME_FIRMWARE", s);
+
+ label = udev_device_get_sysattr_value(d, "label");
+ if (label)
+ udev_builtin_add_property(dev, test, "ID_NET_LABEL_FIRMWARE", label);
+ }
+ }
+
+ /* compose a name based on the PCI bus location */
+ if (sscanf(udev_device_get_sysname(d), "0000:%x:%x.%d", &bus, &slot, &func) == 3) {
+ char str[16];
+
+ snprintf(str, sizeof(str), "%sp%ds%df%d", prefix, bus, slot, func);
+ err = udev_builtin_add_property(dev, test, "ID_NET_NAME_PATH", str);
+ if (err < 0)
+ return err;
+ }
+ return 0;
+}
+
+static int dev_mac(struct udev_device *dev, const char *prefix, bool test) {
+ const char *s;
+ unsigned int i;
+ unsigned int a1, a2, a3, a4, a5, a6;
+ char str[16];
+ int err;
+
+ /* check for NET_ADDR_PERM, skip random MAC addresses */
+ s = udev_device_get_sysattr_value(dev, "addr_assign_type");
+ if (!s)
+ return EXIT_FAILURE;
+ i = strtoul(s, NULL, 0);
+ if (i != 0)
+ return 0;
+
+ s = udev_device_get_sysattr_value(dev, "address");
+ if (!s)
+ return -ENOENT;
+ if (sscanf(s, "%x:%x:%x:%x:%x:%x", &a1, &a2, &a3, &a4, &a5, &a6) != 6)
+ return -EINVAL;
+
+ /* skip empty MAC addresses */
+ if (a1 + a2 + a3 + a4 + a5 + a6 == 0)
return -EINVAL;
- snprintf(oui, sizeof(oui), "OUI:%X%X%X", a1, a2, a3);
- return udev_builtin_hwdb_lookup(dev, oui, test);
+ /* add IEEE Organizationally Unique Identifier */
+ snprintf(str, sizeof(str), "OUI:%X%X%X", a1, a2, a3);
+ udev_builtin_hwdb_lookup(dev, str, test);
+
+ snprintf(str, sizeof(str), "%sx%x%x%x%x%x%x", prefix, a1, a2, a3, a4, a5, a6);
+ err = udev_builtin_add_property(dev, test, "ID_NET_NAME_MAC", str);
+ if (err < 0)
+ return err;
+ return 0;
}
static int builtin_net_id(struct udev_device *dev, int argc, char *argv[], bool test) {
- lookup_OUI(dev, test);
+ const char *s;
+ unsigned int i;
+ const char *devtype;
+ const char *prefix = "en";
+
+ /* handle only ARPHRD_ETHER devices */
+ s = udev_device_get_sysattr_value(dev, "type");
+ if (!s)
+ return EXIT_FAILURE;
+ i = strtoul(s, NULL, 0);
+ if (i != 1)
+ return 0;
+
+ devtype = udev_device_get_devtype(dev);
+ if (devtype) {
+ if (streq("wlan", devtype))
+ prefix = "wl";
+ else if (streq("wwan", devtype))
+ prefix = "ww";
+ }
+
+ dev_pci(dev, prefix, test);
+ dev_mac(dev, prefix, test);
return EXIT_SUCCESS;
}