X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_device.c;h=84d0ab2204e262cd40f27119df3de82d5fe1109d;hp=7821c91cb44a0e0d90efa797ccf7138028c97240;hb=3e5d5cb773f41d70b9e22bef36839101e0c51fd7;hpb=c86be870ce6bb6361ca2ca6c3c05b6d89cf70a2c

diff --git a/udev_device.c b/udev_device.c
index 7821c91cb..84d0ab220 100644
--- a/udev_device.c
+++ b/udev_device.c
@@ -1,7 +1,7 @@
 /*
- * udev_utils.c - generic stuff used by udev
+ * udev_device.c - main udev data object
  *
- * Copyright (C) 2004, 2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2006 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
@@ -26,83 +26,179 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <ctype.h>
-#include <dirent.h>
-#include <syslog.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <sys/utsname.h>
-
-#include "udev_libc_wrapper.h"
+#include <stropts.h>
+#include <net/if.h>
+#include <linux/sockios.h>
+
 #include "udev.h"
-#include "logging.h"
-#include "udev_utils.h"
-#include "list.h"
+#include "udev_rules.h"
 
 
-int udev_init_device(struct udevice *udev, const char* devpath, const char *subsystem, const char *action)
+struct udevice *udev_device_init(void)
 {
-	char *pos;
+	struct udevice *udev;
 
+	udev = malloc(sizeof(struct udevice));
+	if (udev == NULL)
+		return NULL;
 	memset(udev, 0x00, sizeof(struct udevice));
+
 	INIT_LIST_HEAD(&udev->symlink_list);
 	INIT_LIST_HEAD(&udev->run_list);
 	INIT_LIST_HEAD(&udev->env_list);
 
-	if (subsystem)
-		strlcpy(udev->subsystem, subsystem, sizeof(udev->subsystem));
-
-	if (action)
-		strlcpy(udev->action, action, sizeof(udev->action));
-
-	if (devpath) {
-		strlcpy(udev->devpath, devpath, sizeof(udev->devpath));
-		remove_trailing_chars(udev->devpath, '/');
-
-		if (strncmp(udev->devpath, "/block/", 7) == 0)
-			udev->type = DEV_BLOCK;
-		else if (strncmp(udev->devpath, "/class/net/", 11) == 0)
-			udev->type = DEV_NET;
-		else if (strncmp(udev->devpath, "/class/", 7) == 0)
-			udev->type = DEV_CLASS;
-		else if (strncmp(udev->devpath, "/devices/", 9) == 0)
-			udev->type = DEV_DEVICE;
-
-		/* get kernel name */
-		pos = strrchr(udev->devpath, '/');
-		if (pos) {
-			strlcpy(udev->kernel_name, &pos[1], sizeof(udev->kernel_name));
-			dbg("kernel_name='%s'", udev->kernel_name);
-
-			/* Some block devices have '!' in their name, change that to '/' */
-			pos = udev->kernel_name;
-			while (pos[0] != '\0') {
-				if (pos[0] == '!')
-					pos[0] = '/';
-				pos++;
-			}
-
-			/* get kernel number */
-			pos = &udev->kernel_name[strlen(udev->kernel_name)];
-			while (isdigit(pos[-1]))
-				pos--;
-			strlcpy(udev->kernel_number, pos, sizeof(udev->kernel_number));
-			dbg("kernel_number='%s'", udev->kernel_number);
-		}
-	}
+	/* set sysfs device to local storage, can be overridden if needed */
+	udev->dev = &udev->dev_local;
 
-	if (udev->type == DEV_BLOCK || udev->type == DEV_CLASS) {
-		udev->mode = 0660;
-		strcpy(udev->owner, "root");
-		strcpy(udev->group, "root");
-	}
+	/* default node permissions */
+	udev->mode = 0660;
+	strcpy(udev->owner, "root");
+	strcpy(udev->group, "root");
 
-	return 0;
+	return udev;
 }
 
