Release tizen_2.0_beta
[profile/ivi/connman.git] / src / network.c
index 4664ea5..3b98372 100644 (file)
@@ -45,7 +45,6 @@ struct connman_network {
        char *group;
        char *path;
        int index;
-       int router_solicit_count;
 
        struct connman_network_driver *driver;
        void *driver_data;
@@ -74,6 +73,11 @@ struct connman_network {
                connman_bool_t wps;
                connman_bool_t use_wps;
                char *pin_wps;
+#if defined TIZEN_EXT
+               char encryption_mode[6];
+               unsigned char bssid[6];
+               unsigned int maxrate;
+#endif
        } wifi;
 
        struct {
@@ -387,12 +391,10 @@ struct connman_network *connman_network_create(const char *identifier,
  *
  * Increase reference counter of  network
  */
-struct connman_network *
-connman_network_ref_debug(struct connman_network *network,
-                       const char *file, int line, const char *caller)
+struct connman_network *connman_network_ref(struct connman_network *network)
 {
-       DBG("%p name %s ref %d by %s:%d:%s()", network, network->name,
-               network->refcount + 1, file, line, caller);
+       DBG("network %p name %s refcount %d", network, network->name,
+               network->refcount + 1);
 
        __sync_fetch_and_add(&network->refcount, 1);
 
@@ -405,11 +407,10 @@ connman_network_ref_debug(struct connman_network *network,
  *
  * Decrease reference counter of network
  */
-void connman_network_unref_debug(struct connman_network *network,
-                               const char *file, int line, const char *caller)
+void connman_network_unref(struct connman_network *network)
 {
-       DBG("%p name %s ref %d by %s:%d:%s()", network, network->name,
-               network->refcount - 1, file, line, caller);
+       DBG("network %p name %s refcount %d", network, network->name,
+               network->refcount - 1);
 
        if (__sync_fetch_and_sub(&network->refcount, 1) != 1)
                return;
@@ -685,6 +686,12 @@ static void set_invalid_key_error(struct connman_network *network)
 
 static void set_connect_error(struct connman_network *network)
 {
+
+#if defined TIZEN_EXT
+       if (network->associating != FALSE)
+               network->associating = FALSE;
+#endif
+
        struct connman_service *service;
 
        service = __connman_service_lookup_from_network(network);
@@ -707,7 +714,7 @@ void connman_network_set_ipv4_method(struct connman_network *network,
        if (ipconfig == NULL)
                return;
 
-       __connman_ipconfig_set_method(ipconfig, method);
+       connman_ipconfig_set_method(ipconfig, method);
 }
 
 void connman_network_set_ipv6_method(struct connman_network *network,
@@ -724,7 +731,7 @@ void connman_network_set_ipv6_method(struct connman_network *network,
        if (ipconfig == NULL)
                return;
 
-       __connman_ipconfig_set_method(ipconfig, method);
+       connman_ipconfig_set_method(ipconfig, method);
 }
 
 void connman_network_set_error(struct connman_network *network,
@@ -771,8 +778,7 @@ void connman_network_clear_error(struct connman_network *network)
        __connman_service_clear_error(service);
 }
 
-static void set_configuration(struct connman_network *network,
-                       enum connman_ipconfig_type type)
+static void set_configuration(struct connman_network *network)
 {
        struct connman_service *service;
 
@@ -788,7 +794,7 @@ static void set_configuration(struct connman_network *network,
        service = __connman_service_lookup_from_network(network);
        __connman_service_ipconfig_indicate_state(service,
                                        CONNMAN_SERVICE_STATE_CONFIGURATION,
-                                       type);
+                                       CONNMAN_IPCONFIG_TYPE_IPV4);
 }
 
 static void dhcp_success(struct connman_network *network)
@@ -810,7 +816,14 @@ static void dhcp_success(struct connman_network *network)
        if (err < 0)
                goto err;
 
+#if defined TIZEN_EXT
+/*
+ * Description: __connman_service_lookup_from_index cannot find correct service
+ */
+       err = __connman_ipconfig_gateway_add(ipconfig_ipv4, service);
+#else
        err = __connman_ipconfig_gateway_add(ipconfig_ipv4);
+#endif
        if (err < 0)
                goto err;
 
@@ -857,7 +870,7 @@ static int set_connected_fixed(struct connman_network *network)
 
        ipconfig_ipv4 = __connman_service_get_ip4config(service);
 
-       set_configuration(network, CONNMAN_IPCONFIG_TYPE_IPV4);
+       set_configuration(network);
 
        network->connecting = FALSE;
 
@@ -867,7 +880,14 @@ static int set_connected_fixed(struct connman_network *network)
        if (err < 0)
                goto err;
 
+#if defined TIZEN_EXT
+/*
+ * Description: __connman_service_lookup_from_index cannot find correct service
+ */
+       err = __connman_ipconfig_gateway_add(ipconfig_ipv4, service);
+#else
        err = __connman_ipconfig_gateway_add(ipconfig_ipv4);
+#endif
        if (err < 0)
                goto err;
 
@@ -895,13 +915,20 @@ static void set_connected_manual(struct connman_network *network)
        if (__connman_ipconfig_get_local(ipconfig) == NULL)
                __connman_service_read_ip4config(service);
 
-       set_configuration(network, CONNMAN_IPCONFIG_TYPE_IPV4);
+       set_configuration(network);
 
        err = __connman_ipconfig_address_add(ipconfig);
        if (err < 0)
                goto err;
 
+#if defined TIZEN_EXT
+/*
+ * Description: __connman_service_lookup_from_index cannot find correct service
+ */
+       err = __connman_ipconfig_gateway_add(ipconfig, service);
+#else
        err = __connman_ipconfig_gateway_add(ipconfig);
+#endif
        if (err < 0)
                goto err;
 
@@ -923,7 +950,7 @@ static int set_connected_dhcp(struct connman_network *network)
 
        DBG("network %p", network);
 
-       set_configuration(network, CONNMAN_IPCONFIG_TYPE_IPV4);
+       set_configuration(network);
 
        err = __connman_dhcp_start(network, dhcp_callback);
        if (err < 0) {
@@ -956,7 +983,14 @@ static int manual_ipv6_set(struct connman_network *network,
                return err;
        }
 
+#if defined TIZEN_EXT
+/*
+ * Description: __connman_service_lookup_from_index cannot find correct service
+ */
+       err = __connman_ipconfig_gateway_add(ipconfig_ipv6, service);
+#else
        err = __connman_ipconfig_gateway_add(ipconfig_ipv6);
+#endif
        if (err < 0)
                return err;
 
@@ -972,207 +1006,25 @@ static int manual_ipv6_set(struct connman_network *network,
        return 0;
 }
 
-static void stop_dhcpv6(struct connman_network *network)
-{
-       __connman_dhcpv6_stop(network);
-}
-
-static void dhcpv6_release_callback(struct connman_network *network,
-                               connman_bool_t success)
-{
-       DBG("success %d", success);
-
-       stop_dhcpv6(network);
-}
-
-static void release_dhcpv6(struct connman_network *network)
-{
-       __connman_dhcpv6_start_release(network, dhcpv6_release_callback);
-       stop_dhcpv6(network);
-}
-
-static void dhcpv6_info_callback(struct connman_network *network,
-                               connman_bool_t success)
-{
-       DBG("success %d", success);
-
-       stop_dhcpv6(network);
-}
-
-static gboolean dhcpv6_set_addresses(struct connman_network *network)
-{
-       struct connman_service *service;
-       struct connman_ipconfig *ipconfig_ipv6;
-       int err = -EINVAL;
-
-       service = __connman_service_lookup_from_network(network);
-       if (service == NULL)
-               goto err;
-
-       connman_network_set_associating(network, FALSE);
-
-       network->connecting = FALSE;
-
-       ipconfig_ipv6 = __connman_service_get_ip6config(service);
-       err = __connman_ipconfig_address_add(ipconfig_ipv6);
-       if (err < 0)
-               goto err;
-
-       err = __connman_ipconfig_gateway_add(ipconfig_ipv6);
-       if (err < 0)
-               goto err;
-
-       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,
-                       connman_bool_t success);
-
-/*
- * 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,
-                                       connman_bool_t success)
-{
-       if (success == TRUE)
-               dhcpv6_callback(network, success);
-       else {
-               stop_dhcpv6(network);
-
-               /* restart and do solicit again. */
-               autoconf_ipv6_set(network);
-       }
-}
-
-static void dhcpv6_callback(struct connman_network *network,
-                                       connman_bool_t success)
-{
-       DBG("success %d", success);
-
-       /* Start the renew process if necessary */
-       if (success == TRUE) {
-
-               if (dhcpv6_set_addresses(network) < 0) {
-                       stop_dhcpv6(network);
-                       return;
-               }
-
-               if (__connman_dhcpv6_start_renew(network,
-                                       dhcpv6_renew_callback) == -ETIMEDOUT)
-                       dhcpv6_renew_callback(network, FALSE);
-       } 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;
-       GSList *prefixes;
-
-       DBG("reply %p", reply);
-
-       if (reply == NULL) {
-               /*
-                * 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, 1,
-                                               check_dhcpv6, network);
-                       return;
-               }
-               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 == FALSE) {
-               connman_network_unref(network);
-               return;
-       }
-
-       prefixes = __connman_inet_ipv6_get_prefixes(reply, length);
-
-       /*
-        * We do stateful/stateless DHCPv6 if router advertisement says so.
-        */
-       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);
-
-       connman_network_unref(network);
-}
-
 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);
 
        connman_device_set_disconnected(network->device, FALSE);
 
-       network->connecting = FALSE;
+       /* XXX: Append IPv6 nameservers here */
 
-       service = __connman_service_lookup_from_network(network);
-       if (service == NULL)
-               return;
-
-       ipconfig = __connman_service_get_ip6config(service);
-       if (ipconfig == NULL)
-               return;
-
-       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, 1, check_dhcpv6, network);
+       network->connecting = FALSE;
 }
 
-static void set_connected(struct connman_network *network)
+static gboolean set_connected(gpointer user_data)
 {
+       struct connman_network *network = user_data;
+       struct connman_service *service;
        struct connman_ipconfig *ipconfig_ipv4, *ipconfig_ipv6;
        enum connman_ipconfig_method ipv4_method, ipv6_method;
-       struct connman_service *service;
-       int ret;
-
-       if (network->connected == TRUE)
-               return;
-
-       network->connected = TRUE;
 
        service = __connman_service_lookup_from_network(network);
 
@@ -1186,160 +1038,135 @@ static void set_connected(struct connman_network *network)
        ipv6_method = __connman_ipconfig_get_method(ipconfig_ipv6);
 
        DBG("method ipv4 %d ipv6 %d", ipv4_method, ipv6_method);
+       DBG("network connected %d", network->connected);
 
-       switch (ipv6_method) {
-       case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
-       case CONNMAN_IPCONFIG_METHOD_OFF:
-               break;
-       case CONNMAN_IPCONFIG_METHOD_DHCP:
-       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,
+       if (network->connected == TRUE) {
+               int ret;
+
+               switch (ipv6_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;
+                               return FALSE;
+                       }
+                       break;
+               case CONNMAN_IPCONFIG_METHOD_DHCP:
+                       break;
                }
-               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,
+               switch (ipv4_method) {
+               case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+               case CONNMAN_IPCONFIG_METHOD_OFF:
+               case CONNMAN_IPCONFIG_METHOD_AUTO:
+                       return FALSE;
+               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,
+                               return FALSE;
+                       }
+                       return TRUE;
+               case CONNMAN_IPCONFIG_METHOD_MANUAL:
+                       set_connected_manual(network);
+                       return TRUE;
+               case CONNMAN_IPCONFIG_METHOD_DHCP:
+                       if (set_connected_dhcp(network) < 0) {
+                               connman_network_set_error(network,
                                        CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL);
-                       return;
+                               return FALSE;
+                       }
                }
-       }
-
-       network->connecting = FALSE;
 
-       connman_network_set_associating(network, FALSE);
-}
-
-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;
-
-       if (network->connected == FALSE)
-               return;
-
-       network->connected = FALSE;
-
-       service = __connman_service_lookup_from_network(network);
+       } else {
+               enum connman_service_state state;
 
-       ipconfig_ipv4 = __connman_service_get_ip4config(service);
-       ipconfig_ipv6 = __connman_service_get_ip6config(service);
+               __connman_device_set_network(network->device, NULL);
 
-       DBG("service %p ipv4 %p ipv6 %p", service, ipconfig_ipv4,
-               ipconfig_ipv6);
+               switch (ipv4_method) {
+               case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+               case CONNMAN_IPCONFIG_METHOD_OFF:
+               case CONNMAN_IPCONFIG_METHOD_AUTO:
+               case CONNMAN_IPCONFIG_METHOD_FIXED:
+               case CONNMAN_IPCONFIG_METHOD_MANUAL:
+                       break;
+               case CONNMAN_IPCONFIG_METHOD_DHCP:
+                       __connman_dhcp_stop(network);
+                       break;
+               }
 
-       ipv4_method = __connman_ipconfig_get_method(ipconfig_ipv4);
-       ipv6_method = __connman_ipconfig_get_method(ipconfig_ipv6);
+               /*
+                * 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);
 
-       DBG("method ipv4 %d ipv6 %d", ipv4_method, ipv6_method);
+               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);
 
-       /*
-        * Resetting solicit count here will prevent the RS resend loop
-        * from sending packets in check_dhcpv6()
-        */
-       network->router_solicit_count = 0;
+               __connman_connection_gateway_remove(service,
+                                               CONNMAN_IPCONFIG_TYPE_ALL);
 
-       __connman_device_set_network(network->device, NULL);
+               __connman_ipconfig_address_unset(ipconfig_ipv4);
+               __connman_ipconfig_address_unset(ipconfig_ipv6);
 
-       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_AUTO:
-       case CONNMAN_IPCONFIG_METHOD_FIXED:
-       case CONNMAN_IPCONFIG_METHOD_MANUAL:
-               break;
-       case CONNMAN_IPCONFIG_METHOD_DHCP:
-               __connman_dhcp_stop(network);
-               break;
-       }
+               /*
+                * 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);
+               }
 
-       /*
-        * 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)
+#if defined TIZEN_EXT
+               if (connman_service_get_type(service) ==
+                               CONNMAN_SERVICE_TYPE_CELLULAR) {
+                       network->connecting = FALSE;
+                       connman_network_set_associating(network, FALSE);
+               }
+#endif
                __connman_service_ipconfig_indicate_state(service,
-                                       CONNMAN_SERVICE_STATE_DISCONNECT,
+                                       CONNMAN_SERVICE_STATE_IDLE,
                                        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_SERVICE_STATE_IDLE,
                                        CONNMAN_IPCONFIG_TYPE_IPV6);
-
-       __connman_connection_gateway_remove(service,
-                                       CONNMAN_IPCONFIG_TYPE_ALL);
-
-       __connman_ipconfig_address_unset(ipconfig_ipv4);
-       __connman_ipconfig_address_unset(ipconfig_ipv6);
-
-       /*
-        * 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);
+#if defined TIZEN_EXT
+               if (connman_service_get_type(service) ==
+                               CONNMAN_SERVICE_TYPE_CELLULAR)
+                       return FALSE;
+#endif
        }
 
-       __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;
 
        connman_network_set_associating(network, FALSE);
+
+       return FALSE;
 }
 
 /**
@@ -1352,25 +1179,21 @@ static void set_disconnected(struct connman_network *network)
 int connman_network_set_connected(struct connman_network *network,
                                                connman_bool_t connected)
 {
-       DBG("network %p connected %d/%d connecting %d associating %d",
-               network, network->connected, connected, network->connecting,
-               network->associating);
+       DBG("network %p connected %d", network, connected);
 
        if ((network->connecting == TRUE || network->associating == TRUE) &&
                                                        connected == FALSE) {
                connman_network_set_error(network,
                                        CONNMAN_NETWORK_ERROR_CONNECT_FAIL);
-               if (__connman_network_disconnect(network) == 0)
-                       return 0;
+               __connman_network_disconnect(network);
        }
 
        if (network->connected == connected)
                return -EALREADY;
 
-       if (connected == FALSE)
-               set_disconnected(network);
-       else
-               set_connected(network);
+       network->connected = connected;
+
+       set_connected(network);
 
        return 0;
 }
@@ -1397,26 +1220,6 @@ connman_bool_t connman_network_get_associating(struct connman_network *network)
        return network->associating;
 }
 
-int connman_network_connect_hidden(struct connman_network *network,
-                               char *identity, char* passphrase)
-{
-       struct connman_service *service;
-
-       DBG("");
-
-       service = __connman_service_lookup_from_network(network);
-       if (service == NULL)
-               return -EINVAL;
-
-       if (identity != NULL)
-               __connman_service_set_agent_identity(service, identity);
-
-       if (passphrase != NULL)
-               __connman_service_add_passphrase(service, passphrase);
-
-       return __connman_service_connect(service);
-}
-
 /**
  * __connman_network_connect:
  * @network: network structure
@@ -1446,6 +1249,9 @@ 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);
@@ -1459,6 +1265,7 @@ int __connman_network_connect(struct connman_network *network)
                return err;
        }
 
+       network->connected = TRUE;
        set_connected(network);
 
        return err;
@@ -1489,8 +1296,10 @@ int __connman_network_disconnect(struct connman_network *network)
        network->connecting = FALSE;
 
        err = network->driver->disconnect(network);
-       if (err == 0)
-               set_disconnected(network);
+       if (err == 0) {
+               connman_network_set_connected(network, FALSE);
+               set_connected(network);
+       }
 
        return err;
 }
@@ -1512,7 +1321,14 @@ static int manual_ipv4_set(struct connman_network *network,
                return err;
        }
 
+#if defined TIZEN_EXT
+/*
+ * Description: __connman_service_lookup_from_index cannot find correct service
+ */
+       return __connman_ipconfig_gateway_add(ipconfig, service);
+#else
        return __connman_ipconfig_gateway_add(ipconfig);
+#endif
 }
 
 int __connman_network_clear_ipconfig(struct connman_network *network,
@@ -1533,10 +1349,8 @@ int __connman_network_clear_ipconfig(struct connman_network *network,
        case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
        case CONNMAN_IPCONFIG_METHOD_OFF:
        case CONNMAN_IPCONFIG_METHOD_FIXED:
-               return -EINVAL;
        case CONNMAN_IPCONFIG_METHOD_AUTO:
-               release_dhcpv6(network);
-               break;
+               return -EINVAL;
        case CONNMAN_IPCONFIG_METHOD_MANUAL:
                __connman_ipconfig_address_remove(ipconfig);
                break;
@@ -1635,6 +1449,107 @@ int connman_network_set_ipaddress(struct connman_network *network,
        return 0;
 }
 
+#if defined TIZEN_EXT
+/*
+ * Description: Telephony plug-in requires manual PROXY setting function
+ */
+int connman_network_set_proxy(struct connman_network *network,
+                               const char *proxies)
+{
+       struct connman_service *service;
+
+       DBG("network %p proxies %s", network, proxies);
+
+       service = __connman_service_lookup_from_network(network);
+       if (service == NULL)
+               return -EINVAL;
+
+       __connman_service_set_proxy(service, proxies);
+
+       connman_service_set_proxy_method(service, CONNMAN_SERVICE_PROXY_METHOD_MANUAL);
+
+       return 0;
+}
+
+/*
+ * Description: Network client requires additional wifi specific info
+ */
+int connman_network_set_bssid(struct connman_network *network,
+                               const unsigned char *bssid)
+{
+       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]);
+
+       int i = 0;
+       for (;i < 6;i++)
+               network->wifi.bssid[i] = bssid[i];
+
+       return 0;
+}
+
+unsigned char *connman_network_get_bssid(struct connman_network *network)
+{
+       return (unsigned char *)network->wifi.bssid;
+}
+
+int connman_network_set_maxrate(struct connman_network *network,
+                               unsigned int maxrate)
+{
+       DBG("network %p maxrate %d", network, maxrate);
+
+       network->wifi.maxrate = maxrate;
+
+       return 0;
+}
+
+unsigned int connman_network_get_maxrate(struct connman_network *network)
+{
+       return network->wifi.maxrate;
+}
+
+int connman_network_set_enc_mode(struct connman_network *network,
+                               const char *encryption_mode)
+{
+       if (encryption_mode == NULL)
+               return -EINVAL;
+
+       DBG("network %p encryption mode %s", network, encryption_mode);
+
+       g_strlcpy(network->wifi.encryption_mode, encryption_mode, 6);
+
+       return 0;
+}
+
+const char *connman_network_get_enc_mode(struct connman_network *network)
+{
+       return (const char *)network->wifi.encryption_mode;
+}
+
+const char *connman_network_get_ifname(struct connman_network *network)
+{
+       struct connman_service *service;
+       struct connman_ipconfig *ipconfig;
+       const char *ifname = NULL;
+
+       service = __connman_service_lookup_from_network(network);
+       if (service == NULL)
+               return NULL;
+
+       ipconfig = __connman_service_get_ip4config(service);
+
+       if (ipconfig != NULL)
+               ifname = connman_ipconfig_get_ifname(ipconfig);
+
+       DBG("index %d, service %p ip4config %p ifname %s",
+                       network->index, service, ipconfig, ifname);
+       return ifname;
+}
+#endif
+
 int connman_network_set_nameservers(struct connman_network *network,
                                const char *nameservers)
 {
@@ -1753,6 +1668,23 @@ connman_uint16_t connman_network_get_wifi_channel(struct connman_network *networ
 }
 
 /**
+ * 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)
+{
+       DBG("network %p roaming %d", network, roaming);
+
+       network->roaming = roaming;
+
+       return 0;
+}
+
+/**
  * connman_network_set_string:
  * @network: network structure
  * @key: unique identifier
@@ -1882,7 +1814,7 @@ int connman_network_set_bool(struct connman_network *network,
        DBG("network %p key %s value %d", network, key, value);
 
        if (g_strcmp0(key, "Roaming") == 0)
-               network->roaming = value;
+               return connman_network_set_roaming(network, value);
        else if (g_strcmp0(key, "WiFi.WPS") == 0)
                network->wifi.wps = value;
        else if (g_strcmp0(key, "WiFi.UseWPS") == 0)