diff -r 712b4ffd76bb -r 43351a4f2da3 eapol/eapol_framework/eapol_common/include/eap_pac_store_client_message_if.h --- a/eapol/eapol_framework/eapol_common/include/eap_pac_store_client_message_if.h Fri Sep 03 09:22:44 2010 +0300 +++ b/eapol/eapol_framework/eapol_common/include/eap_pac_store_client_message_if.h Thu Sep 16 13:07:04 2010 +0300 @@ -16,7 +16,7 @@ */ /* -* %version: % +* %version: 9 % */ #if !defined(_EAP_PAC_STORE_CLIENT_MESSAGE_IF_H_) @@ -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_PAC_STORE_CLIENT_MESSAGE_IF_H) + #define EAP_CLASS_VISIBILITY_EAP_PAC_STORE_CLIENT_MESSAGE_IF_H EAP_NONSHARABLE + #define EAP_FUNC_VISIBILITY_EAP_PAC_STORE_CLIENT_MESSAGE_IF_H + #define EAP_C_FUNC_VISIBILITY_EAP_PAC_STORE_CLIENT_MESSAGE_IF_H + #define EAP_FUNC_EXPORT_EAP_PAC_STORE_CLIENT_MESSAGE_IF_H + #define EAP_C_FUNC_EXPORT_EAP_PAC_STORE_CLIENT_MESSAGE_IF_H +#elif defined(EAP_EXPORT_EAP_PAC_STORE_CLIENT_MESSAGE_IF_H) + #define EAP_CLASS_VISIBILITY_EAP_PAC_STORE_CLIENT_MESSAGE_IF_H EAP_EXPORT + #define EAP_FUNC_VISIBILITY_EAP_PAC_STORE_CLIENT_MESSAGE_IF_H EAP_FUNC_EXPORT + #define EAP_C_FUNC_VISIBILITY_EAP_PAC_STORE_CLIENT_MESSAGE_IF_H EAP_C_FUNC_EXPORT + #define EAP_FUNC_EXPORT_EAP_PAC_STORE_CLIENT_MESSAGE_IF_H EAP_FUNC_EXPORT + #define EAP_C_FUNC_EXPORT_EAP_PAC_STORE_CLIENT_MESSAGE_IF_H EAP_C_FUNC_EXPORT +#else + #define EAP_CLASS_VISIBILITY_EAP_PAC_STORE_CLIENT_MESSAGE_IF_H EAP_IMPORT + #define EAP_FUNC_VISIBILITY_EAP_PAC_STORE_CLIENT_MESSAGE_IF_H EAP_FUNC_IMPORT + #define EAP_C_FUNC_VISIBILITY_EAP_PAC_STORE_CLIENT_MESSAGE_IF_H EAP_C_FUNC_IMPORT + #define EAP_FUNC_EXPORT_EAP_PAC_STORE_CLIENT_MESSAGE_IF_H + #define EAP_C_FUNC_EXPORT_EAP_PAC_STORE_CLIENT_MESSAGE_IF_H +#endif +// End: added by script change_export_macros.sh. #include "eap_pac_store_message_base.h" #include "abs_eap_am_message_if.h" #include "eap_array.h" @@ -38,7 +59,7 @@ /// A eap_pac_store_client_message_if_c class implements mapping of EAP authentication sessions. /// Network identity separates parallel EAP authentication sessions. -class EAP_EXPORT eap_pac_store_client_message_if_c +class EAP_CLASS_VISIBILITY_EAP_PAC_STORE_CLIENT_MESSAGE_IF_H eap_pac_store_client_message_if_c : public eap_pac_store_message_base_c , public abs_eap_am_message_if_c { @@ -62,12 +83,6 @@ eap_tlv_message_type_function_e m_error_function; - eap_status_e complete_open_pac_store( - EAP_TEMPLATE_CONST eap_array_c * const parameters); - - eap_status_e complete_create_device_seed( - EAP_TEMPLATE_CONST eap_array_c * const parameters); - eap_status_e complete_is_master_key_present( EAP_TEMPLATE_CONST eap_array_c * const parameters); @@ -92,6 +107,9 @@ eap_status_e process_message_type_error( EAP_TEMPLATE_CONST eap_array_c * const parameters); + eap_status_e process_message(eap_process_tlv_message_data_c * const message); + + //-------------------------------------------------- protected: //-------------------------------------------------- @@ -103,7 +121,7 @@ /** * The destructor of the eap_core class does nothing special. */ - EAP_FUNC_IMPORT virtual ~eap_pac_store_client_message_if_c(); + EAP_FUNC_VISIBILITY_EAP_PAC_STORE_CLIENT_MESSAGE_IF_H virtual ~eap_pac_store_client_message_if_c(); /** * The constructor initializes member attributes using parameters passed to it. @@ -113,7 +131,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_pac_store_client_message_if_c( + EAP_FUNC_VISIBILITY_EAP_PAC_STORE_CLIENT_MESSAGE_IF_H eap_pac_store_client_message_if_c( abs_eap_am_tools_c * const tools, eap_am_message_if_c * const client_if, abs_eap_pac_store_message_c * const partner); @@ -125,48 +143,40 @@ * 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_PAC_STORE_CLIENT_MESSAGE_IF_H eap_status_e reset(); // This is documented in abs_eap_stack_interface_c::configure(). - EAP_FUNC_IMPORT eap_status_e configure(); + EAP_FUNC_VISIBILITY_EAP_PAC_STORE_CLIENT_MESSAGE_IF_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_PAC_STORE_CLIENT_MESSAGE_IF_H eap_status_e shutdown(); // This is documented in abs_eap_stack_interface_c::get_is_valid(). - EAP_FUNC_IMPORT bool get_is_valid(); - - EAP_FUNC_IMPORT eap_status_e process_message(eap_process_tlv_message_data_c * const message); + EAP_FUNC_VISIBILITY_EAP_PAC_STORE_CLIENT_MESSAGE_IF_H bool get_is_valid(); - EAP_FUNC_IMPORT eap_status_e send_data(const void * const data, const u32_t length); + EAP_FUNC_VISIBILITY_EAP_PAC_STORE_CLIENT_MESSAGE_IF_H eap_status_e send_data(const void * const data, const u32_t length); - EAP_FUNC_IMPORT eap_status_e open_pac_store( + EAP_FUNC_VISIBILITY_EAP_PAC_STORE_CLIENT_MESSAGE_IF_H eap_status_e is_master_key_present( const eap_status_e completion_status); - EAP_FUNC_IMPORT eap_status_e create_device_seed( - const eap_status_e completion_status); - - EAP_FUNC_IMPORT eap_status_e is_master_key_present( - const eap_status_e completion_status); - - EAP_FUNC_IMPORT eap_status_e is_master_key_and_password_matching( + EAP_FUNC_VISIBILITY_EAP_PAC_STORE_CLIENT_MESSAGE_IF_H eap_status_e is_master_key_and_password_matching( const eap_variable_data_c * const pac_store_password ,const eap_status_e completion_status); - EAP_FUNC_IMPORT eap_status_e create_and_save_master_key( + EAP_FUNC_VISIBILITY_EAP_PAC_STORE_CLIENT_MESSAGE_IF_H eap_status_e create_and_save_master_key( const eap_variable_data_c * const pac_store_password ,const eap_status_e completion_status); - EAP_FUNC_IMPORT eap_status_e compare_pac_store_password( + EAP_FUNC_VISIBILITY_EAP_PAC_STORE_CLIENT_MESSAGE_IF_H eap_status_e compare_pac_store_password( eap_variable_data_c * const pac_store_password); - EAP_FUNC_IMPORT eap_status_e is_pacstore_password_present(); + EAP_FUNC_VISIBILITY_EAP_PAC_STORE_CLIENT_MESSAGE_IF_H eap_status_e is_pacstore_password_present(); - EAP_FUNC_IMPORT eap_status_e set_pac_store_password( + EAP_FUNC_VISIBILITY_EAP_PAC_STORE_CLIENT_MESSAGE_IF_H eap_status_e set_pac_store_password( const eap_variable_data_c * const pac_store_password ,const eap_status_e completion_status); - EAP_FUNC_IMPORT eap_status_e destroy_pac_store( + EAP_FUNC_VISIBILITY_EAP_PAC_STORE_CLIENT_MESSAGE_IF_H eap_status_e destroy_pac_store( const eap_status_e completion_status);