libudev: allow to store negative values in the udev database

[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 379334f02f60693dbe0abef446dc6e8718ce341c..dcee37881fcd0de1565743d658f9f379c7e8d3ef 100644 (file)
--- a/extras/path_id/path_id.c
+++ b/extras/path_id/path_id.c
@@ -1,8 +1,10 @@
 /*
 /*

- * compose persisistent device path
+ * compose persistent device path

  *
  * Copyright (C) 2009 Kay Sievers <kay.sievers@vrfy.org>
  *
  *
  * Copyright (C) 2009 Kay Sievers <kay.sievers@vrfy.org>
  *

+ * Logic based on Hannes Reinecke's shell script.
+ *

  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 2 of the License, or
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 2 of the License, or


@@ -28,10 +30,10 @@
 #include <dirent.h>
 #include <getopt.h>
 
 #include <dirent.h>
 #include <getopt.h>
 

-#include <../../udev/lib/libudev.h>
-#include <../../udev/udev.h>
+#include "libudev.h"
+#include "libudev-private.h"

 
 

-int debug;
+static int debug;

 
 static void log_fn(struct udev *udev, int priority,
                   const char *file, int line, const char *fn,
 
 static void log_fn(struct udev *udev, int priority,
                   const char *file, int line, const char *fn,


@@ -89,128 +91,161 @@ static struct udev_device *skip_subsystem(struct udev_device *dev, const char *s
        return dev;
 }
 
        return dev;
 }
 

-/* find smallest number of instances of <syspath>/<name><number> */
-static int base_number(const char *syspath, const char *name)
+static struct udev_device *handle_scsi_fibre_channel(struct udev_device *parent, char **path)

 {
 {

-       char *base;
-       char *pos;
-       DIR *dir;
-       struct dirent *dent;
-       size_t len;
-       int number = -1;
-
-       base = strdup(syspath);
-       if (base == NULL)
-               goto out;
+       struct udev *udev  = udev_device_get_udev(parent);
+       struct udev_device *targetdev;
+       struct udev_device *fcdev = NULL;
+       const char *port;
+       unsigned int lun;

 
 

-       pos = strrchr(base, '/');
-       if (pos == NULL)
-               goto out;
-       pos[0] = '\0';
+       targetdev = udev_device_get_parent_with_subsystem_devtype(parent, "scsi", "scsi_target");
+       if (targetdev == NULL)
+               return NULL;

 
 

-       len = strlen(name);
-       dir = opendir(base);
-       if (dir == NULL)
+       fcdev = udev_device_new_from_subsystem_sysname(udev, "fc_transport", udev_device_get_sysname(targetdev));
+       if (fcdev == NULL)
+               return NULL;
+       port = udev_device_get_sysattr_value(fcdev, "port_name");
+       if (port == NULL) {
+               parent = NULL;

                goto out;
                goto out;

-       for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
-               char *rest;
-               int i;
-
-               if (dent->d_name[0] == '.')
-                       continue;
-               if (dent->d_type != DT_DIR && dent->d_type != DT_LNK)
-                       continue;
-               if (strncmp(dent->d_name, name, len) != 0)
-                       continue;
-               i = strtoul(&dent->d_name[len], &rest, 10);
-               if (rest[0] != '\0')
-                       continue;
-               if (number == -1 || i < number)
-                       number = i;

        }
        }

-       closedir(dir);
+
+       lun = strtoul(udev_device_get_sysnum(parent), NULL, 10);
+       path_prepend(path, "fc-%s:0x%04x%04x00000000", port, lun & 0xffff, (lun >> 16) & 0xffff);

 out:
 out:

-       free(base);
-       return number;
+       udev_device_unref(fcdev);
+       return parent;

 }
 
 }
 

