X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fodhcp6c.c;h=36e9949f3a5c644ddd0a488e9e36f69f929aa734;hp=ba11ced6d23af32e47676f40159951f6341fa6b9;hb=3dabd4b1c14df34f0a315c3e329d73ba27ac42b5;hpb=5b98f902f616bd9b96a2128587bc6995555a43c1 diff --git a/src/odhcp6c.c b/src/odhcp6c.c index ba11ced..36e9949 100644 --- a/src/odhcp6c.c +++ b/src/odhcp6c.c @@ -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 @@ -391,6 +382,12 @@ int main(_unused int argc, char* const argv[]) odhcp6c_clear_state(STATE_SERVER_ID); // Remove binding + odhcp6c_get_state(STATE_IA_PD, &ia_pd_len); + odhcp6c_get_state(STATE_IA_NA, &ia_na_len); + + if (ia_pd_len == 0 && ia_na_len == 0) + break; + // If we have IAs, try rebind otherwise restart res = dhcpv6_request(DHCPV6_MSG_REBIND); odhcp6c_signal_process(); @@ -444,6 +441,7 @@ static int usage(void) #ifdef EXT_BFD_PING " -B Enable BFD ping check\n" #endif + " -u Set user-class option string\n" " -c Override client-ID (base-16 encoded)\n" " -i Use a custom interface identifier for RA handling\n" " -r Options to be requested (comma-separated)\n"