/*
- * Copyright (C) 2004-2009 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2003-2010 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
#include <errno.h>
#include <ctype.h>
#include <string.h>
+#include <time.h>
+#include <net/if.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
-#include <net/if.h>
#include <linux/sockios.h>
#include "udev.h"
}
for (i = 0; i < ARRAY_SIZE(map); i++) {
- if (strncasecmp(&from[1], map[i].name, strlen(map[i].name)) == 0) {
+ if (strncmp(&from[1], map[i].name, strlen(map[i].name)) == 0) {
type = map[i].type;
from += strlen(map[i].name)+1;
dbg(event->udev, "will substitute format name '%s'\n", map[i].name);
attrbuf[i] = '\0';
from += i+1;
attr = attrbuf;
+ } else {
+ attr = NULL;
}
switch (type) {
break;
}
case SUBST_ATTR: {
- const char *val;
- char value[UTIL_NAME_SIZE];
+ const char *value = NULL;
+ char vbuf[UTIL_NAME_SIZE];
size_t len;
int count;
break;
}
- value[0] = '\0';
- /* read the value specified by "[dmi/id]product_name" */
- util_resolve_subsys_kernel(event->udev, attr, value, sizeof(value), 1);
+ /* try to read the value specified by "[dmi/id]product_name" */
+ if (util_resolve_subsys_kernel(event->udev, attr, vbuf, sizeof(vbuf), 1) == 0)
+ value = vbuf;
- /* try to read attribute of the current device */
- if (value[0] == '\0') {
- val = udev_device_get_sysattr_value(event->dev, attr);
- if (val != NULL)
- util_strscpy(value, sizeof(value), val);
- }
+ /* try to read the attribute the device */
+ if (value == NULL)
+ value = udev_device_get_sysattr_value(event->dev, attr);
/* try to read the attribute of the parent device, other matches have selected */
- if (value[0] == '\0' && event->dev_parent != NULL && event->dev_parent != event->dev) {
- val = udev_device_get_sysattr_value(event->dev_parent, attr);
- if (val != NULL)
- util_strscpy(value, sizeof(value), val);
- }
+ if (value == NULL && event->dev_parent != NULL && event->dev_parent != event->dev)
+ value = udev_device_get_sysattr_value(event->dev_parent, attr);
- if (value[0]=='\0')
+ if (value == NULL)
break;
/* strip trailing whitespace, and replace unwanted characters */
- len = strlen(value);
- while (len > 0 && isspace(value[--len]))
- value[len] = '\0';
- count = udev_util_replace_chars(value, UDEV_ALLOWED_CHARS_INPUT);
+ if (value != vbuf)
+ util_strscpy(vbuf, sizeof(vbuf), value);
+ len = strlen(vbuf);
+ while (len > 0 && isspace(vbuf[--len]))
+ vbuf[len] = '\0';
+ count = udev_util_replace_chars(vbuf, UDEV_ALLOWED_CHARS_INPUT);
if (count > 0)
info(event->udev, "%i character(s) replaced\n" , count);
- l = util_strpcpy(&s, l, value);
- dbg(event->udev, "substitute sysfs value '%s'\n", value);
+ l = util_strpcpy(&s, l, vbuf);
+ dbg(event->udev, "substitute sysfs value '%s'\n", vbuf);
break;
}
case SUBST_PARENT: {
}
/* free our own name, another process may wait for us */
- util_strscpy(ifr.ifr_newname, IFNAMSIZ, udev_device_get_sysname(dev));
- util_strscpy(ifr.ifr_newname, IFNAMSIZ, "_rename");
+ 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",
util_strscpy(ifr.ifr_newname, IFNAMSIZ, event->name);
loop = 90 * 20;
while (loop--) {
+ const struct timespec duration = { 0, 1000 * 1000 * 1000 / 20 };
+
err = ioctl(sk, SIOCSIFNAME, &ifr);
if (err == 0) {
rename_netif_kernel_log(ifr);
}
dbg(event->udev, "wait for netif '%s' to become free, loop=%i\n",
event->name, (90 * 20) - loop);
- usleep(1000 * 1000 / 20);
+ nanosleep(&duration, NULL);
}
}
exit:
struct udev_device *dev = event->dev;
int err = 0;
- if (udev_device_get_devpath_old(dev) != NULL) {
- if (udev_device_rename_db(dev, udev_device_get_devpath(dev)) == 0)
- info(event->udev, "moved database from '%s' to '%s'\n",
- udev_device_get_devpath_old(dev), udev_device_get_devpath(dev));
+ 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));
}
- /* add device node */
- if (major(udev_device_get_devnum(dev)) != 0 &&
- (strcmp(udev_device_get_action(dev), "add") == 0 || strcmp(udev_device_get_action(dev), "change") == 0)) {
- char filename[UTIL_PATH_SIZE];
- struct udev_device *dev_old;
- int delete_kdevnode = 0;
-
- dbg(event->udev, "device node add '%s'\n", udev_device_get_devpath(dev));
-
- /* read old database entry */
- dev_old = udev_device_new_from_syspath(event->udev, udev_device_get_syspath(dev));
- if (dev_old != NULL) {
- udev_device_read_db(dev_old);
- udev_device_set_info_loaded(dev_old);
+ if (strcmp(udev_device_get_action(dev), "remove") == 0) {
+ udev_device_read_db(dev);
+ udev_device_set_info_loaded(dev);
+ udev_device_delete_db(dev);
- /* disable watch during event processing */
- udev_watch_end(event->udev, dev_old);
- }
+ if (major(udev_device_get_devnum(dev)) != 0)
+ udev_watch_end(event->udev, dev);
udev_rules_apply_to_event(rules, event);
- if (event->tmp_node != NULL) {
- dbg(event->udev, "cleanup temporary device node\n");
- util_unlink_secure(event->udev, event->tmp_node);
- free(event->tmp_node);
- event->tmp_node = NULL;
- }
-
- if (event->ignore_device) {
- info(event->udev, "device event will be ignored\n");
- delete_kdevnode = 1;
- goto exit_add;
- }
-
- if (event->name != NULL && event->name[0] == '\0') {
- info(event->udev, "device node creation supressed\n");
- delete_kdevnode = 1;
- goto exit_add;
- }
-
- /* if rule given name disagrees with kernel node name, delete kernel node */
- if (event->name != NULL && udev_device_get_knodename(dev) != NULL) {
- if (strcmp(event->name, udev_device_get_knodename(dev)) != 0)
- delete_kdevnode = 1;
- }
- /* no rule, use kernel provided name */
- if (event->name == NULL) {
- if (udev_device_get_knodename(dev) != NULL) {
- event->name = strdup(udev_device_get_knodename(dev));
- info(event->udev, "no node name set, will use kernel supplied name '%s'\n", event->name);
- } else {
- event->name = strdup(udev_device_get_sysname(event->dev));
- info(event->udev, "no node name set, will use device name '%s'\n", event->name);
- }
- }
-
- /* something went wrong */
- if (event->name == NULL) {
- err(event->udev, "no node name for '%s'\n", udev_device_get_sysname(event->dev));
- goto exit_add;
- }
+ if (major(udev_device_get_devnum(dev)) != 0)
+ err = udev_node_remove(dev);
+ } else {
+ event->dev_db = udev_device_new_from_syspath(event->udev, udev_device_get_syspath(dev));
+ if (event->dev_db != NULL) {
+ udev_device_read_db(event->dev_db);
+ udev_device_set_info_loaded(event->dev_db);
- /* set device node name */
- util_strscpyl(filename, sizeof(filename), udev_get_dev_path(event->udev), "/", event->name, NULL);
- udev_device_set_devnode(dev, filename);
-
- /* write current database entry */
- udev_device_update_db(dev);
-
- /* remove/update possible left-over symlinks from old database entry */
- if (dev_old != NULL)
- udev_node_update_old_links(dev, dev_old);
-
- /* create new node and symlinks */
- err = udev_node_add(dev, event->mode, event->uid, event->gid);
-exit_add:
- if (delete_kdevnode && udev_device_get_knodename(dev) != NULL) {
- struct stat stats;
-
- util_strscpyl(filename, sizeof(filename),
- udev_get_dev_path(event->udev), "/", udev_device_get_knodename(dev), NULL);
- if (stat(filename, &stats) == 0 && stats.st_rdev == udev_device_get_devnum(dev)) {
- unlink(filename);
- util_delete_path(event->udev, filename);
- info(event->udev, "removed kernel created node '%s'\n", filename);
- }
+ /* disable watch during event processing */
+ if (major(udev_device_get_devnum(dev)) != 0)
+ udev_watch_end(event->udev, event->dev_db);
}
- udev_device_unref(dev_old);
- goto exit;
- }
-
- /* add netif */
- if (strcmp(udev_device_get_subsystem(dev), "net") == 0 && strcmp(udev_device_get_action(dev), "add") == 0) {
- dbg(event->udev, "netif add '%s'\n", udev_device_get_devpath(dev));
- udev_device_delete_db(dev);
udev_rules_apply_to_event(rules, event);
- if (event->ignore_device) {
- info(event->udev, "device event will be ignored\n");
- goto exit;
- }
- if (event->name == NULL)
- goto exit;
- /* look if we want to change the name of the netif */
- if (strcmp(event->name, udev_device_get_sysname(dev)) != 0) {
+ /* rename a new network interface, if needed */
+ if (strcmp(udev_device_get_subsystem(dev), "net") == 0 && strcmp(udev_device_get_action(dev), "add") == 0 &&
+ event->name != NULL && strcmp(event->name, udev_device_get_sysname(dev)) != 0) {
char syspath[UTIL_PATH_SIZE];
char *pos;
err = rename_netif(event);
- if (err != 0)
- goto exit;
- info(event->udev, "renamed netif to '%s'\n", event->name);
-
- /* remember old name */
- udev_device_add_property(dev, "INTERFACE_OLD", udev_device_get_sysname(dev));
-
- /* now change the devpath, because the kernel device name has changed */
- util_strscpy(syspath, sizeof(syspath), udev_device_get_syspath(dev));
- pos = strrchr(syspath, '/');
- if (pos != NULL) {
- pos++;
- util_strscpy(pos, sizeof(syspath) - (pos - syspath), event->name);
- udev_device_set_syspath(event->dev, syspath);
- udev_device_add_property(dev, "INTERFACE", udev_device_get_sysname(dev));
- info(event->udev, "changed devpath to '%s'\n", udev_device_get_devpath(dev));
+ if (err == 0) {
+ info(event->udev, "renamed netif to '%s'\n", event->name);
+
+ /* delete stale db file */
+ udev_device_delete_db(dev);
+
+ /* remember old name */
+ udev_device_add_property(dev, "INTERFACE_OLD", udev_device_get_sysname(dev));
+
+ /* now change the devpath, because the kernel device name has changed */
+ util_strscpy(syspath, sizeof(syspath), udev_device_get_syspath(dev));
+ pos = strrchr(syspath, '/');
+ if (pos != NULL) {
+ pos++;
+ util_strscpy(pos, sizeof(syspath) - (pos - syspath), event->name);
+ udev_device_set_syspath(event->dev, syspath);
+ udev_device_add_property(dev, "INTERFACE", udev_device_get_sysname(dev));
+ info(event->udev, "changed devpath to '%s'\n", udev_device_get_devpath(dev));
+ }
}
}
- udev_device_update_db(dev);
- goto exit;
- }
- /* remove device node */
- if (major(udev_device_get_devnum(dev)) != 0 && strcmp(udev_device_get_action(dev), "remove") == 0) {
- /* import database entry and delete it */
- udev_device_read_db(dev);
- udev_device_set_info_loaded(dev);
- udev_device_delete_db(dev);
+ if (major(udev_device_get_devnum(dev)) != 0) {
+ char filename[UTIL_PATH_SIZE];
- /* remove watch */
- udev_watch_end(event->udev, dev);
+ if (event->tmp_node != NULL) {
+ info(event->udev, "cleanup temporary device node\n");
+ util_unlink_secure(event->udev, event->tmp_node);
+ free(event->tmp_node);
+ event->tmp_node = NULL;
+ }
- if (udev_device_get_devnode(dev) == NULL) {
- char devnode[UTIL_PATH_SIZE];
+ /* no rule, use kernel provided name */
+ if (event->name == NULL) {
+ if (udev_device_get_knodename(dev) != NULL) {
+ event->name = strdup(udev_device_get_knodename(dev));
+ info(event->udev, "no node name set, will use kernel supplied name '%s'\n", event->name);
+ } else {
+ event->name = strdup(udev_device_get_sysname(event->dev));
+ info(event->udev, "no node name set, will use device name '%s'\n", event->name);
+ }
+ }
- info(event->udev, "'%s' not found in database, using kernel name '%s'\n",
- udev_device_get_syspath(dev), udev_device_get_sysname(dev));
- util_strscpyl(devnode, sizeof(devnode),
- udev_get_dev_path(event->udev), "/", udev_device_get_sysname(dev), NULL);
- udev_device_set_devnode(dev, devnode);
- }
+ if (event->name == NULL) {
+ /* things went wrong */
+ udev_device_delete_db(dev);
+ udev_device_unref(event->dev_db);
+ err = -ENOMEM;
+ goto out;
+ }
- udev_rules_apply_to_event(rules, event);
- if (event->ignore_device) {
- info(event->udev, "device event will be ignored\n");
- goto exit;
+ /* set device node name */
+ util_strscpyl(filename, sizeof(filename), udev_get_dev_path(event->udev), "/", event->name, NULL);
+ udev_device_set_devnode(dev, filename);
}
- if (udev_device_get_ignore_remove(dev)) {
- info(event->udev, "ignore_remove for '%s'\n", udev_device_get_devnode(dev));
- goto exit;
- }
+ udev_device_update_db(dev);
- err = udev_node_remove(dev);
- goto exit;
- }
+ if (major(udev_device_get_devnum(dev)) != 0) {
+ /* remove/update possible left-over symlinks from old database entry */
+ if (event->dev_db != NULL)
+ udev_node_update_old_links(dev, event->dev_db);
- /* default devices */
- udev_rules_apply_to_event(rules, event);
- if (event->ignore_device)
- info(event->udev, "device event will be ignored\n");
+ if (event->name[0] != '\0')
+ err = udev_node_add(dev, event->mode, event->uid, event->gid);
+ else
+ info(event->udev, "device node creation suppressed\n");
+
+ /* remove kernel-created node, if needed */
+ if (udev_device_get_knodename(dev) != NULL && strcmp(event->name, udev_device_get_knodename(dev)) != 0) {
+ struct stat stats;
+ char filename[UTIL_PATH_SIZE];
+
+ info(event->udev, "remove kernel created node '%s'\n", udev_device_get_knodename(dev));
+ util_strscpyl(filename, sizeof(filename), udev_get_dev_path(event->udev), "/", udev_device_get_knodename(dev), NULL);
+ if (stat(filename, &stats) == 0 && stats.st_rdev == udev_device_get_devnum(dev)) {
+ util_unlink_secure(event->udev, filename);
+ util_delete_path(event->udev, filename);
+ }
+ }
+ }
- if (strcmp(udev_device_get_action(dev), "remove") != 0)
- udev_device_update_db(dev);
- else
- udev_device_delete_db(dev);
-exit:
+ udev_device_unref(event->dev_db);
+ event->dev_db = NULL;
+ }
+out:
return err;
}
-int udev_event_execute_run(struct udev_event *event)
+int udev_event_execute_run(struct udev_event *event, const sigset_t *sigmask)
{
struct udev_list_entry *list_entry;
int err = 0;
udev_event_apply_format(event, cmd, program, sizeof(program));
envp = udev_device_get_properties_envp(event->dev);
- if (util_run_program(event->udev, program, envp, NULL, 0, NULL) != 0) {
- if (!udev_list_entry_get_flag(list_entry))
+ if (util_run_program(event->udev, program, envp, NULL, 0, NULL, sigmask) != 0) {
+ if (udev_list_entry_get_flags(list_entry))
err = -1;
}
}
~ianmdlvl / elogind.git / blobdiff