/*
- * 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"
event = calloc(1, sizeof(struct udev_event));
if (event == NULL)
return NULL;
+ event->mode = 0600;
event->dev = dev;
event->udev = udev_device_get_udev(dev);
udev_list_init(&event->run_list);
- event->mode = 0660;
dbg(event->udev, "allocated event %p\n", event);
return event;
}
s = dest;
l = size;
- while (1) {
+ for (;;) {
enum subst_type type = SUBST_UNKNOWN;
char attrbuf[UTIL_PATH_SIZE];
char *attr = NULL;
}
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);
minor(udev_device_get_devnum(dev)));
if (event->tmp_node == NULL)
break;
- udev_node_mknod(dev, event->tmp_node, makedev(0, 0), 0600, 0, 0);
+ udev_node_mknod(dev, event->tmp_node, 0600, 0, 0);
l = util_strpcpy(&s, l, event->tmp_node);
break;
}
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);
}
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",
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_strscpy(ifr.ifr_newname, IFNAMSIZ, udev_device_get_sysname(dev));
- util_strscpy(ifr.ifr_newname, IFNAMSIZ, "_rename");
- 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--) {
- err = ioctl(sk, SIOCSIFNAME, &ifr);
- if (err == 0) {
- rename_netif_kernel_log(ifr);
- break;
- }
+ /* 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;
+ }
- 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);
- usleep(1000 * 1000 / 20);
+ /* log temporary name */
+ rename_netif_kernel_log(ifr);
+
+ /* 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;
}
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_subsystem(dev) == NULL)
+ return -1;
- /* 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;
+ if (strcmp(udev_device_get_action(dev), "remove") == 0) {
+ udev_device_read_db(dev);
+ udev_device_delete_db(dev);
+ udev_device_tag_index(dev, NULL, false);
- dbg(event->udev, "device node add '%s'\n", udev_device_get_devpath(dev));
+ if (major(udev_device_get_devnum(dev)) != 0)
+ udev_watch_end(event->udev, 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);
+ udev_rules_apply_to_event(rules, event);
+
+ 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);
/* 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, event->dev_db);
}
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;
- }
+ /* 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;
- /* 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);
+ err = rename_netif(event);
+ if (err == 0) {
+ info(event->udev, "renamed netif to '%s'\n", event->name);
+
+ /* delete stale db file */
+ udev_device_delete_db(dev);
+ udev_device_tag_index(dev, NULL, false);
+
+ /* 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));
+ }
}
}
- /* 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) {
+ char filename[UTIL_PATH_SIZE];
- /* 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 (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;
+ }
- /* write current database entry */
- udev_device_update_db(dev);
+ /* 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);
+ }
+ }
- /* 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);
+ if (event->name == NULL || event->name[0] == '\0') {
+ udev_device_delete_db(dev);
+ udev_device_tag_index(dev, NULL, false);
+ udev_device_unref(event->dev_db);
+ err = -ENOMEM;
+ err(event->udev, "no node name, something went wrong, ignoring\n");
+ goto out;
}
- }
- 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);
+ if (udev_device_get_knodename(dev) != NULL && strcmp(udev_device_get_knodename(dev), event->name) != 0)
+ err(event->udev, "kernel-provided name '%s' and NAME= '%s' disagree, "
+ "please use SYMLINK+= or change the kernel to provide the proper name\n",
+ udev_device_get_knodename(dev), event->name);
- 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 (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) {
- 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));
- }
- }
udev_device_update_db(dev);
- goto exit;
- }
+ udev_device_tag_index(dev, event->dev_db, true);
- /* 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);
-
- /* remove watch */
- udev_watch_end(event->udev, dev);
+ 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);
- if (udev_device_get_devnode(dev) == NULL) {
- char devnode[UTIL_PATH_SIZE];
+ /* change default 0600 to 0660 if a group is assigned */
+ if (event->mode == 0600 && event->gid > 0)
+ event->mode = 0660;
- 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);
+ err = udev_node_add(dev, event->mode, event->uid, event->gid);
}
- udev_rules_apply_to_event(rules, event);
- if (event->ignore_device) {
- info(event->udev, "device event will be ignored\n");
- goto exit;
- }
-
- if (udev_device_get_ignore_remove(dev)) {
- info(event->udev, "ignore_remove for '%s'\n", udev_device_get_devnode(dev));
- goto exit;
- }
-
- err = udev_node_remove(dev);
- goto exit;
+ udev_device_unref(event->dev_db);
+ event->dev_db = NULL;
}
-
- /* default devices */
- udev_rules_apply_to_event(rules, event);
- if (event->ignore_device)
- info(event->udev, "device event will be ignored\n");
-
- if (strcmp(udev_device_get_action(dev), "remove") != 0)
- udev_device_update_db(dev);
- else
- udev_device_delete_db(dev);
-exit:
+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 (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;
}
}
~ianmdlvl / elogind.git / blobdiff