X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=6e0f7f1d0c535389c0ff56b1c2cbdc35213f1667;hp=0895e437ba76d6077c30ab5d685c7fca1be8bef7;hb=761e5b476f8e69f41958a62ed787f5d886fa212e;hpb=82ca88904d1c9bf17f4434f54e12754c00eddcbd diff --git a/udev.c b/udev.c index 0895e437b..6e0f7f1d0 100644 --- a/udev.c +++ b/udev.c @@ -32,56 +32,28 @@ #include #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 "namedev.h" +#include "udev_rules.h" #include "logging.h" - -#ifdef LOG -void log_message(int level, const char *format, ...) +#ifdef USE_LOG +void log_message(int priority, const char *format, ...) { va_list args; - if (!udev_log) + if (priority > udev_log_priority) return; va_start(args, format); - vsyslog(level, format, args); + vsyslog(priority, format, args); va_end(args); } #endif -/* (for now) true if udevsend is the helper */ -static int manage_hotplug_event(void) { - char helper[256]; - int fd; - int len; - - /* false, if we are called directly */ - if (!getenv("MANAGED_EVENT")) - goto exit; - - fd = open("/proc/sys/kernel/hotplug", O_RDONLY); - if (fd < 0) - goto exit; - - len = read(fd, helper, 256); - close(fd); - - if (len < 0) - goto exit; - helper[len] = '\0'; - - if (strstr(helper, "udevsend")) - return 1; - -exit: - return 0; -} - static void asmlinkage sig_handler(int signum) { switch (signum) { @@ -95,15 +67,14 @@ static void asmlinkage sig_handler(int signum) int main(int argc, char *argv[], char *envp[]) { - struct sigaction act; - struct sysfs_class_device *class_dev; - struct sysfs_device *devices_dev; struct udevice udev; - char path[SYSFS_PATH_MAX]; + struct udev_rules rules; + char path[PATH_SIZE]; const char *error; const char *action; const char *devpath; const char *subsystem; + struct sigaction act; int retval = -EINVAL; if (argc == 2 && strcmp(argv[1], "-V") == 0) { @@ -112,13 +83,12 @@ int main(int argc, char *argv[], char *envp[]) } logging_init("udev"); - dbg("version %s", UDEV_VERSION); - udev_init_config(); + dbg("version %s", UDEV_VERSION); /* set signal handlers */ memset(&act, 0x00, sizeof(act)); - act.sa_handler = (void (*) (int))sig_handler; + act.sa_handler = (void (*)(int)) sig_handler; sigemptyset (&act.sa_mask); act.sa_flags = 0; sigaction(SIGALRM, &act, NULL); @@ -126,18 +96,7 @@ int main(int argc, char *argv[], char *envp[]) sigaction(SIGTERM, &act, NULL); /* trigger timeout to prevent hanging processes */ - alarm(ALARM_TIMEOUT); - - if (strstr(argv[0], "udevstart") || (argc == 2 && strstr(argv[1], "udevstart"))) { - dbg("udevstart"); - - /* disable all logging, as it's much too slow on some facilities */ - udev_log = 0; - - namedev_init(); - retval = udev_start(); - goto exit; - } + alarm(UDEV_ALARM_TIMEOUT); action = getenv("ACTION"); devpath = getenv("DEVPATH"); @@ -145,101 +104,124 @@ int main(int argc, char *argv[], char *envp[]) /* older kernels passed the SUBSYSTEM only as argument */ if (!subsystem && argc == 2) subsystem = argv[1]; - udev_init_device(&udev, devpath, subsystem); - if (!action) { - dbg("no action"); - goto hotplug; + if (!action || !subsystem || !devpath) { + err("action, subsystem or devpath missing"); + goto exit; } - if (!subsystem) { - dbg("no subsystem"); - goto hotplug; - } + /* export log_priority , as called programs may want to do the same as udev */ + if (udev_log_priority) { + char priority[32]; - if (!devpath) { - dbg("no devpath"); - goto hotplug; + sprintf(priority, "%i", udev_log_priority); + setenv("UDEV_LOG", priority, 1); } - /* export logging flag, as called scripts may want to do the same as udev */ - if (udev_log) - setenv("UDEV_LOG", "1", 1); + udev_init_device(&udev, devpath, subsystem, action); + udev_rules_init(&rules, 0); - if ((strncmp(devpath, "/block/", 7) == 0) || (strncmp(devpath, "/class/", 7) == 0)) { + if (udev.type == DEV_BLOCK || udev.type == DEV_CLASS || udev.type == DEV_NET) { + /* handle device node */ if (strcmp(action, "add") == 0) { - /* wait for sysfs and possibly add node */ - dbg("udev add"); - - /* skip subsystems without "dev", but handle net devices */ - if (udev.type != 'n' && subsystem_expect_no_dev(udev.subsystem)) { - dbg("don't care about '%s' devices", udev.subsystem); - goto hotplug; - } + struct sysfs_class_device *class_dev; - snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, udev.devpath); + /* 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 hotplug; + dbg("open class device failed"); + goto run; } dbg("opened class_dev->name='%s'", class_dev->name); - wait_for_class_device(class_dev, &error); - /* init rules, permissions */ - namedev_init(); - - /* name, create node, store in db */ - retval = udev_add_device(&udev, class_dev); - + /* 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(&rules, &udev, class_dev); + if (udev.ignore_device) { + info("device event will be ignored"); + sysfs_close_class_device(class_dev); + goto cleanup; + } + if (udev.name[0] == '\0') { + info("device node creation supressed"); + sysfs_close_class_device(class_dev); + goto cleanup; + } + /* create node, store in db */ + retval = udev_add_device(&udev, class_dev); + } else { + dbg("no dev-file found"); + udev_rules_get_run(&rules, &udev, class_dev, NULL); + if (udev.ignore_device) { + info("device event will be ignored"); + sysfs_close_class_device(class_dev); + goto cleanup; + } + } sysfs_close_class_device(class_dev); } else if (strcmp(action, "remove") == 0) { - /* possibly remove a node */ - dbg("udev remove"); - - /* skip subsystems without "dev" */ - if (subsystem_expect_no_dev(udev.subsystem)) { - dbg("don't care about '%s' devices", udev.subsystem); - goto hotplug; + dbg("node remove"); + udev_rules_get_run(&rules, &udev, NULL, NULL); + if (udev.ignore_device) { + dbg("device event will be ignored"); + goto cleanup; } - /* get node from db, remove db-entry, delete created node */ + /* get name from db, remove db-entry, delete node */ retval = udev_remove_device(&udev); } - /* run dev.d/ scripts if we created/deleted a node or changed a netif name */ - if (udev.devname[0] != '\0') { + /* export name of device node or netif */ + if (udev.devname[0] != '\0') setenv("DEVNAME", udev.devname, 1); - if (udev_dev_d) - udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX); + } else if (udev.type == DEV_DEVICE && 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; } - } else if ((strncmp(devpath, "/devices/", 9) == 0)) { - if (strcmp(action, "add") == 0) { - /* wait for sysfs */ - dbg("devices add"); - - snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, devpath); - devices_dev = wait_devices_device_open(path); - if (!devices_dev) { - dbg("devices device unavailable (probably remove has beaten us)"); - goto hotplug; - } - dbg("devices device opened '%s'", path); - - wait_for_devices_device(devices_dev, &error); - - sysfs_close_device(devices_dev); - } else if (strcmp(action, "remove") == 0) { - dbg("devices remove"); + dbg("devices device opened '%s'", path); + wait_for_devices_device(devices_dev, &error); + udev_rules_get_run(&rules, &udev, NULL, devices_dev); + sysfs_close_device(devices_dev); + if (udev.ignore_device) { + info("device event will be ignored"); + goto cleanup; } } else { - dbg("unhandled"); + dbg("default handling"); + udev_rules_get_run(&rules, &udev, NULL, NULL); + if (udev.ignore_device) { + info("device event will be ignored"); + goto cleanup; + } + } + +run: + if (udev_run && !list_empty(&udev.run_list)) { + struct name_entry *name_loop; + + dbg("executing run list"); + list_for_each_entry(name_loop, &udev.run_list, node) + execute_program(name_loop->name, udev.subsystem, NULL, 0, NULL); } -hotplug: - if (udev_hotplug_d && manage_hotplug_event()) - udev_multiplex_directory(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX); +cleanup: + udev_cleanup_device(&udev); exit: logging_close();