MCL/sf/mw/accesssec: comparison eapol/eapol_framework/eapol_symbian/am/type/protected_setup/eap_am_type_protected_setup

equal deleted inserted replaced

-:30e048a7b597
+:bad0cc58d154
 * Description:  EAP and WLAN authentication protocols.
 *
 */
 /*
-* %version: 18.1.8 %
+* %version: 18.1.4.1.12 %
 */
 // This is enumeration of EAPOL source code.
 #if defined(USE_EAP_MINIMUM_RELEASE_TRACES)
 	#undef EAP_FILE_NUMBER_ENUM
 #include "eap_am_type_protected_setup_symbian.h"
 #include "eap_am_tools.h"
 #include "eap_state_notification.h"
 #include "eap_config.h"
-#include <wdbifwlansettings.h>
 #include "eap_type_simple_config_types.h"
 #include "eap_tlv_message_data.h"
 #include "abs_simple_config_am_services.h"
 #include "simple_config_credential.h"
 #include "abs_eap_configuration_if.h"
-#include "eap_am_trace_symbian.h"
+#include "EapTraceSymbian.h"
 #include <mmtsy_names.h>
 static const char EAP_AM_TYPE_SIMPLE_CONFIG_MEMORY_STORE_KEY[] = "eap_am_type_simple_config_simulator_c credential_store";
 // ================= MEMBER FUNCTIONS =======================
 //
-EAP_FUNC_EXPORT eap_am_type_protected_setup_symbian_c::eap_am_type_protected_setup_symbian_c(
+EAP_FUNC_EXPORT CEapAmProtectedSetupSymbian::CEapAmProtectedSetupSymbian(
 	abs_eap_am_tools_c * const tools,
 	abs_eap_base_type_c * const partner,
-	const TIndexType aIndexType,
+	const TIndexType /* aIndexType */,
 	const TInt aIndex,
-	const eap_type_value_e aTunnelingType,
+	const eap_type_value_e /* aTunnelingType */,
 	const eap_type_value_e eap_type,
 	const bool is_client_when_true,
 	const eap_am_network_id_c * const receive_network_id,
 	abs_eap_configuration_if_c * const configuration_if)
 : m_partner(partner)
 	EAP_TRACE_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("\n")));
 	EAP_TRACE_DEBUG(
 		m_am_tools,
 		TRACE_FLAGS_DEFAULT,
-		(EAPL("SIMPLE_CONFIG: %s: function: eap_am_type_protected_setup_symbian_c(): this = 0x%08x\n"),
+		(EAPL("SIMPLE_CONFIG: %s: function: CEapAmProtectedSetupSymbian(): this = 0x%08x\n"),
 		(m_is_client == true ? "client": "server"),
 		this));
 	if (receive_network_id == 0
 		|| receive_network_id->get_is_valid_data() == false)
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 }
 //--------------------------------------------------
-void eap_am_type_protected_setup_symbian_c::ConstructL()
+void CEapAmProtectedSetupSymbian::ConstructL()
 {
 	if (m_is_client == true)
 	{
 		m_prot_setup_if = CEapProtectedSetupInterface::NewL(m_am_tools, this);
 		if(m_prot_setup_if == NULL)
 	}
 }
 //--------------------------------------------------
