diff -r e863583e6720 -r c23bdf5a328a eapol/eapol_framework/eapol_symbian/eap_server/include/eap_am_plugin_symbian.h --- a/eapol/eapol_framework/eapol_symbian/eap_server/include/eap_am_plugin_symbian.h Fri Sep 17 08:30:11 2010 +0300 +++ b/eapol/eapol_framework/eapol_symbian/eap_server/include/eap_am_plugin_symbian.h Mon Oct 04 00:19:54 2010 +0300 @@ -16,7 +16,7 @@ */ /* -* %version: 16 % +* %version: 23 % */ #if !defined(_EAP_AM_PLUGIN_SYMBIAN_H_) @@ -25,6 +25,30 @@ #include "eap_tools.h" #include "eap_status.h" #include "eap_am_export.h" +// Start: added by script change_export_macros.sh. +#if defined(EAP_NO_EXPORT_EAP_AM_PLUGIN_SYMBIAN_H) + #define EAP_CLASS_VISIBILITY_EAP_AM_PLUGIN_SYMBIAN_H EAP_NONSHARABLE + #define EAP_FUNC_VISIBILITY_EAP_AM_PLUGIN_SYMBIAN_H + #define EAP_C_FUNC_VISIBILITY_EAP_AM_PLUGIN_SYMBIAN_H + #define EAP_FUNC_EXPORT_EAP_AM_PLUGIN_SYMBIAN_H + #define EAP_C_FUNC_EXPORT_EAP_AM_PLUGIN_SYMBIAN_H +#elif defined(EAP_EXPORT_EAP_AM_PLUGIN_SYMBIAN_H) + #define EAP_CLASS_VISIBILITY_EAP_AM_PLUGIN_SYMBIAN_H EAP_EXPORT + #define EAP_FUNC_VISIBILITY_EAP_AM_PLUGIN_SYMBIAN_H EAP_FUNC_EXPORT + #define EAP_C_FUNC_VISIBILITY_EAP_AM_PLUGIN_SYMBIAN_H EAP_C_FUNC_EXPORT + #define EAP_FUNC_EXPORT_EAP_AM_PLUGIN_SYMBIAN_H EAP_FUNC_EXPORT + #define EAP_C_FUNC_EXPORT_EAP_AM_PLUGIN_SYMBIAN_H EAP_C_FUNC_EXPORT +#else + #define EAP_CLASS_VISIBILITY_EAP_AM_PLUGIN_SYMBIAN_H EAP_IMPORT + #define EAP_FUNC_VISIBILITY_EAP_AM_PLUGIN_SYMBIAN_H EAP_FUNC_IMPORT + #define EAP_C_FUNC_VISIBILITY_EAP_AM_PLUGIN_SYMBIAN_H EAP_C_FUNC_IMPORT + #define EAP_FUNC_EXPORT_EAP_AM_PLUGIN_SYMBIAN_H + #define EAP_C_FUNC_EXPORT_EAP_AM_PLUGIN_SYMBIAN_H +#endif +// End: added by script change_export_macros.sh. +#if defined(USE_FAST_EAP_TYPE) + #include "AbsPacStoreInitializer.h" +#endif //#if defined(USE_FAST_EAP_TYPE) #include "eap_expanded_type.h" #include "eap_array.h" #include "eap_database_reference_if.h" @@ -39,8 +63,11 @@ /** @file */ /// This class is EAP-plugin adaptation. -class EAP_EXPORT eap_am_plugin_symbian_c +class EAP_CLASS_VISIBILITY_EAP_AM_PLUGIN_SYMBIAN_H eap_am_plugin_symbian_c : public eap_am_plugin_c +#if defined(USE_FAST_EAP_TYPE) +, public AbsPacStoreInitializer +#endif //#if defined(USE_FAST_EAP_TYPE) { private: @@ -53,6 +80,10 @@ eap_array_c m_loaded_types; + eap_method_settings_c * m_internal_settings; + + eap_tlv_message_type_function_e m_completion_function; + bool m_is_valid; bool m_shutdown_was_called; @@ -69,6 +100,16 @@ u32_t index_type, u32_t index); +#if defined(USE_FAST_EAP_TYPE) + eap_status_e initialize_pac_store( + const eap_method_settings_c * const internal_settings, + const eap_tlv_message_type_function_e completion_function); +#endif //#if defined(USE_FAST_EAP_TYPE) + + eap_status_e internal_complete_get_configuration(const eap_method_settings_c * const internal_settings); + + eap_status_e internal_complete_set_configuration(const eap_method_settings_c * const internal_settings); + // ---------------------------------------------------------------------- public: @@ -102,6 +143,12 @@ eap_status_e get_type_info(const eap_method_settings_c * const internal_settings); +#if defined(USE_FAST_EAP_TYPE) + + TInt CompleteInitialisePacStore(); + +#endif //#if defined(USE_FAST_EAP_TYPE) + // ---------------------------------------------------------------------- };