X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=wpa_supplicant%2Fwpa_supplicant_i.h;h=66f544e3a966e22fcf863f9f958995df5fee678b;hb=HEAD;hp=74838c95670764209695ee10c39d8f619e9d73d1;hpb=2d5b792d2b7e8940bd860348443b1e579c14c53a;p=libeap.git diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h index 74838c9..66f544e 100644 --- a/wpa_supplicant/wpa_supplicant_i.h +++ b/wpa_supplicant/wpa_supplicant_i.h @@ -1,6 +1,6 @@ /* * wpa_supplicant - Internal definitions - * Copyright (c) 2003-2007, Jouni Malinen + * Copyright (c) 2003-2010, Jouni Malinen * * 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 @@ -15,6 +15,7 @@ #ifndef WPA_SUPPLICANT_I_H #define WPA_SUPPLICANT_I_H +#include "utils/list.h" #include "common/defs.h" extern const char *wpa_supplicant_version; @@ -27,11 +28,12 @@ extern const char *wpa_supplicant_full_license4; extern const char *wpa_supplicant_full_license5; #endif /* CONFIG_NO_STDOUT_DEBUG */ -struct wpa_scan_result; -struct wpa_scan_res; struct wpa_sm; struct wpa_supplicant; struct ibss_rsn; +struct scan_info; +struct wpa_bss; +struct wpa_scan_results; /* * Forward declarations of private structures used within the ctrl_iface @@ -40,7 +42,7 @@ struct ibss_rsn; */ struct ctrl_iface_priv; struct ctrl_iface_global_priv; -struct ctrl_iface_dbus_priv; +struct wpas_dbus_priv; /** * struct wpa_interface - Parameters for wpa_supplicant_add_iface() @@ -160,6 +162,36 @@ struct wpa_params { * wpa_debug_syslog - Enable log output through syslog */ int wpa_debug_syslog; + + /** + * override_driver - Optional driver parameter override + * + * This parameter can be used to override the driver parameter in + * dynamic interface addition to force a specific driver wrapper to be + * used instead. + */ + char *override_driver; + + /** + * override_ctrl_interface - Optional ctrl_interface override + * + * This parameter can be used to override the ctrl_interface parameter + * in dynamic interface addition to force a control interface to be + * created. + */ + char *override_ctrl_interface; +}; + +struct p2p_srv_bonjour { + struct dl_list list; + struct wpabuf *query; + struct wpabuf *resp; +}; + +struct p2p_srv_upnp { + struct dl_list list; + u8 version; + char *service; }; /** @@ -172,9 +204,17 @@ struct wpa_global { struct wpa_supplicant *ifaces; struct wpa_params params; struct ctrl_iface_global_priv *ctrl_iface; - struct ctrl_iface_dbus_priv *dbus_ctrl_iface; + struct wpas_dbus_priv *dbus; void **drv_priv; size_t drv_count; + struct os_time suspend_time; + struct p2p_data *p2p; + struct wpa_supplicant *p2p_group_formation; + u8 p2p_dev_addr[ETH_ALEN]; + struct dl_list p2p_srv_bonjour; /* struct p2p_srv_bonjour */ + struct dl_list p2p_srv_upnp; /* struct p2p_srv_upnp */ + int p2p_disabled; + int cross_connection; }; @@ -194,7 +234,7 @@ struct wpa_client_mlme { size_t extra_ie_len; u8 *extra_probe_ie; /* to be added to the end of ProbeReq */ size_t extra_probe_ie_len; - wpa_key_mgmt key_mgmt; + enum wpa_key_mgmt key_mgmt; /* The last AssocReq/Resp IEs */ u8 *assocreq_ies, *assocresp_ies; @@ -215,10 +255,8 @@ struct wpa_client_mlme { struct os_time last_probe; -#define IEEE80211_AUTH_ALG_OPEN BIT(0) -#define IEEE80211_AUTH_ALG_SHARED_KEY BIT(1) -#define IEEE80211_AUTH_ALG_LEAP BIT(2) - unsigned int auth_algs; /* bitfield of allowed auth algs */ + unsigned int auth_algs; /* bitfield of allowed auth algs + * (WPA_AUTH_ALG_*) */ int auth_alg; /* currently used IEEE 802.11 authentication algorithm */ int auth_transaction; @@ -240,6 +278,7 @@ struct wpa_client_mlme { u8 scan_ssid[32]; size_t scan_ssid_len; int scan_skip_11b; + int *scan_freqs; struct ieee80211_sta_bss *sta_bss_list; #define STA_HASH_SIZE 256 @@ -248,13 +287,13 @@ struct wpa_client_mlme { int cts_protect_erp_frames; - int phymode; /* current mode; WPA_MODE_IEEE80211A, .. */ - struct wpa_hw_modes *modes; + enum hostapd_hw_mode phymode; /* current mode */ + struct hostapd_hw_modes *modes; size_t num_modes; unsigned int hw_modes; /* bitfield of allowed hardware modes; - * (1 << MODE_*) */ + * (1 << HOSTAPD_MODE_*) */ int num_curr_rates; - struct wpa_rate_data *curr_rates; + int *curr_rates; int freq; /* The current frequency in MHz */ int channel; /* The current IEEE 802.11 channel number */ @@ -264,6 +303,10 @@ struct wpa_client_mlme { size_t ft_ies_len; #endif /* CONFIG_IEEE80211R */ + void (*public_action_cb)(void *ctx, const u8 *buf, size_t len, + int freq); + void *public_action_cb_ctx; + #else /* CONFIG_CLIENT_MLME */ int dummy; /* to keep MSVC happy */ #endif /* CONFIG_CLIENT_MLME */ @@ -279,6 +322,7 @@ struct wpa_client_mlme { */ struct wpa_supplicant { struct wpa_global *global; + struct wpa_supplicant *parent; struct wpa_supplicant *next; struct l2_packet_data *l2; struct l2_packet_data *l2_br; @@ -287,6 +331,9 @@ struct wpa_supplicant { #ifdef CONFIG_CTRL_IFACE_DBUS char *dbus_path; #endif /* CONFIG_CTRL_IFACE_DBUS */ +#ifdef CONFIG_CTRL_IFACE_DBUS_NEW + char *dbus_new_path; +#endif /* CONFIG_CTRL_IFACE_DBUS_NEW */ char bridge_ifname[16]; char *confname; @@ -300,7 +347,9 @@ struct wpa_supplicant { int disconnected; /* all connections disabled; i.e., do no reassociate * before this has been cleared */ struct wpa_ssid *current_ssid; + struct wpa_bss *current_bss; int ap_ies_from_associnfo; + unsigned int assoc_freq; /* Selected configuration (based on Beacon/ProbeResp WPA IE) */ int pairwise_cipher; @@ -309,6 +358,7 @@ struct wpa_supplicant { int mgmt_group_cipher; void *drv_priv; /* private data used by driver_ops */ + void *global_drv_priv; struct wpa_ssid *prev_scan_ssid; /* previously scanned SSID; * NULL = not yet initialized (start @@ -318,7 +368,13 @@ struct wpa_supplicant { */ #define WILDCARD_SSID_SCAN ((struct wpa_ssid *) 1) - struct wpa_scan_results *scan_res; + void (*scan_res_handler)(struct wpa_supplicant *wpa_s, + struct wpa_scan_results *scan_res); + struct dl_list bss; /* struct wpa_bss::list */ + struct dl_list bss_id; /* struct wpa_bss::list_id */ + size_t num_bss; + unsigned int bss_update_idx; + unsigned int bss_next_id; struct wpa_driver_ops *driver; int interface_removed; /* whether the network interface has been @@ -328,7 +384,8 @@ struct wpa_supplicant { struct ctrl_iface_priv *ctrl_iface; - wpa_states wpa_state; + enum wpa_states wpa_state; + int scanning; int new_connection; int reassociated_connection; @@ -345,15 +402,13 @@ struct wpa_supplicant { int scan_req; /* manual scan request; this forces a scan even if there * are no enabled networks in the configuration */ - int scan_res_tried; /* whether ap_scan=1 mode has tried to fetch scan - * results without a new scan request; this is used - * to speed up the first association if the driver - * has already available scan results. */ int scan_runs; /* number of scan runs since WPS was started */ struct wpa_client_mlme mlme; unsigned int drv_flags; int max_scan_ssids; + unsigned int max_remain_on_chan; + unsigned int max_stations; int pending_mic_error_report; int pending_mic_error_pairwise; @@ -361,51 +416,140 @@ struct wpa_supplicant { struct wps_context *wps; int wps_success; /* WPS success event received */ + struct wps_er *wps_er; int blacklist_cleared; + struct wpabuf *pending_eapol_rx; + struct os_time pending_eapol_rx_time; + u8 pending_eapol_rx_src[ETH_ALEN]; + struct ibss_rsn *ibss_rsn; + int set_sta_uapsd; + int sta_uapsd; + int set_ap_uapsd; + int ap_uapsd; + #ifdef CONFIG_SME struct { u8 ssid[32]; size_t ssid_len; int freq; - u8 assoc_req_ie[80]; + u8 assoc_req_ie[200]; size_t assoc_req_ie_len; int mfp; int ft_used; u8 mobility_domain[2]; u8 *ft_ies; size_t ft_ies_len; + u8 prev_bssid[ETH_ALEN]; + int prev_bssid_set; + int auth_alg; } sme; #endif /* CONFIG_SME */ #ifdef CONFIG_AP struct hostapd_iface *ap_iface; + void (*ap_configured_cb)(void *ctx, void *data); + void *ap_configured_cb_ctx; + void *ap_configured_cb_data; #endif /* CONFIG_AP */ + +#ifdef CONFIG_P2P + struct p2p_go_neg_results *go_params; + int create_p2p_iface; + u8 pending_interface_addr[ETH_ALEN]; + char pending_interface_name[IFNAMSIZ]; + int pending_interface_type; + int p2p_group_idx; + unsigned int off_channel_freq; + struct wpabuf *pending_action_tx; + u8 pending_action_src[ETH_ALEN]; + u8 pending_action_dst[ETH_ALEN]; + u8 pending_action_bssid[ETH_ALEN]; + unsigned int pending_action_freq; + int pending_action_without_roc; + unsigned int pending_listen_freq; + unsigned int pending_listen_duration; + enum { + NOT_P2P_GROUP_INTERFACE, + P2P_GROUP_INTERFACE_PENDING, + P2P_GROUP_INTERFACE_GO, + P2P_GROUP_INTERFACE_CLIENT + } p2p_group_interface; + struct p2p_group *p2p_group; + int p2p_long_listen; + char p2p_pin[10]; + int p2p_wps_method; + u8 p2p_auth_invite[ETH_ALEN]; + int p2p_sd_over_ctrl_iface; + int p2p_in_provisioning; + int pending_invite_ssid_id; + int show_group_started; + u8 go_dev_addr[ETH_ALEN]; + int pending_pd_before_join; + u8 pending_join_iface_addr[ETH_ALEN]; + u8 pending_join_dev_addr[ETH_ALEN]; + int pending_join_wps_method; + unsigned int roc_waiting_drv_freq; + int force_long_sd; + + /* + * Whether cross connection is disallowed by the AP to which this + * interface is associated (only valid if there is an association). + */ + int cross_connect_disallowed; + + /* + * Whether this P2P group is configured to use cross connection (only + * valid if this is P2P GO interface). The actual cross connect packet + * forwarding may not be configured depending on the uplink status. + */ + int cross_connect_enabled; + + /* Whether cross connection forwarding is in use at the moment. */ + int cross_connect_in_use; + + /* + * Uplink interface name for cross connection + */ + char cross_connect_uplink[100]; +#endif /* CONFIG_P2P */ + + struct wpa_ssid *bgscan_ssid; + const struct bgscan_ops *bgscan; + void *bgscan_priv; + + int connect_without_scan; + + int after_wps; + unsigned int wps_freq; + int wps_fragment_size; + int auto_reconnect_disabled; }; /* wpa_supplicant.c */ +int wpa_set_wep_keys(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid); + int wpa_supplicant_reload_configuration(struct wpa_supplicant *wpa_s); -const char * wpa_supplicant_state_txt(int state); +const char * wpa_supplicant_state_txt(enum wpa_states state); int wpa_supplicant_driver_init(struct wpa_supplicant *wpa_s); int wpa_supplicant_set_suites(struct wpa_supplicant *wpa_s, - struct wpa_scan_res *bss, - struct wpa_ssid *ssid, + struct wpa_bss *bss, struct wpa_ssid *ssid, u8 *wpa_ie, size_t *wpa_ie_len); void wpa_supplicant_associate(struct wpa_supplicant *wpa_s, - struct wpa_scan_res *bss, + struct wpa_bss *bss, struct wpa_ssid *ssid); void wpa_supplicant_set_non_wpa_policy(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid); void wpa_supplicant_initiate_eapol(struct wpa_supplicant *wpa_s); -int wpa_supplicant_get_scan_results(struct wpa_supplicant *wpa_s); void wpa_clear_keys(struct wpa_supplicant *wpa_s, const u8 *addr); void wpa_supplicant_req_auth_timeout(struct wpa_supplicant *wpa_s, int sec, int usec); -void wpa_supplicant_set_state(struct wpa_supplicant *wpa_s, wpa_states state); +void wpa_supplicant_set_state(struct wpa_supplicant *wpa_s, + enum wpa_states state); struct wpa_ssid * wpa_supplicant_get_ssid(struct wpa_supplicant *wpa_s); void wpa_supplicant_cancel_auth_timeout(struct wpa_supplicant *wpa_s); void wpa_supplicant_deauthenticate(struct wpa_supplicant *wpa_s, @@ -413,6 +557,18 @@ void wpa_supplicant_deauthenticate(struct wpa_supplicant *wpa_s, void wpa_supplicant_disassociate(struct wpa_supplicant *wpa_s, int reason_code); +void wpa_supplicant_enable_network(struct wpa_supplicant *wpa_s, + struct wpa_ssid *ssid); +void wpa_supplicant_disable_network(struct wpa_supplicant *wpa_s, + struct wpa_ssid *ssid); +void wpa_supplicant_select_network(struct wpa_supplicant *wpa_s, + struct wpa_ssid *ssid); +int wpa_supplicant_set_ap_scan(struct wpa_supplicant *wpa_s, + int ap_scan); +int wpa_supplicant_set_debug_params(struct wpa_global *global, + int debug_level, int debug_timestamp, + int debug_show_keys); + void wpa_show_license(void); struct wpa_supplicant * wpa_supplicant_add_iface(struct wpa_global *global, @@ -427,12 +583,21 @@ void wpa_supplicant_deinit(struct wpa_global *global); int wpa_supplicant_scard_init(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid); - -/* scan.c */ -void wpa_supplicant_req_scan(struct wpa_supplicant *wpa_s, int sec, int usec); -void wpa_supplicant_cancel_scan(struct wpa_supplicant *wpa_s); +void wpa_supplicant_terminate_proc(struct wpa_global *global); +void wpa_supplicant_rx_eapol(void *ctx, const u8 *src_addr, + const u8 *buf, size_t len); +enum wpa_key_mgmt key_mgmt2driver(int key_mgmt); +enum wpa_cipher cipher_suite2driver(int cipher); +void wpa_supplicant_update_config(struct wpa_supplicant *wpa_s); +void wpa_supplicant_clear_status(struct wpa_supplicant *wpa_s); /* events.c */ void wpa_supplicant_mark_disassoc(struct wpa_supplicant *wpa_s); +void wpa_supplicant_connect(struct wpa_supplicant *wpa_s, + struct wpa_bss *selected, + struct wpa_ssid *ssid); + +/* eap_register.c */ +int eap_register_methods(void); #endif /* WPA_SUPPLICANT_I_H */