chiark / gitweb /
udev: fix netdev RUN handling
[elogind.git] / udev.c
diff --git a/udev.c b/udev.c
index 1d66410b6c0085ba1c9c780497fb4f8f94b98bc1..3eb788f4c12ecfa08e32694e75dcec395c71f03c 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -3,8 +3,8 @@
  *
  * Userspace devfs
  *
- * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- *
+ * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2004 Kay Sievers <kay.sievers@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 the
  *
  */
 
+#include <stdio.h>
+#include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 #include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
 #include <ctype.h>
+#include <errno.h>
 #include <signal.h>
+#include <unistd.h>
 
+#include "libsysfs/sysfs/libsysfs.h"
+#include "udev_libc_wrapper.h"
 #include "udev.h"
+#include "udev_utils.h"
+#include "udev_sysfs.h"
 #include "udev_version.h"
-#include "udev_dbus.h"
-#include "namedev.h"
-#include "udevdb.h"
-#include "libsysfs/libsysfs.h"
+#include "udev_rules.h"
+#include "logging.h"
+
+#ifdef USE_LOG
+void log_message(int priority, const char *format, ...)
+{
+       va_list args;
 
-/* global variables */
-char **main_argv;
-char **main_envp;
+       if (priority > udev_log_priority)
+               return;
+
+       va_start(args, format);
+       vsyslog(priority, format, args);
+       va_end(args);
+}
+#endif
 
-static void sig_handler(int signum)
+static void asmlinkage sig_handler(int signum)
 {
-       dbg("caught signal %d", signum);
        switch (signum) {
+               case SIGALRM:
+                       exit(1);
                case SIGINT:
                case SIGTERM:
-               case SIGKILL:
-                       sysbus_disconnect();
-                       udevdb_exit();
                        exit(20 + signum);
-                       break;
-               default:
-                       dbg("unhandled signal");
        }
 }
 
