Update license headers

[odhcp6c.git] / src / odhcp6c.c

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index b67ed11843b25cda7e13e7e6727a404f94fa0c0d..a97e4c914cf646d680edd869bcfe258e4f652372 100644 (file)
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2012 Steven Barth <steven@midlink.org>
+ * Copyright (C) 2012-2013 Steven Barth <steven@midlink.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License v2 as published by
@@ -41,13 +41,11 @@ static size_t state_len[_STATE_MAX] = {0};
 
 static volatile int do_signal = 0;
 static int urandom_fd = -1;
-static bool bound = false, allow_slaac_only = true;
+static bool bound = false, allow_slaac_only = true, release = true;
 
 
 int main(_unused int argc, char* const argv[])
 {
-       openlog("odhcp6c", LOG_PERROR | LOG_PID, LOG_DAEMON);
-
        // Allocate ressources
        const char *pidfile = NULL;
        const char *script = "/usr/sbin/odhcp6c-update";
@@ -58,8 +56,9 @@ int main(_unused int argc, char* const argv[])
        enum odhcp6c_ia_mode ia_na_mode = IA_MODE_TRY;
 
        bool help = false, daemonize = false;
+       int logopt = LOG_PID;
        int c, request_pd = 0;
-       while ((c = getopt(argc, argv, "SN:P:c:r:s:hdp:")) != -1) {
+       while ((c = getopt(argc, argv, "SN:P:c:r:s:khedp:")) != -1) {
                switch (c) {
                case 'S':
                        allow_slaac_only = false;
@@ -89,7 +88,7 @@ int main(_unused int argc, char* const argv[])
                                buf[0] = 0;
                                buf[1] = DHCPV6_OPT_CLIENTID;
                                buf[2] = 0;
-                               buf[4] = l;
+                               buf[3] = l;
                                odhcp6c_add_state(STATE_CLIENT_ID, buf, l + 4);
                        } else {
                                help = true;
@@ -112,6 +111,14 @@ int main(_unused int argc, char* const argv[])
                        script = optarg;
                        break;
 
+               case 'k':
+                       release = false;
+                       break;
+
+               case 'e':
+                       logopt |= LOG_PERROR;
+                       break;
+
                case 'd':
                        daemonize = true;
                        break;
@@ -126,18 +133,12 @@ int main(_unused int argc, char* const argv[])
                }
        }
 
+       openlog("odhcp6c", logopt, LOG_DAEMON);
        const char *ifname = argv[optind];
 
        if (help || !ifname)
                return usage();
 
-       if ((urandom_fd = open("/dev/urandom", O_CLOEXEC | O_RDONLY)) < 0 ||
-                       init_dhcpv6(ifname, request_pd) || ra_init(ifname) ||
-                       script_init(script, ifname)) {
-               syslog(LOG_ERR, "failed to initialize: %s", strerror(errno));
-               return 3;
-       }
-
        signal(SIGIO, sighandler);
        signal(SIGHUP, sighandler);
        signal(SIGINT, sighandler);
@@ -146,6 +147,13 @@ int main(_unused int argc, char* const argv[])
        signal(SIGUSR1, sighandler);
        signal(SIGUSR2, sighandler);
 
+       if ((urandom_fd = open("/dev/urandom", O_CLOEXEC | O_RDONLY)) < 0 ||
+                       init_dhcpv6(ifname, request_pd) || ra_init(ifname) ||
+                       script_init(script, ifname)) {
+               syslog(LOG_ERR, "failed to initialize: %s", strerror(errno));
+               return 3;
+       }
+
        if (daemonize) {
                openlog("odhcp6c", LOG_PID, LOG_DAEMON); // Disable LOG_PERROR
                if (daemon(0, 0)) {
@@ -282,7 +290,7 @@ int main(_unused int argc, char* const argv[])
                bound = false;
                script_call("unbound");
 
-               if (server_id_len > 0 && (ia_pd_len > 0 || ia_na_len > 0))
+               if (server_id_len > 0 && (ia_pd_len > 0 || ia_na_len > 0) && release)
                        dhcpv6_request(DHCPV6_MSG_RELEASE);
 
                odhcp6c_clear_state(STATE_IA_NA);
@@ -305,9 +313,11 @@ static int usage(void)
        "       -c <clientid>   Override client-ID (base-16 encoded)\n"
        "       -r <options>    Options to be requested (comma-separated)\n"
        "       -s <script>     Status update script (/usr/sbin/odhcp6c-update)\n"
+       "       -k              Don't send a RELEASE when stopping\n"
        "\nInvocation options:\n"
        "       -p <pidfile>    Set pidfile (/var/run/6relayd.pid)\n"
        "       -d              Daemonize\n"
+       "       -e              Write logmessages to stderr\n"
        //"     -v              Increase logging verbosity\n"
        "       -h              Show this help\n\n";
        write(STDERR_FILENO, buf, sizeof(buf));