Maintain connection status when wifi roaming
[platform/upstream/connman.git] / src / network.c
index 4a53bba..8eb8c1e 100755 (executable)
@@ -27,6 +27,8 @@
 #include <string.h>
 
 #include "connman.h"
+#include <connman/acd.h>
+#include "src/shared/arp.h"
 
 /*
  * How many times to send RS with the purpose of
  */
 #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;
 
@@ -67,6 +77,9 @@ struct connman_network {
        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;
@@ -97,6 +110,7 @@ struct connman_network {
                char *private_key_passphrase;
                char *phase2_auth;
                bool wps;
+               bool wps_advertizing;
                bool use_wps;
                char *pin_wps;
 #if defined TIZEN_EXT
@@ -108,6 +122,7 @@ struct connman_network {
                unsigned int keymgmt;
                char *keymgmt_type;
                bool rsn_mode;
+               bool pmf_required;
                int disconnect_reason;
                int assoc_status_code;
                GSList *vsie_list;
@@ -117,8 +132,27 @@ struct connman_network {
                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;
 
@@ -179,6 +213,264 @@ static void set_configuration(struct connman_network *network,
                                        type);
 }
 
+void connman_network_append_acddbus(DBusMessageIter *dict,
+               struct connman_network *network)
+{
+       if (!network->acd_host)
+               return;
+
+       acd_host_append_dbus_property(network->acd_host, dict);
+}
+
+static int start_acd(struct connman_network *network);
+
+static void remove_ipv4ll_timeout(struct connman_network *network)
+{
+       if (network->ipv4ll_timeout > 0) {
+               g_source_remove(network->ipv4ll_timeout);
+               network->ipv4ll_timeout = 0;
+       }
+}
+
+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;
+
+       if (!network)
+               return;
+
+       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;
+       }
+
+       err = __connman_ipconfig_address_add(ipconfig_ipv4);
+       if (err < 0)
+               goto err;
+
+#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_service_save(service);
+
+       return;
+
+err:
+       connman_network_set_error(__connman_service_get_network(service),
+                               CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
+}
+
+static int start_ipv4ll(struct connman_network *network)
+{
+       struct connman_service *service;
+       struct connman_ipconfig *ipconfig_ipv4;
+       struct in_addr addr;
+       char *address;
+
+       service = connman_service_lookup_from_network(network);
+       if (!service)
+               return -EINVAL;
+
+       ipconfig_ipv4 = __connman_service_get_ip4config(service);
+       if (!ipconfig_ipv4) {
+               connman_error("Service has no IPv4 configuration");
+               return -EINVAL;
+       }
+
+       /* 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);
+
+       connman_info("Probing IPv4LL address %s", address);
+       return start_acd(network);
+}
+
+static gboolean start_ipv4ll_ontimeout(gpointer data)
+{
+       struct connman_network *network = data;
+
+       if (!network)
+               return FALSE;
+
+       /* Start IPv4LL ACD. */
+       start_ipv4ll(network);
+
+       return FALSE;
+}
+
+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;
+
+       if (!network)
+               return;
+
+       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;
+       }
+
+       type = __connman_ipconfig_get_config_type(ipconfig_ipv4);
+       if (type != CONNMAN_IPCONFIG_TYPE_IPV4)
+               return;
+
+       __connman_ipconfig_address_remove(ipconfig_ipv4);
+
+       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);
+       }
+}
+
+static void acd_host_ipv4_conflict(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_method method;
+
+       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;
+       }
+
+       method = __connman_ipconfig_get_method(ipconfig_ipv4);
+       connman_info("%s conflict counts=%u", __FUNCTION__,
+                       acd_host_get_conflicts_count(acd));
+
+       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);
+       }
+}
+
+static void acd_host_ipv4_maxconflict(struct acd_host *acd, gpointer user_data)
+{
+       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);
+}
+
+static int start_acd(struct connman_network *network)
+{
+       struct connman_service *service;
+       struct connman_ipconfig *ipconfig_ipv4;
+       const char* address;
+       struct in_addr addr;
+
+       remove_ipv4ll_timeout(network);
+
+       service = connman_service_lookup_from_network(network);
+       if (!service)
+               return -EINVAL;
+
+       ipconfig_ipv4 = __connman_service_get_ip4config(service);
+       if (!ipconfig_ipv4) {
+               connman_error("Service has no IPv4 configuration");
+               return -EINVAL;
+       }
+
+       if (!network->acd_host) {
+               int index;
+
+               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;
+               }
+
+               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);
+       }
+
+       address = __connman_ipconfig_get_local(ipconfig_ipv4);
+       if (!address)
+               return -EINVAL;
+
+       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;
+}
+
 static void dhcp_success(struct connman_network *network)
 {
        struct connman_service *service;
@@ -196,6 +488,14 @@ static void dhcp_success(struct connman_network *network)
        if (!ipconfig_ipv4)
                return;
 
+       if (connman_setting_get_bool("AddressConflictDetection")) {
+               err = start_acd(network);
+               if (!err)
+                       return;
+
+               /* On error proceed without ACD. */
+       }
+
        err = __connman_ipconfig_address_add(ipconfig_ipv4);
        if (err < 0)
                goto err;
@@ -263,9 +563,21 @@ static int set_connected_manual(struct connman_network *network)
        ipconfig = __connman_service_get_ip4config(service);
        __connman_ipconfig_enable(ipconfig);
 
+#if defined TIZEN_EXT
+       if (!service || !ipconfig)
+               return -EINVAL;
+#endif
        if (!__connman_ipconfig_get_local(ipconfig))
                __connman_service_read_ip4config(service);
 
+       if (connman_setting_get_bool("AddressConflictDetection")) {
+               err = start_acd(network);
+               if (!err)
+                       return 0;
+
+               /* On error proceed without ACD. */
+       }
+
        err = __connman_ipconfig_address_add(ipconfig);
        if (err < 0)
                goto err;
@@ -282,13 +594,26 @@ err:
        return err;
 }
 
