chiark / gitweb /
[PATCH] netdev - udevdb+dev.d changes
[elogind.git] / udev-add.c
index 17b69eadabc620abde5b12b817801f306b8668b1..1f17f50bc3de8a372b6a80d9595518fad05a9e4d 100644 (file)
 #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 "udev_dbus.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
  * "dev" in sysfs.
  */
 static int get_major_minor(struct sysfs_class_device *class_dev, struct udevice *udev)
 {
-       int retval = -ENODEV;
-       char *dev;
+       struct sysfs_attribute *attr = NULL;
 
-       dev = sysfs_get_value_from_attributes(class_dev->directory->attributes, "dev");
-       if (dev == NULL)
-               goto exit;
-       dbg("dev='%s'", dev);
+       attr = sysfs_get_classdev_attr(class_dev, "dev");
+       if (attr == NULL)
+               goto error;
+       dbg("dev='%s'", attr->value);
 
-       if (sscanf(dev, "%u:%u", &udev->major, &udev->minor) != 2)
-               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);
 
-       retval = 0;
-exit:
-       return retval;
+       return 0;
+error:
+       return -1;
 }
 
 static int create_path(char *file)
@@ -77,7 +84,7 @@ static int create_path(char *file)
        int retval;
        struct stat stats;
        
-       strncpy(p, file, sizeof(p));
+       strfieldcpy(p, file);
        pos = strchr(p+1, '/');
        while (1) {
                pos = strchr(pos+1, '/');
@@ -86,7 +93,7 @@ static int create_path(char *file)
                *pos = 0x00;
                if (stat(p, &stats)) {
                        retval = mkdir(p, 0755);
-                       if (retval) {
+                       if (retval != 0) {
                                dbg("mkdir(%s) failed with error '%s'",
                                    p, strerror(errno));
                                return retval;
@@ -98,25 +105,100 @@ static int create_path(char *file)
        return 0;
 }
 
-static int create_node(struct udevice *dev)
+static int make_node(char *filename, int major, int minor, unsigned int mode, uid_t uid, gid_t gid)
+{
+       int retval;
+
+       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;
+       }
+
+       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;
+       }
+
+       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;
+               }
+       }
+
+exit:
+       return retval;
+}
+
+/* get the local logged in user */
+static void set_to_local_user(char *user)
+{
+       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)
 {
-       char filename[255];
-       char linktarget[255];
+       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;
        int i;
        int tail;
+       char *pos;
+       int len;
 
-       strncpy(filename, udev_root, sizeof(filename));
-       strncat(filename, dev->name, sizeof(filename));
-
-#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':
@@ -138,90 +220,104 @@ static int create_node(struct udevice *dev)
        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 {
-                       struct passwd *pw = getpwnam(dev->owner);
-                       if (!pw)
-                               dbg("user unknown '%s'", dev->owner);
+                       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 {
                        struct group *gr = getgrnam(dev->group);
-                       if (!gr)
-                               dbg("group unknown '%s'", 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);
        }
 
+       /* 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 if requested */
-       if (*dev->symlink) {
-               strncpy(filename, udev_root, sizeof(filename));
-               strncat(filename, dev->symlink, sizeof(filename));
+       /* 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 (strrchr(dev->symlink, '/'))
-                       create_path(filename);
+               if (!fake)
+                       if (strrchr(linkname, '/'))
+                               create_path(filename);
 
                /* optimize relative link */
                linktarget[0] = '\0';
                i = 0;
                tail = 0;
-               while ((dev->name[i] == dev->symlink[i]) && dev->name[i]) {
+               while ((dev->name[i] == linkname[i]) && dev->name[i]) {
                        if (dev->name[i] == '/')
                                tail = i+1;
                        i++;
                }
-               while (dev->symlink[i]) {
-                       if (dev->symlink[i] == '/')
-                               strcat(linktarget, "../");
+               while (linkname[i] != '\0') {
+                       if (linkname[i] == '/')
+                               strfieldcat(linktarget, "../");
                        i++;
                }
 
-               if (*linktarget == '\0')
-                       strcpy(linktarget, "./");
-               strcat(linktarget, &dev->name[tail]);
+               strfieldcat(linktarget, &dev->name[tail]);
+
+               if (!fake)
+                       unlink_entry(filename);
 
                dbg("symlink(%s, %s)", linktarget, filename);
-               retval = symlink(linktarget, filename);
-               if (retval)
-                       dbg("symlink(%s, %s) failed with error '%s'",
-                           linktarget, filename, strerror(errno));
+               if (!fake) {
+                       if (symlink(linktarget, filename) != 0)
+                               dbg("symlink(%s, %s) failed with error '%s'",
+                                   linktarget, filename, strerror(errno));
+               }
        }
 
-       return retval;
+       return 0;
+error:
+       return -1;
 }
 
 static struct sysfs_class_device *get_class_dev(char *device_name)
@@ -229,14 +325,14 @@ 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);
+       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);
@@ -248,23 +344,23 @@ 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);
                retval = stat(filename, &buf);
-               if (!retval)
+               if (retval == 0)
                        goto exit;
 
                /* sleep to give the kernel a chance to create the dev file */
@@ -275,52 +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;
 
        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';
+       dev.type = get_device_type(path, subsystem);
+       switch (dev.type) {
+       case 'b':
+       case 'c':
+               retval = sleep_for_file(path, "/dev");
+               break;
 
-       retval = sleep_for_dev(path);
-       if (retval)
-               goto exit;
+       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);
-       retval = create_node(&dev);
 
-       if (retval == 0)
-               sysbus_send_create(&dev, path);
+       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;
+
+       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;
 }