Apply DNS configuration method
[platform/upstream/connman.git] / src / network.c
old mode 100644 (file)
new mode 100755 (executable)
index eba068b..2585841
@@ -96,9 +96,19 @@ struct connman_network {
                char encryption_mode[WIFI_ENCYPTION_MODE_LEN_MAX];
                unsigned char bssid[WIFI_BSSID_LEN_MAX];
                unsigned int maxrate;
+               unsigned int isHS20AP;
+               unsigned int keymgmt;
+               char *keymgmt_type;
+               bool rsn_mode;
+               int disconnect_reason;
 #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)
@@ -163,10 +173,6 @@ static void dhcp_success(struct connman_network *network)
        if (!service)
                goto err;
 
-       connman_network_set_associating(network, false);
-
-       network->connecting = false;
-
        ipconfig_ipv4 = __connman_service_get_ip4config(service);
 
        DBG("lease acquired for ipconfig %p", ipconfig_ipv4);
@@ -178,7 +184,11 @@ static void dhcp_success(struct connman_network *network)
        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;
 
@@ -198,9 +208,6 @@ static void dhcp_failure(struct connman_network *network)
        if (!service)
                return;
 
-       connman_network_set_associating(network, false);
-       network->connecting = false;
-
        ipconfig_ipv4 = __connman_service_get_ip4config(service);
 
        DBG("lease lost for ipconfig %p", ipconfig_ipv4);
@@ -216,55 +223,24 @@ static void dhcp_callback(struct connman_ipconfig *ipconfig,
                        struct connman_network *network,
                        bool success, gpointer data)
 {
+       network->connecting = false;
+
        if (success)
                dhcp_success(network);
        else
                dhcp_failure(network);
 }
 
-static int set_connected_fixed(struct connman_network *network)
-{
-       struct connman_service *service;
-       struct connman_ipconfig *ipconfig_ipv4;
-       int err;
-
-       DBG("");
-
-       service = connman_service_lookup_from_network(network);
-
-       ipconfig_ipv4 = __connman_service_get_ip4config(service);
-
-       set_configuration(network, CONNMAN_IPCONFIG_TYPE_IPV4);
-
-       network->connecting = false;
-
-       connman_network_set_associating(network, false);
-
-       err = __connman_ipconfig_address_add(ipconfig_ipv4);
-       if (err < 0)
-               goto err;
-
-       err = __connman_ipconfig_gateway_add(ipconfig_ipv4);
-       if (err < 0)
-               goto err;
-
-       return 0;
-
-err:
-       connman_network_set_error(network,
-                       CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
-
-       return err;
-}
-
-static void set_connected_manual(struct connman_network *network)
+static int set_connected_manual(struct connman_network *network)
 {
+       int err = 0;
        struct connman_service *service;
        struct connman_ipconfig *ipconfig;
-       int err;
 
        DBG("network %p", network);
 
+       network->connecting = false;
+
        service = connman_service_lookup_from_network(network);
 
        ipconfig = __connman_service_get_ip4config(service);
@@ -272,26 +248,20 @@ static void set_connected_manual(struct connman_network *network)
        if (!__connman_ipconfig_get_local(ipconfig))
                __connman_service_read_ip4config(service);
 
-       set_configuration(network, CONNMAN_IPCONFIG_TYPE_IPV4);
-
        err = __connman_ipconfig_address_add(ipconfig);
        if (err < 0)
                goto err;
 
+#if defined TIZEN_EXT
+       err = __connman_ipconfig_gateway_add(ipconfig, service);
+#else
        err = __connman_ipconfig_gateway_add(ipconfig);
+#endif
        if (err < 0)
                goto err;
 
-       network->connecting = false;
-
-       connman_network_set_associating(network, false);
-
-       return;
-
 err:
-       connman_network_set_error(network,
-                                       CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
-       return;
+       return err;
 }
 
 static int set_connected_dhcp(struct connman_network *network)
@@ -302,8 +272,6 @@ static int set_connected_dhcp(struct connman_network *network)
 
        DBG("network %p", network);
 
-       set_configuration(network, CONNMAN_IPCONFIG_TYPE_IPV4);
-
        service = connman_service_lookup_from_network(network);
        ipconfig_ipv4 = __connman_service_get_ip4config(service);
 
@@ -341,7 +309,11 @@ static int manual_ipv6_set(struct connman_network *network,
                return err;
        }
 
+#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;
 
@@ -352,6 +324,8 @@ static int manual_ipv6_set(struct connman_network *network,
 
        connman_device_set_disconnected(network->device, false);
 
+       connman_network_set_associating(network, false);
+
        network->connecting = false;
 
        return 0;
@@ -359,6 +333,8 @@ static int manual_ipv6_set(struct connman_network *network,
 
 static void stop_dhcpv6(struct connman_network *network)
 {
+       network->connecting = false;
+
        __connman_dhcpv6_stop(network);
 }
 
@@ -396,8 +372,6 @@ static int dhcpv6_set_addresses(struct connman_network *network)
        if (!service)
                goto err;
 
-       connman_network_set_associating(network, false);
-
        network->connecting = false;
 
        ipconfig_ipv6 = __connman_service_get_ip6config(service);
@@ -405,10 +379,6 @@ static int dhcpv6_set_addresses(struct connman_network *network)
        if (err < 0)
                goto err;
 
-       err = __connman_ipconfig_gateway_add(ipconfig_ipv6);
-       if (err < 0)
-               goto err;
-
        return 0;
 
 err:
@@ -521,6 +491,8 @@ static void check_dhcpv6(struct nd_router_advert *reply,
        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);
@@ -529,10 +501,16 @@ static void check_dhcpv6(struct nd_router_advert *reply,
        /*
         * We do stateful/stateless DHCPv6 if router advertisement says so.
         */
-       if (reply->nd_ra_flags_reserved & ND_RA_FLAG_MANAGED)
+       if (reply->nd_ra_flags_reserved & ND_RA_FLAG_MANAGED) {
                __connman_dhcpv6_start(network, prefixes, dhcpv6_callback);
-       else if (reply->nd_ra_flags_reserved & ND_RA_FLAG_OTHER)
-               __connman_dhcpv6_start_info(network, dhcpv6_info_callback);
+       } else {
+               if (reply->nd_ra_flags_reserved & ND_RA_FLAG_OTHER)
+                       __connman_dhcpv6_start_info(network,
+                                                       dhcpv6_info_callback);
+
+               g_slist_free_full(prefixes, g_free);
+               network->connecting = false;
+       }
 
        connman_network_unref(network);
 }
@@ -612,11 +590,9 @@ static void autoconf_ipv6_set(struct connman_network *network)
 
        connman_device_set_disconnected(network->device, false);
 
-       network->connecting = false;
-
 #if defined TIZEN_EXT
-               if(network->type == CONNMAN_NETWORK_TYPE_CELLULAR)
-                       return;
+       if(network->type == CONNMAN_NETWORK_TYPE_CELLULAR)
+               return;
 #endif
 
        service = connman_service_lookup_from_network(network);
@@ -627,6 +603,8 @@ static void autoconf_ipv6_set(struct connman_network *network)
        if (!ipconfig)
                return;
 
+       __connman_ipconfig_enable_ipv6(ipconfig);
+
        __connman_ipconfig_address_remove(ipconfig);
 
        index = __connman_ipconfig_get_index(ipconfig);
@@ -641,13 +619,13 @@ static void autoconf_ipv6_set(struct connman_network *network)
 static void set_connected(struct connman_network *network)
 {
        struct connman_ipconfig *ipconfig_ipv4, *ipconfig_ipv6;
-       enum connman_ipconfig_method ipv4_method, ipv6_method;
        struct connman_service *service;
-       int ret;
 
        if (network->connected)
                return;
 
+       connman_network_set_associating(network, false);
+
        network->connected = true;
 
        service = connman_service_lookup_from_network(network);
@@ -658,62 +636,8 @@ static void set_connected(struct connman_network *network)
        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);
-
-       switch (ipv6_method) {
-       case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
-       case CONNMAN_IPCONFIG_METHOD_OFF:
-               break;
-       case CONNMAN_IPCONFIG_METHOD_DHCP:
-       case CONNMAN_IPCONFIG_METHOD_AUTO:
-#if defined TIZEN_EXT
-               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;
-               }
-               break;
-       }
-
-       switch (ipv4_method) {
-       case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
-       case CONNMAN_IPCONFIG_METHOD_OFF:
-       case CONNMAN_IPCONFIG_METHOD_AUTO:
-               return;
-       case CONNMAN_IPCONFIG_METHOD_FIXED:
-               if (set_connected_fixed(network) < 0) {
-                       connman_network_set_error(network,
-                                       CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL);
-                       return;
-               }
-               return;
-       case CONNMAN_IPCONFIG_METHOD_MANUAL:
-               set_connected_manual(network);
-               return;
-       case CONNMAN_IPCONFIG_METHOD_DHCP:
-               if (set_connected_dhcp(network) < 0) {
-                       connman_network_set_error(network,
-                                       CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL);
-                       return;
-               }
-       }
-
-       network->connecting = false;
-
-       connman_network_set_associating(network, false);
+       __connman_network_enable_ipconfig(network, ipconfig_ipv4);
+       __connman_network_enable_ipconfig(network, ipconfig_ipv6);
 }
 
 static void set_disconnected(struct connman_network *network)
@@ -792,12 +716,22 @@ static void set_disconnected(struct connman_network *network)
                                        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
@@ -913,23 +847,6 @@ static void network_remove(struct connman_network *network)
        network->driver = NULL;
 }
 
-static void network_change(struct connman_network *network)
-{
-       DBG("network %p name %s", network, network->name);
-
-       if (!network->connected)
-               return;
-
-       connman_device_set_disconnected(network->device, true);
-
-       if (network->driver && network->driver->disconnect) {
-               network->driver->disconnect(network);
-               return;
-       }
-
-       network->connected = false;
-}
-
 static void probe_driver(struct connman_network_driver *driver)
 {
        GSList *list;
@@ -1160,14 +1077,21 @@ void connman_network_set_index(struct connman_network *network, int index)
                goto done;
 
        ipconfig = __connman_service_get_ip4config(service);
-       if (!ipconfig)
-               goto done;
+       if (ipconfig) {
+               __connman_ipconfig_set_index(ipconfig, index);
 
-       /* If index changed, the index of ipconfig must be reset. */
-       __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);
+       }
 
-       DBG("index %d service %p ip4config %p", network->index,
-               service, ipconfig);
 done:
        network->index = index;
 }
@@ -1263,6 +1187,15 @@ bool __connman_network_get_weakness(struct connman_network *network)
        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;
@@ -1278,7 +1211,9 @@ bool connman_network_get_connecting(struct connman_network *network)
 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;
@@ -1299,6 +1234,86 @@ 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_network_clear_associating(network);
+
+       return FALSE;
+}
+#endif
+
 /**
  * connman_network_set_associating:
  * @network: network structure
@@ -1328,6 +1343,14 @@ int connman_network_set_associating(struct connman_network *network,
                                        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;
 }
 
@@ -1337,8 +1360,13 @@ static void set_associate_error(struct connman_network *network)
 
        service = connman_service_lookup_from_network(network);
 
+#if defined TIZEN_EXT
+       __connman_service_indicate_error(service,
+                                       CONNMAN_SERVICE_ERROR_AUTH_FAILED);
+#else
        __connman_service_indicate_error(service,
                                        CONNMAN_SERVICE_ERROR_CONNECT_FAILED);
+#endif
 }
 
 static void set_configure_error(struct connman_network *network)
@@ -1357,6 +1385,10 @@ static void set_invalid_key_error(struct connman_network *network)
 
        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);
 }
@@ -1371,6 +1403,32 @@ static void set_connect_error(struct connman_network *network)
                                        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)
 {
@@ -1410,9 +1468,6 @@ void connman_network_set_error(struct connman_network *network,
 {
        DBG("network %p error %d", network, error);
 
-       network->connecting = false;
-       network->associating = false;
-
        switch (error) {
        case CONNMAN_NETWORK_ERROR_UNKNOWN:
                return;
@@ -1428,9 +1483,19 @@ void connman_network_set_error(struct connman_network *network,
        case CONNMAN_NETWORK_ERROR_CONNECT_FAIL:
                set_connect_error(network);
                break;
+#if defined TIZEN_EXT
+       case CONNMAN_NETWORK_ERROR_DHCP_FAIL:
+               set_dhcp_error(network);
+               break;
+#endif
+
+       case CONNMAN_NETWORK_ERROR_BLOCKED:
+               set_blocked_error(network);
+               break;
+
        }
 
-       network_change(network);
+       __connman_network_disconnect(network);
 }
 
 /**
@@ -1451,8 +1516,7 @@ int connman_network_set_connected(struct connman_network *network,
                                                        !connected) {
                connman_network_set_error(network,
                                        CONNMAN_NETWORK_ERROR_CONNECT_FAIL);
-               if (__connman_network_disconnect(network) == 0)
-                       return 0;
+               return 0;
        }
 
        if (network->connected == connected)
@@ -1568,13 +1632,19 @@ int __connman_network_connect(struct connman_network *network)
 
        network->connecting = true;
 
+#if defined TIZEN_EXT
+       if (network->type != CONNMAN_NETWORK_TYPE_CELLULAR)
+#endif
        __connman_device_disconnect(network->device);
 
        err = network->driver->connect(network);
        if (err < 0) {
-               if (err == -EINPROGRESS)
+               if (err == -EINPROGRESS) {
+#if defined TIZEN_EXT
+                       if (network->type != CONNMAN_NETWORK_TYPE_CELLULAR)
+#endif
                        connman_network_set_associating(network, true);
-               else
+               else
                        network->connecting = false;
 
                return err;
@@ -1615,26 +1685,6 @@ int __connman_network_disconnect(struct connman_network *network)
        return err;
 }
 
-static int manual_ipv4_set(struct connman_network *network,
-                               struct connman_ipconfig *ipconfig)
-{
-       struct connman_service *service;
-       int err;
-
-       service = connman_service_lookup_from_network(network);
-       if (!service)
-               return -EINVAL;
-
-       err = __connman_ipconfig_address_add(ipconfig);
-       if (err < 0) {
-               connman_network_set_error(network,
-                       CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
-               return err;
-       }
-
-       return __connman_ipconfig_gateway_add(ipconfig);
-}
-
 int __connman_network_clear_ipconfig(struct connman_network *network,
                                        struct connman_ipconfig *ipconfig)
 {
@@ -1679,58 +1729,122 @@ int __connman_network_clear_ipconfig(struct connman_network *network,
        return 0;
 }
 
-int __connman_network_set_ipconfig(struct connman_network *network,
-                                       struct connman_ipconfig *ipconfig_ipv4,
-                                       struct connman_ipconfig *ipconfig_ipv6)
+#if defined TIZEN_EXT
+void __connman_network_set_auto_ipv6_gateway(char *gateway, void *user_data)
 {
+       DBG("");
+
+       struct connman_network *network = user_data;
+       struct connman_service *service;
+       struct connman_ipconfig *ipconfig = NULL;
+
+       service = connman_service_lookup_from_network(network);
+       if (service == NULL)
+               return;
+
+       ipconfig = __connman_service_get_ipconfig(service, AF_INET6);
+       if (ipconfig == NULL)
+               return;
+
+       __connman_ipconfig_set_gateway(ipconfig, gateway);
+
+       return;
+}
+#endif
+
+int __connman_network_enable_ipconfig(struct connman_network *network,
+                               struct connman_ipconfig *ipconfig)
+{
+       int r = 0;
+       enum connman_ipconfig_type type;
        enum connman_ipconfig_method method;
-       int ret;
+#if defined TIZEN_EXT
+       struct connman_service *service;
+#endif
 
-       if (!network)
+       if (!network || !ipconfig)
                return -EINVAL;
 
-       if (ipconfig_ipv6) {
-               method = __connman_ipconfig_get_method(ipconfig_ipv6);
+       type = __connman_ipconfig_get_config_type(ipconfig);
+
+       switch (type) {
+       case CONNMAN_IPCONFIG_TYPE_UNKNOWN:
+       case CONNMAN_IPCONFIG_TYPE_ALL:
+               return -ENOSYS;
+
+       case CONNMAN_IPCONFIG_TYPE_IPV6:
+               set_configuration(network, type);
+
+               method = __connman_ipconfig_get_method(ipconfig);
+
+               DBG("ipv6 ipconfig method %d", 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 ret;
-                       }
+                       r = manual_ipv6_set(network, ipconfig);
                        break;
+
                case CONNMAN_IPCONFIG_METHOD_DHCP:
+                       r = -ENOSYS;
                        break;
                }
-       }
 
-       if (ipconfig_ipv4) {
-               method = __connman_ipconfig_get_method(ipconfig_ipv4);
+               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:
-               case CONNMAN_IPCONFIG_METHOD_FIXED:
+                       break;
+
                case CONNMAN_IPCONFIG_METHOD_AUTO:
-                       return -EINVAL;
+                       r = -ENOSYS;
+                       break;
+
+               case CONNMAN_IPCONFIG_METHOD_FIXED:
                case CONNMAN_IPCONFIG_METHOD_MANUAL:
-                       return manual_ipv4_set(network, ipconfig_ipv4);
+                       r = set_connected_manual(network);
+                       break;
+
                case CONNMAN_IPCONFIG_METHOD_DHCP:
-                       return __connman_dhcp_start(ipconfig_ipv4,
-                                               network, dhcp_callback, NULL);
+                       r = set_connected_dhcp(network);
+                       break;
                }
+
+               break;
        }
 
-       return 0;
+       if (r < 0)
+               connman_network_set_error(network,
+                                       CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
+
+       return r;
 }
 
 int connman_network_set_ipaddress(struct connman_network *network,
@@ -1788,7 +1902,9 @@ unsigned char *connman_network_get_bssid(struct connman_network *network)
 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;
 
@@ -1819,6 +1935,14 @@ const char *connman_network_get_enc_mode(struct connman_network *network)
        return (const char *)network->wifi.encryption_mode;
 }
 
+int connman_network_set_rsn_mode(struct connman_network *network,
+                               bool rsn_mode)
+{
+       network->wifi.rsn_mode = rsn_mode;
+
+       return 0;
+}
+
 int connman_network_set_proxy(struct connman_network *network,
                                const char *proxies)
 {
@@ -1837,6 +1961,63 @@ int connman_network_set_proxy(struct connman_network *network,
 
        return 0;
 }
+
+int connman_network_set_is_hs20AP(struct connman_network *network,
+                               unsigned int isHS20AP)
+{
+       if (!network)
+               return 0;
+
+       network->wifi.isHS20AP = isHS20AP;
+
+       return 0;
+}
+
+unsigned int connman_network_get_is_hs20AP(struct connman_network *network)
+{
+       if (!network)
+               return 0;
+
+       return network->wifi.isHS20AP;
+}
+
+int connman_network_set_keymgmt(struct connman_network *network,
+                               unsigned int keymgmt)
+{
+       if (network == NULL)
+               return 0;
+
+       network->wifi.keymgmt = keymgmt;
+
+       return 0;
+}
+
+unsigned int connman_network_get_keymgmt(struct connman_network *network)
+{
+       if (network == NULL)
+               return 0;
+
+       return network->wifi.keymgmt;
+}
+
+int connman_network_set_disconnect_reason(struct connman_network *network,
+                               int reason_code)
+{
+       if (network == NULL)
+               return 0;
+
+       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;
+}
 #endif
 
 int connman_network_set_nameservers(struct connman_network *network,
@@ -1860,8 +2041,14 @@ int connman_network_set_nameservers(struct connman_network *network,
        nameservers_array = g_strsplit(nameservers, " ", 0);
 
        for (i = 0; nameservers_array[i]; i++) {
+#if defined TIZEN_EXT
+               __connman_service_nameserver_append(service,
+                                               nameservers_array[i], false,
+                                               CONNMAN_IPCONFIG_TYPE_ALL);
+#else
                __connman_service_nameserver_append(service,
                                                nameservers_array[i], false);
+#endif
        }
 
        g_strfreev(nameservers_array);
@@ -1914,7 +2101,9 @@ int connman_network_set_name(struct connman_network *network,
 int connman_network_set_strength(struct connman_network *network,
                                                uint8_t strength)
 {
+#if !defined TIZEN_EXT
        DBG("network %p strengh %d", network, strength);
+#endif
 
        network->strength = strength;
 
@@ -1929,7 +2118,9 @@ uint8_t connman_network_get_strength(struct connman_network *network)
 int connman_network_set_frequency(struct connman_network *network,
                                                uint16_t frequency)
 {
+#if !defined TIZEN_EXT
        DBG("network %p frequency %d", network, frequency);
+#endif
 
        network->frequency = frequency;
 
@@ -1967,7 +2158,9 @@ uint16_t connman_network_get_wifi_channel(struct connman_network *network)
 int connman_network_set_string(struct connman_network *network,
                                        const char *key, const char *value)
 {
+#if !defined TIZEN_EXT
        DBG("network %p key %s value %s", network, key, value);
+#endif
 
        if (g_strcmp0(key, "Name") == 0)
                return connman_network_set_name(network, value);
@@ -2031,7 +2224,9 @@ int connman_network_set_string(struct connman_network *network,
 const char *connman_network_get_string(struct connman_network *network,
                                                        const char *key)
 {
+#if !defined TIZEN_EXT
        DBG("network %p key %s", network, key);
+#endif
 
        if (g_str_equal(key, "Path"))
                return network->path;
@@ -2042,7 +2237,15 @@ 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"))
@@ -2078,7 +2281,9 @@ const char *connman_network_get_string(struct connman_network *network,
 int connman_network_set_bool(struct connman_network *network,
                                        const char *key, bool value)
 {
+#if !defined TIZEN_EXT
        DBG("network %p key %s value %d", network, key, value);
+#endif
 
        if (g_strcmp0(key, "Roaming") == 0)
                network->roaming = value;
@@ -2086,6 +2291,10 @@ int connman_network_set_bool(struct connman_network *network,
                network->wifi.wps = 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;
+#endif
 
        return -EINVAL;
 }
@@ -2100,7 +2309,9 @@ int connman_network_set_bool(struct connman_network *network,
 bool connman_network_get_bool(struct connman_network *network,
                                                        const char *key)
 {
+#if !defined TIZEN_EXT
        DBG("network %p key %s", network, key);
+#endif
 
        if (g_str_equal(key, "Roaming"))
                return network->roaming;
@@ -2108,6 +2319,10 @@ bool connman_network_get_bool(struct connman_network *network,
                return network->wifi.wps;
        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;
+#endif
 
        return false;
 }
@@ -2124,7 +2339,9 @@ bool connman_network_get_bool(struct connman_network *network,
 int connman_network_set_blob(struct connman_network *network,
                        const char *key, const void *data, unsigned int size)
 {
+#if !defined TIZEN_EXT
        DBG("network %p key %s size %d", network, key, size);
+#endif
 
        if (g_str_equal(key, "WiFi.SSID")) {
                g_free(network->wifi.ssid);