Revert "Revert to old behaviour regarding information requests"
authorSteven Barth <steven@midlink.org>
Wed, 9 Apr 2014 06:47:53 +0000 (08:47 +0200)
committerSteven Barth <steven@midlink.org>
Wed, 9 Apr 2014 06:48:37 +0000 (08:48 +0200)
This reverts commit c98181c4a48c57e405effd1dc9046aaaee6d480f.

src/dhcpv6.c
src/odhcp6c.c

index 6e5e8ba..0d206f3 100644 (file)
@@ -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);
index 96865c7..36e9949 100644 (file)
@@ -372,16 +372,7 @@ int main(_unused int argc, char* const argv[])
                                        break; // Other signal type
 
                                // Send renew as T1 expired
-                               size_t ia_pd_len, ia_na_len;
-                               odhcp6c_get_state(STATE_IA_PD, &ia_pd_len);
-                               odhcp6c_get_state(STATE_IA_NA, &ia_na_len);
-
-                               // If we have any IAs, send renew, otherwise request
-                               if (ia_pd_len == 0 && ia_na_len == 0)
-                                       res = dhcpv6_request(DHCPV6_MSG_REQUEST);
-                               else
-                                       res = dhcpv6_request(DHCPV6_MSG_RENEW);
-
+                               res = dhcpv6_request(DHCPV6_MSG_RENEW);
                                odhcp6c_signal_process();
                                if (res > 0) { // Renew was succesfull
                                        // Publish updates