X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fodhcp6c.c;h=4a9267dc19e490781c7cadf7ac8261ab32755836;hp=9334c7aa0caab1fd1a8d0eb655ddc27932b656d0;hb=3f3f2531deacf11afbc4f96f6dfbf8c47753215d;hpb=dc30922e418be6271ad177f3f9d4ecf0c1eb3f01 diff --git a/src/odhcp6c.c b/src/odhcp6c.c index 9334c7a..4a9267d 100644 --- 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; @@ -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; @@ -414,6 +425,7 @@ static int usage(void) " -N Mode for requesting addresses [try|force|none]\n" " -P Request IPv6-Prefix (0 = auto)\n" " -F Force IPv6-Prefix\n" + " -V Set vendor-class option. string length must be a multiple of 2\n" #ifdef EXT_BFD_PING " -B Enable BFD ping check\n" #endif