Add user-class option

[odhcp6c.git] / src / odhcp6c.c

diff --git a/src/odhcp6c.c b/src/odhcp6c.c
index abb88f6c52d35104980df8fa78a53dcc652998b0..dbe2bdf04528997b0f015b39e66f9c79b0abb5dc 100644 (file)
--- a/src/odhcp6c.c
+++ b/src/odhcp6c.c
@@ -61,6 +61,7 @@ int main(_unused int argc, char* const argv[])
        uint8_t buf[134];
        char *optpos;
        uint16_t opttype;
+       uint16_t optlen;
        enum odhcp6c_ia_mode ia_na_mode = IA_MODE_TRY;
        enum odhcp6c_ia_mode ia_pd_mode = IA_MODE_NONE;
        int ia_pd_iaid_index = 0;
@@ -76,7 +77,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:V:P:FB:c:i:r:Rs:kt:hedp:fa")) != -1) {
+       while ((c = getopt(argc, argv, "S::N:V:P:FB:c:i:r:Ru:s:kt:hedp:fa")) != -1) {
                switch (c) {
                case 'S':
                        allow_slaac_only = (optarg) ? atoi(optarg) : -1;
@@ -115,7 +116,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;
                        }
@@ -124,8 +125,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));
 
@@ -176,6 +179,12 @@ int main(_unused int argc, char* const argv[])
                        client_options |= DHCPV6_STRICT_OPTIONS;
                        break;
 
+               case 'u':
+                       optlen = htons(strlen(optarg));
+                       odhcp6c_add_state(STATE_USERCLASS, &optlen, 2);
+                       odhcp6c_add_state(STATE_USERCLASS, optarg, strlen(optarg));
+                       break;
+
                case 's':
                        script = optarg;
                        break;