-static struct udev_device *handle_fc(struct udev_device *parent, char **path)
+static struct udev_device *handle_scsi_sas(struct udev_device *parent, char **path)
+{
+       return NULL;
+}
+
+static struct udev_device *handle_scsi_iscsi(struct udev_device *parent, char **path)

 {
        struct udev *udev  = udev_device_get_udev(parent);
 {
        struct udev *udev  = udev_device_get_udev(parent);

-       struct udev_device *targetdev = NULL;
-       char *syspath = NULL;
-       struct udev_device *fcdev;
+       struct udev_device *transportdev;
+       struct udev_device *sessiondev = NULL;
+       const char *target;
+       char *connname;
+       struct udev_device *conndev = NULL;
+       const char *addr;

        const char *port;
        const char *port;

-       unsigned int lun;

 
 

-       targetdev = udev_device_get_parent_with_subsystem_devtype(parent, "scsi", "scsi_target");
-       if (targetdev == NULL) {
+       /* find iscsi session */
+       transportdev = parent;
+       while (1) {
+               transportdev = udev_device_get_parent(transportdev);
+               if (transportdev == NULL)
+                       return NULL;
+               if (strncmp(udev_device_get_sysname(transportdev), "session", 7) == 0)
+                       break;
+       }
+       if (transportdev == NULL)
+               return NULL;
+
+       /* find iscsi session device */
+       sessiondev = udev_device_new_from_subsystem_sysname(udev, "iscsi_session", udev_device_get_sysname(transportdev));
+       if (sessiondev == NULL)
+               return NULL;
+       target = udev_device_get_sysattr_value(sessiondev, "targetname");
+       if (target == NULL) {

                parent = NULL;
                goto out;
        }
 
                parent = NULL;
                goto out;
        }
 

-       if (asprintf(&syspath, "%s/fc_transport/%s", udev_device_get_syspath(targetdev), udev_device_get_sysname(targetdev)) < 0) {
+       if (asprintf(&connname, "connection%s:0", udev_device_get_sysnum(transportdev)) < 0) {

                parent = NULL;
                goto out;
        }
                parent = NULL;
                goto out;
        }

-       fcdev = udev_device_new_from_syspath(udev, syspath);
-       if (fcdev == NULL) {
+       conndev = udev_device_new_from_subsystem_sysname(udev, "iscsi_connection", connname);
+       free(connname);
+       if (conndev == NULL) {

                parent = NULL;
                goto out;
        }
                parent = NULL;
                goto out;
        }

-
-       port = udev_device_get_sysattr_value(fcdev, "port_name");
-       if (port == NULL) {
+       addr = udev_device_get_sysattr_value(conndev, "persistent_address");
+       port = udev_device_get_sysattr_value(conndev, "persistent_port");
+       if (addr == NULL || port == NULL) {

                parent = NULL;
                goto out;
        }
 
                parent = NULL;
                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);
+       path_prepend(path, "ip-%s:%s-iscsi-%s-lun-%s", addr, port, target, udev_device_get_sysnum(parent));

 out:
 out:

-       free(syspath);
-       udev_device_unref(fcdev);
-       return parent;
-}
-
-static struct udev_device *handle_sas(struct udev_device *parent, char **path)
-{
-       path_prepend(path, "sas-PATH_ID_NOT_IMPLEMENTED");
+       udev_device_unref(sessiondev);
+       udev_device_unref(conndev);

        return parent;
 }
 
        return parent;
 }
 

-static struct udev_device *handle_iscsi(struct udev_device *parent, char **path)
-{
-       path_prepend(path, "ip-PATH_ID_NOT_IMPLEMENTED");
-       return parent;
-}
-
-static struct udev_device *handle_scsi(struct udev_device *parent, char **path)
+static struct udev_device *handle_scsi_default(struct udev_device *parent, char **path)

 {
        struct udev_device *hostdev;
        int host, bus, target, lun;
        const char *name;
 {
        struct udev_device *hostdev;
        int host, bus, target, lun;
        const char *name;

-       int base;
+       char *base;
+       char *pos;
+       DIR *dir;
+       struct dirent *dent;
+       int basenum;

 
        hostdev = udev_device_get_parent_with_subsystem_devtype(parent, "scsi", "scsi_host");
        if (hostdev == NULL)
 
        hostdev = udev_device_get_parent_with_subsystem_devtype(parent, "scsi", "scsi_host");
        if (hostdev == NULL)

-               return parent;
+               return NULL;

 
        name = udev_device_get_sysname(parent);
        if (sscanf(name, "%d:%d:%d:%d", &host, &bus, &target, &lun) != 4)
 
        name = udev_device_get_sysname(parent);
        if (sscanf(name, "%d:%d:%d:%d", &host, &bus, &target, &lun) != 4)

-               return parent;
+               return NULL;

 
        /* rebase host offset to get the local relative number */
 
        /* rebase host offset to get the local relative number */

-       base = base_number(udev_device_get_syspath(hostdev), "host");
-       if (base < 0)
-               return parent;
-       host -= base;
+       basenum = -1;
+       base = strdup(udev_device_get_syspath(hostdev));
+       if (base == NULL)
+               return NULL;
+       pos = strrchr(base, '/');
+       if (pos == NULL) {
+               parent = NULL;
+               goto out;
+       }
+       pos[0] = '\0';
+       dir = opendir(base);
+       if (dir == NULL) {
+               parent = NULL;
+               goto out;
+       }
+       for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
+               char *rest;
+               int i;
+
+               if (dent->d_name[0] == '.')
+                       continue;
+               if (dent->d_type != DT_DIR && dent->d_type != DT_LNK)
+                       continue;
+               if (strncmp(dent->d_name, "host", 4) != 0)
+                       continue;
+               i = strtoul(&dent->d_name[4], &rest, 10);
+               if (rest[0] != '\0')
+                       continue;
+               if (basenum == -1 || i < basenum)
+                       basenum = i;
+       }
+       closedir(dir);
+       if (basenum == -1) {
+               parent = NULL;
+               goto out;
+       }
+       host -= basenum;

 
        path_prepend(path, "scsi-%u:%u:%u:%u", host, bus, target, lun);
 
        path_prepend(path, "scsi-%u:%u:%u:%u", host, bus, target, lun);

+out:
+       free(base);

        return hostdev;
 }
 
        return hostdev;
 }
 

