From 3dd714003534ab1588203f854ac4cb1a7a233262 Mon Sep 17 00:00:00 2001 From: Patrik Flykt Date: Fri, 20 Dec 2013 17:16:20 +0200 Subject: [PATCH] libsystemd-dhcp: Handle T2 Rebinding timeout Reuse existing functionality when adding T2 Rebinding support. --- src/libsystemd-dhcp/dhcp-client.c | 41 +++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/src/libsystemd-dhcp/dhcp-client.c b/src/libsystemd-dhcp/dhcp-client.c index 23669c7f0..a8b9354d6 100644 --- a/src/libsystemd-dhcp/dhcp-client.c +++ b/src/libsystemd-dhcp/dhcp-client.c @@ -328,7 +328,8 @@ static int client_packet_init(sd_dhcp_client *client, uint8_t type, refuse to issue an DHCP lease if 'secs' is set to zero */ message->secs = htobe16(secs); - if (client->state == DHCP_STATE_RENEWING) + if (client->state == DHCP_STATE_RENEWING || + client->state == DHCP_STATE_REBINDING) message->ciaddr = client->lease->address; memcpy(&message->chaddr, &client->mac_addr, ETH_ALEN); @@ -532,13 +533,22 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec, break; + case DHCP_STATE_REBINDING: + + time_left = (client->lease->lifetime - client->lease->t2)/2; + if (time_left < 60) + time_left = 60; + + next_timeout = usec + time_left * USEC_PER_SEC; + + break; + case DHCP_STATE_INIT: case DHCP_STATE_INIT_REBOOT: case DHCP_STATE_REBOOTING: case DHCP_STATE_SELECTING: case DHCP_STATE_REQUESTING: case DHCP_STATE_BOUND: - case DHCP_STATE_REBINDING: if (client->attempt < 64) client->attempt *= 2; @@ -581,6 +591,7 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec, case DHCP_STATE_REQUESTING: case DHCP_STATE_RENEWING: + case DHCP_STATE_REBINDING: err = client_send_request(client, secs); if (err < 0 && client->attempt >= 64) goto error; @@ -592,7 +603,6 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec, case DHCP_STATE_INIT_REBOOT: case DHCP_STATE_REBOOTING: case DHCP_STATE_BOUND: - case DHCP_STATE_REBINDING: break; } @@ -641,7 +651,28 @@ static int client_timeout_expire(sd_event_source *s, uint64_t usec, static int client_timeout_t2(sd_event_source *s, uint64_t usec, void *userdata) { - return 0; + sd_dhcp_client *client = userdata; + int r; + + if (client->fd >= 0) { + client->receive_message = + sd_event_source_unref(client->receive_message); + close(client->fd); + client->fd = -1; + } + + client->state = DHCP_STATE_REBINDING; + client->attempt = 1; + + r = dhcp_network_bind_raw_socket(client->index, &client->link); + if (r < 0) { + client_stop(client, r); + return 0; + } + + client->fd = r; + + return client_initialize_events(client, usec); } static int client_timeout_t1(sd_event_source *s, uint64_t usec, void *userdata) @@ -972,6 +1003,7 @@ static int client_receive_message(sd_event_source *s, int fd, case DHCP_STATE_REQUESTING: case DHCP_STATE_RENEWING: + case DHCP_STATE_REBINDING: r = client_receive_ack(client, buf, len); @@ -1013,7 +1045,6 @@ static int client_receive_message(sd_event_source *s, int fd, case DHCP_STATE_INIT_REBOOT: case DHCP_STATE_REBOOTING: case DHCP_STATE_BOUND: - case DHCP_STATE_REBINDING: break; } -- 2.30.2