X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevmonitor.c;h=75e39481a02a3ff3773b215a6741766745acd0e0;hp=33dff2a13c3e7e8fa9947d904ba5493d9e593a9c;hb=225cb03bd851adc6d269b13bdf2b1bfded2b96b9;hpb=9ae611be33c29d5d9b51bca281408d407dcf007f diff --git a/udevmonitor.c b/udevmonitor.c index 33dff2a13..75e39481a 100644 --- a/udevmonitor.c +++ b/udevmonitor.c @@ -1,7 +1,5 @@ /* - * udevmonitor.c - * - * Copyright (C) 2004-2005 Kay Sievers + * Copyright (C) 2004-2006 Kay Sievers * * 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 @@ -14,18 +12,20 @@ * * 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. * */ #include #include #include +#include #include #include -#include #include #include +#include +#include #include #include #include @@ -34,18 +34,15 @@ #include "udev.h" #include "udevd.h" -#include "udev_utils.h" -#include "udev_libc_wrapper.h" -static int uevent_netlink_sock; -static int udev_monitor_sock; +static int uevent_netlink_sock = -1; +static int udev_monitor_sock = -1; static volatile int udev_exit; 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)); @@ -56,22 +53,19 @@ static int init_udev_monitor_socket(void) udev_monitor_sock = socket(AF_LOCAL, SOCK_DGRAM, 0); if (udev_monitor_sock == -1) { - fprintf(stderr, "error getting socket, %s\n", strerror(errno)); + fprintf(stderr, "error getting socket: %s\n", strerror(errno)); return -1; } /* the bind takes care of ensuring only one copy running */ retval = bind(udev_monitor_sock, (struct sockaddr *) &saddr, addrlen); if (retval < 0) { - fprintf(stderr, "bind failed, %s\n", strerror(errno)); + fprintf(stderr, "bind failed: %s\n", strerror(errno)); close(udev_monitor_sock); udev_monitor_sock = -1; return -1; } - /* enable receiving of the sender credentials */ - setsockopt(udev_monitor_sock, SOL_SOCKET, SO_PASSCRED, &feature_on, sizeof(feature_on)); - return 0; } @@ -83,18 +77,18 @@ static int init_uevent_netlink_sock(void) memset(&snl, 0x00, sizeof(struct sockaddr_nl)); snl.nl_family = AF_NETLINK; snl.nl_pid = getpid(); - snl.nl_groups = 0xffffffff; + snl.nl_groups = 1; uevent_netlink_sock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT); if (uevent_netlink_sock == -1) { - fprintf(stderr, "error getting socket, %s\n", strerror(errno)); + fprintf(stderr, "error getting socket: %s\n", strerror(errno)); return -1; } retval = bind(uevent_netlink_sock, (struct sockaddr *) &snl, sizeof(struct sockaddr_nl)); if (retval < 0) { - fprintf(stderr, "bind failed, %s\n", strerror(errno)); + fprintf(stderr, "bind failed: %s\n", strerror(errno)); close(uevent_netlink_sock); uevent_netlink_sock = -1; return -1; @@ -109,33 +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 [--env]\n" - " --env print the whole event environment\n" - " --help print this help text\n\n"); - exit(0); - } else { - fprintf(stderr, "unknown option\n\n"); - 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, "need to be root, exit\n\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 */ @@ -146,64 +185,84 @@ 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) { - static char buf[UEVENT_BUFFER_SIZE*2]; + 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); - if (uevent_netlink_sock > 0) + if (uevent_netlink_sock >= 0) FD_SET(uevent_netlink_sock, &readfds); - if (udev_monitor_sock > 0) + if (udev_monitor_sock >= 0) FD_SET(udev_monitor_sock, &readfds); fdcount = select(UDEV_MAX(uevent_netlink_sock, udev_monitor_sock)+1, &readfds, NULL, NULL, NULL); if (fdcount < 0) { if (errno != EINTR) - fprintf(stderr, "error receiving uevent message\n"); + fprintf(stderr, "error receiving uevent message: %s\n", strerror(errno)); continue; } - if ((uevent_netlink_sock > 0) && FD_ISSET(uevent_netlink_sock, &readfds)) { + if (gettimeofday(&tv, &tz) == 0) { + snprintf(timestr, sizeof(timestr), "%llu.%06u", + (unsigned long long) tv.tv_sec, (unsigned int) tv.tv_usec); + } else + timestr[0] = '\0'; + + if ((uevent_netlink_sock >= 0) && FD_ISSET(uevent_netlink_sock, &readfds)) { buflen = recv(uevent_netlink_sock, &buf, sizeof(buf), 0); - if (buflen <= 0) { - fprintf(stderr, "error receiving uevent message\n"); + if (buflen <= 0) { + fprintf(stderr, "error receiving uevent message: %s\n", strerror(errno)); continue; } - printf("UEVENT[%i] %s\n", time(NULL), buf); + source = "UEVENT"; } - if ((udev_monitor_sock > 0) && FD_ISSET(udev_monitor_sock, &readfds)) { + if ((udev_monitor_sock >= 0) && FD_ISSET(udev_monitor_sock, &readfds)) { buflen = recv(udev_monitor_sock, &buf, sizeof(buf), 0); - if (buflen <= 0) { - fprintf(stderr, "error receiving udev message\n"); + if (buflen <= 0) { + fprintf(stderr, "error receiving udev message: %s\n", strerror(errno)); continue; } - printf("UDEV [%i] %s\n", time(NULL), 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; @@ -219,12 +278,12 @@ int main(int argc, char *argv[]) } out: - if (uevent_netlink_sock > 0) + if (uevent_netlink_sock >= 0) close(uevent_netlink_sock); - if (udev_monitor_sock > 0) + if (udev_monitor_sock >= 0) close(udev_monitor_sock); if (retval) - return 3; + return 1; return 0; }