path_id: prepare for new sysfs layout

[elogind.git] / udevd.c

diff --git a/udevd.c b/udevd.c
index ffa81bbb75034963f1033fcfd765028fc4e87a29..02c4887f541d304ff091ff4f6341570b042ac27b 100644 (file)
--- a/udevd.c
+++ b/udevd.c
@@ -100,6 +100,13 @@ static int udev_event_process(struct uevent_msg *msg)
        act.sa_flags = 0;
        sigaction(SIGALRM, &act, NULL);
 
        act.sa_flags = 0;
        sigaction(SIGALRM, &act, NULL);
 

+       /* reset to default */
+       act.sa_handler = SIG_DFL;
+       sigaction(SIGINT, &act, NULL);
+       sigaction(SIGTERM, &act, NULL);
+       sigaction(SIGCHLD, &act, NULL);
+       sigaction(SIGHUP, &act, NULL);
+

        /* trigger timeout to prevent hanging processes */
        alarm(UDEV_ALARM_TIMEOUT);
 
        /* trigger timeout to prevent hanging processes */
        alarm(UDEV_ALARM_TIMEOUT);
 


@@ -117,16 +124,22 @@ static int udev_event_process(struct uevent_msg *msg)
        retval = udev_device_event(&rules, udev);
 
        /* run programs collected by RUN-key*/
        retval = udev_device_event(&rules, udev);
 
        /* run programs collected by RUN-key*/

-       if (retval == 0) {
+       if (retval == 0 && !udev->ignore_device && udev_run) {

                struct name_entry *name_loop;
 
                struct name_entry *name_loop;
 

+               dbg("executing run list");

                list_for_each_entry(name_loop, &udev->run_list, node) {
                        if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0)
                list_for_each_entry(name_loop, &udev->run_list, node) {
                        if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0)

-                               pass_env_to_socket(&name_loop->name[strlen("socket:")], msg->devpath, msg->action);
-                       else
-                               if (run_program(name_loop->name, udev->dev->subsystem, NULL, 0, NULL,
+                               pass_env_to_socket(&name_loop->name[strlen("socket:")], udev->dev->devpath, udev->action);
+                       else {
+                               char program[PATH_SIZE];
+
+                               strlcpy(program, name_loop->name, sizeof(program));
+                               udev_rules_apply_format(udev, program, sizeof(program));
+                               if (run_program(program, udev->dev->subsystem, NULL, 0, NULL,

                                                (udev_log_priority >= LOG_INFO)))
                                        retval = -1;
                                                (udev_log_priority >= LOG_INFO)))
                                        retval = -1;

+                       }

                }
        }
 
                }
        }
 


@@ -194,6 +207,10 @@ static void export_event_state(struct uevent_msg *msg, enum event_state state)
                        if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
                                return;
 
                        if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
                                return;
 

+               list_for_each_entry(loop_msg, &exec_list, node)
+                       if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
+                               return;
+

                /* move failed events to the failed directory */
                if (state == EVENT_FAILED) {
                        create_path(filename_failed);
                /* move failed events to the failed directory */
                if (state == EVENT_FAILED) {
                        create_path(filename_failed);


@@ -233,7 +250,7 @@ static void udev_event_run(struct uevent_msg *msg)
                /* child */
                close(uevent_netlink_sock);
                close(udevd_sock);
                /* child */
                close(uevent_netlink_sock);
                close(udevd_sock);

-               if (inotify_fd > 0)
+               if (inotify_fd >= 0)

                        close(inotify_fd);
                close(signal_pipe[READ_END]);
                close(signal_pipe[WRITE_END]);
                        close(inotify_fd);
                close(signal_pipe[READ_END]);
                close(signal_pipe[WRITE_END]);


@@ -262,8 +279,23 @@ static void udev_event_run(struct uevent_msg *msg)
 
 static void msg_queue_insert(struct uevent_msg *msg)
 {
 
 static void msg_queue_insert(struct uevent_msg *msg)
 {

+       char filename[PATH_SIZE];
+       int fd;
+

        msg->queue_time = time(NULL);
 
        msg->queue_time = time(NULL);
 

+       strlcpy(filename, udev_root, sizeof(filename));
+       strlcat(filename, "/" EVENT_SEQNUM, sizeof(filename));
+       fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644);
+       if (fd >= 0) {
+               char str[32];
+               int len;
+
+               len = sprintf(str, "%llu\n", msg->seqnum);
+               write(fd, str, len);
+               close(fd);
+       }
+

        export_event_state(msg, EVENT_QUEUED);
 
        /* run all events with a timeout set immediately */
        export_event_state(msg, EVENT_QUEUED);
 
        /* run all events with a timeout set immediately */


@@ -521,26 +553,23 @@ static struct uevent_msg *get_msg_from_envbuf(const char *buf, int buf_size)
                free(msg);
                return NULL;
        }
                free(msg);
                return NULL;
        }

-

        return msg;
 }
 
 /* receive the udevd message from userspace */
 static struct uevent_msg *get_udevd_msg(void)
 {
        return msg;
 }
 
 /* receive the udevd message from userspace */
 static struct uevent_msg *get_udevd_msg(void)
 {

-       static struct udevd_msg usend_msg;
-       struct uevent_msg *msg;
+       static 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))];
        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;
 
        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));
        iov.iov_len = sizeof(struct udevd_msg);
 
        memset(&smsg, 0x00, sizeof(struct msghdr));


