Maintain connection status when wifi roaming
[platform/upstream/connman.git] / src / network.c
old mode 100644 (file)
new mode 100755 (executable)
index dca18ae..8eb8c1e
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2010  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2014  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
 #include <string.h>
 
 #include "connman.h"
+#include <connman/acd.h>
+#include "src/shared/arp.h"
 
-static unsigned int hidden_counter = 0;
+/*
+ * How many times to send RS with the purpose of
+ * refreshing RDNSS entries before they actually expire.
+ * With a value of 1, one RS will be sent, with no retries.
+ */
+#define RS_REFRESH_COUNT       1
+
+/*
+ * Value in seconds to wait for RA after RS was sent.
+ * After this time elapsed, we can send another RS.
+ */
+#define RS_REFRESH_TIMEOUT     3
+
+/*
+ * As per RFC 4861, a host should transmit up to MAX_RTR_SOLICITATIONS(3)
+ * Router Solicitation messages, each separated by at least
+ * RTR_SOLICITATION_INTERVAL(4) seconds to obtain RA for IPv6 auto-configuration.
+ */
+#define RTR_SOLICITATION_INTERVAL      4
+
+#define DHCP_RETRY_TIMEOUT     10
+
+#if defined TIZEN_EXT
+static unsigned char invalid_bssid[WIFI_BSSID_LEN_MAX] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+#endif
+
+static GSList *network_list = NULL;
+static GSList *driver_list = NULL;
 
 struct connman_network {
-       struct connman_element element;
+       int refcount;
        enum connman_network_type type;
-       connman_bool_t available;
-       connman_bool_t connected;
-       connman_bool_t roaming;
-       connman_bool_t hidden;
-       connman_uint8_t strength;
-       connman_uint16_t frequency;
+       bool available;
+       bool connected;
+       bool roaming;
+       uint8_t strength;
+       uint16_t frequency;
        char *identifier;
        char *name;
        char *node;
        char *group;
+       char *path;
+       int index;
+       int router_solicit_count;
+       int router_solicit_refresh_count;
+       struct acd_host *acd_host;
+       guint ipv4ll_timeout;
+       guint dhcp_timeout;
 
        struct connman_network_driver *driver;
        void *driver_data;
 
-       connman_bool_t connecting;
-       connman_bool_t associating;
+       bool connecting;
+       bool associating;
 
        struct connman_device *device;
 
@@ -61,15 +98,69 @@ struct connman_network {
                char *passphrase;
                char *eap;
                char *identity;
+               char *anonymous_identity;
+               char *agent_identity;
                char *ca_cert_path;
+               char *subject_match;
+               char *altsubject_match;
+               char *domain_suffix_match;
+               char *domain_match;
                char *client_cert_path;
                char *private_key_path;
                char *private_key_passphrase;
                char *phase2_auth;
-               connman_bool_t wps;
-               connman_bool_t use_wps;
+               bool wps;
+               bool wps_advertizing;
+               bool use_wps;
                char *pin_wps;
+#if defined TIZEN_EXT
+               char encryption_mode[WIFI_ENCYPTION_MODE_LEN_MAX];
+               unsigned char bssid[WIFI_BSSID_LEN_MAX];
+               unsigned int maxrate;
+               int maxspeed;
+               bool isHS20AP;
+               unsigned int keymgmt;
+               char *keymgmt_type;
+               bool rsn_mode;
+               bool pmf_required;
+               int disconnect_reason;
+               int assoc_status_code;
+               GSList *vsie_list;
+               /*
+               * Only for EAP-FAST
+               */
+               char *phase1;
+               unsigned char country_code[WIFI_COUNTRY_CODE_LEN];
+               GSList *bssid_list;
+               GSList *sec_list;
+               ieee80211_modes_e phy_mode;
+               connection_mode_e connection_mode;
+               char *connector;
+               char *c_sign_key;
+               char *net_access_key;
+#endif
+#if defined TIZEN_EXT
+               unsigned char last_connected_bssid[WIFI_BSSID_LEN_MAX];
+               GHashTable *assoc_reject_table;
+               bool owe_transition_mode;
+               void *transition_mode_ssid;
+               int transition_mode_ssid_len;
+               unsigned char transition_mode_bssid[WIFI_BSSID_LEN_MAX];
+               bool roaming_progress;
+               bool roaming_dhcp;
+               char *roaming_cur_bssid;
+               char *roaming_dst_bssid;
+               __time_t roam_scan_time;
+               unsigned int max_bssid_count;
+               int snr;
+#endif
        } wifi;
+
+#if defined TIZEN_EXT
+       /* Multiple APN services and a default APN which a user selected */
+       bool default_internet;
+#endif
+
 };
 
 static const char *type2string(enum connman_network_type type)
@@ -80,10 +171,10 @@ static const char *type2string(enum connman_network_type type)
                break;
        case CONNMAN_NETWORK_TYPE_ETHERNET:
                return "ethernet";
+       case CONNMAN_NETWORK_TYPE_GADGET:
+               return "gadget";
        case CONNMAN_NETWORK_TYPE_WIFI:
                return "wifi";
-       case CONNMAN_NETWORK_TYPE_WIMAX:
-               return "wimax";
        case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
        case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
                return "bluetooth";
@@ -94,1171 +185,2574 @@ static const char *type2string(enum connman_network_type type)
        return NULL;
 }
 
-connman_bool_t __connman_network_has_driver(struct connman_network *network)
+static bool match_driver(struct connman_network *network,
+                                       struct connman_network_driver *driver)
 {
-       if (network == NULL || network->driver == NULL)
-               return FALSE;
+       if (network->type == driver->type ||
+                       driver->type == CONNMAN_NETWORK_TYPE_UNKNOWN)
+               return true;
 
-       return TRUE;
+       return false;
 }
 
-static GSList *driver_list = NULL;
+static void set_configuration(struct connman_network *network,
+                       enum connman_ipconfig_type type)
+{
+       struct connman_service *service;
 
-static gint compare_priority(gconstpointer a, gconstpointer b)
+       DBG("network %p", network);
+
+       if (!network->device)
+               return;
+
+       __connman_device_set_network(network->device, network);
+
+       service = connman_service_lookup_from_network(network);
+       __connman_service_ipconfig_indicate_state(service,
+                                       CONNMAN_SERVICE_STATE_CONFIGURATION,
+                                       type);
+}
+
+void connman_network_append_acddbus(DBusMessageIter *dict,
+               struct connman_network *network)
 {
-       const struct connman_network_driver *driver1 = a;
-       const struct connman_network_driver *driver2 = b;
+       if (!network->acd_host)
+               return;
 
-       return driver2->priority - driver1->priority;
+       acd_host_append_dbus_property(network->acd_host, dict);
 }
 
-/**
- * connman_network_driver_register:
- * @driver: network driver definition
- *
- * Register a new network driver
- *
- * Returns: %0 on success
- */
-int connman_network_driver_register(struct connman_network_driver *driver)
+static int start_acd(struct connman_network *network);
+
+static void remove_ipv4ll_timeout(struct connman_network *network)
 {
-       GSList *list;
+       if (network->ipv4ll_timeout > 0) {
+               g_source_remove(network->ipv4ll_timeout);
+               network->ipv4ll_timeout = 0;
+       }
+}
 
