X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevsend.c;h=5fe0f456a1d7e4dc65e8c3e2c989fc5aebaf93ed;hp=f92ee2b5d8286aa539c575355ee76368b2d43ee6;hb=e750d24b0552f4fb11672ab5bdf72f536a047446;hpb=35b7d88c0dab4c1104c127ddd644db22307949c9 diff --git a/udevsend.c b/udevsend.c index f92ee2b5d..5fe0f456a 100644 --- a/udevsend.c +++ b/udevsend.c @@ -23,61 +23,43 @@ */ #include -#include -#include +#include +#include +#include +#include #include #include #include +#include #include #include -#include -#include +#include #include "udev.h" #include "udev_version.h" #include "udevd.h" #include "logging.h" -static inline char *get_action(void) -{ - char *action; - - action = getenv("ACTION"); - return action; -} +/* global variables */ +static int sock = -1; -static inline char *get_devpath(void) +#ifdef LOG +void log_message (int level, const char *format, ...) { - char *devpath; - - devpath = getenv("DEVPATH"); - return devpath; -} - -static inline char *get_seqnum(void) -{ - char *seqnum; - - seqnum = getenv("SEQNUM"); - return seqnum; -} + va_list args; -static int build_hotplugmsg(struct hotplug_msg *msg, char *action, - char *devpath, char *subsystem, int seqnum) -{ - memset(msg, 0x00, sizeof(*msg)); - msg->mtype = HOTPLUGMSGTYPE; - 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) { pid_t pid; pid_t child_pid; + char *const argv[] = { "udevd", NULL }; + char *const envp[] = { NULL }; pid = fork(); switch (pid) { @@ -86,12 +68,11 @@ static int start_daemon(void) child_pid = fork(); switch (child_pid) { case 0: - /* daemon */ - setsid(); - chdir("/"); - execl(UDEVD_BIN, "udevd", NULL); + /* daemon with empty environment */ + close(sock); + execve(UDEVD_BIN, argv, envp); dbg("exec of daemon failed"); - exit(1); + _exit(1); case -1: dbg("fork of daemon failed"); return -1; @@ -103,88 +84,137 @@ static int start_daemon(void) dbg("fork of helper failed"); return -1; default: - wait(NULL); + waitpid(pid, NULL, 0); } return 0; } - -int main(int argc, char* argv[]) +static void run_udev(const char *subsystem) { - int msgid; - key_t key; - struct msqid_ds msg_queue; - struct hotplug_msg message; - char *action; - char *devpath; - char *subsystem; - char *seqnum; - int seq; - int retval = -EINVAL; - int size; - int loop; - struct timespec tspec; + char *const argv[] = { "udev", (char *)subsystem, NULL }; + pid_t pid; - subsystem = argv[1]; - if (subsystem == NULL) { - dbg("no subsystem"); - goto exit; + pid = fork(); + switch (pid) { + case 0: + /* child */ + execv(UDEV_BIN, argv); + dbg("exec of child failed"); + _exit(1); + break; + case -1: + dbg("fork of child failed"); + break; + default: + waitpid(pid, NULL, 0); } +} - devpath = get_devpath(); - if (devpath == NULL) { - dbg("no devpath"); - goto exit; +int main(int argc, char *argv[], char *envp[]) +{ + static struct udevsend_msg usend_msg; + int usend_msg_len; + int i; + int loop; + struct sockaddr_un saddr; + socklen_t addrlen; + int bufpos = 0; + int retval = 1; + int started_daemon = 0; + const char *subsystem = NULL; + + logging_init("udevsend"); + dbg("version %s", UDEV_VERSION); + + sock = socket(AF_LOCAL, SOCK_DGRAM, 0); + if (sock == -1) { + dbg("error getting socket"); + goto fallback; } - action = get_action(); - if (action == NULL) { - dbg("no action"); - goto exit; - } + 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; + + memset(&usend_msg, 0x00, sizeof(struct udevsend_msg)); + strcpy(usend_msg.magic, UDEV_MAGIC); + + /* copy all keys to send buffer */ + for (i = 0; envp[i]; i++) { + const char *key; + int keylen; - seqnum = get_seqnum(); - if (seqnum == NULL) { - dbg("no seqnum"); - goto exit; + 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 >= HOTPLUG_BUFFER_SIZE-1) { + dbg("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; } - seq = atoi(seqnum); - - /* create ipc message queue or get id of our existing one */ - key = ftok(UDEVD_BIN, IPC_KEY_ID); - dbg("using ipc queue 0x%0x", key); - size = build_hotplugmsg(&message, action, devpath, subsystem, seq); - msgid = msgget(key, IPC_CREAT); - if (msgid == -1) { - dbg("error open ipc queue"); - goto exit; + /* 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); } - /* send ipc message to the daemon */ - retval = msgsnd(msgid, &message, size, 0); - if (retval == -1) { - dbg("error sending ipc message"); - goto exit; - } + usend_msg_len = offsetof(struct udevsend_msg, envbuf) + bufpos; + dbg("usend_msg_len=%i", usend_msg_len); - /* get state of ipc queue */ - tspec.tv_sec = 0; - tspec.tv_nsec = 10000000; /* 10 millisec */ - loop = UDEVSEND_RETRY_COUNT; - while (loop--) { - retval = msgctl(msgid, IPC_STAT, &msg_queue); - if (retval == -1) { - dbg("error getting info on ipc queue"); + /* If we can't send, try to start daemon and resend message */ + loop = SEND_WAIT_MAX_SECONDS * SEND_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 exit; } - if (msg_queue.msg_qnum == 0) - goto exit; - nanosleep(&tspec, NULL); + + if (errno != ECONNREFUSED) { + dbg("error sending message (%s)", strerror(errno)); + goto fallback; + } + + if (!started_daemon) { + dbg("try to start udevd daemon"); + retval = start_daemon(); + if (retval) { + dbg("error starting daemon"); + goto fallback; + } + dbg("udevd daemon started"); + started_daemon = 1; + } else { + dbg("retry to connect %d", SEND_WAIT_MAX_SECONDS * SEND_WAIT_LOOP_PER_SECOND - loop); + usleep(1000 * 1000 / SEND_WAIT_LOOP_PER_SECOND); + } } - info("message is still in the ipc queue, starting daemon..."); - retval = start_daemon(); +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; }