X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=udev-add.c;h=4aff06e15f8b83f89004450ff1c2e5654ffa289c;hb=949e32f2249da55890a6a49208023df30b6b5227;hp=c13cce53d4f413960465d1f53d29b410ab15acba;hpb=dc820c1bc191db59f587660342285b2418e5ee74;p=elogind.git diff --git a/udev-add.c b/udev-add.c index c13cce53d..4aff06e15 100644 --- a/udev-add.c +++ b/udev-add.c @@ -30,6 +30,10 @@ #include #include #include +#include +#include +#include +#include #ifndef __KLIBC__ #include #include @@ -37,9 +41,8 @@ #include "libsysfs/sysfs/libsysfs.h" #include "udev.h" +#include "udev_lib.h" #include "udev_version.h" -#include "udev_dbus.h" -#include "udev_selinux.h" #include "logging.h" #include "namedev.h" #include "udevdb.h" @@ -141,7 +144,7 @@ static void set_to_local_user(char *user) struct utmp *u; time_t recent = 0; - strnfieldcpy(user, default_owner_str, OWNER_SIZE); + strfieldcpymax(user, default_owner_str, OWNER_SIZE); setutent(); while (1) { u = getutent(); @@ -158,7 +161,7 @@ static void set_to_local_user(char *user) if (u->ut_time > recent) { recent = u->ut_time; - strfieldcpy(user, u->ut_user); + strfieldcpymax(user, u->ut_user, OWNER_SIZE); dbg("local user is '%s'", user); break; } @@ -186,16 +189,17 @@ static int unlink_entry(char *filename) static int create_node(struct udevice *dev, int fake) { - char filename[255]; - char linktarget[255]; - char partitionname[255]; - char *linkname; - char *symlinks; + char filename[NAME_SIZE]; + char linkname[NAME_SIZE]; + char linktarget[NAME_SIZE]; + char partitionname[NAME_SIZE]; int retval = 0; uid_t uid = 0; gid_t gid = 0; int i; int tail; + char *pos; + int len; strfieldcpy(filename, udev_root); strfieldcat(filename, dev->name); @@ -226,10 +230,11 @@ static int create_node(struct udevice *dev, int fake) if (endptr[0] == '\0') uid = (uid_t) id; else { + struct passwd *pw; if (strncmp(dev->owner, LOCAL_USER, sizeof(LOCAL_USER)) == 0) set_to_local_user(dev->owner); - struct passwd *pw = getpwnam(dev->owner); + pw = getpwnam(dev->owner); if (pw == NULL) dbg("specified user unknown '%s'", dev->owner); else @@ -275,51 +280,42 @@ static int create_node(struct udevice *dev, int fake) } } - if (!fake) - selinux_add_node(filename); - /* create symlink if requested */ - if (dev->symlink[0] != '\0') { - symlinks = dev->symlink; - while (1) { - linkname = strsep(&symlinks, " "); - if (linkname == NULL || linkname[0] == '\0') - break; - - 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++; - } + 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]); + strfieldcat(linktarget, &dev->name[tail]); - if (!fake) - unlink_entry(filename); + if (!fake) + unlink_entry(filename); - dbg("symlink(%s, %s)", linktarget, filename); - if (!fake) { - retval = symlink(linktarget, filename); - if (retval != 0) - dbg("symlink(%s, %s) failed with error '%s'", - linktarget, filename, strerror(errno)); - } + dbg("symlink(%s, %s)", linktarget, filename); + if (!fake) { + retval = symlink(linktarget, filename); + if (retval != 0) + dbg("symlink(%s, %s) failed with error '%s'", + linktarget, filename, strerror(errno)); } } @@ -350,16 +346,16 @@ 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; strfieldcpy(filename, sysfs_path); strfieldcat(filename, path); - strfieldcat(filename, "/dev"); + strfieldcat(filename, file); while (loop--) { struct stat buf; @@ -377,6 +373,30 @@ exit: return retval; } +static int rename_net_if(struct udevice *dev) +{ + int sk; + struct ifreq ifr; + int retval; + + 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); + + dbg("changing net interface name from '%s' to '%s'", dev->kernel_name, dev->name); + retval = ioctl(sk, SIOCSIFNAME, &ifr); + if (retval != 0) + dbg("error changing net interface name"); + + return retval; +} + int udev_add_device(char *path, char *subsystem, int fake) { struct sysfs_class_device *class_dev = NULL; @@ -386,42 +406,64 @@ int udev_add_device(char *path, char *subsystem, int fake) memset(&dev, 0x00, sizeof(dev)); /* 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'; - retval = sleep_for_dev(path); - if (retval != 0) - 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); + retval = -EINVAL; + } class_dev = get_class_dev(path); if (class_dev == NULL) goto exit; - retval = get_major_minor(class_dev, &dev); - if (retval != 0) { - 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 != 0) goto exit; - if (!fake) { + if (!fake && (dev.type == 'b' || dev.type == 'c')) { 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); - retval = create_node(&dev, fake); + switch (dev.type) { + case 'b': + case 'c': + retval = create_node(&dev, fake); + break; + + case 'n': + retval = rename_net_if(&dev); + if (retval != 0) + dbg("net device naming failed"); + break; + } if ((retval == 0) && (!fake)) - sysbus_send_create(&dev, path); + dev_d_send(&dev, subsystem); exit: if (class_dev)