gdhcp: Fix spelling mistake

[framework/connectivity/connman.git] / gdhcp / client.c

diff --git a/gdhcp/client.c b/gdhcp/client.c
index a7bd88a..55810d5 100644 (file)
--- a/gdhcp/client.c
+++ b/gdhcp/client.c
@@ -33,7 +33,6 @@
 
 #include <netpacket/packet.h>
 #include <net/ethernet.h>
-#include <net/if_arp.h>
 
 #include <linux/if.h>
 #include <linux/filter.h>
@@ -44,7 +43,7 @@
 #include "common.h"
 
 #define DISCOVER_TIMEOUT 3
-#define DISCOVER_RETRIES 5
+#define DISCOVER_RETRIES 10
 
 #define REQUEST_TIMEOUT 3
 #define REQUEST_RETRIES 5
@@ -268,70 +267,7 @@ static int send_release(GDHCPClient *dhcp_client,
                                                server, SERVER_PORT);
 }
 
-static gboolean interface_is_up(int index)
-{
-       int sk, err;
-       struct ifreq ifr;
-       gboolean ret = FALSE;
-
-       sk = socket(PF_INET, SOCK_DGRAM, 0);
-       if (sk < 0) {
-               perror("Open socket error");
-               return FALSE;
-       }
 
-       memset(&ifr, 0, sizeof(ifr));
-       ifr.ifr_ifindex = index;
-
-       err = ioctl(sk, SIOCGIFNAME, &ifr);
-       if (err < 0) {
-               perror("Get interface name error");
-               goto done;
-       }
-
-       err = ioctl(sk, SIOCGIFFLAGS, &ifr);
-       if (err < 0) {
-               perror("Get interface flags error");
-               goto done;
-       }
-
-       if (ifr.ifr_flags & IFF_UP)
-               ret = TRUE;
-
-done:
-       close(sk);
-
-       return ret;
-}
-
-static char *get_interface_name(int index)
-{
-       struct ifreq ifr;
-       int sk, err;
-
-       if (index < 0)
-               return NULL;
-
-       sk = socket(PF_INET, SOCK_DGRAM, 0);
-       if (sk < 0) {
-               perror("Open socket error");
-               return NULL;
-       }
-
-       memset(&ifr, 0, sizeof(ifr));
-       ifr.ifr_ifindex = index;
-
-       err = ioctl(sk, SIOCGIFNAME, &ifr);
-       if (err < 0) {
-               perror("Get interface name error");
-               close(sk);
-               return NULL;
-       }
-
-       close(sk);
-
-       return g_strdup(ifr.ifr_name);
-}
 
 static void get_interface_mac_address(int index, uint8_t *mac_address)
 {
@@ -499,6 +435,7 @@ static int dhcp_l2_socket(int ifindex)
                setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &filter_prog,
                                                        sizeof(filter_prog));
 
+       memset(&sock, 0, sizeof(sock));
        sock.sll_family = AF_PACKET;
        sock.sll_protocol = htons(ETH_P_IP);
        sock.sll_ifindex = ifindex;
