X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udevmonitor.c;h=35c3721f7633bd80ae66c8dddfdcd25289ef934b;hb=c7c00276f6f26ff7f38e99d887137bc1f172a978;hp=9fe6da906f986ab81895efb67e332d7087a62a16;hpb=9bbcdb56d8221e2e839a2cf03fc071952fe7bc3c;p=elogind.git diff --git a/udevmonitor.c b/udevmonitor.c index 9fe6da906..35c3721f7 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,17 +12,19 @@ * * 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 @@ -33,11 +33,10 @@ #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) { @@ -54,14 +53,14 @@ 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; @@ -81,18 +80,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; @@ -101,8 +100,15 @@ static int init_uevent_netlink_sock(void) return 0; } +static void asmlinkage sig_handler(int signum) +{ + if (signum == SIGINT || signum == SIGTERM) + udev_exit = 1; +} + int main(int argc, char *argv[]) { + struct sigaction act; int env = 0; fd_set readfds; int i; @@ -110,28 +116,36 @@ int main(int argc, char *argv[]) for (i = 1 ; i < argc; i++) { char *arg = argv[i]; - if (strcmp(arg, "--env") == 0 || strcmp(arg, "-e") == 0) { + if (strcmp(arg, "--env") == 0 || strcmp(arg, "-e") == 0) env = 1; - } else if (strcmp(arg, "--help") == 0 || strcmp(arg, "-h") == 0){ - printf("Usage: udevmonitor [--env]\n" + 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, "unknown option\n\n"); + fprintf(stderr, "unrecognized option '%s'\n", arg); exit(1); } } if (getuid() != 0) { - fprintf(stderr, "need to be root, exit\n\n"); + fprintf(stderr, "root privileges required\n"); exit(2); } + /* set signal handlers */ + memset(&act, 0x00, sizeof(struct sigaction)); + act.sa_handler = (void (*)(int)) sig_handler; + sigemptyset(&act.sa_mask); + act.sa_flags = SA_RESTART; + 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; @@ -139,41 +153,50 @@ int main(int argc, char *argv[]) printf("udevmonitor prints the received event from the kernel [UEVENT]\n" "and the event which udev sends out after rule processing [UDEV]\n\n"); - while (1) { - static char buf[UEVENT_BUFFER_SIZE*2]; + while (!udev_exit) { + char buf[UEVENT_BUFFER_SIZE*2]; ssize_t buflen; int fdcount; + struct timeval tv; + struct timezone tz; + char timestr[64]; 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"); + fprintf(stderr, "error receiving uevent message: %s\n", strerror(errno)); continue; } - printf("UEVENT[%i] %s\n", time(NULL), buf); + printf("UEVENT[%s] %s\n", timestr, buf); } - 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"); + fprintf(stderr, "error receiving udev message: %s\n", strerror(errno)); continue; } - printf("UDEV [%i] %s\n", time(NULL), buf); + printf("UDEV [%s] %s\n", timestr, buf); } if (buflen == 0) @@ -202,9 +225,9 @@ 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)