udevinitsend: handle replay messages correctly

[elogind.git] / udevsend.c

diff --git a/udevsend.c b/udevsend.c
index dcd5a2ae934ab4620d392e52b93de39bcbfda5ce..42ef0271dd7fe254927f17ae7dd3e1a73c5941b9 100644 (file)
--- a/udevsend.c
+++ b/udevsend.c
@@ -44,12 +44,15 @@
 static int sock = -1;
 
 #ifdef USE_LOG
-void log_message (int level, const char *format, ...)
+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
@@ -71,17 +74,17 @@ static int start_daemon(void)
                        /* daemon with empty environment */
                        close(sock);
                        execve(UDEVD_BIN, argv, envp);
-                       dbg("exec of daemon failed");
+                       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);
@@ -99,11 +102,11 @@ static void run_udev(const char *subsystem)
        case 0:
                /* child */
                execv(UDEV_BIN, argv);
-               dbg("exec of child failed");
+               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);
@@ -112,7 +115,7 @@ static void run_udev(const char *subsystem)
 
 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;
@@ -124,11 +127,14 @@ int main(int argc, char *argv[], char *envp[])
        const char *subsystem = NULL;
 
        logging_init("udevsend");
+#ifdef USE_LOG
+       udev_init_config();
+#endif
        dbg("version %s", UDEV_VERSION);
 
        sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
        if (sock == -1) {
-               dbg("error getting socket");
+               err("error getting socket");
                goto fallback;
        }
 
@@ -138,8 +144,9 @@ int main(int argc, char *argv[], char *envp[])
        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_UDEVSEND;
 
        /* copy all keys to send buffer */
        for (i = 0; envp[i]; i++) {
@@ -155,8 +162,8 @@ int main(int argc, char *argv[], char *envp[])
                        goto exit;
                }
 
-               if (bufpos + keylen >= HOTPLUG_BUFFER_SIZE-1) {
-                       dbg("environment buffer too small, probably not called by the kernel");
+               if (bufpos + keylen >= UEVENT_BUFFER_SIZE-1) {
+                       err("environment buffer too small, probably not called by the kernel");
                        continue;
                }
 
@@ -174,11 +181,11 @@ int main(int argc, char *argv[], char *envp[])
                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) {
@@ -187,12 +194,12 @@ int main(int argc, char *argv[], char *envp[])
                }
 
                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) {
                                dbg("error starting daemon");
@@ -201,13 +208,13 @@ int main(int argc, char *argv[], char *envp[])
                        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");
+       err("unable to connect to event daemon, try to call udev directly");
        run_udev(subsystem);
 
 exit: