--- a/eapol/eapol_framework/eapol_common/include/ethernet_core.h Fri Sep 17 08:30:11 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/include/ethernet_core.h Mon Oct 04 00:19:54 2010 +0300
@@ -24,6 +24,27 @@
#include "eap_tools.h"
#include "eap_am_export.h"
+// Start: added by script change_export_macros.sh.
+#if defined(EAP_NO_EXPORT_ETHERNET_CORE_H)
+ #define EAP_CLASS_VISIBILITY_ETHERNET_CORE_H EAP_NONSHARABLE
+ #define EAP_FUNC_VISIBILITY_ETHERNET_CORE_H
+ #define EAP_C_FUNC_VISIBILITY_ETHERNET_CORE_H
+ #define EAP_FUNC_EXPORT_ETHERNET_CORE_H
+ #define EAP_C_FUNC_EXPORT_ETHERNET_CORE_H
+#elif defined(EAP_EXPORT_ETHERNET_CORE_H)
+ #define EAP_CLASS_VISIBILITY_ETHERNET_CORE_H EAP_EXPORT
+ #define EAP_FUNC_VISIBILITY_ETHERNET_CORE_H EAP_FUNC_EXPORT
+ #define EAP_C_FUNC_VISIBILITY_ETHERNET_CORE_H EAP_C_FUNC_EXPORT
+ #define EAP_FUNC_EXPORT_ETHERNET_CORE_H EAP_FUNC_EXPORT
+ #define EAP_C_FUNC_EXPORT_ETHERNET_CORE_H EAP_C_FUNC_EXPORT
+#else
+ #define EAP_CLASS_VISIBILITY_ETHERNET_CORE_H EAP_IMPORT
+ #define EAP_FUNC_VISIBILITY_ETHERNET_CORE_H EAP_FUNC_IMPORT
+ #define EAP_C_FUNC_VISIBILITY_ETHERNET_CORE_H EAP_C_FUNC_IMPORT
+ #define EAP_FUNC_EXPORT_ETHERNET_CORE_H
+ #define EAP_C_FUNC_EXPORT_ETHERNET_CORE_H
+#endif
+// End: added by script change_export_macros.sh.
#include "abs_ethernet_core.h"
#include "abs_eapol_core.h"
#include "eapol_core.h"
@@ -36,7 +57,7 @@
/// This class defines the ethernet protocol layer.
-class EAP_EXPORT ethernet_core_c
+class EAP_CLASS_VISIBILITY_ETHERNET_CORE_H ethernet_core_c
: public abs_eapol_core_c
, public abs_eap_stack_interface_c
, public eap_database_reference_if_c
@@ -65,27 +86,27 @@
//--------------------------------------------------
//
- EAP_FUNC_IMPORT virtual ~ethernet_core_c();
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H virtual ~ethernet_core_c();
//
- EAP_FUNC_IMPORT ethernet_core_c(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H ethernet_core_c(
abs_eap_am_tools_c * const m_am_tools,
abs_ethernet_core_c * const partner,
const bool is_client_when_true);
- EAP_FUNC_IMPORT eap_status_e cancel_all_authentication_sessions();
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e cancel_all_authentication_sessions();
//
- EAP_FUNC_IMPORT eap_base_type_c * load_type(const eap_type_value_e type);
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_base_type_c * load_type(const eap_type_value_e type);
// This is documented in abs_eap_stack_interface_c::packet_process().
- EAP_FUNC_IMPORT eap_status_e packet_process(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e packet_process(
const eap_am_network_id_c * const receive_network_id,
eap_general_header_base_c * const packet_data,
const u32_t packet_length);
//
- EAP_FUNC_IMPORT eap_status_e packet_send(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e packet_send(
const eap_am_network_id_c * const send_network_id,
eap_buf_chain_wr_c * const sent_packet,
const u32_t header_offset,
@@ -93,15 +114,15 @@
const u32_t buffer_length);
//
- EAP_FUNC_IMPORT u32_t get_header_offset(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H u32_t get_header_offset(
u32_t * const MTU,
u32_t * const trailer_length);
//
- EAP_FUNC_IMPORT eap_status_e eap_acknowledge(const eap_am_network_id_c * const receive_network_id);
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e eap_acknowledge(const eap_am_network_id_c * const receive_network_id);
//
- EAP_FUNC_IMPORT eap_status_e load_module(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e load_module(
const eap_type_value_e type,
const eap_type_value_e /* tunneling_type */,
abs_eap_base_type_c * const partner,
@@ -110,7 +131,7 @@
const eap_am_network_id_c * const receive_network_id);
//
- EAP_FUNC_IMPORT eap_status_e unload_module(const eap_type_value_e type);
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e unload_module(const eap_type_value_e type);
/**
* This function checks whether PMKSA is cached to each eap_am_network_id_c object.
@@ -120,7 +141,7 @@
* after function returns have PMKSA cached and read_reassociation_parameters() can be called
* with those eap_am_network_id_c objects.
*/
- EAP_FUNC_IMPORT eap_status_e check_pmksa_cache(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e check_pmksa_cache(
eap_array_c<eap_am_network_id_c> * const bssid_sta_receive_network_ids,
const eapol_key_authentication_type_e selected_eapol_key_authentication_type,
const eapol_RSNA_key_header_c::eapol_RSNA_cipher_e pairwise_key_cipher_suite,
@@ -132,7 +153,7 @@
* MAC address of Authenticator should be in source address.
* MAC address of Supplicant should be in destination address.
*/
- EAP_FUNC_IMPORT eap_status_e remove_pmksa_from_cache(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e remove_pmksa_from_cache(
const eap_am_network_id_c * const receive_network_id);
/**
@@ -145,7 +166,7 @@
* The second parameter is_client_when_true tells whether this stack
* is client (true) or server (false).
*/
- EAP_FUNC_IMPORT eap_status_e start_authentication(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e start_authentication(
const eap_am_network_id_c * const receive_network_id,
const bool is_client_when_true);
@@ -159,11 +180,11 @@
* The adaptation module calls the start_preauthentication() function
* when preauthentication is needed with another AP.
*/
- EAP_FUNC_IMPORT eap_status_e start_preauthentication(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e start_preauthentication(
const eap_am_network_id_c * const receive_network_id,
const eapol_key_authentication_type_e authentication_type);
- EAP_FUNC_IMPORT eap_status_e read_reassociation_parameters(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e read_reassociation_parameters(
const eap_am_network_id_c * const old_receive_network_id, ///< source includes remote address, destination includes local address.
const eap_am_network_id_c * const new_receive_network_id, ///< source includes remote address, destination includes local address.
const eapol_key_authentication_type_e authentication_type,
@@ -171,12 +192,12 @@
const eap_variable_data_c * const received_WPA_ie,
const eap_variable_data_c * const sent_WPA_ie);
- EAP_FUNC_IMPORT eap_status_e start_reassociation(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e start_reassociation(
const eap_am_network_id_c * const receive_network_id,
const eapol_key_authentication_type_e authentication_type,
const eap_variable_data_c * const PMKID);
- EAP_FUNC_IMPORT eap_status_e complete_reassociation(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e complete_reassociation(
const eapol_wlan_authentication_state_e reassociation_result,
const eap_am_network_id_c * const receive_network_id,
const eapol_key_authentication_type_e authentication_type,
@@ -185,68 +206,68 @@
const eapol_RSNA_key_header_c::eapol_RSNA_cipher_e pairwise_key_cipher_suite,
const eapol_RSNA_key_header_c::eapol_RSNA_cipher_e group_key_cipher_suite);
- EAP_FUNC_IMPORT eap_status_e start_WPXM_reassociation(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e start_WPXM_reassociation(
const eap_am_network_id_c * const receive_network_id,
const eapol_key_authentication_type_e authentication_type,
eap_variable_data_c * const send_reassociation_request_ie);
- EAP_FUNC_IMPORT eap_status_e complete_WPXM_reassociation(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e complete_WPXM_reassociation(
const eapol_wlan_authentication_state_e reassociation_result,
const eap_am_network_id_c * const receive_network_id,
const eapol_key_authentication_type_e authentication_type,
const eap_variable_data_c * const received_reassociation_ie);
- EAP_FUNC_IMPORT eap_status_e send_logoff(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e send_logoff(
const eap_am_network_id_c * const receive_network_id);
// This is documented in abs_eap_stack_interface_c::set_is_valid().
- EAP_FUNC_IMPORT void set_is_valid();
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H void set_is_valid();
// This is documented in abs_eap_stack_interface_c::get_is_valid().
- EAP_FUNC_IMPORT bool get_is_valid();
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H bool get_is_valid();
// This is documented in abs_eap_stack_interface_c::configure().
- EAP_FUNC_IMPORT eap_status_e configure();
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e configure();
// This is documented in abs_eap_stack_interface_c::shutdown().
- EAP_FUNC_IMPORT eap_status_e shutdown();
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e shutdown();
- EAP_FUNC_IMPORT eap_status_e packet_data_session_key(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e packet_data_session_key(
const eap_am_network_id_c * const send_network_id,
const eapol_session_key_c * const key);
- EAP_FUNC_IMPORT eap_status_e read_configure(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e read_configure(
const eap_configuration_field_c * const field,
eap_variable_data_c * const data);
- EAP_FUNC_IMPORT eap_status_e write_configure(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e write_configure(
const eap_configuration_field_c * const field,
eap_variable_data_c * const data);
// See abs_eap_base_type_c::state_notification().
- EAP_FUNC_IMPORT void state_notification(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H void state_notification(
const abs_eap_state_notification_c * const state);
//
- EAP_FUNC_IMPORT eap_status_e set_timer(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e set_timer(
abs_eap_base_timer_c * const p_initializer,
const u32_t p_id,
void * const p_data,
const u32_t p_time_ms);
- EAP_FUNC_IMPORT eap_status_e cancel_timer(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e cancel_timer(
abs_eap_base_timer_c * const p_initializer,
const u32_t p_id);
//
- EAP_FUNC_IMPORT eap_status_e cancel_all_timers();
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e cancel_all_timers();
//
- EAP_FUNC_IMPORT eap_status_e check_is_valid_eap_type(const eap_type_value_e eap_type);
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e check_is_valid_eap_type(const eap_type_value_e eap_type);
// See abs_eap_core_c::get_eap_type_list().
- EAP_FUNC_IMPORT eap_status_e get_eap_type_list(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e get_eap_type_list(
eap_array_c<eap_type_value_e> * const eap_type_list);
/**
@@ -256,7 +277,7 @@
* Supplicant should be in destination address.
* @param authentication_type is the selected authentication type.
*/
- EAP_FUNC_IMPORT eap_status_e create_state(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e create_state(
const eap_am_network_id_c * const receive_network_id,
const eapol_key_authentication_type_e authentication_type
);
@@ -271,7 +292,7 @@
* @param eapol_pairwise_cipher is the selected pairwise cipher.
* @param eapol_group_cipher is the selected group cipher.
*/
- EAP_FUNC_IMPORT eap_status_e association(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e association(
const eap_am_network_id_c * const receive_network_id,
const eapol_key_authentication_type_e authentication_type,
const eap_variable_data_c * const authenticator_RSNA_IE,
@@ -285,25 +306,25 @@
* @param receive_network_id carries the MAC addresses.
* MAC address of Authenticator should be in source address. MAC address of Supplicant should be in destination address.
*/
- EAP_FUNC_IMPORT eap_status_e disassociation(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e disassociation(
const bool complete_to_lower_layer,
const eap_am_network_id_c * const receive_network_id
);
/// @see abs_eap_core_c::add_rogue_ap().
- EAP_FUNC_IMPORT eap_status_e add_rogue_ap(eap_array_c<eap_rogue_ap_entry_c> & rogue_ap_list);
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e add_rogue_ap(eap_array_c<eap_rogue_ap_entry_c> & rogue_ap_list);
- EAP_FUNC_IMPORT eap_status_e tkip_mic_failure(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e tkip_mic_failure(
const eap_am_network_id_c * const receive_network_id,
const bool fatal_failure_when_true,
const eapol_RSNA_key_header_c::eapol_tkip_mic_failure_type_e tkip_mic_failure_type);
- EAP_FUNC_IMPORT eap_status_e complete_check_pmksa_cache(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e complete_check_pmksa_cache(
EAP_TEMPLATE_CONST eap_array_c<eap_am_network_id_c> * const bssid_sta_receive_network_ids);
#if defined(USE_EAP_SIMPLE_CONFIG)
- EAP_FUNC_IMPORT eap_status_e save_simple_config_session(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e save_simple_config_session(
const simple_config_state_e state,
EAP_TEMPLATE_CONST eap_array_c<simple_config_credential_c> * const credential_array,
const eap_variable_data_c * const new_password,
@@ -312,21 +333,21 @@
#endif // #if defined(USE_EAP_SIMPLE_CONFIG)
- EAP_FUNC_IMPORT eap_status_e set_eap_database_reference_values(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e set_eap_database_reference_values(
const eap_variable_data_c * const reference);
- EAP_FUNC_IMPORT eap_status_e get_802_11_authentication_mode(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e get_802_11_authentication_mode(
const eap_am_network_id_c * const receive_network_id,
const eapol_key_authentication_type_e authentication_type,
const eap_variable_data_c * const SSID,
const eap_variable_data_c * const preshared_key);
- EAP_FUNC_IMPORT eap_status_e complete_get_802_11_authentication_mode(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e complete_get_802_11_authentication_mode(
const eap_status_e completion_status,
const eap_am_network_id_c * const receive_network_id,
const eapol_key_802_11_authentication_mode_e mode);
- EAP_FUNC_IMPORT eap_status_e complete_disassociation(
+ EAP_FUNC_VISIBILITY_ETHERNET_CORE_H eap_status_e complete_disassociation(
const bool complete_to_lower_layer,
const eap_am_network_id_c * const receive_network_id);