@@ -568,22 +597,12 @@ static struct uevent_msg *get_udevd_msg(void)
                return NULL;
        }
 
                return NULL;
        }
 

-       if (strncmp(usend_msg.magic, UDEV_MAGIC, sizeof(UDEV_MAGIC)) != 0 ) {
-               err("message magic '%s' doesn't match, ignore it", usend_msg.magic);
+       if (strncmp(ctrl_msg.magic, UDEV_MAGIC, sizeof(UDEV_MAGIC)) != 0 ) {
+               err("message magic '%s' doesn't match, ignore it", ctrl_msg.magic);

                return NULL;
        }
 
                return NULL;
        }
 

-       switch (usend_msg.type) {
-       case UDEVD_UEVENT_UDEVSEND:
-       case UDEVD_UEVENT_INITSEND:
-               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;
        case UDEVD_STOP_EXEC_QUEUE:
                info("udevd message (STOP_EXEC_QUEUE) received");
                stop_exec_q = 1;


@@ -594,14 +613,14 @@ static struct uevent_msg *get_udevd_msg(void)
                msg_queue_manager();
                break;
        case UDEVD_SET_LOG_LEVEL:
                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:
                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;
                info("udevd message (UDEVD_SET_MAX_CHILDS) received, max_childs=%i", *intval);
                max_childs = *intval;
                break;


@@ -791,6 +810,34 @@ static int init_uevent_netlink_sock(void)
        return 0;
 }
 
        return 0;
 }
 

