udev: net_id - fix OUI handling

[elogind.git] / src / udev / udev-node.c

diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c
index aee84a92f1cd4984a87aa5f10fea8dfdccd9101e..77743037041b13e18ba02b36d7d48e4712bb8f3e 100644 (file)
--- a/src/udev/udev-node.c
+++ b/src/udev/udev-node.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2003-2010 Kay Sievers <kay@vrfy.org>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -67,21 +67,8 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink)
         /* preserve link with correct target, do not replace node of other device */
         if (lstat(slink, &stats) == 0) {
                 if (S_ISBLK(stats.st_mode) || S_ISCHR(stats.st_mode)) {
-                        struct stat stats2;
-
-                        log_debug("found existing node instead of symlink '%s'\n", slink);
-                        if (lstat(node, &stats2) == 0) {
-                                if ((stats.st_mode & S_IFMT) == (stats2.st_mode & S_IFMT) &&
-                                    stats.st_rdev == stats2.st_rdev && stats.st_ino != stats2.st_ino) {
-                                        log_debug("replace device node '%s' with symlink to our node '%s'\n",
-                                             slink, node);
-                                } else {
-                                        log_error("device node '%s' already exists, "
-                                            "link to '%s' will not overwrite it\n",
-                                            slink, node);
-                                        goto exit;
-                                }
-                        }
+                        log_error("conflicting device node '%s' found, link to '%s' will not be created\n", slink, node);
+                        goto exit;
                 } else if (S_ISLNK(stats.st_mode)) {
                         char buf[UTIL_PATH_SIZE];
                         int len;
@@ -91,7 +78,7 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink)
                                 buf[len] = '\0';
                                 if (strcmp(target, buf) == 0) {
                                         log_debug("preserve already existing symlink '%s' to '%s'\n", slink, target);
-                                        label_fix(slink, true);
+                                        label_fix(slink, true, false);
                                         utimensat(AT_FDCWD, slink, NULL, AT_SYMLINK_NOFOLLOW);
                                         goto exit;
                                 }
@@ -172,7 +159,7 @@ static const char *link_find_prioritized(struct udev_device *dev, bool add, cons
                 if (strcmp(dent->d_name, udev_device_get_id_filename(dev)) == 0)
                         continue;
 
-                dev_db = udev_device_new_from_id_filename(udev, dent->d_name);
+                dev_db = udev_device_new_from_device_id(udev, dent->d_name);
                 if (dev_db != NULL) {
                         const char *devnode;
 
@@ -203,8 +190,8 @@ static void link_update(struct udev_device *dev, const char *slink, bool add)
         const char *target;
         char buf[UTIL_PATH_SIZE];
 
-        util_path_encode(slink + strlen(TEST_PREFIX "/dev"), name_enc, sizeof(name_enc));
-        util_strscpyl(dirname, sizeof(dirname), TEST_PREFIX "/run/udev/links/", name_enc, NULL);
+        util_path_encode(slink + strlen("/dev"), name_enc, sizeof(name_enc));
+        util_strscpyl(dirname, sizeof(dirname), "/run/udev/links/", name_enc, NULL);
         util_strscpyl(filename, sizeof(filename), dirname, "/", udev_device_get_id_filename(dev), NULL);
 
         if (!add && unlink(filename) == 0)
@@ -263,7 +250,7 @@ void udev_node_update_old_links(struct udev_device *dev, struct udev_device *dev
 
                 log_debug("update old name, '%s' no longer belonging to '%s'\n",
                      name, udev_device_get_devpath(dev));
-                link_update(dev, name, 0);
+                link_update(dev, name, false);
         }
 }
 
@@ -307,7 +294,7 @@ static int node_fixup(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid
          * something else has set a custom context in the meantime.
          */
         if (strcmp(udev_device_get_action(dev), "add") == 0)
-                label_fix(devnode, true);
+            label_fix(devnode, true, false);
 
         /* always update timestamp when we re-use the node, like on media change events */
         utimensat(AT_FDCWD, devnode, NULL, 0);
@@ -328,19 +315,14 @@ void udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid)
                 return;
 
         /* always add /dev/{block,char}/$major:$minor */
-        snprintf(filename, sizeof(filename), TEST_PREFIX "/dev/%s/%u:%u",
+        snprintf(filename, sizeof(filename), "/dev/%s/%u:%u",
                  strcmp(udev_device_get_subsystem(dev), "block") == 0 ? "block" : "char",
                  major(udev_device_get_devnum(dev)), minor(udev_device_get_devnum(dev)));
         node_symlink(udev, udev_device_get_devnode(dev), filename);
 
         /* create/update symlinks, add symlinks to name index */
-        udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(dev)) {
-                if (udev_list_entry_get_num(list_entry))
-                        /* simple unmanaged link name */
-                        node_symlink(udev, udev_device_get_devnode(dev), udev_list_entry_get_name(list_entry));
-                else
-                        link_update(dev, udev_list_entry_get_name(list_entry), 1);
-        }
+        udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(dev))
+                        link_update(dev, udev_list_entry_get_name(list_entry), true);
 }
 
 void udev_node_remove(struct udev_device *dev)
@@ -350,10 +332,10 @@ void udev_node_remove(struct udev_device *dev)
 
         /* remove/update symlinks, remove symlinks from name index */
         udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(dev))
-                link_update(dev, udev_list_entry_get_name(list_entry), 0);
+                link_update(dev, udev_list_entry_get_name(list_entry), false);
 
         /* remove /dev/{block,char}/$major:$minor */
-        snprintf(filename, sizeof(filename), TEST_PREFIX "/dev/%s/%u:%u",
+        snprintf(filename, sizeof(filename), "/dev/%s/%u:%u",
                  strcmp(udev_device_get_subsystem(dev), "block") == 0 ? "block" : "char",
                  major(udev_device_get_devnum(dev)), minor(udev_device_get_devnum(dev)));
         unlink(filename);