X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_device.c;h=cf21191ca0069f91d089fad0be6f9e2ff08d9c6c;hp=91fa6554805d6504c6a6060e9d3cd5cbe5b6b158;hb=4c46d72a93409860aea84242f4dcbe37b2afab19;hpb=4a7e6bcef059af60baab92a3c0fbe01ed44465d5

diff --git a/udev_device.c b/udev_device.c
index 91fa65548..cf21191ca 100644
--- a/udev_device.c
+++ b/udev_device.c
@@ -33,11 +33,10 @@
 #include "udev_rules.h"
 
 
-struct udevice *udev_device_init(void)
+struct udevice *udev_device_init(struct udevice *udev)
 {
-	struct udevice *udev;
-
-	udev = malloc(sizeof(struct udevice));
+	if (udev == NULL)
+		udev = malloc(sizeof(struct udevice));
 	if (udev == NULL)
 		return NULL;
 	memset(udev, 0x00, sizeof(struct udevice));
@@ -54,6 +53,8 @@ struct udevice *udev_device_init(void)
 	strcpy(udev->owner, "root");
 	strcpy(udev->group, "root");
 
+	udev->event_timeout = -1;
+
 	return udev;
 }
 
@@ -79,19 +80,39 @@ dev_t udev_device_get_devt(struct udevice *udev)
 	return makedev(0, 0);
 }
 
+static void kernel_log(struct ifreq ifr)
+{
+	int klog;
+	FILE *f;
+
+	klog = open("/dev/kmsg", O_WRONLY);
+	if (klog < 0)
+		return;
+
+	f = fdopen(klog, "w");
+	if (f == NULL) {
+		close(klog);
+		return;
+	}
+
+	fprintf(f, "<6>udev: renamed network interface %s to %s\n",
+		ifr.ifr_name, ifr.ifr_newname);
+	fclose(f);
+}
+
 static int rename_netif(struct udevice *udev)
 {
 	int sk;
 	struct ifreq ifr;
 	int retval;
 
-	info("changing net interface name from '%s' to '%s'", udev->dev->kernel, udev->name);
+	info("changing net interface name from '%s' to '%s'\n", udev->dev->kernel, 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));
+		err("error opening socket: %s\n", strerror(errno));
 		return -1;
 	}
 
@@ -99,12 +120,14 @@ static int rename_netif(struct udevice *udev)
 	strlcpy(ifr.ifr_name, udev->dev->kernel, IFNAMSIZ);
 	strlcpy(ifr.ifr_newname, udev->name, IFNAMSIZ);
 	retval = ioctl(sk, SIOCSIFNAME, &ifr);
