Use the default logic when not using INS

1. Use signal strength for bssid sorting
2. Send a signal when service->connect_reason is changed

Change-Id: Ia7b1598f9de34440ae1cad5b773784ca769603e4
Signed-off-by: Jaehyun Kim <jeik01.kim@samsung.com>

2 files changed, 20 insertions, 26 deletions

diff --git a/src/network.c b/src/network.c
index 870749f0..845fa008 100755
--- a/src/network.c
+++ b/src/network.c
@@ -2345,12 +2345,11 @@ int connman_network_set_bssid(struct connman_network *network,
 
 	if (bssid == NULL)
 		return -EINVAL;
-#if defined TIZEN_EXT
+
 	if (!simplified_log)
-#endif
-	DBG("network %p bssid %02x:%02x:%02x:%02x:%02x:%02x", network,
-			bssid[0], bssid[1], bssid[2],
-			bssid[3], bssid[4], bssid[5]);
+		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];
@@ -2439,10 +2438,8 @@ int connman_network_set_enc_mode(struct connman_network *network,
 	if (encryption_mode == NULL)
 		return -EINVAL;
 
-#if defined TIZEN_EXT
 	if (!simplified_log)
-#endif
-	DBG("network %p encryption mode %s", network, encryption_mode);
+		DBG("network %p encryption mode %s", network, encryption_mode);
 
 	g_strlcpy(network->wifi.encryption_mode, encryption_mode,
 					WIFI_ENCYPTION_MODE_LEN_MAX);
@@ -2535,11 +2532,9 @@ int connman_network_set_countrycode(struct connman_network *network,
 	if (country_code == NULL)
 		return -EINVAL;
 
-#if defined TIZEN_EXT
 	if (!simplified_log)
-#endif
-	DBG("network %p Country Code %02x:%02x",network,
-	    country_code[0],country_code[1]);
+		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];
@@ -2564,10 +2559,8 @@ int connman_network_set_bssid_list(struct connman_network *network,
 int connman_network_set_phy_mode(struct connman_network *network,
 				    ieee80211_modes_e mode)
 {
-#if defined TIZEN_EXT
 	if (!simplified_log)
-#endif
-	DBG("network %p phy mode %d", network, mode);
+		DBG("network %p phy mode %d", network, mode);
 	network->wifi.phy_mode = mode;
 
 	return 0;
diff --git a/src/service.c b/src/service.c
index 8ffb254b..6b2b9801 100755
--- a/src/service.c
+++ b/src/service.c
@@ -860,10 +860,8 @@ static int service_ext_load(struct connman_service *service)
 	int i;
 	int err = 0;
 
-#if defined TIZEN_EXT
 	if (!simplified_log)
-#endif
-	DBG("service %p", service);
+		DBG("service %p", service);
 
 	if (!service->network)
 		return -EINVAL;
@@ -3083,17 +3081,19 @@ static void state_changed(struct connman_service *service)
 #endif
 }
 
-#if defined TIZEN_EXT && defined TIZEN_EXT_INS
+#if defined TIZEN_EXT
 static void connect_reason_changed(struct connman_service *service)
 {
+#if defined TIZEN_EXT_INS
 	struct connman_device *device;
-
+#endif
 	if (!service->path)
 		return;
 
 	if (!allow_property_changed(service))
 		return;
 
+#if defined TIZEN_EXT_INS
 	if (service->connect_reason == CONNMAN_SERVICE_CONNECT_REASON_USER) {
 		device = connman_network_get_device(service->network);
 		if (device) {
@@ -3110,12 +3110,13 @@ static void connect_reason_changed(struct connman_service *service)
 				connman_device_save_last_user_selection(device);
 		}
 	}
+#endif
 
 	connman_dbus_property_changed_basic(service->path,
-					    CONNMAN_SERVICE_INTERFACE,
-					    "ConnectReason",
-					    DBUS_TYPE_INT32,
-					    &service->connect_reason);
+					CONNMAN_SERVICE_INTERFACE,
+					"ConnectReason",
+					DBUS_TYPE_INT32,
+					&service->connect_reason);
 }
 #endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
 
@@ -9981,9 +9982,9 @@ int __connman_service_connect(struct connman_service *service,
 	DBG("service %p err %d", service, err);
 
 	service->connect_reason = reason;
-#if defined TIZEN_EXT && defined TIZEN_EXT_INS
+#if defined TIZEN_EXT
 	connect_reason_changed(service);
-#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
+#endif
 
 	if (err >= 0)
 		return 0;