X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevsend.c;h=1b9860baca5ecfbf6537958a4a0edc27265a4722;hp=bdc69d0508e4c3ce786e895a65a6d66dd5e5980e;hb=83cc6ab4760817509f1ed1ee429669e563f82caf;hpb=8ab44e3fd0b8fd4555db973d4c2c305ca09e787d

diff --git a/udevsend.c b/udevsend.c
index bdc69d050..1b9860bac 100644
--- a/udevsend.c
+++ b/udevsend.c
@@ -1,12 +1,9 @@
 /*
  * udevsend.c
  *
- * Userspace devfs
- *
  * Copyright (C) 2004 Ling, Xiaofeng <xiaofeng.ling@intel.com>
  * Copyright (C) 2004 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
  *	Free Software Foundation version 2 of the License.
@@ -22,23 +19,21 @@
  *
  */
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/wait.h>
-#include <sys/un.h>
-#include <time.h>
-#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
-#include <string.h>
 #include <unistd.h>
+#include <string.h>
+#include <time.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/wait.h>
+#include <sys/un.h>
 #include <linux/stddef.h>
 
 #include "udev.h"
-#include "udev_version.h"
 #include "udevd.h"
-#include "logging.h"
 
 /* global variables */
 static int sock = -1;
@@ -57,85 +52,28 @@ void log_message (int priority, const char *format, ...)
 }
 #endif
 
-static int start_daemon(void)
-{
-	pid_t pid;
-	pid_t child_pid;
-	char *const argv[] = { "udevd", NULL };
-	char *const envp[] = { NULL };
-
-	pid = fork();
-	switch (pid) {
-	case 0:
-		/* helper child */
-		child_pid = fork();
-		switch (child_pid) {
-		case 0:
-			/* daemon with empty environment */
-			close(sock);
-			execve(UDEVD_BIN, argv, envp);
-			err("exec of daemon failed");
-			_exit(1);
-		case -1:
-			err("fork of daemon failed");
-			return -1;
-		default:
-			exit(0);
-		}
-		break;
-	case -1:
-		err("fork of helper failed");
-		return -1;
-	default:
-		waitpid(pid, NULL, 0);
-	}
-	return 0;
-}
-
-static void run_udev(const char *subsystem)
-{
-	char *const argv[] = { "udev", (char *)subsystem, NULL };
-	pid_t pid;
-
-	pid = fork();
-	switch (pid) {
-	case 0:
-		/* child */
-		execv(UDEV_BIN, argv);
-		err("exec of udev child failed");
-		_exit(1);
-		break;
-	case -1:
-		err("fork of udev child failed");
-		break;
-	default:
-		waitpid(pid, NULL, 0);
-	}
-}
-
 int main(int argc, char *argv[], char *envp[])
 {
 	static struct udevd_msg usend_msg;
 	int usend_msg_len;
 	int i;
-	int loop;
 	struct sockaddr_un saddr;
 	socklen_t addrlen;
 	int bufpos = 0;
-	int retval = 1;
-	int started_daemon = 0;
+	int retval = 0;
 	const char *subsystem = NULL;
 
 	logging_init("udevsend");
 #ifdef USE_LOG
-	udev_init_config();
+	udev_config_init();
 #endif
 	dbg("version %s", UDEV_VERSION);
 
 	sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
-	if (sock == -1) {
-		err("error getting socket");
-		goto fallback;
+	if (sock < 0) {
+		err("error getting socket: %s", strerror(errno));
+		retval = 1;
+		goto exit;
 	}
 
 	memset(&saddr, 0x00, sizeof(struct sockaddr_un));
@@ -156,9 +94,17 @@ int main(int argc, char *argv[], char *envp[])
 		key = envp[i];
 		keylen = strlen(key);
 
+		/* ignore events which are already sent on the netlink socket */
+		if (strncmp(key, "SEQNUM=", 7) == 0) {
+			dbg("ignoring event with SEQNUM set");
+			retval = 0;
+			goto exit;
+		}
+
 		/* prevent loops in the scripts we execute */
 		if (strncmp(key, "UDEVD_EVENT=", 12) == 0) {
-			dbg("seems that the event source is not the kernel, just exit");
+			err("event loop, already passed through the daemon, exit");
+			retval = 2;
 			goto exit;
 		}
 
@@ -175,53 +121,19 @@ int main(int argc, char *argv[], char *envp[])
 		strcpy(&usend_msg.envbuf[bufpos], key);
 		bufpos += keylen + 1;
 	}
-	/* older kernels passed the SUBSYSTEM only as the first argument */
-	if (!subsystem && argc == 2) {
-		bufpos += sprintf(&usend_msg.envbuf[bufpos], "SUBSYSTEM=%s", argv[1]) + 1;
-		dbg("add 'SUBSYSTEM=%s' to env[%i] buffer from argv", argv[1], i);
-	}
 
 	usend_msg_len = offsetof(struct udevd_msg, envbuf) + bufpos;
 	dbg("usend_msg_len=%i", usend_msg_len);
 
-	/* If we can't send, try to start daemon and resend message */
-	loop = UDEVSEND_WAIT_MAX_SECONDS * UDEVSEND_WAIT_LOOP_PER_SECOND;
-	while (--loop) {
-		retval = sendto(sock, &usend_msg, usend_msg_len, 0, (struct sockaddr *)&saddr, addrlen);
-		if (retval != -1) {
-			retval = 0;
-			goto exit;
-		}
-
-		if (errno != ECONNREFUSED) {
-			err("error sending message (%s)", strerror(errno));
-			goto fallback;
-		}
-
-		if (!started_daemon) {
-			info("try to start udevd daemon");
-			retval = start_daemon();
-			if (retval) {
-				dbg("error starting daemon");
-				goto fallback;
-			}
-			dbg("udevd daemon started");
-			started_daemon = 1;
-		} else {
-			dbg("retry to connect %d", UDEVSEND_WAIT_MAX_SECONDS * UDEVSEND_WAIT_LOOP_PER_SECOND - loop);
-			usleep(1000 * 1000 / UDEVSEND_WAIT_LOOP_PER_SECOND);
-		}
+	if (sendto(sock, &usend_msg, usend_msg_len, 0, (struct sockaddr *)&saddr, addrlen) < 0) {
+		retval = 3;
+		err("error sending message: %s", strerror(errno));
 	}
 
-fallback:
-	err("unable to connect to event daemon, try to call udev directly");
-	run_udev(subsystem);
-
 exit:
 	if (sock != -1)
 		close(sock);
 
 	logging_close();
-
 	return retval;
 }