chiark / gitweb /
volume_id: clean up linux_raid code
[elogind.git] / udevmonitor.c
index 6f2844ff150b46265cd506184a4c06a64ed47d61..2430dd39a557fe1411d9b21380e501126b32ce36 100644 (file)
@@ -1,6 +1,4 @@
 /*
- * udevmonitor.c
- *
  * Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
  *
  *     This program is free software; you can redistribute it and/or modify it
@@ -14,7 +12,7 @@
  * 
  *     You should have received a copy of the GNU General Public License along
  *     with this program; if not, write to the Free Software Foundation, Inc.,
- *     675 Mass Ave, Cambridge, MA 02139, USA.
+ *     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
@@ -26,6 +24,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <signal.h>
+#include <getopt.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/un.h>
@@ -44,14 +43,13 @@ static int init_udev_monitor_socket(void)
 {
        struct sockaddr_un saddr;
        socklen_t addrlen;
-       const int feature_on = 1;
        int retval;
 
        memset(&saddr, 0x00, sizeof(saddr));
        saddr.sun_family = AF_LOCAL;
        /* use abstract namespace for socket path */
        strcpy(&saddr.sun_path[1], "/org/kernel/udev/monitor");
-       addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
+       addrlen = offsetof(struct sockaddr_un, sun_path) + 1 + strlen(&saddr.sun_path[1]);
 
        udev_monitor_sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
        if (udev_monitor_sock == -1) {
@@ -68,9 +66,6 @@ static int init_udev_monitor_socket(void)
                return -1;
        }
 
-       /* enable receiving of the sender credentials */
-       setsockopt(udev_monitor_sock, SOL_SOCKET, SO_PASSCRED, &feature_on, sizeof(feature_on));
-
        return 0;
 }
 
@@ -108,32 +103,78 @@ static void asmlinkage sig_handler(int signum)
                udev_exit = 1;
 }
 
