Use key=val pairs for additional prefix params

[odhcp6c.git] / src / script.c

diff --git a/src/script.c b/src/script.c
index ffb39f3f5726470513e8f0004f12bd7007048b61..051718f206ed2e7513fbd9808d09628a2b2d17ae 100644 (file)
--- a/src/script.c
+++ b/src/script.c
@@ -17,6 +17,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
+#include <signal.h>
 #include <unistd.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
@@ -38,6 +39,7 @@ static const int8_t hexvals[] = {
 
 
 static char *argv[4] = {NULL, NULL, NULL, NULL};
+static volatile char *delayed_call = NULL;
 
 
 int script_init(const char *path, const char *ifname)
@@ -162,7 +164,7 @@ static void entry_to_env(const char *name, const void *data, size_t len, enum en
 
                        if (type == ENTRY_PREFIX && e[i].priority) {
                                // priority and router are abused for prefix exclusion
-                               buf[buf_len++] = ',';
+                               buf_len += snprintf(&buf[buf_len], 12, ",excluded=");
                                inet_ntop(AF_INET6, &e[i].router, &buf[buf_len], INET6_ADDRSTRLEN);
                                buf_len += strlen(&buf[buf_len]);
                                buf_len += snprintf(&buf[buf_len], 24, "/%u", e[i].priority);
@@ -176,11 +178,32 @@ static void entry_to_env(const char *name, const void *data, size_t len, enum en
 }
 
 
+static void script_call_delayed(int signal __attribute__((unused)))
+{
+       if (delayed_call)
+               script_call((char*)delayed_call);
+}
+
+
+void script_delay_call(const char *status, int timeout)
+{
+       if (!delayed_call) {
+               delayed_call = strdup(status);
+               signal(SIGALRM, script_call_delayed);
+               alarm(timeout);
+       }
+}
+
+
 void script_call(const char *status)
 {
        size_t dns_len, search_len, custom_len, sntp_ip_len, sntp_dns_len;
        size_t sip_ip_len, sip_fqdn_len;
 
+       odhcp6c_expire();
+       if (delayed_call)
+               alarm(0);
+
        struct in6_addr *dns = odhcp6c_get_state(STATE_DNS, &dns_len);
        uint8_t *search = odhcp6c_get_state(STATE_SEARCH, &search_len);
        uint8_t *custom = odhcp6c_get_state(STATE_CUSTOM_OPTS, &custom_len);