*/
#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/msg.h>
+#include <sys/socket.h>
+#include <sys/wait.h>
+#include <sys/un.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
+#include <stddef.h>
#include <string.h>
#include <unistd.h>
#include <time.h>
-#include <wait.h>
+#include <linux/stddef.h>
#include "udev.h"
+#include "udev_version.h"
#include "udevd.h"
#include "logging.h"
+unsigned char logname[42];
+
+int log_ok(void)
+{
+ return 1;
+}
+
static inline char *get_action(void)
{
char *action;
return seqnum;
}
-static int build_hotplugmsg(struct hotplug_msg **ppmsg, char *action,
+static int build_hotplugmsg(struct hotplug_msg *msg, char *action,
char *devpath, char *subsystem, int seqnum)
{
- struct hotplug_msg *pmsg;
-
- pmsg = malloc(sizeof(struct hotplug_msg));
- pmsg->mtype = HOTPLUGMSGTYPE;
- pmsg->seqnum = seqnum;
- strncpy(pmsg->action, action, 8);
- strncpy(pmsg->devpath, devpath, 128);
- strncpy(pmsg->subsystem, subsystem, 16);
- *ppmsg = pmsg;
+ memset(msg, 0x00, sizeof(*msg));
+ strfieldcpy(msg->magic, UDEV_MAGIC);
+ msg->seqnum = seqnum;
+ strncpy(msg->action, action, 8);
+ strncpy(msg->devpath, devpath, 128);
+ strncpy(msg->subsystem, subsystem, 16);
return sizeof(struct hotplug_msg);
}
-static void free_hotplugmsg(struct hotplug_msg *pmsg)
-{
- free(pmsg);
-}
-
static int start_daemon(void)
{
pid_t pid;
switch (child_pid) {
case 0:
/* daemon */
- execl(DEFAULT_UDEVD_EXEC, NULL);
+ setsid();
+ chdir("/");
+ execl(UDEVD_BIN, "udevd", NULL);
dbg("exec of daemon failed");
exit(1);
case -1:
dbg("fork of helper failed");
return -1;
default:
- wait(0);
+ wait(NULL);
}
return 0;
}
-
int main(int argc, char* argv[])
{
- int msgid;
- key_t key;
- struct msqid_ds msg_queue;
- struct msgbuf *pmsg;
+ struct hotplug_msg msg;
char *action;
char *devpath;
char *subsystem;
char *seqnum;
int seq;
- int retval = -EINVAL;
+ int retval = 1;
int size;
int loop;
struct timespec tspec;
+ int sock;
+ struct sockaddr_un saddr;
+ socklen_t addrlen;
+ int started_daemon = 0;
+ struct iovec iov;
+ struct msghdr smsg;
+ char cred_msg[CMSG_SPACE(sizeof(struct ucred))];
+ struct cmsghdr *cmsg;
+ struct ucred *cred;
+
+
+
+#ifdef DEBUG
+ init_logging("udevsend");
+#endif
subsystem = argv[1];
if (subsystem == NULL) {
}
seqnum = get_seqnum();
- if (seqnum == NULL) {
- dbg("no seqnum");
- goto exit;
- }
- seq = atoi(seqnum);
-
- /* create ipc message queue or get id of our existing one */
- key = ftok(DEFAULT_UDEVD_EXEC, IPC_KEY_ID);
- size = build_hotplugmsg( (struct hotplug_msg**) &pmsg, action, devpath, subsystem, seq);
- msgid = msgget(key, IPC_CREAT);
- if (msgid == -1) {
- dbg("error open ipc queue");
- goto exit;
- }
-
- /* send ipc message to the daemon */
- retval = msgsnd(msgid, pmsg, size, 0);
- free_hotplugmsg( (struct hotplug_msg*) pmsg);
- if (retval == -1) {
- dbg("error sending ipc message");
+ if (seqnum == NULL)
+ seq = -1;
+ else
+ seq = atoi(seqnum);
+
+ sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
+ if (sock == -1) {
+ dbg("error getting socket");
goto exit;
}
- /* get state of ipc queue */
- tspec.tv_sec = 0;
- tspec.tv_nsec = 10000000; /* 10 millisec */
- loop = 20;
+ memset(&saddr, 0x00, sizeof(saddr));
+ 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);
+
+ /* prepare message with credentials to authenticate ourself */
+ iov.iov_base = &msg;
+ iov.iov_len = size;
+
+ smsg.msg_name = &saddr;
+ smsg.msg_namelen = addrlen;
+ smsg.msg_iov = &iov;
+ smsg.msg_iovlen = 1;
+ smsg.msg_control = cred_msg;
+ smsg.msg_controllen = CMSG_LEN(sizeof(struct ucred));;
+ smsg.msg_flags = 0;
+
+ cmsg = CMSG_FIRSTHDR(&smsg);
+ cmsg->cmsg_level = SOL_SOCKET;
+ cmsg->cmsg_type = SCM_CREDENTIALS;
+ cmsg->cmsg_len = sizeof(cred_msg);
+ cred = (struct ucred *) CMSG_DATA(cmsg);
+ cred->uid = getuid();
+ cred->gid = getgid();
+ cred->pid = getpid();
+ cred->pid = getpid();
+
+ /* If we can't send, try to start daemon and resend message */
+ loop = UDEVSEND_CONNECT_RETRY;
while (loop--) {
- retval = msgctl(msgid, IPC_STAT, &msg_queue);
- if (retval == -1) {
- dbg("error getting info on ipc queue");
- goto exit;
+ retval = sendmsg(sock, &smsg, 0);
+ if (retval != -1) {
+ retval = 0;
+ goto close_and_exit;
+ }
+
+ if (errno != ECONNREFUSED) {
+ dbg("error sending message");
+ goto close_and_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 (msg_queue.msg_qnum == 0)
- goto exit;
- nanosleep(&tspec, NULL);
}
-
- info("message is still in the ipc queue, starting daemon...");
- retval = start_daemon();
-
+
+close_and_exit:
+ close(sock);
exit:
return retval;
}
~ianmdlvl / elogind.git / blobdiff