chiark / gitweb /
[PATCH] cleanup udevd/udevstart
[elogind.git] / udevsend.c
index a24e7d75ed47baedf863ad893225a7c69f7bc036..84c46bc0c286b3c117123d77c4ba27a6c702482c 100644 (file)
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <sys/un.h>
+#include <time.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_lib.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)
+#ifdef LOG
+unsigned char logname[LOGNAME_SIZE];
+void log_message (int level, const char *format, ...)
 {
-       char *action;
-
-       action = getenv("ACTION");
-       return action;
-}
-
-static inline char *get_devpath(void)
-{
-       char *devpath;
+       va_list args;
 
-       devpath = getenv("DEVPATH");
-       return devpath;
-}
-
-static inline char *get_seqnum(void)
-{
-       char *seqnum;
-
-       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);
+       va_start(args, format);
+       vsyslog(level, format, args);
+       va_end(args);
 }
+#endif
 
 static int start_daemon(void)
 {
@@ -117,99 +87,132 @@ static int start_daemon(void)
        return 0;
 }
 
+static void run_udev(const char *subsystem)
+{
+       pid_t pid;
+
+       pid = fork();
+       switch (pid) {
+       case 0:
+               /* child */
+               execl(UDEV_BIN, UDEV_BIN, subsystem, NULL);
+               dbg("exec of child failed");
+               _exit(1);
+               break;
+       case -1:
+               dbg("fork of child failed");
+               break;
+       default:
+               wait(NULL);
+       }
+}
+
 int main(int argc, char* argv[])
 {
-       struct hotplug_msg message;
+       struct hotplug_msg msg;
        char *action;
        char *devpath;
        char *subsystem;
        char *seqnum;
-       int seq;
+       unsigned long long seq;
        int retval = 1;
-       int size;
        int loop;
-       struct timespec tspec;
-       int sock;
+       int sock = -1;
        struct sockaddr_un saddr;
        socklen_t addrlen;
        int started_daemon = 0;
 
-#ifdef DEBUG
-       init_logging("udevsend");
-#endif
+       logging_init("udevsend");
+       dbg("version %s", UDEV_VERSION);
 
-       subsystem = argv[1];
+       subsystem = get_subsystem(argv[1]);
        if (subsystem == NULL) {
                dbg("no subsystem");
                goto exit;
        }
+       dbg("subsystem = '%s'", subsystem);
 
        devpath = get_devpath();
        if (devpath == NULL) {
                dbg("no devpath");
                goto exit;
        }
+       dbg("DEVPATH = '%s'", devpath);
 
        action = get_action();
        if (action == NULL) {
                dbg("no action");
                goto exit;
        }
+       dbg("ACTION = '%s'", action);
 
        seqnum = get_seqnum();
        if (seqnum == NULL)
-               seq = -1;
+               seq = 0;
        else
-               seq = atoi(seqnum);
+               seq = strtoull(seqnum, NULL, 10);
+       dbg("SEQNUM = '%llu'", seq);
 
        sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
        if (sock == -1) {
                dbg("error getting socket");
-               goto exit;
+               goto fallback;
        }
 
-       memset(&saddr, 0x00, sizeof(saddr));
+       set_cloexec_flag(sock, 1);
+
+       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;
 
-       size = build_hotplugmsg(&message, action, devpath, subsystem, seq);
-       
+       memset(&msg, 0x00, sizeof(struct hotplug_msg));
+       strcpy(msg.magic, UDEV_MAGIC);
+       msg.seqnum = seq;
+       strfieldcpy(msg.action, action);
+       strfieldcpy(msg.devpath, devpath);
+       strfieldcpy(msg.subsystem, subsystem);
+
        /* 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);
+       loop = SEND_WAIT_MAX_SECONDS * SEND_WAIT_LOOP_PER_SECOND;
+       while (--loop) {
+               retval = sendto(sock, &msg, sizeof(struct hotplug_msg), 0,
+                               (struct sockaddr *)&saddr, addrlen);
                if (retval != -1) {
                        retval = 0;
-                       goto close_and_exit;
+                       goto exit;
                }
-               
+
                if (errno != ECONNREFUSED) {
                        dbg("error sending message");
-                       goto close_and_exit;
+                       goto fallback;
                }
-               
+
                if (!started_daemon) {
-                       dbg("connect failed, try starting daemon...");
+                       info("starting udevd daemon");
                        retval = start_daemon();
                        if (retval) {
-                               dbg("error starting daemon");
-                               goto exit;
+                               info("error starting daemon");
+                               goto fallback;
                        }
-                       
                        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);
+                       dbg("retry to connect %d", SEND_WAIT_MAX_SECONDS * SEND_WAIT_LOOP_PER_SECOND - loop);
+                       usleep(1000 * 1000 / SEND_WAIT_LOOP_PER_SECOND);
                }
        }
-       
-close_and_exit:
-       close(sock);
+
+fallback:
+       info("unable to connect to event daemon, try to call udev directly");
+       run_udev(subsystem);
+
 exit:
+       if (sock != -1)
+               close(sock);
+
+       logging_close();
+
        return retval;
 }