X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevsend.c;h=d0cfc2af53894b309c530325e2b5d78e4f017519;hp=08212dfee62552cfb8c6bb3edc825c75a707e0b9;hb=f4fc0136523afdc3ace865312f816c53694a6b87;hpb=c472e3c89b9aaad90ad6398c0d2ff5dcf5a9d238 diff --git a/udevsend.c b/udevsend.c index 08212dfee..d0cfc2af5 100644 --- a/udevsend.c +++ b/udevsend.c @@ -1,12 +1,9 @@ /* * udevsend.c * - * Userspace devfs - * * Copyright (C) 2004 Ling, Xiaofeng * Copyright (C) 2004 Kay Sievers * - * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the * Free Software Foundation version 2 of the License. @@ -22,17 +19,17 @@ * */ -#include -#include -#include -#include -#include #include #include #include -#include #include +#include #include +#include +#include +#include +#include +#include #include #include "udev.h" @@ -40,58 +37,29 @@ #include "udevd.h" #include "logging.h" -#ifdef LOG -unsigned char logname[42]; -void log_message (int level, const char *format, ...) +/* global variables */ +static int sock = -1; + +#ifdef USE_LOG +void log_message (int priority, const char *format, ...) { - va_list args; + va_list args; + + if (priority > udev_log_priority) + return; va_start(args, format); - vsyslog(level, format, args); + vsyslog(priority, format, args); va_end(args); } #endif -static inline char *get_action(void) -{ - char *action; - - action = getenv("ACTION"); - return action; -} - -static inline char *get_devpath(void) -{ - char *devpath; - - 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; - strfieldcpy(msg->action, action); - strfieldcpy(msg->devpath, devpath); - strfieldcpy(msg->subsystem, subsystem); - return sizeof(struct hotplug_msg); -} - static int start_daemon(void) { pid_t pid; pid_t child_pid; + char *const argv[] = { "udevd", NULL }; + char *const envp[] = { NULL }; pid = fork(); switch (pid) { @@ -100,126 +68,132 @@ static int start_daemon(void) child_pid = fork(); switch (child_pid) { case 0: - /* daemon */ - setsid(); - chdir("/"); - execl(UDEVD_BIN, "udevd", NULL); - dbg("exec of daemon failed"); - exit(1); + /* daemon with empty environment */ + close(sock); + execve(UDEVD_BIN, argv, envp); + err("exec of daemon failed: %s", strerror(errno)); + _exit(1); case -1: - dbg("fork of daemon failed"); + err("fork of daemon failed: %s", strerror(errno)); return -1; default: exit(0); } break; case -1: - dbg("fork of helper failed"); + err("fork of helper failed: %s", strerror(errno)); return -1; default: - wait(NULL); + waitpid(pid, NULL, 0); } return 0; } -int main(int argc, char* argv[]) +int main(int argc, char *argv[], char *envp[]) { - struct hotplug_msg msg; - char *action; - char *devpath; - char *subsystem; - char *seqnum; - int seq; - int retval = 1; - int size; + static struct udevd_msg usend_msg; + int usend_msg_len; + int i; int loop; - struct timespec tspec; - int sock; struct sockaddr_un saddr; socklen_t addrlen; + int bufpos = 0; + int retval = 1; int started_daemon = 0; + const char *subsystem = NULL; -#ifdef DEBUG - init_logging("udevsend"); + logging_init("udevsend"); +#ifdef USE_LOG + udev_init_config(); #endif dbg("version %s", UDEV_VERSION); - 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; - else - seq = atoi(seqnum); - dbg("SEQNUM = '%d'", seq); - sock = socket(AF_LOCAL, SOCK_DGRAM, 0); if (sock == -1) { - dbg("error getting socket"); + err("error getting socket: %s", strerror(errno)); goto exit; } - memset(&saddr, 0x00, sizeof(saddr)); + 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(&msg, action, devpath, subsystem, seq); + memset(&usend_msg, 0x00, sizeof(struct udevd_msg)); + strcpy(usend_msg.magic, UDEV_MAGIC); + usend_msg.type = UDEVD_UEVENT_UDEVSEND; + + /* copy all keys to send buffer */ + for (i = 0; envp[i]; i++) { + const char *key; + int keylen; + + key = envp[i]; + keylen = strlen(key); + + /* prevent loops in the scripts we execute */ + if (strncmp(key, "UDEVD_EVENT=", 12) == 0) { + dbg("seems that the event source is not the kernel, just exit"); + goto exit; + } + + if (bufpos + keylen >= UEVENT_BUFFER_SIZE-1) { + err("environment buffer too small, probably not called by the kernel"); + continue; + } + + /* remember the SUBSYSTEM */ + if (strncmp(key, "SUBSYSTEM=", 10) == 0) + subsystem = &key[10]; + + dbg("add '%s' to env[%i] buffer", key, i); + strcpy(&usend_msg.envbuf[bufpos], key); + bufpos += keylen + 1; + } + /* older kernels passed the SUBSYSTEM only as the first argument */ + if (!subsystem && argc == 2) { + bufpos += sprintf(&usend_msg.envbuf[bufpos], "SUBSYSTEM=%s", argv[1]) + 1; + dbg("add 'SUBSYSTEM=%s' to env[%i] buffer from argv", argv[1], i); + } + + usend_msg_len = offsetof(struct udevd_msg, envbuf) + bufpos; + dbg("usend_msg_len=%i", usend_msg_len); /* If we can't send, try to start daemon and resend message */ - loop = UDEVSEND_CONNECT_RETRY; - while (loop--) { - retval = sendto(sock, &msg, size, 0, (struct sockaddr *)&saddr, addrlen); + loop = UDEVSEND_WAIT_MAX_SECONDS * UDEVSEND_WAIT_LOOP_PER_SECOND; + while (--loop) { + retval = sendto(sock, &usend_msg, usend_msg_len, 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; + err("error sending message: %s", strerror(errno)); + goto exit; } - + if (!started_daemon) { - dbg("connect failed, try starting daemon..."); + info("try to start udevd daemon"); retval = start_daemon(); if (retval) { dbg("error starting daemon"); goto exit; } - - dbg("daemon started"); + dbg("udevd 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", UDEVSEND_WAIT_MAX_SECONDS * UDEVSEND_WAIT_LOOP_PER_SECOND - loop); + usleep(1000 * 1000 / UDEVSEND_WAIT_LOOP_PER_SECOND); } } - -close_and_exit: - close(sock); + exit: + if (sock != -1) + close(sock); + + logging_close(); + return retval; }