#include <linux/stddef.h>
#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
{
pid_t pid;
pid_t child_pid;
+ char *const argv[] = { "udevd", NULL };
+ char *const envp[] = { NULL };
pid = fork();
switch (pid) {
child_pid = fork();
switch (child_pid) {
case 0:
- /* daemon */
- setsid();
- chdir("/");
- execl(UDEVD_BIN, "udevd", NULL);
- dbg("exec of daemon failed");
+ /* daemon with empty environment */
+ close(sock);
+ execve(UDEVD_BIN, argv, envp);
+ err("exec of daemon failed");
_exit(1);
case -1:
- dbg("fork of daemon failed");
+ err("fork of daemon failed");
return -1;
default:
exit(0);
}
break;
case -1:
- dbg("fork of helper failed");
+ err("fork of helper failed");
return -1;
default:
waitpid(pid, NULL, 0);
static void run_udev(const char *subsystem)
{
+ char *const argv[] = { "udev", (char *)subsystem, NULL };
pid_t pid;
pid = fork();
switch (pid) {
case 0:
/* child */
- execl(UDEV_BIN, "udev", subsystem, NULL);
- dbg("exec of child failed");
+ execv(UDEV_BIN, argv);
+ err("exec of udev child failed");
_exit(1);
break;
case -1:
- dbg("fork of child failed");
+ err("fork of udev child failed");
break;
default:
waitpid(pid, NULL, 0);
int main(int argc, char *argv[], char *envp[])
{
- static struct udevsend_msg usend_msg;
+ static struct udevd_msg usend_msg;
int usend_msg_len;
int i;
int loop;
struct sockaddr_un saddr;
socklen_t addrlen;
- const char *subsystem_argv;
- int subsystem_env = 0;
int bufpos = 0;
int retval = 1;
- int sock = -1;
int started_daemon = 0;
+ const char *subsystem = NULL;
logging_init("udevsend");
+#ifdef USE_LOG
+ udev_init_config();
+#endif
dbg("version %s", UDEV_VERSION);
- subsystem_argv = argv[1];
- if (subsystem_argv == NULL) {
- dbg("no subsystem");
- goto exit;
- }
-
sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
if (sock == -1) {
- dbg("error getting socket");
+ err("error getting socket");
goto fallback;
}
- 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;
- memset(&usend_msg, 0x00, sizeof(struct udevsend_msg));
-
+ 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++) {
key = envp[i];
keylen = strlen(key);
- if (bufpos + keylen >= HOTPLUG_BUFFER_SIZE-1) {
- dbg("environment buffer too small, probably not called by the kernel");
+
+ /* 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;
}
- /* older kernels do not have the SUBSYSTEM in the environment */
+ /* remember the SUBSYSTEM */
if (strncmp(key, "SUBSYSTEM=", 10) == 0)
- subsystem_env = 1;
+ subsystem = &key[10];
dbg("add '%s' to env[%i] buffer", key, i);
strcpy(&usend_msg.envbuf[bufpos], key);
bufpos += keylen + 1;
}
- 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);
+ /* 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 udevsend_msg, envbuf) + bufpos;
+ 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 = SEND_WAIT_MAX_SECONDS * SEND_WAIT_LOOP_PER_SECOND;
+ 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) {
}
if (errno != ECONNREFUSED) {
- dbg("error sending message (%s)", strerror(errno));
+ err("error sending message (%s)", strerror(errno));
goto fallback;
}
if (!started_daemon) {
- dbg("try to start udevd daemon");
+ info("try to start udevd daemon");
retval = start_daemon();
if (retval) {
- info("error starting daemon");
+ dbg("error starting daemon");
goto fallback;
}
- info("udevd daemon started");
+ 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);
+ dbg("retry to connect %d", UDEVSEND_WAIT_MAX_SECONDS * UDEVSEND_WAIT_LOOP_PER_SECOND - loop);
+ usleep(1000 * 1000 / UDEVSEND_WAIT_LOOP_PER_SECOND);
}
}
fallback:
- info("unable to connect to event daemon, try to call udev directly");
- run_udev(subsystem_argv);
+ err("unable to connect to event daemon, try to call udev directly");
+ run_udev(subsystem);
exit:
if (sock != -1)