[PATCH dhcp 2/4] gdhcp: Enable DHCP REQUESTED IP address option when starting client.

[Jukka Rissanen]

---
 gdhcp/client.c |   22 ++++++++++++++++++----
 gdhcp/gdhcp.h  |    2 +-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/gdhcp/client.c b/gdhcp/client.c
index 0cf39cd..9ac7752 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,7 @@ static gboolean discover_timeout(gpointer user_data)
 
        dhcp_client->retry_times++;
 
-       g_dhcp_client_start(dhcp_client);
+       g_dhcp_client_start(dhcp_client, dhcp_client->last_address);
 
        return FALSE;
 }
@@ -1306,9 +1307,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 +1329,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 +1518,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 4f583ff..d89446e 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);
-- 
1.7.1

_______________________________________________
connman mailing list
connman@connman.net
http://lists.connman.net/listinfo/connman