-eap_am_type_protected_setup_symbian_c* eap_am_type_protected_setup_symbian_c::NewL(
+EAP_FUNC_EXPORT CEapAmProtectedSetupSymbian* CEapAmProtectedSetupSymbian::NewL(
 	abs_eap_am_tools_c * const tools,
 	abs_eap_base_type_c * const partner,
 	const TIndexType aIndexType,
 	const TInt aIndex,
 	const eap_type_value_e aTunnelingType,
 	const eap_type_value_e eap_type,
 	const bool is_client_when_true,
 	const eap_am_network_id_c * const receive_network_id,
 	abs_eap_configuration_if_c * const configuration_if)
 {
-	eap_am_type_protected_setup_symbian_c* self = new (ELeave) eap_am_type_protected_setup_symbian_c(
+	CEapAmProtectedSetupSymbian* self = new (ELeave) CEapAmProtectedSetupSymbian(
 		tools,
 		partner,
 		aIndexType,
 		aIndex,
 		aTunnelingType,
 }
 //--------------------------------------------------
 //
-EAP_FUNC_EXPORT eap_am_type_protected_setup_symbian_c::~eap_am_type_protected_setup_symbian_c()
+EAP_FUNC_EXPORT CEapAmProtectedSetupSymbian::~CEapAmProtectedSetupSymbian()
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 	EAP_TRACE_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("\n")));
 	EAP_TRACE_DEBUG(
 		m_am_tools,
 		TRACE_FLAGS_DEFAULT,
-		(EAPL("SIMPLE_CONFIG: %s: function: ~eap_am_type_protected_setup_symbian_c(): this = 0x%08x\n"),
+		(EAPL("SIMPLE_CONFIG: %s: function: ~CEapAmProtectedSetupSymbian(): this = 0x%08x\n"),
 		(m_is_client == true ? "client": "server"),
 		this));
 	EAP_ASSERT(m_shutdown_was_called == true);
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 }
 //--------------------------------------------------
-abs_simple_config_am_services_c * eap_am_type_protected_setup_symbian_c::get_simple_config_am_partner()
+abs_simple_config_am_services_c * CEapAmProtectedSetupSymbian::get_simple_config_am_partner()
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 	EAP_ASSERT_ALWAYS(m_simple_config_am_partner != 0);
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 	return m_simple_config_am_partner;
 }
 //--------------------------------------------------
-EAP_FUNC_EXPORT void eap_am_type_protected_setup_symbian_c::set_simple_config_am_partner(abs_simple_config_am_services_c * const simple_config_am_partner)
+EAP_FUNC_EXPORT void CEapAmProtectedSetupSymbian::set_simple_config_am_partner(abs_simple_config_am_services_c * const simple_config_am_partner)
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 	m_simple_config_am_partner = simple_config_am_partner;
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 }
 //--------------------------------------------------
-EAP_FUNC_EXPORT void eap_am_type_protected_setup_symbian_c::set_am_partner(abs_eap_am_type_simple_config_c * const partner)
+EAP_FUNC_EXPORT void CEapAmProtectedSetupSymbian::set_am_partner(abs_eap_am_type_simple_config_c * const partner)
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 	m_am_partner = partner;
 }
 //--------------------------------------------------
