dnsproxy: Only one copy of the relevant buffers will be made to a TCP request

[framework/connectivity/connman.git] / src / dhcpv6.c

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index 5d09799..574b19e 100644 (file)
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -291,7 +291,8 @@ static void info_req_cb(GDHCPClient *dhcp_client, gpointer user_data)
 
                dhcp->nameservers = nameservers;
 
-               for (i = 0; dhcp->nameservers[i] != NULL; i++)
+               for (i = 0; dhcp->nameservers != NULL &&
+                                       dhcp->nameservers[i] != NULL; i++)
                        __connman_service_nameserver_append(service,
                                                dhcp->nameservers[i],
                                                FALSE);
@@ -318,7 +319,8 @@ static void info_req_cb(GDHCPClient *dhcp_client, gpointer user_data)
 
                dhcp->timeservers = timeservers;
 
-               for (i = 0; dhcp->timeservers[i] != NULL; i++)
+               for (i = 0; dhcp->timeservers != NULL &&
+                                       dhcp->timeservers[i] != NULL; i++)
                        __connman_service_timeserver_append(service,
                                                        dhcp->timeservers[i]);
        } else
@@ -343,20 +345,24 @@ static int dhcpv6_info_request(struct connman_dhcpv6 *dhcp)
        index = connman_network_get_index(dhcp->network);
 
        dhcp_client = g_dhcp_client_new(G_DHCP_IPV6, index, &error);
-       if (error != G_DHCP_CLIENT_ERROR_NONE)
+       if (error != G_DHCP_CLIENT_ERROR_NONE) {
+               clear_timer(dhcp);
                return -EINVAL;
+       }
 
        if (getenv("CONNMAN_DHCPV6_DEBUG"))
                g_dhcp_client_set_debug(dhcp_client, dhcpv6_debug, "DHCPv6");
 
        service = __connman_service_lookup_from_network(dhcp->network);
        if (service == NULL) {
+               clear_timer(dhcp);
                g_dhcp_client_unref(dhcp_client);
                return -EINVAL;
        }
 
        ret = set_duid(service, dhcp->network, dhcp_client, index);
        if (ret < 0) {
+               clear_timer(dhcp);
                g_dhcp_client_unref(dhcp_client);
                return ret;
        }
@@ -465,7 +471,8 @@ static int set_addresses(GDHCPClient *dhcp_client,
 
                dhcp->nameservers = nameservers;
 
-               for (i = 0; dhcp->nameservers[i] != NULL; i++)
+               for (i = 0; dhcp->nameservers != NULL &&
+                                       dhcp->nameservers[i] != NULL; i++)
                        __connman_service_nameserver_append(service,
                                                        dhcp->nameservers[i],
                                                        FALSE);
@@ -492,7 +499,8 @@ static int set_addresses(GDHCPClient *dhcp_client,
 
                dhcp->timeservers = timeservers;
 
-               for (i = 0; dhcp->timeservers[i] != NULL; i++)
+               for (i = 0; dhcp->timeservers != NULL &&
+                                       dhcp->timeservers[i] != NULL; i++)
                        __connman_service_timeserver_append(service,
                                                        dhcp->timeservers[i]);
        } else
@@ -1092,20 +1100,24 @@ static int dhcpv6_solicitation(struct connman_dhcpv6 *dhcp)
        index = connman_network_get_index(dhcp->network);
 
        dhcp_client = g_dhcp_client_new(G_DHCP_IPV6, index, &error);
-       if (error != G_DHCP_CLIENT_ERROR_NONE)
+       if (error != G_DHCP_CLIENT_ERROR_NONE) {
+               clear_timer(dhcp);
                return -EINVAL;
+       }
 
        if (getenv("CONNMAN_DHCPV6_DEBUG"))
                g_dhcp_client_set_debug(dhcp_client, dhcpv6_debug, "DHCPv6");
 
        service = __connman_service_lookup_from_network(dhcp->network);
        if (service == NULL) {
+               clear_timer(dhcp);
                g_dhcp_client_unref(dhcp_client);
                return -EINVAL;
        }
 
        ret = set_duid(service, dhcp->network, dhcp_client, index);
        if (ret < 0) {
+               clear_timer(dhcp);
                g_dhcp_client_unref(dhcp_client);
                return ret;
        }