@@ -600,6 +537,9 @@ static gboolean request_timeout(gpointer user_data)
 {
        GDHCPClient *dhcp_client = user_data;
 
+       debug(dhcp_client, "request timeout (retries %d)",
+                                       dhcp_client->retry_times);
+
        dhcp_client->retry_times++;
 
        start_request(dhcp_client);
@@ -616,6 +556,9 @@ static int switch_listening_mode(GDHCPClient *dhcp_client,
        GIOChannel *listener_channel;
        int listener_sockfd;
 
+       debug(dhcp_client, "switch listening mode (%d ==> %d)",
+                               dhcp_client->listen_mode, listen_mode);
+
        if (dhcp_client->listen_mode == listen_mode)
                return 0;
 
@@ -665,6 +608,9 @@ static int switch_listening_mode(GDHCPClient *dhcp_client,
 
 static void start_request(GDHCPClient *dhcp_client)
 {
+       debug(dhcp_client, "start request (retries %d)",
+                                       dhcp_client->retry_times);
+
        if (dhcp_client->retry_times == REQUEST_RETRIES) {
                dhcp_client->state = INIT_SELECTING;
 
@@ -710,6 +656,8 @@ static uint32_t get_lease(struct dhcp_packet *packet)
 
 static void restart_dhcp(GDHCPClient *dhcp_client, int retry_times)
 {
+       debug(dhcp_client, "restart DHCP (retries %d)", retry_times);
+
        if (dhcp_client->timeout > 0) {
                g_source_remove(dhcp_client->timeout);
                dhcp_client->timeout = 0;
@@ -726,6 +674,8 @@ static gboolean start_rebound_timeout(gpointer user_data)
 {
        GDHCPClient *dhcp_client = user_data;
 
+       debug(dhcp_client, "start rebound timeout");
+
        switch_listening_mode(dhcp_client, L2);
 
        dhcp_client->lease_seconds >>= 1;
@@ -755,6 +705,8 @@ static gboolean start_rebound_timeout(gpointer user_data)
 
 static void start_rebound(GDHCPClient *dhcp_client)
 {
+       debug(dhcp_client, "start rebound");
+
        dhcp_client->state = REBINDING;
 
        dhcp_client->timeout = g_timeout_add_seconds_full(G_PRIORITY_HIGH,
@@ -768,6 +720,8 @@ static gboolean start_renew_timeout(gpointer user_data)
 {
        GDHCPClient *dhcp_client = user_data;
 
+       debug(dhcp_client, "start renew timeout");
+
        dhcp_client->state = RENEWING;
 
        dhcp_client->lease_seconds >>= 1;
@@ -791,6 +745,8 @@ static gboolean start_renew_timeout(gpointer user_data)
 
 static void start_bound(GDHCPClient *dhcp_client)
 {
+       debug(dhcp_client, "start bound");
+
        dhcp_client->state = BOUND;
 
        dhcp_client->timeout = g_timeout_add_seconds_full(G_PRIORITY_HIGH,
@@ -803,6 +759,8 @@ static gboolean restart_dhcp_timeout(gpointer user_data)
 {
        GDHCPClient *dhcp_client = user_data;
 
+       debug(dhcp_client, "restart DHCP timeout");
+
        dhcp_client->ack_retry_times++;
 
        restart_dhcp(dhcp_client, dhcp_client->ack_retry_times);
@@ -887,20 +845,26 @@ static char *malloc_option_value_string(uint8_t *option, GDHCPOptionType type)
        return ret;
 }
 
-static GList *get_option_value_list(char *value)
+static GList *get_option_value_list(char *value, GDHCPOptionType type)
 {
        char *pos = value;
        GList *list = NULL;
 
+       if (pos == NULL)
+               return NULL;
+
+       if (type == OPTION_STRING)
+               return g_list_append(list, g_strdup(value));
+
        while ((pos = strchr(pos, ' ')) != NULL) {
                *pos = '\0';
 
-               list =  g_list_append(list, g_strdup(value));
+               list = g_list_append(list, g_strdup(value));
 
                value = ++pos;
        }
 
-       list =  g_list_append(list, g_strdup(value));
+       list = g_list_append(list, g_strdup(value));
 
        return list;
 }
@@ -930,7 +894,7 @@ static void get_request(GDHCPClient *dhcp_client, struct dhcp_packet *packet)
                        g_hash_table_remove(dhcp_client->code_value_hash,
                                                GINT_TO_POINTER((int) code));
 
-               value_list = get_option_value_list(option_value);
+               value_list = get_option_value_list(option_value, type);
 
                g_free(option_value);
 
@@ -974,7 +938,7 @@ static gboolean listener_event(GIOChannel *channel, GIOCondition condition,
 
        message_type = dhcp_get_option(&packet, DHCP_MESSAGE_TYPE);
        if (message_type == NULL)
-               /* No message type option, ignore pakcage */
+               /* No message type option, ignore package */
                return TRUE;
 
        debug(dhcp_client, "received DHCP packet (current state %d)",