-EAP_FUNC_EXPORT eap_status_e eap_am_type_protected_setup_symbian_c::configure()
+EAP_FUNC_EXPORT eap_status_e CEapAmProtectedSetupSymbian::configure()
 {
 	EAP_TRACE_DEBUG(
 		m_am_tools,
 		TRACE_FLAGS_DEFAULT,
-		(EAPL("SIMPLE_CONFIG: %s: function: eap_am_type_protected_setup_symbian_c::configure()\n"),
+		(EAPL("SIMPLE_CONFIG: %s: function: CEapAmProtectedSetupSymbian::configure()\n"),
 		 (m_is_client == true ? "client": "server")));
 	if (m_configured == true)
 	{
 		EAP_TRACE_DEBUG(
 			m_am_tools,
 			TRACE_FLAGS_DEFAULT,
-			(EAPL("SIMPLE_CONFIG: %s: function: eap_am_type_protected_setup_symbian_c::configure(): Already configured.\n"),
+			(EAPL("SIMPLE_CONFIG: %s: function: CEapAmProtectedSetupSymbian::configure(): Already configured.\n"),
 			 (m_is_client == true ? "client": "server")));
 		EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 		return EAP_STATUS_RETURN(m_am_tools, eap_status_ok);
 	}
 	//----------------------------------------------------------
 	{
 		eap_variable_data_c use_manual_username(m_am_tools);
-		eap_status_e status = m_partner->read_configure(
+		eap_status_e status = type_configure_read(
 			cf_str_EAP_SIMPLE_CONFIG_use_manual_username.get_field(),
 			&use_manual_username);
 		if (status == eap_status_ok
 			&& use_manual_username.get_is_valid_data() == true)
 		{
 	//----------------------------------------------------------
 	if (m_use_manual_username == true)
 	{
-		eap_status_e status = m_partner->read_configure(
+		eap_status_e status = type_configure_read(
 			cf_str_EAP_SIMPLE_CONFIG_manual_username.get_field(),
 			&m_manual_username);
 		if (status == eap_status_ok
 			&& m_manual_username.get_is_valid_data() == true)
 		{
 }
 //--------------------------------------------------
-EAP_FUNC_EXPORT eap_status_e eap_am_type_protected_setup_symbian_c::reset()
+EAP_FUNC_EXPORT eap_status_e CEapAmProtectedSetupSymbian::reset()
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 	m_device_parameters_valid = false;
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 	return EAP_STATUS_RETURN(m_am_tools, eap_status_ok);
 }
 //--------------------------------------------------
-EAP_FUNC_EXPORT eap_status_e eap_am_type_protected_setup_symbian_c::shutdown()
+EAP_FUNC_EXPORT eap_status_e CEapAmProtectedSetupSymbian::shutdown()
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 	EAP_TRACE_DEBUG(
 		m_am_tools,
 		TRACE_FLAGS_DEFAULT,
-		(EAPL("SIMPLE_CONFIG: %s: function: eap_am_type_protected_setup_symbian_c::shutdown(): ")
+		(EAPL("SIMPLE_CONFIG: %s: function: CEapAmProtectedSetupSymbian::shutdown(): ")
 		 EAPL("this = 0x%08x\n"),
 		(m_is_client == true ? "client": "server"),
 		this));
 	if (m_shutdown_was_called == true)
 		(void) m_am_tools->memory_store_remove_data(&key);
 		EAP_TRACE_DEBUG(
 			m_am_tools,
 			TRACE_FLAGS_DEFAULT,
-			(EAPL("EAP_type_SIMPLE_CONFIG: eap_am_type_protected_setup_symbian_c::shutdown():")
+			(EAPL("EAP_type_SIMPLE_CONFIG: CEapAmProtectedSetupSymbian::shutdown():")
 			 EAPL("credentials removed from eapol\n")));
 		eap_tlv_message_data_c tlv_data(m_am_tools);
 	return EAP_STATUS_RETURN(m_am_tools, eap_status_ok);
 }
 //--------------------------------------------------
-void eap_am_type_protected_setup_symbian_c::send_error_notification(const eap_status_e error)
+void CEapAmProtectedSetupSymbian::send_error_notification(const eap_status_e error)
 {
 	{
 		eap_general_state_variable_e general_state_variable(eap_general_state_authentication_error);
 		if (error == eap_status_user_cancel_authentication)
 	}
 }
 //--------------------------------------------------
-EAP_FUNC_EXPORT eap_status_e eap_am_type_protected_setup_symbian_c::authentication_finished(
+EAP_FUNC_EXPORT eap_status_e CEapAmProtectedSetupSymbian::authentication_finished(
 	const bool true_when_successfull,
 	const bool true_when_session_resumed)
 {
 	EAP_UNREFERENCED_PARAMETER(true_when_successfull);  // for release
 	EAP_UNREFERENCED_PARAMETER(true_when_session_resumed); // for release
 	return eap_status_ok;
 }
 //--------------------------------------------------
-EAP_FUNC_EXPORT eap_status_e eap_am_type_protected_setup_symbian_c::query_eap_identity(
+EAP_FUNC_EXPORT eap_status_e CEapAmProtectedSetupSymbian::query_eap_identity(
-	const eap_am_network_id_c * const receive_network_id,
+	const eap_am_network_id_c * const /* receive_network_id */,
 	const u8_t eap_identifier,
-	bool * const use_manual_username,
+	bool * const /* use_manual_username */,
 	eap_variable_data_c * const manual_username,
-	bool *const use_manual_realm,
+	bool *const /* use_manual_realm */,
-	eap_variable_data_c * const manual_realm
+	eap_variable_data_c * const /* manual_realm */
 	)
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 	EAP_TRACE_DEBUG(
 	eap_status_e status(eap_status_process_general_error);
 	if (m_use_manual_username == true
 		&& m_manual_username.get_is_valid_data() == true)
 	{
+		EAP_TRACE_DEBUG(
+			m_am_tools,
+			TRACE_FLAGS_DEFAULT,
+			(EAPL("SIMPLE_CONFIG: %s: function: query_eap_identity(): manual username\n"),
+			 (m_is_client == true ? "client": "server")));
 		status = manual_username->set_copy_of_buffer(&m_manual_username);
 	}
 	m_eap_identifier = eap_identifier;
 }
 //--------------------------------------------------
 //
-EAP_FUNC_EXPORT eap_status_e eap_am_type_protected_setup_symbian_c::cancel_identity_query()
+EAP_FUNC_EXPORT eap_status_e CEapAmProtectedSetupSymbian::cancel_identity_query()
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 	EAP_TRACE_DEBUG(
 		m_am_tools,
 }
 //--------------------------------------------------
 //
-EAP_FUNC_EXPORT void eap_am_type_protected_setup_symbian_c::set_is_valid()
+EAP_FUNC_EXPORT void CEapAmProtectedSetupSymbian::set_is_valid()
 {
 	m_is_valid = true;
 }
 //--------------------------------------------------
 //
-EAP_FUNC_EXPORT bool eap_am_type_protected_setup_symbian_c::get_is_valid()
+EAP_FUNC_EXPORT bool CEapAmProtectedSetupSymbian::get_is_valid()
 {
 	return m_is_valid;
 }
 //--------------------------------------------------
 //
-EAP_FUNC_EXPORT eap_status_e eap_am_type_protected_setup_symbian_c::type_configure_read(
+EAP_FUNC_EXPORT eap_status_e CEapAmProtectedSetupSymbian::type_configure_read(
 	const eap_configuration_field_c * const field,
 	eap_variable_data_c * const data)
 {
 		// Here configuration data must be read from type spesific database (CommsDat).
 			return EAP_STATUS_RETURN(m_am_tools, status);
 		} // if (!wanted_field.compare(&type_field))
-	// NOTE: This is for simulation.
 	// Read is routed to partner object.
 	status = m_partner->read_configure(
 			field,
 			data);
 }
 //--------------------------------------------------
 //
-void eap_am_type_protected_setup_symbian_c::read_device_passwordL(
+void CEapAmProtectedSetupSymbian::read_device_passwordL(
 	eap_config_string /*field*/,
 	const u32_t /*field_length*/,
-	eap_variable_data_c * const data)
+	eap_variable_data_c * const /* data */)
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 	// Get the things from commsdat here.
+#if 0
 	// We need PSK (PIN code for protected setup) from the CommsDat.
 	// CommDbIf is used to get the PSK.
 	CWLanSettings* wlan_settings = new(ELeave) CWLanSettings;
 	CleanupStack::PushL(wlan_settings);
 	SWLANSettings wlanSettings;
 	TInt error(KErrNone);
 		// Could not connect to CommsDat
 		EAP_TRACE_DEBUG(
 			m_am_tools,
 			TRACE_FLAGS_DEFAULT, (
-			EAPL("ERROR: eap_am_type_protected_setup_symbian_c::read_device_passwordL() Connecting to CommsDat failed!\n")));
+			EAPL("ERROR: CEapAmProtectedSetupSymbian::read_device_passwordL() Connecting to CommsDat failed!\n")));
 		User::Leave(KErrCouldNotConnect);
 	}
 	EAP_TRACE_DEBUG(
 		m_am_tools,
 		TRACE_FLAGS_DEFAULT, (
-		EAPL("eap_am_type_protected_setup_symbian_c::read_device_passwordL() Connected to CommDbIf.\n")));
+		EAPL("CEapAmProtectedSetupSymbian::read_device_passwordL() Connected to CommDbIf.\n")));
 	error = wlan_settings->GetWlanSettingsForService(m_index, wlanSettings);
 	if ( error != KErrNone)
 	{
 		EAP_TRACE_DEBUG(
 			m_am_tools,
 			TRACE_FLAGS_DEFAULT, (
-			EAPL("ERROR: eap_am_type_protected_setup_symbian_c::read_device_passwordL() GetWlanSettingsForService failed, error=%d\n"),
+			EAPL("ERROR: CEapAmProtectedSetupSymbian::read_device_passwordL() GetWlanSettingsForService failed, error=%d\n"),
 			error));
 		wlan_settings->Disconnect();
 		User::Leave(error);
 	}
 	wlan_settings->Disconnect();
 	CleanupStack::PopAndDestroy(wlan_settings);
+#endif
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 }
 //--------------------------------------------------
 //
-EAP_FUNC_EXPORT eap_status_e eap_am_type_protected_setup_symbian_c::type_configure_write(
+EAP_FUNC_EXPORT eap_status_e CEapAmProtectedSetupSymbian::type_configure_write(
 	const eap_configuration_field_c * const field,
 	eap_variable_data_c * const data)
 {
 	// Here configuration data must be read from type spesific database.
 	return status;
 }
 //--------------------------------------------------
-abs_eap_am_type_simple_config_c * eap_am_type_protected_setup_symbian_c::get_am_partner()
+abs_eap_am_type_simple_config_c * CEapAmProtectedSetupSymbian::get_am_partner()
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 	return m_am_partner;
 }
 //--------------------------------------------------
-EAP_FUNC_EXPORT eap_status_e eap_am_type_protected_setup_symbian_c::query_network_and_device_parameters(
+EAP_FUNC_EXPORT eap_status_e CEapAmProtectedSetupSymbian::query_network_and_device_parameters(
 	const simple_config_state_e state)
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 	EAP_TRACE_DEBUG(
 		TRACE_FLAGS_DEFAULT,
 		(EAPL("\n")));
 	EAP_TRACE_DEBUG(
 		m_am_tools,
 		TRACE_FLAGS_DEFAULT,
-		(EAPL("SIMPLE_CONFIG: %s: eap_am_type_protected_setup_symbian_c::query_network_and_device_parameters()\n"),
+		(EAPL("SIMPLE_CONFIG: %s: CEapAmProtectedSetupSymbian::query_network_and_device_parameters()\n"),
 		(m_is_client == true ? "client": "server")));
 	eap_status_e status = eap_status_process_general_error;
 	m_simple_config_state = state;
 	// check if we already have done the query
 	if( m_device_parameters_valid == true )
 	{
 		EAP_TRACE_DEBUG_SYMBIAN(
-			(_L("eap_am_type_protected_setup_symbian_c::query_network_and_device_parameters: Parameters exist, completing query immediately.")));
+			(_L("CEapAmProtectedSetupSymbian::query_network_and_device_parameters: Parameters exist, completing query immediately.")));
 		// pass the parameters
 		status = get_simple_config_am_partner()->complete_query_network_and_device_parameters(
 			m_simple_config_state,
 			&m_network_and_device_parameters,
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 	EAP_TRACE_DEBUG(
 		m_am_tools,
 		TRACE_FLAGS_DEFAULT,
-		(EAPL("eap_am_type_protected_setup_symbian_c::query_network_and_device_parameters() m_Device_Password_ID=%d\n"),
+		(EAPL("CEapAmProtectedSetupSymbian::query_network_and_device_parameters() m_Device_Password_ID=%d\n"),
 		m_Device_Password_ID));
 	{
 		// This may be changed in future if more methods need to be supported.
 		simple_config_Config_Methods_e Config_Methods(simple_config_Config_Methods_Display);
 }
 //--------------------------------------------------
 // This is always synchronous call.
-EAP_FUNC_EXPORT eap_status_e eap_am_type_protected_setup_symbian_c::save_simple_config_session(
+EAP_FUNC_EXPORT eap_status_e CEapAmProtectedSetupSymbian::save_simple_config_session(
 	const simple_config_state_e state,
 	EAP_TEMPLATE_CONST eap_array_c<simple_config_credential_c> * const credential_array,
 	const eap_variable_data_c * const new_password,
 	const simple_config_Device_Password_ID_e Device_Password_ID,
 	const simple_config_payloads_c * const other_configuration)
 	return EAP_STATUS_RETURN(m_am_tools, status);
 }
 //--------------------------------------------------
-EAP_FUNC_EXPORT eap_status_e eap_am_type_protected_setup_symbian_c::received_registrar_information(
+EAP_FUNC_EXPORT eap_status_e CEapAmProtectedSetupSymbian::received_registrar_information(
 	EAP_TEMPLATE_CONST eap_array_c<simple_config_payloads_c> * const M2D_payloads)
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 	EAP_TRACE_DEBUG(
 	return EAP_STATUS_RETURN(m_am_tools, eap_status_ok);
 }
 //--------------------------------------------------
-EAP_FUNC_EXPORT eap_status_e eap_am_type_protected_setup_symbian_c::cancel_query_network_and_device_parameters()
+EAP_FUNC_EXPORT eap_status_e CEapAmProtectedSetupSymbian::cancel_query_network_and_device_parameters()
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 	EAP_TRACE_DEBUG(
 		m_am_tools,
 	return EAP_STATUS_RETURN(m_am_tools, eap_status_ok);
 }
 //--------------------------------------------------
-EAP_FUNC_EXPORT eap_status_e eap_am_type_protected_setup_symbian_c::load_module(
+EAP_FUNC_EXPORT eap_status_e CEapAmProtectedSetupSymbian::load_module(
 		const eap_type_value_e eap_type,
 		const eap_type_value_e tunneling_type,
 		abs_eap_base_type_c * const partner,
 		eap_base_type_c ** const eap_type_if,
 		const bool is_client_when_true,
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 	EAP_TRACE_DEBUG(
 		m_am_tools,
 		TRACE_FLAGS_DEFAULT,
-		(EAPL("eap_am_type_protected_setup_symbian_c::load_module(0x%08x)\n"),
+		(EAPL("CEapAmProtectedSetupSymbian::load_module(0x%08x)\n"),
 		 convert_eap_type_to_u32_t(eap_type)));
 	eap_status_e status = m_partner->load_module(
 		eap_type,
 		tunneling_type,
 	return EAP_STATUS_RETURN(m_am_tools, status);
 }
 //--------------------------------------------------
-EAP_FUNC_EXPORT eap_status_e eap_am_type_protected_setup_symbian_c::check_is_valid_eap_type(const eap_type_value_e eap_type)
+EAP_FUNC_EXPORT eap_status_e CEapAmProtectedSetupSymbian::check_is_valid_eap_type(const eap_type_value_e eap_type)
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 	EAP_TRACE_DEBUG(
 		m_am_tools,
 		TRACE_FLAGS_DEFAULT,
-		(EAPL("eap_am_type_protected_setup_symbian_c::check_is_valid_eap_type(0x%08x)\n"),
+		(EAPL("CEapAmProtectedSetupSymbian::check_is_valid_eap_type(0x%08x)\n"),
 		 convert_eap_type_to_u32_t(eap_type)));
 	eap_status_e status = m_partner->check_is_valid_eap_type(
 		eap_type);
 	return EAP_STATUS_RETURN(m_am_tools, status);
 }
 //--------------------------------------------------
-EAP_FUNC_EXPORT eap_status_e eap_am_type_protected_setup_symbian_c::get_eap_type_list(
+EAP_FUNC_EXPORT eap_status_e CEapAmProtectedSetupSymbian::get_eap_type_list(
 	eap_array_c<eap_type_value_e> * const eap_type_list)
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 	eap_status_e status = m_partner->get_eap_type_list(eap_type_list);
 	return EAP_STATUS_RETURN(m_am_tools, status);
 }
 //--------------------------------------------------
-EAP_FUNC_EXPORT eap_status_e eap_am_type_protected_setup_symbian_c::unload_module(const eap_type_value_e eap_type)
+EAP_FUNC_EXPORT eap_status_e CEapAmProtectedSetupSymbian::unload_module(const eap_type_value_e eap_type)
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 	EAP_TRACE_DEBUG(
 		m_am_tools,
 		TRACE_FLAGS_DEFAULT,
-		(EAPL("eap_am_type_protected_setup_symbian_c::unload_module(0x%08x)\n"),
+		(EAPL("CEapAmProtectedSetupSymbian::unload_module(0x%08x)\n"),
 		convert_eap_type_to_u32_t(eap_type)));
 	eap_status_e status = m_partner->unload_module(
 		eap_type);
 	return EAP_STATUS_RETURN(m_am_tools, status);
 }
 //--------------------------------------------------
-EAP_FUNC_EXPORT eap_status_e eap_am_type_protected_setup_symbian_c::complete_protected_setup_device_paramsL(
+EAP_FUNC_EXPORT eap_status_e CEapAmProtectedSetupSymbian::complete_protected_setup_device_paramsL(
 	const RMobilePhone::TMobilePhoneIdentityV1 &phone_identity,
 	const eap_status_e completion_status )
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 	eap_status_e status(eap_status_process_general_error);
 		// Use model as the device name as well
 		// since there is nothing better for the purpose.
 		EAP_TRACE_DEBUG_SYMBIAN(
-			(_L("eap_am_type_protected_setup_symbian_c::complete_protected_setup_device_paramsL: Uses model as device name.")));
+			(_L("CEapAmProtectedSetupSymbian::complete_protected_setup_device_paramsL: Uses model as device name.")));
 		status = m_network_and_device_parameters.copy_attribute_data(
 				simple_config_Attribute_Type_Device_Name,
 				true,
 				attribute_data_Ptr.Ptr(),
 	return status;
 }
 //--------------------------------------------------
-void eap_am_type_protected_setup_symbian_c::ConvertUnicodeToAsciiL(const TDesC16& aFromUnicode, TDes8& aToAscii)
+void CEapAmProtectedSetupSymbian::ConvertUnicodeToAsciiL(const TDesC16& aFromUnicode, TDes8& aToAscii)
 {
 		EAP_TRACE_DATA_DEBUG_SYMBIAN(
-			("eap_am_type_protected_setup_symbian_c::ConvertUnicodeToAsciiL:From TEXT",
+			("CEapAmProtectedSetupSymbian::ConvertUnicodeToAsciiL:From TEXT",
 			aFromUnicode.Ptr(),
 			aFromUnicode.Size()));
 		if(aFromUnicode.Length() <= 0)
 		{
 			EAP_TRACE_DEBUG_SYMBIAN(
-			(_L("eap_am_type_protected_setup_symbian_c::ConvertUnicodeToAsciiL: Return: NOTHING TO CONVERT")));
+			(_L("CEapAmProtectedSetupSymbian::ConvertUnicodeToAsciiL: Return: NOTHING TO CONVERT")));
 			return;
 		}
 		EAP_TRACE_DEBUG_SYMBIAN(
-			(_L("eap_am_type_protected_setup_symbian_c::ConvertUnicodeToAsciiL, aFromUnicode.Length=%d, aFromUnicode.Size=%d"),
+			(_L("CEapAmProtectedSetupSymbian::ConvertUnicodeToAsciiL, aFromUnicode.Length=%d, aFromUnicode.Size=%d"),
 			aFromUnicode.Length(), aFromUnicode.Size()));
 		// Convert from Unicode to ascii.
 		HBufC8* aFromUnicodeBuf8 = HBufC8::NewLC(aFromUnicode.Length()); // Half times size of source (or length) is enough here.
 		TPtr8 aFromUnicodePtr8 = aFromUnicodeBuf8->Des();
 		EAP_TRACE_DEBUG_SYMBIAN(
-			(_L("eap_am_type_protected_setup_symbian_c::ConvertUnicodeToAsciiL, aFromUnicodePtr8.Length=%d, aFromUnicodePtr8.Size=%d, aFromUnicodePtr8.MaxLength=%d, aFromUnicodePtr8.MaxSize=%d"),
+			(_L("CEapAmProtectedSetupSymbian::ConvertUnicodeToAsciiL, aFromUnicodePtr8.Length=%d, aFromUnicodePtr8.Size=%d, aFromUnicodePtr8.MaxLength=%d, aFromUnicodePtr8.MaxSize=%d"),
 			aFromUnicodePtr8.Length(), aFromUnicodePtr8.Size(), aFromUnicodePtr8.MaxLength(), aFromUnicodePtr8.MaxSize()));
 		aFromUnicodePtr8.Copy(aFromUnicode); // Unicode -> ascii.
 		aToAscii = aFromUnicodePtr8;
 		CleanupStack::PopAndDestroy(aFromUnicodeBuf8); // Delete aFromUnicodeBuf8.
 		EAP_TRACE_DATA_DEBUG_SYMBIAN(
-			("eap_am_type_protected_setup_symbian_c::ConvertUnicodeToAsciiL:To ASCII",
+			("CEapAmProtectedSetupSymbian::ConvertUnicodeToAsciiL:To ASCII",
 			aToAscii.Ptr(),
 			aToAscii.Size()));
 }
 //--------------------------------------------------

branch	RCL_3
changeset 18	bad0cc58d154
parent 2	1c7bc153c08e
child 19	c74b3d9f6b9e