X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevsend.c;h=6af9df77040a386c39a93ddf1245235efd517eda;hp=bdc8293df7a2d495d63071469b605240942fdd82;hb=95a6f4c8acafe7031087667aa556a50a6a091c93;hpb=71c077fb0a9f7222f5363ebc1c67d48d7a2f5ff8;ds=sidebyside

diff --git a/udevsend.c b/udevsend.c
index bdc8293df..6af9df770 100644
--- a/udevsend.c
+++ b/udevsend.c
@@ -32,11 +32,16 @@
 #include <unistd.h>
 #include <time.h>
 #include <wait.h>
+#include <sys/socket.h>
+#include <sys/un.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;
@@ -64,7 +69,8 @@ static inline char *get_seqnum(void)
 static int build_hotplugmsg(struct hotplug_msg *msg, char *action,
 			    char *devpath, char *subsystem, int seqnum)
 {
-	msg->mtype = HOTPLUGMSGTYPE;
+	memset(msg, 0x00, sizeof(*msg));
+	strfieldcpy(msg->magic, UDEV_MAGIC);
 	msg->seqnum = seqnum;
 	strncpy(msg->action, action, 8);
 	strncpy(msg->devpath, devpath, 128);
@@ -85,7 +91,9 @@ static int start_daemon(void)
 		switch (child_pid) {
 		case 0:
 			/* daemon */
-			execl(DEFAULT_UDEVD_EXEC, NULL);
+			setsid();
+			chdir("/");
+			execl(UDEVD_BIN, "udevd", NULL);
 			dbg("exec of daemon failed");
 			exit(1);
 		case -1:
@@ -99,17 +107,13 @@ static int start_daemon(void)
 		dbg("fork of helper failed");
 		return -1;
 	default:
-		wait(0);
+		wait(NULL);
 	}
 	return 0;
 }
 
-
 int main(int argc, char* argv[])
 {
-	int msgid;
-	key_t key;
-	struct msqid_ds msg_queue;
 	struct hotplug_msg message;
 	char *action;
 	char *devpath;
@@ -120,6 +124,10 @@ int main(int argc, char* argv[])
 	int size;
 	int loop;
 	struct timespec tspec;
+	int sock;
+	struct sockaddr_un saddr;
+
+	init_logging("udevsend");
 
 	subsystem = argv[1];
 	if (subsystem == NULL) {
@@ -146,40 +154,58 @@ int main(int argc, char* argv[])
 	}
 	seq = atoi(seqnum);
 
-	/* create ipc message queue or get id of our existing one */
-	key = ftok(DEFAULT_UDEVD_EXEC, IPC_KEY_ID);
-	size =  build_hotplugmsg(&message, action, devpath, subsystem, seq);
-	msgid = msgget(key, IPC_CREAT);
-	if (msgid == -1) {
-		dbg("error open ipc queue");
+	sock = socket(AF_LOCAL, SOCK_STREAM, 0);
+	if (sock == -1) {
+		dbg("error getting socket");
 		goto exit;
 	}
 
-	/* send ipc message to the daemon */
-	retval = msgsnd(msgid, &message, size, 0);
-	if (retval == -1) {
-		dbg("error sending ipc message");
-		goto exit;
+	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, &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;
+		}
 	}
 
-	/* get state of ipc queue */
+	/* try to connect while daemon to starts */
 	tspec.tv_sec = 0;
-	tspec.tv_nsec = 10000000;  /* 10 millisec */
-	loop = 20;
+	tspec.tv_nsec = 100000000;  /* 100 millisec */
+	loop = UDEVSEND_CONNECT_RETRY;
 	while (loop--) {
-		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)
-			goto exit;
+		retval = connect(sock, &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;
 
-	info("message is still in the ipc queue, starting daemon...");
-	retval = start_daemon();
+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;
+	}
+	close (sock);
+	return 0;
 
 exit:
-	return retval;
+	return 1;
 }