X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=gsupplicant%2Fgsupplicant.h;h=b0984b8c0b8fb3282da7e77103b5f3063a7a144b;hb=ea06d6f89f3860358c26de964e935c51718489b4;hp=0f586a1192a62edc93f8841c0ab8447a80eb3f4d;hpb=c1f3036eeabe20903d077f5e0069d644d93d5bfd;p=platform%2Fupstream%2Fconnman.git diff --git a/gsupplicant/gsupplicant.h b/gsupplicant/gsupplicant.h old mode 100644 new mode 100755 index 0f586a1..b0984b8 --- a/gsupplicant/gsupplicant.h +++ b/gsupplicant/gsupplicant.h @@ -2,7 +2,7 @@ * * WPA supplicant library with GLib integration * - * Copyright (C) 2012 Intel Corporation. All rights reserved. + * Copyright (C) 2012-2013 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -49,14 +49,20 @@ extern "C" { #define G_SUPPLICANT_CAPABILITY_MODE_INFRA (1 << 0) #define G_SUPPLICANT_CAPABILITY_MODE_IBSS (1 << 1) #define G_SUPPLICANT_CAPABILITY_MODE_AP (1 << 2) +#define G_SUPPLICANT_CAPABILITY_MODE_P2P (1 << 3) #define G_SUPPLICANT_KEYMGMT_NONE (1 << 0) #define G_SUPPLICANT_KEYMGMT_IEEE8021X (1 << 1) #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) @@ -78,6 +84,11 @@ extern "C" { #define G_SUPPLICANT_WPS_PIN (1 << 2) #define G_SUPPLICANT_WPS_REGISTRAR (1 << 3) +#define G_SUPPLICANT_WPS_CONFIG_PBC 0x0080 + +#define G_SUPPLICANT_GROUP_ROLE_CLIENT (1 << 0) +#define G_SUPPLICANT_GROUP_ROLE_GO (1 << 1) + typedef enum { G_SUPPLICANT_MODE_UNKNOWN, G_SUPPLICANT_MODE_INFRA, @@ -91,10 +102,24 @@ 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, G_SUPPLICANT_STATE_DISCONNECTED, G_SUPPLICANT_STATE_INACTIVE, G_SUPPLICANT_STATE_SCANNING, @@ -112,6 +137,22 @@ typedef enum { G_SUPPLICANT_WPS_STATE_FAIL, } GSupplicantWpsState; +typedef enum { + G_SUPPLICANT_PEER_SERVICES_CHANGED, + G_SUPPLICANT_PEER_GROUP_CHANGED, + G_SUPPLICANT_PEER_GROUP_STARTED, + G_SUPPLICANT_PEER_GROUP_FINISHED, + G_SUPPLICANT_PEER_GROUP_JOINED, + G_SUPPLICANT_PEER_GROUP_DISCONNECTED, + G_SUPPLICANT_PEER_GROUP_FAILED, +} GSupplicantPeerState; + +enum GSupplicantAPHiddenSSID { + G_SUPPLICANT_AP_NO_SSID_HIDING, + G_SUPPLICANT_AP_HIDDEN_SSID_ZERO_LEN, + G_SUPPLICANT_AP_HIDDEN_SSID_ZERO_CONTENTS, +}; + struct _GSupplicantSSID { const void *ssid; unsigned int ssid_len; @@ -125,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; @@ -133,6 +179,15 @@ struct _GSupplicantSSID { dbus_bool_t use_wps; const char *pin_wps; const char *bgscan; + 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 }; typedef struct _GSupplicantSSID GSupplicantSSID; @@ -156,11 +211,33 @@ struct _GSupplicantScanParams { uint8_t num_ssids; + uint8_t num_freqs; uint16_t *freqs; }; typedef struct _GSupplicantScanParams GSupplicantScanParams; +struct _GSupplicantPeerParams { + bool master; + char *wps_pin; + char *path; +}; + +typedef struct _GSupplicantPeerParams GSupplicantPeerParams; + +struct _GSupplicantP2PServiceParams { + int version; + char *service; + unsigned char *query; + int query_length; + unsigned char *response; + int response_length; + unsigned char *wfd_ies; + int wfd_ies_length; +}; + +typedef struct _GSupplicantP2PServiceParams GSupplicantP2PServiceParams; + /* global API */ typedef void (*GSupplicantCountryCallback) (int result, const char *alpha2, @@ -172,13 +249,17 @@ int g_supplicant_set_country(const char *alpha2, /* Interface API */ struct _GSupplicantInterface; +struct _GSupplicantPeer; typedef struct _GSupplicantInterface GSupplicantInterface; +typedef struct _GSupplicantPeer GSupplicantPeer; typedef void (*GSupplicantInterfaceCallback) (int result, GSupplicantInterface *interface, void *user_data); +void g_supplicant_interface_cancel(GSupplicantInterface *interface); + int g_supplicant_interface_create(const char *ifname, const char *driver, const char *bridge, GSupplicantInterfaceCallback callback, @@ -191,6 +272,35 @@ int g_supplicant_interface_scan(GSupplicantInterface *interface, GSupplicantInterfaceCallback callback, void *user_data); +int g_supplicant_interface_p2p_find(GSupplicantInterface *interface, + GSupplicantInterfaceCallback callback, + void *user_data); + +int g_supplicant_interface_p2p_stop_find(GSupplicantInterface *interface); + +int g_supplicant_interface_p2p_connect(GSupplicantInterface *interface, + GSupplicantPeerParams *peer_params, + GSupplicantInterfaceCallback callback, + void *user_data); + +int g_supplicant_interface_p2p_disconnect(GSupplicantInterface *interface, + GSupplicantPeerParams *peer_params); + +int g_supplicant_interface_p2p_listen(GSupplicantInterface *interface, + int period, int interval); + +int g_supplicant_interface_p2p_add_service(GSupplicantInterface *interface, + GSupplicantInterfaceCallback callback, + GSupplicantP2PServiceParams *p2p_service_params, + void *user_data); + +int g_supplicant_interface_p2p_del_service(GSupplicantInterface *interface, + GSupplicantP2PServiceParams *p2p_service_params); + +int g_supplicant_set_widi_ies(GSupplicantP2PServiceParams *p2p_service_params, + GSupplicantInterfaceCallback callback, + void *user_data); + int g_supplicant_interface_connect(GSupplicantInterface *interface, GSupplicantSSID *ssid, GSupplicantInterfaceCallback callback, @@ -220,11 +330,24 @@ unsigned int g_supplicant_interface_get_max_scan_ssids( int g_supplicant_interface_enable_selected_network(GSupplicantInterface *interface, dbus_bool_t enable); - -/* Network API */ +int g_supplicant_interface_set_country(GSupplicantInterface *interface, + GSupplicantCountryCallback callback, + const char *alpha2, + void *user_data); +bool g_supplicant_interface_has_p2p(GSupplicantInterface *interface); +int g_supplicant_interface_set_p2p_device_config(GSupplicantInterface *interface, + const char *device_name, + const char *primary_dev_type); +GSupplicantPeer *g_supplicant_interface_peer_lookup(GSupplicantInterface *interface, + const char *identifier); +bool g_supplicant_interface_is_p2p_finding(GSupplicantInterface *interface); + +/* Network and Peer API */ struct _GSupplicantNetwork; +struct _GSupplicantGroup; typedef struct _GSupplicantNetwork GSupplicantNetwork; +typedef struct _GSupplicantGroup GSupplicantGroup; GSupplicantInterface *g_supplicant_network_get_interface(GSupplicantNetwork *network); const char *g_supplicant_network_get_name(GSupplicantNetwork *network); @@ -241,19 +364,75 @@ dbus_bool_t g_supplicant_network_is_wps_active(GSupplicantNetwork *network); dbus_bool_t g_supplicant_network_is_wps_pbc(GSupplicantNetwork *network); dbus_bool_t g_supplicant_network_is_wps_advertizing(GSupplicantNetwork *network); +GSupplicantInterface *g_supplicant_peer_get_interface(GSupplicantPeer *peer); +const char *g_supplicant_peer_get_path(GSupplicantPeer *peer); +const char *g_supplicant_peer_get_identifier(GSupplicantPeer *peer); +const void *g_supplicant_peer_get_device_address(GSupplicantPeer *peer); +const void *g_supplicant_peer_get_iface_address(GSupplicantPeer *peer); +const char *g_supplicant_peer_get_name(GSupplicantPeer *peer); +const unsigned char *g_supplicant_peer_get_widi_ies(GSupplicantPeer *peer, + int *length); +bool g_supplicant_peer_is_wps_pbc(GSupplicantPeer *peer); +bool g_supplicant_peer_is_wps_pin(GSupplicantPeer *peer); +bool g_supplicant_peer_is_in_a_group(GSupplicantPeer *peer); +GSupplicantInterface *g_supplicant_peer_get_group_interface(GSupplicantPeer *peer); +bool g_supplicant_peer_is_client(GSupplicantPeer *peer); +bool g_supplicant_peer_has_requested_connection(GSupplicantPeer *peer); + +#if defined TIZEN_EXT +/* +* Description: Network client requires additional wifi specific info +*/ +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); +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 { void (*system_ready) (void); void (*system_killed) (void); void (*interface_added) (GSupplicantInterface *interface); void (*interface_state) (GSupplicantInterface *interface); void (*interface_removed) (GSupplicantInterface *interface); + 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 + void (*network_merged) (GSupplicantNetwork *network); +#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); + void (*peer_found) (GSupplicantPeer *peer); + void (*peer_lost) (GSupplicantPeer *peer); + void (*peer_changed) (GSupplicantPeer *peer, + 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;