Add support for colored address in IA_NA

[odhcp6c.git] / src / script.c

diff --git a/src/script.c b/src/script.c
index 9d88daf43676054a4c415b917b8f8a7931d38452..74aea6411dbad82a14f0e05f52d2cbd1f4cc483e 100644 (file)
--- a/src/script.c
+++ b/src/script.c
@@ -41,6 +41,7 @@ static const int8_t hexvals[] = {
 
 static char *argv[4] = {NULL, NULL, NULL, NULL};
 static volatile char *delayed_call = NULL;
+static bool dont_delay = false;
 
 
 int script_init(const char *path, const char *ifname)
@@ -186,6 +187,9 @@ static void entry_to_env(const char *name, const void *data, size_t len, enum en
                        } else {
                                buf_len += snprintf(&buf[buf_len], 24, ",%u,%u", e[i].preferred, e[i].valid);
                        }
+                       if ((type == ENTRY_PREFIX || type == ENTRY_ADDRESS) && e[i].prefix_class) {
+                          buf_len += snprintf(&buf[buf_len], 12, ",class=%u", e[i].prefix_class);
+                        }
 
                        if (type == ENTRY_PREFIX && e[i].priority) {
                                // priority and router are abused for prefix exclusion
@@ -212,7 +216,9 @@ static void script_call_delayed(int signal __attribute__((unused)))
 
 void script_delay_call(const char *status, int timeout)
 {
-       if (!delayed_call) {
+       if (dont_delay) {
+               script_call(status);
+       } else if (!delayed_call) {
                delayed_call = strdup(status);
                signal(SIGALRM, script_call_delayed);
                alarm(timeout);
@@ -226,8 +232,10 @@ void script_call(const char *status)
        size_t sip_ip_len, sip_fqdn_len, aftr_name_len;
 
        odhcp6c_expire();
-       if (delayed_call)
+       if (delayed_call) {
                alarm(0);
+               dont_delay = true;
+       }
 
        struct in6_addr *dns = odhcp6c_get_state(STATE_DNS, &dns_len);
        uint8_t *search = odhcp6c_get_state(STATE_SEARCH, &search_len);