X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevsend.c;h=17372d8d9a0ec28568f036ea82be120c93203166;hp=1a897451c0beda11cbb1c8bf20d7047d3f295317;hb=51a8bb2f361d86013e7579570faba446eed9c66d;hpb=7b15897b464e246c7342b9bf2098fd5d91b64cca

diff --git a/udevsend.c b/udevsend.c
index 1a897451c..17372d8d9 100644
--- a/udevsend.c
+++ b/udevsend.c
@@ -23,17 +23,30 @@
  */
 
 #include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/msg.h>
+#include <sys/socket.h>
+#include <sys/wait.h>
+#include <sys/un.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <string.h>
+#include <unistd.h>
+#include <time.h>
+#include <linux/stddef.h>
 
 #include "udev.h"
+#include "udev_version.h"
 #include "udevd.h"
 #include "logging.h"
 
+unsigned char logname[42];
+
+int log_ok(void)
+{
+	return 1;
+}
+
 static inline char *get_action(void)
 {
 	char *action;
@@ -58,39 +71,72 @@ static inline char *get_seqnum(void)
 	return seqnum;
 }
 
-static int build_hotplugmsg(struct hotplug_msg **ppmsg, char *action,
+static int build_hotplugmsg(struct hotplug_msg *msg, char *action,
 			    char *devpath, char *subsystem, int seqnum)
 {
-	struct hotplug_msg *pmsg;
-
-	pmsg = malloc(sizeof(struct hotplug_msg));
-	pmsg->mtype = HOTPLUGMSGTYPE;
-	pmsg->seqnum = seqnum;
-	strncpy(pmsg->action, action, 8);
-	strncpy(pmsg->devpath, devpath, 128);
-	strncpy(pmsg->subsystem, subsystem, 16);
-	*ppmsg = pmsg;
+	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);
 }
 
-static void free_hotplugmsg(struct hotplug_msg *pmsg)
+static int start_daemon(void)
 {
-	free(pmsg);
+	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;
 }
 
 int main(int argc, char* argv[])
 {
-	int msgid;
-	key_t key;
-	struct msqid_ds  msg_queue;
-	struct msgbuf *pmsg;
+	struct hotplug_msg message;
 	char *action;
 	char *devpath;
 	char *subsystem;
 	char *seqnum;
 	int seq;
-	int retval = -EINVAL;
+	int retval = 1;
 	int size;
+	int loop;
+	struct timespec tspec;
+	int sock;
+	struct sockaddr_un saddr;
+	socklen_t addrlen;
+	int started_daemon = 0;
+
+#ifdef DEBUG
+	init_logging("udevsend");
+#endif
 
 	subsystem = argv[1];
 	if (subsystem == NULL) {
@@ -111,40 +157,59 @@ int main(int argc, char* argv[])
 	}
 
 	seqnum = get_seqnum();
-	if (seqnum == NULL) {
-		dbg("no seqnum");
+	if (seqnum == NULL)
+		seq = -1;
+	else
+		seq = atoi(seqnum);
+
+	sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
+	if (sock == -1) {
+		dbg("error getting socket");
 		goto exit;
 	}
-	seq = atoi(seqnum);
 
-	key = ftok(DEFAULT_EXEC_PROGRAM, IPC_KEY_ID);
-	size =  build_hotplugmsg( (struct hotplug_msg**) &pmsg, action, devpath, subsystem, seq);
-	msgid = msgget(key, IPC_CREAT);
-	if (msgid == -1) {
-		dbg("open ipc queue error");
-		goto exit;
+	memset(&saddr, 0x00, sizeof(saddr));
+	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;
+
+	size = build_hotplugmsg(&message, action, devpath, subsystem, seq);
+	
+	/* If we can't send, try to start daemon and resend message */
+	loop = UDEVSEND_CONNECT_RETRY;
+	while (loop--) {
+		retval = sendto(sock, &message, size, 0, (struct sockaddr*)&saddr, addrlen);
+		if (retval != -1) {
+			retval = 0;
+			goto close_and_exit;
+		}
+		
+		if (errno != ECONNREFUSED) {
+			dbg("error sending message");
+			goto close_and_exit;
+		}
+		
+		if (!started_daemon) {
+			dbg("connect failed, try starting daemon...");
+			retval = start_daemon();
+			if (retval) {
+				dbg("error starting daemon");
+				goto exit;
+			}
+			
+			dbg("daemon started");
+			started_daemon = 1;
+		} else {
+			dbg("retry to connect %d", UDEVSEND_CONNECT_RETRY - loop);
+			tspec.tv_sec = 0;
+			tspec.tv_nsec = 100000000;  /* 100 millisec */
+			nanosleep(&tspec, NULL);
+		}
 	}
-
-	/* get state of queue */
-	retval = msgctl(msgid, IPC_STAT, &msg_queue);
-	if (retval == -1) {
-		dbg("error getting info on ipc queue");
-		goto exit;
-	}
-	if (msg_queue.msg_qnum > 0)
-		dbg("%li messages already in the ipc queue", msg_queue.msg_qnum);
-
-	retval = msgsnd(msgid, pmsg, size, 0);
-	free_hotplugmsg( (struct hotplug_msg*) pmsg);
-	if (retval == -1) {
-		dbg("send ipc message error");
-		goto exit;
-	}
-	return 0;
-
+	
+close_and_exit:
+	close(sock);
 exit:
-	if (retval > 0)
-		retval = 0;
-
 	return retval;
 }