static void sighandler(int signal);
static int usage(void);
-
static uint8_t *state_data[_STATE_MAX] = {NULL};
static size_t state_len[_STATE_MAX] = {0};
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;
static struct in6_addr ifid = IN6ADDR_ANY_INIT;
+ int sol_timeout = 120;
bool help = false, daemonize = false;
int logopt = LOG_PID;
int c, request_pd = 0;
- while ((c = getopt(argc, argv, "S::N:P:c:i:r:s:khedp:")) != -1) {
+ while ((c = getopt(argc, argv, "S::N:P:Fc:i:r:s:kt:hedp:")) != -1) {
switch (c) {
case 'S':
allow_slaac_only = (optarg) ? atoi(optarg) : -1;
break;
case 'N':
- if (!strcmp(optarg, "force"))
+ if (!strcmp(optarg, "force")) {
ia_na_mode = IA_MODE_FORCE;
- else if (!strcmp(optarg, "none"))
+ allow_slaac_only = -1;
+ } else if (!strcmp(optarg, "none")) {
ia_na_mode = IA_MODE_NONE;
- else if (!strcmp(optarg, "try"))
+ } else if (!strcmp(optarg, "try")) {
ia_na_mode = IA_MODE_TRY;
- else
+ } else{
help = true;
+ }
break;
case 'P':
request_pd = strtoul(optarg, NULL, 10);
if (request_pd == 0)
request_pd = -1;
+
+ ia_pd_mode = IA_MODE_TRY;
+ break;
+
+ case 'F':
+ allow_slaac_only = -1;
+ ia_pd_mode = IA_MODE_FORCE;
break;
case 'c':
release = false;
break;
+ case 't':
+ sol_timeout = atoi(optarg);
+ break;
+
case 'e':
logopt |= LOG_PERROR;
break;
signal(SIGUSR2, sighandler);
if ((urandom_fd = open("/dev/urandom", O_CLOEXEC | O_RDONLY)) < 0 ||
- init_dhcpv6(ifname, request_pd) || ra_init(ifname, &ifid) ||
- script_init(script, ifname)) {
+ init_dhcpv6(ifname, request_pd, sol_timeout) ||
+ ra_init(ifname, &ifid) || script_init(script, ifname)) {
syslog(LOG_ERR, "failed to initialize: %s", strerror(errno));
return 3;
}
odhcp6c_clear_state(STATE_SNTP_FQDN);
odhcp6c_clear_state(STATE_SIP_IP);
odhcp6c_clear_state(STATE_SIP_FQDN);
- dhcpv6_set_ia_na_mode(ia_na_mode);
+ dhcpv6_set_ia_mode(ia_na_mode, ia_pd_mode);
bound = false;
// Server candidates need deep-delete
int res = dhcpv6_request(DHCPV6_MSG_SOLICIT);
odhcp6c_signal_process();
- if (res < 0) {
+ if (res <= 0) {
continue; // Might happen if we got a signal
} else if (res == DHCPV6_STATELESS) { // Stateless mode
while (do_signal == 0 || do_signal == SIGUSR1) {
}
// Stateful mode
- if (dhcpv6_request(DHCPV6_MSG_REQUEST) < 0)
+ if (dhcpv6_request(DHCPV6_MSG_REQUEST) <= 0)
continue;
odhcp6c_signal_process();
// Wait for T1 to expire or until we get a reconfigure
int res = dhcpv6_poll_reconfigure();
odhcp6c_signal_process();
- if (res >= 0) {
- if (res > 0)
- script_call("updated");
-
+ if (res > 0) {
+ script_call("updated");
continue;
}
else
r = dhcpv6_request(DHCPV6_MSG_RENEW);
odhcp6c_signal_process();
- if (r > 0) // Publish updates
+ if (r > 0) { // Renew was succesfull
+ // Publish updates
script_call("updated");
- if (r >= 0)
continue; // Renew was successful
+ }
odhcp6c_clear_state(STATE_SERVER_ID); // Remove binding
odhcp6c_get_state(STATE_IA_PD, &ia_pd_new);
odhcp6c_get_state(STATE_IA_NA, &ia_na_new);
- if (res < 0 || (ia_pd_new == 0 && ia_pd_len) ||
+ if (res <= 0 || (ia_pd_new == 0 && ia_pd_len) ||
(ia_na_new == 0 && ia_na_len))
break; // We lost all our IAs, restart
else if (res > 0)
" -S <time> Wait at least <time> sec for a DHCP-server (0)\n"
" -N <mode> Mode for requesting addresses [try|force|none]\n"
" -P <length> Request IPv6-Prefix (0 = auto)\n"
+ " -F Force IPv6-Prefix\n"
" -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"
" -s <script> Status update script (/usr/sbin/odhcp6c-update)\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"
" -d Daemonize\n"
}
-void odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *new, uint32_t safe)
+bool odhcp6c_update_entry_safe(enum odhcp6c_state state, struct odhcp6c_entry *new, uint32_t safe)
{
size_t len;
struct odhcp6c_entry *x = odhcp6c_find_entry(state, new);
struct odhcp6c_entry *start = odhcp6c_get_state(state, &len);
+ bool changed = true;
if (x && x->valid > new->valid && new->valid < safe)
new->valid = safe;
if (new->valid > 0) {
if (x) {
+ if (new->valid >= x->valid && new->valid - x->valid < 60 &&
+ new->preferred >= x->preferred &&
+ new->preferred - x->preferred < 60 &&
+ x->class == new->class)
+ changed = false;
x->valid = new->valid;
x->preferred = new->preferred;
- x->prefix_class = new->prefix_class;
+ x->t1 = new->t1;
+ x->t2 = new->t2;
+ x->class = new->class;
} else {
odhcp6c_add_state(state, new, sizeof(*new));
}
} else if (x) {
odhcp6c_remove_state(state, (x - start) * sizeof(*x), sizeof(*x));
}
+ return changed;
}
-void odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new)
+bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new)
{
- odhcp6c_update_entry_safe(state, new, 0);
+ return odhcp6c_update_entry_safe(state, new, 0);
}
size_t len;
struct odhcp6c_entry *start = odhcp6c_get_state(state, &len);
for (struct odhcp6c_entry *c = start; c < &start[len / sizeof(*c)]; ++c) {
+ if (c->t1 < elapsed)
+ c->t1 = 0;
+ else if (c->t1 != UINT32_MAX)
+ c->t1 -= elapsed;
+
+ if (c->t2 < elapsed)
+ c->t2 = 0;
+ else if (c->t2 != UINT32_MAX)
+ c->t2 -= elapsed;
+
if (c->preferred < elapsed)
c->preferred = 0;
else if (c->preferred != UINT32_MAX)
read(urandom_fd, buf, len);
}
+bool odhcp6c_is_bound(void)
+{
+ return bound;
+}
static void sighandler(int signal)
{
projects / odhcp6c.git / blobdiff