/**
- * 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
static bool bound = false, release = true;
static time_t last_update = 0;
-
int main(_unused int argc, char* const argv[])
{
// Allocate ressources
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;
bool help = false, daemonize = false;
int logopt = LOG_PID;
- int c, request_pd = 0;
- while ((c = getopt(argc, argv, "S::N:P:FB:c:i:r:s:kt:hedp:")) != -1) {
+ 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) {
switch (c) {
case 'S':
allow_slaac_only = (optarg) ? atoi(optarg) : -1;
}
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;
- request_pd = strtoul(optarg, NULL, 10);
- if (request_pd == 0)
- request_pd = -1;
+ char *iaid_begin;
+ int iaid_len = 0;
+
+ int prefix_length = strtoul(optarg, &iaid_begin, 10);
+
+ if (*iaid_begin != '\0' && *iaid_begin != ',' && *iaid_begin != ':') {
+ syslog(LOG_ERR, "invalid argument: '%s'", optarg);
+ return 1;
+ }
+
+ struct odhcp6c_request_prefix prefix = { 0, prefix_length };
+
+ 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 = htonl(++ia_pd_iaid_index);
+
+ odhcp6c_add_state(STATE_IA_PD_INIT, &prefix, sizeof(prefix));
break;
}
break;
+ case 'R':
+ client_options |= DHCPV6_STRICT_OPTIONS;
+ break;
+
case 's':
script = optarg;
break;
pidfile = optarg;
break;
+ case 'f':
+ client_options &= ~DHCPV6_CLIENT_FQDN;
+ break;
+
+ case 'a':
+ client_options &= ~DHCPV6_ACCEPT_RECONFIGURE;
+ break;
+
default:
help = true;
break;
signal(SIGUSR2, sighandler);
if ((urandom_fd = open("/dev/urandom", O_CLOEXEC | O_RDONLY)) < 0 ||
- init_dhcpv6(ifname, request_pd, 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;
" -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
" -c <clientid> Override client-ID (base-16 encoded)\n"
" -i <iface-id> Use a custom interface identifier for RA handling\n"
" -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"
- " -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"
x->t1 = new->t1;
x->t2 = new->t2;
x->class = new->class;
+ x->iaid = new->iaid;
} else {
odhcp6c_add_state(state, new, sizeof(*new));
}