Modify to get rsn mode using pairwise

[platform/upstream/connman.git] / src / network.c

diff --git a/src/network.c b/src/network.c
index f67dbb6..d20385f 100755 (executable)
--- a/src/network.c
+++ b/src/network.c
@@ -99,7 +99,8 @@ struct connman_network {
                unsigned int isHS20AP;
                unsigned int keymgmt;
                char *keymgmt_type;
-               bool rsn_selected;
+               bool rsn_mode;
+               int disconnect_reason;
 #endif
        } wifi;
 
@@ -1203,6 +1204,15 @@ bool __connman_network_get_weakness(struct connman_network *network)
        return false;
 }
 
+#if defined TIZEN_EXT
+void connman_network_set_connecting(struct connman_network *network)
+{
+       DBG("set network connecting true");
+       network->connecting = TRUE;
+       return;
+}
+#endif
+
 bool connman_network_get_connecting(struct connman_network *network)
 {
        return network->connecting;
@@ -1367,8 +1377,13 @@ static void set_associate_error(struct connman_network *network)
 
        service = connman_service_lookup_from_network(network);
 
+#if defined TIZEN_EXT
+       __connman_service_indicate_error(service,
+                                       CONNMAN_SERVICE_ERROR_AUTH_FAILED);
+#else
        __connman_service_indicate_error(service,
                                        CONNMAN_SERVICE_ERROR_CONNECT_FAILED);
+#endif
 }
 
 static void set_configure_error(struct connman_network *network)
@@ -1898,10 +1913,10 @@ const char *connman_network_get_enc_mode(struct connman_network *network)
        return (const char *)network->wifi.encryption_mode;
 }
 
-int connman_network_set_rsn_selected(struct connman_network *network,
-                               bool rsn_selected)
+int connman_network_set_rsn_mode(struct connman_network *network,
+                               bool rsn_mode)
 {
-       network->wifi.rsn_selected = rsn_selected;
+       network->wifi.rsn_mode = rsn_mode;
 
        return 0;
 }
@@ -1962,6 +1977,25 @@ unsigned int connman_network_get_keymgmt(struct connman_network *network)
 
        return network->wifi.keymgmt;
 }
+
+int connman_network_set_disconnect_reason(struct connman_network *network,
+                               int reason_code)
+{
+       if (network == NULL)
+               return 0;
+
+       network->wifi.disconnect_reason = reason_code;
+
+       return 0;
+}
+
+int connman_network_get_disconnect_reason(struct connman_network *network)
+{
+       if (network == NULL)
+               return 0;
+
+       return network->wifi.disconnect_reason;
+}
 #endif
 
 int connman_network_set_nameservers(struct connman_network *network,
@@ -2176,7 +2210,7 @@ const char *connman_network_get_string(struct connman_network *network,
                return network->wifi.mode;
        else if (g_str_equal(key, "WiFi.Security"))
 #if defined TIZEN_EXT
-               if (network->wifi.rsn_selected != true ||
+               if (network->wifi.rsn_mode != true ||
                    g_str_equal(network->wifi.security, "ieee8021x"))
                        return network->wifi.security;
                else