X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gsupplicant%2Fgsupplicant.h;h=b0984b8c0b8fb3282da7e77103b5f3063a7a144b;hb=ea06d6f89f3860358c26de964e935c51718489b4;hp=a33dab0ff4811053d1f55bbf2bd45ea3e2078faa;hpb=5b04daf30f54e0728d91a65d71e1dc6a47075a11;p=platform%2Fupstream%2Fconnman.git

diff --git a/gsupplicant/gsupplicant.h b/gsupplicant/gsupplicant.h
index a33dab0..b0984b8 100755
--- a/gsupplicant/gsupplicant.h
+++ b/gsupplicant/gsupplicant.h
@@ -108,6 +108,15 @@ typedef enum {
 #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,
@@ -157,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;
@@ -168,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
 };
 
@@ -291,9 +310,6 @@ int g_supplicant_interface_disconnect(GSupplicantInterface *interface,
 					GSupplicantInterfaceCallback callback,
 							void *user_data);
 
-#if defined TIZEN_EXT
-int g_supplicant_interface_remove_network(GSupplicantInterface *interface);
-#endif
 int g_supplicant_interface_set_apscan(GSupplicantInterface *interface,
 							unsigned int ap_scan);
 
@@ -372,13 +388,15 @@ const unsigned char *g_supplicant_network_get_bssid(
 unsigned int g_supplicant_network_get_maxrate(GSupplicantNetwork *network);
 const char *g_supplicant_network_get_enc_mode(GSupplicantNetwork *network);
 bool g_supplicant_network_get_rsn_mode(GSupplicantNetwork *network);
-unsigned int g_supplicant_network_is_hs20AP(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);
-const void *g_supplicant_network_get_wifi_vsie(GSupplicantNetwork *network,
-						unsigned int *wifi_vsie_len);
+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 {
@@ -390,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
@@ -397,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);
@@ -409,7 +430,7 @@ struct _GSupplicantCallbacks {
 	void (*peer_request) (GSupplicantPeer *peer);
 	void (*debug) (const char *str);
 	void (*disconnect_reasoncode)(GSupplicantInterface *interface,
-								int reasoncode);
+				int reasoncode);
 	void (*assoc_status_code)(GSupplicantInterface *interface,
 				int reasoncode);
 };