[PATCH] fix up 'make release' to use bk to build the export tree.

[elogind.git] / udevsend.c

diff --git a/udevsend.c b/udevsend.c
index d3c74dd46a4e9f5b9248759b2a711888585e2222..b26c7444224ae6330faaa73e488c76906456b613 100644 (file)
--- a/udevsend.c
+++ b/udevsend.c
@@ -29,9 +29,11 @@
 #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"
@@ -40,6 +42,11 @@
 
 unsigned char logname[42];
 
+int log_ok(void)
+{
+       return 1;
+}
+
 static inline char *get_action(void)
 {
        char *action;
@@ -112,18 +119,27 @@ static int start_daemon(void)
 
 int main(int argc, char* argv[])
 {
-       struct hotplug_msg message;
+       struct hotplug_msg msg;
        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;
+       struct iovec iov;
+       struct msghdr smsg;
+       char cred_msg[CMSG_SPACE(sizeof(struct ucred))];
+       struct cmsghdr *cmsg;
+       struct ucred *cred;
+       
+
 
 #ifdef DEBUG
        init_logging("udevsend");
@@ -148,13 +164,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;
@@ -162,50 +177,68 @@ 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, (struct sockaddr *) &saddr, sizeof(saddr));
-       if (retval != -1) {
-               goto send;
-       } else {
-               dbg("connect failed, try starting daemon...");
-               retval = start_daemon();
-               if (retval == 0) {
+       /* 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(&msg, action, devpath, subsystem, seq);
+
+       /* prepare message with credentials to authenticate ourself */
+       iov.iov_base = &msg;
+       iov.iov_len = size;
+
+       smsg.msg_name = &saddr;
+       smsg.msg_namelen = addrlen;
+       smsg.msg_iov = &iov;
+       smsg.msg_iovlen = 1;
+       smsg.msg_control = cred_msg;
+       smsg.msg_controllen = CMSG_LEN(sizeof(struct ucred));;
+       smsg.msg_flags = 0;
+
+       cmsg = CMSG_FIRSTHDR(&smsg);
+       cmsg->cmsg_level = SOL_SOCKET;
+       cmsg->cmsg_type = SCM_CREDENTIALS;
+       cmsg->cmsg_len = sizeof(cred_msg);
+       cred = (struct ucred *) CMSG_DATA(cmsg);
+       cred->uid = getuid();
+       cred->gid = getgid();
+       cred->pid = getpid();
+       cred->pid = getpid();
+
+       /* If we can't send, try to start daemon and resend message */
+       loop = UDEVSEND_CONNECT_RETRY;
+       while (loop--) {
+               retval = sendmsg(sock, &smsg, 0);
+               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("error starting daemon");
-                       goto exit;
+                       dbg("retry to connect %d", UDEVSEND_CONNECT_RETRY - loop);
+                       tspec.tv_sec = 0;
+                       tspec.tv_nsec = 100000000;  /* 100 millisec */
+                       nanosleep(&tspec, NULL);
                }
        }
-
-       /* 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;
-       }
-       close (sock);
-       return 0;
-
+       
+close_and_exit:
+       close(sock);
 exit:
-       return 1;
+       return retval;
 }