added command line switch for strict oro

[odhcp6c.git] / src / odhcp6c.c

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index dbba60512c171ef8f5782ecd524d07baacfabc87..e5e415c98409fc13e1548f20d043f1034f4f3a47 100644 (file)
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -43,7 +43,11 @@ static int usage(void);
 static uint8_t *state_data[_STATE_MAX] = {NULL};
 static size_t state_len[_STATE_MAX] = {0};
 
-static volatile int do_signal = 0;
+static volatile bool signal_io = false;
+static volatile bool signal_usr1 = false;
+static volatile bool signal_usr2 = false;
+static volatile bool signal_term = false;
+
 static int urandom_fd = -1, allow_slaac_only = 0;
 static bool bound = false, release = true;
 static time_t last_update = 0;
@@ -67,10 +71,10 @@ int main(_unused int argc, char* const argv[])
        int bfd_interval = 0, bfd_loss = 3;
 #endif
 
-       bool help = false, daemonize = false;
+       bool help = false, daemonize = false, strict_options = false;
        int logopt = LOG_PID;
        int c, request_pd = 0;
-       while ((c = getopt(argc, argv, "S::N:P:FB:c:i:r:s:kt:hedp:")) != -1) {
+       while ((c = getopt(argc, argv, "S::N:P:FB:c:i:r:Rs:kt:hedp:")) != -1) {
                switch (c) {
                case 'S':
                        allow_slaac_only = (optarg) ? atoi(optarg) : -1;
@@ -140,6 +144,10 @@ int main(_unused int argc, char* const argv[])
                        }
                        break;
 
+               case 'R':
+                       strict_options = true;
+                       break;
+
                case 's':
                        script = optarg;
                        break;
@@ -185,7 +193,7 @@ int main(_unused int argc, char* const argv[])
        signal(SIGUSR2, sighandler);
 
        if ((urandom_fd = open("/dev/urandom", O_CLOEXEC | O_RDONLY)) < 0 ||
-                       init_dhcpv6(ifname, request_pd, sol_timeout) ||
+                       init_dhcpv6(ifname, request_pd, strict_options, sol_timeout) ||
                        ra_init(ifname, &ifid) || script_init(script, ifname)) {
                syslog(LOG_ERR, "failed to initialize: %s", strerror(errno));
                return 3;
@@ -217,12 +225,13 @@ int main(_unused int argc, char* const argv[])
 
        script_call("started");
 
-       while (do_signal != SIGTERM) { // Main logic
+       while (!signal_term) { // Main logic
                odhcp6c_clear_state(STATE_SERVER_ID);
                odhcp6c_clear_state(STATE_IA_NA);
                odhcp6c_clear_state(STATE_IA_PD);
                odhcp6c_clear_state(STATE_SNTP_IP);
-               odhcp6c_clear_state(STATE_SNTP_FQDN);
+               odhcp6c_clear_state(STATE_NTP_IP);
+               odhcp6c_clear_state(STATE_NTP_FQDN);
                odhcp6c_clear_state(STATE_SIP_IP);
                odhcp6c_clear_state(STATE_SIP_FQDN);
                dhcpv6_set_ia_mode(ia_na_mode, ia_pd_mode);
@@ -230,7 +239,7 @@ int main(_unused int argc, char* const argv[])
 
                syslog(LOG_NOTICE, "(re)starting transaction on %s", ifname);
 
-               do_signal = 0;
+               signal_usr1 = signal_usr2 = false;
                int mode = dhcpv6_request(DHCPV6_MSG_SOLICIT);
                odhcp6c_signal_process();
 
@@ -240,11 +249,11 @@ int main(_unused int argc, char* const argv[])
                do {
                        int res = dhcpv6_request(mode == DHCPV6_STATELESS ?
                                        DHCPV6_MSG_INFO_REQ : DHCPV6_MSG_REQUEST);
+                       bool signalled = odhcp6c_signal_process();
 
-                       odhcp6c_signal_process();
                        if (res > 0)
                                break;
-                       else if (do_signal > 0) {
+                       else if (signalled) {
                                mode = -1;
                                break;
                        }
@@ -260,9 +269,9 @@ int main(_unused int argc, char* const argv[])
                        bound = true;
                        syslog(LOG_NOTICE, "entering stateless-mode on %s", ifname);
 
-                       while (do_signal == 0 || do_signal == SIGUSR1) {
-                               do_signal = 0;
-                               script_call("informed");                                        
+                       while (!signal_usr2 && !signal_term) {
+                               signal_usr1 = false;
+                               script_call("informed");
 
                                int res = dhcpv6_poll_reconfigure();
                                odhcp6c_signal_process();
@@ -270,15 +279,16 @@ int main(_unused int argc, char* const argv[])
                                if (res > 0)
                                        continue;
 
-                               if (do_signal == SIGUSR1) {
-                                       do_signal = 0; // Acknowledged
+                               if (signal_usr1) {
+                                       signal_usr1 = false; // Acknowledged
                                        continue;
-                               } else if (do_signal > 0)
+                               }
+                               if (signal_usr2 || signal_term)
                                        break;
 
                                res = dhcpv6_request(DHCPV6_MSG_INFO_REQ);
                                odhcp6c_signal_process();
-                               if (do_signal == SIGUSR1)
+                               if (signal_usr1)
                                        continue;
                                else if (res < 0)
                                        break;
@@ -294,7 +304,7 @@ int main(_unused int argc, char* const argv[])
                                bfd_start(ifname, bfd_loss, bfd_interval);
 #endif
 
-                       while (do_signal == 0 || do_signal == SIGUSR1) {
+                       while (!signal_usr2 && !signal_term) {
                                // Renew Cycle
                                // Wait for T1 to expire or until we get a reconfigure
                                int res = dhcpv6_poll_reconfigure();
@@ -305,9 +315,9 @@ int main(_unused int argc, char* const argv[])
                                }
 
                                // Handle signal, if necessary
-                               if (do_signal == SIGUSR1)
-                                       do_signal = 0; // Acknowledged
-                               else if (do_signal > 0)
+                               if (signal_usr1)
+                                       signal_usr1 = false; // Acknowledged
+                               if (signal_usr2 || signal_term)
                                        break; // Other signal type
 
                                // Send renew as T1 expired
@@ -327,7 +337,7 @@ int main(_unused int argc, char* const argv[])
                                        script_call("updated");
                                        continue; // Renew was successful
                                }
-                               
+
                                odhcp6c_clear_state(STATE_SERVER_ID); // Remove binding
 
                                // If we have IAs, try rebind otherwise restart
@@ -385,6 +395,7 @@ static int usage(void)
        "       -c <clientid>   Override client-ID (base-16 encoded)\n"
        "       -i <iface-id>   Use a custom interface identifier for RA handling\n"
        "       -r <options>    Options to be requested (comma-separated)\n"
+       "       -R              Do not request any options except those specified with -r\n"
        "       -s <script>     Status update script (/usr/sbin/odhcp6c-update)\n"
        "       -k              Don't send a RELEASE when stopping\n"
        "       -t <seconds>    Maximum timeout for DHCPv6-SOLICIT (120)\n"
@@ -427,12 +438,13 @@ static uint8_t* odhcp6c_resize_state(enum odhcp6c_state state, ssize_t len)
 
 bool odhcp6c_signal_process(void)
 {
-       if (do_signal == SIGIO) {
-               do_signal = 0;
+       while (signal_io) {
+               signal_io = false;
+
                bool ra_updated = ra_process();
 
                if (ra_link_up())
-                       do_signal = SIGUSR2;
+                       signal_usr2 = true;
 
                if (ra_updated && (bound || allow_slaac_only == 0))
                        script_call("ra-updated"); // Immediate process urgent events
@@ -444,7 +456,7 @@ bool odhcp6c_signal_process(void)
 #endif
        }
 
-       return do_signal != 0;
+       return signal_usr1 || signal_usr2 || signal_term;
 }
 
 
@@ -470,7 +482,7 @@ void odhcp6c_insert_state(enum odhcp6c_state state, size_t offset, const void *d
        uint8_t *n = odhcp6c_resize_state(state, len);
        if (n) {
                uint8_t *sdata = state_data[state];
-               
+
                memmove(sdata + offset + len, sdata + offset, len_after);
                memcpy(sdata + offset, data, len);
        }
@@ -624,11 +636,11 @@ static void sighandler(int signal)
        if (signal == SIGCHLD)
                while (waitpid(-1, NULL, WNOHANG) > 0);
        else if (signal == SIGUSR1)
-               do_signal = SIGUSR1;
+               signal_usr1 = true;
        else if (signal == SIGUSR2)
-               do_signal = SIGUSR2;
+               signal_usr2 = true;
        else if (signal == SIGIO)
-               do_signal = SIGIO;
+               signal_io = true;
        else
-               do_signal = SIGTERM;
+               signal_term = true;
 }