X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fdhcp.c;h=3425b6d19d4986bbce2653d7bd1092738c250265;hb=2973e70796e17cff8b76b747f4fc45e77c208681;hp=10e140315644c59878002945e9e005be3407584d;hpb=5b875e36444979b36170cf7074fb3e0f5b970a3e;p=framework%2Fconnectivity%2Fconnman.git diff --git a/src/dhcp.c b/src/dhcp.c index 10e1403..3425b6d 100644 --- a/src/dhcp.c +++ b/src/dhcp.c @@ -2,7 +2,7 @@ * * Connection Manager * - * Copyright (C) 2007-2010 Intel Corporation. All rights reserved. + * Copyright (C) 2007-2012 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -40,7 +40,7 @@ struct connman_dhcp { dhcp_cb callback; char **nameservers; - char *timeserver; + char **timeservers; char *pac; GDHCPClient *dhcp_client; @@ -51,11 +51,11 @@ static GHashTable *network_table; static void dhcp_free(struct connman_dhcp *dhcp) { g_strfreev(dhcp->nameservers); - g_free(dhcp->timeserver); + g_strfreev(dhcp->timeservers); g_free(dhcp->pac); dhcp->nameservers = NULL; - dhcp->timeserver = NULL; + dhcp->timeservers = NULL; dhcp->pac = NULL; } @@ -94,12 +94,18 @@ static void dhcp_invalidate(struct connman_dhcp *dhcp, connman_bool_t callback) __connman_service_set_domainname(service, NULL); __connman_service_set_pac(service, NULL); - __connman_service_timeserver_remove(service, dhcp->timeserver); + + if (dhcp->timeservers != NULL) { + for (i = 0; dhcp->timeservers[i] != NULL; i++) { + __connman_service_timeserver_remove(service, + dhcp->timeservers[i]); + } + } if (dhcp->nameservers != NULL) { for (i = 0; dhcp->nameservers[i] != NULL; i++) { __connman_service_nameserver_remove(service, - dhcp->nameservers[i]); + dhcp->nameservers[i], FALSE); } } @@ -181,7 +187,7 @@ static void lease_available_cb(GDHCPClient *dhcp_client, gpointer user_data) char *address, *netmask = NULL, *gateway = NULL; const char *c_address, *c_gateway; char *domainname = NULL, *hostname = NULL; - char **nameservers, *timeserver = NULL, *pac = NULL; + char **nameservers, **timeservers, *pac = NULL; int ns_entries; struct connman_ipconfig *ipconfig; struct connman_service *service; @@ -221,6 +227,8 @@ static void lease_available_cb(GDHCPClient *dhcp_client, gpointer user_data) gateway = g_strdup(option->data); prefixlen = __connman_ipconfig_netmask_prefix_len(netmask); + if (prefixlen == 255) + connman_warn("netmask: %s is invalid", netmask); DBG("c_address %s", c_address); @@ -238,8 +246,7 @@ static void lease_available_cb(GDHCPClient *dhcp_client, gpointer user_data) ip_change = FALSE; option = g_dhcp_client_get_option(dhcp_client, G_DHCP_DNS_SERVER); - for (ns_entries = 0, list = option; list; list = list->next) - ns_entries += 1; + ns_entries = g_list_length(option); nameservers = g_try_new0(char *, ns_entries + 1); if (nameservers != NULL) { for (i = 0, list = option; list; list = list->next, i++) @@ -256,14 +263,19 @@ static void lease_available_cb(GDHCPClient *dhcp_client, gpointer user_data) hostname = g_strdup(option->data); option = g_dhcp_client_get_option(dhcp_client, G_DHCP_NTP_SERVER); - if (option != NULL) - timeserver = g_strdup(option->data); + ns_entries = g_list_length(option); + timeservers = g_try_new0(char *, ns_entries + 1); + if (timeservers != NULL) { + for (i = 0, list = option; list; list = list->next, i++) + timeservers[i] = g_strdup(list->data); + timeservers[ns_entries] = NULL; + } option = g_dhcp_client_get_option(dhcp_client, 252); if (option != NULL) pac = g_strdup(option->data); - connman_ipconfig_set_method(ipconfig, CONNMAN_IPCONFIG_METHOD_DHCP); + __connman_ipconfig_set_method(ipconfig, CONNMAN_IPCONFIG_METHOD_DHCP); if (ip_change == TRUE) { __connman_ipconfig_set_local(ipconfig, address); @@ -275,33 +287,40 @@ static void lease_available_cb(GDHCPClient *dhcp_client, gpointer user_data) if (dhcp->nameservers != NULL) { for (i = 0; dhcp->nameservers[i] != NULL; i++) { __connman_service_nameserver_remove(service, - dhcp->nameservers[i]); + dhcp->nameservers[i], FALSE); } g_strfreev(dhcp->nameservers); } 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]); + dhcp->nameservers[i], FALSE); } } else { g_strfreev(nameservers); } - if (g_strcmp0(timeserver, dhcp->timeserver) != 0) { - if (dhcp->timeserver != NULL) { - __connman_service_timeserver_remove(service, - dhcp->timeserver); - g_free(dhcp->timeserver); + if (compare_string_arrays(timeservers, dhcp->timeservers) == FALSE) { + if (dhcp->timeservers != NULL) { + for (i = 0; dhcp->timeservers[i] != NULL; i++) { + __connman_service_timeserver_remove(service, + dhcp->timeservers[i]); + } + g_strfreev(dhcp->timeservers); } - dhcp->timeserver = timeserver; + dhcp->timeservers = timeservers; - if (dhcp->timeserver != NULL) + for (i = 0; dhcp->timeservers != NULL && + dhcp->timeservers[i] != NULL; i++) { __connman_service_timeserver_append(service, - dhcp->timeserver); + dhcp->timeservers[i]); + } + } else { + g_strfreev(timeservers); } if (g_strcmp0(pac, dhcp->pac) != 0) { @@ -354,7 +373,7 @@ static void ipv4ll_available_cb(GDHCPClient *dhcp_client, gpointer user_data) prefixlen = __connman_ipconfig_netmask_prefix_len(netmask); - connman_ipconfig_set_method(ipconfig, CONNMAN_IPCONFIG_METHOD_DHCP); + __connman_ipconfig_set_method(ipconfig, CONNMAN_IPCONFIG_METHOD_DHCP); __connman_ipconfig_set_local(ipconfig, address); __connman_ipconfig_set_prefixlen(ipconfig, prefixlen); __connman_ipconfig_set_gateway(ipconfig, NULL); @@ -390,6 +409,8 @@ static int dhcp_request(struct connman_dhcp *dhcp) if (getenv("CONNMAN_DHCP_DEBUG")) g_dhcp_client_set_debug(dhcp_client, dhcp_debug, "DHCP"); + g_dhcp_client_set_id(dhcp_client); + hostname = connman_utsname_get_hostname(); if (hostname != NULL) g_dhcp_client_set_send(dhcp_client, G_DHCP_HOST_NAME, hostname); @@ -468,6 +489,8 @@ int __connman_dhcp_start(struct connman_network *network, dhcp_cb callback) dhcp->network = network; dhcp->callback = callback; + connman_network_ref(network); + g_hash_table_replace(network_table, network, dhcp); return dhcp_request(dhcp); @@ -480,7 +503,8 @@ void __connman_dhcp_stop(struct connman_network *network) if (network_table == NULL) return; - g_hash_table_remove(network_table, network); + if (g_hash_table_remove(network_table, network) == TRUE) + connman_network_unref(network); } int __connman_dhcp_init(void)