X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevsend.c;h=1b9860baca5ecfbf6537958a4a0edc27265a4722;hp=f1c46d33672e918bb548c798a84265e65b51390a;hb=a6aa9d70a470e02ccaf68bdb1929a2b7a3c5d030;hpb=c81b35c08bbd7789883993ea280e0d3772cce440 diff --git a/udevsend.c b/udevsend.c index f1c46d336..1b9860bac 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,181 +19,121 @@ * */ -#include -#include -#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" -#ifdef LOG -unsigned char logname[LOGNAME_SIZE]; -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 int build_hotplugmsg(struct hotplug_msg *msg, char *action, - char *devpath, char *subsystem, int seqnum) +int main(int argc, char *argv[], char *envp[]) { - 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; - - pid = fork(); - switch (pid) { - case 0: - /* helper child */ - child_pid = fork(); - switch (child_pid) { - case 0: - /* daemon */ - setsid(); - chdir("/"); - execl(UDEVD_BIN, "udevd", NULL); - dbg("exec of daemon failed"); - exit(1); - case -1: - dbg("fork of daemon failed"); - return -1; - default: - exit(0); - } - break; - case -1: - dbg("fork of helper failed"); - return -1; - default: - wait(NULL); - } - return 0; -} - -int main(int argc, char* argv[]) -{ - struct hotplug_msg msg; - char *action; - char *devpath; - char *subsystem; - char *seqnum; - int seq; - int retval = 1; - int size; - int loop; - struct timespec tspec; - int sock; + static struct udevd_msg usend_msg; + int usend_msg_len; + int i; struct sockaddr_un saddr; socklen_t addrlen; - int started_daemon = 0; + int bufpos = 0; + int retval = 0; + const char *subsystem = NULL; -#ifdef DEBUG - init_logging("udevsend"); + logging_init("udevsend"); +#ifdef USE_LOG + udev_config_init(); #endif dbg("version %s", UDEV_VERSION); - 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; - else - seq = atoi(seqnum); - dbg("SEQNUM = '%d'", seq); - sock = socket(AF_LOCAL, SOCK_DGRAM, 0); - if (sock == -1) { - dbg("error getting socket"); + if (sock < 0) { + err("error getting socket: %s", strerror(errno)); + retval = 1; 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; - /* 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); - if (retval != -1) { + /* copy all keys to send buffer */ + for (i = 0; envp[i]; i++) { + const char *key; + int keylen; + + key = envp[i]; + keylen = strlen(key); + + /* ignore events which are already sent on the netlink socket */ + if (strncmp(key, "SEQNUM=", 7) == 0) { + dbg("ignoring event with SEQNUM set"); retval = 0; - goto close_and_exit; + goto exit; } - - if (errno != ECONNREFUSED) { - dbg("error sending message"); - goto close_and_exit; + + /* prevent loops in the scripts we execute */ + if (strncmp(key, "UDEVD_EVENT=", 12) == 0) { + err("event loop, already passed through the daemon, exit"); + retval = 2; + goto 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("retry to connect %d", UDEVSEND_CONNECT_RETRY - loop); - tspec.tv_sec = 0; - tspec.tv_nsec = 100000000; /* 100 millisec */ - nanosleep(&tspec, NULL); + + 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; } - -close_and_exit: - close(sock); + + usend_msg_len = offsetof(struct udevd_msg, envbuf) + bufpos; + dbg("usend_msg_len=%i", usend_msg_len); + + if (sendto(sock, &usend_msg, usend_msg_len, 0, (struct sockaddr *)&saddr, addrlen) < 0) { + retval = 3; + err("error sending message: %s", strerror(errno)); + } + exit: + if (sock != -1) + close(sock); + + logging_close(); return retval; }