X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gsupplicant%2Fgsupplicant.h;h=46d065bf0c548d66d1048d0f337dfd65c9ce967c;hb=45e07ac85c513f438bf4534b4a6abe36f0467248;hp=c6ecf788d5e7c72b8139f23e00059b1102b9d8e4;hpb=01a3b20535f4eb48ee08d37e312e4a69efec005a;p=platform%2Fupstream%2Fconnman.git diff --git a/gsupplicant/gsupplicant.h b/gsupplicant/gsupplicant.h old mode 100644 new mode 100755 index c6ecf78..46d065b --- a/gsupplicant/gsupplicant.h +++ b/gsupplicant/gsupplicant.h @@ -2,7 +2,7 @@ * * WPA supplicant library with GLib integration * - * Copyright (C) 2010 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,18 +49,27 @@ 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) +#define G_SUPPLICANT_PROTO_WPA (1 << 0) +#define G_SUPPLICANT_PROTO_RSN (1 << 1) + #define G_SUPPLICANT_GROUP_WEP40 (1 << 0) #define G_SUPPLICANT_GROUP_WEP104 (1 << 1) #define G_SUPPLICANT_GROUP_TKIP (1 << 2) @@ -70,10 +79,21 @@ extern "C" { #define G_SUPPLICANT_PAIRWISE_TKIP (1 << 1) #define G_SUPPLICANT_PAIRWISE_CCMP (1 << 2) +#define G_SUPPLICANT_WPS_CONFIGURED (1 << 0) +#define G_SUPPLICANT_WPS_PBC (1 << 1) +#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, G_SUPPLICANT_MODE_IBSS, + G_SUPPLICANT_MODE_MASTER, } GSupplicantMode; typedef enum { @@ -82,10 +102,15 @@ 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; typedef enum { G_SUPPLICANT_STATE_UNKNOWN, + G_SUPPLICANT_STATE_DISABLED, G_SUPPLICANT_STATE_DISCONNECTED, G_SUPPLICANT_STATE_INACTIVE, G_SUPPLICANT_STATE_SCANNING, @@ -97,42 +122,171 @@ typedef enum { G_SUPPLICANT_STATE_COMPLETED, } GSupplicantState; +typedef enum { + G_SUPPLICANT_WPS_STATE_UNKNOWN, + G_SUPPLICANT_WPS_STATE_SUCCESS, + 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; + unsigned int scan_ssid; GSupplicantMode mode; GSupplicantSecurity security; + unsigned int protocol; + unsigned int pairwise_cipher; + unsigned int group_cipher; + unsigned int freq; 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; const char *phase2_auth; + dbus_bool_t use_wps; + const char *pin_wps; + const char *bgscan; + int ignore_broadcast_ssid; +#if defined TIZEN_EXT + unsigned char *bssid; +#endif }; typedef struct _GSupplicantSSID GSupplicantSSID; +/* + * Max number of SSIDs that can be scanned. + * In wpa_s 0.7x the limit is 4. + * In wps_s 0.8 or later it is 16. + * The value is only used if wpa_supplicant does not return any max limit + * for number of scannable SSIDs. + */ +#define WPAS_MAX_SCAN_SSIDS 4 + +struct scan_ssid { + unsigned char ssid[32]; + uint8_t ssid_len; +}; + +struct _GSupplicantScanParams { + GSList *ssids; + + 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, + void *user_data); + +int g_supplicant_set_country(const char *alpha2, + GSupplicantCountryCallback callback, + const void *user_data); + /* 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, void *user_data); int g_supplicant_interface_remove(GSupplicantInterface *interface, GSupplicantInterfaceCallback callback, void *user_data); int g_supplicant_interface_scan(GSupplicantInterface *interface, + GSupplicantScanParams *scan_data, 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, @@ -142,17 +296,47 @@ 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); + 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); 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); +const void *g_supplicant_interface_get_wps_ssid(GSupplicantInterface *interface, + unsigned int *ssid_len); +GSupplicantWpsState g_supplicant_interface_get_wps_state(GSupplicantInterface *interface); +unsigned int g_supplicant_interface_get_mode(GSupplicantInterface *interface); +dbus_bool_t g_supplicant_interface_get_ready(GSupplicantInterface *interface); +unsigned int g_supplicant_interface_get_max_scan_ssids( + GSupplicantInterface *interface); -/* Network API */ +int g_supplicant_interface_enable_selected_network(GSupplicantInterface *interface, + dbus_bool_t enable); +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); @@ -163,6 +347,43 @@ const void *g_supplicant_network_get_ssid(GSupplicantNetwork *network, const char *g_supplicant_network_get_mode(GSupplicantNetwork *network); const char *g_supplicant_network_get_security(GSupplicantNetwork *network); dbus_int16_t g_supplicant_network_get_signal(GSupplicantNetwork *network); +dbus_uint16_t g_supplicant_network_get_frequency(GSupplicantNetwork *network); +dbus_bool_t g_supplicant_network_get_wps(GSupplicantNetwork *network); +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); +#endif struct _GSupplicantCallbacks { void (*system_ready) (void); @@ -170,11 +391,34 @@ struct _GSupplicantCallbacks { 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; @@ -182,6 +426,14 @@ typedef struct _GSupplicantCallbacks GSupplicantCallbacks; int g_supplicant_register(const GSupplicantCallbacks *callbacks); void g_supplicant_unregister(const GSupplicantCallbacks *callbacks); +static inline +void g_supplicant_free_scan_params(GSupplicantScanParams *scan_params) +{ + g_slist_free_full(scan_params->ssids, g_free); + g_free(scan_params->freqs); + g_free(scan_params); +} + #ifdef __cplusplus } #endif