--- a/eapol/eapol_framework/eapol_common/type/gsmsim/core/eap_type_gsmsim.cpp Thu Aug 19 09:58:27 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/type/gsmsim/core/eap_type_gsmsim.cpp Tue Aug 31 15:16:37 2010 +0300
@@ -16,7 +16,7 @@
*/
/*
-* %version: 27.1.4 %
+* %version: 37 %
*/
// This is enumeration of EAPOL source code.
@@ -344,7 +344,7 @@
#if !defined(NO_EAP_TYPE_GSMSIM_MESSAGE_STATE_CHECK)
//
-void eap_type_gsmsim_c::initialize_state(
+EAP_FUNC_EXPORT void eap_type_gsmsim_c::initialize_state(
const eap_type_gsmsim_state_variable_e state,
const bool must_be_initiator,
const bool must_be_responder,
@@ -626,7 +626,7 @@
* This function saves the current m_state to m_saved_previous_state.
* The saved state is restored in error case.
*/
-void eap_type_gsmsim_c::save_current_state()
+EAP_FUNC_EXPORT void eap_type_gsmsim_c::save_current_state()
{
m_saved_previous_state = m_state;
}
@@ -636,7 +636,7 @@
/**
* This function restores the saved state.
*/
-void eap_type_gsmsim_c::restore_saved_previous_state()
+EAP_FUNC_EXPORT void eap_type_gsmsim_c::restore_saved_previous_state()
{
set_state(m_saved_previous_state);
}
@@ -2719,7 +2719,7 @@
payload->get_payload_length(),
payload->get_reserved()));
- status = p_gsmsim_payloads->get_COUNTER_TOO_SMALL()->set_buffer(
+ status = p_gsmsim_payloads->get_counter_too_small()->set_buffer(
payload, 0, 0u, false, false);
EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
@@ -3665,8 +3665,6 @@
//--------------------------------------------------
-#if defined(USE_EAP_TRACE)
-
//
EAP_FUNC_EXPORT void eap_type_gsmsim_c::packet_trace(
eap_const_string prefix,
@@ -3777,7 +3775,6 @@
EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
}
-#endif //#if defined(USE_EAP_TRACE)
//--------------------------------------------------
@@ -4656,8 +4653,8 @@
TRACE_FLAGS_DEFAULT,
(EAPL("received: GSMSIM packet"),
received_gsmsim->get_header_buffer(
- received_gsmsim->get_header_length()+received_gsmsim->get_data_length()),
- received_gsmsim->get_header_length()+received_gsmsim->get_data_length()));
+ received_gsmsim->get_header_buffer_length()),
+ received_gsmsim->get_header_buffer_length()));
if (received_gsmsim->get_type() == eap_type_identity)
{
@@ -6479,7 +6476,6 @@
//----------------------------------------------------------
-#if defined(USE_EAP_EXPANDED_TYPES)
{
eap_variable_data_c use_eap_expanded_type(m_am_tools);
@@ -6513,7 +6509,6 @@
}
}
}
-#endif //#if defined(USE_EAP_EXPANDED_TYPES)
//----------------------------------------------------------
@@ -6794,21 +6789,6 @@
//--------------------------------------------------
-//
-EAP_FUNC_EXPORT eap_status_e eap_type_gsmsim_c::cancel_all_timers()
-{
- EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
-
- EAP_ASSERT(m_am_tools->get_global_mutex()->get_is_reserved() == true);
-
- const eap_status_e status = get_type_partner()->cancel_all_timers();
-
- EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
- return EAP_STATUS_RETURN(m_am_tools, status);
-}
-
-//--------------------------------------------------
-
void eap_type_gsmsim_c::set_start_response_includes_identity(gsmsim_payload_AT_type_e type)
{
EAP_TRACE_DEBUG(