X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev-add.c;h=1f17f50bc3de8a372b6a80d9595518fad05a9e4d;hp=7ba873a8d47d7a37766d1ac30bd56f9dfeb1830d;hb=bbbe503ec1a5623a5a8abd003f46fdd8c3581054;hpb=5bd1061cd67dea7ebc5a061365335b394f37b122

diff --git a/udev-add.c b/udev-add.c
index 7ba873a8d..1f17f50bc 100644
--- a/udev-add.c
+++ b/udev-add.c
@@ -28,12 +28,27 @@
 #include <unistd.h>
 #include <errno.h>
 #include <sys/stat.h>
+#include <sys/types.h>
+#include <grp.h>
+#include <net/if.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <linux/sockios.h>
+#ifndef __KLIBC__
+#include <pwd.h>
+#include <utmp.h>
+#endif
 
+#include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
+#include "udev_lib.h"
 #include "udev_version.h"
+#include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
-#include "libsysfs/libsysfs.h"
+#include "klibc_fixups.h"
+
+#define LOCAL_USER "$local"
 
 /* 
  * Right now the major/minor of a device is stored in a file called
@@ -46,46 +61,144 @@
  */
 static int get_major_minor(struct sysfs_class_device *class_dev, struct udevice *udev)
 {
-	int retval = -ENODEV;
+	struct sysfs_attribute *attr = NULL;
 
-	char *dev;
+	attr = sysfs_get_classdev_attr(class_dev, "dev");
+	if (attr == NULL)
+		goto error;
+	dbg("dev='%s'", attr->value);
 
-	dev = sysfs_get_value_from_attributes(class_dev->directory->attributes, "dev");
-	if (dev == NULL)
-		goto exit;
+	if (sscanf(attr->value, "%u:%u", &udev->major, &udev->minor) != 2)
+		goto error;
+	dbg("found major=%d, minor=%d", udev->major, udev->minor);
+
+	return 0;
+error:
+	return -1;
+}
+
+static int create_path(char *file)
+{
+	char p[NAME_SIZE];
+	char *pos;
+	int retval;
+	struct stat stats;
+	
+	strfieldcpy(p, file);
+	pos = strchr(p+1, '/');
+	while (1) {
+		pos = strchr(pos+1, '/');
+		if (pos == NULL)
+			break;
+		*pos = 0x00;
+		if (stat(p, &stats)) {
+			retval = mkdir(p, 0755);
+			if (retval != 0) {
+				dbg("mkdir(%s) failed with error '%s'",
+				    p, strerror(errno));
+				return retval;
+			}
+			dbg("created '%s'", p);
+		}
+		*pos = '/';
+	}
+	return 0;
+}
+
+static int make_node(char *filename, int major, int minor, unsigned int mode, uid_t uid, gid_t gid)
+{
+	int retval;
 
-	dbg("dev = %s", dev);
+	retval = mknod(filename, mode, makedev(major, minor));
+	if (retval != 0) {
+		dbg("mknod(%s, %#o, %u, %u) failed with error '%s'",
+		    filename, mode, major, minor, strerror(errno));
+		goto exit;
+	}
 
-	if (sscanf(dev, "%u:%u", &udev->major, &udev->minor) != 2)
+	dbg("chmod(%s, %#o)", filename, mode);
+	if (chmod(filename, mode) != 0) {
+		dbg("chmod(%s, %#o) failed with error '%s'",
+		    filename, mode, strerror(errno));
 		goto exit;
+	}
 
-	dbg("found major = %d, minor = %d", udev->major, udev->minor);
+	if (uid != 0 || gid != 0) {
+		dbg("chown(%s, %u, %u)", filename, uid, gid);
+		if (chown(filename, uid, gid) != 0) {
+			dbg("chown(%s, %u, %u) failed with error '%s'",
+			    filename, uid, gid, strerror(errno));
+			goto exit;
+		}
+	}
 
-	retval = 0;
 exit:
 	return retval;
 }
 
