--- a/eapol/eapol_framework/eapol_common/include/eap_session_core.h Fri Sep 03 09:22:44 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/include/eap_session_core.h Thu Sep 16 13:07:04 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_EAP_SESSION_CORE_H)
+ #define EAP_CLASS_VISIBILITY_EAP_SESSION_CORE_H EAP_NONSHARABLE
+ #define EAP_FUNC_VISIBILITY_EAP_SESSION_CORE_H
+ #define EAP_C_FUNC_VISIBILITY_EAP_SESSION_CORE_H
+ #define EAP_FUNC_EXPORT_EAP_SESSION_CORE_H
+ #define EAP_C_FUNC_EXPORT_EAP_SESSION_CORE_H
+#elif defined(EAP_EXPORT_EAP_SESSION_CORE_H)
+ #define EAP_CLASS_VISIBILITY_EAP_SESSION_CORE_H EAP_EXPORT
+ #define EAP_FUNC_VISIBILITY_EAP_SESSION_CORE_H EAP_FUNC_EXPORT
+ #define EAP_C_FUNC_VISIBILITY_EAP_SESSION_CORE_H EAP_C_FUNC_EXPORT
+ #define EAP_FUNC_EXPORT_EAP_SESSION_CORE_H EAP_FUNC_EXPORT
+ #define EAP_C_FUNC_EXPORT_EAP_SESSION_CORE_H EAP_C_FUNC_EXPORT
+#else
+ #define EAP_CLASS_VISIBILITY_EAP_SESSION_CORE_H EAP_IMPORT
+ #define EAP_FUNC_VISIBILITY_EAP_SESSION_CORE_H EAP_FUNC_IMPORT
+ #define EAP_C_FUNC_VISIBILITY_EAP_SESSION_CORE_H EAP_C_FUNC_IMPORT
+ #define EAP_FUNC_EXPORT_EAP_SESSION_CORE_H
+ #define EAP_C_FUNC_EXPORT_EAP_SESSION_CORE_H
+#endif
+// End: added by script change_export_macros.sh.
#include "abs_eap_session_core.h"
#include "eap_core_map.h"
#include "abs_eap_stack_interface.h"
@@ -50,7 +71,7 @@
/// A eap_session_core_c class implements mapping of EAP authentication sessions.
/// Network identity separates parallel EAP authentication sessions.
-class EAP_EXPORT eap_session_core_c
+class EAP_CLASS_VISIBILITY_EAP_SESSION_CORE_H eap_session_core_c
: public abs_eap_core_c
, public abs_eap_core_map_c
, public abs_eap_base_timer_c
@@ -87,16 +108,16 @@
/**
* Function creates a new session.
*/
- EAP_FUNC_IMPORT eap_core_c * create_new_session(
+ EAP_FUNC_VISIBILITY_EAP_SESSION_CORE_H eap_core_c * create_new_session(
const eap_am_network_id_c * const receive_network_id);
- EAP_FUNC_IMPORT eap_status_e reset_or_remove_session(
+ EAP_FUNC_VISIBILITY_EAP_SESSION_CORE_H eap_status_e reset_or_remove_session(
eap_core_c ** const session,
const eap_network_id_selector_c * const selector,
const bool reset_immediately);
- EAP_FUNC_IMPORT static eap_status_e shutdown_operation(
+ EAP_FUNC_VISIBILITY_EAP_SESSION_CORE_H static eap_status_e shutdown_operation(
eap_core_c * const core,
abs_eap_am_tools_c * const m_am_tools);
@@ -111,7 +132,7 @@
/**
* The destructor of the eap_core class does nothing special.
*/
- EAP_FUNC_IMPORT virtual ~eap_session_core_c();
+ EAP_FUNC_VISIBILITY_EAP_SESSION_CORE_H virtual ~eap_session_core_c();
/**
* The constructor initializes member attributes using parameters passed to it.
@@ -121,7 +142,7 @@
* as a client (true) or server (false), in terms of EAP-protocol
* whether this network entity is EAP-supplicant (true) or EAP-authenticator (false).
*/
- EAP_FUNC_IMPORT eap_session_core_c(
+ EAP_FUNC_VISIBILITY_EAP_SESSION_CORE_H eap_session_core_c(
abs_eap_am_tools_c * const tools,
abs_eap_session_core_c * const partner,
const bool is_client_when_true);
@@ -133,7 +154,7 @@
* If object reset fails this function must return corresponding error status.
* @return This function returns the status of reset operation.
*/
- EAP_FUNC_IMPORT eap_status_e reset();
+ EAP_FUNC_VISIBILITY_EAP_SESSION_CORE_H eap_status_e reset();
/**
* This function cancels all EAP-sessions.
@@ -141,10 +162,10 @@
* If this fails this function must return corresponding error status.
* @return This function returns the status of operation.
*/
- EAP_FUNC_IMPORT eap_status_e cancel_all_eap_sessions();
+ EAP_FUNC_VISIBILITY_EAP_SESSION_CORE_H eap_status_e cancel_all_eap_sessions();
// This is documented in abs_eap_stack_interface_c::packet_process().
- EAP_FUNC_IMPORT eap_status_e packet_process(
+ EAP_FUNC_VISIBILITY_EAP_SESSION_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);
@@ -158,7 +179,7 @@
* @param data_length is length in bytes of the EAP-packet.
* @param buffer_length is length in bytes of the whole packet buffer.
*/
- EAP_FUNC_IMPORT eap_status_e packet_send(
+ EAP_FUNC_VISIBILITY_EAP_SESSION_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,
@@ -168,7 +189,7 @@
/**
* The get_partner() function returns pointer to partner class.
*/
- EAP_FUNC_IMPORT abs_eap_session_core_c * get_partner();
+ EAP_FUNC_VISIBILITY_EAP_SESSION_CORE_H abs_eap_session_core_c * get_partner();
/**
* The get_header_offset() function obtains the header offset of EAP-packet.
@@ -179,7 +200,7 @@
* @return Function returns the offset of EAP-header.
* @see abs_eap_base_type_c::get_header_offset().
*/
- EAP_FUNC_IMPORT u32_t get_header_offset(
+ EAP_FUNC_VISIBILITY_EAP_SESSION_CORE_H u32_t get_header_offset(
u32_t * const MTU,
u32_t * const trailer_length);
@@ -187,7 +208,7 @@
* The unload_module() function initializes un-load of desired EAP-type.
* After the EAP-type is not needed this function should be called.
*/
- EAP_FUNC_IMPORT eap_status_e unload_module(
+ EAP_FUNC_VISIBILITY_EAP_SESSION_CORE_H eap_status_e unload_module(
const eap_type_value_e type);
/**
@@ -199,14 +220,14 @@
* The server does not need eap_acknowledge() function because
* server (EAP-authenticator) sends the EAP-success message.
*/
- EAP_FUNC_IMPORT eap_status_e eap_acknowledge(
+ EAP_FUNC_VISIBILITY_EAP_SESSION_CORE_H eap_status_e eap_acknowledge(
const eap_am_network_id_c * const receive_network_id);
/**
* This function restarts authentication using current object.
* This is used for testing.
*/
- EAP_FUNC_IMPORT eap_status_e restart_authentication(
+ EAP_FUNC_VISIBILITY_EAP_SESSION_CORE_H eap_status_e restart_authentication(
const eap_am_network_id_c * const send_network_id,
const bool is_client_when_true);
@@ -216,7 +237,7 @@
* when EAP-authentication is needed with another peer.
* @param network_id includes the addresses (network identity) and packet type.
*/
- EAP_FUNC_IMPORT eap_status_e send_eap_identity_request(
+ EAP_FUNC_VISIBILITY_EAP_SESSION_CORE_H eap_status_e send_eap_identity_request(
const eap_am_network_id_c * const network_id);
#endif //#if defined(USE_EAP_CORE_SERVER)
@@ -227,7 +248,7 @@
* @param eap_identifier is the EAP-Identifier to be used with EAP-Nak message.
* @param preferred_eap_type is the acceptable EAP-Type to be informed with an other peer.
*/
- EAP_FUNC_IMPORT eap_status_e send_eap_nak_response(
+ EAP_FUNC_VISIBILITY_EAP_SESSION_CORE_H eap_status_e send_eap_nak_response(
const eap_am_network_id_c * const receive_network_id,
const u8_t eap_identifier,
const eap_type_value_e preferred_eap_type);
@@ -242,16 +263,16 @@
* @param encryption_key is pointer to the first byte of the encryption key.
* @param encr_key_length is count of bytes in the encryption key.
*/
- EAP_FUNC_IMPORT eap_status_e packet_data_crypto_keys(
+ EAP_FUNC_VISIBILITY_EAP_SESSION_CORE_H eap_status_e packet_data_crypto_keys(
const eap_am_network_id_c * const send_network_id,
const eap_master_session_key_c * const master_session_key
);
// This is documented in abs_eap_stack_interface_c::configure().
- EAP_FUNC_IMPORT eap_status_e configure();
+ EAP_FUNC_VISIBILITY_EAP_SESSION_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_EAP_SESSION_CORE_H eap_status_e shutdown();
/**
* The read_configure() function reads the configuration data identified
@@ -261,7 +282,7 @@
* @param field_length is length of the field string.
* @param data is pointer to existing eap_variable_data object.
*/
- EAP_FUNC_IMPORT virtual eap_status_e read_configure(
+ EAP_FUNC_VISIBILITY_EAP_SESSION_CORE_H virtual eap_status_e read_configure(
const eap_configuration_field_c * const field,
eap_variable_data_c * const data);
@@ -273,26 +294,26 @@
* @param field_length is length of the field string.
* @param data is pointer to existing eap_variable_data object.
*/
- EAP_FUNC_IMPORT virtual eap_status_e write_configure(
+ EAP_FUNC_VISIBILITY_EAP_SESSION_CORE_H virtual eap_status_e write_configure(
const eap_configuration_field_c * const field,
eap_variable_data_c * const data);
// This is documented in abs_eap_stack_interface_c::set_is_valid().
- EAP_FUNC_IMPORT void set_is_valid();
+ EAP_FUNC_VISIBILITY_EAP_SESSION_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_EAP_SESSION_CORE_H bool get_is_valid();
// See abs_eap_base_type_c::state_notification().
- EAP_FUNC_IMPORT void state_notification(
+ EAP_FUNC_VISIBILITY_EAP_SESSION_CORE_H void state_notification(
const abs_eap_state_notification_c * const state);
// See abs_eap_base_timer_c::timer_expired().
- EAP_FUNC_IMPORT eap_status_e timer_expired(
+ EAP_FUNC_VISIBILITY_EAP_SESSION_CORE_H eap_status_e timer_expired(
const u32_t id, void *data);
// See abs_eap_base_timer_c::timer_delete_data().
- EAP_FUNC_IMPORT eap_status_e timer_delete_data(
+ EAP_FUNC_VISIBILITY_EAP_SESSION_CORE_H eap_status_e timer_delete_data(
const u32_t id, void *data);
/**
@@ -300,7 +321,7 @@
* load new module of EAP-type.
* @see abs_eap_core_c::load_module().
*/
- EAP_FUNC_IMPORT eap_status_e load_module(
+ EAP_FUNC_VISIBILITY_EAP_SESSION_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,
@@ -313,7 +334,7 @@
* when EAP-authentication is needed with another peer.
* @see abs_eap_core_c::restart_authentication().
*/
- EAP_FUNC_IMPORT eap_status_e restart_authentication(
+ EAP_FUNC_VISIBILITY_EAP_SESSION_CORE_H eap_status_e restart_authentication(
const eap_am_network_id_c * const receive_network_id,
const bool is_client_when_true,
const bool force_clean_restart,
@@ -323,14 +344,14 @@
* This function creates EAP session object synchronously.
* @param receive_network_id identifies the removed EAP session.
*/
- EAP_FUNC_IMPORT eap_status_e create_eap_session(
+ EAP_FUNC_VISIBILITY_EAP_SESSION_CORE_H eap_status_e create_eap_session(
const eap_am_network_id_c * const receive_network_id);
/**
* This function removes EAP session object synchronously.
* @param receive_network_id identifies the removed EAP session.
*/
- EAP_FUNC_IMPORT eap_status_e remove_eap_session(
+ EAP_FUNC_VISIBILITY_EAP_SESSION_CORE_H eap_status_e remove_eap_session(
const bool complete_to_lower_layer,
const eap_am_network_id_c * const receive_network_id);
@@ -345,44 +366,44 @@
* This function tells lower layer to remove EAP session object asynchronously.
* @param eap_type is pointer to selector that identifies the removed EAP session.
*/
- EAP_FUNC_IMPORT eap_status_e asynchronous_init_remove_eap_session(
+ EAP_FUNC_VISIBILITY_EAP_SESSION_CORE_H eap_status_e asynchronous_init_remove_eap_session(
const eap_network_id_selector_c * const state_selector);
//
- EAP_FUNC_IMPORT eap_status_e set_timer(
+ EAP_FUNC_VISIBILITY_EAP_SESSION_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_EAP_SESSION_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 check_is_valid_eap_type(const eap_type_value_e eap_type);
+ EAP_FUNC_VISIBILITY_EAP_SESSION_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_EAP_SESSION_CORE_H eap_status_e get_eap_type_list(
eap_array_c<eap_type_value_e> * const eap_type_list);
/// @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_EAP_SESSION_CORE_H eap_status_e add_rogue_ap(eap_array_c<eap_rogue_ap_entry_c> & rogue_ap_list);
// This is documented in abs_eap_core_c::set_session_timeout().
- EAP_FUNC_IMPORT eap_status_e set_session_timeout(
+ EAP_FUNC_VISIBILITY_EAP_SESSION_CORE_H eap_status_e set_session_timeout(
const u32_t session_timeout_ms);
- EAP_FUNC_IMPORT eap_status_e set_eap_database_reference_values(
+ EAP_FUNC_VISIBILITY_EAP_SESSION_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_EAP_SESSION_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_EAP_SESSION_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);