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

diff --git a/udevsend.c b/udevsend.c
index 0ddc6839d..17372d8d9 100644
--- a/udevsend.c
+++ b/udevsend.c
@@ -23,23 +23,29 @@
  */
 
 #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 <wait.h>
-#include <sys/socket.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];
+
+int log_ok(void)
+{
+	return 1;
+}
 
 static inline char *get_action(void)
 {
@@ -119,12 +125,18 @@ int main(int argc, char* argv[])
 	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) {
@@ -145,13 +157,12 @@ int main(int argc, char* argv[])
 	}
 
 	seqnum = get_seqnum();
-	if (seqnum == NULL) {
-		dbg("no seqnum");
-		goto exit;
-	}
-	seq = atoi(seqnum);
+	if (seqnum == NULL)
+		seq = -1;
+	else
+		seq = atoi(seqnum);
 
-	sock = socket(AF_LOCAL, SOCK_STREAM, 0);
+	sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
 	if (sock == -1) {
 		dbg("error getting socket");
 		goto exit;
@@ -159,50 +170,46 @@ int main(int argc, char* argv[])
 
 	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;
-		}
-	}
+	/* 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;
 
-	/* try to connect while daemon to starts */
-	tspec.tv_sec = 0;
-	tspec.tv_nsec = 100000000;  /* 100 millisec */
+	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 = 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;
-
-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;
+		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);
+		}
 	}
-	close (sock);
-	return 0;
-
+	
+close_and_exit:
+	close(sock);
 exit:
-	return 1;
+	return retval;
 }