path_id: add missing '-' to tape suffix

[elogind.git] / extras / path_id / path_id.c

diff --git a/extras/path_id/path_id.c b/extras/path_id/path_id.c
index 518ec8b386a782596404a1cd3aede55a60cb9593..9e77b8a7cc2a4e10ecef0c234abe5ce585ac30b8 100644 (file)
--- a/extras/path_id/path_id.c
+++ b/extras/path_id/path_id.c
@@ -50,29 +50,44 @@ static void log_fn(struct udev *udev, int priority,
 static int path_prepend(char **path, const char *fmt, ...)
 {
        va_list va;
-       char *old;
        char *pre;
-       int err;
-
-       old = *path;
+       int err = 0;
 
        va_start(va, fmt);
        err = vasprintf(&pre, fmt, va);
        va_end(va);
        if (err < 0)
-               return err;
+               goto out;
 
-       if (old != NULL) {
-               err = asprintf(path, "%s-%s", pre, old);
-               if (err < 0)
-                       return err;
+       if (*path != NULL) {
+               char *new;
+
+               err = asprintf(&new, "%s-%s", pre, *path);
                free(pre);
+               if (err < 0)
+                       goto out;
+               free(*path);
+               *path = new;
        } else {
                *path = pre;
        }
+out:
+       return err;
+}
 
-       free(old);
-       return 0;
+/*
+** Linux only supports 32 bit luns.
+** See drivers/scsi/scsi_scan.c::scsilun_to_int() for more details.
+*/
+static int format_lun_number(struct udev_device *dev, char **path)
+{
+       unsigned long lun = strtoul(udev_device_get_sysnum(dev), NULL, 10);
+
+       /* address method 0, peripheral device addressing with bus id of zero */
+       if (lun < 256)
+               return path_prepend(path, "lun-%d", lun);
+       /* handle all other lun addressing methods by using a variant of the original lun format */
+       return path_prepend(path, "lun-0x%04x%04x00000000", (lun & 0xffff), (lun >> 16) & 0xffff);
 }
 
 static struct udev_device *skip_subsystem(struct udev_device *dev, const char *subsys)
@@ -97,7 +112,7 @@ static struct udev_device *handle_scsi_fibre_channel(struct udev_device *parent,
        struct udev_device *targetdev;
        struct udev_device *fcdev = NULL;
        const char *port;
-       unsigned int lun;
+       char *lun = NULL;;
 
        targetdev = udev_device_get_parent_with_subsystem_devtype(parent, "scsi", "scsi_target");
        if (targetdev == NULL)
@@ -112,8 +127,10 @@ static struct udev_device *handle_scsi_fibre_channel(struct udev_device *parent,
                goto out;
        }
 
-       lun = strtoul(udev_device_get_sysnum(parent), NULL, 10);
-       path_prepend(path, "fc-%s:0x%04x%04x00000000", port, lun & 0xffff, (lun >> 16) & 0xffff);
+       format_lun_number(parent, &lun);
+       path_prepend(path, "fc-%s-%s", port, lun);
+       if (lun)
+               free(lun);
 out:
        udev_device_unref(fcdev);
        return parent;
@@ -121,7 +138,39 @@ out:
 
 static struct udev_device *handle_scsi_sas(struct udev_device *parent, char **path)
 {
-       return NULL;
+       struct udev *udev  = udev_device_get_udev(parent);
+       struct udev_device *targetdev;
+       struct udev_device *target_parent;
+       struct udev_device *sasdev;
+       const char *sas_address;
+       char *lun = NULL;
+
+       targetdev = udev_device_get_parent_with_subsystem_devtype(parent, "scsi", "scsi_target");
+       if (targetdev == NULL)
+               return NULL;
+
+       target_parent = udev_device_get_parent(targetdev);
+       if (target_parent == NULL)
+               return NULL;
+
+       sasdev = udev_device_new_from_subsystem_sysname(udev, "sas_device", 
+                               udev_device_get_sysname(target_parent));
+       if (sasdev == NULL)
+               return NULL;
+
+       sas_address = udev_device_get_sysattr_value(sasdev, "sas_address");
+       if (sas_address == NULL) {
+               parent = NULL;
+               goto out;
+       }
+
+       format_lun_number(parent, &lun);
+       path_prepend(path, "sas-%s-%s", sas_address, lun);
+       if (lun)
+               free(lun);
+out:
+       udev_device_unref(sasdev);
+       return parent;
 }
 
 static struct udev_device *handle_scsi_iscsi(struct udev_device *parent, char **path)
@@ -134,6 +183,7 @@ static struct udev_device *handle_scsi_iscsi(struct udev_device *parent, char **
        struct udev_device *conndev = NULL;
        const char *addr;
        const char *port;
+       char *lun = NULL;
 
        /* find iscsi session */
        transportdev = parent;
@@ -172,7 +222,10 @@ static struct udev_device *handle_scsi_iscsi(struct udev_device *parent, char **
                goto out;
        }
 
-       path_prepend(path, "ip-%s:%s-iscsi-%s-lun-%s", addr, port, target, udev_device_get_sysnum(parent));
+       format_lun_number(parent, &lun);
+       path_prepend(path, "ip-%s:%s-iscsi-%s-%s", addr, port, target, lun);
+       if (lun)
+               free(lun);
 out:
        udev_device_unref(sessiondev);
        udev_device_unref(conndev);
@@ -284,15 +337,19 @@ out:
        return parent;
 }
 
-static void handle_scsi_tape(struct udev_device *dev, char **suffix)
+static void handle_scsi_tape(struct udev_device *dev, char **path)
 {
        const char *name;
 
+       /* must be the last device in the syspath */
+       if (*path != NULL)
+               return;
+
        name = udev_device_get_sysname(dev);
        if (strncmp(name, "nst", 3) == 0 && strchr("lma", name[3]) != NULL)
-               asprintf(suffix, "nst%c", name[3]);
+               path_prepend(path, "nst%c", name[3]);
        else if (strncmp(name, "st", 2) == 0 && strchr("lma", name[2]) != NULL)
-               asprintf(suffix, "st%c", name[2]);
+               path_prepend(path, "st%c", name[2]);
 }
 
 static struct udev_device *handle_usb(struct udev_device *parent, char **path)
@@ -302,7 +359,9 @@ static struct udev_device *handle_usb(struct udev_device *parent, char **path)
        const char *port;
 
        devtype = udev_device_get_devtype(parent);
-       if (devtype == NULL || strcmp(devtype, "usb_interface") != 0)
+       if (devtype == NULL)
+               return parent;
+       if (strcmp(devtype, "usb_interface") != 0 && strcmp(devtype, "usb_device") != 0)
                return parent;
 
        str = udev_device_get_sysname(parent);
@@ -358,9 +417,8 @@ int main(int argc, char **argv)
        struct udev_device *parent;
        char syspath[UTIL_PATH_SIZE];
        const char *devpath;
-       char *path;
-       char *path_suffix;
-       int rc = 1;
+       char *path = NULL;
+       int rc = EXIT_FAILURE;
 
        udev = udev_new();
        if (udev == NULL)
@@ -405,9 +463,6 @@ int main(int argc, char **argv)
                goto exit;
        }
 
-       path = NULL;
-       path_suffix = NULL;
-
        /* S390 ccw bus */
        parent = udev_device_get_parent_with_subsystem_devtype(dev, "ccw", NULL);
        if (parent != NULL) {
@@ -425,7 +480,7 @@ int main(int argc, char **argv)
                if (subsys == NULL) {
                        ;
                } else if (strcmp(subsys, "scsi_tape") == 0) {
-                       handle_scsi_tape(parent, &path_suffix);
+                       handle_scsi_tape(parent, &path);
                } else if (strcmp(subsys, "scsi") == 0) {
                        parent = handle_scsi(parent, &path);
                } else if (strcmp(subsys, "cciss") == 0) {
@@ -453,14 +508,9 @@ int main(int argc, char **argv)
        }
 out:
        if (path != NULL) {
-               if (path_suffix != NULL) {
-                       printf("ID_PATH=%s%s\n", path, path_suffix);
-                       free(path_suffix);
-               } else {
-                       printf("ID_PATH=%s\n", path);
-               }
+               printf("ID_PATH=%s\n", path);
                free(path);
-               rc = 0;
+               rc = EXIT_SUCCESS;
        }
 
        udev_device_unref(dev);