Fixed precondition check for the ethernet network

Change-Id: I1a02f3f0af05d4e2bde2697d570cf80b2ed3ee84
Signed-off-by: Seonah Moon <seonah1.moon@samsung.com>

diff --git a/packaging/capi-network-tethering.spec b/packaging/capi-network-tethering.spec
index 4ebf191..fdf00c4 100644 (file)
--- a/packaging/capi-network-tethering.spec
+++ b/packaging/capi-network-tethering.spec
@@ -1,6 +1,6 @@
 Name:          capi-network-tethering
 Summary:       Tethering Framework
-Version:       1.0.51
+Version:       1.0.52
 Release:       1
 Group:         System/Network
 License:       Apache-2.0
@@ -34,15 +34,9 @@ Development package for Tethering framework library
 
 
 %build
-%if "%{TIZEN_PROFILE_TV}" == "1"
-export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE -DTIZEN_TV_EXT"
-export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE -DTIZEN_TV_EXT"
-export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE -DTIZEN_TV_EXT"
-%else
 export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE"
 export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
 export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
-%endif
 
 %cmake .
 

diff --git a/src/tethering.c b/src/tethering.c
index 7d93058..422ac1e 100755 (executable)
--- a/src/tethering.c
+++ b/src/tethering.c
@@ -1377,9 +1377,8 @@ static int __prepare_wifi_settings(tethering_h tethering, _softap_settings_t *se
 
 static bool __check_precondition(tethering_type_e type)
 {
-       int dnet_state = 0;
+       int dnet_status = 0;
        int cellular_state = 0;
-       int wifi_state = 0;
 
        /* data network through cellular */
        vconf_get_int(VCONFKEY_NETWORK_CELLULAR_STATE, &cellular_state);
@@ -1388,35 +1387,14 @@ static bool __check_precondition(tethering_type_e type)
                return TRUE;
        }
 
-#ifdef TIZEN_TV_EXT
-       /* data network through ethernet */
-       vconf_get_int(VCONFKEY_NETWORK_STATUS, &dnet_state);
-       if (dnet_state == VCONFKEY_NETWORK_ETHERNET) {
-               INFO("Data Network is connected");
+       /* data network status */
+       vconf_get_int(VCONFKEY_NETWORK_STATUS, &dnet_status);
+       if ((dnet_status == VCONFKEY_NETWORK_WIFI
+                       && type != TETHERING_TYPE_WIFI)
+               || dnet_status == VCONFKEY_NETWORK_ETHERNET)
                return TRUE;
-       }
-#else
-       //LCOV_EXCL_LINE
-       vconf_get_int(VCONFKEY_DNET_STATE, &dnet_state);
-       if (dnet_state > VCONFKEY_DNET_OFF) {
-               INFO("Data Network is connected");
-               return TRUE;
-       }
-       //LCOV_EXCL_STOP
-#endif/*TIZEN_TV_EXT*/
-
-       //LCOV_EXCL_START
-       /* data network through wifi */
-       if (type != TETHERING_TYPE_WIFI) {
-               vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state);
-               if (wifi_state > VCONFKEY_WIFI_UNCONNECTED) {
-                       INFO("Wi-Fi is connected!");
-                       return TRUE;
-               }
-       }
 
        ERR("Network is not available!");
-       //LCOV_EXCL_STOP
        return FALSE;
 }