+static void export_initial_seqnum(void)
+{
+       char filename[PATH_SIZE];
+       int fd;
+       char seqnum[32];
+       ssize_t len = 0;
+
+       strlcpy(filename, sysfs_path, sizeof(filename));
+       strlcat(filename, "/kernel/uevent_seqnum", sizeof(filename));
+       fd = open(filename, O_RDONLY);
+       if (fd >= 0) {
+               len = read(fd, seqnum, sizeof(seqnum)-1);
+               close(fd);
+       }
+       if (len <= 0) {
+               strcpy(seqnum, "0\n");
+               len = 3;
+       }
+       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);
+               close(fd);
+       }
+}
+

 int main(int argc, char *argv[], char *envp[])
 {
        int retval;
 int main(int argc, char *argv[], char *envp[])
 {
        int retval;


@@ -863,6 +910,8 @@ int main(int argc, char *argv[], char *envp[])
        sysfs_init();
        udev_rules_init(&rules, 1);
 
        sysfs_init();
        udev_rules_init(&rules, 1);
 

+       export_initial_seqnum();
+

        if (daemonize) {
                pid_t pid;
 
        if (daemonize) {
                pid_t pid;
 


@@ -906,12 +955,24 @@ int main(int argc, char *argv[], char *envp[])
                err("error getting pipes: %s", strerror(errno));
                goto exit;
        }
                err("error getting pipes: %s", strerror(errno));
                goto exit;
        }

-       retval = fcntl(signal_pipe[READ_END], F_SETFL, O_NONBLOCK);
+
+       retval = fcntl(signal_pipe[READ_END], F_GETFL, 0);
+       if (retval < 0) {
+               err("error fcntl on read pipe: %s", strerror(errno));
+               goto exit;
+       }
+       retval = fcntl(signal_pipe[READ_END], F_SETFL, retval | O_NONBLOCK);

        if (retval < 0) {
                err("error fcntl on read pipe: %s", strerror(errno));
                goto exit;
        }
        if (retval < 0) {
                err("error fcntl on read pipe: %s", strerror(errno));
                goto exit;
        }

-       retval = fcntl(signal_pipe[WRITE_END], F_SETFL, O_NONBLOCK);
+
+       retval = fcntl(signal_pipe[WRITE_END], F_GETFL, 0);
+       if (retval < 0) {
+               err("error fcntl on write pipe: %s", strerror(errno));
+               goto exit;
+       }
+       retval = fcntl(signal_pipe[WRITE_END], F_SETFL, retval | O_NONBLOCK);

        if (retval < 0) {
                err("error fcntl on write pipe: %s", strerror(errno));
                goto exit;
        if (retval < 0) {
                err("error fcntl on write pipe: %s", strerror(errno));
                goto exit;


@@ -929,8 +990,12 @@ int main(int argc, char *argv[], char *envp[])
 
        /* watch rules directory */
        inotify_fd = inotify_init();
 
        /* watch rules directory */
        inotify_fd = inotify_init();

-       if (inotify_fd > 0)
+       if (inotify_fd >= 0)

                inotify_add_watch(inotify_fd, udev_rules_filename, IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
                inotify_add_watch(inotify_fd, udev_rules_filename, IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);

+       else if (errno == ENOSYS)
+               err("the kernel does not support inotify, udevd can't monitor configuration file changes");
+       else
+               err("inotify_init failed: %s", strerror(errno));

 
        /* maximum limit of forked childs */
        value = getenv("UDEVD_MAX_CHILDS");
 
        /* maximum limit of forked childs */
        value = getenv("UDEVD_MAX_CHILDS");


@@ -968,7 +1033,7 @@ int main(int argc, char *argv[], char *envp[])
                FD_SET(signal_pipe[READ_END], &readfds);
                FD_SET(udevd_sock, &readfds);
                FD_SET(uevent_netlink_sock, &readfds);
                FD_SET(signal_pipe[READ_END], &readfds);
                FD_SET(udevd_sock, &readfds);
                FD_SET(uevent_netlink_sock, &readfds);

-               if (inotify_fd > 0)
+               if (inotify_fd >= 0)

                        FD_SET(inotify_fd, &readfds);
 
                fdcount = select(maxfd+1, &readfds, NULL, NULL, NULL);
                        FD_SET(inotify_fd, &readfds);
 
                fdcount = select(maxfd+1, &readfds, NULL, NULL, NULL);


@@ -1000,7 +1065,7 @@ int main(int argc, char *argv[], char *envp[])
                }
 
                /* rules directory inotify watch */
                }
 
                /* rules directory inotify watch */

-               if ((inotify_fd > 0) && FD_ISSET(inotify_fd, &readfds)) {
+               if ((inotify_fd >= 0) && FD_ISSET(inotify_fd, &readfds)) {

                        int nbytes;
 
                        /* discard all possible events, we can just reload the config */
                        int nbytes;
 
                        /* discard all possible events, we can just reload the config */


@@ -1043,16 +1108,16 @@ exit:
        udev_rules_cleanup(&rules);
        sysfs_cleanup();
 
        udev_rules_cleanup(&rules);
        sysfs_cleanup();
 

-       if (signal_pipe[READ_END] > 0)
+       if (signal_pipe[READ_END] >= 0)

                close(signal_pipe[READ_END]);
                close(signal_pipe[READ_END]);

-       if (signal_pipe[WRITE_END] > 0)
+       if (signal_pipe[WRITE_END] >= 0)

                close(signal_pipe[WRITE_END]);
 
                close(signal_pipe[WRITE_END]);
 

-       if (udevd_sock > 0)
+       if (udevd_sock >= 0)

                close(udevd_sock);
                close(udevd_sock);

-       if (inotify_fd > 0)
+       if (inotify_fd >= 0)

                close(inotify_fd);
                close(inotify_fd);

-       if (uevent_netlink_sock > 0)
+       if (uevent_netlink_sock >= 0)

                close(uevent_netlink_sock);
 
        logging_close();
                close(uevent_netlink_sock);
 
        logging_close();