Don't export IAID as class if IAID is 1 (default)

[odhcp6c.git] / src / odhcp6c.c

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index 9334c7aa0caab1fd1a8d0eb655ddc27932b656d0..2668d949bdedc9050572f3497ab06e62d04b9870 100644 (file)
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2012-2013 Steven Barth <steven@midlink.org>
+ * Copyright (C) 2012-2014 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
@@ -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;
@@ -76,7 +76,7 @@ int main(_unused int argc, char* const argv[])
        int c;
        unsigned int client_options = DHCPV6_CLIENT_FQDN | DHCPV6_ACCEPT_RECONFIGURE;
 
-       while ((c = getopt(argc, argv, "S::N:P:FB:c:i:r:Rs:kt:hedp:fa")) != -1) {
+       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;
@@ -95,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;
 
@@ -104,7 +115,7 @@ int main(_unused int argc, char* const argv[])
 
                        int prefix_length = strtoul(optarg, &iaid_begin, 10);
 
-                       if (*iaid_begin != '\0' && *iaid_begin != ',') {
+                       if (*iaid_begin != '\0' && *iaid_begin != ',' && *iaid_begin != ':') {
                                syslog(LOG_ERR, "invalid argument: '%s'", optarg);
                                return 1;
                        }
@@ -113,8 +124,10 @@ int main(_unused int argc, char* const argv[])
 
                        if (*iaid_begin == ',' && (iaid_len = strlen(iaid_begin)) > 1)
                                memcpy(&prefix.iaid, iaid_begin + 1, iaid_len > 4 ? 4 : iaid_len);
+                       else if (*iaid_begin == ':')
+                               prefix.iaid = htonl((uint32_t)strtoul(&iaid_begin[1], NULL, 16));
                        else
-                               prefix.iaid = ++ia_pd_iaid_index;
+                               prefix.iaid = htonl(++ia_pd_iaid_index);
 
                        odhcp6c_add_state(STATE_IA_PD_INIT, &prefix, sizeof(prefix));
 
@@ -414,6 +427,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
@@ -427,7 +441,7 @@ static int usage(void)
        "       -k              Don't send a RELEASE when stopping\n"
        "       -t <seconds>    Maximum timeout for DHCPv6-SOLICIT (120)\n"
        "\nInvocation options:\n"
-       "       -p <pidfile>    Set pidfile (/var/run/6relayd.pid)\n"
+       "       -p <pidfile>    Set pidfile (/var/run/odhcp6c.pid)\n"
        "       -d              Daemonize\n"
        "       -e              Write logmessages to stderr\n"
        //"     -v              Increase logging verbosity\n"