-/*
- * we possibly want to add some symlinks here
- * only numeric owner/group id's are supported
- */
-static int create_node(struct udevice *dev)
+/* get the local logged in user */
+static void set_to_local_user(char *user)
 {
-	char filename[255];
+	struct utmp *u;
+	time_t recent = 0;
+
+	strfieldcpymax(user, default_owner_str, OWNER_SIZE);
+	setutent();
+	while (1) {
+		u = getutent();
+		if (u == NULL)
+			break;
+
+		/* is this a user login ? */
+		if (u->ut_type != USER_PROCESS)
+			continue;
+
+		/* is this a local login ? */
+		if (strcmp(u->ut_host, ""))
+			continue;
+
+		if (u->ut_time > recent) {
+			recent = u->ut_time;
+			strfieldcpymax(user, u->ut_user, OWNER_SIZE);
+			dbg("local user is '%s'", user);
+			break;
+		}
+	}
+	endutent();
+}
+
+static int unlink_entry(char *filename)
+{
+	struct stat stats;
 	int retval = 0;
+	
+	if (lstat(filename, &stats) == 0) {
+		if ((stats.st_mode & S_IFMT) != S_IFDIR) {
+			retval = unlink(filename);
+			if (retval) {
+				dbg("unlink(%s) failed with error '%s'",
+				    filename, strerror(errno));
+			}
+		}
+	}
+	return retval;
+}
+
+static int create_node(struct udevice *dev, int fake)
+{
+	char filename[NAME_SIZE];
+	char linkname[NAME_SIZE];
+	char linktarget[NAME_SIZE];
+	char partitionname[NAME_SIZE];
 	uid_t uid = 0;
 	gid_t gid = 0;
-	dev_t res;
-
-	strncpy(filename, udev_root, sizeof(filename));
-	strncat(filename, dev->name, sizeof(filename));
+	int i;
+	int tail;
+	char *pos;
+	int len;
 
-#ifdef __KLIBC__
-	res = (dev->major << 8) | (dev->minor);
-#else
-	res = makedev(dev->major, dev->minor);
-#endif
+	strfieldcpy(filename, udev_root);
+	strfieldcat(filename, dev->name);
 
 	switch (dev->type) {
 	case 'b':
@@ -103,71 +216,108 @@ static int create_node(struct udevice *dev)
 		return -EINVAL;
 	}
 
-	/* create subdirectories if requested */
-	if (strchr(dev->name, '/')) {
-		char path[255];
-		char *pos;
-		struct stat stats;
-
-		strncpy(path, filename, sizeof(path));
-		pos = strchr(path+1, '/');
-		while (1) {
-			pos = strchr(pos+1, '/');
-			if (pos == NULL)
-				break;
-			*pos = 0x00;
-			if (stat(path, &stats)) {
-				retval = mkdir(path, 0755);
-				if (retval) {
-					dbg("mkdir(%s) failed with error '%s'",
-					    path, strerror(errno));
-					return retval;
-				}
-				dbg("created %s", path);
-			}
-			*pos = '/';
-		}
-	}
+	/* create parent directories if needed */
+	if (strrchr(dev->name, '/'))
+		create_path(filename);
 
-	dbg("mknod(%s, %#o, %u, %u)", filename, dev->mode, dev->major, dev->minor);
-	retval = mknod(filename, dev->mode, res);
-	if (retval)
-		dbg("mknod(%s, %#o, %u, %u) failed with error '%s'",
-		    filename, dev->mode, dev->major, dev->minor, strerror(errno));
-
-	dbg("chmod(%s, %#o)", filename, dev->mode);
-	retval = chmod(filename, dev->mode);
-	if (retval)
-		dbg("chmod(%s, %#o) failed with error '%s'",
-		    filename, dev->mode, strerror(errno));
-
-	if (*dev->owner) {
+	if (dev->owner[0] != '\0') {
 		char *endptr;
 		unsigned long id = strtoul(dev->owner, &endptr, 10);
-		if (*endptr == 0x00)
+		if (endptr[0] == '\0')
 			uid = (uid_t) id;
-		else
-			dbg("only numeric owner id supported: %s", dev->owner);
+		else {
+			struct passwd *pw;
+			if (strncmp(dev->owner, LOCAL_USER, sizeof(LOCAL_USER)) == 0)
+				set_to_local_user(dev->owner);
+
+			pw = getpwnam(dev->owner);
+			if (pw == NULL)
+				dbg("specified user unknown '%s'", dev->owner);
+			else
+				uid = pw->pw_uid;
+		}
 	}
 
-	if (*dev->group) {
+	if (dev->group[0] != '\0') {
 		char *endptr;
 		unsigned long id = strtoul(dev->group, &endptr, 10);
-		if (*endptr == 0x00)
+		if (endptr[0] == '\0')
 			gid = (gid_t) id;
-		else
-			dbg("only numeric group id supported: %s", dev->group);
+		else {
+			struct group *gr = getgrnam(dev->group);
+			if (gr == NULL)
+				dbg("specified group unknown '%s'", dev->group);
+			else
+				gid = gr->gr_gid;
+		}
 	}
 
-	if (uid || gid) {
-		dbg("chown(%s, %u, %u)", filename, uid, gid);
-		retval = chown(filename, uid, gid);
-		if (retval)
-			dbg("chown(%s, %u, %u) failed with error '%s'", filename,
-			    uid, gid, strerror(errno));
+	if (!fake) {
+		unlink_entry(filename);
+		info("creating device node '%s'", filename);
+		if (make_node(filename, dev->major, dev->minor, dev->mode, uid, gid) != 0)
+			goto error;
+	} else {
+		info("creating device node '%s', major = '%d', minor = '%d', "
+		     "mode = '%#o', uid = '%d', gid = '%d'", filename,
+		     dev->major, dev->minor, (mode_t)dev->mode, uid, gid);
 	}
 
-	return retval;
+	/* create all_partitions if requested */
+	if (dev->partitions > 0) {
+		info("creating device partition nodes '%s[1-%i]'", filename, dev->partitions);
+		if (!fake) {
+			for (i = 1; i <= dev->partitions; i++) {
+				strfieldcpy(partitionname, filename);
+				strintcat(partitionname, i);
+				unlink_entry(partitionname);
+				make_node(partitionname, dev->major,
+					  dev->minor + i, dev->mode, uid, gid);
+			}
+		}
+	}
+
+	/* create symlink(s) if requested */
+	foreach_strpart(dev->symlink, " ", pos, len) {
+		strfieldcpymax(linkname, pos, len+1);
+		strfieldcpy(filename, udev_root);
+		strfieldcat(filename, linkname);
+		dbg("symlink '%s' to node '%s' requested", filename, dev->name);
+		if (!fake)
+			if (strrchr(linkname, '/'))
+				create_path(filename);
+
+		/* optimize relative link */
+		linktarget[0] = '\0';
+		i = 0;
+		tail = 0;
+		while ((dev->name[i] == linkname[i]) && dev->name[i]) {
+			if (dev->name[i] == '/')
+				tail = i+1;
+			i++;
+		}
+		while (linkname[i] != '\0') {
+			if (linkname[i] == '/')
+				strfieldcat(linktarget, "../");
+			i++;
+		}
+
+		strfieldcat(linktarget, &dev->name[tail]);
+
+		if (!fake)
+			unlink_entry(filename);
+
+		dbg("symlink(%s, %s)", linktarget, filename);
+		if (!fake) {
+			if (symlink(linktarget, filename) != 0)
+				dbg("symlink(%s, %s) failed with error '%s'",
+				    linktarget, filename, strerror(errno));
+		}
+	}
+
+	return 0;
+error:
+	return -1;
 }
 
 static struct sysfs_class_device *get_class_dev(char *device_name)
@@ -175,18 +325,17 @@ static struct sysfs_class_device *get_class_dev(char *device_name)
 	char dev_path[SYSFS_PATH_MAX];
 	struct sysfs_class_device *class_dev = NULL;
 
-	strcpy(dev_path, sysfs_path);
-	strcat(dev_path, device_name);
-
-	dbg("looking at %s", dev_path);
+	strfieldcpy(dev_path, sysfs_path);
+	strfieldcat(dev_path, device_name);
+	dbg("looking at '%s'", dev_path);
 
 	/* open up the sysfs class device for this thing... */
-	class_dev = sysfs_open_class_device(dev_path);
+	class_dev = sysfs_open_class_device_path(dev_path);
 	if (class_dev == NULL) {
-		dbg ("sysfs_open_class_device failed");
+		dbg ("sysfs_open_class_device_path failed");
 		goto exit;
 	}
-	dbg("class_dev->name = %s", class_dev->name);
+	dbg("class_dev->name='%s'", class_dev->name);
 
 exit:
 	return class_dev;
@@ -195,27 +344,26 @@ exit:
 /* wait for the "dev" file to show up in the directory in sysfs.
  * If it doesn't happen in about 10 seconds, give up.
  */
-#define SECONDS_TO_WAIT_FOR_DEV		10
-static int sleep_for_dev(char *path)
+#define SECONDS_TO_WAIT_FOR_FILE	10
+static int sleep_for_file(char *path, char* file)
 {
 	char filename[SYSFS_PATH_MAX + 6];
-	int loop = SECONDS_TO_WAIT_FOR_DEV;
+	int loop = SECONDS_TO_WAIT_FOR_FILE;
 	int retval;
 
-	strcpy(filename, sysfs_path);
-	strcat(filename, path);
-	strcat(filename, "/dev");
+	strfieldcpy(filename, sysfs_path);
+	strfieldcat(filename, path);
+	strfieldcat(filename, file);
 
 	while (loop--) {
 		struct stat buf;
 
-		dbg("looking for %s", filename);
+		dbg("looking for '%s'", filename);
 		retval = stat(filename, &buf);
-		if (!retval)
+		if (retval == 0)
 			goto exit;
 
-		/* sleep for a second or two to give the kernel a chance to
-		 * create the dev file */
+		/* sleep to give the kernel a chance to create the dev file */
 		sleep(1);
 	}
 	retval = -ENODEV;
@@ -223,48 +371,114 @@ exit:
 	return retval;
 }
 
-int udev_add_device(char *path, char *subsystem)
+static int rename_net_if(struct udevice *dev, int fake)
 {
-	struct sysfs_class_device *class_dev = NULL;
+	int sk;
+	struct ifreq ifr;
+	int retval;
+
+	dbg("changing net interface name from '%s' to '%s'", dev->kernel_name, dev->name);
+	if (fake)
+		return 0;
+
+	sk = socket(PF_INET, SOCK_DGRAM, 0);
+	if (sk < 0) {
+		dbg("error opening socket");
+		return -1;
+	}
+
+	memset(&ifr, 0x00, sizeof(struct ifreq));
+	strfieldcpy(ifr.ifr_name, dev->kernel_name);
+	strfieldcpy(ifr.ifr_newname, dev->name);
+
+	retval = ioctl(sk, SIOCSIFNAME, &ifr);
+	if (retval != 0)
+		dbg("error changing net interface name");
+	close(sk);
+
+	return retval;
+}
+
+int udev_add_device(char *path, char *subsystem, int fake)
+{
+	struct sysfs_class_device *class_dev;
 	struct udevice dev;
-	int retval = -EINVAL;
+	char key[DEVPATH_SIZE];
+	char *pos;
+	int retval;
 
-	/* for now, the block layer is the only place where block devices are */
-	if (strcmp(subsystem, "block") == 0)
-		dev.type = 'b';
-	else
-		dev.type = 'c';
+	memset(&dev, 0x00, sizeof(dev));
 
-	retval = sleep_for_dev(path);
-	if (retval)
-		goto exit;
+	dev.type = get_device_type(path, subsystem);
+	switch (dev.type) {
+	case 'b':
+	case 'c':
+		retval = sleep_for_file(path, "/dev");
+		break;
+
+	case 'n':
+		retval = sleep_for_file(path, "/address");
+		break;
+
+	default:
+		dbg("unknown device type '%c'", dev.type);
+		return -1;
+	}
 
 	class_dev = get_class_dev(path);
 	if (class_dev == NULL)
-		goto exit;
+		return -1;
 
-	retval = get_major_minor(class_dev, &dev);
-	if (retval) {
-		dbg("get_major_minor failed");
-		goto exit;
+	if (dev.type == 'b' || dev.type == 'c') {
+		retval = get_major_minor(class_dev, &dev);
+		if (retval != 0) {
+			dbg("get_major_minor failed");
+			goto exit;
+		}
 	}
 
-	retval = namedev_name_device(class_dev, &dev);
-	if (retval)
+	if (namedev_name_device(class_dev, &dev) != 0)
 		goto exit;
 
-	retval = udevdb_add_dev(path, &dev);
-	if (retval != 0)
-		dbg("udevdb_add_dev failed, but we are going to try to create the node anyway. "
-		    "But remove might not work properly for this device.");
+	dbg("name='%s'", dev.name);
+
+	switch (dev.type) {
+	case 'b':
+	case 'c':
+		retval = create_node(&dev, fake);
+		if (fake || retval != 0)
+			goto exit;
+		if (udevdb_add_dev(path, &dev) != 0)
+			dbg("udevdb_add_dev failed, but we are going to try "
+			    "to create the node anyway. But remove might not "
+			    "work properly for this device.");
+		break;
 
-	dbg("name = %s", dev.name);
-	retval = create_node(&dev);
+	case 'n':
+		strfieldcpy(key, path);
+		if (strcmp(dev.name, dev.kernel_name) != 0) {
+			retval = rename_net_if(&dev, fake);
+			if (fake || retval != 0)
+				goto exit;
+			/* netif's are keyed with the configured name, cause
+			 * the original kernel name sleeps with the fishes
+			 */
+			pos = strrchr(key, '/');
+			if (pos != NULL) {
+				pos[1] = '\0';
+				strfieldcat(key, dev.name);
+			}
+		}
+		if (udevdb_add_dev(key, &dev) != 0)
+			dbg("udevdb_add_dev failed");
+		break;
+	}
+
+	/* execute programs in dev.d/ with the name in the environment */
+	dev_d_send(&dev, subsystem);
 
 exit:
-	if (class_dev)
-		sysfs_close_class_device(class_dev);
+	sysfs_close_class_device(class_dev);
 
 	return retval;
 }
-