udevd: use dev_t or netif ifindex as database key

[elogind.git] / udev / udev-event.c

diff --git a/udev/udev-event.c b/udev/udev-event.c
index 9c2ce1d3882aeb1398e7b011fd378c83578b7285..f41f06b16a0b29a93d6c5e4f0bf3cba3a2a0db85 100644 (file)
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -111,7 +111,7 @@ size_t udev_event_apply_format(struct udev_event *event, const char *src, char *
        s = dest;
        l = size;
 
-       while (1) {
+       for (;;) {
                enum subst_type type = SUBST_UNKNOWN;
                char attrbuf[UTIL_PATH_SIZE];
                char *attr = NULL;
@@ -454,8 +454,8 @@ static void rename_netif_kernel_log(struct ifreq ifr)
                return;
        }
 
-       fprintf(f, "<6>udev: renamed network interface %s to %s\n",
-               ifr.ifr_name, ifr.ifr_newname);
+       fprintf(f, "<6>udev[%u]: renamed network interface %s to %s\n",
+               getpid(), ifr.ifr_name, ifr.ifr_newname);
        fclose(f);
 }
 
@@ -464,6 +464,7 @@ static int rename_netif(struct udev_event *event)
        struct udev_device *dev = event->dev;
        int sk;
        struct ifreq ifr;
+       int loop;
        int err;
 
        info(event->udev, "changing net interface name from '%s' to '%s'\n",
@@ -471,59 +472,60 @@ static int rename_netif(struct udev_event *event)
 
        sk = socket(PF_INET, SOCK_DGRAM, 0);
        if (sk < 0) {
+               err = -errno;
                err(event->udev, "error opening socket: %m\n");
-               return -1;
+               return err;
        }
 
        memset(&ifr, 0x00, sizeof(struct ifreq));
        util_strscpy(ifr.ifr_name, IFNAMSIZ, udev_device_get_sysname(dev));
        util_strscpy(ifr.ifr_newname, IFNAMSIZ, event->name);
        err = ioctl(sk, SIOCSIFNAME, &ifr);
-       if (err == 0)
+       if (err == 0) {
                rename_netif_kernel_log(ifr);
-       else {
-               int loop;
-
-               /* see if the destination interface name already exists */
-               if (errno != EEXIST) {
-                       err(event->udev, "error changing netif name %s to %s: %m\n",
-                           ifr.ifr_name, ifr.ifr_newname);
-                       goto exit;
-               }
+               goto out;
+       }
 
-               /* free our own name, another process may wait for us */
-               util_strscpyl(ifr.ifr_newname, IFNAMSIZ, udev_device_get_sysname(dev), "_rename", NULL);
-               err = ioctl(sk, SIOCSIFNAME, &ifr);
-               if (err != 0) {
-                       err(event->udev, "error changing netif name %s to %s: %m\n",
-                           ifr.ifr_name, ifr.ifr_newname);
-                       goto exit;
-               }
+       /* keep trying if the destination interface name already exists */
+       err = -errno;
+       if (err != -EEXIST)
+               goto out;
 
-               /* wait 90 seconds for our target to become available */
-               util_strscpy(ifr.ifr_name, IFNAMSIZ, ifr.ifr_newname);
-               util_strscpy(ifr.ifr_newname, IFNAMSIZ, event->name);
-               loop = 90 * 20;
-               while (loop--) {
-                       const struct timespec duration = { 0, 1000 * 1000 * 1000 / 20 };
+       /* free our own name, another process may wait for us */
+       util_strscpyl(ifr.ifr_newname, IFNAMSIZ, udev_device_get_sysname(dev), "-", event->name, NULL);
+       err = ioctl(sk, SIOCSIFNAME, &ifr);
+       if (err < 0) {
+               err = -errno;
+               goto out;
+       }
 
-                       err = ioctl(sk, SIOCSIFNAME, &ifr);
-                       if (err == 0) {
-                               rename_netif_kernel_log(ifr);
-                               break;
-                       }
+       /* log temporary name */
+       rename_netif_kernel_log(ifr);
 
-                       if (errno != EEXIST) {
-                               err(event->udev, "error changing net interface name %s to %s: %m\n",
-                                   ifr.ifr_name, ifr.ifr_newname);
-                               break;
-                       }
-                       dbg(event->udev, "wait for netif '%s' to become free, loop=%i\n",
-                           event->name, (90 * 20) - loop);
-                       nanosleep(&duration, NULL);
+       /* wait a maximum of 90 seconds for our target to become available */
+       util_strscpy(ifr.ifr_name, IFNAMSIZ, ifr.ifr_newname);
+       util_strscpy(ifr.ifr_newname, IFNAMSIZ, event->name);
+       loop = 90 * 20;
+       while (loop--) {
+               const struct timespec duration = { 0, 1000 * 1000 * 1000 / 20 };
+
+               dbg(event->udev, "wait for netif '%s' to become free, loop=%i\n",
+                   event->name, (90 * 20) - loop);
+               nanosleep(&duration, NULL);
+
+               err = ioctl(sk, SIOCSIFNAME, &ifr);
+               if (err == 0) {
+                       rename_netif_kernel_log(ifr);
+                       break;
                }
+               err = -errno;
+               if (err != -EEXIST)
+                       break;
        }
-exit:
+
+out:
+       if (err < 0)
+               err(event->udev, "error changing net interface name %s to %s: %m\n", ifr.ifr_name, ifr.ifr_newname);
        close(sk);
        return err;
 }
@@ -533,13 +535,8 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
        struct udev_device *dev = event->dev;
        int err = 0;
 
-       if (udev_device_get_sysname_old(dev) != NULL &&
-           strcmp(udev_device_get_sysname_old(dev), udev_device_get_sysname(dev)) != 0) {
-               udev_device_rename_db(dev);
-               info(event->udev, "moved database from '%s:%s' to '%s:%s'\n",
-                    udev_device_get_subsystem(dev), udev_device_get_sysname_old(dev),
-                    udev_device_get_subsystem(dev), udev_device_get_sysname(dev));
-       }
+       if (udev_device_get_subsystem(dev) == NULL)
+               return -1;
 
        if (strcmp(udev_device_get_action(dev), "remove") == 0) {
                udev_device_read_db(dev);
@@ -681,6 +678,10 @@ int udev_event_execute_run(struct udev_event *event, const sigset_t *sigmask)
 
                        udev_event_apply_format(event, cmd, program, sizeof(program));
                        envp = udev_device_get_properties_envp(event->dev);
+                       if (event->exec_delay > 0) {
+                               info(event->udev, "delay execution of '%s'\n", program);
+                               sleep(event->exec_delay);
+                       }
                        if (util_run_program(event->udev, program, envp, NULL, 0, NULL, sigmask, true) != 0) {
                                if (udev_list_entry_get_flags(list_entry))
                                        err = -1;