X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevsend.c;h=1b9860baca5ecfbf6537958a4a0edc27265a4722;hp=9dc2b2e841bb635cd3a30dc284e25224938b9f90;hb=a6aa9d70a470e02ccaf68bdb1929a2b7a3c5d030;hpb=86590cd590a9f2fcc5917e8f5c85e024af1e58e0

diff --git a/udevsend.c b/udevsend.c
index 9dc2b2e84..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,189 +19,121 @@
  *
  */
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/wait.h>
-#include <sys/un.h>
-#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <stddef.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"
-
-unsigned char logname[42];
-
-static inline char *get_action(void)
-{
-	char *action;
-
-	action = getenv("ACTION");
-	return action;
-}
 
-static inline char *get_devpath(void)
-{
-	char *devpath;
-
-	devpath = getenv("DEVPATH");
-	return devpath;
-}
+/* global variables */
+static int sock = -1;
 
-static inline char *get_seqnum(void)
+#ifdef USE_LOG
+void log_message (int priority, const char *format, ...)
 {
-	char *seqnum;
+	va_list args;
 
-	seqnum = getenv("SEQNUM");
-	return seqnum;
-}
-
-static int build_hotplugmsg(struct hotplug_msg *msg, char *action,
-			    char *devpath, char *subsystem, int seqnum)
-{
-	memset(msg, 0x00, sizeof(*msg));
-	strfieldcpy(msg->magic, UDEV_MAGIC);
-	msg->seqnum = seqnum;
-	strncpy(msg->action, action, 8);
-	strncpy(msg->devpath, devpath, 128);
-	strncpy(msg->subsystem, subsystem, 16);
-	return sizeof(struct hotplug_msg);
-}
+	if (priority > udev_log_priority)
+		return;
 
-static int start_daemon(void)
-{
-	pid_t pid;
-	pid_t child_pid;
-
-	pid = fork();
-	switch (pid) {
-	case 0:
-		/* helper child */
-		child_pid = fork();
-		switch (child_pid) {
-		case 0:
-			/* daemon */
-			setsid();
-			chdir("/");
-			execl(UDEVD_BIN, "udevd", NULL);
-			dbg("exec of daemon failed");
-			exit(1);
-		case -1:
-			dbg("fork of daemon failed");
-			return -1;
-		default:
-			exit(0);
-		}
-		break;
-	case -1:
-		dbg("fork of helper failed");
-		return -1;
-	default:
-		wait(NULL);
-	}
-	return 0;
+	va_start(args, format);
+	vsyslog(priority, format, args);
+	va_end(args);
 }
+#endif
 
-int main(int argc, char* argv[])
+int main(int argc, char *argv[], char *envp[])
 {
-	struct hotplug_msg message;
-	char *action;
-	char *devpath;
-	char *subsystem;
-	char *seqnum;
-	int seq;
-	int retval = -EINVAL;
-	int size;
-	int loop;
-	struct timespec tspec;
-	int sock;
+	static struct udevd_msg usend_msg;
+	int usend_msg_len;
+	int i;
 	struct sockaddr_un saddr;
-
-#ifdef DEBUG
-	init_logging("udevsend");
+	socklen_t addrlen;
+	int bufpos = 0;
+	int retval = 0;
+	const char *subsystem = NULL;
+
+	logging_init("udevsend");
+#ifdef USE_LOG
+	udev_config_init();
 #endif
+	dbg("version %s", UDEV_VERSION);
 
-	subsystem = argv[1];
-	if (subsystem == NULL) {
-		dbg("no subsystem");
+	sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
+	if (sock < 0) {
+		err("error getting socket: %s", strerror(errno));
+		retval = 1;
 		goto exit;
 	}
 
-	devpath = get_devpath();
-	if (devpath == NULL) {
-		dbg("no devpath");
-		goto exit;
-	}
+	memset(&saddr, 0x00, sizeof(struct sockaddr_un));
+	saddr.sun_family = AF_LOCAL;
+	/* use abstract namespace for socket path */
+	strcpy(&saddr.sun_path[1], UDEVD_SOCK_PATH);
+	addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
+
+	memset(&usend_msg, 0x00, sizeof(struct udevd_msg));
+	strcpy(usend_msg.magic, UDEV_MAGIC);
+	usend_msg.type = UDEVD_UEVENT_UDEVSEND;
+
+	/* copy all keys to send buffer */
+	for (i = 0; envp[i]; i++) {
+		const char *key;
+		int keylen;
+
+		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;
+		}
 
-	action = get_action();
-	if (action == NULL) {
-		dbg("no action");
-		goto exit;
-	}
+		/* prevent loops in the scripts we execute */
+		if (strncmp(key, "UDEVD_EVENT=", 12) == 0) {
+			err("event loop, already passed through the daemon, exit");
+			retval = 2;
+			goto exit;
+		}
 
-	seqnum = get_seqnum();
-	if (seqnum == NULL)
-		seq = 0;
-	else
-		seq = atoi(seqnum);
+		if (bufpos + keylen >= UEVENT_BUFFER_SIZE-1) {
+			err("environment buffer too small, probably not called by the kernel");
+			continue;
+		}
 
-	sock = socket(AF_LOCAL, SOCK_STREAM, 0);
-	if (sock == -1) {
-		dbg("error getting socket");
-		goto exit;
-	}
+		/* remember the SUBSYSTEM */
+		if (strncmp(key, "SUBSYSTEM=", 10) == 0)
+			subsystem = &key[10];
 
-	memset(&saddr, 0x00, sizeof(saddr));
-	saddr.sun_family = AF_LOCAL;
-	strcpy(saddr.sun_path, UDEVD_SOCK);
-
-	/* try to connect, if it fails start daemon */
-	retval = connect(sock, (struct sockaddr *) &saddr, sizeof(saddr));
-	if (retval != -1) {
-		goto send;
-	} else {
-		dbg("connect failed, try starting daemon...");
-		retval = start_daemon();
-		if (retval == 0) {
-			dbg("daemon started");
-		} else {
-			dbg("error starting daemon");
-			goto exit;
-		}
+		dbg("add '%s' to env[%i] buffer", key, i);
+		strcpy(&usend_msg.envbuf[bufpos], key);
+		bufpos += keylen + 1;
 	}
 
-	/* try to connect while daemon to starts */
-	tspec.tv_sec = 0;
-	tspec.tv_nsec = 100000000;  /* 100 millisec */
-	loop = UDEVSEND_CONNECT_RETRY;
-	while (loop--) {
-		retval = connect(sock, (struct sockaddr *) &saddr, sizeof(saddr));
-		if (retval != -1)
-			goto send;
-		else
-			dbg("retry to connect %d",
-			    UDEVSEND_CONNECT_RETRY - loop);
-		nanosleep(&tspec, NULL);
-	}
-	dbg("error connecting to daemon, start daemon failed");
-	goto exit;
-
-send:
-	size = build_hotplugmsg(&message, action, devpath, subsystem, seq);
-	retval = send(sock, &message, size, 0);
-	if (retval == -1) {
-		dbg("error sending message");
-		close (sock);
-		goto exit;
+	usend_msg_len = offsetof(struct udevd_msg, envbuf) + bufpos;
+	dbg("usend_msg_len=%i", usend_msg_len);
+
+	if (sendto(sock, &usend_msg, usend_msg_len, 0, (struct sockaddr *)&saddr, addrlen) < 0) {
+		retval = 3;
+		err("error sending message: %s", strerror(errno));
 	}
-	close (sock);
-	return 0;
 
 exit:
-	return 1;
+	if (sock != -1)
+		close(sock);
+
+	logging_close();
+	return retval;
 }