-       DBG("driver %p name %s", driver, driver->name);
+static void acd_host_ipv4_available(struct acd_host *acd, gpointer user_data)
+{
+       struct connman_network *network = user_data;
+       struct connman_service *service;
+       struct connman_ipconfig *ipconfig_ipv4;
+       int err;
 
-       for (list = driver_list; list; list = list->next) {
-               struct connman_network_driver *tmp = list->data;
+       if (!network)
+               return;
 
-               if (tmp->type == driver->type)
-                       return -EALREADY;
+       service = connman_service_lookup_from_network(network);
+       if (!service)
+               return;
 
+       ipconfig_ipv4 = __connman_service_get_ip4config(service);
+       if (!ipconfig_ipv4) {
+               connman_error("Service has no IPv4 configuration");
+               return;
        }
 
-       driver_list = g_slist_insert_sorted(driver_list, driver,
-                                                       compare_priority);
+       err = __connman_ipconfig_address_add(ipconfig_ipv4);
+       if (err < 0)
+               goto err;
 
-       return 0;
-}
+#if defined TIZEN_EXT
+       err = __connman_ipconfig_gateway_add(ipconfig_ipv4, service);
+#else
+       err = __connman_ipconfig_gateway_add(ipconfig_ipv4);
+#endif
+       if (err < 0)
+               goto err;
 
-/**
- * connman_network_driver_unregister:
- * @driver: network driver definition
- *
- * Remove a previously registered network driver
- */
-void connman_network_driver_unregister(struct connman_network_driver *driver)
-{
-       DBG("driver %p name %s", driver, driver->name);
+       __connman_service_save(service);
 
-       driver_list = g_slist_remove(driver_list, driver);
+       return;
+
+err:
+       connman_network_set_error(__connman_service_get_network(service),
+                               CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
 }
 
-static void network_destruct(struct connman_element *element)
+static int start_ipv4ll(struct connman_network *network)
 {
-       struct connman_network *network = element->network;
+       struct connman_service *service;
+       struct connman_ipconfig *ipconfig_ipv4;
+       struct in_addr addr;
+       char *address;
 
-       DBG("element %p name %s", element, element->name);
+       service = connman_service_lookup_from_network(network);
+       if (!service)
+               return -EINVAL;
 
-       g_free(network->wifi.ssid);
-       g_free(network->wifi.mode);
-       g_free(network->wifi.security);
-       g_free(network->wifi.passphrase);
-       g_free(network->wifi.eap);
-       g_free(network->wifi.identity);
-       g_free(network->wifi.ca_cert_path);
-       g_free(network->wifi.client_cert_path);
-       g_free(network->wifi.private_key_path);
-       g_free(network->wifi.private_key_passphrase);
-       g_free(network->wifi.phase2_auth);
-       g_free(network->wifi.pin_wps);
+       ipconfig_ipv4 = __connman_service_get_ip4config(service);
+       if (!ipconfig_ipv4) {
+               connman_error("Service has no IPv4 configuration");
+               return -EINVAL;
+       }
 
-       g_free(network->group);
-       g_free(network->node);
-       g_free(network->name);
-       g_free(network->identifier);
+       /* Apply random IPv4 address. */
+       addr.s_addr = htonl(arp_random_ip());
+       address = inet_ntoa(addr);
+       if (!address) {
+               connman_error("Could not convert IPv4LL random address %u",
+                               addr.s_addr);
+               return -EINVAL;
+       }
+       __connman_ipconfig_set_local(ipconfig_ipv4, address);
 
-       network->device = NULL;
+       connman_info("Probing IPv4LL address %s", address);
+       return start_acd(network);
 }
 
-/**
- * connman_network_create:
- * @identifier: network identifier (for example an unqiue name)
- *
- * Allocate a new network and assign the #identifier to it.
- *
- * Returns: a newly-allocated #connman_network structure
- */
-struct connman_network *connman_network_create(const char *identifier,
-                                               enum connman_network_type type)
+static gboolean start_ipv4ll_ontimeout(gpointer data)
 {
-       struct connman_network *network;
-       connman_uint8_t strength = 0;
-       const char *str;
-       char *temp;
-
-       DBG("identifier %s type %d", identifier, type);
-
-       network = g_try_new0(struct connman_network, 1);
-       if (network == NULL)
-               return NULL;
+       struct connman_network *network = data;
 
-       DBG("network %p", network);
+       if (!network)
+               return FALSE;
 
-       __connman_element_initialize(&network->element);
+       /* Start IPv4LL ACD. */
+       start_ipv4ll(network);
 
-       if (identifier == NULL) {
-               temp = g_strdup_printf("hidden_%d", hidden_counter++);
-               network->hidden = TRUE;
-       } else
-               temp = g_strdup(identifier);
+       return FALSE;
+}
 
-       if (temp == NULL) {
-               g_free(network);
-               return NULL;
-       }
+static void acd_host_ipv4_lost(struct acd_host *acd, gpointer user_data)
+{
+       struct connman_network *network = user_data;
+       struct connman_service *service;
+       struct connman_ipconfig *ipconfig_ipv4;
+       enum connman_ipconfig_type type;
+       enum connman_ipconfig_method method;
 
-       network->element.name = temp;
-       network->element.type = CONNMAN_ELEMENT_TYPE_NETWORK;
+       if (!network)
+               return;
 
-       network->element.network = network;
-       network->element.destruct = network_destruct;
+       service = connman_service_lookup_from_network(network);
+       if (!service)
+               return;
 
-       str = type2string(type);
-       if (str != NULL)
-               connman_element_set_string(&network->element, "Type", str);
+       ipconfig_ipv4 = __connman_service_get_ip4config(service);
+       if (!ipconfig_ipv4) {
+               connman_error("Service has no IPv4 configuration");
+               return;
+       }
 
-       connman_element_set_uint8(&network->element, "Strength", strength);
+       type = __connman_ipconfig_get_config_type(ipconfig_ipv4);
+       if (type != CONNMAN_IPCONFIG_TYPE_IPV4)
+               return;
 
-       network->type       = type;
-       network->identifier = g_strdup(temp);
+       __connman_ipconfig_address_remove(ipconfig_ipv4);
 
-       return network;
+       method = __connman_ipconfig_get_method(ipconfig_ipv4);
+       if (method == CONNMAN_IPCONFIG_METHOD_DHCP) {
+               /*
+                * We have one more chance for DHCP. If this fails
+                * acd_host_ipv4_conflict will be called.
+                */
+               network = __connman_service_get_network(service);
+               if (network)
+                       __connman_network_enable_ipconfig(network, ipconfig_ipv4);
+       } else {
+               /* Start IPv4LL ACD. */
+               start_ipv4ll(network);
+       }
 }
 
-/**
- * connman_network_ref:
- * @network: network structure
- *
- * Increase reference counter of  network
- */
-struct connman_network *connman_network_ref(struct connman_network *network)
+static void acd_host_ipv4_conflict(struct acd_host *acd, gpointer user_data)
 {
-       if (connman_element_ref(&network->element) == NULL)
-               return NULL;
+       struct connman_network *network = user_data;
+       struct connman_service *service;
+       struct connman_ipconfig *ipconfig_ipv4;
+       enum connman_ipconfig_method method;
 
-       return network;
-}
+       service = connman_service_lookup_from_network(network);
+       if (!service)
+               return;
 
-/**
- * connman_network_unref:
- * @network: network structure
- *
- * Decrease reference counter of network
- */
-void connman_network_unref(struct connman_network *network)
-{
-       connman_element_unref(&network->element);
-}
+       ipconfig_ipv4 = __connman_service_get_ip4config(service);
+       if (!ipconfig_ipv4) {
+               connman_error("Service has no IPv4 configuration");
+               return;
+       }
 
-const char *__connman_network_get_type(struct connman_network *network)
-{
-       return type2string(network->type);
-}
+       method = __connman_ipconfig_get_method(ipconfig_ipv4);
+       connman_info("%s conflict counts=%u", __FUNCTION__,
+                       acd_host_get_conflicts_count(acd));
 
-/**
- * connman_network_get_type:
- * @network: network structure
- *
- * Get type of network
- */
-enum connman_network_type connman_network_get_type(struct connman_network *network)
-{
-       return network->type;
+       if (method == CONNMAN_IPCONFIG_METHOD_DHCP &&
+                       acd_host_get_conflicts_count(acd) < 2) {
+               connman_info("%s Sending DHCP decline", __FUNCTION__);
+               __connman_dhcp_decline(ipconfig_ipv4);
+
+               connman_network_set_connected_dhcp_later(network, DHCP_RETRY_TIMEOUT);
+               __connman_ipconfig_set_local(ipconfig_ipv4, NULL);
+       } else {
+               if (method == CONNMAN_IPCONFIG_METHOD_DHCP) {
+                       __connman_ipconfig_set_method(ipconfig_ipv4,
+                                       CONNMAN_IPCONFIG_METHOD_AUTO);
+                       __connman_dhcp_decline(ipconfig_ipv4);
+               }
+               /* Start IPv4LL ACD. */
+               start_ipv4ll(network);
+       }
 }
 
-/**
- * connman_network_get_identifier:
- * @network: network structure
- *
- * Get identifier of network
- */
-const char *connman_network_get_identifier(struct connman_network *network)
+static void acd_host_ipv4_maxconflict(struct acd_host *acd, gpointer user_data)
 {
-       return network->identifier;
+       struct connman_network *network = user_data;
+
+       remove_ipv4ll_timeout(network);
+       connman_info("Had maximum number of conflicts. Next IPv4LL address will be "
+                       "tried in %d seconds", RATE_LIMIT_INTERVAL);
+       /* Wait, then start IPv4LL ACD. */
+       network->ipv4ll_timeout =
+               g_timeout_add_seconds_full(G_PRIORITY_HIGH,
+                               RATE_LIMIT_INTERVAL,
+                               start_ipv4ll_ontimeout,
+                               network,
+                               NULL);
 }
 
-/**
- * connman_network_set_index:
- * @network: network structure
- * @index: index number
- *
- * Set index number of network
- */
-void connman_network_set_index(struct connman_network *network, int index)
+static int start_acd(struct connman_network *network)
 {
        struct connman_service *service;
-       struct connman_ipconfig *ipconfig;
-
-       service = __connman_service_lookup_from_network(network);
-       if (service == NULL)
-               goto done;
+       struct connman_ipconfig *ipconfig_ipv4;
+       const char* address;
+       struct in_addr addr;
 
-       ipconfig = __connman_service_get_ip4config(service);
+       remove_ipv4ll_timeout(network);
 
-       DBG("index %d service %p ip4config %p", network->element.index,
-               service, ipconfig);
+       service = connman_service_lookup_from_network(network);
+       if (!service)
+               return -EINVAL;
 
-       if (network->element.index < 0 && ipconfig == NULL) {
+       ipconfig_ipv4 = __connman_service_get_ip4config(service);
+       if (!ipconfig_ipv4) {
+               connman_error("Service has no IPv4 configuration");
+               return -EINVAL;
+       }
 
-               ipconfig = __connman_service_get_ip4config(service);
-               if (ipconfig == NULL)
-                       /*
-                        * This is needed for plugins that havent set their
-                        * ipconfig layer yet, due to not being able to get
-                        * a network index prior to creating a service.
-                        */
-                       __connman_service_create_ip4config(service, index);
-               else
-                       __connman_ipconfig_set_index(ipconfig, index);
+       if (!network->acd_host) {
+               int index;
 
-       } else {
-               /* If index changed, the index of ipconfig must be reset. */
-               if (ipconfig == NULL)
-                       goto done;
+               index = __connman_ipconfig_get_index(ipconfig_ipv4);
+               network->acd_host = acd_host_new(index,
+                               connman_service_get_dbuspath(service));
+               if (!network->acd_host) {
+                       connman_error("Could not create ACD data structure");
+                       return -EINVAL;
+               }
 
-               __connman_ipconfig_set_index(ipconfig, index);
+               acd_host_register_event(network->acd_host,
+                               ACD_HOST_EVENT_IPV4_AVAILABLE,
+                               acd_host_ipv4_available, network);
+               acd_host_register_event(network->acd_host,
+                               ACD_HOST_EVENT_IPV4_LOST,
+                               acd_host_ipv4_lost, network);
+               acd_host_register_event(network->acd_host,
+                               ACD_HOST_EVENT_IPV4_CONFLICT,
+                               acd_host_ipv4_conflict, network);
+               acd_host_register_event(network->acd_host,
+                               ACD_HOST_EVENT_IPV4_MAXCONFLICT,
+                               acd_host_ipv4_maxconflict, network);
        }
 
-done:
-       network->element.index = index;
-}
+       address = __connman_ipconfig_get_local(ipconfig_ipv4);
+       if (!address)
+               return -EINVAL;
 
-/**
- * connman_network_get_index:
- * @network: network structure
- *
- * Get index number of network
- */
-int connman_network_get_index(struct connman_network *network)
-{
-       return network->element.index;
+       connman_info("Starting ACD for address %s", address);
+       if (inet_pton(AF_INET, address, &addr) != 1)
+               connman_error("Could not convert address %s", address);
+
+       acd_host_start(network->acd_host, htonl(addr.s_addr));
+
+       return 0;
 }
 
-/**
- * connman_network_get_element:
- * @network: network structure
- *
- * Get connman_element of network
- */
-struct connman_element *connman_network_get_element(
-                               struct connman_network *network)
+static void dhcp_success(struct connman_network *network)
 {
-       return &network->element;
-}
+       struct connman_service *service;
+       struct connman_ipconfig *ipconfig_ipv4;
+       int err;
 
-/**
- * connman_network_set_group:
- * @network: network structure
- * @group: group name
- *
- * Set group name for automatic clustering
- */
-void connman_network_set_group(struct connman_network *network,
-                                                       const char *group)
-{
-       switch (network->type) {
-       case CONNMAN_NETWORK_TYPE_UNKNOWN:
-       case CONNMAN_NETWORK_TYPE_VENDOR:
-               return;
-       case CONNMAN_NETWORK_TYPE_ETHERNET:
-       case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
-       case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
-       case CONNMAN_NETWORK_TYPE_CELLULAR:
-       case CONNMAN_NETWORK_TYPE_WIFI:
-       case CONNMAN_NETWORK_TYPE_WIMAX:
-               break;
-       }
+       service = connman_service_lookup_from_network(network);
+       if (!service)
+               goto err;
 
-       if (g_strcmp0(network->group, group) == 0) {
-               if (group != NULL)
-                       __connman_service_update_from_network(network);
+       ipconfig_ipv4 = __connman_service_get_ip4config(service);
+
+       DBG("lease acquired for ipconfig %p", ipconfig_ipv4);
+
+       if (!ipconfig_ipv4)
                return;
-       }
 
-       if (network->group != NULL) {
-               __connman_service_remove_from_network(network);
+       if (connman_setting_get_bool("AddressConflictDetection")) {
+               err = start_acd(network);
+               if (!err)
+                       return;
 
-               g_free(network->group);
+               /* On error proceed without ACD. */
        }
 
-       network->group = g_strdup(group);
+       err = __connman_ipconfig_address_add(ipconfig_ipv4);
+       if (err < 0)
+               goto err;
 
-       if (network->group != NULL)
-               __connman_service_create_from_network(network);
-}
+#if defined TIZEN_EXT
+       err = __connman_ipconfig_gateway_add(ipconfig_ipv4, service);
+#else
+       err = __connman_ipconfig_gateway_add(ipconfig_ipv4);
+#endif
+       if (err < 0)
+               goto err;
 
-/**
- * connman_network_get_group:
- * @network: network structure
- *
- * Get group name for automatic clustering
- */
-const char *connman_network_get_group(struct connman_network *network)
-{
-       return network->group;
-}
+       __connman_service_save(service);
 
-const char *__connman_network_get_ident(struct connman_network *network)
-{
-       if (network->device == NULL)
-               return NULL;
+       return;
 
-       return connman_device_get_ident(network->device);
+err:
+       connman_network_set_error(network,
+                               CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
 }
 
-connman_bool_t __connman_network_get_weakness(struct connman_network *network)
+static void dhcp_failure(struct connman_network *network)
 {
-       switch (network->type) {
-       case CONNMAN_NETWORK_TYPE_UNKNOWN:
-       case CONNMAN_NETWORK_TYPE_VENDOR:
-       case CONNMAN_NETWORK_TYPE_ETHERNET:
-       case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
-       case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
-       case CONNMAN_NETWORK_TYPE_CELLULAR:
-       case CONNMAN_NETWORK_TYPE_WIMAX:
-               break;
-       case CONNMAN_NETWORK_TYPE_WIFI:
-               if (g_strcmp0(network->wifi.mode, "adhoc") == 0)
-                       return TRUE;
-               if (network->strength > 0 && network->strength < 20)
-                       return TRUE;
-               break;
-       }
-
-       return FALSE;
-}
+       struct connman_service *service;
+       struct connman_ipconfig *ipconfig_ipv4;
 
-connman_bool_t connman_network_get_connecting(struct connman_network *network)
-{
-       return network->connecting;
-}
+       service = connman_service_lookup_from_network(network);
+       if (!service)
+               return;
 
-/**
- * connman_network_set_available:
- * @network: network structure
- * @available: availability state
- *
- * Change availability state of network (in range)
- */
-int connman_network_set_available(struct connman_network *network,
-                                               connman_bool_t available)
-{
-       DBG("network %p available %d", network, available);
+       ipconfig_ipv4 = __connman_service_get_ip4config(service);
 
-       if (network->available == available)
-               return -EALREADY;
+       DBG("lease lost for ipconfig %p", ipconfig_ipv4);
 
-       network->available = available;
+       if (!ipconfig_ipv4)
+               return;
 
-       return 0;
+       __connman_ipconfig_address_remove(ipconfig_ipv4);
+       __connman_ipconfig_gateway_remove(ipconfig_ipv4);
 }
 
-/**
- * connman_network_get_available:
- * @network: network structure
- *
- * Get network available setting
- */
-connman_bool_t connman_network_get_available(struct connman_network *network)
+static void dhcp_callback(struct connman_ipconfig *ipconfig,
+                       struct connman_network *network,
+                       bool success, gpointer data)
 {
-       if (network->hidden == TRUE)
-               return TRUE;
+       network->connecting = false;
 
-       return network->available;
+       if (success)
+               dhcp_success(network);
+       else
+               dhcp_failure(network);
 }
 
-/**
- * connman_network_set_associating:
- * @network: network structure
- * @associating: associating state
- *
- * Change associating state of network
- */
-int connman_network_set_associating(struct connman_network *network,
-                                               connman_bool_t associating)
+static int set_connected_manual(struct connman_network *network)
 {
-       DBG("network %p associating %d", network, associating);
-
-       if (network->associating == associating)
-               return -EALREADY;
+       int err = 0;
+       struct connman_service *service;
+       struct connman_ipconfig *ipconfig;
 
-       network->associating = associating;
+       DBG("network %p", network);
 
-       if (associating == TRUE) {
-               struct connman_service *service;
+       network->connecting = false;
 
-               service = __connman_service_lookup_from_network(network);
-               __connman_service_indicate_state(service,
-                                       CONNMAN_SERVICE_STATE_ASSOCIATION,
-                                       CONNMAN_IPCONFIG_TYPE_IPV4);
-       }
+       service = connman_service_lookup_from_network(network);
+       ipconfig = __connman_service_get_ip4config(service);
+       __connman_ipconfig_enable(ipconfig);
 
-       return 0;
-}
+#if defined TIZEN_EXT
+       if (!service || !ipconfig)
+               return -EINVAL;
+#endif
+       if (!__connman_ipconfig_get_local(ipconfig))
+               __connman_service_read_ip4config(service);
 
-static void set_associate_error(struct connman_network *network)
-{
-       struct connman_service *service;
+       if (connman_setting_get_bool("AddressConflictDetection")) {
+               err = start_acd(network);
+               if (!err)
+                       return 0;
 
-       if (network->associating == FALSE)
-               return ;
+               /* On error proceed without ACD. */
+       }
 
-       network->associating = FALSE;
+       err = __connman_ipconfig_address_add(ipconfig);
+       if (err < 0)
+               goto err;
 
-       service = __connman_service_lookup_from_network(network);
+#if defined TIZEN_EXT
+       err = __connman_ipconfig_gateway_add(ipconfig, service);
+#else
+       err = __connman_ipconfig_gateway_add(ipconfig);
+#endif
+       if (err < 0)
+               goto err;
 
-       __connman_service_indicate_state(service,
-                                       CONNMAN_SERVICE_STATE_FAILURE,
-                                       CONNMAN_IPCONFIG_TYPE_IPV4);
+err:
+       return err;
 }
 
-static void set_configure_error(struct connman_network *network)
+static void remove_dhcp_timeout(struct connman_network *network)
 {
-       struct connman_service *service;
-
-       network->connecting = FALSE;
-
-       service = __connman_service_lookup_from_network(network);
-
-       __connman_service_indicate_state(service,
-                                       CONNMAN_SERVICE_STATE_FAILURE,
-                                       CONNMAN_IPCONFIG_TYPE_IPV4);
+       if (network->dhcp_timeout > 0) {
+               g_source_remove(network->dhcp_timeout);
+               network->dhcp_timeout = 0;
+       }
 }
 
-static void set_invalid_key_error(struct connman_network *network)
+#if defined TIZEN_EXT
+int set_connected_dhcp(struct connman_network *network)
+#else
+static int set_connected_dhcp(struct connman_network *network)
+#endif
 {
        struct connman_service *service;
+       struct connman_ipconfig *ipconfig_ipv4;
+       int err;
 
-       service = __connman_service_lookup_from_network(network);
+       DBG("network %p", network);
+       remove_dhcp_timeout(network);
 
-       __connman_service_indicate_error(service,
-                                       CONNMAN_SERVICE_ERROR_INVALID_KEY);
+       service = connman_service_lookup_from_network(network);
+       ipconfig_ipv4 = __connman_service_get_ip4config(service);
+       __connman_ipconfig_enable(ipconfig_ipv4);
+
+       err = __connman_dhcp_start(ipconfig_ipv4, network,
+                                                       dhcp_callback, NULL);
+       if (err < 0) {
+               connman_error("Can not request DHCP lease");
+               return err;
+       }
+
+       return 0;
 }
 
-void connman_network_set_ipv4_method(struct connman_network *network,
-                                       enum connman_ipconfig_method method)
+static gboolean set_connected_dhcp_timout(gpointer data)
 {
+       struct connman_network *network = data;
        struct connman_service *service;
        struct connman_ipconfig *ipconfig;
+       enum connman_ipconfig_method method;
 
-       network->element.ipv4.method = method;
+       network->dhcp_timeout = 0;
 
-       service = __connman_service_lookup_from_network(network);
-       if (service == NULL)
-               return;
+       service = connman_service_lookup_from_network(network);
+       if (!service)
+               return FALSE;
 
        ipconfig = __connman_service_get_ip4config(service);
-       if (ipconfig == NULL)
-               return;
+       if (!ipconfig)
+               return FALSE;
+
+       /* Method is still DHCP? */
+       method = __connman_ipconfig_get_method(ipconfig);
+       if (method == CONNMAN_IPCONFIG_METHOD_DHCP)
+               set_connected_dhcp(network);
 
-       connman_ipconfig_set_method(ipconfig, method);
+       return FALSE;
 }
 
-void connman_network_set_ipv6_method(struct connman_network *network,
-                                       enum connman_ipconfig_method method)
+void connman_network_set_connected_dhcp_later(struct connman_network *network,
+               uint32_t sec)
 {
-       struct connman_service *service;
-       struct connman_ipconfig *ipconfig;
+       remove_dhcp_timeout(network);
 
-       network->element.ipv6.method = method;
+       network->dhcp_timeout =
+               g_timeout_add_seconds_full(G_PRIORITY_HIGH,
+                               sec,
+                               set_connected_dhcp_timout,
+                               network,
+                               NULL);
+}
 
-       service = __connman_service_lookup_from_network(network);
-       if (service == NULL)
-               return;
+static int manual_ipv6_set(struct connman_network *network,
+                               struct connman_ipconfig *ipconfig_ipv6)
+{
+       struct connman_service *service;
+       int err;
 
-       ipconfig = __connman_service_get_ip6config(service);
-       if (ipconfig == NULL)
-               return;
+       DBG("network %p ipv6 %p", network, ipconfig_ipv6);
 
-       connman_ipconfig_set_method(ipconfig, method);
-}
+       service = connman_service_lookup_from_network(network);
+       if (!service)
+               return -EINVAL;
 
-void connman_network_set_error(struct connman_network *network,
-                                       enum connman_network_error error)
-{
-       DBG("nework %p, error %d", network, error);
+       if (!__connman_ipconfig_get_local(ipconfig_ipv6))
+               __connman_service_read_ip6config(service);
 
-       network->connecting = FALSE;
+       __connman_ipconfig_enable_ipv6(ipconfig_ipv6);
 
-       switch (error) {
-       case CONNMAN_NETWORK_ERROR_UNKNOWN:
-               return;
-       case CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL:
-               set_associate_error(network);
-               break;
-       case CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL:
-               set_configure_error(network);
-               break;
-       case CONNMAN_NETWORK_ERROR_INVALID_KEY:
-               set_invalid_key_error(network);
-               break;
+       err = __connman_ipconfig_address_add(ipconfig_ipv6);
+       if (err < 0) {
+               connman_network_set_error(network,
+                       CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
+               return err;
        }
-}
 
-void connman_network_clear_error(struct connman_network *network)
-{
-       struct connman_service *service;
+#if defined TIZEN_EXT
+       err = __connman_ipconfig_gateway_add(ipconfig_ipv6, service);
+#else
+       err = __connman_ipconfig_gateway_add(ipconfig_ipv6);
+#endif
+       if (err < 0)
+               return err;
 
-       DBG("network %p", network);
+       __connman_device_set_network(network->device, network);
 
-       if (network == NULL)
-               return;
+       connman_network_set_associating(network, false);
 
-       if (network->connecting == TRUE || network->associating == TRUE)
-               return;
+       network->connecting = false;
 
-       service = __connman_service_lookup_from_network(network);
-       __connman_service_clear_error(service);
+       return 0;
 }
 
-static void set_configuration(struct connman_network *network)
+static void stop_dhcpv6(struct connman_network *network)
 {
-       struct connman_service *service;
+       network->connecting = false;
 
-       DBG("network %p", network);
+       __connman_dhcpv6_stop(network);
+}
 
-       __connman_device_increase_connections(network->device);
+static void dhcpv6_release_callback(struct connman_network *network,
+                               enum __connman_dhcpv6_status status,
+                               gpointer data)
+{
+       DBG("status %d", status);
 
-       __connman_device_set_network(network->device, network);
+       stop_dhcpv6(network);
+}
 
-       connman_device_set_disconnected(network->device, FALSE);
+static void release_dhcpv6(struct connman_network *network)
+{
+       __connman_dhcpv6_start_release(network, dhcpv6_release_callback);
+       stop_dhcpv6(network);
+}
 
-       service = __connman_service_lookup_from_network(network);
-       __connman_service_indicate_state(service,
-                                       CONNMAN_SERVICE_STATE_CONFIGURATION,
-                                       CONNMAN_IPCONFIG_TYPE_IPV4);
+static void dhcpv6_info_callback(struct connman_network *network,
+                               enum __connman_dhcpv6_status status,
+                               gpointer data)
+{
+       DBG("status %d", status);
+
+       stop_dhcpv6(network);
 }
 
-static void dhcp_success(struct connman_network *network)
+static int dhcpv6_set_addresses(struct connman_network *network)
 {
        struct connman_service *service;
-       struct connman_ipconfig *ipconfig_ipv4;
-       int err;
+       struct connman_ipconfig *ipconfig_ipv6;
+       int err = -EINVAL;
 
-       service = __connman_service_lookup_from_network(network);
-       if (service == NULL)
+       service = connman_service_lookup_from_network(network);
+       if (!service)
                goto err;
 
-       connman_network_set_associating(network, FALSE);
-
-       network->connecting = FALSE;
+       network->connecting = false;
 
-       ipconfig_ipv4 = __connman_service_get_ip4config(service);
-       err = __connman_ipconfig_address_add(ipconfig_ipv4);
-       if (err < 0)
+       ipconfig_ipv6 = __connman_service_get_ip6config(service);
+#if defined TIZEN_EXT
+       if (!ipconfig_ipv6)
                goto err;
-
-       err = __connman_ipconfig_gateway_add(ipconfig_ipv4);
+#endif
+       err = __connman_ipconfig_address_add(ipconfig_ipv6);
        if (err < 0)
                goto err;
 
-       __connman_service_indicate_state(service, CONNMAN_SERVICE_STATE_READY,
+       return 0;
+
+err:
+       connman_network_set_error(network,
+                               CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
+       return err;
+}
+
+static void autoconf_ipv6_set(struct connman_network *network);
+static void dhcpv6_callback(struct connman_network *network,
+                       enum __connman_dhcpv6_status status, gpointer data);
+
+/*
+ * Have a separate callback for renew so that we do not do autoconf
+ * in wrong phase as the dhcpv6_callback() is also called when doing
+ * DHCPv6 solicitation.
+ */
+static void dhcpv6_renew_callback(struct connman_network *network,
+                               enum __connman_dhcpv6_status status,
+                               gpointer data)
+{
+       switch (status) {
+       case CONNMAN_DHCPV6_STATUS_SUCCEED:
+               dhcpv6_callback(network, status, data);
+               break;
+       case CONNMAN_DHCPV6_STATUS_FAIL:
+       case CONNMAN_DHCPV6_STATUS_RESTART:
+               stop_dhcpv6(network);
+
+               /* restart and do solicit again. */
+               autoconf_ipv6_set(network);
+               break;
+       }
+}
+
+static void dhcpv6_callback(struct connman_network *network,
+                       enum __connman_dhcpv6_status status, gpointer data)
+{
+       DBG("status %d", status);
+
+       /* Start the renew process if necessary */
+       if (status == CONNMAN_DHCPV6_STATUS_SUCCEED) {
+
+               if (dhcpv6_set_addresses(network) < 0) {
+                       stop_dhcpv6(network);
+                       return;
+               }
+
+               if (__connman_dhcpv6_start_renew(network,
+                                       dhcpv6_renew_callback) == -ETIMEDOUT)
+                       dhcpv6_renew_callback(network,
+                                               CONNMAN_DHCPV6_STATUS_FAIL,
+                                               data);
+
+       } else if (status == CONNMAN_DHCPV6_STATUS_RESTART) {
+               stop_dhcpv6(network);
+               autoconf_ipv6_set(network);
+       } else
+               stop_dhcpv6(network);
+}
+
+static void check_dhcpv6(struct nd_router_advert *reply,
+                       unsigned int length, void *user_data)
+{
+       struct connman_network *network = user_data;
+       struct connman_service *service;
+       GSList *prefixes;
+
+       DBG("reply %p", reply);
+
+       if (!reply) {
+               /*
+                * Router solicitation message seem to get lost easily so
+                * try to send it again.
+                */
+               if (network->router_solicit_count > 0) {
+                       DBG("re-send router solicitation %d",
+                                               network->router_solicit_count);
+                       network->router_solicit_count--;
+                       __connman_inet_ipv6_send_rs(network->index, RTR_SOLICITATION_INTERVAL,
+                                               check_dhcpv6, network);
+                       return;
+               }
+#if defined TIZEN_EXT
+               DBG("RA message is not received from server in reply of RS.");
+#endif
+               connman_network_unref(network);
+               return;
+       }
+
+       network->router_solicit_count = 0;
+
+       /*
+        * If we were disconnected while waiting router advertisement,
+        * we just quit and do not start DHCPv6
+        */
+       if (!network->connected) {
+               connman_network_unref(network);
+#if defined TIZEN_EXT
+               DBG("Network is not connected");
+#endif
+               return;
+       }
+
+       prefixes = __connman_inet_ipv6_get_prefixes(reply, length);
+
+       /*
+        * If IPv6 config is missing from service, then create it.
+        * The ipconfig might be missing if we got a rtnl message
+        * that disabled IPv6 config and thus removed it. This
+        * can happen if we are switching from one service to
+        * another in the same interface. The only way to get IPv6
+        * config back is to re-create it here.
+        */
+       service = connman_service_lookup_from_network(network);
+       if (service) {
+               connman_service_create_ip6config(service, network->index);
+
+               connman_network_set_associating(network, false);
+
+               __connman_service_ipconfig_indicate_state(service,
+                                       CONNMAN_SERVICE_STATE_CONFIGURATION,
+                                       CONNMAN_IPCONFIG_TYPE_IPV6);
+       }
+
+       /*
+        * We do stateful/stateless DHCPv6 if router advertisement says so.
+        */
+       if (reply->nd_ra_flags_reserved & ND_RA_FLAG_MANAGED) {
+#if defined TIZEN_EXT
+               DBG("IPv6 ND_RA_FLAG_MANAGED");
+#endif
+               __connman_dhcpv6_start(network, prefixes, dhcpv6_callback);
+       } else {
+               if (reply->nd_ra_flags_reserved & ND_RA_FLAG_OTHER)
+#if defined TIZEN_EXT
+               {
+                       DBG("IPv6 ND_RA_FLAG_OTHER");
+#endif
+                       __connman_dhcpv6_start_info(network,
+                                                       dhcpv6_info_callback);
+#if defined TIZEN_EXT
+               }
+#endif
+
+               g_slist_free_full(prefixes, g_free);
+               network->connecting = false;
+       }
+
+       connman_network_unref(network);
+}
+
+static void receive_refresh_rs_reply(struct nd_router_advert *reply,
+               unsigned int length, void *user_data)
+{
+       struct connman_network *network = user_data;
+
+       DBG("reply %p", reply);
+
+       if (!reply) {
+               /*
+                * Router solicitation message seem to get lost easily so
+                * try to send it again.
+                */
+               if (network->router_solicit_refresh_count > 1) {
+                       network->router_solicit_refresh_count--;
+                       DBG("re-send router solicitation %d",
+                                       network->router_solicit_refresh_count);
+                       __connman_inet_ipv6_send_rs(network->index,
+                                       RS_REFRESH_TIMEOUT,
+                                       receive_refresh_rs_reply,
+                                       network);
+                       return;
+               }
+       }
+
+       /* RS refresh not in progress anymore */
+       network->router_solicit_refresh_count = 0;
+
+       connman_network_unref(network);
+}
+
+int __connman_network_refresh_rs_ipv6(struct connman_network *network,
+                                       int index)
+{
+       int ret = 0;
+
+       DBG("network %p index %d", network, index);
+
+       /* Send only one RS for all RDNSS entries which are about to expire */
+       if (network->router_solicit_refresh_count > 0) {
+               DBG("RS refresh already started");
+               return 0;
+       }
+
+       network->router_solicit_refresh_count = RS_REFRESH_COUNT;
+
+       connman_network_ref(network);
+
+       ret = __connman_inet_ipv6_send_rs(index, RS_REFRESH_TIMEOUT,
+                       receive_refresh_rs_reply, network);
+       return ret;
+}
+
+static void autoconf_ipv6_set(struct connman_network *network)
+{
+       struct connman_service *service;
+       struct connman_ipconfig *ipconfig;
+       int index;
+
+       DBG("network %p", network);
+
+       if (network->router_solicit_count > 0) {
+               /*
+                * The autoconfiguration is already pending and we have sent
+                * router solicitation messages and are now waiting answers.
+                * There is no need to continue any further.
+                */
+               DBG("autoconfiguration already started");
+               return;
+       }
+
+       __connman_device_set_network(network->device, network);
+
+#if defined TIZEN_EXT
+       if(network->type == CONNMAN_NETWORK_TYPE_CELLULAR)
+               return;
+#endif
+
+       service = connman_service_lookup_from_network(network);
+       if (!service)
+               return;
+
+       ipconfig = __connman_service_get_ip6config(service);
+       if (!ipconfig)
+               return;
+
+       __connman_ipconfig_enable(ipconfig);
+
+       __connman_ipconfig_enable_ipv6(ipconfig);
+
+       __connman_ipconfig_address_remove(ipconfig);
+
+       index = __connman_ipconfig_get_index(ipconfig);
+
+       connman_network_ref(network);
+
+       /* Try to get stateless DHCPv6 information, RFC 3736 */
+       network->router_solicit_count = 3;
+       __connman_inet_ipv6_send_rs(index, RTR_SOLICITATION_INTERVAL,
+                       check_dhcpv6, network);
+}
+
+static void set_connected(struct connman_network *network)
+{
+       struct connman_ipconfig *ipconfig_ipv4, *ipconfig_ipv6;
+       struct connman_service *service;
+
+       if (network->connected)
+               return;
+
+       connman_network_set_associating(network, false);
+
+       network->connected = true;
+
+       service = connman_service_lookup_from_network(network);
+
+       ipconfig_ipv4 = __connman_service_get_ip4config(service);
+       ipconfig_ipv6 = __connman_service_get_ip6config(service);
+
+       DBG("service %p ipv4 %p ipv6 %p", service, ipconfig_ipv4,
+               ipconfig_ipv6);
+
+       __connman_network_enable_ipconfig(network, ipconfig_ipv4);
+       __connman_network_enable_ipconfig(network, ipconfig_ipv6);
+}
+
+static void set_disconnected(struct connman_network *network)
+{
+       struct connman_ipconfig *ipconfig_ipv4, *ipconfig_ipv6;
+       enum connman_ipconfig_method ipv4_method, ipv6_method;
+       enum connman_service_state state;
+       struct connman_service *service;
+
+       service = connman_service_lookup_from_network(network);
+
+       ipconfig_ipv4 = __connman_service_get_ip4config(service);
+       ipconfig_ipv6 = __connman_service_get_ip6config(service);
+
+       DBG("service %p ipv4 %p ipv6 %p", service, ipconfig_ipv4,
+               ipconfig_ipv6);
+
+       ipv4_method = __connman_ipconfig_get_method(ipconfig_ipv4);
+       ipv6_method = __connman_ipconfig_get_method(ipconfig_ipv6);
+
+       DBG("method ipv4 %d ipv6 %d", ipv4_method, ipv6_method);
+
+       /*
+        * Resetting solicit count here will prevent the RS resend loop
+        * from sending packets in check_dhcpv6()
+        */
+       network->router_solicit_count = 0;
+
+       __connman_device_set_network(network->device, NULL);
+
+       if (network->connected) {
+               switch (ipv6_method) {
+               case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+               case CONNMAN_IPCONFIG_METHOD_OFF:
+               case CONNMAN_IPCONFIG_METHOD_FIXED:
+               case CONNMAN_IPCONFIG_METHOD_MANUAL:
+                       break;
+               case CONNMAN_IPCONFIG_METHOD_DHCP:
+               case CONNMAN_IPCONFIG_METHOD_AUTO:
+                       release_dhcpv6(network);
+                       break;
+               }
+
+               switch (ipv4_method) {
+               case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+               case CONNMAN_IPCONFIG_METHOD_OFF:
+               case CONNMAN_IPCONFIG_METHOD_FIXED:
+               case CONNMAN_IPCONFIG_METHOD_MANUAL:
+                       break;
+               case CONNMAN_IPCONFIG_METHOD_AUTO:
+                       /*
+                        * If the current method is AUTO then next time we
+                        * try first DHCP. DHCP also needs to be stopped
+                        * in this case because if we fell in AUTO means
+                        * that DHCP  was launched for IPv4 but it failed.
+                        */
+                       __connman_ipconfig_set_method(ipconfig_ipv4,
+                                               CONNMAN_IPCONFIG_METHOD_DHCP);
+                       __connman_service_notify_ipv4_configuration(service);
+                       /* fall through */
+               case CONNMAN_IPCONFIG_METHOD_DHCP:
+                       remove_dhcp_timeout(network);
+                       __connman_dhcp_stop(ipconfig_ipv4);
+                       break;
+               }
+       }
+
+       /*
+        * We only set the disconnect state if we were not in idle
+        * or in failure. It does not make sense to go to disconnect
+        * state if we were not connected.
+        */
+       state = __connman_service_ipconfig_get_state(service,
+                                               CONNMAN_IPCONFIG_TYPE_IPV4);
+       if (state != CONNMAN_SERVICE_STATE_IDLE &&
+                       state != CONNMAN_SERVICE_STATE_FAILURE)
+               __connman_service_ipconfig_indicate_state(service,
+                                       CONNMAN_SERVICE_STATE_DISCONNECT,
+                                       CONNMAN_IPCONFIG_TYPE_IPV4);
+
+       state = __connman_service_ipconfig_get_state(service,
+                                               CONNMAN_IPCONFIG_TYPE_IPV6);
+       if (state != CONNMAN_SERVICE_STATE_IDLE &&
+                               state != CONNMAN_SERVICE_STATE_FAILURE)
+               __connman_service_ipconfig_indicate_state(service,
+                                       CONNMAN_SERVICE_STATE_DISCONNECT,
+                                       CONNMAN_IPCONFIG_TYPE_IPV6);
+
+       if (network->connected) {
+#if defined TIZEN_EXT
+               /**
+                * Do not remove gateway and its address,
+                * if there are connected profiles that use same interface (multiple PDN)
+                */
+               if (connman_service_get_type(service) != CONNMAN_SERVICE_TYPE_CELLULAR ||
+                               __connman_service_get_connected_count_of_iface(service) <= 0) {
+#endif
+               __connman_connection_gateway_remove(service,
+                                               CONNMAN_IPCONFIG_TYPE_ALL);
+
+               __connman_ipconfig_address_unset(ipconfig_ipv4);
+               __connman_ipconfig_address_unset(ipconfig_ipv6);
+
+#if defined TIZEN_EXT
+               }
+#endif
+               /*
+                * Special handling for IPv6 autoconfigured address.
+                * The simplest way to remove autoconfigured routes is to
+                * disable IPv6 temporarily so that kernel will do the cleanup
+                * automagically.
+                */
+               if (ipv6_method == CONNMAN_IPCONFIG_METHOD_AUTO) {
+                       __connman_ipconfig_disable_ipv6(ipconfig_ipv6);
+                       __connman_ipconfig_enable_ipv6(ipconfig_ipv6);
+               }
+       }
+
+       __connman_service_ipconfig_indicate_state(service,
+                                               CONNMAN_SERVICE_STATE_IDLE,
+                                               CONNMAN_IPCONFIG_TYPE_IPV4);
+
+       __connman_service_ipconfig_indicate_state(service,
+                                               CONNMAN_SERVICE_STATE_IDLE,
+                                               CONNMAN_IPCONFIG_TYPE_IPV6);
+
+       network->connecting = false;
+       network->connected = false;
+
+       connman_network_set_associating(network, false);
+}
+
+
+
+static int network_probe(struct connman_network *network)
+{
+       GSList *list;
+       struct connman_network_driver *driver = NULL;
+
+       DBG("network %p name %s", network, network->name);
+
+       if (network->driver)
+               return -EALREADY;
+
+       for (list = driver_list; list; list = list->next) {
+               driver = list->data;
+
+               if (!match_driver(network, driver)) {
+                       driver = NULL;
+                       continue;
+               }
+#if defined TIZEN_EXT
+               if (!simplified_log)
+#endif
+               DBG("driver %p name %s", driver, driver->name);
+
+               if (driver->probe(network) == 0)
+                       break;
+
+               driver = NULL;
+       }
+
+       if (!driver)
+               return -ENODEV;
+
+       if (!network->group)
+               return -EINVAL;
+
+       switch (network->type) {
+       case CONNMAN_NETWORK_TYPE_UNKNOWN:
+       case CONNMAN_NETWORK_TYPE_VENDOR:
+               return 0;
+       case CONNMAN_NETWORK_TYPE_ETHERNET:
+       case CONNMAN_NETWORK_TYPE_GADGET:
+       case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
+       case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
+       case CONNMAN_NETWORK_TYPE_CELLULAR:
+       case CONNMAN_NETWORK_TYPE_WIFI:
+               network->driver = driver;
+               if (!__connman_service_create_from_network(network)) {
+                       network->driver = NULL;
+                       return -EINVAL;
+               }
+       }
+
+       return 0;
+}
+
+static void network_remove(struct connman_network *network)
+{
+       DBG("network %p name %s", network, network->name);
+
+       if (!network->driver)
+               return;
+
+       if (network->connected)
+               set_disconnected(network);
+
+       switch (network->type) {
+       case CONNMAN_NETWORK_TYPE_UNKNOWN:
+       case CONNMAN_NETWORK_TYPE_VENDOR:
+               break;
+       case CONNMAN_NETWORK_TYPE_ETHERNET:
+       case CONNMAN_NETWORK_TYPE_GADGET:
+       case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
+       case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
+       case CONNMAN_NETWORK_TYPE_CELLULAR:
+       case CONNMAN_NETWORK_TYPE_WIFI:
+               if (network->group) {
+                       __connman_service_remove_from_network(network);
+
+                       g_free(network->group);
+                       network->group = NULL;
+               }
+               break;
+       }
+
+       if (network->driver->remove)
+               network->driver->remove(network);
+
+       network->driver = NULL;
+}
+
+static void probe_driver(struct connman_network_driver *driver)
+{
+       GSList *list;
+
+       DBG("driver %p name %s", driver, driver->name);
+
+       for (list = network_list; list; list = list->next) {
+               struct connman_network *network = list->data;
+
+               if (network->driver)
+                       continue;
+
+               if (driver->type != network->type)
+                       continue;
+
+               if (driver->probe(network) < 0)
+                       continue;
+
+               network->driver = driver;
+       }
+}
+
+static gint compare_priority(gconstpointer a, gconstpointer b)
+{
+       const struct connman_network_driver *driver1 = a;
+       const struct connman_network_driver *driver2 = b;
+
+       return driver2->priority - driver1->priority;
+}
+
+/**
+ * connman_network_driver_register:
+ * @driver: network driver definition
+ *
+ * Register a new network driver
+ *
+ * Returns: %0 on success
+ */
+int connman_network_driver_register(struct connman_network_driver *driver)
+{
+       DBG("driver %p name %s", driver, driver->name);
+
+       driver_list = g_slist_insert_sorted(driver_list, driver,
+                                                       compare_priority);
+
+       probe_driver(driver);
+
+       return 0;
+}
+
+/**
+ * connman_network_driver_unregister:
+ * @driver: network driver definition
+ *
+ * Remove a previously registered network driver
+ */
+void connman_network_driver_unregister(struct connman_network_driver *driver)
+{
+       GSList *list;
+
+       DBG("driver %p name %s", driver, driver->name);
+
+       driver_list = g_slist_remove(driver_list, driver);
+
+       for (list = network_list; list; list = list->next) {
+               struct connman_network *network = list->data;
+
+               if (network->driver == driver)
+                       network_remove(network);
+       }
+}
+
+static void network_destruct(struct connman_network *network)
+{
+       DBG("network %p name %s", network, network->name);
+
+       g_free(network->wifi.ssid);
+       g_free(network->wifi.mode);
+       g_free(network->wifi.security);
+       g_free(network->wifi.passphrase);
+       g_free(network->wifi.eap);
+       g_free(network->wifi.identity);
+       g_free(network->wifi.anonymous_identity);
+       g_free(network->wifi.agent_identity);
+       g_free(network->wifi.ca_cert_path);
+       g_free(network->wifi.subject_match);
+       g_free(network->wifi.altsubject_match);
+       g_free(network->wifi.domain_suffix_match);
+       g_free(network->wifi.domain_match);
+       g_free(network->wifi.client_cert_path);
+       g_free(network->wifi.private_key_path);
+       g_free(network->wifi.private_key_passphrase);
+       g_free(network->wifi.phase2_auth);
+       g_free(network->wifi.pin_wps);
+
+#if defined TIZEN_EXT
+       g_slist_free_full(network->wifi.vsie_list, g_free);
+       g_slist_free_full(network->wifi.bssid_list, g_free);
+       g_hash_table_destroy(network->wifi.assoc_reject_table);
+#endif
+       g_free(network->path);
+       g_free(network->group);
+       g_free(network->node);
+       g_free(network->name);
+       g_free(network->identifier);
+       acd_host_free(network->acd_host);
+
+       network->device = NULL;
+
+       g_free(network);
+}
+
+/**
+ * connman_network_create:
+ * @identifier: network identifier (for example an unique name)
+ *
+ * Allocate a new network and assign the #identifier to it.
+ *
+ * Returns: a newly-allocated #connman_network structure
+ */
+struct connman_network *connman_network_create(const char *identifier,
+                                               enum connman_network_type type)
+{
+       struct connman_network *network;
+       char *ident;
+
+       network = g_try_new0(struct connman_network, 1);
+       if (!network)
+               return NULL;
+
+       network->refcount = 1;
+
+       ident = g_strdup(identifier);
+
+       if (!ident) {
+               g_free(network);
+               return NULL;
+       }
+
+       network->type       = type;
+       network->identifier = ident;
+       network->acd_host = NULL;
+       network->ipv4ll_timeout = 0;
+
+       network_list = g_slist_prepend(network_list, network);
+
+       network->dhcp_timeout = 0;
+
+       DBG("network %p identifier %s type %s", network, identifier,
+               type2string(type));
+       return network;
+}
+
+/**
+ * connman_network_ref:
+ * @network: network structure
+ *
+ * Increase reference counter of  network
+ */
+struct connman_network *
+connman_network_ref_debug(struct connman_network *network,
+                       const char *file, int line, const char *caller)
+{
+#if defined TIZEN_EXT
+       if (!simplified_log)
+#endif
+       DBG("%p name %s ref %d by %s:%d:%s()", network, network->name,
+               network->refcount + 1, file, line, caller);
+
+       __sync_fetch_and_add(&network->refcount, 1);
+
+       return network;
+}
+
+/**
+ * connman_network_unref:
+ * @network: network structure
+ *
+ * Decrease reference counter of network
+ */
+void connman_network_unref_debug(struct connman_network *network,
+                               const char *file, int line, const char *caller)
+{
+#if defined TIZEN_EXT
+       if (!simplified_log)
+#endif
+       DBG("%p name %s ref %d by %s:%d:%s()", network, network->name,
+               network->refcount - 1, file, line, caller);
+
+       if (__sync_fetch_and_sub(&network->refcount, 1) != 1)
+               return;
+
+       network_list = g_slist_remove(network_list, network);
+
+       network_destruct(network);
+}
+
+const char *__connman_network_get_type(struct connman_network *network)
+{
+       return type2string(network->type);
+}
+
+/**
+ * connman_network_get_type:
+ * @network: network structure
+ *
+ * Get type of network
+ */
+enum connman_network_type connman_network_get_type(
+                               struct connman_network *network)
+{
+       return network->type;
+}
+
+/**
+ * connman_network_get_identifier:
+ * @network: network structure
+ *
+ * Get identifier of network
+ */
+const char *connman_network_get_identifier(struct connman_network *network)
+{
+       return network->identifier;
+}
+
+/**
+ * connman_network_set_index:
+ * @network: network structure
+ * @index: index number
+ *
+ * Set index number of network
+ */
+void connman_network_set_index(struct connman_network *network, int index)
+{
+       struct connman_service *service;
+       struct connman_ipconfig *ipconfig;
+
+       service = connman_service_lookup_from_network(network);
+       if (!service)
+               goto done;
+
+       ipconfig = __connman_service_get_ip4config(service);
+       if (ipconfig) {
+               __connman_ipconfig_set_index(ipconfig, index);
+
+               DBG("index %d service %p ip4config %p", network->index,
+                       service, ipconfig);
+       }
+
+       ipconfig = __connman_service_get_ip6config(service);
+       if (ipconfig) {
+               __connman_ipconfig_set_index(ipconfig, index);
+
+               DBG("index %d service %p ip6config %p", network->index,
+                       service, ipconfig);
+       }
+
+done:
+       network->index = index;
+}
+
+/**
+ * connman_network_get_index:
+ * @network: network structure
+ *
+ * Get index number of network
+ */
+int connman_network_get_index(struct connman_network *network)
+{
+       return network->index;
+}
+
+/**
+ * connman_network_set_group:
+ * @network: network structure
+ * @group: group name
+ *
+ * Set group name for automatic clustering
+ */
+void connman_network_set_group(struct connman_network *network,
+                                                       const char *group)
+{
+       switch (network->type) {
+       case CONNMAN_NETWORK_TYPE_UNKNOWN:
+       case CONNMAN_NETWORK_TYPE_VENDOR:
+               return;
+       case CONNMAN_NETWORK_TYPE_ETHERNET:
+       case CONNMAN_NETWORK_TYPE_GADGET:
+       case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
+       case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
+       case CONNMAN_NETWORK_TYPE_CELLULAR:
+       case CONNMAN_NETWORK_TYPE_WIFI:
+               break;
+       }
+
+       if (g_strcmp0(network->group, group) == 0) {
+               if (group)
+                       __connman_service_update_from_network(network);
+               return;
+       }
+
+       if (network->group) {
+               __connman_service_remove_from_network(network);
+
+               g_free(network->group);
+       }
+
+       network->group = g_strdup(group);
+
+       if (network->group)
+               network_probe(network);
+}
+
+/**
+ * connman_network_get_group:
+ * @network: network structure
+ *
+ * Get group name for automatic clustering
+ */
+const char *connman_network_get_group(struct connman_network *network)
+{
+       return network->group;
+}
+
+const char *__connman_network_get_ident(struct connman_network *network)
+{
+       if (!network->device)
+               return NULL;
+
+       return connman_device_get_ident(network->device);
+}
+
+bool __connman_network_get_weakness(struct connman_network *network)
+{
+       switch (network->type) {
+       case CONNMAN_NETWORK_TYPE_UNKNOWN:
+       case CONNMAN_NETWORK_TYPE_VENDOR:
+       case CONNMAN_NETWORK_TYPE_ETHERNET:
+       case CONNMAN_NETWORK_TYPE_GADGET:
+       case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
+       case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
+       case CONNMAN_NETWORK_TYPE_CELLULAR:
+               break;
+       case CONNMAN_NETWORK_TYPE_WIFI:
+               if (network->strength > 0 && network->strength < 20)
+                       return true;
+               break;
+       }
+
+       return false;
+}
+
+#if defined TIZEN_EXT
+void connman_network_set_connecting(struct connman_network *network)
+{
+       DBG("set network connecting true");
+       network->connecting = TRUE;
+       return;
+}
+#endif
+
+bool connman_network_get_connecting(struct connman_network *network)
+{
+       return network->connecting;
+}
+
+/**
+ * connman_network_set_available:
+ * @network: network structure
+ * @available: availability state
+ *
+ * Change availability state of network (in range)
+ */
+int connman_network_set_available(struct connman_network *network,
+                                               bool available)
+{
+#if !defined TIZEN_EXT
+       DBG("network %p available %d", network, available);
+#endif
+
+       if (network->available == available)
+               return -EALREADY;
+
+       network->available = available;
+
+       return 0;
+}
+
+/**
+ * connman_network_get_available:
+ * @network: network structure
+ *
+ * Get network available setting
+ */
+bool connman_network_get_available(struct connman_network *network)
+{
+       return network->available;
+}
+
+#if defined TIZEN_EXT
+void connman_network_clear_associating(struct connman_network *network)
+{
+       struct connman_service *service;
+       enum connman_service_state state;
+
+       DBG("network %p", network);
+
+       network->connecting = FALSE;
+       network->associating = FALSE;
+
+       service = connman_service_lookup_from_network(network);
+       if (!service)
+               return;
+
+       state = __connman_service_ipconfig_get_state(service,
+                                               CONNMAN_IPCONFIG_TYPE_IPV4);
+       if (state != CONNMAN_SERVICE_STATE_IDLE &&
+                       state != CONNMAN_SERVICE_STATE_FAILURE)
+               __connman_service_ipconfig_indicate_state(service,
+                                       CONNMAN_SERVICE_STATE_DISCONNECT,
+                                       CONNMAN_IPCONFIG_TYPE_IPV4);
+
+       state = __connman_service_ipconfig_get_state(service,
+                                               CONNMAN_IPCONFIG_TYPE_IPV6);
+       if (state != CONNMAN_SERVICE_STATE_IDLE &&
+                               state != CONNMAN_SERVICE_STATE_FAILURE)
+               __connman_service_ipconfig_indicate_state(service,
+                                       CONNMAN_SERVICE_STATE_DISCONNECT,
+                                       CONNMAN_IPCONFIG_TYPE_IPV6);
+
+       __connman_service_ipconfig_indicate_state(service,
+                                               CONNMAN_SERVICE_STATE_IDLE,
+                                               CONNMAN_IPCONFIG_TYPE_IPV4);
+
+       __connman_service_ipconfig_indicate_state(service,
+                                               CONNMAN_SERVICE_STATE_IDLE,
+                                               CONNMAN_IPCONFIG_TYPE_IPV6);
+}
+
+static gboolean __connman_network_clear_associating_delayed(gpointer user_data)
+{
+       GSList *list;
+       gboolean found = FALSE;
+       enum connman_service_state state_ipv4;
+       enum connman_service_state state_ipv6;
+       struct connman_service *service;
+       struct connman_network *network = (struct connman_network *)user_data;
+
+       for (list = network_list; list != NULL; list = list->next) {
+               struct connman_network *item = list->data;
+
+               if (item == network) {
+                       found = TRUE;
+                       break;
+               }
+       }
+
+       if (found != TRUE)
+               return FALSE;
+
+       DBG("network %p name %s", network, network->name);
+       service = connman_service_lookup_from_network(network);
+
+       state_ipv4 = __connman_service_ipconfig_get_state(service,
                                                CONNMAN_IPCONFIG_TYPE_IPV4);
+       state_ipv6 = __connman_service_ipconfig_get_state(service,
+                                               CONNMAN_IPCONFIG_TYPE_IPV6);
+
+       DBG("service %p state %d/%d", service, state_ipv4, state_ipv6);
+
+       if (network->associating == FALSE &&
+                       state_ipv4 == CONNMAN_SERVICE_STATE_ASSOCIATION &&
+                       state_ipv6 == CONNMAN_SERVICE_STATE_ASSOCIATION) {
+               __connman_service_ipconfig_indicate_state(service,
+                               CONNMAN_SERVICE_STATE_IDLE,
+                               CONNMAN_IPCONFIG_TYPE_IPV4);
+               __connman_service_ipconfig_indicate_state(service,
+                               CONNMAN_SERVICE_STATE_IDLE,
+                               CONNMAN_IPCONFIG_TYPE_IPV6);
+       } else {
+               if (network->associating == FALSE) {
+                       struct connman_ipconfig *ipconfig_ipv4, *ipconfig_ipv6;
+                       enum connman_ipconfig_method ipv4_method, ipv6_method;
+
+                       ipconfig_ipv4 = __connman_service_get_ip4config(service);
+                       ipv4_method = __connman_ipconfig_get_method(ipconfig_ipv4);
+                       ipconfig_ipv6 = __connman_service_get_ip4config(service);
+                       ipv6_method = __connman_ipconfig_get_method(ipconfig_ipv6);
+
+                       if((ipv4_method == CONNMAN_IPCONFIG_METHOD_UNKNOWN || ipv4_method == CONNMAN_IPCONFIG_METHOD_OFF) &&
+                                       (state_ipv6 == CONNMAN_SERVICE_STATE_ASSOCIATION))
+                               __connman_service_ipconfig_indicate_state(service,
+                                               CONNMAN_SERVICE_STATE_IDLE,
+                                               CONNMAN_IPCONFIG_TYPE_IPV6);
+                       if((ipv6_method == CONNMAN_IPCONFIG_METHOD_UNKNOWN || ipv6_method == CONNMAN_IPCONFIG_METHOD_OFF) &&
+                                       (state_ipv4 == CONNMAN_SERVICE_STATE_ASSOCIATION))
+                               __connman_service_ipconfig_indicate_state(service,
+                                               CONNMAN_SERVICE_STATE_IDLE,
+                                               CONNMAN_IPCONFIG_TYPE_IPV4);
+               }
+       }
+
+       return FALSE;
+}
+#endif
+
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+bool connman_network_check_validity(struct connman_network *network)
+{
+       return (NULL == g_slist_find(network_list, network)) ? false : true;
+}
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
+
+/**
+ * connman_network_set_associating:
+ * @network: network structure
+ * @associating: associating state
+ *
+ * Change associating state of network
+ */
+int connman_network_set_associating(struct connman_network *network,
+                                               bool associating)
+{
+       DBG("network %p associating %d", network, associating);
+
+       if (network->associating == associating)
+               return -EALREADY;
+
+       network->associating = associating;
+
+       if (associating) {
+               struct connman_service *service;
+
+               service = connman_service_lookup_from_network(network);
+               __connman_service_ipconfig_indicate_state(service,
+                                       CONNMAN_SERVICE_STATE_ASSOCIATION,
+                                       CONNMAN_IPCONFIG_TYPE_IPV4);
+               __connman_service_ipconfig_indicate_state(service,
+                                       CONNMAN_SERVICE_STATE_ASSOCIATION,
+                                       CONNMAN_IPCONFIG_TYPE_IPV6);
+       }
+
+#if defined TIZEN_EXT
+       if (associating == FALSE &&
+                       connman_network_get_bool(network, "WiFi.UseWPS") == FALSE)
+               g_timeout_add_seconds(1,
+                               __connman_network_clear_associating_delayed,
+                               network);
+#endif
+
+       return 0;
+}
+
+#if defined TIZEN_EXT
+static void set_authenticate_error(struct connman_network *network)
+{
+       struct connman_service *service;
+
+       service = connman_service_lookup_from_network(network);
+
+       if (!service)
+               return;
+
+       __connman_service_indicate_error(service,
+                                       CONNMAN_SERVICE_ERROR_AUTH_FAILED);
+}
+#endif
+
+
+static void set_associate_error(struct connman_network *network)
+{
+       struct connman_service *service;
+
+       service = connman_service_lookup_from_network(network);
+
+#if defined TIZEN_EXT
+       if (!service)
+               return;
+
+       __connman_service_indicate_error(service,
+                                       CONNMAN_SERVICE_ERROR_ASSOC_FAILED);
+#else
+       __connman_service_indicate_error(service,
+                                       CONNMAN_SERVICE_ERROR_CONNECT_FAILED);
+#endif
+}
+
+static void set_configure_error(struct connman_network *network)
+{
+       struct connman_service *service;
+
+       service = connman_service_lookup_from_network(network);
+
+       __connman_service_indicate_error(service,
+                                       CONNMAN_SERVICE_ERROR_CONNECT_FAILED);
+}
+
+static void set_invalid_key_error(struct connman_network *network)
+{
+       struct connman_service *service;
+
+       service = connman_service_lookup_from_network(network);
+
+#if defined TIZEN_EXT
+       if (service)
+               __connman_service_set_favorite(service, false);
+#endif
+       __connman_service_indicate_error(service,
+                                       CONNMAN_SERVICE_ERROR_INVALID_KEY);
+}
+
+static void set_connect_error(struct connman_network *network)
+{
+       struct connman_service *service;
+
+       service = connman_service_lookup_from_network(network);
+
+       __connman_service_indicate_error(service,
+                                       CONNMAN_SERVICE_ERROR_CONNECT_FAILED);
+}
+
+static void set_blocked_error(struct connman_network *network)
+{
+       struct connman_service *service;
+
+       service = connman_service_lookup_from_network(network);
+
+       __connman_service_indicate_error(service,
+                                       CONNMAN_SERVICE_ERROR_BLOCKED);
+}
+
+
+#if defined TIZEN_EXT
+static void set_dhcp_error(struct connman_network *network)
+{
+       struct connman_service *service;
+
+       if (network->associating != FALSE)
+               network->associating = FALSE;
+
+       service = connman_service_lookup_from_network(network);
+
+       __connman_service_indicate_error(service,
+                                       CONNMAN_SERVICE_ERROR_DHCP_FAILED);
+}
+#endif
+
+void connman_network_set_ipv4_method(struct connman_network *network,
+                                       enum connman_ipconfig_method method)
+{
+       struct connman_service *service;
+       struct connman_ipconfig *ipconfig;
 
-       return;
+       service = connman_service_lookup_from_network(network);
+       if (!service)
+               return;
 
-err:
-       connman_network_set_error(network,
-                               CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
+       ipconfig = __connman_service_get_ip4config(service);
+       if (!ipconfig)
+               return;
+
+       __connman_ipconfig_set_method(ipconfig, method);
 }
 
-static void dhcp_failure(struct connman_network *network)
+void connman_network_set_ipv6_method(struct connman_network *network,
+                                       enum connman_ipconfig_method method)
 {
        struct connman_service *service;
-       struct connman_ipconfig *ipconfig_ipv4;
+       struct connman_ipconfig *ipconfig;
 
-       service = __connman_service_lookup_from_network(network);
-       if (service == NULL)
+       service = connman_service_lookup_from_network(network);
+       if (!service)
                return;
 
-       ipconfig_ipv4 = __connman_service_get_ip4config(service);
-       __connman_ipconfig_address_remove(ipconfig_ipv4);
+       ipconfig = __connman_service_get_ip6config(service);
+       if (!ipconfig)
+               return;
 
-       __connman_service_indicate_state(service, CONNMAN_SERVICE_STATE_IDLE,
-                                               CONNMAN_IPCONFIG_TYPE_IPV4);
+       __connman_ipconfig_set_method(ipconfig, method);
 }
 
-static void dhcp_callback(struct connman_network *network,
-                       connman_bool_t success)
+void connman_network_set_error(struct connman_network *network,
+                                       enum connman_network_error error)
 {
-       DBG("success %d", success);
+       DBG("network %p error %d", network, error);
 
-       if (success == TRUE)
-               dhcp_success(network);
+       switch (error) {
+       case CONNMAN_NETWORK_ERROR_UNKNOWN:
+               return;
+       case CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL:
+               set_associate_error(network);
+               break;
+       case CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL:
+               set_configure_error(network);
+               break;
+       case CONNMAN_NETWORK_ERROR_INVALID_KEY:
+               set_invalid_key_error(network);
+               break;
+       case CONNMAN_NETWORK_ERROR_CONNECT_FAIL:
+               set_connect_error(network);
+               break;
+#if defined TIZEN_EXT
+       case CONNMAN_NETWORK_ERROR_AUTHENTICATE_FAIL:
+               set_authenticate_error(network);
+               break;
+       case CONNMAN_NETWORK_ERROR_DHCP_FAIL:
+               set_dhcp_error(network);
+               break;
+#endif
+
+       case CONNMAN_NETWORK_ERROR_BLOCKED:
+               set_blocked_error(network);
+               break;
+       }
+
+       __connman_network_disconnect(network);
+}
+
+/**
+ * connman_network_set_connected:
+ * @network: network structure
+ * @connected: connected state
+ *
+ * Change connected state of network
+ */
+int connman_network_set_connected(struct connman_network *network,
+                                               bool connected)
+{
+       DBG("network %p connected %d/%d connecting %d associating %d",
+               network, network->connected, connected, network->connecting,
+               network->associating);
+
+       if ((network->connecting || network->associating) &&
+                                                       !connected) {
+               connman_network_set_error(network,
+                                       CONNMAN_NETWORK_ERROR_CONNECT_FAIL);
+               return 0;
+       }
+
+       if (network->connected == connected)
+               return -EALREADY;
+
+       if (!connected)
+               set_disconnected(network);
        else
-               dhcp_failure(network);
+               set_connected(network);
+
+       return 0;
 }
 
-static int set_connected_fixed(struct connman_network *network)
+/**
+ * connman_network_get_connected:
+ * @network: network structure
+ *
+ * Get network connection status
+ */
+bool connman_network_get_connected(struct connman_network *network)
 {
-       struct connman_service *service;
-       struct connman_ipconfig *ipconfig_ipv4;
-       int err;
+       return network->connected;
+}
 
-       DBG("");
+/**
+ * connman_network_get_associating:
+ * @network: network structure
+ *
+ * Get network associating status
+ */
+bool connman_network_get_associating(struct connman_network *network)
+{
+       return network->associating;
+}
 
-       service = __connman_service_lookup_from_network(network);
+void connman_network_clear_hidden(void *user_data)
+{
+       if (!user_data)
+               return;
 
-       ipconfig_ipv4 = __connman_service_get_ip4config(service);
+       DBG("user_data %p", user_data);
 
-       set_configuration(network);
+       /*
+        * Hidden service does not have a connect timeout so
+        * we do not need to remove it. We can just return
+        * error to the caller telling that we could not find
+        * any network that we could connect to.
+        */
+       connman_dbus_reply_pending(user_data, EIO, NULL);
+}
 
-       network->connecting = FALSE;
+int connman_network_connect_hidden(struct connman_network *network,
+                       char *identity, char *passphrase, void *user_data)
+{
+       int err = 0;
+       struct connman_service *service;
 
-       connman_network_set_associating(network, FALSE);
+       service = connman_service_lookup_from_network(network);
 
-       err = __connman_ipconfig_address_add(ipconfig_ipv4);
-       if (err < 0)
-               goto err;
+       DBG("network %p service %p user_data %p", network, service, user_data);
 
-       err = __connman_ipconfig_gateway_add(ipconfig_ipv4);
-       if (err < 0)
-               goto err;
+       if (!service)
+               return -EINVAL;
 
-       __connman_service_indicate_state(service,
-                                       CONNMAN_SERVICE_STATE_READY,
-                                       CONNMAN_IPCONFIG_TYPE_IPV4);
-       return 0;
+       if (identity)
+               __connman_service_set_agent_identity(service, identity);
 
-err:
-       connman_network_set_error(network,
-                       CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
+       if (passphrase)
+               err = __connman_service_set_passphrase(service, passphrase);
+
+       if (err == -ENOKEY) {
+               __connman_service_indicate_error(service,
+                                       CONNMAN_SERVICE_ERROR_INVALID_KEY);
+               goto out;
+       } else {
+               __connman_service_set_hidden(service);
+               __connman_service_set_hidden_data(service, user_data);
+               return __connman_service_connect(service,
+                                       CONNMAN_SERVICE_CONNECT_REASON_USER);
+       }
 
+out:
+       __connman_service_return_error(service, -err, user_data);
        return err;
 }
 
-static void set_connected_manual(struct connman_network *network)
+/**
+ * __connman_network_connect:
+ * @network: network structure
+ *
+ * Connect network
+ */
+int __connman_network_connect(struct connman_network *network)
 {
-       struct connman_service *service;
-       struct connman_ipconfig *ipconfig;
        int err;
 
        DBG("network %p", network);
 
-       service = __connman_service_lookup_from_network(network);
+       if (network->connected)
+               return -EISCONN;
 
-       ipconfig = __connman_service_get_ip4config(service);
+       if (network->connecting || network->associating)
+               return -EALREADY;
 
-       set_configuration(network);
+       if (!network->driver)
+               return -EUNATCH;
 
-       err = __connman_ipconfig_address_add(ipconfig);
-       if (err < 0)
-               goto err;
+       if (!network->driver->connect)
+               return -ENOSYS;
 
-       err = __connman_ipconfig_gateway_add(ipconfig);
-       if (err < 0)
-               goto err;
+       if (!network->device)
+               return -ENODEV;
 
-       network->connecting = FALSE;
+#if defined TIZEN_EXT
+       if (network->type != CONNMAN_NETWORK_TYPE_CELLULAR)
+#endif
+       __connman_device_disconnect(network->device);
 
-       connman_network_set_associating(network, FALSE);
+       network->connecting = true;
 
-       __connman_service_indicate_state(service, CONNMAN_SERVICE_STATE_READY,
-                                       CONNMAN_IPCONFIG_TYPE_IPV4);
+#if defined TIZEN_EXT
+       DBG("ConnMan, Connect Request [%s]", network->name);
+#endif
 
-       return;
+       err = network->driver->connect(network);
+       if (err < 0) {
+               if (err == -EINPROGRESS) {
+#if defined TIZEN_EXT
+                       if (network->type != CONNMAN_NETWORK_TYPE_CELLULAR)
+#endif
+                       connman_network_set_associating(network, true);
+               } else
+                       network->connecting = false;
 
-err:
-       connman_network_set_error(network,
-                                       CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
-       return;
+               return err;
+       }
+
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+       /*
+        * Note: If EAP on Ethernet is ON, then network will be connected
+        * after EAP Success event is recieved, from plugin/ethernet.c
+        */
+       struct connman_service *service = connman_service_lookup_from_network(network);
+       if (service && __connman_service_get_use_eapol(service)) {
+               connman_network_set_associating(network, true);
+               return 0;
+       }
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
+
+       set_connected(network);
+
+       return err;
 }
 
-static int set_connected_dhcp(struct connman_network *network)
+/**
+ * __connman_network_disconnect:
+ * @network: network structure
+ *
+ * Disconnect network
+ */
+int __connman_network_disconnect(struct connman_network *network)
 {
-       int err;
-
+       int err = 0;
+#if defined TIZEN_EXT
+       if (!simplified_log)
+#endif
        DBG("network %p", network);
 
-       set_configuration(network);
+       remove_ipv4ll_timeout(network);
+       if (network->acd_host)
+               acd_host_stop(network->acd_host);
 
-       err = __connman_dhcp_start(network, dhcp_callback);
-       if (err < 0) {
-               connman_error("Can not request DHCP lease");
-               return err;
-       }
+       if (!network->connected && !network->connecting &&
+                                               !network->associating)
+               return -ENOTCONN;
 
-       return 0;
+       if (!network->driver)
+               return -EUNATCH;
+
+       network->connecting = false;
+
+#if defined TIZEN_EXT
+       DBG("ConnMan, Disconnect request");
+       struct connman_service *service = connman_service_lookup_from_network(network);
+       connman_service_set_disconnection_requested(service, true);
+#endif
+       if (network->driver->disconnect)
+               err = network->driver->disconnect(network);
+
+       if (err != -EINPROGRESS)
+               set_disconnected(network);
+
+       return err;
 }
 
-static int manual_ipv6_set(struct connman_network *network,
-                               struct connman_ipconfig *ipconfig_ipv6)
+int __connman_network_clear_ipconfig(struct connman_network *network,
+                                       struct connman_ipconfig *ipconfig)
 {
        struct connman_service *service;
-       int err;
+       struct connman_ipconfig *ipconfig_ipv4;
+       enum connman_ipconfig_method method;
+       enum connman_ipconfig_type type;
 
-       service = __connman_service_lookup_from_network(network);
-       if (service == NULL)
+       service = connman_service_lookup_from_network(network);
+       if (!service)
                return -EINVAL;
 
-       err = __connman_ipconfig_address_add(ipconfig_ipv6);
-       if (err < 0) {
-               connman_network_set_error(network,
-                       CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
-               return err;
+       ipconfig_ipv4 = __connman_service_get_ip4config(service);
+       method = __connman_ipconfig_get_method(ipconfig);
+       type = __connman_ipconfig_get_config_type(ipconfig);
+
+       switch (method) {
+       case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+       case CONNMAN_IPCONFIG_METHOD_OFF:
+       case CONNMAN_IPCONFIG_METHOD_FIXED:
+               return -EINVAL;
+       case CONNMAN_IPCONFIG_METHOD_MANUAL:
+               __connman_ipconfig_address_remove(ipconfig);
+               break;
+       case CONNMAN_IPCONFIG_METHOD_AUTO:
+               release_dhcpv6(network);
+               if (type == CONNMAN_IPCONFIG_TYPE_IPV6)
+                       break;
+               /* fall through */
+       case CONNMAN_IPCONFIG_METHOD_DHCP:
+               remove_dhcp_timeout(network);
+               __connman_dhcp_stop(ipconfig_ipv4);
+               break;
        }
 
-       /*
-        * READY state will be indicated by IPV4 setting
-        * gateway will be set by IPV4 setting
-        */
+       if (type == CONNMAN_IPCONFIG_TYPE_IPV6)
+               __connman_service_ipconfig_indicate_state(service,
+                                       CONNMAN_SERVICE_STATE_CONFIGURATION,
+                                       CONNMAN_IPCONFIG_TYPE_IPV6);
+       else if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
+               __connman_service_ipconfig_indicate_state(service,
+                                       CONNMAN_SERVICE_STATE_CONFIGURATION,
+                                       CONNMAN_IPCONFIG_TYPE_IPV4);
 
        return 0;
 }
 
-static void autoconf_ipv6_set(struct connman_network *network)
+#if defined TIZEN_EXT
+void __connman_network_set_auto_ipv6_gateway(char *gateway, void *user_data)
 {
-       struct connman_service *service;
-       const char *nameserver = NULL;
-
-       DBG("network %p", network);
-
-       service = __connman_service_lookup_from_network(network);
-
-       __connman_device_increase_connections(network->device);
+       DBG("");
 
-       __connman_device_set_network(network->device, network);
+       struct connman_network *network = user_data;
+       struct connman_service *service;
+       struct connman_ipconfig *ipconfig = NULL;
 
-       connman_device_set_disconnected(network->device, FALSE);
+       service = connman_service_lookup_from_network(network);
+       if (service == NULL)
+               return;
 
-       connman_element_get_value(&network->element,
-                       CONNMAN_PROPERTY_ID_IPV6_NAMESERVER, &nameserver);
-       if (nameserver != NULL)
-               __connman_service_nameserver_append(service, nameserver);
+       ipconfig = __connman_service_get_ipconfig(service, AF_INET6);
+       if (ipconfig == NULL)
+               return;
 
-       network->connecting = FALSE;
+       __connman_ipconfig_set_gateway(ipconfig, gateway);
 
-       __connman_service_indicate_state(service,
-                                       CONNMAN_SERVICE_STATE_READY,
-                                       CONNMAN_IPCONFIG_TYPE_IPV6);
+       return;
 }
+#endif
 
-static gboolean set_connected(gpointer user_data)
+int __connman_network_enable_ipconfig(struct connman_network *network,
+                               struct connman_ipconfig *ipconfig)
 {
-       struct connman_network *network = user_data;
+       int r = 0;
+       enum connman_ipconfig_type type;
+       enum connman_ipconfig_method method;
+#if defined TIZEN_EXT
        struct connman_service *service;
-       struct connman_ipconfig *ipconfig_ipv4, *ipconfig_ipv6;
-       enum connman_ipconfig_method ipv4_method, ipv6_method;
+#endif
 
-       service = __connman_service_lookup_from_network(network);
+       if (!network || !ipconfig)
+               return -EINVAL;
 
-       ipconfig_ipv4 = __connman_service_get_ip4config(service);
-       ipconfig_ipv6 = __connman_service_get_ip6config(service);
+       type = __connman_ipconfig_get_config_type(ipconfig);
 
-       DBG("service %p ipv4 %p ipv6 %p", service, ipconfig_ipv4,
-               ipconfig_ipv6);
+       switch (type) {
+       case CONNMAN_IPCONFIG_TYPE_UNKNOWN:
+       case CONNMAN_IPCONFIG_TYPE_ALL:
+               return -ENOSYS;
 
-       ipv4_method = __connman_ipconfig_get_method(ipconfig_ipv4);
-       ipv6_method = __connman_ipconfig_get_method(ipconfig_ipv6);
+       case CONNMAN_IPCONFIG_TYPE_IPV6:
+               set_configuration(network, type);
 
-       DBG("method ipv4 %d ipv6 %d", ipv4_method, ipv6_method);
-       DBG("network connected %d", network->connected);
+               method = __connman_ipconfig_get_method(ipconfig);
 
-       if (network->connected == TRUE) {
-               int ret;
+               DBG("ipv6 ipconfig method %d", method);
 
-               switch (ipv6_method) {
+               switch (method) {
                case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+                       break;
+
                case CONNMAN_IPCONFIG_METHOD_OFF:
+                       __connman_ipconfig_disable_ipv6(ipconfig);
                        break;
+
                case CONNMAN_IPCONFIG_METHOD_AUTO:
+#if defined TIZEN_EXT
+               service = connman_service_lookup_from_network(network);
+
+               if(network->type == CONNMAN_NETWORK_TYPE_CELLULAR)
+                       __connman_service_ipconfig_indicate_state(service,
+                               CONNMAN_SERVICE_STATE_CONFIGURATION,
+                                       CONNMAN_IPCONFIG_TYPE_IPV6);
+#endif
                        autoconf_ipv6_set(network);
                        break;
+
                case CONNMAN_IPCONFIG_METHOD_FIXED:
                case CONNMAN_IPCONFIG_METHOD_MANUAL:
-                       ret = manual_ipv6_set(network, ipconfig_ipv6);
-                       if (ret != 0) {
-                               connman_network_set_error(network,
-                                       CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL);
-                               return FALSE;
-                       }
+                       r = manual_ipv6_set(network, ipconfig);
                        break;
+
                case CONNMAN_IPCONFIG_METHOD_DHCP:
+                       r = -ENOSYS;
                        break;
                }
 
-               switch (ipv4_method) {
+               break;
+
+       case CONNMAN_IPCONFIG_TYPE_IPV4:
+               set_configuration(network, type);
+
+               method = __connman_ipconfig_get_method(ipconfig);
+
+               DBG("ipv4 ipconfig method %d", method);
+
+               switch (method) {
                case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
                case CONNMAN_IPCONFIG_METHOD_OFF:
+                       break;
+
                case CONNMAN_IPCONFIG_METHOD_AUTO:
-                       return FALSE;
+                       r = -ENOSYS;
+                       break;
+
                case CONNMAN_IPCONFIG_METHOD_FIXED:
-                       if (set_connected_fixed(network) < 0) {
-                               connman_network_set_error(network,
-                                       CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL);
-                               return FALSE;
-                       }
-                       return TRUE;
                case CONNMAN_IPCONFIG_METHOD_MANUAL:
-                       set_connected_manual(network);
-                       return TRUE;
+                       r = set_connected_manual(network);
+                       break;
+
                case CONNMAN_IPCONFIG_METHOD_DHCP:
-                       if (set_connected_dhcp(network) < 0) {
-                               connman_network_set_error(network,
-                                       CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL);
-                               return FALSE;
-                       }
+                       r = set_connected_dhcp(network);
+                       break;
                }
 
-       } else {
-               struct connman_service *service;
-
-               connman_element_unregister_children(&network->element);
-
-               __connman_device_set_network(network->device, NULL);
-               network->hidden = FALSE;
-
-               service = __connman_service_lookup_from_network(network);
+               break;
+       }
 
-               __connman_service_indicate_state(service,
-                                       CONNMAN_SERVICE_STATE_DISCONNECT,
-                                       CONNMAN_IPCONFIG_TYPE_IPV4);
+       if (r < 0)
+               connman_network_set_error(network,
+                                       CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
 
-               __connman_service_indicate_state(service,
-                                       CONNMAN_SERVICE_STATE_DISCONNECT,
-                                       CONNMAN_IPCONFIG_TYPE_IPV6);
+       return r;
+}
 
-               __connman_connection_gateway_remove(service);
+int connman_network_set_ipaddress(struct connman_network *network,
+                                       struct connman_ipaddress *ipaddress)
+{
+       struct connman_service *service;
+       struct connman_ipconfig *ipconfig = NULL;
 
-               __connman_service_indicate_state(service,
-                                       CONNMAN_SERVICE_STATE_IDLE,
-                                       CONNMAN_IPCONFIG_TYPE_IPV4);
+       DBG("network %p", network);
 
-               __connman_service_indicate_state(service,
-                                       CONNMAN_SERVICE_STATE_IDLE,
-                                       CONNMAN_IPCONFIG_TYPE_IPV6);
-       }
+       service = connman_service_lookup_from_network(network);
+       if (!service)
+               return -EINVAL;
 
-       network->connecting = FALSE;
+       ipconfig = __connman_service_get_ipconfig(service, ipaddress->family);
+       if (!ipconfig)
+               return -EINVAL;
 
-       connman_network_set_associating(network, FALSE);
+       __connman_ipconfig_set_local(ipconfig, ipaddress->local);
+       __connman_ipconfig_set_peer(ipconfig, ipaddress->peer);
+       __connman_ipconfig_set_broadcast(ipconfig, ipaddress->broadcast);
+       __connman_ipconfig_set_prefixlen(ipconfig, ipaddress->prefixlen);
+       __connman_ipconfig_set_gateway(ipconfig, ipaddress->gateway);
 
-       return FALSE;
+       return 0;
 }
 
-/**
- * connman_network_set_connected:
- * @network: network structure
- * @connected: connected state
- *
- * Change connected state of network
+#if defined TIZEN_EXT
+/*
+ * Description: Network client requires additional wifi specific info
  */
-int connman_network_set_connected(struct connman_network *network,
-                                               connman_bool_t connected)
+int connman_network_set_bssid(struct connman_network *network,
+                               const unsigned char *bssid)
 {
-       DBG("network %p connected %d", network, connected);
-
-       if ((network->connecting == TRUE || network->associating == TRUE) &&
-                                                       connected == FALSE) {
-               connman_element_set_error(&network->element,
-                                       CONNMAN_ELEMENT_ERROR_CONNECT_FAILED);
-               __connman_network_disconnect(network);
-       }
-
-       if (network->connected == connected)
-               return -EALREADY;
+       int i = 0;
 
-       if (connected == FALSE)
-               __connman_device_decrease_connections(network->device);
+       if (bssid == NULL)
+               return -EINVAL;
 
-       network->connected = connected;
+       if (!simplified_log)
+               DBG("network %p bssid %02x:%02x:%02x:%02x:%02x:%02x", network,
+                               bssid[0], bssid[1], bssid[2],
+                               bssid[3], bssid[4], bssid[5]);
 
-       set_connected(network);
+       for (;i < WIFI_BSSID_LEN_MAX;i++)
+               network->wifi.bssid[i] = bssid[i];
 
        return 0;
 }
 
-/**
- * connman_network_get_connected:
- * @network: network structure
- *
- * Get network connection status
- */
-connman_bool_t connman_network_get_connected(struct connman_network *network)
+unsigned char *connman_network_get_bssid(struct connman_network *network)
 {
-       return network->connected;
+       return (unsigned char *)network->wifi.bssid;
 }
 
-/**
- * connman_network_get_associating:
- * @network: network structure
- *
- * Get network associating status
- */
-connman_bool_t connman_network_get_associating(struct connman_network *network)
+int connman_network_set_transition_mode_bssid(struct connman_network *network,
+                               const unsigned char *transition_mode_bssid)
 {
-       return network->associating;
+       int i = 0;
+
+       if (transition_mode_bssid == NULL)
+               return -EINVAL;
+
+       for (;i < WIFI_BSSID_LEN_MAX;i++)
+               network->wifi.transition_mode_bssid[i] = transition_mode_bssid[i];
+
+       return 0;
 }
 
-/**
- * __connman_network_connect:
- * @network: network structure
- *
- * Connect network
- */
-int __connman_network_connect(struct connman_network *network)
+unsigned char *connman_network_get_transition_mode_bssid(struct connman_network *network)
 {
-       int err;
+       return (unsigned char *)network->wifi.transition_mode_bssid;
+}
 
-       DBG("network %p", network);
+bool connman_network_check_transition_mode(struct connman_network *network1, struct connman_network *network2)
+{
 
-       if (network->connected == TRUE)
-               return -EISCONN;
+       if (network1 == NULL || network2 == NULL)
+               return FALSE;
 
-       if (network->connecting == TRUE || network->associating == TRUE)
-               return -EALREADY;
+       if (network1->wifi.owe_transition_mode == FALSE || network2->wifi.owe_transition_mode == FALSE)
+               return FALSE;
 
-       if (network->driver == NULL)
-               return -EUNATCH;
+       if ((memcmp(network1->wifi.bssid, network2->wifi.transition_mode_bssid, WIFI_BSSID_LEN_MAX) == 0)
+               && (memcmp(network1->wifi.transition_mode_bssid, network2->wifi.bssid, WIFI_BSSID_LEN_MAX) == 0))
+               return TRUE;
+       else
+               return FALSE;
+}
 
-       if (network->driver->connect == NULL)
-               return -ENOSYS;
+int connman_network_set_maxspeed(struct connman_network *network,
+                                int maxspeed)
+{
+       network->wifi.maxspeed = maxspeed;
+        return 0;
+}
 
-       if (network->device == NULL)
-               return -ENODEV;
+int connman_network_get_maxspeed(struct connman_network *network)
+{
+       if (!network->driver)
+               return 0;
 
-       network->connecting = TRUE;
+       if (network->connected)
+               return network->wifi.maxspeed;
 
-       __connman_device_disconnect(network->device);
+       return 0;
+}
 
-       err = network->driver->connect(network);
-       if (err < 0) {
-               if (err == -EINPROGRESS)
-                       connman_network_set_associating(network, TRUE);
-               else {
-                       network->connecting = FALSE;
-                       network->hidden = FALSE;
-               }
+int connman_network_set_sec_list(struct connman_network *network,
+                                       GSList *sec_list)
+{
+       g_slist_free(network->wifi.sec_list);
+       network->wifi.sec_list = sec_list;
 
-               return err;
-       }
+       return 0;
+}
 
-       network->connected = TRUE;
-       set_connected(network);
+void *connman_network_get_sec_list(struct connman_network *network)
+{
+       return network->wifi.sec_list;
+}
 
-       return err;
+int connman_network_set_maxrate(struct connman_network *network,
+                               unsigned int maxrate)
+{
+#if !defined TIZEN_EXT
+       DBG("network %p maxrate %d", network, maxrate);
+#endif
+
+       network->wifi.maxrate = maxrate;
+
+       return 0;
 }
 
-/**
- * __connman_network_disconnect:
- * @network: network structure
- *
- * Disconnect network
- */
-int __connman_network_disconnect(struct connman_network *network)
+unsigned int connman_network_get_maxrate(struct connman_network *network)
 {
-       int err;
+       return network->wifi.maxrate;
+}
 
-       DBG("network %p", network);
+int connman_network_set_enc_mode(struct connman_network *network,
+                               const char *encryption_mode)
+{
+       if (encryption_mode == NULL)
+               return -EINVAL;
 
-       if (network->connected == FALSE && network->connecting == FALSE &&
-                                               network->associating == FALSE)
-               return -ENOTCONN;
+       if (!simplified_log)
+               DBG("network %p encryption mode %s", network, encryption_mode);
 
-       if (network->driver == NULL)
-               return -EUNATCH;
+       g_strlcpy(network->wifi.encryption_mode, encryption_mode,
+                                       WIFI_ENCYPTION_MODE_LEN_MAX);
 
-       if (network->driver->disconnect == NULL)
-               return -ENOSYS;
+       return 0;
+}
 
-       network->connecting = FALSE;
+const char *connman_network_get_enc_mode(struct connman_network *network)
+{
+       return (const char *)network->wifi.encryption_mode;
+}
 
-       err = network->driver->disconnect(network);
-       if (err == 0) {
-               connman_network_set_connected(network, FALSE);
-               set_connected(network);
-       }
+int connman_network_set_rsn_mode(struct connman_network *network,
+                               bool rsn_mode)
+{
+       network->wifi.rsn_mode = rsn_mode;
 
-       return err;
+       return 0;
 }
 
-static int manual_ipv4_set(struct connman_network *network,
-                               struct connman_ipconfig *ipconfig)
+int connman_network_set_proxy(struct connman_network *network,
+                               const char *proxies)
 {
        struct connman_service *service;
-       int err;
 
-       service = __connman_service_lookup_from_network(network);
+       DBG("network %p proxies %s", network, proxies);
+
+       service = connman_service_lookup_from_network(network);
        if (service == NULL)
                return -EINVAL;
 
-       err = __connman_ipconfig_address_add(ipconfig);
-       if (err < 0) {
-               connman_network_set_error(network,
-                       CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
-               return err;
-       }
+       __connman_service_set_proxy(service, proxies);
 
-       __connman_ipconfig_gateway_add(ipconfig);
+       connman_service_set_proxy_method(service,
+                               CONNMAN_SERVICE_PROXY_METHOD_MANUAL);
 
-       __connman_service_indicate_state(service, CONNMAN_SERVICE_STATE_READY,
-                                       CONNMAN_IPCONFIG_TYPE_IPV4);
+       return 0;
+}
+
+int connman_network_set_keymgmt(struct connman_network *network,
+                               unsigned int keymgmt)
+{
+       if (network == NULL)
+               return 0;
+
+       network->wifi.keymgmt = keymgmt;
 
        return 0;
 }
 
-int __connman_network_clear_ipconfig(struct connman_network *network,
-                                       struct connman_ipconfig *ipconfig)
+unsigned int connman_network_get_keymgmt(struct connman_network *network)
 {
-       struct connman_service *service;
-       enum connman_ipconfig_method method;
-       enum connman_ipconfig_type type;
+       if (network == NULL)
+               return 0;
 
-       service = __connman_service_lookup_from_network(network);
-       if (service == NULL)
-               return -EINVAL;
+       return network->wifi.keymgmt;
+}
 
-       method = __connman_ipconfig_get_method(ipconfig);
-       type = __connman_ipconfig_get_config_type(ipconfig);
+int connman_network_set_disconnect_reason(struct connman_network *network,
+                               int reason_code)
+{
+       if (network == NULL)
+               return 0;
 
-       switch (method) {
-       case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
-       case CONNMAN_IPCONFIG_METHOD_OFF:
-       case CONNMAN_IPCONFIG_METHOD_FIXED:
-       case CONNMAN_IPCONFIG_METHOD_AUTO:
+       network->wifi.disconnect_reason = reason_code;
+
+       return 0;
+}
+
+int connman_network_get_disconnect_reason(struct connman_network *network)
+{
+       if (network == NULL)
+               return 0;
+
+       return network->wifi.disconnect_reason;
+}
+int connman_network_get_assoc_status_code(struct connman_network *network)
+{
+       if (network == NULL)
+               return 0;
+
+       return network->wifi.assoc_status_code;
+}
+
+int connman_network_set_countrycode(struct connman_network *network,
+                                   const unsigned char *country_code)
+{
+       int i = 0;
+
+       if (country_code == NULL)
                return -EINVAL;
-       case CONNMAN_IPCONFIG_METHOD_MANUAL:
-               __connman_ipconfig_address_remove(ipconfig);
-               break;
-       case CONNMAN_IPCONFIG_METHOD_DHCP:
-               __connman_dhcp_stop(network);
-               break;
-       }
 
-       if (type == CONNMAN_IPCONFIG_TYPE_IPV6)
-               __connman_service_indicate_state(service,
-                                       CONNMAN_SERVICE_STATE_CONFIGURATION,
-                                       CONNMAN_IPCONFIG_TYPE_IPV6);
-       else if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
-               __connman_service_indicate_state(service,
-                                       CONNMAN_SERVICE_STATE_CONFIGURATION,
-                                       CONNMAN_IPCONFIG_TYPE_IPV4);
+       if (!simplified_log)
+               DBG("network %p Country Code %02x:%02x",network,
+                               country_code[0],country_code[1]);
+
+       for (; i < WIFI_COUNTRY_CODE_LEN; i++)
+               network->wifi.country_code[i] = country_code[i];
 
        return 0;
 }
 
-int __connman_network_set_ipconfig(struct connman_network *network,
-                                       struct connman_ipconfig *ipconfig_ipv4,
-                                       struct connman_ipconfig *ipconfig_ipv6)
+unsigned char *connman_network_get_countrycode(struct connman_network *network)
 {
-       enum connman_ipconfig_method method;
-       int ret;
+       return (unsigned char *)network->wifi.country_code;
+}
 
-       if (ipconfig_ipv6) {
-               method = __connman_ipconfig_get_method(ipconfig_ipv6);
+int connman_network_set_bssid_list(struct connman_network *network,
+                                       GSList *bssids)
+{
+       unsigned int max_bssid_count;
 
-               switch (method) {
-               case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
-               case CONNMAN_IPCONFIG_METHOD_OFF:
-                       break;
-               case CONNMAN_IPCONFIG_METHOD_AUTO:
-                       autoconf_ipv6_set(network);
-                       break;
-               case CONNMAN_IPCONFIG_METHOD_FIXED:
-               case CONNMAN_IPCONFIG_METHOD_MANUAL:
-                       ret = manual_ipv6_set(network, ipconfig_ipv6);
-                       if (ret != 0) {
-                               connman_network_set_error(network,
-                                       CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL);
-                               return ret;
-                       }
-                       break;
-               case CONNMAN_IPCONFIG_METHOD_DHCP:
-                       break;
-               }
-       }
+       g_slist_free_full(network->wifi.bssid_list, g_free);
+       network->wifi.bssid_list = bssids;
+
+       max_bssid_count = g_slist_length(bssids);
+       if (network->wifi.max_bssid_count < max_bssid_count)
+               network->wifi.max_bssid_count = max_bssid_count;
+
+       return 0;
+}
+
+int connman_network_set_phy_mode(struct connman_network *network,
+                                   ieee80211_modes_e mode)
+{
+       if (!simplified_log)
+               DBG("network %p phy mode %d", network, mode);
+       network->wifi.phy_mode = mode;
 
-       if (ipconfig_ipv4) {
-               method = __connman_ipconfig_get_method(ipconfig_ipv4);
+       return 0;
+}
 
-               switch (method) {
-               case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
-               case CONNMAN_IPCONFIG_METHOD_OFF:
-               case CONNMAN_IPCONFIG_METHOD_FIXED:
-               case CONNMAN_IPCONFIG_METHOD_AUTO:
-                       return -EINVAL;
-               case CONNMAN_IPCONFIG_METHOD_MANUAL:
-                       return manual_ipv4_set(network, ipconfig_ipv4);
-               case CONNMAN_IPCONFIG_METHOD_DHCP:
-                       return __connman_dhcp_start(network, dhcp_callback);
-               }
-       }
+ieee80211_modes_e connman_network_get_phy_mode(struct connman_network *network)
+{
+       return network->wifi.phy_mode;
+}
+
+int connman_network_set_connection_mode(struct connman_network *network,
+                                   connection_mode_e mode)
+{
+       DBG("network %p connection mode %d", network, mode);
+       network->wifi.connection_mode = mode;
 
        return 0;
 }
 
-int connman_network_set_ipaddress(struct connman_network *network,
-                                       struct connman_ipaddress *ipaddress)
+connection_mode_e connman_network_get_connection_mode(struct connman_network *network)
 {
-       struct connman_service *service;
-       struct connman_ipconfig *ipconfig = NULL;
+       return network->wifi.connection_mode;
+}
 
-       DBG("network %p", network);
+void *connman_network_get_bssid_list(struct connman_network *network)
+{
+       return network->wifi.bssid_list;
+}
 
-       service = __connman_service_lookup_from_network(network);
-       if (service == NULL)
+unsigned int connman_network_get_max_bssid_count(struct connman_network *network)
+{
+       return network->wifi.max_bssid_count;
+}
+
+int connman_network_set_last_connected_bssid(struct connman_network *network,
+                               const unsigned char *bssid)
+{
+       if (!bssid)
                return -EINVAL;
 
-       ipconfig = __connman_service_get_ipconfig(service, ipaddress->family);
-       if (ipconfig == NULL)
+       if (!memcmp(bssid, invalid_bssid, WIFI_BSSID_LEN_MAX))
                return -EINVAL;
 
-       __connman_ipconfig_set_local(ipconfig, ipaddress->local);
-       __connman_ipconfig_set_peer(ipconfig, ipaddress->peer);
-       __connman_ipconfig_set_broadcast(ipconfig, ipaddress->broadcast);
-       __connman_ipconfig_set_prefixlen(ipconfig, ipaddress->prefixlen);
-       __connman_ipconfig_set_gateway(ipconfig, ipaddress->gateway);
+       memcpy(network->wifi.last_connected_bssid, bssid, WIFI_BSSID_LEN_MAX);
 
        return 0;
 }
 
-int connman_network_set_pac(struct connman_network *network,
-                               const char *pac)
+unsigned char *connman_network_get_last_connected_bssid(struct connman_network *network)
 {
-       struct connman_service *service;
+       return (unsigned char *)network->wifi.last_connected_bssid;
+}
+
+void connman_network_set_assoc_reject_table(struct connman_network *network,
+               GHashTable *assoc_reject_table)
+{
+       if (!network)
+               return;
 
-       DBG("network %p pac %s", network, pac);
+       if (!assoc_reject_table)
+               return;
 
-       service = __connman_service_lookup_from_network(network);
-       if (service == NULL)
-               return -EINVAL;
+       g_hash_table_destroy(network->wifi.assoc_reject_table);
 
-       __connman_service_set_pac(service, pac);
+       network->wifi.assoc_reject_table = assoc_reject_table;
+}
 
-       return 0;
+GHashTable *connman_network_get_assoc_reject_table(struct connman_network *network)
+{
+       if (!network)
+               return NULL;
+
+       return network->wifi.assoc_reject_table;
+}
+
+__time_t connman_network_get_roam_scan_time(struct connman_network *network)
+{
+       return network->wifi.roam_scan_time;
+}
+
+void connman_network_set_roam_scan_time(struct connman_network *network,
+                                               __time_t roam_scan_time)
+{
+       network->wifi.roam_scan_time = roam_scan_time;
 }
 
+int connman_network_get_snr(struct connman_network *network)
+{
+       return network->wifi.snr;
+}
+
+void connman_network_set_snr(struct connman_network *network, int snr)
+{
+       network->wifi.snr = snr;
+}
+#endif
+
 int connman_network_set_nameservers(struct connman_network *network,
                                const char *nameservers)
 {
        struct connman_service *service;
-       char **nameservers_array = NULL;
+       char **nameservers_array;
        int i;
 
        DBG("network %p nameservers %s", network, nameservers);
 
-       service = __connman_service_lookup_from_network(network);
-       if (service == NULL)
+       service = connman_service_lookup_from_network(network);
+       if (!service)
                return -EINVAL;
 
        __connman_service_nameserver_clear(service);
 
-       if (nameservers != NULL)
-               nameservers_array = g_strsplit(nameservers, " ", 0);
+       if (!nameservers)
+               return 0;
+
+       nameservers_array = g_strsplit(nameservers, " ", 0);
 
-       for (i = 0; nameservers_array[i] != NULL; i++) {
+       for (i = 0; nameservers_array[i]; i++) {
+#if defined TIZEN_EXT
                __connman_service_nameserver_append(service,
-                                               nameservers_array[i]);
+                                               nameservers_array[i], false,
+                                               CONNMAN_IPCONFIG_TYPE_ALL);
+#else
+               __connman_service_nameserver_append(service,
+                                               nameservers_array[i], false);
+#endif
        }
 
        g_strfreev(nameservers_array);
@@ -1273,8 +2767,8 @@ int connman_network_set_domain(struct connman_network *network,
 
        DBG("network %p domain %s", network, domain);
 
-       service = __connman_service_lookup_from_network(network);
-       if (service == NULL)
+       service = connman_service_lookup_from_network(network);
+       if (!service)
                return -EINVAL;
 
        __connman_service_set_domainname(service, domain);
@@ -1292,12 +2786,15 @@ int connman_network_set_domain(struct connman_network *network,
 int connman_network_set_name(struct connman_network *network,
                                                        const char *name)
 {
+#if defined TIZEN_EXT
+       if (!simplified_log)
+#endif
        DBG("network %p name %s", network, name);
 
        g_free(network->name);
        network->name = g_strdup(name);
 
-       return connman_element_set_string(&network->element, "Name", name);
+       return 0;
 }
 
 /**
@@ -1307,33 +2804,62 @@ int connman_network_set_name(struct connman_network *network,
  *
  * Set signal strength value for network
  */
+
 int connman_network_set_strength(struct connman_network *network,
-                                               connman_uint8_t strength)
+                                               uint8_t strength)
 {
-       DBG("network %p strengh %d", network, strength);
-
        network->strength = strength;
+#if defined TIZEN_EXT
+       __connman_service_notify_strength_changed(network);
+#endif
 
-       return connman_element_set_uint8(&network->element,
-                                               "Strength", strength);
+       return 0;
 }
 
-/**
- * connman_network_set_roaming:
- * @network: network structure
- * @roaming: roaming state
- *
- * Set roaming state for network
- */
-int connman_network_set_roaming(struct connman_network *network,
-                                               connman_bool_t roaming)
+uint8_t connman_network_get_strength(struct connman_network *network)
+{
+       return network->strength;
+}
+
+int connman_network_set_frequency(struct connman_network *network,
+                                               uint16_t frequency)
+{
+       network->frequency = frequency;
+
+       return 0;
+}
+
+uint16_t connman_network_get_frequency(struct connman_network *network)
+{
+       return network->frequency;
+}
+
+int connman_network_set_wifi_channel(struct connman_network *network,
+                                               uint16_t channel)
+{
+       network->wifi.channel = channel;
+
+       return 0;
+}
+
+int connman_network_set_autoconnect(struct connman_network *network,
+                               bool autoconnect)
 {
-       DBG("network %p roaming %d", network, roaming);
+       if (!network->driver || !network->driver->set_autoconnect)
+               return 0;
+       return network->driver->set_autoconnect(network, autoconnect);
+}
 
-       network->roaming = roaming;
+bool __connman_network_native_autoconnect(struct connman_network *network)
+{
+       if (!network->driver || !network->driver->set_autoconnect)
+               return false;
+       return true;
+}
 
-       return connman_element_set_bool(&network->element,
-                                               "Roaming", roaming);
+uint16_t connman_network_get_wifi_channel(struct connman_network *network)
+{
+       return network->wifi.channel;
 }
 
 /**
@@ -1347,61 +2873,90 @@ int connman_network_set_roaming(struct connman_network *network,
 int connman_network_set_string(struct connman_network *network,
                                        const char *key, const char *value)
 {
-       int err;
-
-       DBG("network %p key %s value %s", network, key, value);
-
        if (g_strcmp0(key, "Name") == 0)
                return connman_network_set_name(network, value);
 
-       if (g_str_equal(key, "Node") == TRUE) {
+       if (g_str_equal(key, "Path")) {
+               g_free(network->path);
+               network->path = g_strdup(value);
+       } else if (g_str_equal(key, "Node")) {
                g_free(network->node);
                network->node = g_strdup(value);
-       } else if (g_str_equal(key, "WiFi.Mode") == TRUE) {
+       } else if (g_str_equal(key, "WiFi.Mode")) {
                g_free(network->wifi.mode);
                network->wifi.mode = g_strdup(value);
-       } else if (g_str_equal(key, "WiFi.Security") == TRUE) {
+       } else if (g_str_equal(key, "WiFi.Security")) {
                g_free(network->wifi.security);
                network->wifi.security = g_strdup(value);
-       } else if (g_str_equal(key, "WiFi.Passphrase") == TRUE) {
+       } else if (g_str_equal(key, "WiFi.Passphrase")) {
+#if defined TIZEN_EXT
+               DBG("ConnMan, %p key %s", network, key);
+#endif
                g_free(network->wifi.passphrase);
                network->wifi.passphrase = g_strdup(value);
-       } else if (g_str_equal(key, "WiFi.EAP") == TRUE) {
+       } else if (g_str_equal(key, "WiFi.EAP")) {
                g_free(network->wifi.eap);
                network->wifi.eap = g_strdup(value);
-       } else if (g_str_equal(key, "WiFi.Identity") == TRUE) {
+       } else if (g_str_equal(key, "WiFi.Identity")) {
                g_free(network->wifi.identity);
                network->wifi.identity = g_strdup(value);
-       } else if (g_str_equal(key, "WiFi.CACertFile") == TRUE) {
+       } else if (g_str_equal(key, "WiFi.AnonymousIdentity")) {
+               g_free(network->wifi.anonymous_identity);
+               network->wifi.anonymous_identity = g_strdup(value);
+       } else if (g_str_equal(key, "WiFi.AgentIdentity")) {
+               g_free(network->wifi.agent_identity);
+               network->wifi.agent_identity = g_strdup(value);
+       } else if (g_str_equal(key, "WiFi.CACertFile")) {
                g_free(network->wifi.ca_cert_path);
                network->wifi.ca_cert_path = g_strdup(value);
-       } else if (g_str_equal(key, "WiFi.ClientCertFile") == TRUE) {
+       } else if (g_str_equal(key, "WiFi.SubjectMatch")) {
+               g_free(network->wifi.subject_match);
+               network->wifi.subject_match = g_strdup(value);
+       } else if (g_str_equal(key, "WiFi.AltSubjectMatch")) {
+               g_free(network->wifi.altsubject_match);
+               network->wifi.altsubject_match = g_strdup(value);
+       } else if (g_str_equal(key, "WiFi.DomainSuffixMatch")) {
+               g_free(network->wifi.domain_suffix_match);
+               network->wifi.domain_suffix_match = g_strdup(value);
+       } else if (g_str_equal(key, "WiFi.DomainMatch")) {
+               g_free(network->wifi.domain_match);
+               network->wifi.domain_match = g_strdup(value);
+       } else if (g_str_equal(key, "WiFi.ClientCertFile")) {
                g_free(network->wifi.client_cert_path);
                network->wifi.client_cert_path = g_strdup(value);
-       } else if (g_str_equal(key, "WiFi.PrivateKeyFile") == TRUE) {
+       } else if (g_str_equal(key, "WiFi.PrivateKeyFile")) {
                g_free(network->wifi.private_key_path);
                network->wifi.private_key_path = g_strdup(value);
-       } else if (g_str_equal(key, "WiFi.PrivateKeyPassphrase") == TRUE) {
+       } else if (g_str_equal(key, "WiFi.PrivateKeyPassphrase")) {
                g_free(network->wifi.private_key_passphrase);
                network->wifi.private_key_passphrase = g_strdup(value);
-       } else if (g_str_equal(key, "WiFi.Phase2") == TRUE) {
+       } else if (g_str_equal(key, "WiFi.Phase2")) {
                g_free(network->wifi.phase2_auth);
                network->wifi.phase2_auth = g_strdup(value);
-       } else if (g_str_equal(key, "WiFi.PinWPS") == TRUE) {
+       } else if (g_str_equal(key, "WiFi.PinWPS")) {
                g_free(network->wifi.pin_wps);
                network->wifi.pin_wps = g_strdup(value);
+#if defined TIZEN_EXT
+       } else if (g_str_equal(key, "WiFi.Connector")) {
+               g_free(network->wifi.connector);
+               network->wifi.connector = g_strdup(value);
+       } else if (g_str_equal(key, "WiFi.CSignKey")) {
+               g_free(network->wifi.c_sign_key);
+               network->wifi.c_sign_key = g_strdup(value);
+       } else if (g_str_equal(key, "WiFi.NetAccessKey")) {
+               g_free(network->wifi.net_access_key);
+               network->wifi.net_access_key = g_strdup(value);
+       } else if (g_str_equal(key, "WiFi.RoamingCurBSSID")) {
+               g_free(network->wifi.roaming_cur_bssid);
+               network->wifi.roaming_cur_bssid = g_strdup(value);
+       } else if (g_str_equal(key, "WiFi.RoamingDstBSSID")) {
+               g_free(network->wifi.roaming_dst_bssid);
+               network->wifi.roaming_dst_bssid = g_strdup(value);
+#endif
+       } else {
+               return -EINVAL;
        }
 
-       err = connman_element_set_string(&network->element, key, value);
-       if (err < 0)
-               return err;
-
-       if (network->driver == NULL)
-               return 0;
-
-       if (network->driver->setup)
-               return network->driver->setup(network, key);
-
        return 0;
 }
 
@@ -1415,36 +2970,60 @@ int connman_network_set_string(struct connman_network *network,
 const char *connman_network_get_string(struct connman_network *network,
                                                        const char *key)
 {
-       DBG("network %p key %s", network, key);
-
-       if (g_str_equal(key, "Name") == TRUE)
+       if (g_str_equal(key, "Path"))
+               return network->path;
+       else if (g_str_equal(key, "Name"))
                return network->name;
-       else if (g_str_equal(key, "Node") == TRUE)
+       else if (g_str_equal(key, "Node"))
                return network->node;
-       else if (g_str_equal(key, "WiFi.Mode") == TRUE)
+       else if (g_str_equal(key, "WiFi.Mode"))
                return network->wifi.mode;
-       else if (g_str_equal(key, "WiFi.Security") == TRUE)
+       else if (g_str_equal(key, "WiFi.Security"))
                return network->wifi.security;
-       else if (g_str_equal(key, "WiFi.Passphrase") == TRUE)
+       else if (g_str_equal(key, "WiFi.Passphrase"))
                return network->wifi.passphrase;
-       else if (g_str_equal(key, "WiFi.EAP") == TRUE)
+       else if (g_str_equal(key, "WiFi.EAP"))
                return network->wifi.eap;
-       else if (g_str_equal(key, "WiFi.Identity") == TRUE)
+       else if (g_str_equal(key, "WiFi.Identity"))
                return network->wifi.identity;
-       else if (g_str_equal(key, "WiFi.CACertFile") == TRUE)
+       else if (g_str_equal(key, "WiFi.AnonymousIdentity"))
+               return network->wifi.anonymous_identity;
+       else if (g_str_equal(key, "WiFi.AgentIdentity"))
+               return network->wifi.agent_identity;
+       else if (g_str_equal(key, "WiFi.CACertFile"))
                return network->wifi.ca_cert_path;
-       else if (g_str_equal(key, "WiFi.ClientCertFile") == TRUE)
+       else if (g_str_equal(key, "WiFi.SubjectMatch"))
+               return network->wifi.subject_match;
+       else if (g_str_equal(key, "WiFi.AltSubjectMatch"))
+               return network->wifi.altsubject_match;
+       else if (g_str_equal(key, "WiFi.DomainSuffixMatch"))
+               return network->wifi.domain_suffix_match;
+       else if (g_str_equal(key, "WiFi.DomainMatch"))
+               return network->wifi.domain_match;
+       else if (g_str_equal(key, "WiFi.ClientCertFile"))
                return network->wifi.client_cert_path;
-       else if (g_str_equal(key, "WiFi.PrivateKeyFile") == TRUE)
+       else if (g_str_equal(key, "WiFi.PrivateKeyFile"))
                return network->wifi.private_key_path;
-       else if (g_str_equal(key, "WiFi.PrivateKeyPassphrase") == TRUE)
+       else if (g_str_equal(key, "WiFi.PrivateKeyPassphrase"))
                return network->wifi.private_key_passphrase;
-       else if (g_str_equal(key, "WiFi.Phase2") == TRUE)
+       else if (g_str_equal(key, "WiFi.Phase2"))
                return network->wifi.phase2_auth;
-       else if (g_str_equal(key, "WiFi.PinWPS") == TRUE)
+       else if (g_str_equal(key, "WiFi.PinWPS"))
                return network->wifi.pin_wps;
+#if defined TIZEN_EXT
+       else if (g_str_equal(key, "WiFi.Connector"))
+               return network->wifi.connector;
+       else if (g_str_equal(key, "WiFi.CSignKey"))
+               return network->wifi.c_sign_key;
+       else if (g_str_equal(key, "WiFi.NetAccessKey"))
+               return network->wifi.net_access_key;
+       else if (g_str_equal(key, "WiFi.RoamingCurBSSID"))
+               return network->wifi.roaming_cur_bssid;
+       else if (g_str_equal(key, "WiFi.RoamingDstBSSID"))
+               return network->wifi.roaming_dst_bssid;
+#endif
 
-       return connman_element_get_string(&network->element, key);
+       return NULL;
 }
 
 /**
@@ -1456,18 +3035,32 @@ const char *connman_network_get_string(struct connman_network *network,
  * Set boolean value for specific key
  */
 int connman_network_set_bool(struct connman_network *network,
-                                       const char *key, connman_bool_t value)
+                                       const char *key, bool value)
 {
-       DBG("network %p key %s value %d", network, key, value);
-
        if (g_strcmp0(key, "Roaming") == 0)
-               return connman_network_set_roaming(network, value);
+               network->roaming = value;
        else if (g_strcmp0(key, "WiFi.WPS") == 0)
                network->wifi.wps = value;
+       else if (g_strcmp0(key, "WiFi.WPSAdvertising") == 0)
+               network->wifi.wps_advertizing = value;
        else if (g_strcmp0(key, "WiFi.UseWPS") == 0)
                network->wifi.use_wps = value;
+#if defined TIZEN_EXT
+       else if (g_strcmp0(key, "DefaultInternet") == 0)
+               network->default_internet = value;
+       else if (g_strcmp0(key, "WiFi.HS20AP") == 0)
+               network->wifi.isHS20AP = value;
+       else if (g_strcmp0(key, "WiFi.TRANSITION_MODE") == 0)
+               network->wifi.owe_transition_mode = value;
+       else if (g_strcmp0(key, "WiFi.Roaming") == 0)
+               network->wifi.roaming_progress = value;
+       else if (g_strcmp0(key, "WiFi.RoamingDHCP") == 0)
+               network->wifi.roaming_dhcp = value;
+       else if (g_strcmp0(key, "WiFi.PMFRequired") == 0)
+               network->wifi.pmf_required = value;
+#endif
 
-       return connman_element_set_bool(&network->element, key, value);
+       return -EINVAL;
 }
 
 /**
@@ -1477,98 +3070,60 @@ int connman_network_set_bool(struct connman_network *network,
  *
  * Get boolean value for specific key
  */
-connman_bool_t connman_network_get_bool(struct connman_network *network,
+bool connman_network_get_bool(struct connman_network *network,
                                                        const char *key)
 {
-       DBG("network %p key %s", network, key);
-
-       if (g_str_equal(key, "Roaming") == TRUE)
+       if (g_str_equal(key, "Roaming"))
                return network->roaming;
-       else if (g_str_equal(key, "WiFi.WPS") == TRUE)
+       else if (g_str_equal(key, "WiFi.WPS"))
                return network->wifi.wps;
-       else if (g_str_equal(key, "WiFi.UseWPS") == TRUE)
+       else if (g_str_equal(key, "WiFi.WPSAdvertising"))
+               return network->wifi.wps_advertizing;
+       else if (g_str_equal(key, "WiFi.UseWPS"))
                return network->wifi.use_wps;
+#if defined TIZEN_EXT
+       else if (g_str_equal(key, "DefaultInternet"))
+               return network->default_internet;
+       else if (g_str_equal(key, "WiFi.HS20AP"))
+               return network->wifi.isHS20AP;
+       else if (g_str_equal(key, "WiFi.TRANSITION_MODE"))
+               return network->wifi.owe_transition_mode;
+       else if (g_str_equal(key, "WiFi.Roaming"))
+               return network->wifi.roaming_progress;
+       else if (g_str_equal(key, "WiFi.RoamingDHCP"))
+               return network->wifi.roaming_dhcp;
+       else if (g_str_equal(key, "WiFi.PMFRequired"))
+               return network->wifi.pmf_required;
+#endif
 
-       return connman_element_get_bool(&network->element, key);
-}
-
-/**
- * connman_network_set_uint8:
- * @network: network structure
- * @key: unique identifier
- * @value: integer value
- *
- * Set integer value for specific key
- */
-int connman_network_set_uint8(struct connman_network *network,
-                                       const char *key, connman_uint8_t value)
-{
-       DBG("network %p key %s value %d", network, key, value);
-
-       if (g_strcmp0(key, "Strength") == 0)
-               return connman_network_set_strength(network, value);
-
-       return connman_element_set_uint8(&network->element, key, value);
-}
-
-/**
- * connman_network_get_uint8:
- * @network: network structure
- * @key: unique identifier
- *
- * Get integer value for specific key
- */
-connman_uint8_t connman_network_get_uint8(struct connman_network *network,
-                                                       const char *key)
-{
-       DBG("network %p key %s", network, key);
-
-       if (g_str_equal(key, "Strength") == TRUE)
-               return network->strength;
-
-       return connman_element_get_uint8(&network->element, key);
+       return false;
 }
 
+#if defined TIZEN_EXT
 /**
- * connman_network_set_uint16:
+ * connman_network_set_vsie_list:
  * @network: network structure
- * @key: unique identifier
- * @value: integer value
+ * @vsie_list: GSList pointer
  *
- * Set integer value for specific key
+ * Set vendor specific list pointer
  */
-int connman_network_set_uint16(struct connman_network *network,
-                               const char *key, connman_uint16_t value)
+void connman_network_set_vsie_list(struct connman_network *network, GSList *vsie_list)
 {
-       DBG("network %p key %s value %d", network, key, value);
-
-       if (g_str_equal(key, "Frequency") == TRUE)
-               network->frequency = value;
-       else if (g_str_equal(key, "WiFi.Channel") == TRUE)
-               network->wifi.channel = value;
-
-       return -EINVAL;
+       g_slist_free_full(network->wifi.vsie_list, g_free);
+       network->wifi.vsie_list = vsie_list;
 }
 
 /**
- * connman_network_get_uint16:
+ * connman_network_get_vsie_list:
  * @network: network structure
- * @key: unique identifier
  *
- * Get integer value for specific key
+ * Get vendor specific list pointer
  */
-connman_uint16_t connman_network_get_uint16(struct connman_network *network,
-                                                       const char *key)
+void *connman_network_get_vsie_list(struct connman_network *network)
 {
-       DBG("network %p key %s", network, key);
-
-       if (g_str_equal(key, "Frequency") == TRUE)
-               return network->frequency;
-       else if (g_str_equal(key, "WiFi.Channel") == TRUE)
-               return network->wifi.channel;
-
-       return 0;
+       return network->wifi.vsie_list;
 }
+#endif
 
 /**
  * connman_network_set_blob:
@@ -1582,19 +3137,29 @@ connman_uint16_t connman_network_get_uint16(struct connman_network *network,
 int connman_network_set_blob(struct connman_network *network,
                        const char *key, const void *data, unsigned int size)
 {
-       DBG("network %p key %s size %d", network, key, size);
-
-       if (g_str_equal(key, "WiFi.SSID") == TRUE) {
+       if (g_str_equal(key, "WiFi.SSID")) {
                g_free(network->wifi.ssid);
                network->wifi.ssid = g_try_malloc(size);
-               if (network->wifi.ssid != NULL) {
+               if (network->wifi.ssid) {
                        memcpy(network->wifi.ssid, data, size);
                        network->wifi.ssid_len = size;
                } else
                        network->wifi.ssid_len = 0;
+#ifdef TIZEN_EXT
+       } else if (g_str_equal(key, "WiFi.TRANSITION_MODE_SSID")) {
+               g_free(network->wifi.transition_mode_ssid);
+               network->wifi.transition_mode_ssid = g_try_malloc(size);
+               if (network->wifi.transition_mode_ssid) {
+                       memcpy(network->wifi.transition_mode_ssid, data, size);
+                       network->wifi.transition_mode_ssid_len = size;
+               } else
+                       network->wifi.transition_mode_ssid_len = 0;
+#endif
+       } else {
+               return -EINVAL;
        }
 
-       return connman_element_set_blob(&network->element, key, data, size);
+       return 0;
 }
 
 /**
@@ -1608,21 +3173,34 @@ int connman_network_set_blob(struct connman_network *network,
 const void *connman_network_get_blob(struct connman_network *network,
                                        const char *key, unsigned int *size)
 {
-       DBG("network %p key %s", network, key);
-
-       if (g_str_equal(key, "WiFi.SSID") == TRUE) {
-               if (size != NULL)
+       if (g_str_equal(key, "WiFi.SSID")) {
+               if (size)
                        *size = network->wifi.ssid_len;
                return network->wifi.ssid;
+#ifdef TIZEN_EXT
+       } else if (g_str_equal(key, "WiFi.TRANSITION_MODE_SSID")) {
+               if (size)
+                       *size = network->wifi.transition_mode_ssid_len;
+               return network->wifi.transition_mode_ssid;
+#endif
        }
 
-       return connman_element_get_blob(&network->element, key, size);
+       return NULL;
 }
 
 void __connman_network_set_device(struct connman_network *network,
                                        struct connman_device *device)
 {
+       if (network->device == device)
+               return;
+
+       if (network->device)
+               network_remove(network);
+
        network->device = device;
+
+       if (network->device)
+               network_probe(network);
 }
 
 /**
@@ -1666,153 +3244,26 @@ void connman_network_update(struct connman_network *network)
        case CONNMAN_NETWORK_TYPE_VENDOR:
                return;
        case CONNMAN_NETWORK_TYPE_ETHERNET:
+       case CONNMAN_NETWORK_TYPE_GADGET:
        case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
        case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
        case CONNMAN_NETWORK_TYPE_CELLULAR:
        case CONNMAN_NETWORK_TYPE_WIFI:
-       case CONNMAN_NETWORK_TYPE_WIMAX:
                break;
        }
 
-       if (network->group != NULL)
+       if (network->group)
                __connman_service_update_from_network(network);
-
-       return;
-}
-
-static gboolean match_driver(struct connman_network *network,
-                                       struct connman_network_driver *driver)
-{
-       if (network->type == driver->type ||
-                       driver->type == CONNMAN_NETWORK_TYPE_UNKNOWN)
-               return TRUE;
-
-       return FALSE;
-}
-
-static int network_probe(struct connman_element *element)
-{
-       struct connman_network *network = element->network;
-       GSList *list;
-
-       DBG("element %p name %s", element, element->name);
-
-       if (network == NULL)
-               return -ENODEV;
-
-       for (list = driver_list; list; list = list->next) {
-               struct connman_network_driver *driver = list->data;
-
-               if (match_driver(network, driver) == FALSE)
-                       continue;
-
-               DBG("driver %p name %s", driver, driver->name);
-
-               if (driver->probe(network) == 0) {
-                       network->driver = driver;
-                       break;
-               }
-       }
-
-       if (network->driver == NULL)
-               return -ENODEV;
-
-       switch (network->type) {
-       case CONNMAN_NETWORK_TYPE_UNKNOWN:
-       case CONNMAN_NETWORK_TYPE_VENDOR:
-               break;
-       case CONNMAN_NETWORK_TYPE_ETHERNET:
-       case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
-       case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
-       case CONNMAN_NETWORK_TYPE_CELLULAR:
-       case CONNMAN_NETWORK_TYPE_WIFI:
-       case CONNMAN_NETWORK_TYPE_WIMAX:
-               if (network->group != NULL &&
-                        __connman_service_create_from_network(network) == NULL)
-                               return -EINVAL;
-       }
-
-       return 0;
-}
-
-static void network_remove(struct connman_element *element)
-{
-       struct connman_network *network = element->network;
-
-       DBG("element %p name %s", element, element->name);
-
-       if (network == NULL)
-               return;
-
-       if (network->driver == NULL)
-               return;
-
-       switch (network->type) {
-       case CONNMAN_NETWORK_TYPE_UNKNOWN:
-       case CONNMAN_NETWORK_TYPE_VENDOR:
-               break;
-       case CONNMAN_NETWORK_TYPE_ETHERNET:
-       case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
-       case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
-       case CONNMAN_NETWORK_TYPE_CELLULAR:
-       case CONNMAN_NETWORK_TYPE_WIFI:
-       case CONNMAN_NETWORK_TYPE_WIMAX:
-               if (network->group != NULL) {
-                       __connman_service_remove_from_network(network);
-
-                       g_free(network->group);
-                       network->group = NULL;
-               }
-               break;
-       }
-
-       if (network->driver->remove)
-               network->driver->remove(network);
-}
-
-static void network_change(struct connman_element *element)
-{
-       struct connman_network *network = element->network;
-
-       DBG("element %p name %s", element, element->name);
-
-       if (element->state != CONNMAN_ELEMENT_STATE_ERROR)
-               return;
-
-       if (network->connected == FALSE)
-               return;
-
-       connman_element_unregister_children(element);
-
-       connman_device_set_disconnected(network->device, TRUE);
-
-       if (network->driver && network->driver->disconnect) {
-               network->driver->disconnect(network);
-               return;
-       }
-
-       network->connected = FALSE;
 }
 
-static struct connman_driver network_driver = {
-       .name           = "network",
-       .type           = CONNMAN_ELEMENT_TYPE_NETWORK,
-       .priority       = CONNMAN_DRIVER_PRIORITY_LOW,
-       .probe          = network_probe,
-       .remove         = network_remove,
-       .change         = network_change,
-};
-
 int __connman_network_init(void)
 {
        DBG("");
 
-       return connman_driver_register(&network_driver);
+       return 0;
 }
 
 void __connman_network_cleanup(void)
 {
        DBG("");
-
-       connman_driver_unregister(&network_driver);
 }