diff options
| author | Steven Barth <steven@midlink.org> | 2014-04-09 08:47:53 +0200 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2014-04-09 08:48:37 +0200 |
| commit | 3dabd4b1c14df34f0a315c3e329d73ba27ac42b5 (patch) | |
| tree | 2e29cc3a08757a56cdbfb243aafbd0990f9cea49 /src/dhcpv6.c | |
| parent | dbe066616e7fb2d1845066c471ad619af8ee987c (diff) | |
| download | odhcp6c-3dabd4b1c14df34f0a315c3e329d73ba27ac42b5.tar.gz | |
Revert "Revert to old behaviour regarding information requests"
This reverts commit c98181c4a48c57e405effd1dc9046aaaee6d480f.
Diffstat (limited to 'src/dhcpv6.c')
| -rw-r--r-- | src/dhcpv6.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/dhcpv6.c b/src/dhcpv6.c index 6e5e8ba..0d206f3 100644 --- a/src/dhcpv6.c +++ b/src/dhcpv6.c @@ -1231,8 +1231,6 @@ static int dhcpv6_calc_refresh_timers(void) t1 = l_t1; t2 = l_t2; t3 = l_t3; - } else { - t1 = 600; } return (int)(ia_pd_entries + ia_na_entries); @@ -1370,8 +1368,7 @@ int dhcpv6_promote_server_cand(void) size_t cand_len; struct dhcpv6_server_cand *cand = odhcp6c_get_state(STATE_SERVER_CAND, &cand_len); uint16_t hdr[2]; - int ret = (na_mode == IA_MODE_NONE && pd_mode == IA_MODE_NONE) ? - DHCPV6_STATELESS : DHCPV6_STATEFUL; + int ret = DHCPV6_STATELESS; // Clear lingering candidate state info odhcp6c_clear_state(STATE_SERVER_ID); |