Merge "supported OWE Transition mode" into tizen

diff --combined plugins/wifi.c
index 1610211,0b75c77..7f26417
--- 1/plugins/wifi.c
--- 2/plugins/wifi.c
+++ b/plugins/wifi.c
@@@ -2395,18 -2395,6 +2395,18 @@@ static void setup_autoscan(struct wifi_
                wifi->autoscan = parse_autoscan_params(AUTOSCAN_EXPONENTIAL);
                return;
        }
 +#if defined TIZEN_EXT
 +      else {
 +              if (wifi->autoscan) {
 +                      g_free(wifi->autoscan);
 +                      wifi->autoscan = NULL;
 +              }
 +
 +              DBG("BackgroundScanning is disabled");
 +
 +              return;
 +      }
 +#endif
  
        /*
         * On the contrary, if BackgroundScanning is disabled, update autoscan
@@@ -3613,6 -3601,8 +3613,8 @@@ done
  
        if(g_strcmp0(ssid->eap, "fast") == 0)
                ssid->pac_file = g_strdup(WIFI_EAP_FAST_PAC_FILE);
+ 
+       ssid->keymgmt = connman_network_get_keymgmt(network);
  #endif
  
        if (connman_setting_get_bool("BackgroundScanning"))
@@@ -4796,6 -4786,10 +4798,10 @@@ static void network_added(GSupplicantNe
        bool wps_advertizing;
  
  #if defined TIZEN_EXT
+       bool owe_transition_mode;
+       const unsigned char *transition_mode_ssid;
+       const unsigned char *transition_mode_bssid;
+       unsigned int transition_mode_ssid_len;
        GSList *vsie_list = NULL;
        const unsigned char *country_code;
        ieee80211_modes_e phy_mode;
@@@ -4900,6 -4894,15 +4906,15 @@@
  #if defined TIZEN_EXT
        connman_network_set_bssid(network,
                        g_supplicant_network_get_bssid(supplicant_network));
+       owe_transition_mode = (bool)g_supplicant_network_get_transition_mode(supplicant_network);
+       connman_network_set_bool(network, "WiFi.TRANSITION_MODE", owe_transition_mode);
+       if (owe_transition_mode) {
+               transition_mode_ssid = (unsigned char *)g_supplicant_network_get_transition_mode_ssid(supplicant_network, &transition_mode_ssid_len);
+               connman_network_set_blob(network, "WiFi.TRANSITION_MODE_SSID",
+                                                       transition_mode_ssid, transition_mode_ssid_len);
+               transition_mode_bssid = g_supplicant_network_get_transition_mode_bssid(supplicant_network);
+               connman_network_set_transition_mode_bssid(network, transition_mode_bssid);
+       }
        connman_network_set_maxrate(network,
                        g_supplicant_network_get_maxrate(supplicant_network));
        connman_network_set_enc_mode(network,
@@@ -5186,7 -5189,22 +5201,22 @@@ static void network_associated(GSupplic
        if (wifi->network) {
                if (wifi->network == connman_network)
                        return;
- 
+ #if TIZEN_EXT
+               unsigned int ssid_len;
+               DBG("network1 ssid[%s] , OWE[%d],ssid[%s]",
+                       (char *)connman_network_get_blob(wifi->network,"WiFi.SSID", &ssid_len),
+                       connman_network_get_bool(wifi->network,"WiFi.TRANSITION_MODE"),
+                       (char *)connman_network_get_blob(wifi->network,"WiFi.TRANSITION_MODE_SSID", &ssid_len));
+ 
+               DBG("network1 ssid[%s], OWE[%d], ssid[%s]",
+                       (char *)connman_network_get_blob(connman_network,"WiFi.SSID",&ssid_len),
+                       connman_network_get_bool(connman_network,"WiFi.TRANSITION_MODE"),
+                       (char *)connman_network_get_blob(connman_network,"WiFi.TRANSITION_MODE_SSID", &ssid_len));
+               if (connman_network_check_transition_mode(wifi->network, connman_network)) {//OWE trasition mode check
+                       DBG("OWE transition mode is TRUE");
+                       return;
+               }
+ #endif
                /*
                 * This should never happen, we got associated with
                 * a network different than the one we were expecting.