/*
* udevsend.c
*
- * Userspace devfs
- *
* Copyright (C) 2004 Ling, Xiaofeng <xiaofeng.ling@intel.com>
* Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
*
- *
* 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.
*
*/
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/wait.h>
-#include <sys/un.h>
-#include <time.h>
-#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
-#include <string.h>
#include <unistd.h>
+#include <string.h>
+#include <time.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/wait.h>
+#include <sys/un.h>
#include <linux/stddef.h>
#include "udev.h"
/* daemon with empty environment */
close(sock);
execve(UDEVD_BIN, argv, envp);
- err("exec of daemon failed");
+ err("exec of daemon failed: %s", strerror(errno));
_exit(1);
case -1:
- err("fork of daemon failed");
+ err("fork of daemon failed: %s", strerror(errno));
return -1;
default:
exit(0);
}
break;
case -1:
- err("fork of helper failed");
+ err("fork of helper failed: %s", strerror(errno));
return -1;
default:
waitpid(pid, NULL, 0);
return 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 */
- execv(UDEV_BIN, argv);
- err("exec of udev child failed");
- _exit(1);
- break;
- case -1:
- 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;
sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
if (sock == -1) {
- err("error getting socket");
- goto fallback;
+ err("error getting socket: %s", strerror(errno));
+ goto exit;
}
memset(&saddr, 0x00, sizeof(struct sockaddr_un));
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++) {
goto exit;
}
- if (bufpos + keylen >= HOTPLUG_BUFFER_SIZE-1) {
+ if (bufpos + keylen >= UEVENT_BUFFER_SIZE-1) {
err("environment buffer too small, probably not called by the kernel");
continue;
}
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) {
- err("error sending message (%s)", strerror(errno));
- goto fallback;
+ err("error sending message: %s", strerror(errno));
+ goto exit;
}
if (!started_daemon) {
retval = start_daemon();
if (retval) {
dbg("error starting daemon");
- goto fallback;
+ goto exit;
}
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:
- err("unable to connect to event daemon, try to call udev directly");
- run_udev(subsystem);
-
exit:
if (sock != -1)
close(sock);