+static void remove_dhcp_timeout(struct connman_network *network)
+{
+       if (network->dhcp_timeout > 0) {
+               g_source_remove(network->dhcp_timeout);
+               network->dhcp_timeout = 0;
+       }
+}
+
+#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;
 
        DBG("network %p", network);
+       remove_dhcp_timeout(network);
 
        service = connman_service_lookup_from_network(network);
        ipconfig_ipv4 = __connman_service_get_ip4config(service);
@@ -304,6 +629,44 @@ static int set_connected_dhcp(struct connman_network *network)
        return 0;
 }
 
+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->dhcp_timeout = 0;
+
+       service = connman_service_lookup_from_network(network);
+       if (!service)
+               return FALSE;
+
+       ipconfig = __connman_service_get_ip4config(service);
+       if (!ipconfig)
+               return FALSE;
+
+       /* Method is still DHCP? */
+       method = __connman_ipconfig_get_method(ipconfig);
+       if (method == CONNMAN_IPCONFIG_METHOD_DHCP)
+               set_connected_dhcp(network);
+
+       return FALSE;
+}
+
+void connman_network_set_connected_dhcp_later(struct connman_network *network,
+               uint32_t sec)
+{
+       remove_dhcp_timeout(network);
+
+       network->dhcp_timeout =
+               g_timeout_add_seconds_full(G_PRIORITY_HIGH,
+                               sec,
+                               set_connected_dhcp_timout,
+                               network,
+                               NULL);
+}
+
 static int manual_ipv6_set(struct connman_network *network,
                                struct connman_ipconfig *ipconfig_ipv6)
 {
@@ -389,6 +752,10 @@ static int dhcpv6_set_addresses(struct connman_network *network)
        network->connecting = false;
 
        ipconfig_ipv6 = __connman_service_get_ip6config(service);
+#if defined TIZEN_EXT
+       if (!ipconfig_ipv6)
+               goto err;
+#endif
        err = __connman_ipconfig_address_add(ipconfig_ipv6);
        if (err < 0)
                goto err;
@@ -573,7 +940,6 @@ static void receive_refresh_rs_reply(struct nd_router_advert *reply,
        network->router_solicit_refresh_count = 0;
 
        connman_network_unref(network);
-       return;
 }
 
 int __connman_network_refresh_rs_ipv6(struct connman_network *network,
@@ -730,6 +1096,7 @@ static void set_disconnected(struct connman_network *network)
                        __connman_service_notify_ipv4_configuration(service);
                        /* fall through */
                case CONNMAN_IPCONFIG_METHOD_DHCP:
+                       remove_dhcp_timeout(network);
                        __connman_dhcp_stop(ipconfig_ipv4);
                        break;
                }
@@ -770,6 +1137,7 @@ static void set_disconnected(struct connman_network *network)
 
                __connman_ipconfig_address_unset(ipconfig_ipv4);
                __connman_ipconfig_address_unset(ipconfig_ipv6);
+
 #if defined TIZEN_EXT
                }
 #endif