-int main(int argc, char *argv[])
+static const char *search_key(const char *searchkey, const char *buf, size_t buflen)
+{
+       size_t bufpos = 0;
+       size_t searchkeylen = strlen(searchkey);
+
+       while (bufpos < buflen) {
+               const char *key;
+               int keylen;
+
+               key = &buf[bufpos];
+               keylen = strlen(key);
+               if (keylen == 0)
+                       break;
+                if ((strncmp(searchkey, key, searchkeylen) == 0) && key[searchkeylen] == '=')
+                       return &key[searchkeylen + 1];
+               bufpos += keylen + 1;
+       }
+       return NULL;
+}
+
+int udevmonitor(int argc, char *argv[], char *envp[])
 {
        struct sigaction act;
+       int option;
        int env = 0;
+       int kernel = 0;
+       int udev = 0;
        fd_set readfds;
-       int i;
        int retval = 0;
 
-       for (i = 1 ; i < argc; i++) {
-               char *arg = argv[i];
-               if (strcmp(arg, "--env") == 0 || strcmp(arg, "-e") == 0)
+       static const struct option options[] = {
+               { "environment", 0, NULL, 'e' },
+               { "kernel", 0, NULL, 'k' },
+               { "udev", 0, NULL, 'u' },
+               { "help", 0, NULL, 'h' },
+               {}
+       };
+
+       while (1) {
+               option = getopt_long(argc, argv, "ekuh", options, NULL);
+               if (option == -1)
+                       break;
+
+               switch (option) {
+               case 'e':
                        env = 1;
-               else if (strcmp(arg, "--help") == 0  || strcmp(arg, "-h") == 0){
-                       printf("Usage: udevmonitor [--help] [--env]\n"
-                               "  --env    print the whole event environment\n"
-                               "  --help   print this help text\n\n");
-                       exit(0);
-               } else {
-                       fprintf(stderr, "unrecognized option '%s'\n", arg);
-                       exit(1);
+                       break;
+               case 'k':
+                       kernel = 1;
+                       break;
+               case 'u':
+                       udev = 1;
+                       break;
+               case 'h':
+                       printf("Usage: udevadm monitor [--environment] [--kernel] [--udev] [--help]\n"
+                              "  --env    print the whole event environment\n"
+                              "  --kernel print kernel uevents\n"
+                              "  --udev   print udev events\n"
+                              "  --help   print this help text\n\n");
+               default:
+                       goto out;
                }
        }
 
-       if (getuid() != 0) {
-               fprintf(stderr, "root privileges required\n");
-               exit(2);
+       if (!kernel && !udev) {
+               kernel = 1;
+               udev =1;
+       }
+
+       if (getuid() != 0 && kernel) {
+               fprintf(stderr, "root privileges needed to subscribe to kernel events\n");
+               goto out;
        }
 
        /* set signal handlers */
@@ -144,24 +185,32 @@ int main(int argc, char *argv[])
        sigaction(SIGINT, &act, NULL);
        sigaction(SIGTERM, &act, NULL);
 
-       retval = init_udev_monitor_socket();
-       if (retval)
-               goto out;
-
-       retval = init_uevent_netlink_sock();
-       if (retval)
-               goto out;
-
-       printf("udevmonitor prints the received event from the kernel [UEVENT]\n"
-              "and the event which udev sends out after rule processing [UDEV]\n\n");
+       printf("udevmonitor will print the received events for:\n");
+       if (udev) {
+               retval = init_udev_monitor_socket();
+               if (retval)
+                       goto out;
+               printf("UDEV the event which udev sends out after rule processing\n");
+       }
+       if (kernel) {
+               retval = init_uevent_netlink_sock();
+               if (retval)
+                       goto out;
+               printf("UEVENT the kernel uevent\n");
+       }
+       printf("\n");
 
        while (!udev_exit) {
                char buf[UEVENT_BUFFER_SIZE*2];
                ssize_t buflen;
+               ssize_t bufpos;
+               ssize_t keys;
                int fdcount;
                struct timeval tv;
                struct timezone tz;
                char timestr[64];
+               const char *source = NULL;
+               const char *devpath, *action, *subsys;
 
                buflen = 0;
                FD_ZERO(&readfds);
@@ -185,33 +234,35 @@ int main(int argc, char *argv[])
 
                if ((uevent_netlink_sock >= 0) && FD_ISSET(uevent_netlink_sock, &readfds)) {
                        buflen = recv(uevent_netlink_sock, &buf, sizeof(buf), 0);
-                       if (buflen <=  0) {
+                       if (buflen <= 0) {
                                fprintf(stderr, "error receiving uevent message: %s\n", strerror(errno));
                                continue;
                        }
-                       printf("UEVENT[%s] %s\n", timestr, buf);
+                       source = "UEVENT";
                }
 
                if ((udev_monitor_sock >= 0) && FD_ISSET(udev_monitor_sock, &readfds)) {
                        buflen = recv(udev_monitor_sock, &buf, sizeof(buf), 0);
-                       if (buflen <=  0) {
+                       if (buflen <= 0) {
                                fprintf(stderr, "error receiving udev message: %s\n", strerror(errno));
                                continue;
                        }
-                       printf("UDEV  [%s] %s\n", timestr, buf);
+                       source = "UDEV  ";
                }
 
                if (buflen == 0)
                        continue;
 
+               keys = strlen(buf) + 1; /* start of payload */
+               devpath = search_key("DEVPATH", &buf[keys], buflen);
+               action = search_key("ACTION", &buf[keys], buflen);
+               subsys = search_key("SUBSYSTEM", &buf[keys], buflen);
+               printf("%s[%s] %-8s %s (%s)\n", source, timestr, action, devpath, subsys);
+
                /* print environment */
+               bufpos = keys;
                if (env) {
-                       size_t bufpos;
-
-                       /* start of payload */
-                       bufpos = strlen(buf) + 1;
-
-                       while (bufpos < (size_t)buflen) {
+                       while (bufpos < buflen) {
                                int keylen;
                                char *key;
 
@@ -233,6 +284,6 @@ out:
                close(udev_monitor_sock);
 
        if (retval)
-               return 3;
+               return 1;
        return 0;
 }