-static inline char *get_action(void)
-{
-       char *action;
-
-       action = getenv("ACTION");
-       return action;
-}
-
-static inline char *get_devpath(void)
-{
-       char *devpath;
-
-       devpath = getenv("DEVPATH");
-       return devpath;
-}
-
-static inline char *get_seqnum(void)
+int main(int argc, char *argv[], char *envp[])
 {
-       char *seqnum;
-
-       seqnum = getenv("SEQNUM");
-       return seqnum;
-}
-
-int main(int argc, char **argv, char **envp)
-{
-       char *action;
-       char *devpath;
-       char *subsystem;
+       struct udevice udev;
+       char path[PATH_SIZE];
+       const char *error;
+       const char *action;
+       const char *devpath;
+       const char *subsystem;
+       struct sigaction act;
        int retval = -EINVAL;
 
-       signal(SIGINT, sig_handler);
-       signal(SIGTERM, sig_handler);
-       signal(SIGKILL, sig_handler);
-
-       main_argv = argv;
-       main_envp = envp;
+       if (argc == 2 && strcmp(argv[1], "-V") == 0) {
+               printf("%s\n", UDEV_VERSION);
+               exit(0);
+       }
 
+       logging_init("udev");
+       udev_init_config();
        dbg("version %s", UDEV_VERSION);
 
-       if (argc != 2) {
-               dbg ("unknown number of arguments");
-               goto exit;
-       }
+       /* set signal handlers */
+       memset(&act, 0x00, sizeof(act));
+       act.sa_handler = (void (*)(int)) sig_handler;
+       sigemptyset (&act.sa_mask);
+       act.sa_flags = 0;
+       sigaction(SIGALRM, &act, NULL);
+       sigaction(SIGINT, &act, NULL);
+       sigaction(SIGTERM, &act, NULL);
 
-       subsystem = argv[1];
+       /* trigger timeout to prevent hanging processes */
+       alarm(ALARM_TIMEOUT);
 
-       devpath = get_devpath();
-       if (!devpath) {
-               dbg ("no devpath?");
-               goto exit;
-       }
-       dbg("looking at '%s'", devpath);
+       action = getenv("ACTION");
+       devpath = getenv("DEVPATH");
+       subsystem = getenv("SUBSYSTEM");
+       /* older kernels passed the SUBSYSTEM only as argument */
+       if (!subsystem && argc == 2)
+               subsystem = argv[1];
 
-       /* we only care about class devices and block stuff */
-       if (!strstr(devpath, "class") &&
-           !strstr(devpath, "block")) {
-               dbg("not a block or class device");
+       if (!action || !subsystem || !devpath) {
+               err("action, subsystem or devpath missing");
                goto exit;
        }
 
-       /* but we don't care about net class devices */
-       if (strcmp(subsystem, "net") == 0) {
-               dbg("don't care about net devices");
-               goto exit;
-       }
+       /* export log_level , as called programs may want to do the same as udev */
+       if (udev_log_priority) {
+               char priority[32];
 
-       action = get_action();
-       if (!action) {
-               dbg ("no action?");
-               goto exit;
+               sprintf(priority, "%i", udev_log_priority);
+               setenv("UDEV_LOG", priority, 1);
        }
 
-       /* initialize our configuration */
-       udev_init_config();
-
-       /* connect to the system message bus */
-       sysbus_connect();
-
-       /* initialize udev database */
-       retval = udevdb_init(UDEVDB_DEFAULT);
-       if (retval != 0) {
-               dbg("unable to initialize database");
-               goto exit_sysbus;
+       udev_init_device(&udev, devpath, subsystem, action);
+       udev_rules_init();
+
+       if (udev.type == DEV_BLOCK || udev.type == DEV_CLASS || udev.type == DEV_NET) {
+               /* handle device node */
+               if (strcmp(action, "add") == 0) {
+                       struct sysfs_class_device *class_dev;
+
+                       /* wait for sysfs of /sys/class /sys/block */
+                       dbg("node add");
+                       snprintf(path, sizeof(path), "%s%s", sysfs_path, udev.devpath);
+                       path[sizeof(path)-1] = '\0';
+                       class_dev = wait_class_device_open(path);
+                       if (class_dev == NULL) {
+                               dbg("open class device failed");
+                               goto run;
+                       }
+                       dbg("opened class_dev->name='%s'", class_dev->name);
+                       wait_for_class_device(class_dev, &error);
+
+                       /* get major/minor */
+                       if (udev.type == DEV_BLOCK || udev.type == DEV_CLASS)
+                               udev.devt = get_devt(class_dev);
+
+                       if (udev.type == DEV_NET || udev.devt) {
+                               /* name device */
+                               udev_rules_get_name(&udev, class_dev);
+                               if (udev.ignore_device) {
+                                       info("device event will be ignored");
+                                       goto cleanup;
+                               }
+                               if (udev.name[0] == '\0') {
+                                       info("device node creation supressed");
+                                       goto cleanup;
+                               }
+                               
+                               /* create node, store in db */
+                               retval = udev_add_device(&udev, class_dev);
+                       } else {
+                               dbg("no dev-file found");
+                               udev_rules_get_run(&udev, NULL);
+                               if (udev.ignore_device) {
+                                       info("device event will be ignored");
+                                       goto cleanup;
+                               }
+                       }
+                       sysfs_close_class_device(class_dev);
+               } else if (strcmp(action, "remove") == 0) {
+                       dbg("node remove");
+                       udev_rules_get_run(&udev, NULL);
+                       if (udev.ignore_device) {
+                               dbg("device event will be ignored");
+                               goto cleanup;
+                       }
+
+                       /* get name from db, remove db-entry, delete node */
+                       retval = udev_remove_device(&udev);
+               }
+
+               /* export name of device node or netif */
+               if (udev.devname[0] != '\0')
+                       setenv("DEVNAME", udev.devname, 1);
+       } else if (udev.type == DEV_DEVICE) {
+               if (strcmp(action, "add") == 0) {
+                       struct sysfs_device *devices_dev;
+
+                       /* wait for sysfs of /sys/devices/ */
+                       dbg("devices add");
+                       snprintf(path, sizeof(path), "%s%s", sysfs_path, devpath);
+                       path[sizeof(path)-1] = '\0';
+                       devices_dev = wait_devices_device_open(path);
+                       if (!devices_dev) {
+                               dbg("devices device unavailable (probably remove has beaten us)");
+                               goto run;
+                       }
+                       dbg("devices device opened '%s'", path);
+                       wait_for_devices_device(devices_dev, &error);
+                       udev_rules_get_run(&udev, devices_dev);
+                       sysfs_close_device(devices_dev);
+                       if (udev.ignore_device) {
+                               info("device event will be ignored");
+                               goto cleanup;
+                       }
+               } else if (strcmp(action, "remove") == 0) {
+                       dbg("devices remove");
+                       udev_rules_get_run(&udev, NULL);
+                       if (udev.ignore_device) {
+                               info("device event will be ignored");
+                               goto cleanup;
+                       }
+               }
        }
 
-       /* initialize the naming deamon */
-       namedev_init();
-
-       if (strcmp(action, "add") == 0)
-               retval = udev_add_device(devpath, subsystem);
-
-       else if (strcmp(action, "remove") == 0)
-               retval = udev_remove_device(devpath, subsystem);
+run:
+       if (udev_run && !list_empty(&udev.run_list)) {
+               struct name_entry *name_loop;
 
-       else {
-               dbg("unknown action '%s'", action);
-               retval = -EINVAL;
+               dbg("executing run list");
+               list_for_each_entry(name_loop, &udev.run_list, node)
+                       execute_command(name_loop->name, udev.subsystem);
        }
-       udevdb_exit();
 
-exit_sysbus:
-       /* disconnect from the system message bus */
-       sysbus_disconnect();
+cleanup:
+       udev_cleanup_device(&udev);
 
 exit:
+       logging_close();
        return retval;
 }