@@ -818,7 +1186,9 @@ static int network_probe(struct connman_network *network)
                        driver = NULL;
                        continue;
                }
-
+#if defined TIZEN_EXT
+               if (!simplified_log)
+#endif
                DBG("driver %p name %s", driver, driver->name);
 
                if (driver->probe(network) == 0)
@@ -982,15 +1352,18 @@ static void network_destruct(struct connman_network *network)
        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;
 
@@ -999,7 +1372,7 @@ static void network_destruct(struct connman_network *network)
 
 /**
  * connman_network_create:
- * @identifier: network identifier (for example an unqiue name)
+ * @identifier: network identifier (for example an unique name)
  *
  * Allocate a new network and assign the #identifier to it.
  *
@@ -1026,9 +1399,13 @@ struct connman_network *connman_network_create(const char *identifier,
 
        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;
@@ -1044,6 +1421,9 @@ 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);
 
@@ -1061,6 +1441,9 @@ connman_network_ref_debug(struct connman_network *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);
 
@@ -1381,6 +1764,13 @@ static gboolean __connman_network_clear_associating_delayed(gpointer user_data)
 }
 #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
@@ -1421,6 +1811,22 @@ int connman_network_set_associating(struct connman_network *network,
        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;
@@ -1428,8 +1834,11 @@ static void set_associate_error(struct connman_network *network)
        service = connman_service_lookup_from_network(network);
 
 #if defined TIZEN_EXT
+       if (!service)
+               return;
+
        __connman_service_indicate_error(service,
-                                       CONNMAN_SERVICE_ERROR_AUTH_FAILED);
+                                       CONNMAN_SERVICE_ERROR_ASSOC_FAILED);
 #else
        __connman_service_indicate_error(service,
                                        CONNMAN_SERVICE_ERROR_CONNECT_FAILED);
@@ -1551,6 +1960,9 @@ void connman_network_set_error(struct connman_network *network,
                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;
@@ -1559,7 +1971,6 @@ void connman_network_set_error(struct connman_network *network,
        case CONNMAN_NETWORK_ERROR_BLOCKED:
                set_blocked_error(network);
                break;
-
        }
 
        __connman_network_disconnect(network);
@@ -1697,15 +2108,17 @@ int __connman_network_connect(struct connman_network *network)
        if (!network->device)
                return -ENODEV;
 
-       network->connecting = true;
-
 #if defined TIZEN_EXT
        if (network->type != CONNMAN_NETWORK_TYPE_CELLULAR)
 #endif
        __connman_device_disconnect(network->device);
+
+       network->connecting = true;
+
 #if defined TIZEN_EXT
        DBG("ConnMan, Connect Request [%s]", network->name);
 #endif
+
        err = network->driver->connect(network);
        if (err < 0) {
                if (err == -EINPROGRESS) {
@@ -1719,6 +2132,18 @@ int __connman_network_connect(struct connman_network *network)
                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;
@@ -1733,9 +2158,15 @@ int __connman_network_connect(struct connman_network *network)
 int __connman_network_disconnect(struct connman_network *network)
 {
        int err = 0;
-
+#if defined TIZEN_EXT
+       if (!simplified_log)
+#endif
        DBG("network %p", network);
 
+       remove_ipv4ll_timeout(network);
+       if (network->acd_host)
+               acd_host_stop(network->acd_host);
+
        if (!network->connected && !network->connecting &&
                                                !network->associating)
                return -ENOTCONN;
@@ -1744,8 +2175,11 @@ int __connman_network_disconnect(struct connman_network *network)
                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);
@@ -1777,13 +2211,16 @@ int __connman_network_clear_ipconfig(struct connman_network *network,
        case CONNMAN_IPCONFIG_METHOD_OFF:
        case CONNMAN_IPCONFIG_METHOD_FIXED:
                return -EINVAL;
-       case CONNMAN_IPCONFIG_METHOD_AUTO:
-               release_dhcpv6(network);
-               break;
        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;
        }
@@ -1955,9 +2392,10 @@ int connman_network_set_bssid(struct connman_network *network,
        if (bssid == NULL)
                return -EINVAL;
 
-       DBG("network %p bssid %02x:%02x:%02x:%02x:%02x:%02x", network,
-                       bssid[0], bssid[1], bssid[2],
-                       bssid[3], bssid[4], bssid[5]);
+       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]);
 
        for (;i < WIFI_BSSID_LEN_MAX;i++)
                network->wifi.bssid[i] = bssid[i];
@@ -1970,6 +2408,41 @@ unsigned char *connman_network_get_bssid(struct connman_network *network)
        return (unsigned char *)network->wifi.bssid;
 }
 
+int connman_network_set_transition_mode_bssid(struct connman_network *network,
+                               const unsigned char *transition_mode_bssid)
+{
+       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;
+}
+
+unsigned char *connman_network_get_transition_mode_bssid(struct connman_network *network)
+{
+       return (unsigned char *)network->wifi.transition_mode_bssid;
+}
+
+bool connman_network_check_transition_mode(struct connman_network *network1, struct connman_network *network2)
+{
+
+       if (network1 == NULL || network2 == NULL)
+               return FALSE;
+
+       if (network1->wifi.owe_transition_mode == FALSE || network2->wifi.owe_transition_mode == FALSE)
+               return FALSE;
+
+       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;
+}
+
 int connman_network_set_maxspeed(struct connman_network *network,
                                 int maxspeed)
 {
@@ -1988,6 +2461,20 @@ int connman_network_get_maxspeed(struct connman_network *network)
        return 0;
 }
 
+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 0;
+}
+
+void *connman_network_get_sec_list(struct connman_network *network)
+{
+       return network->wifi.sec_list;
+}
+
 int connman_network_set_maxrate(struct connman_network *network,
                                unsigned int maxrate)
 {
@@ -2011,7 +2498,8 @@ int connman_network_set_enc_mode(struct connman_network *network,
        if (encryption_mode == NULL)
                return -EINVAL;
 
-       DBG("network %p encryption mode %s", network, encryption_mode);
+       if (!simplified_log)
+               DBG("network %p encryption mode %s", network, encryption_mode);
 
        g_strlcpy(network->wifi.encryption_mode, encryption_mode,
                                        WIFI_ENCYPTION_MODE_LEN_MAX);
@@ -2104,8 +2592,9 @@ int connman_network_set_countrycode(struct connman_network *network,
        if (country_code == NULL)
                return -EINVAL;
 
-       DBG("network %p Country Code %02x:%02x",network,
-           country_code[0],country_code[1]);
+       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];
@@ -2121,16 +2610,23 @@ unsigned char *connman_network_get_countrycode(struct connman_network *network)
 int connman_network_set_bssid_list(struct connman_network *network,
                                        GSList *bssids)
 {
+       unsigned int max_bssid_count;
+
        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)
 {
-       DBG("network %p phy mode %d", network, mode);
+       if (!simplified_log)
+               DBG("network %p phy mode %d", network, mode);
        network->wifi.phy_mode = mode;
 
        return 0;
@@ -2159,6 +2655,73 @@ void *connman_network_get_bssid_list(struct connman_network *network)
 {
        return network->wifi.bssid_list;
 }
+
+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;
+
+       if (!memcmp(bssid, invalid_bssid, WIFI_BSSID_LEN_MAX))
+               return -EINVAL;
+
+       memcpy(network->wifi.last_connected_bssid, bssid, WIFI_BSSID_LEN_MAX);
+
+       return 0;
+}
+
+unsigned char *connman_network_get_last_connected_bssid(struct connman_network *network)
+{
+       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;
+
+       if (!assoc_reject_table)
+               return;
+
+       g_hash_table_destroy(network->wifi.assoc_reject_table);
+
+       network->wifi.assoc_reject_table = assoc_reject_table;
+}
+
+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,
@@ -2223,6 +2786,9 @@ 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);
@@ -2243,6 +2809,9 @@ int connman_network_set_strength(struct connman_network *network,
                                                uint8_t strength)
 {
        network->strength = strength;
+#if defined TIZEN_EXT
+       __connman_service_notify_strength_changed(network);
+#endif
 
        return 0;
 }
@@ -2273,6 +2842,21 @@ int connman_network_set_wifi_channel(struct connman_network *network,
        return 0;
 }
 
+int connman_network_set_autoconnect(struct connman_network *network,
+                               bool autoconnect)
+{
+       if (!network->driver || !network->driver->set_autoconnect)
+               return 0;
+       return network->driver->set_autoconnect(network, autoconnect);
+}
+
+bool __connman_network_native_autoconnect(struct connman_network *network)
+{
+       if (!network->driver || !network->driver->set_autoconnect)
+               return false;
+       return true;
+}
+
 uint16_t connman_network_get_wifi_channel(struct connman_network *network)
 {
        return network->wifi.channel;
@@ -2352,6 +2936,23 @@ int connman_network_set_string(struct connman_network *network,
        } 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;
        }
@@ -2378,15 +2979,7 @@ const char *connman_network_get_string(struct connman_network *network,
        else if (g_str_equal(key, "WiFi.Mode"))
                return network->wifi.mode;
        else if (g_str_equal(key, "WiFi.Security"))
-#if defined TIZEN_EXT
-               if (network->wifi.rsn_mode != true ||
-                   g_str_equal(network->wifi.security, "ieee8021x"))
-                       return network->wifi.security;
-               else
-                       return "rsn";
-#else
                return network->wifi.security;
-#endif
        else if (g_str_equal(key, "WiFi.Passphrase"))
                return network->wifi.passphrase;
        else if (g_str_equal(key, "WiFi.EAP"))
@@ -2417,6 +3010,18 @@ const char *connman_network_get_string(struct connman_network *network,
                return network->wifi.phase2_auth;
        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 NULL;
 }
@@ -2436,6 +3041,8 @@ int connman_network_set_bool(struct connman_network *network,
                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
@@ -2443,6 +3050,14 @@ int connman_network_set_bool(struct connman_network *network,
                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 -EINVAL;
@@ -2462,6 +3077,8 @@ bool connman_network_get_bool(struct connman_network *network,
                return network->roaming;
        else if (g_str_equal(key, "WiFi.WPS"))
                return network->wifi.wps;
+       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
@@ -2469,6 +3086,14 @@ bool connman_network_get_bool(struct connman_network *network,
                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 false;
@@ -2520,6 +3145,16 @@ int connman_network_set_blob(struct connman_network *network,
                        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;
        }
@@ -2542,6 +3177,12 @@ const void *connman_network_get_blob(struct connman_network *network,
                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 NULL;