-	if (retval != 0) {
+	if (retval == 0)
+		kernel_log(ifr);
+	else {
 		int loop;
 
 		/* see if the destination interface name already exists */
 		if (errno != EEXIST) {
-			err("error changing netif name %s to %s: %s", ifr.ifr_name, ifr.ifr_newname, strerror(errno));
+			err("error changing netif name %s to %s: %s\n", ifr.ifr_name, ifr.ifr_newname, strerror(errno));
 			goto exit;
 		}
 
@@ -113,7 +136,7 @@ static int rename_netif(struct udevice *udev)
 		strlcat(ifr.ifr_newname, "_rename", IFNAMSIZ);
 		retval = ioctl(sk, SIOCSIFNAME, &ifr);
 		if (retval != 0) {
-			err("error changing netif name %s to %s: %s", ifr.ifr_name, ifr.ifr_newname, strerror(errno));
+			err("error changing netif name %s to %s: %s\n", ifr.ifr_name, ifr.ifr_newname, strerror(errno));
 			goto exit;
 		}
 
@@ -123,15 +146,17 @@ static int rename_netif(struct udevice *udev)
 		loop = 30 * 20;
 		while (loop--) {
 			retval = ioctl(sk, SIOCSIFNAME, &ifr);
-			if (retval == 0)
+			if (retval == 0) {
+				kernel_log(ifr);
 				break;
+			}
 
 			if (errno != EEXIST) {
-				err("error changing net interface name %s to %s: %s",
+				err("error changing net interface name %s to %s: %s\n",
 				    ifr.ifr_name, ifr.ifr_newname, strerror(errno));
 				break;
 			}
-			dbg("wait for netif '%s' to become free, loop=%i", udev->name, (30 * 20) - loop);
+			dbg("wait for netif '%s' to become free, loop=%i\n", udev->name, (30 * 20) - loop);
 			usleep(1000 * 1000 / 20);
 		}
 	}
@@ -145,94 +170,92 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
 {
 	int retval = 0;
 
+	if (udev->devpath_old != NULL)
+		if (udev_db_rename(udev->devpath_old, udev->dev->devpath) == 0)
+			info("moved database from '%s' to '%s'\n", udev->devpath_old, udev->dev->devpath);
+
 	/* add device node */
 	if (major(udev->devt) != 0 &&
 	    (strcmp(udev->action, "add") == 0 || strcmp(udev->action, "change") == 0)) {
 		struct udevice *udev_old;
 
-		dbg("device node add '%s'", udev->dev->devpath);
+		dbg("device node add '%s'\n", udev->dev->devpath);
 
 		udev_rules_get_name(rules, udev);
 		if (udev->ignore_device) {
-			info("device event will be ignored");
+			info("device event will be ignored\n");
 			goto exit;
 		}
 		if (udev->name[0] == '\0') {
-			info("device node creation supressed");
+			info("device node creation supressed\n");
 			goto exit;
 		}
 
-		/* read current database entry, we may want to cleanup symlinks */
-		udev_old = udev_device_init();
+		/* read current database entry; cleanup, if it is known device */
+		udev_old = udev_device_init(NULL);
 		if (udev_old != NULL) {
-			if (udev_db_get_device(udev_old, udev->dev->devpath) != 0) {
+			udev_old->test_run = udev->test_run;
+			if (udev_db_get_device(udev_old, udev->dev->devpath) == 0) {
+				info("device '%s' already in database, cleanup\n", udev->dev->devpath);
+				udev_db_delete_device(udev_old);
+			} else {
 				udev_device_cleanup(udev_old);
 				udev_old = NULL;
-			} else
-				info("device '%s' already in database, validate currently present symlinks",
-				     udev->dev->devpath);
-		}
-
-		/* create node and symlinks */
-		retval = udev_node_add(udev, udev_old);
-		if (retval == 0) {
-			/* store record in database */
-			udev_db_add_device(udev);
-
-			/* remove possibly left-over symlinks */
-			if (udev_old != NULL) {
-				struct name_entry *link_loop;
-				struct name_entry *link_old_loop;
-				struct name_entry *link_old_tmp_loop;
-
-				/* remove still valid symlinks from old list */
-				list_for_each_entry_safe(link_old_loop, link_old_tmp_loop, &udev_old->symlink_list, node)
-					list_for_each_entry(link_loop, &udev->symlink_list, node)
-						if (strcmp(link_old_loop->name, link_loop->name) == 0) {
-							dbg("symlink '%s' still valid, keep it", link_old_loop->name);
-							list_del(&link_old_loop->node);
-							free(link_old_loop);
-						}
-				udev_node_remove_symlinks(udev_old);
-				udev_device_cleanup(udev_old);
 			}
 		}
+
+		/* create node */
+		retval = udev_node_add(udev);
+		if (retval != 0)
+			goto exit;
+
+		/* store in database */
+		udev_db_add_device(udev);
+
+		/* create, replace, delete symlinks according to priority */
+		udev_node_update_symlinks(udev, udev_old);
+
+		if (udev_old != NULL)
+			udev_device_cleanup(udev_old);
 		goto exit;
 	}
 
 	/* add netif */
 	if (strcmp(udev->dev->subsystem, "net") == 0 && strcmp(udev->action, "add") == 0) {
-		dbg("netif add '%s'", udev->dev->devpath);
+		dbg("netif add '%s'\n", udev->dev->devpath);
 		udev_rules_get_name(rules, udev);
 		if (udev->ignore_device) {
-			info("device event will be ignored");
+			info("device event will be ignored\n");
 			goto exit;
 		}
 		if (udev->name[0] == '\0') {
-			info("device renaming supressed");
+			info("device renaming supressed\n");
 			goto exit;
 		}
 
 		/* look if we want to change the name of the netif */
 		if (strcmp(udev->name, udev->dev->kernel) != 0) {
+			char devpath[PATH_MAX];
 			char *pos;
 
 			retval = rename_netif(udev);
 			if (retval != 0)
 				goto exit;
-			info("renamed netif to '%s'", udev->name);
+			info("renamed netif to '%s'\n", udev->name);
 
 			/* export old name */
 			setenv("INTERFACE_OLD", udev->dev->kernel, 1);
 
-			/* now fake the devpath, because the kernel name changed silently */
-			pos = strrchr(udev->dev->devpath, '/');
+			/* now change the devpath, because the kernel device name has changed */
+			strlcpy(devpath, udev->dev->devpath, sizeof(devpath));
+			pos = strrchr(devpath, '/');
 			if (pos != NULL) {
 				pos[1] = '\0';
-				strlcat(udev->dev->devpath, udev->name, sizeof(udev->dev->devpath));
-				strlcpy(udev->dev->kernel, udev->name, sizeof(udev->dev->kernel));
+				strlcat(devpath, udev->name, sizeof(devpath));
+				sysfs_device_set_values(udev->dev, devpath, NULL, NULL);
 				setenv("DEVPATH", udev->dev->devpath, 1);
 				setenv("INTERFACE", udev->name, 1);
+				info("changed devpath to '%s'\n", udev->dev->devpath);
 			}
 		}
 		goto exit;
@@ -242,35 +265,40 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
 	if (major(udev->devt) != 0 && strcmp(udev->action, "remove") == 0) {
 		struct name_entry *name_loop;
 
-		/* import and delete database entry */
+		/* import database entry, and delete it */
 		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);
+			dbg("'%s' not found in database, using kernel name '%s'\n",
+			    udev->dev->devpath, udev->dev->kernel);
 			strlcpy(udev->name, udev->dev->kernel, sizeof(udev->name));
 		}
 
 		udev_rules_get_run(rules, udev);
 		if (udev->ignore_device) {
-			info("device event will be ignored");
+			info("device event will be ignored\n");
 			goto exit;
 		}
 
+		if (udev->ignore_remove) {
+			info("ignore_remove for '%s'\n", udev->name);
+			goto exit;
+		}
+		/* remove the node */
 		retval = udev_node_remove(udev);
+
+		/* delete or restore symlinks according to priority */
+		udev_node_update_symlinks(udev, NULL);
 		goto exit;
 	}
 
 	/* default devices */
 	udev_rules_get_run(rules, udev);
 	if (udev->ignore_device)
-		info("device event will be ignored");
+		info("device event will be ignored\n");
 
 exit:
 	return retval;