From: Niraj Kumar Goit Date: Thu, 27 Sep 2018 11:48:05 +0000 (+0530) Subject: Added support to update EAP manual IP. X-Git-Tag: submit/tizen/20181004.140159^0 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2Fconnman.git;a=commitdiff_plain;h=ae2e73a206fa707a9f490f0e7c51a855ed874cbe Added support to update EAP manual IP. Added support to update EAP manual IP setting using wifi_manager_update_ap() Change-Id: Ifa331ec3b1e4bd95262f63698d32f65e6128518c Signed-off-by: Niraj Kumar Goit --- diff --git a/src/config.c b/src/config.c index 0126711..11f0bd8 100644 --- a/src/config.c +++ b/src/config.c @@ -1285,6 +1285,12 @@ static int try_provision_service(struct connman_config_service *config, return -ENOENT; } +#if defined TIZEN_EXT + struct connman_ipconfig *ip6config = __connman_service_get_ip6config(service); + enum connman_ipconfig_method ipv6_method = __connman_ipconfig_get_method(ip6config); + if (ipv6_method == CONNMAN_IPCONFIG_METHOD_MANUAL) + goto ipv6_out; +#endif if (!config->ipv6_address) { connman_network_set_ipv6_method(network, CONNMAN_IPCONFIG_METHOD_AUTO); @@ -1321,6 +1327,9 @@ static int try_provision_service(struct connman_config_service *config, connman_ipaddress_free(address); } +#if defined TIZEN_EXT +ipv6_out: +#endif if (config->ipv6_privacy) { struct connman_ipconfig *ipconfig; @@ -1330,6 +1339,12 @@ static int try_provision_service(struct connman_config_service *config, config->ipv6_privacy); } +#if defined TIZEN_EXT + struct connman_ipconfig *ip4config = __connman_service_get_ip4config(service); + enum connman_ipconfig_method ipv4_method = __connman_ipconfig_get_method(ip4config); + if (ipv4_method == CONNMAN_IPCONFIG_METHOD_MANUAL) + goto ipv4_out; +#endif if (!config->ipv4_address) { connman_network_set_ipv4_method(network, CONNMAN_IPCONFIG_METHOD_DHCP); @@ -1366,6 +1381,9 @@ static int try_provision_service(struct connman_config_service *config, connman_ipaddress_free(address); } +#if defined TIZEN_EXT +ipv4_out: +#endif __connman_service_disconnect(service); service_id = __connman_service_get_ident(service); @@ -1432,7 +1450,9 @@ static int try_provision_service(struct connman_config_service *config, return 0; } +#if !defined TIZEN_EXT __connman_service_set_immutable(service, true); +#endif if (type == CONNMAN_SERVICE_TYPE_ETHERNET || type == CONNMAN_SERVICE_TYPE_GADGET) { diff --git a/src/service.c b/src/service.c index bc08157..e0947e9 100644 --- a/src/service.c +++ b/src/service.c @@ -8599,8 +8599,15 @@ static int service_register(struct connman_service *service) DBG("path %s", service->path); +#if defined TIZEN_EXT + service_load(service); + int ret = __connman_config_provision_service(service); + if (ret < 0) + DBG("Failed to provision service"); +#else if (__connman_config_provision_service(service) < 0) service_load(service); +#endif g_dbus_register_interface(connection, service->path, CONNMAN_SERVICE_INTERFACE,