diff options
| author | Jukka Rissanen <jukka.rissanen@linux.intel.com> | 2011-07-28 13:20:28 +0300 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-08-09 13:22:54 +0200 |
| commit | 5b875e36444979b36170cf7074fb3e0f5b970a3e (patch) | |
| tree | 87a62ad28048d1a8b3028ea7fbc462d519ffec9b /gdhcp | |
| parent | d7f9c1d864581aeba3a45b1ddb0e1ad46f5184d1 (diff) | |
| download | connman-5b875e36444979b36170cf7074fb3e0f5b970a3e.tar.gz connman-5b875e36444979b36170cf7074fb3e0f5b970a3e.tar.bz2 connman-5b875e36444979b36170cf7074fb3e0f5b970a3e.zip | |
dhcp: Try to reuse the IP address we had last time.
This fix will cause the DHCP_REQUESTED_IP option to be sent to
the server.
Fixes BMC #21068
Diffstat (limited to 'gdhcp')
| -rw-r--r-- | gdhcp/client.c | 27 | ||||
| -rw-r--r-- | gdhcp/gdhcp.h | 2 |
2 files changed, 24 insertions, 5 deletions
diff --git a/gdhcp/client.c b/gdhcp/client.c index 0cf39cd7..8ea75d65 100644 --- a/gdhcp/client.c +++ b/gdhcp/client.c @@ -109,6 +109,7 @@ struct _GDHCPClient { gpointer address_conflict_data; GDHCPDebugFunc debug_func; gpointer debug_data; + char *last_address; }; static inline void debug(GDHCPClient *client, const char *format, ...) @@ -879,7 +880,7 @@ static void restart_dhcp(GDHCPClient *dhcp_client, int retry_times) dhcp_client->requested_ip = 0; switch_listening_mode(dhcp_client, L2); - g_dhcp_client_start(dhcp_client); + g_dhcp_client_start(dhcp_client, dhcp_client->last_address); } static gboolean start_rebound_timeout(gpointer user_data) @@ -1240,7 +1241,12 @@ static gboolean discover_timeout(gpointer user_data) dhcp_client->retry_times++; - g_dhcp_client_start(dhcp_client); + /* + * We do not send the REQUESTED IP option if we are retrying because + * if the server is non-authoritative it will ignore the request if the + * option is present. + */ + g_dhcp_client_start(dhcp_client, NULL); return FALSE; } @@ -1306,9 +1312,10 @@ static gboolean ipv4ll_probe_timeout(gpointer dhcp_data) return FALSE; } -int g_dhcp_client_start(GDHCPClient *dhcp_client) +int g_dhcp_client_start(GDHCPClient *dhcp_client, const char *last_address) { int re; + uint32_t addr; if (dhcp_client->retry_times == DISCOVER_RETRIES) { ipv4ll_start(dhcp_client); @@ -1327,7 +1334,18 @@ int g_dhcp_client_start(GDHCPClient *dhcp_client) dhcp_client->xid = rand(); } - send_discover(dhcp_client, 0); + if (last_address == NULL) { + addr = 0; + } else { + addr = inet_addr(last_address); + if (addr == 0xFFFFFFFF) { + addr = 0; + } else { + g_free(dhcp_client->last_address); + dhcp_client->last_address = g_strdup(last_address); + } + } + send_discover(dhcp_client, addr); dhcp_client->timeout = g_timeout_add_seconds_full(G_PRIORITY_HIGH, DISCOVER_TIMEOUT, @@ -1505,6 +1523,7 @@ void g_dhcp_client_unref(GDHCPClient *dhcp_client) g_free(dhcp_client->interface); g_free(dhcp_client->assigned_ip); + g_free(dhcp_client->last_address); g_list_free(dhcp_client->request_list); g_list_free(dhcp_client->require_list); diff --git a/gdhcp/gdhcp.h b/gdhcp/gdhcp.h index 4f583ff7..d89446e2 100644 --- a/gdhcp/gdhcp.h +++ b/gdhcp/gdhcp.h @@ -73,7 +73,7 @@ typedef void (*GDHCPDebugFunc)(const char *str, gpointer user_data); GDHCPClient *g_dhcp_client_new(GDHCPType type, int index, GDHCPClientError *error); -int g_dhcp_client_start(GDHCPClient *client); +int g_dhcp_client_start(GDHCPClient *client, const char *last_address); void g_dhcp_client_stop(GDHCPClient *client); GDHCPClient *g_dhcp_client_ref(GDHCPClient *client); |