X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2Fconnman.git;a=blobdiff_plain;f=gsupplicant%2Fgsupplicant.h;h=155f8464a90bcd360ecb4649b1d852eacda17865;hp=648ee57210c5674e1b769b9925486319f5560c10;hb=a48fa9fdffe415e9a6f703776b5db795e242ac23;hpb=522b6f5340a56e3431cb5aa82fef864aa45a7a32

diff --git a/gsupplicant/gsupplicant.h b/gsupplicant/gsupplicant.h
old mode 100755
new mode 100644
index 648ee57..155f846
--- a/gsupplicant/gsupplicant.h
+++ b/gsupplicant/gsupplicant.h
@@ -50,6 +50,9 @@ extern "C" {
 #define G_SUPPLICANT_CAPABILITY_MODE_IBSS		(1 << 1)
 #define G_SUPPLICANT_CAPABILITY_MODE_AP		(1 << 2)
 #define G_SUPPLICANT_CAPABILITY_MODE_P2P	(1 << 3)
+#if defined TIZEN_EXT_WIFI_MESH
+#define G_SUPPLICANT_CAPABILITY_MODE_MESH      (1 << 4)
+#endif
 
 #define G_SUPPLICANT_KEYMGMT_NONE		(1 << 0)
 #define G_SUPPLICANT_KEYMGMT_IEEE8021X	(1 << 1)
@@ -66,6 +69,9 @@ extern "C" {
 #define G_SUPPLICANT_KEYMGMT_WPA_EAP	(1 << 7)
 #define G_SUPPLICANT_KEYMGMT_WPA_EAP_256	(1 << 8)
 #define G_SUPPLICANT_KEYMGMT_WPS		(1 << 9)
+#if defined TIZEN_EXT
+#define G_SUPPLICANT_KEYMGMT_SAE		(1 << 10)
+#endif
 
 #define G_SUPPLICANT_PROTO_WPA		(1 << 0)
 #define G_SUPPLICANT_PROTO_RSN		(1 << 1)
@@ -94,8 +100,19 @@ typedef enum {
 	G_SUPPLICANT_MODE_INFRA,
 	G_SUPPLICANT_MODE_IBSS,
 	G_SUPPLICANT_MODE_MASTER,
+#if defined TIZEN_EXT_WIFI_MESH
+	G_SUPPLICANT_MODE_MESH,
+#endif
 } GSupplicantMode;
 
+#if defined TIZEN_EXT_WIFI_MESH
+typedef enum {
+	G_SUPPLICANT_IEEE80211W_UNKNOWN,
+	G_SUPPLICANT_IEEE80211W_OPTIONAL,
+	G_SUPPLICANT_IEEE80211W_REQUIRED,
+} GSupplicantPmf;
+#endif
+
 typedef enum {
 	G_SUPPLICANT_SECURITY_UNKNOWN,
 	G_SUPPLICANT_SECURITY_NONE,
@@ -105,6 +122,7 @@ typedef enum {
 #if defined TIZEN_EXT
 	G_SUPPLICANT_SECURITY_FT_PSK,
 	G_SUPPLICANT_SECURITY_FT_IEEE8021X,
+	G_SUPPLICANT_SECURITY_SAE,
 #endif
 } GSupplicantSecurity;
 
@@ -115,6 +133,16 @@ typedef enum {
 	G_SUPPLICANT_EAP_KEYMGMT_CCKM,
 	G_SUPPLICANT_EAP_KEYMGMT_OKC,
 } GSupplicantEapKeymgmt;
+
+typedef enum {
+	G_SUPPLICANT_MODE_IEEE80211_UNKNOWN,
+	G_SUPPLICANT_MODE_IEEE80211B,
+	G_SUPPLICANT_MODE_IEEE80211BG,
+	G_SUPPLICANT_MODE_IEEE80211BGN,
+	G_SUPPLICANT_MODE_IEEE80211A,
+	G_SUPPLICANT_MODE_IEEE80211AN,
+	G_SUPPLICANT_MODE_IEEE80211ANAC,
+} GSupplicantPhy_mode;
 #endif
 
 typedef enum {
@@ -191,6 +219,7 @@ struct _GSupplicantSSID {
 	GSupplicantEapKeymgmt eap_keymgmt;
 	const char *phase1;
 	const char *pac_file;
+	uint16_t ieee80211w;
 #endif
 };
 
@@ -257,11 +286,19 @@ struct _GSupplicantPeer;
 
 typedef struct _GSupplicantInterface GSupplicantInterface;
 typedef struct _GSupplicantPeer GSupplicantPeer;
+#if defined TIZEN_EXT_WIFI_MESH
+typedef struct _GSupplicantMeshPeer GSupplicantMeshPeer;
+#endif
 
 typedef void (*GSupplicantInterfaceCallback) (int result,
 					GSupplicantInterface *interface,
 							void *user_data);
 
+#if defined TIZEN_EXT
+typedef void (*GSupplicantMaxSpeedCallback) (int result,
+					int maxspeed, void *user_data);
+#endif
+
 void g_supplicant_interface_cancel(GSupplicantInterface *interface);
 
 int g_supplicant_interface_create(const char *ifname, const char *driver,
@@ -276,6 +313,12 @@ int g_supplicant_interface_scan(GSupplicantInterface *interface,
 					GSupplicantInterfaceCallback callback,
 							void *user_data);
 
+#if defined TIZEN_EXT
+int g_supplicant_interface_signalpoll(GSupplicantInterface *interface,
+					GSupplicantMaxSpeedCallback callback,
+					void *user_data);
+#endif
+
 int g_supplicant_interface_p2p_find(GSupplicantInterface *interface,
 					GSupplicantInterfaceCallback callback,
 							void *user_data);
@@ -321,6 +364,9 @@ void g_supplicant_interface_set_data(GSupplicantInterface *interface,
 								void *data);
 void *g_supplicant_interface_get_data(GSupplicantInterface *interface);
 const char *g_supplicant_interface_get_ifname(GSupplicantInterface *interface);
+#if defined TIZEN_EXT
+bool g_supplicant_interface_get_is_5_0_ghz_supported(GSupplicantInterface *interface);
+#endif
 const char *g_supplicant_interface_get_driver(GSupplicantInterface *interface);
 GSupplicantState g_supplicant_interface_get_state(GSupplicantInterface *interface);
 const char *g_supplicant_interface_get_wps_key(GSupplicantInterface *interface);
@@ -346,6 +392,26 @@ GSupplicantPeer *g_supplicant_interface_peer_lookup(GSupplicantInterface *interf
 						const char *identifier);
 bool g_supplicant_interface_is_p2p_finding(GSupplicantInterface *interface);
 
+#if defined TIZEN_EXT_WIFI_MESH
+bool g_supplicant_interface_has_mesh(GSupplicantInterface *interface);
+int g_supplicant_mesh_interface_create(const char *ifname, const char *driver,
+						const char *bridge, const char *parent_ifname,
+						GSupplicantInterfaceCallback callback, void *user_data);
+const void *g_supplicant_interface_get_mesh_group_ssid(
+							GSupplicantInterface *interface,
+							unsigned int *ssid_len);
+int g_supplicant_mesh_get_disconnect_reason(GSupplicantInterface *interface);
+const char *g_supplicant_mesh_peer_get_address(GSupplicantMeshPeer *mesh_peer);
+int g_supplicant_mesh_peer_get_disconnect_reason(
+							GSupplicantMeshPeer *mesh_peer);
+int g_supplicant_interface_abort_scan(GSupplicantInterface *interface,
+				GSupplicantInterfaceCallback callback, void *user_data);
+int g_supplicant_interface_mesh_peer_change_status(
+				GSupplicantInterface *interface,
+				GSupplicantInterfaceCallback callback, const char *peer_address,
+				const char *method, void *user_data);
+#endif
+
 /* Network and Peer API */
 struct _GSupplicantNetwork;
 struct _GSupplicantGroup;
@@ -401,6 +467,7 @@ 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);
+GSupplicantPhy_mode g_supplicant_network_get_phy_mode(GSupplicantNetwork *network);
 #endif
 
 struct _GSupplicantCallbacks {
@@ -437,6 +504,13 @@ struct _GSupplicantCallbacks {
 				int reasoncode);
 	void (*assoc_status_code)(GSupplicantInterface *interface,
 				int reasoncode);
+#if defined TIZEN_EXT_WIFI_MESH
+	void (*mesh_support) (GSupplicantInterface *interface);
+	void (*mesh_group_started) (GSupplicantInterface *interface);
+	void (*mesh_group_removed) (GSupplicantInterface *interface);
+	void (*mesh_peer_connected) (GSupplicantMeshPeer *mesh_peer);
+	void (*mesh_peer_disconnected) (GSupplicantMeshPeer *mesh_peer);
+#endif
 };
 
 typedef struct _GSupplicantCallbacks GSupplicantCallbacks;