Fix stateless mode

[odhcp6c.git] / src / odhcp6c.c

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index fdfc3278840443e82f0249ca9981a14f0ca41cdb..4a9267dc19e490781c7cadf7ac8261ab32755836 100644 (file)
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -62,7 +62,7 @@ int main(_unused int argc, char* const argv[])
        char *optpos;
        uint16_t opttype;
        enum odhcp6c_ia_mode ia_na_mode = IA_MODE_TRY;
-       enum odhcp6c_ia_mode ia_pd_mode = IA_MODE_TRY;
+       enum odhcp6c_ia_mode ia_pd_mode = IA_MODE_NONE;
        int ia_pd_iaid_index = 0;
        static struct in6_addr ifid = IN6ADDR_ANY_INIT;
        int sol_timeout = DHCPV6_SOL_MAX_RT;
@@ -71,10 +71,12 @@ int main(_unused int argc, char* const argv[])
        int bfd_interval = 0, bfd_loss = 3;
 #endif
 
-       bool help = false, daemonize = false, strict_options = false;
+       bool help = false, daemonize = false;
        int logopt = LOG_PID;
        int c;
-       while ((c = getopt(argc, argv, "S::N:P:FB:c:i:r:Rs:kt:hedp:")) != -1) {
+       unsigned int client_options = DHCPV6_CLIENT_FQDN | DHCPV6_ACCEPT_RECONFIGURE;
+
+       while ((c = getopt(argc, argv, "S::N:V:P:FB:c:i:r:Rs:kt:hedp:fa")) != -1) {
                switch (c) {
                case 'S':
                        allow_slaac_only = (optarg) ? atoi(optarg) : -1;
@@ -93,7 +95,18 @@ int main(_unused int argc, char* const argv[])
                        }
                        break;
 
+               case 'V':
+                       l = script_unhexlify(buf, sizeof(buf), optarg);
+                       if (!l)
+                               help=true;
+
+                       odhcp6c_add_state(STATE_VENDORCLASS, buf, l);
+
+                       break;
                case 'P':
+                       if (ia_pd_mode == IA_MODE_NONE)
+                               ia_pd_mode = IA_MODE_TRY;
+
                        if (allow_slaac_only >= 0 && allow_slaac_only < 10)
                                allow_slaac_only = 10;
 
@@ -160,7 +173,7 @@ int main(_unused int argc, char* const argv[])
                        break;
 
                case 'R':
-                       strict_options = true;
+                       client_options |= DHCPV6_STRICT_OPTIONS;
                        break;
 
                case 's':
@@ -187,6 +200,14 @@ int main(_unused int argc, char* const argv[])
                        pidfile = optarg;
                        break;
 
+               case 'f':
+                       client_options &= ~DHCPV6_CLIENT_FQDN;
+                       break;
+
+               case 'a':
+                       client_options &= ~DHCPV6_ACCEPT_RECONFIGURE;
+                       break;
+
                default:
                        help = true;
                        break;
@@ -208,7 +229,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, strict_options, sol_timeout) ||
+                       init_dhcpv6(ifname, client_options, sol_timeout) ||
                        ra_init(ifname, &ifid) || script_init(script, ifname)) {
                syslog(LOG_ERR, "failed to initialize: %s", strerror(errno));
                return 3;
@@ -404,6 +425,7 @@ static int usage(void)
        "       -N <mode>       Mode for requesting addresses [try|force|none]\n"
        "       -P <length>     Request IPv6-Prefix (0 = auto)\n"
        "       -F              Force IPv6-Prefix\n"
+       "       -V <hex-string> Set vendor-class option. string length must be a multiple of 2\n"
 #ifdef EXT_BFD_PING
        "       -B <interval>   Enable BFD ping check\n"
 #endif
@@ -412,6 +434,8 @@ static int usage(void)
        "       -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"
+       "       -a              Don't send Accept Reconfigure option\n"
+       "       -f              Don't send Client FQDN option\n"
        "       -k              Don't send a RELEASE when stopping\n"
        "       -t <seconds>    Maximum timeout for DHCPv6-SOLICIT (120)\n"
        "\nInvocation options:\n"