Fixed various memory leaks

[platform/upstream/connman.git] / gsupplicant / gsupplicant.h

diff --git a/gsupplicant/gsupplicant.h b/gsupplicant/gsupplicant.h
index ad78c29..b0984b8 100755 (executable)
--- a/gsupplicant/gsupplicant.h
+++ b/gsupplicant/gsupplicant.h
@@ -56,8 +56,13 @@ extern "C" {
 #define G_SUPPLICANT_KEYMGMT_WPA_NONE  (1 << 2)
 #define G_SUPPLICANT_KEYMGMT_WPA_PSK   (1 << 3)
 #define G_SUPPLICANT_KEYMGMT_WPA_PSK_256       (1 << 4)
+#if defined TIZEN_EXT
+#define G_SUPPLICANT_KEYMGMT_WPA_FT_EAP        (1 << 5)
+#define G_SUPPLICANT_KEYMGMT_WPA_FT_PSK        (1 << 6)
+#else
 #define G_SUPPLICANT_KEYMGMT_WPA_FT_PSK        (1 << 5)
 #define G_SUPPLICANT_KEYMGMT_WPA_FT_EAP        (1 << 6)
+#endif
 #define G_SUPPLICANT_KEYMGMT_WPA_EAP   (1 << 7)
 #define G_SUPPLICANT_KEYMGMT_WPA_EAP_256       (1 << 8)
 #define G_SUPPLICANT_KEYMGMT_WPS               (1 << 9)
@@ -97,8 +102,21 @@ typedef enum {
        G_SUPPLICANT_SECURITY_WEP,
        G_SUPPLICANT_SECURITY_PSK,
        G_SUPPLICANT_SECURITY_IEEE8021X,
+#if defined TIZEN_EXT
+       G_SUPPLICANT_SECURITY_FT_PSK,
+       G_SUPPLICANT_SECURITY_FT_IEEE8021X,
+#endif
 } GSupplicantSecurity;
 
+#if defined TIZEN_EXT
+typedef enum {
+       G_SUPPLICANT_EAP_KEYMGMT_NONE,
+       G_SUPPLICANT_EAP_KEYMGMT_FT,
+       G_SUPPLICANT_EAP_KEYMGMT_CCKM,
+       G_SUPPLICANT_EAP_KEYMGMT_OKC,
+} GSupplicantEapKeymgmt;
+#endif
+
 typedef enum {
        G_SUPPLICANT_STATE_UNKNOWN,
        G_SUPPLICANT_STATE_DISABLED,
@@ -148,7 +166,12 @@ struct _GSupplicantSSID {
        const char *eap;
        const char *passphrase;
        const char *identity;
+       const char *anonymous_identity;
        const char *ca_cert_path;
+       const char *subject_match;
+       const char *altsubject_match;
+       const char *domain_suffix_match;
+       const char *domain_match;
        const char *client_cert_path;
        const char *private_key_path;
        const char *private_key_passphrase;
@@ -159,6 +182,11 @@ struct _GSupplicantSSID {
        int ignore_broadcast_ssid;
 #if defined TIZEN_EXT
        unsigned char *bssid;
+       unsigned int bssid_for_connect_len;
+       unsigned char bssid_for_connect[6];
+       GSupplicantEapKeymgmt eap_keymgmt;
+       const char *phase1;
+       const char *pac_file;
 #endif
 };
 
@@ -359,10 +387,16 @@ const unsigned char *g_supplicant_network_get_bssid(
                                                GSupplicantNetwork *network);
 unsigned int g_supplicant_network_get_maxrate(GSupplicantNetwork *network);
 const char *g_supplicant_network_get_enc_mode(GSupplicantNetwork *network);
-unsigned int g_supplicant_network_is_hs20AP(GSupplicantNetwork *network);
+bool g_supplicant_network_get_rsn_mode(GSupplicantNetwork *network);
+bool g_supplicant_network_is_hs20AP(GSupplicantNetwork *network);
 const char *g_supplicant_network_get_eap(GSupplicantNetwork *network);
 const char *g_supplicant_network_get_identity(GSupplicantNetwork *network);
 const char *g_supplicant_network_get_phase2(GSupplicantNetwork *network);
+unsigned int g_supplicant_network_get_keymgmt(GSupplicantNetwork *network);
+void *g_supplicant_network_get_wifi_vsie(GSupplicantNetwork *network);
+const unsigned char *g_supplicant_network_get_countrycode(GSupplicantNetwork
+                                                         *network);
+void *g_supplicant_network_get_bssid_list(GSupplicantNetwork *network);
 #endif
 
 struct _GSupplicantCallbacks {
@@ -374,6 +408,7 @@ struct _GSupplicantCallbacks {
        void (*p2p_support) (GSupplicantInterface *interface);
        void (*scan_started) (GSupplicantInterface *interface);
        void (*scan_finished) (GSupplicantInterface *interface);
+       void (*ap_create_fail) (GSupplicantInterface *interface);
        void (*network_added) (GSupplicantNetwork *network);
        void (*network_removed) (GSupplicantNetwork *network);
 #if defined TIZEN_EXT
@@ -381,8 +416,10 @@ struct _GSupplicantCallbacks {
 #endif
        void (*network_changed) (GSupplicantNetwork *network,
                                        const char *property);
+       void (*network_associated) (GSupplicantNetwork *network);
 #if defined TIZEN_EXT
        void (*system_power_off) (void);
+       void (*assoc_failed) (void *user_data);
 #endif
        void (*add_station) (const char *mac);
        void (*remove_station) (const char *mac);
@@ -392,6 +429,10 @@ struct _GSupplicantCallbacks {
                                        GSupplicantPeerState state);
        void (*peer_request) (GSupplicantPeer *peer);
        void (*debug) (const char *str);
+       void (*disconnect_reasoncode)(GSupplicantInterface *interface,
+                               int reasoncode);
+       void (*assoc_status_code)(GSupplicantInterface *interface,
+                               int reasoncode);
 };
 
 typedef struct _GSupplicantCallbacks GSupplicantCallbacks;