logging_init("udevd-event");
setpriority(PRIO_PROCESS, 0, UDEV_PRIORITY);
+
retval = udev_event_process(msg);
info("seq %llu finished", msg->seqnum);
static int running_processes(void)
{
int f;
- static char buf[4096];
+ char buf[32768];
int len;
int running;
const char *pos;
}
/* receive the udevd message from userspace */
-static struct uevent_msg *get_udevd_msg(void)
+static void get_udevd_msg(void)
{
- static struct udevd_msg usend_msg;
- struct uevent_msg *msg;
+ struct udevd_msg ctrl_msg;
ssize_t size;
struct msghdr smsg;
struct cmsghdr *cmsg;
struct iovec iov;
struct ucred *cred;
char cred_msg[CMSG_SPACE(sizeof(struct ucred))];
- int envbuf_size;
int *intval;
- memset(&usend_msg, 0x00, sizeof(struct udevd_msg));
- iov.iov_base = &usend_msg;
+ memset(&ctrl_msg, 0x00, sizeof(struct udevd_msg));
+ iov.iov_base = &ctrl_msg;
iov.iov_len = sizeof(struct udevd_msg);
memset(&smsg, 0x00, sizeof(struct msghdr));
if (size < 0) {
if (errno != EINTR)
err("unable to receive user udevd message: %s", strerror(errno));
- return NULL;
+ return;
}
cmsg = CMSG_FIRSTHDR(&smsg);
cred = (struct ucred *) CMSG_DATA(cmsg);
if (cmsg == NULL || cmsg->cmsg_type != SCM_CREDENTIALS) {
err("no sender credentials received, message ignored");
- return NULL;
+ return;
}
if (cred->uid != 0) {
err("sender uid=%i, message ignored", cred->uid);
- return NULL;
+ return;
}
- if (strncmp(usend_msg.magic, UDEV_MAGIC, sizeof(UDEV_MAGIC)) != 0 ) {
- err("message magic '%s' doesn't match, ignore it", usend_msg.magic);
- return NULL;
+ if (strncmp(ctrl_msg.magic, UDEV_MAGIC, sizeof(UDEV_MAGIC)) != 0 ) {
+ err("message magic '%s' doesn't match, ignore it", ctrl_msg.magic);
+ return;
}
- switch (usend_msg.type) {
- case UDEVD_UEVENT_UDEVSEND:
- info("udevd event message received");
- envbuf_size = size - offsetof(struct udevd_msg, envbuf);
- dbg("envbuf_size=%i", envbuf_size);
- msg = get_msg_from_envbuf(usend_msg.envbuf, envbuf_size);
- if (msg == NULL)
- return NULL;
- msg->type = usend_msg.type;
- return msg;
+ switch (ctrl_msg.type) {
case UDEVD_STOP_EXEC_QUEUE:
info("udevd message (STOP_EXEC_QUEUE) received");
stop_exec_q = 1;
msg_queue_manager();
break;
case UDEVD_SET_LOG_LEVEL:
- intval = (int *) usend_msg.envbuf;
+ intval = (int *) ctrl_msg.envbuf;
info("udevd message (SET_LOG_PRIORITY) received, udev_log_priority=%i", *intval);
udev_log_priority = *intval;
sprintf(udev_log, "UDEV_LOG=%i", udev_log_priority);
putenv(udev_log);
break;
case UDEVD_SET_MAX_CHILDS:
- intval = (int *) usend_msg.envbuf;
+ intval = (int *) ctrl_msg.envbuf;
info("udevd message (UDEVD_SET_MAX_CHILDS) received, max_childs=%i", *intval);
max_childs = *intval;
break;
default:
dbg("unknown message type");
}
- return NULL;
}
/* receive the kernel user event message and do some sanity checks */
memset(&snl, 0x00, sizeof(struct sockaddr_nl));
snl.nl_family = AF_NETLINK;
snl.nl_pid = getpid();
- snl.nl_groups = 0xffffffff;
+ snl.nl_groups = 1;
uevent_netlink_sock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT);
if (uevent_netlink_sock == -1) {
}
strlcpy(filename, udev_root, sizeof(filename));
strlcat(filename, "/" EVENT_SEQNUM, sizeof(filename));
+ create_path(filename);
fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644);
if (fd >= 0) {
write(fd, seqnum, len);
}
/* get user socket message */
- if (FD_ISSET(udevd_sock, &readfds)) {
- msg = get_udevd_msg();
- if (msg)
- msg_queue_insert(msg);
- }
+ if (FD_ISSET(udevd_sock, &readfds))
+ get_udevd_msg();
/* get kernel netlink message */
if (FD_ISSET(uevent_netlink_sock, &readfds)) {