X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=3eb788f4c12ecfa08e32694e75dcec395c71f03c;hp=e71cddd3eee3cfd5f47d8ba892c832713f38aaa9;hb=d27d8d6a8d63ffce768842324dd53067b9b0e905;hpb=aa8666f77b1f605dced47a822a8b74b9c1326fed diff --git a/udev.c b/udev.c index e71cddd3e..3eb788f4c 100644 --- a/udev.c +++ b/udev.c @@ -32,53 +32,28 @@ #include #include "libsysfs/sysfs/libsysfs.h" +#include "udev_libc_wrapper.h" #include "udev.h" -#include "udev_lib.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 -unsigned char logname[LOGNAME_SIZE]; -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; - - 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) { @@ -92,144 +67,160 @@ 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]; - int retval = -EINVAL; + char path[PATH_SIZE]; const char *error; - const char *action = getenv("ACTION"); - const char *devpath = getenv("DEVPATH"); - const char *subsystem = argv[1]; + const char *action; + const char *devpath; + const char *subsystem; + struct sigaction act; + int retval = -EINVAL; + + if (argc == 2 && strcmp(argv[1], "-V") == 0) { + printf("%s\n", UDEV_VERSION); + exit(0); + } - dbg("version %s", UDEV_VERSION); logging_init("udev"); 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; - /* alarm must not restart syscalls*/ sigaction(SIGALRM, &act, NULL); sigaction(SIGINT, &act, NULL); sigaction(SIGTERM, &act, NULL); - /* trigger timeout to interrupt blocking syscalls */ + /* trigger timeout to prevent hanging processes */ alarm(ALARM_TIMEOUT); - udev_set_values(&udev, devpath, subsystem, action); - - if (strstr(argv[0], "udevstart") || (argv[1] != NULL && strstr(argv[1], "udevstart"))) { - dbg("udevstart"); + action = getenv("ACTION"); + devpath = getenv("DEVPATH"); + subsystem = getenv("SUBSYSTEM"); + /* older kernels passed the SUBSYSTEM only as argument */ + if (!subsystem && argc == 2) + subsystem = argv[1]; - /* disable all logging, as it's much too slow on some facilities */ - udev_log = 0; - - namedev_init(); - retval = udev_start(); + if (!action || !subsystem || !devpath) { + err("action, subsystem or devpath missing"); goto exit; } - if (!action) { - dbg("no action"); - goto hotplug; - } - - if (!subsystem) { - dbg("no subsystem"); - goto hotplug; - } + /* export log_level , 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(); - 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 blacklisted subsystems */ - 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); - - /* run dev.d/ scripts if we created a node or changed a netif name */ - if (udev.devname[0] != '\0') { - setenv("DEVNAME", udev.devname, 1); - dev_d_execute(&udev, DEVD_DIR, DEVD_SUFFIX); + /* 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) { - /* possibly remove a node */ - dbg("udev remove"); - - /* get node from db, remove db-entry, delete created node */ - retval = udev_remove_device(&udev); - - /* Set the DEVNAME if known */ - if (udev.devname[0] != '\0') { - setenv("DEVNAME", udev.devname, 1); - } - /* run dev.d/ scripts if we're not instructed to ignore the event */ - if (udev.devname[0] != '\0') { - setenv("DEVNAME", udev.devname, 1); - dev_d_execute(&udev, DEVD_DIR, DEVD_SUFFIX); + 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); } - } else if ((strncmp(devpath, "/devices/", 9) == 0)) { + + /* 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) { - /* wait for sysfs */ - dbg("devices add"); + struct sysfs_device *devices_dev; - snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, devpath); + /* 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 hotplug; + 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; + } } - } else { - dbg("unhandled"); } -hotplug: - if (manage_hotplug_event()) - dev_d_execute(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX); +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_command(name_loop->name, udev.subsystem); + } + +cleanup: + udev_cleanup_device(&udev); exit: logging_close();