diff -r 093cf0757204 -r 938269283a16 eapol/eapol_framework/eapol_common/am/include/eap_file_config.h --- a/eapol/eapol_framework/eapol_common/am/include/eap_file_config.h Fri May 14 15:54:13 2010 +0300 +++ b/eapol/eapol_framework/eapol_common/am/include/eap_file_config.h Fri Jun 11 13:40:22 2010 +0300 @@ -16,7 +16,7 @@ */ /* -* %version: 11.1.2 % +* %version: % */ #ifndef _FILECONFIG_H @@ -26,6 +26,8 @@ #include "eap_configuration_field.h" #include "abs_eap_am_file_input.h" +class eap_tlv_header_c; + template Type minimum( Type a, Type b ) @@ -34,7 +36,7 @@ } -class eap_config_value_c +class EAP_EXPORT eap_config_value_c { private: @@ -50,25 +52,29 @@ public: - virtual ~eap_config_value_c(); + EAP_FUNC_IMPORT virtual ~eap_config_value_c(); - eap_config_value_c( + EAP_FUNC_IMPORT eap_config_value_c( abs_eap_am_tools_c* const tools); - void set_subsection( + EAP_FUNC_IMPORT void set_subsection( eap_core_map_c * const subsection_map); - eap_core_map_c * get_subsection(); + EAP_FUNC_IMPORT eap_core_map_c * get_subsection(); + + EAP_FUNC_IMPORT eap_variable_data_c * get_data(); - eap_variable_data_c * get_data(); + EAP_FUNC_IMPORT const eap_variable_data_c * get_const_data() const; - void set_type(const eap_configure_type_e type); + EAP_FUNC_IMPORT void set_type(const eap_configure_type_e type); - eap_configure_type_e get_type(); + EAP_FUNC_IMPORT eap_configure_type_e get_type(); + + EAP_FUNC_IMPORT eap_configure_type_e get_const_type() const; - void object_increase_reference_count(); + EAP_FUNC_IMPORT void object_increase_reference_count(); - bool get_is_valid(); + EAP_FUNC_IMPORT bool get_is_valid() const; }; @@ -220,6 +226,14 @@ eap_core_map_c * const config_map, const bool check_subsection_when_true); + eap_status_e read_all_configurations( + const eap_configuration_field_c * const field, + eap_variable_data_c* const data, + eap_core_map_c * const config_map); + + eap_status_e add_option( + const eap_tlv_header_c * const option_header); + public: EAP_FUNC_IMPORT eap_file_config_c( @@ -230,6 +244,9 @@ EAP_FUNC_IMPORT eap_status_e configure( abs_eap_am_file_input_c * const file); + EAP_FUNC_IMPORT eap_status_e read_configuration_message( + const eap_variable_data_c * const configuration_message); + EAP_FUNC_IMPORT eap_status_e read_configure( const eap_configuration_field_c * const field, eap_variable_data_c* const data);