X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fnetwork.c;h=b1643e72f701e068d9d798b31439d3ee83c7b418;hb=a0f49e57059d59d8b3124554a16238c968f158c7;hp=845fa008c5159cac19f4ea90b695086bb6cba177;hpb=17c2dfb865433db2e64f1e64fcd5fac7cb445c23;p=platform%2Fupstream%2Fconnman.git

diff --git a/src/network.c b/src/network.c
index 845fa00..b1643e7 100755
--- a/src/network.c
+++ b/src/network.c
@@ -131,6 +131,7 @@ 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;
@@ -144,6 +145,10 @@ struct connman_network {
 		void *transition_mode_ssid;
 		int transition_mode_ssid_len;
 		unsigned char transition_mode_bssid[WIFI_BSSID_LEN_MAX];
+		bool roaming_progress;
+		char *roaming_cur_bssid;
+		char *roaming_dst_bssid;
+		int snr;
 #endif
 	} wifi;
 
@@ -2346,6 +2351,9 @@ int connman_network_set_bssid(struct connman_network *network,
 	if (bssid == NULL)
 		return -EINVAL;
 
+	if (network->connected)
+		return -EPERM;
+
 	if (!simplified_log)
 		DBG("network %p bssid %02x:%02x:%02x:%02x:%02x:%02x", network,
 				bssid[0], bssid[1], bssid[2],
@@ -2415,6 +2423,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)
 {
@@ -2628,6 +2650,16 @@ GHashTable *connman_network_get_assoc_reject_table(struct connman_network *netwo
 
 	return network->wifi.assoc_reject_table;
 }
+
+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,
@@ -2837,6 +2869,12 @@ int connman_network_set_string(struct connman_network *network,
 	} 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;
@@ -2864,15 +2902,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"))
@@ -2910,6 +2940,10 @@ const char *connman_network_get_string(struct connman_network *network,
 		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;
@@ -2941,6 +2975,9 @@ int connman_network_set_bool(struct connman_network *network,
 		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;
+	}
 #endif
 
 	return -EINVAL;
@@ -2969,8 +3006,10 @@ 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_strcmp0(key, "WiFi.TRANSITION_MODE"))
+	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;
 #endif
 
 	return false;