diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2011-03-05 06:26:39 +0100 |
---|---|---|
committer | Kay Sievers <kay.sievers@vrfy.org> | 2011-03-05 06:26:39 +0100 |
commit | 3e0a2c9a50d799fb623694de2f821f46ec01e2ae (patch) | |
tree | 9db490552244702c43728cf0eb4b35bec53b70a2 | |
parent | 20bee04c19e49a0cef3bd7dfec9028270c46172b (diff) |
libudev: resolve ifindex in udev_device_new_from_id_filename()
-rw-r--r-- | libudev/libudev-device.c | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/libudev/libudev-device.c b/libudev/libudev-device.c index 8b8507c3a4..c78cf9b7a0 100644 --- a/libudev/libudev-device.c +++ b/libudev/libudev-device.c @@ -19,7 +19,11 @@ #include <dirent.h> #include <fcntl.h> #include <ctype.h> +#include <net/if.h> #include <sys/stat.h> +#include <sys/ioctl.h> +#include <sys/socket.h> +#include <linux/sockios.h> #include "libudev.h" #include "libudev-private.h" @@ -497,6 +501,35 @@ struct udev_device *udev_device_new_from_id_filename(struct udev *udev, char *id if (sscanf(id, "%c%i:%i", &type, &maj, &min) != 3) return NULL; return udev_device_new_from_devnum(udev, type, makedev(maj, min)); + case 'n': { + int sk; + struct ifreq ifr; + struct udev_device *dev; + int ifindex; + + ifindex = strtoul(&id[1], NULL, 10); + if (ifindex <= 0) + return NULL; + + sk = socket(PF_INET, SOCK_DGRAM, 0); + if (sk < 0) + return NULL; + memset(&ifr, 0x00, sizeof(struct ifreq)); + ifr.ifr_ifindex = ifindex; + if (ioctl(sk, SIOCGIFNAME, &ifr) != 0) { + close(sk); + return NULL; + } + close(sk); + + dev = udev_device_new_from_subsystem_sysname(udev, "net", ifr.ifr_name); + if (dev == NULL) + return NULL; + if (udev_device_get_ifindex(dev) == ifindex) + return dev; + udev_device_unref(dev); + return NULL; + } case '+': util_strscpy(subsys, sizeof(subsys), &id[1]); sysname = strchr(subsys, ':'); |