X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udevmonitor.c;h=4c59a495dbc92c90fa77e45ff6a43401463646e0;hb=f051e340699286831b90b242d843eb1a38c2b19f;hp=33dff2a13c3e7e8fa9947d904ba5493d9e593a9c;hpb=9ae611be33c29d5d9b51bca281408d407dcf007f;p=elogind.git

diff --git a/udevmonitor.c b/udevmonitor.c
index 33dff2a13..4c59a495d 100644
--- a/udevmonitor.c
+++ b/udevmonitor.c
@@ -1,7 +1,7 @@
 /*
  * udevmonitor.c
  *
- * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
  *
  *	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
@@ -21,11 +21,12 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <string.h>
 #include <fcntl.h>
-#include <time.h>
 #include <errno.h>
 #include <signal.h>
+#include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/select.h>
@@ -34,11 +35,9 @@
 
 #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)
@@ -56,14 +55,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;
@@ -83,18 +82,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;
@@ -149,6 +148,7 @@ int main(int argc, char *argv[])
 	retval = init_udev_monitor_socket();
 	if (retval)
 		goto out;
+
 	retval = init_uevent_netlink_sock();
 	if (retval)
 		goto out;
@@ -157,40 +157,49 @@ int main(int argc, char *argv[])
 	       "and the event which udev sends out after rule processing [UDEV]\n\n");
 
 	while (!udev_exit) {
-		static char buf[UEVENT_BUFFER_SIZE*2];
+		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)
@@ -219,9 +228,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)