X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevsend.c;h=9f324077b3b92ee6d3e67f53363ff28566193099;hp=3f3bbacbc2eb89712ca41d834943372c279a1ddd;hb=13f24d596c5638443ffc7bc48c10a66758335c74;hpb=a695feaeff0551745e1a397be2daa61b8cd0cc42 diff --git a/udevsend.c b/udevsend.c index 3f3bbacbc..9f324077b 100644 --- a/udevsend.c +++ b/udevsend.c @@ -23,55 +23,38 @@ */ #include -#include -#include +#include +#include +#include +#include #include #include #include +#include #include #include -#include -#include +#include #include "udev.h" +#include "udev_lib.h" +#include "udev_version.h" #include "udevd.h" #include "logging.h" -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; -} +/* global variables */ +static int sock = -1; -static inline char *get_seqnum(void) +#ifdef LOG +unsigned char logname[LOGNAME_SIZE]; +void log_message (int level, const char *format, ...) { - char *seqnum; + va_list args; - 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)); - 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) { @@ -86,10 +69,10 @@ static int start_daemon(void) switch (child_pid) { case 0: /* daemon */ - setsid(); - execl(UDEVD_EXEC, "udevd", NULL); + close(sock); + execl(UDEVD_BIN, "udevd", NULL); dbg("exec of daemon failed"); - exit(1); + _exit(1); case -1: dbg("fork of daemon failed"); return -1; @@ -101,87 +84,136 @@ static int start_daemon(void) dbg("fork of helper failed"); return -1; default: - wait(NULL); + waitpid(pid, NULL, 0); } return 0; } +static void run_udev(const char *subsystem) +{ + pid_t pid; -int main(int argc, char* argv[]) + pid = fork(); + switch (pid) { + case 0: + /* child */ + execl(UDEV_BIN, "udev", subsystem, NULL); + dbg("exec of child failed"); + _exit(1); + break; + case -1: + dbg("fork of child failed"); + break; + default: + waitpid(pid, NULL, 0); + } +} + +int main(int argc, char *argv[], char *envp[]) { - 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; + static struct udevsend_msg usend_msg; + int usend_msg_len; + int i; int loop; - struct timespec tspec; - - subsystem = argv[1]; - if (subsystem == NULL) { + struct sockaddr_un saddr; + socklen_t addrlen; + const char *subsystem_argv; + int subsystem_env = 0; + int bufpos = 0; + int retval = 1; + int started_daemon = 0; + + logging_init("udevsend"); + dbg("version %s", UDEV_VERSION); + + subsystem_argv = argv[1]; + if (subsystem_argv == NULL) { dbg("no subsystem"); goto exit; } - devpath = get_devpath(); - if (devpath == NULL) { - dbg("no devpath"); - goto exit; + 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; - seqnum = get_seqnum(); - if (seqnum == NULL) { - dbg("no seqnum"); - goto exit; + 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; + + key = envp[i]; + keylen = strlen(key); + if (bufpos + keylen >= HOTPLUG_BUFFER_SIZE-1) { + dbg("environment buffer too small, probably not called by the kernel"); + continue; + } + + /* older kernels do not have the SUBSYSTEM in the environment */ + if (strncmp(key, "SUBSYSTEM=", 10) == 0) + subsystem_env = 1; + + 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_EXEC, IPC_KEY_ID); - size = build_hotplugmsg(&message, action, devpath, subsystem, seq); - msgid = msgget(key, IPC_CREAT); - if (msgid == -1) { - dbg("error open ipc queue"); - goto exit; + if (!subsystem_env) { + bufpos += sprintf(&usend_msg.envbuf[bufpos], "SUBSYSTEM=%s", subsystem_argv) + 1; + dbg("add 'SUBSYSTEM=%s' to env[%i] buffer from argv", subsystem_argv, 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 = 30; - 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) { + info("error starting daemon"); + goto fallback; + } + info("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_argv); exit: + if (sock != -1) + close(sock); + + logging_close(); + return retval; }