-static struct udev_device *handle_scsi_lun(struct udev_device *parent, char **path)
+static struct udev_device *handle_scsi(struct udev_device *parent, char **path)

 {
        const char *devtype;
        const char *name;
 {
        const char *devtype;
        const char *name;


@@ -228,28 +263,25 @@ static struct udev_device *handle_scsi_lun(struct udev_device *parent, char **pa
                goto out;
        }
 
                goto out;
        }
 

+       /* lousy scsi sysfs does not have a "subsystem" for the transport */

        name = udev_device_get_syspath(parent);
 
        name = udev_device_get_syspath(parent);
 

-       /* fibre channel */

        if (strstr(name, "/rport-") != NULL) {
        if (strstr(name, "/rport-") != NULL) {

-               parent = handle_fc(parent, path);
+               parent = handle_scsi_fibre_channel(parent, path);

                goto out;
        }
 
                goto out;
        }
 

-       /* sas */

        if (strstr(name, "/end_device-") != NULL) {
        if (strstr(name, "/end_device-") != NULL) {

-               parent = handle_sas(parent, path);
+               parent = handle_scsi_sas(parent, path);

                goto out;
        }
 
                goto out;
        }
 

-       /* iSCSI */

        if (strstr(name, "/session") != NULL) {
        if (strstr(name, "/session") != NULL) {

-               parent = handle_iscsi(parent, path);
+               parent = handle_scsi_iscsi(parent, path);

                goto out;
        }
 
                goto out;
        }
 

-       /* default */
-       parent = handle_scsi(parent, path);
+       parent = handle_scsi_default(parent, path);

 out:
        return parent;
 }
 out:
        return parent;
 }


@@ -288,8 +320,7 @@ static struct udev_device *handle_usb(struct udev_device *parent, char **path)
 
 static struct udev_device *handle_cciss(struct udev_device *parent, char **path)
 {
 
 static struct udev_device *handle_cciss(struct udev_device *parent, char **path)
 {

-       path_prepend(path, "cciss-PATH_ID_NOT_IMPLEMENTED");
-       return parent;
+       return NULL;

 }
 
 static struct udev_device *handle_ccw(struct udev_device *parent, struct udev_device *dev, char **path)
 }
 
 static struct udev_device *handle_ccw(struct udev_device *parent, struct udev_device *dev, char **path)


@@ -337,7 +368,7 @@ int main(int argc, char **argv)
        if (udev == NULL)
                goto exit;
 
        if (udev == NULL)
                goto exit;
 

-       logging_init("usb_id");
+       udev_log_init("path_id");

        udev_set_log_fn(udev, log_fn);
 
        while (1) {
        udev_set_log_fn(udev, log_fn);
 
        while (1) {


@@ -400,7 +431,7 @@ int main(int argc, char **argv)
                } else if (strcmp(subsys, "scsi_tape") == 0) {
                        handle_scsi_tape(parent, &path_suffix);
                } else if (strcmp(subsys, "scsi") == 0) {
                } else if (strcmp(subsys, "scsi_tape") == 0) {
                        handle_scsi_tape(parent, &path_suffix);
                } else if (strcmp(subsys, "scsi") == 0) {

-                       parent = handle_scsi_lun(parent, &path);
+                       parent = handle_scsi(parent, &path);

                } else if (strcmp(subsys, "cciss") == 0) {
                        handle_cciss(parent, &path);
                } else if (strcmp(subsys, "usb") == 0) {
                } else if (strcmp(subsys, "cciss") == 0) {
                        handle_cciss(parent, &path);
                } else if (strcmp(subsys, "usb") == 0) {


@@ -436,6 +467,6 @@ out:
        udev_device_unref(dev);
 exit:
        udev_unref(udev);
        udev_device_unref(dev);
 exit:
        udev_unref(udev);

-       logging_close();
+       udev_log_close();

        return rc;
 }
        return rc;
 }