-void udev_cleanup_device(struct udevice *udev)
+void udev_device_cleanup(struct udevice *udev)
 {
 	name_list_cleanup(&udev->symlink_list);
 	name_list_cleanup(&udev->run_list);
 	name_list_cleanup(&udev->env_list);
+	free(udev);
+}
+
+dev_t udev_device_get_devt(struct udevice *udev)
+{
+	const char *attr;
+	unsigned int major, minor;
+
+	/* read it from sysfs  */
+	attr = sysfs_attr_get_value(udev->dev->devpath, "dev");
+	if (attr != NULL) {
+		if (sscanf(attr, "%u:%u", &major, &minor) == 2)
+			return makedev(major, minor);
+	}
+	return makedev(0, 0);
+}
+
+static int rename_net_if(struct udevice *udev)
+{
+	int sk;
+	struct ifreq ifr;
+	int retval;
+
+	info("changing net interface name from '%s' to '%s'", udev->dev->kernel_name, udev->name);
+	if (udev->test_run)
+		return 0;
+
+	sk = socket(PF_INET, SOCK_DGRAM, 0);
+	if (sk < 0) {
+		err("error opening socket: %s", strerror(errno));
+		return -1;
+	}
+
+	memset(&ifr, 0x00, sizeof(struct ifreq));
+	strlcpy(ifr.ifr_name, udev->dev->kernel_name, IFNAMSIZ);
+	strlcpy(ifr.ifr_newname, udev->name, IFNAMSIZ);
+
+	retval = ioctl(sk, SIOCSIFNAME, &ifr);
+	if (retval != 0)
+		err("error changing net interface name: %s", strerror(errno));
+	close(sk);
+
+	return retval;
+}
+
+int udev_device_event(struct udev_rules *rules, struct udevice *udev)
+{
+	int retval = 0;
+
+	/* add device node */
+	if (major(udev->devt) != 0 && strcmp(udev->action, "add") == 0) {
+		dbg("device node add '%s'", udev->dev->devpath);
+		udev_rules_get_name(rules, udev);
+		if (udev->ignore_device) {
+			info("device event will be ignored");
+			goto exit;
+		}
+		if (udev->name[0] == '\0') {
+			info("device node creation supressed");
+			goto exit;
+		}
+		/* create node, store in db */
+		retval = udev_node_add(udev);
+		if (retval == 0)
+			udev_db_add_device(udev);
+		goto exit;
+	}
+
+	/* add netif */
+	if (strcmp(udev->dev->subsystem, "net") == 0 && strcmp(udev->action, "add") == 0) {
+		dbg("netif add '%s'", udev->dev->devpath);
+		udev_rules_get_name(rules, udev);
+		if (udev->ignore_device) {
+			info("device event will be ignored");
+			goto exit;
+		}
+
+		/* look if we want to change the name of the netif */
+		if (strcmp(udev->name, udev->dev->kernel_name) != 0) {
+			char *pos;
+
+			retval = rename_net_if(udev);
+			if (retval != 0)
+				goto exit;
+			info("renamed netif to '%s'", udev->name);
+
+			/* export old name */
+			setenv("INTERFACE_OLD", udev->dev->kernel_name, 1);
+
+			/* now fake the devpath, because the kernel name changed silently */
+			pos = strrchr(udev->dev->devpath, '/');
+			if (pos != NULL) {
+				pos[1] = '\0';
+				strlcat(udev->dev->devpath, udev->name, sizeof(udev->dev->devpath));
+				strlcpy(udev->dev->kernel_name, udev->name, sizeof(udev->dev->kernel_name));
+				setenv("DEVPATH", udev->dev->devpath, 1);
+				setenv("INTERFACE", udev->name, 1);
+			}
+		}
+		goto exit;
+	}
+
+	/* remove device node */
+	if (major(udev->devt) != 0 && strcmp(udev->action, "remove") == 0) {
+		struct name_entry *name_loop;
+
+		/* import and delete database entry */
+		if (udev_db_get_device(udev, udev->dev->devpath) == 0) {
+			udev_db_delete_device(udev);
+			if (udev->ignore_remove) {
+				dbg("remove event for '%s' requested to be ignored by rule", udev->name);
+				return 0;
+			}
+			/* restore stored persistent data */
+			list_for_each_entry(name_loop, &udev->env_list, node)
+				putenv(name_loop->name);
+		} else {
+			dbg("'%s' not found in database, using kernel name '%s'", udev->dev->devpath, udev->dev->kernel_name);
+			strlcpy(udev->name, udev->dev->kernel_name, sizeof(udev->name));
+		}
+
+		udev_rules_get_run(rules, udev);
+		if (udev->ignore_device) {
+			info("device event will be ignored");
+			goto exit;
+		}
+
+		retval = udev_node_remove(udev);
+		goto exit;
+	}
+
+	/* default devices */
+	udev_rules_get_run(rules, udev);
+	if (udev->ignore_device)
+		info("device event will be ignored");
+
+exit:
+	return retval;
 }