X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fdhcp.c;h=7c446cf81e246c10418e30ccfdc58a901916c55d;hb=00b8c314dc2cfb641494d413f4b00d90a10ecbeb;hp=1af1eb5201c5cbaba6c9ae150baf310dfbf412a1;hpb=9362752a471a5c892d679548fbf2828d5fc5684b;p=platform%2Fupstream%2Fconnman.git

diff --git a/src/dhcp.c b/src/dhcp.c
index 1af1eb5..7c446cf 100644
--- a/src/dhcp.c
+++ b/src/dhcp.c
@@ -67,6 +67,9 @@ static GHashTable *ipconfig_table;
 
 static void dhcp_free(struct connman_dhcp *dhcp)
 {
+#if defined TIZEN_EXT
+	DBG("dhcp_free [%p]", dhcp);
+#endif
 	g_strfreev(dhcp->nameservers);
 	g_strfreev(dhcp->timeservers);
 	g_free(dhcp->pac);
@@ -76,10 +79,16 @@ static void dhcp_free(struct connman_dhcp *dhcp)
 	dhcp->pac = NULL;
 
 	g_free(dhcp);
+#if defined TIZEN_EXT
+	dhcp = NULL;
+#endif
 }
 
 static void ipv4ll_stop_client(struct connman_dhcp *dhcp)
 {
+#if defined TIZEN_EXT
+	DBG("dhcp [%p] ipv4ll_client [%p]", dhcp, dhcp->ipv4ll_client);
+#endif
 	if (!dhcp->ipv4ll_client)
 		return;
 
@@ -119,8 +128,14 @@ static bool apply_dhcp_invalidate_on_network(struct connman_dhcp *dhcp)
 	}
 	if (dhcp->nameservers) {
 		for (i = 0; dhcp->nameservers[i]; i++) {
+#if defined TIZEN_EXT
+			__connman_service_nameserver_remove(service,
+					dhcp->nameservers[i], false,
+					CONNMAN_IPCONFIG_TYPE_IPV4);
+#else
 			__connman_service_nameserver_remove(service,
 						dhcp->nameservers[i], false);
+#endif
 		}
 		g_strfreev(dhcp->nameservers);
 		dhcp->nameservers = NULL;
@@ -193,6 +208,10 @@ static int ipv4ll_start_client(struct connman_dhcp *dhcp)
 	int index;
 	int err;
 
+#if defined TIZEN_EXT
+	DBG("dhcp %p", dhcp);
+#endif
+
 	if (dhcp->ipv4ll_client)
 		return -EALREADY;
 
@@ -202,12 +221,16 @@ static int ipv4ll_start_client(struct connman_dhcp *dhcp)
 	if (error != G_DHCP_CLIENT_ERROR_NONE)
 		return -EINVAL;
 
+#if !defined TIZEN_EXT
 	if (getenv("CONNMAN_DHCP_DEBUG")) {
+#endif
 		dhcp->ipv4ll_debug_prefix = g_strdup_printf("IPv4LL index %d",
 							index);
 		g_dhcp_client_set_debug(ipv4ll_client, dhcp_debug,
 					dhcp->ipv4ll_debug_prefix);
+#if !defined TIZEN_EXT
 	}
+#endif
 
 	g_dhcp_client_set_id(ipv4ll_client);
 
@@ -243,6 +266,10 @@ static gboolean dhcp_retry_cb(gpointer user_data)
 
 	dhcp->timeout = 0;
 
+#if defined TIZEN_EXT
+	DBG("dhcp %p", dhcp);
+	DBG("dhcp->timeout %d", dhcp->timeout);
+#endif
 	g_dhcp_client_start(dhcp->dhcp_client,
 			__connman_ipconfig_get_dhcp_address(dhcp->ipconfig));
 
@@ -257,6 +284,22 @@ static void no_lease_cb(GDHCPClient *dhcp_client, gpointer user_data)
 	DBG("No lease available ipv4ll %d client %p", dhcp->ipv4ll_running,
 		dhcp->ipv4ll_client);
 
+#if defined TIZEN_EXT
+	if (dhcp->network &&
+			connman_network_get_bool(dhcp->network, "WiFi.RoamingDHCP")) {
+		connman_network_set_bool(dhcp->network, "WiFi.RoamingDHCP", false);
+		__connman_network_enable_ipconfig(dhcp->network, dhcp->ipconfig);
+
+		return;
+	}
+
+	if (connman_setting_get_bool("EnableAutoIp") == false) {
+		DBG("link-local address autoconfiguration is disabled.");
+		if (dhcp->network)
+			__connman_network_disconnect(dhcp->network);
+		return;
+	}
+#endif
 	if (dhcp->timeout > 0)
 		g_source_remove(dhcp->timeout);
 
@@ -382,18 +425,32 @@ static bool apply_lease_available_on_network(GDHCPClient *dhcp_client,
 
 	if (!compare_string_arrays(nameservers, dhcp->nameservers)) {
 		if (dhcp->nameservers) {
+#if defined TIZEN_EXT
+			for (i = 0; dhcp->nameservers[i] != NULL; i++) {
+				__connman_service_nameserver_remove(service,
+						dhcp->nameservers[i], false,
+						CONNMAN_IPCONFIG_TYPE_IPV4);
+			}
+#else
 			for (i = 0; dhcp->nameservers[i]; i++) {
 				__connman_service_nameserver_remove(service,
 						dhcp->nameservers[i], false);
 			}
+#endif
 			g_strfreev(dhcp->nameservers);
 		}
 
 		dhcp->nameservers = nameservers;
 
 		for (i = 0; dhcp->nameservers && dhcp->nameservers[i]; i++) {
+#if defined TIZEN_EXT
+			__connman_service_nameserver_append(service,
+						dhcp->nameservers[i], false,
+						CONNMAN_IPCONFIG_TYPE_IPV4);
+#else
 			__connman_service_nameserver_append(service,
 						dhcp->nameservers[i], false);
+#endif
 		}
 	} else {
 		g_strfreev(nameservers);
@@ -458,6 +515,10 @@ static void lease_available_cb(GDHCPClient *dhcp_client, gpointer user_data)
 	__connman_ipconfig_set_dhcp_address(dhcp->ipconfig, address);
 	DBG("last address %s", address);
 
+#if defined TIZEN_EXT
+	int dhcp_lease_duration = g_dhcp_client_get_dhcp_lease_duration(dhcp_client);
+#endif
+
 	option = g_dhcp_client_get_option(dhcp_client, G_DHCP_SUBNET);
 	if (option)
 		netmask = g_strdup(option->data);
@@ -492,6 +553,10 @@ static void lease_available_cb(GDHCPClient *dhcp_client, gpointer user_data)
 	__connman_ipconfig_set_method(dhcp->ipconfig,
 						CONNMAN_IPCONFIG_METHOD_DHCP);
 
+#if defined TIZEN_EXT
+	__connman_ipconfig_set_dhcp_lease_duration(dhcp->ipconfig, dhcp_lease_duration);
+#endif
+
 	/*
 	 * Notify IPv4.Configuration's method moved back to DHCP.
 	 *
@@ -506,6 +571,17 @@ static void lease_available_cb(GDHCPClient *dhcp_client, gpointer user_data)
 			__connman_service_notify_ipv4_configuration(service);
 	}
 
+#if defined TIZEN_EXT
+	if (connman_network_get_bool(dhcp->network, "WiFi.RoamingDHCP")) {
+
+		if (ip_change)
+			connman_service_notify_reconnection(
+				connman_service_lookup_from_network(dhcp->network));
+
+		connman_network_set_bool(dhcp->network, "WiFi.RoamingDHCP", false);
+	}
+#endif
+
 	if (ip_change) {
 		__connman_ipconfig_set_local(dhcp->ipconfig, address);
 		__connman_ipconfig_set_prefixlen(dhcp->ipconfig, prefixlen);
@@ -580,14 +656,25 @@ static int dhcp_initialize(struct connman_dhcp *dhcp)
 
 	dhcp_client = g_dhcp_client_new(G_DHCP_IPV4, index, &error);
 	if (error != G_DHCP_CLIENT_ERROR_NONE)
+#if defined TIZEN_EXT
+	{
+		DBG("failed g_dhcp_client_new(%d), index(%d)", error, index);
+#endif
 		return -EINVAL;
+#if defined TIZEN_EXT
+	}
+#endif
 
+#if !defined TIZEN_EXT
 	if (getenv("CONNMAN_DHCP_DEBUG")) {
+#endif
 		dhcp->dhcp_debug_prefix = g_strdup_printf("DHCP index %d",
 							index);
 		g_dhcp_client_set_debug(dhcp_client, dhcp_debug,
 					dhcp->dhcp_debug_prefix);
+#if !defined TIZEN_EXT
 	}
+#endif
 
 	g_dhcp_client_set_id(dhcp_client);
 
@@ -616,7 +703,7 @@ static int dhcp_initialize(struct connman_dhcp *dhcp)
 	g_dhcp_client_set_request(dhcp_client, G_DHCP_ROUTER);
 	g_dhcp_client_set_request(dhcp_client, G_DHCP_SUBNET);
 
-	vendor_class_id = connman_option_get_string("VendorClassID");
+	vendor_class_id = connman_setting_get_string("VendorClassID");
 	if (vendor_class_id)
 		g_dhcp_client_set_send(dhcp_client, G_DHCP_VENDOR_CLASS_ID,
 					vendor_class_id);
@@ -671,11 +758,48 @@ char *__connman_dhcp_get_server_address(struct connman_ipconfig *ipconfig)
 	return g_dhcp_client_get_server_address(dhcp->dhcp_client);
 }
 
+#if defined TIZEN_EXT_WIFI_MESH
+int __connman_mesh_dhcp_start(struct connman_ipconfig *ipconfig,
+			dhcp_cb callback, gpointer user_data)
+{
+	struct connman_dhcp *dhcp;
+	int err;
+
+	DBG("");
+
+	dhcp = g_hash_table_lookup(ipconfig_table, ipconfig);
+	if (!dhcp) {
+
+		dhcp = g_try_new0(struct connman_dhcp, 1);
+		if (!dhcp)
+			return -ENOMEM;
+
+		dhcp->ipconfig = ipconfig;
+		__connman_ipconfig_ref(ipconfig);
+
+		err = dhcp_initialize(dhcp);
+
+		if (err < 0) {
+			g_free(dhcp);
+			return err;
+		}
+
+		g_hash_table_insert(ipconfig_table, ipconfig, dhcp);
+	}
+
+	dhcp->callback = callback;
+	dhcp->user_data = user_data;
+	return g_dhcp_client_start(dhcp->dhcp_client, NULL);
+}
+#endif
+
 int __connman_dhcp_start(struct connman_ipconfig *ipconfig,
 			struct connman_network *network, dhcp_cb callback,
 			gpointer user_data)
 {
+#if !defined TIZEN_EXT
 	const char *last_addr = NULL;
+#endif
 	struct connman_dhcp *dhcp;
 	int err;
 
@@ -689,7 +813,9 @@ int __connman_dhcp_start(struct connman_ipconfig *ipconfig,
 			return -EINVAL;
 	}
 
+#if !defined TIZEN_EXT
 	last_addr = __connman_ipconfig_get_dhcp_address(ipconfig);
+#endif
 
 	dhcp = g_hash_table_lookup(ipconfig_table, ipconfig);
 	if (!dhcp) {
@@ -721,7 +847,19 @@ int __connman_dhcp_start(struct connman_ipconfig *ipconfig,
 	dhcp->callback = callback;
 	dhcp->user_data = user_data;
 
+#if defined TIZEN_EXT
+	if (connman_network_get_bool(network, "WiFi.RoamingDHCP")) {
+		const char *last_addr = __connman_ipconfig_get_dhcp_address(ipconfig);
+
+		DBG("Start DHCP with last address request");
+		return g_dhcp_client_start(dhcp->dhcp_client, last_addr);
+	} else {
+		DBG("Start DHCP with DHCPDISCOVER request");
+		return g_dhcp_client_start(dhcp->dhcp_client, NULL);
+	}
+#else
 	return g_dhcp_client_start(dhcp->dhcp_client, last_addr);
+#endif
 }
 
 void __connman_dhcp_stop(struct connman_ipconfig *ipconfig)
@@ -745,6 +883,30 @@ void __connman_dhcp_stop(struct connman_ipconfig *ipconfig)
 	}
 }
 
+void __connman_dhcp_decline(struct connman_ipconfig *ipconfig)
+{
+	struct connman_dhcp *dhcp;
+	const char *address;
+	struct in_addr addr;
+
+	DBG("ipconfig_table %p ipconfig %p", ipconfig_table, ipconfig);
+
+	if (!ipconfig_table)
+		return;
+
+	dhcp = g_hash_table_lookup(ipconfig_table, ipconfig);
+	if (dhcp) {
+		address = __connman_ipconfig_get_local(ipconfig);
+		if (!address)
+			return;
+
+		if (inet_pton(AF_INET, address, &addr) != 1)
+			connman_error("Could not convert address %s", address);
+
+		g_dhcp_client_decline(dhcp->dhcp_client, htonl(addr.s_addr));
+	}
+}
+
 int __connman_dhcp_init(void)
 {
 	DBG("");
@@ -761,6 +923,4 @@ void __connman_dhcp_cleanup(void)
 
 	g_hash_table_destroy(ipconfig_table);
 	ipconfig_table = NULL;
-
-	dhcp_cleanup_random();
 }