FCL/sf/mw/accesssec: comparison eapol/eapol_framework/eapol_symbian/am/eapvpnif/src/eap_vpn_if

equal deleted inserted replaced

-:e863583e6720
+:c23bdf5a328a
 * Description:  CEapVpnInterfaceImplementation
 *
 */
 /*
-* %version: 61 %
+* %version: 67 %
 */
 // INCLUDE FILES
 #include <w32std.h>
 #include <pathinfo.h>
 #include <EapType.h>
 #include <EapTypePlugin.h>
+#include <EapGeneralSettings.h>
 #include "eap_vpn_if_implementation.h"
 #include "eap_am_memory.h"
 #include "eap_tools.h"
 #include "eap_type_all.h"
 #include "EapConversion.h"
 #include "eap_session_core_base.h"
 #include "eap_automatic_variable.h"
 #include "eap_core_client_message_if.h"
 #include "eap_process_tlv_message_data.h"
+#include "eapol_wlan_database_reference.h"
 // LOCAL CONSTANTS
 const TUint KMaxConfigStringLength = 256;
 const u32_t KMTU = 1500u;
 const u32_t KTrailerLength = 0;
 const u32_t KHeaderOffset = 0;
 #define KEapIdentityOffset 5
+#ifdef USE_EAP_VPN_FILETRACE
 const eap_const_string EAPPLUGIN_TRACE_FILE = EAPL("logs\\eapol\\eap_vpn_if.txt");
+#endif
 enum eapol_am_core_timer_id_e
 {
 	EAPOL_AM_CORE_TIMER_RESTART_AUTHENTICATION_ID,
 	EAPOL_AM_CORE_TIMER_DELETE_STACK_ID,
 	{
 		User::Leave(KErrGeneral);
 	}
+#ifdef USE_EAP_VPN_FILETRACE
 	{
 		TFileName drivePath( PathInfo::MemoryCardRootPath() );
 		const TInt MAXPATHNAME=256ul;
 			}
 		}
 		CleanupStack::PopAndDestroy(buf); // Delete pathbuffer.
 	}
+#endif
 	m_eap_type_array = new eap_array_c<eap_type_value_e>(m_am_tools);
 	if (m_eap_type_array == 0)
 	{
 		User::Leave(KErrGeneral);
 	}
 	EAP_TRACE_DEBUG(
 		m_am_tools,
 		TRACE_FLAGS_DEFAULT,
 		(EAPL("CEapVpnInterfaceImplementation::~CEapVpnInterfaceImplementation() - destructor\n")));
+#ifdef USE_EAP_VPN_FILETRACE
 	delete m_trace_log_file_name;
 	m_trace_log_file_name = 0;
+#endif
 	shutdown();
 }
 		delete m_am_tools;
 	}
 	return eap_status_ok;
 }
 //--------------------------------------------------
 //
 void CEapVpnInterfaceImplementation::RunL()
 	// All of the configuration options are optional.
 	// So we return OK.
 	return eap_status_ok;
 }
 //----------------------------------------------------------
 // Implementations of virtual functions from CEapVpnInterface
 //----------------------------------------------------------
 		TRACE_FLAGS_DEFAULT,
 		(EAPL("CEapVpnInterfaceImplementation::EapConfigure(): iRealmPrefix\n"),
 		iRealmPrefix->Ptr(),
 		iRealmPrefix->Size()));
+		//--------------------------------------------------------
+		//--------------------------------------------------------
+		// Set the values for realm and user name if there is any.
+		// If there is no values the default settings will be used( automatic realm and username).
+	{
+		EAP_TRACE_DEBUG(
+			m_am_tools,
+			TRACE_FLAGS_DEFAULT,
+			(EAPL("CEapVpnInterfaceImplementation::EapConfigure(): About to configure manual/auto username and manual/auto realm, m_index_type=%d, m_index=%d\n"),
+			m_index_type,
+			m_index));
+		CEapType* eapType = 0;
+		// Check if this EAP type has already been loaded
+		i32_t eapArrayIndex = find<eap_type_value_e>(
+			m_eap_type_array,
+			&iRequestedEapType,
+			m_am_tools);
+		if (eapArrayIndex >= 0)
+		{
+			// Yep. It was loaded already.
+			EAP_TRACE_DEBUG(
+				m_am_tools,
+				TRACE_FLAGS_DEFAULT,
+				(EAPL("CEapVpnInterfaceImplementation::EapConfigure(): EAP Type Already loaded\n")));
+			eapType = m_eap_if_array[eapArrayIndex];
+		}
+		else
+		{
+			// We must have a trap here since the EAP core knows nothing about Symbian.
+			EAP_TRACE_DEBUG(
+				m_am_tools,
+				TRACE_FLAGS_DEFAULT,
+				(EAPL("CEapVpnInterfaceImplementation::EapConfigure(): EAP Type new\n")));
+			TEapExpandedType aEapType;
+			TInt error = CEapConversion::ConvertInternalTypeToExpandedEAPType(
+				&iRequestedEapType,
+				&aEapType);
+			if (error != KErrNone)
+			{
+				EAP_TRACE_DEBUG_SYMBIAN(
+					(_L("ERROR: CEapVpnInterfaceImplementation::EapConfigure(): Error from CEapConversion::ConvertExpandedEAPTypeToInternalType()=%d\n"),
+					error));
+				EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
+				return EAP_STATUS_RETURN(m_am_tools, m_am_tools->convert_am_error_to_eapol_error(error));
+			}
+			TRAP(error, (eapType = CEapType::NewL(m_index_type, m_index, aEapType)));
+			if (error != KErrNone
+				|| eapType == 0)
+			{
+				// Interface not found or implementation creation function failed
+				delete eapType;
+				EAP_TRACE_DEBUG(
+					m_am_tools,
+					TRACE_FLAGS_DEFAULT,
+					(EAPL("CEapVpnInterfaceImplementation::EapConfigure(): EAP Type new, unable to load\n")));
+				EAP_TRACE_ALWAYS(
+					m_am_tools,
+					TRACE_FLAGS_DEFAULT,
+					(EAPL("ECom could not find/initiate implementation.\n")));
+				return EAP_STATUS_RETURN(m_am_tools, eap_status_allocation_error);
+			}
+			// Add EAP-interface information to the member arrays.
+			if (m_eap_if_array.Append(eapType) != KErrNone)
+			{
+				delete eapType;
+				return EAP_STATUS_RETURN(m_am_tools, eap_status_allocation_error);
+			}
+		}
+		EAPSettings* setSettings = new EAPSettings;
+		if( setSettings == NULL )
+		{
+			EAP_TRACE_DEBUG(
+				m_am_tools,
+				TRACE_FLAGS_DEFAULT,
+				(EAPL("CEapVpnInterfaceImplementation::EapConfigure(): EAPSettings allocation error \n")));
+			EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
+			return EAP_STATUS_RETURN(m_am_tools, eap_status_allocation_error);
+		}
+		if(iRequestedEapType == eap_type_aka)
+		{
+			setSettings->iEAPExpandedType = *EapExpandedTypeAka.GetType();
+		}
+		else if(iRequestedEapType == eap_type_gsmsim)
+		{
+			setSettings->iEAPExpandedType = *EapExpandedTypeSim.GetType();
+		}
+		else
+		{
+			delete setSettings;
+			// Only EAP-SIM and AKA are possible now.
+			EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
+			return EAP_STATUS_RETURN(m_am_tools, eap_status_illegal_eap_type);
+		}
+		if(iManualUsername && iManualUsername->Length() != 0)
+		{
+		setSettings->iUsernamePresent = ETrue; // Same value for both SIM and AKA.
+	    	setSettings->iUsername.Copy(iManualUsername->Des());
+		}
+		else
+		{
+	    	// No user name. we have to set automatic now.
+	    	setSettings->iUsernamePresent = EFalse; // Same value for both SIM and AKA.
+	    	setSettings->iUseAutomaticUsernamePresent = ETrue; // Same value for both SIM and AKA.
+	    	setSettings->iUseAutomaticUsername = ETrue; // Same value for both SIM and AKA.
+		}
+		if(iManualRealm && iManualRealm->Length() != 0)
+		{
+	    	setSettings->iRealmPresent = ETrue; // Same value for both SIM and AKA.
+	    	setSettings->iRealm.Copy(iManualRealm->Des());
+		}
+		else
+		{
+	    	// No realm. we have to set automatic now.
+	    	setSettings->iRealmPresent = EFalse; // Same value for both SIM and AKA.
+	    	setSettings->iUseAutomaticRealmPresent = ETrue; // Same value for both SIM and AKA.
+	    	setSettings->iUseAutomaticRealm = ETrue; // Same value for both SIM and AKA.
+		}
+		TRAP(error, eapType->SetConfigurationL(*setSettings) );
+		delete setSettings;
+		setSettings = 0;
+		if ( error != KErrNone )
+		{
+			EAP_TRACE_DEBUG(
+				m_am_tools,
+				TRACE_FLAGS_DEFAULT,
+				(EAPL("ERROR: CEapVpnInterfaceImplementation::EapConfigure(): Setting Manual Username and Realm failed. SetConfigurationL() error=%d\n")));
+			return error;
+		}
+	}
+	{
+		CEapGeneralSettings* genSet = NULL;
+		TRAPD(error, genSet = CEapGeneralSettings::NewL(m_index_type, m_index));
+		if (error != KErrNone)
+		{
+			delete genSet;
+			EAP_TRACE_DEBUG(
+				m_am_tools,
+				TRACE_FLAGS_DEFAULT,
+				(EAPL("ERROR: CEapVpnInterfaceImplementation::EapConfigure(): CEapGeneralSettings::NewL() error=%d\n")));
+			return error;
+		}
+		TEapExpandedType tmpEap;
+		RArray<TEapExpandedType> OuterEapsOn;
+	    RArray<TEapExpandedType> OuterEapsOff;
+		tmpEap.SetValue(
+			iRequestedEapType.get_vendor_id(),
+			iRequestedEapType.get_vendor_type());
+		error = OuterEapsOn.Append(tmpEap);
+		if(error != KErrNone)
+		{
+			OuterEapsOn.Close();
+			OuterEapsOff.Close();
+			delete genSet;
+			EAP_TRACE_DEBUG(
+				m_am_tools,
+				TRACE_FLAGS_DEFAULT,
+				(EAPL("ERROR: CEapVpnInterfaceImplementation::EapConfigure(): OuterEapsOn.Append() error=%d\n")));
+			return error;
+		}
+		error = genSet->SetEapMethods(OuterEapsOn, OuterEapsOff);
+		OuterEapsOn.Close();
+		OuterEapsOff.Close();
+		delete genSet;
+		if (error != KErrNone)
+		{
+			EAP_TRACE_DEBUG(
+				m_am_tools,
+				TRACE_FLAGS_DEFAULT,
+				(EAPL("ERROR: CEapVpnInterfaceImplementation::EapConfigure(): SetEapMethods() error=%d\n")));
+			return error;
+		}
+	}
+	{
+		eap_status_e status(eap_status_ok);
+		eap_variable_data_c reference(m_am_tools);
+		{
+			eapol_wlan_database_reference_values_s values = {m_index_type, m_index};
+			status = reference.set_copy_of_buffer(&values, sizeof(values));
+			if (status != eap_status_ok)
+			{
+				return m_am_tools->convert_eapol_error_to_am_error(
+					EAP_STATUS_RETURN(m_am_tools, status));
+			}
+		}
+		status = iEapCore->set_eap_database_reference_values(&reference);
+		if (status != eap_status_ok)
+		{
+			return m_am_tools->convert_eapol_error_to_am_error(
+				EAP_STATUS_RETURN(m_am_tools, status));
+		}
+		eap_variable_data_c SSID(m_am_tools);
+		if (SSID.get_is_valid() == false)
+		{
+			EAP_TRACE_ERROR(
+				m_am_tools,
+				TRACE_FLAGS_DEFAULT,
+				(EAPL("CEapVpnInterfaceImplementation::EapConfigure(): SSID failed.\n")));
+			return m_am_tools->convert_eapol_error_to_am_error(
+				EAP_STATUS_RETURN(m_am_tools, eap_status_allocation_error));
+		}
+		const u8_t dummy[] = "dummy";
+		status = SSID.set_copy_of_buffer(dummy, sizeof(dummy));
+		if (status != eap_status_ok)
+		{
+			return m_am_tools->convert_eapol_error_to_am_error(
+				EAP_STATUS_RETURN(m_am_tools, status));
+		}
+		eap_variable_data_c preshared_key(m_am_tools);
+		if (preshared_key.get_is_valid() == false)
+		{
+			EAP_TRACE_ERROR(
+				m_am_tools,
+				TRACE_FLAGS_DEFAULT,
+				(EAPL("CEapVpnInterfaceImplementation::EapConfigure(): preshared_key failed.\n")));
+			return m_am_tools->convert_eapol_error_to_am_error(
+				EAP_STATUS_RETURN(m_am_tools, eap_status_allocation_error));
+		}
+		// This is asynchronous function call that is completed by complete_get_802_11_authentication_mode() function call.
+		status = iEapCore->get_802_11_authentication_mode(
+			m_receive_network_id,
+			eapol_key_authentication_type_RSNA_EAP,
+			&SSID,
+			&preshared_key);
+		if (status != eap_status_ok)
+		{
+			return m_am_tools->convert_eapol_error_to_am_error(
+				EAP_STATUS_RETURN(m_am_tools, status));
+		}
+		status = wait_complete_get_802_11_authentication_mode();
+		if (status != eap_status_ok)
+		{
+			return m_am_tools->convert_eapol_error_to_am_error(
+				EAP_STATUS_RETURN(m_am_tools, status));
+		}
+		// Creates a EAP-session.
+		status = iEapCore->create_eap_session(m_receive_network_id);
+		if (status != eap_status_ok)
+		{
+			return m_am_tools->convert_eapol_error_to_am_error(
+				EAP_STATUS_RETURN(m_am_tools, status));
+		}
+	}
 	return KErrNone;
 }
+//--------------------------------------------------
 /**
 * Function:    StartL
 *
 * Description: Initializes the eap plugin
 *
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 	return m_am_tools->convert_eapol_error_to_am_error(EAP_STATUS_RETURN(m_am_tools, status));
 }
+//--------------------------------------------------
 /**
 * Function:    QueryIdentity
 *
 * Description: Ask the identity
 *
 	eap_request.set_code(eap_code_request);
 	eap_request.set_identifier(0);
 	eap_request.set_type_data_length(0u, false);
 	eap_request.set_type(eap_type_identity, false);
+	EAP_TRACE_DEBUG(
+		m_am_tools,
+		TRACE_FLAGS_DEFAULT,
+		(EAPL("CEapVpnInterfaceImplementation::send_eap_identity_request(): %s, code=0x%02x=%s, identifier=0x%02x, length=0x%04x, type=0x%08x=%s, packet length 0x%04x\n"),
+		(m_is_client == true) ? "client": "server",
+		eap_request.get_code(),
+		eap_request.get_code_string(),
+		eap_request.get_identifier(),
+		eap_request.get_length(),
+		convert_eap_type_to_u32_t(eap_request.get_type()),
+		eap_request.get_type_string(),
+		eap_request.get_length()));
 	EAP_ASSERT(eap_request.get_length() >= 4);
 	status = iEapCore->packet_process(
 		m_receive_network_id,
 		&eap_request,
 		EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 	return EAP_STATUS_RETURN(m_am_tools, status);
 }
+//--------------------------------------------------
 /**
 * Function:    EapInbound
 *
 * Description: Handle incoming eap message.
 	eap_header_wr_c eap_request(
 		m_am_tools,
 		request_packet.get_data_offset(0, aMessage.Length()),
 		aMessage.Length());
+	EAP_TRACE_DEBUG(
+		m_am_tools,
+		TRACE_FLAGS_DEFAULT,
+		(EAPL("CEapVpnInterfaceImplementation::EapInbound(): %s, code=0x%02x=%s, identifier=0x%02x, length=0x%04x, type=0x%08x=%s, packet length 0x%04x\n"),
+		(m_is_client == true) ? "client": "server",
+		eap_request.get_code(),
+		eap_request.get_code_string(),
+		eap_request.get_identifier(),
+		eap_request.get_length(),
+		convert_eap_type_to_u32_t(eap_request.get_type()),
+		eap_request.get_type_string(),
+		eap_request.get_length()));
+	EAP_TRACE_DATA_DEBUG(
+		m_am_tools,
+		TRACE_FLAGS_DEFAULT,
+		(EAPL("CEapVpnInterfaceImplementation::EapInbound(): EAP-packet"),
+		aMessage.Ptr(),
+		aMessage.Length()));
 	// Forward the packet to the Eap layer of the EAPOL stack. Ignore return value. Failure is signalled using state_notification.
 	status = iEapCore->packet_process(
 		m_receive_network_id,
 		&eap_request,
 		length);
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 	return status;
 }
+//--------------------------------------------------
 // Virtual callback function implementations, called by the eap_core
 /**
 * The derived class could send packets to partner class with this function.
 		EAP_TRACE_ALWAYS(
 			m_am_tools,
 			TRACE_FLAGS_DEFAULT,
 			(EAPL("packet_send: packet buffer corrupted.\n")));
 		EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
-		return eap_status_process_general_error;
+		return EAP_STATUS_RETURN(m_am_tools, eap_status_process_general_error);
 	}
 	else if (header_offset+data_length != sent_packet->get_data_length())
 	{
 		EAP_TRACE_ALWAYS(
 			m_am_tools,
 			TRACE_FLAGS_DEFAULT,
 			(EAPL("ERROR: packet_send: packet buffer corrupted (data_length != sent_packet->get_data_length()).\n")));
 			EAP_ASSERT(data_length == sent_packet->get_buffer_length());
 		EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
-		return eap_status_process_general_error;
+		return EAP_STATUS_RETURN(m_am_tools, eap_status_process_general_error);
 	}
 	if (m_block_packet_sends_and_notifications == true)
 	{
 		// Packet sending block is active. This happens when disassociated has been called.
 		m_am_tools,
 		sent_packet->get_data_offset(
 			header_offset, data_length),
 			data_length);
+	EAP_TRACE_DEBUG(
+		m_am_tools,
+		TRACE_FLAGS_DEFAULT,
+		(EAPL("CEapVpnInterfaceImplementation::packet_send(): %s, code=0x%02x=%s, identifier=0x%02x, length=0x%04x, type=0x%08x=%s, packet length 0x%04x\n"),
+		(m_is_client == true) ? "client": "server",
+		eap.get_code(),
+		eap.get_code_string(),
+		eap.get_identifier(),
+		eap.get_length(),
+		convert_eap_type_to_u32_t(eap.get_type()),
+		eap.get_type_string(),
+		eap.get_length()));
 	TInt status(KErrNone);
 	if (status == KErrNone)
 	{
 		u8_t * const packet_data = sent_packet->get_data_offset(header_offset, data_length);
 		if (packet_data == 0)
 		{
-		EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
+			EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
-		return eap_status_buffer_too_short;
+			return eap_status_buffer_too_short;
 		}
+		EAP_TRACE_DATA_DEBUG(
+			m_am_tools,
+			TRACE_FLAGS_DEFAULT,
+			(EAPL("CEapVpnInterfaceImplementation::packet_send(): EAP-packet"),
+			packet_data,
+			data_length));
 		// Here we send the original packet.
 		HBufC8* eapData = NULL;
 		TInt error = KErrNone;
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 	return EAP_STATUS_RETURN(m_am_tools, m_am_tools->convert_am_error_to_eapol_error(status));
 }
+//--------------------------------------------------
 /**
 * The get_header_offset() function obtains the header offset of EAP-packet.
 * @see abs_eap_base_type_c::get_header_offset().
 */
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 	return KHeaderOffset;
 }
+//--------------------------------------------------
 /**
 * The load_module() function function indicates the lower level to
 * load new module of EAP-type.
 * @param type is the requested EAP-type.
 				EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 				return EAP_STATUS_RETURN(m_am_tools, status);
 			}
 		}
+#if 0
 		//--------------------------------------------------------
 		//--------------------------------------------------------
 		// Set the values for realm and user name if there is any.
 		// If there is no values the default settings will be used( automatic realm and username).
 		{
 			EAP_TRACE_DEBUG(
 				m_am_tools,
 				TRACE_FLAGS_DEFAULT,
 			}
 			delete setSettings;
 			setSettings = 0;
 		}
+#endif
 	}
 	//--------------------------------------------------------
 	//--------------------------------------------------------
 	// Create the EAP protocol interface implementation.
 	EAP_TRACE_DEBUG(
 		m_am_tools,
 		TRACE_FLAGS_DEFAULT,
 		(EAPL("CEapVpnInterfaceImplementation: EAP Type new, GetStackInterfaceL()\n")));
 	{
 		CEapTypePlugin* eapPlugin = 0;
-		TRAP(error, (eapPlugin = CEapTypePlugin::NewL(aEapType.GetValue(), m_index_type, m_index)));
+		TRAP(error, (eapPlugin = CEapTypePlugin::NewL(aEapType.GetValue(), m_index_type, m_index, m_am_tools)));
 		if (error != KErrNone
 			|| eapPlugin == 0)
 		{
 			// Interface not found or implementation creation function failed
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 	return EAP_STATUS_RETURN(m_am_tools, status);
 }
+//--------------------------------------------------
 /**
 * The unload_module() function unloads the module of a EAP-type.
 * @param eap_type is the requested EAP-type.
 */
 eap_status_e CEapVpnInterfaceImplementation::unload_module(const eap_type_value_e type)
 void CEapVpnInterfaceImplementation::set_is_valid()
 {
 	m_is_valid = true;
 }
+//--------------------------------------------------
 bool CEapVpnInterfaceImplementation::get_is_valid()
 {
 	return m_is_valid;
 }
+//--------------------------------------------------
 void CEapVpnInterfaceImplementation::increment_authentication_counter()
 {
 	++m_authentication_counter;
 }
+//--------------------------------------------------
 u32_t CEapVpnInterfaceImplementation::get_authentication_counter()
 {
 	return m_authentication_counter;
 }
+//--------------------------------------------------
 bool CEapVpnInterfaceImplementation::get_is_client()
 {
 	return m_is_client;
 }
+//--------------------------------------------------
 /**
 * Note this function is just an example. Parameters will change later.
 * The packet_data_crypto_keys() function gives the generated keys to lower level.
 * After EAP-authentication has generated the keys it calls this function
 	}
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 	return eap_status_ok;
 }
+//--------------------------------------------------
 /**
 * The packet_data_session_key() function passes one traffic encryption key to
 * the lower layers. Ultimately the key can end up to the WLAN hardware.
 * @param send_network_id carries the addresses (network identity) and type of the packet.
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 	return EAP_STATUS_RETURN(m_am_tools, m_am_tools->convert_am_error_to_eapol_error(status));
 }
+//--------------------------------------------------
 eap_status_e CEapVpnInterfaceImplementation::add_configuration_data(
 	eap_process_tlv_message_data_c * const message,
 	const eap_configuration_field_c * field,
-	const eap_configure_type_e /* type */,
+	const eap_configure_type_e type,
 	const eap_variable_data_c * const value_data
 )
 {
 	eap_variable_data_c selector(m_am_tools);
 	if (config.get_is_valid() == false)
 	{
 		return EAP_STATUS_RETURN(m_am_tools, eap_status_allocation_error);
 	}
-	config.set_type(eap_configure_type_hex_data);
+	config.set_type(type);
 	status = config.get_data()->set_copy_of_buffer(
 		value_data);
 	if (status != eap_status_ok)
 	{
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 	return EAP_STATUS_RETURN(m_am_tools, status);
 }
+//--------------------------------------------------
 const TUint32 K2DigitMncMccList[]
 	= {
 		202,204,206,208,213,214,216,218,
 		219,220,222,226,228,230,231,232,
 		645,646,647,648,649,650,651,652,
 		653,654,655,702,704,706,710,712,
 		714,716,724,730,734,744,746,901
 	};
+//--------------------------------------------------
 /**
 * The read_configure() function reads the configuration data identified
 * by the field string of field_length bytes length. Adaptation module must direct
 * the query to some persistent store.
 * @see abs_eap_base_type_c::read_configure().
 			if (value_data.get_is_valid() == false)
 			{
 				return EAP_STATUS_RETURN(m_am_tools, eap_status_allocation_error);
 			}
-			// Set uma realm prefix of EAP-SIM and EAP-AKA.
+			if (iRealmPrefix != 0)
-			status = value_data.set_copy_of_buffer(iRealmPrefix->Ptr(), iRealmPrefix->Length());
+			{
-			if (status != eap_status_ok)
+				// Set uma realm prefix of EAP-SIM and EAP-AKA.
-			{
+				status = value_data.set_copy_of_buffer(iRealmPrefix->Ptr(), iRealmPrefix->Length());
-				EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
+				if (status != eap_status_ok)
-				return EAP_STATUS_RETURN(m_am_tools, status);
+				{
+					EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
+					return EAP_STATUS_RETURN(m_am_tools, status);
+				}
 			}
 			status = add_configuration_data(
 				&message,
 				cf_str_EAP_GSMSIM_UMA_realm_prefix.get_field(),
 			eap_variable_data_c value_data(m_am_tools);
 			if (value_data.get_is_valid() == false)
 			{
 				return EAP_STATUS_RETURN(m_am_tools, eap_status_allocation_error);
 			}
+#ifdef USE_EAP_VPN_FILETRACE
 			status = value_data.set_copy_of_buffer(m_trace_log_file_name);
 			if (status != eap_status_ok)
 			{
 				EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 				return EAP_STATUS_RETURN(m_am_tools, status);
 			}
+#endif
 			status = add_configuration_data(
 				&message,
 				cf_str_EAP_TRACE_output_file_name.get_field(),
 				eap_configure_type_string,
 				&value_data);
 			|| wanted_field.compare(
 					cf_str_EAP_AKA_UMA_realm_prefix.get_field()->get_field(),
 					cf_str_EAP_AKA_UMA_realm_prefix.get_field()->get_field_length()) == 0)
 		{
 			// Set uma realm prefix of EAP-SIM and EAP-AKA.
-			status = data->set_copy_of_buffer(iRealmPrefix->Ptr(), iRealmPrefix->Length());
+			if (iRealmPrefix != 0)
+			{
+				status = data->set_copy_of_buffer(iRealmPrefix->Ptr(), iRealmPrefix->Length());
+			}
+			else
+			{
+				status = eap_status_illegal_configure_field;
+			}
 			EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 			return EAP_STATUS_RETURN(m_am_tools, status);
 		}
 		else if (wanted_field.compare(
 				cf_str_EAP_GSMSIM_use_manual_realm.get_field()->get_field(),
 			|| wanted_field.compare(
 					cf_str_EAP_AKA_manual_realm.get_field()->get_field(),
 					cf_str_EAP_AKA_manual_realm.get_field()->get_field_length()) == 0)
 		{
 			// ManualRealm of EAP-SIM and EAP-AKA.
-			status = data->set_copy_of_buffer(iManualRealm->Ptr(), iManualRealm->Length());
+			if(iManualRealm != 0)
+			{
+				status = data->set_copy_of_buffer(iManualRealm->Ptr(), iManualRealm->Length());
+			}
+			else
+			{
+				status = eap_status_illegal_configure_field;
+			}
 			EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 			return EAP_STATUS_RETURN(m_am_tools, status);
 		}
 		else if (wanted_field.compare(
 				cf_str_EAP_GSMSIM_use_manual_username.get_field()->get_field(),
 			// 2-digit MNC configuration of EAP-SIM and EAP-AKA.
 			status = data->set_copy_of_buffer((u32_t*) K2DigitMncMccList, sizeof(K2DigitMncMccList));
 			EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 			return EAP_STATUS_RETURN(m_am_tools, status);
 		}
+#ifdef USE_EAP_VPN_FILETRACE
 		else if (wanted_field.compare(
 				cf_str_EAP_TRACE_output_file_name.get_field()->get_field(),
 				cf_str_EAP_TRACE_output_file_name.get_field()->get_field_length()) == 0)
 		{
 			// Trace output file name.
 			status = data->set_copy_of_buffer(
 				m_trace_log_file_name);
 			EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 			return EAP_STATUS_RETURN(m_am_tools, status);
 		}
+#endif
 		else if (wanted_field.compare(
 					cf_str_EAP_GSMSIM_max_session_validity_time.get_field()->get_field(),
 					cf_str_EAP_GSMSIM_max_session_validity_time.get_field()->get_field_length()) == 0
 				|| wanted_field.compare(
 					cf_str_EAP_AKA_max_session_validity_time.get_field()->get_field(),
 		data);
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 	return EAP_STATUS_RETURN(m_am_tools, status);
 }
+//--------------------------------------------------
 /**
 * The write_configure() function writes the configuration data identified
 * by the field string of field_length bytes length. Adaptation module must direct
 * the action to some persistent store.
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 	return eap_status_not_supported;
 }
+//--------------------------------------------------
 /**
 * This is notification of internal state transition.
 * This is used for notifications, debugging and protocol testing.
 * The primal notifications are eap_state_variable_e::eap_state_authentication_finished_successfully
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 	EAP_TRACE_DEBUG(
 		m_am_tools,
 		TRACE_FLAGS_DEFAULT,
-		(EAPL("CEapVpnInterfaceImplementation::state_notification() = %d\n"), state->get_current_state()));
+		(EAPL("CEapVpnInterfaceImplementation::state_notification() = %d=%s\n"),
+		state->get_current_state(),
+		eap_state_notification_c::get_state_string(eap_protocol_layer_eap, state->get_current_state())));
 	if (m_block_packet_sends_and_notifications == true)
 	{
 		// Notification block is active.
 		EAP_TRACE_ALWAYS(
 		}
 	}
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 }
+//--------------------------------------------------
 /**
 * The set_timer() function initializes timer to be elapsed after time_ms milliseconds.
 * @param initializer is pointer to object which timer_expired() function will
 * be called after timer elapses.
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 	return status;
 }
+//--------------------------------------------------
 /**
 * The cancel_timer() function cancels the timer id initiated by initializer.
 * @param initializer is pointer to object which set the cancelled timer.
 * @param id is identifier which will be returned in timer_expired() function.
 * The user selects and interprets the id for this timer.
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 	return status;
 }
+//--------------------------------------------------
 /**
 * The cancel_all_timers() function cancels all timers.
 * User should use this in termination of the stack before
 * the adaptation module of tools is deleted.
 * Preferred mode is to cancel each timer directly
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 	return status;
 }
+//--------------------------------------------------
 /**
 * This function queries the validity of EAP-type.
 * Lower layer should return eap_status_ok if this EAP-type is supported.
 * @param eap_type is the requested EAP-type.
 */
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 	return EAP_STATUS_RETURN(m_am_tools, status);
 }
+//--------------------------------------------------
 /**
 * This function queries the list of supported EAP-types.
 * Lower layer should return eap_status_ok if this call succeeds.
 * @param eap_type_list will include the list of supported EAP-types. Each value in list
 * is type of u32_t and represent one supported EAP-type. List consists of subsequent u32_t type values.
 	}
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 	return eap_status_ok;
 }
-//--------------------------------------------------
+//--------------------------------------------------
 eap_status_e CEapVpnInterfaceImplementation::add_rogue_ap(eap_array_c<eap_rogue_ap_entry_c> & /*rogue_ap_list*/)
 {
 	// Not used, but might be called
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 	return EAP_STATUS_RETURN(m_am_tools, m_am_tools->convert_am_error_to_eapol_error(err));
 }
+//--------------------------------------------------
 eap_status_e CEapVpnInterfaceImplementation::restart_authentication(
 	const eap_am_network_id_c * const /*receive_network_id*/,
 	const bool /*is_client_when_true*/,
 	const bool /*force_clean_restart*/,
 	implArray->Close();
 }
 //--------------------------------------------------
+eap_status_e CEapVpnInterfaceImplementation::wait_complete_get_802_11_authentication_mode()
+{
+	EAP_TRACE_DEBUG(
+		m_am_tools,
+		TRACE_FLAGS_DEFAULT,
+		(EAPL("CEapGeneralSettingsImpl::wait_complete_get_802_11_authentication_mode(): calls iWait.Start()\n")));
+	iWait.Start();
+	EAP_TRACE_DEBUG(
+		m_am_tools,
+		TRACE_FLAGS_DEFAULT,
+		(EAPL("CEapGeneralSettingsImpl::WaitCompletion(): iWait.Start() returns, m_completion_status=%d\n"),
+		m_completion_status));
+	return EAP_STATUS_RETURN(m_am_tools, m_completion_status);
+}
+//--------------------------------------------------
 eap_status_e CEapVpnInterfaceImplementation::complete_get_802_11_authentication_mode(
-	const eap_status_e /* completion_status */,
+	const eap_status_e completion_status,
-	const eap_am_network_id_c * /* const receive_network_id */,
+	const eap_am_network_id_c * const /* receive_network_id */,
 	const eapol_key_802_11_authentication_mode_e /* mode */)
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
+	EAP_TRACE_DEBUG(
+		m_am_tools,
+		TRACE_FLAGS_DEFAULT,
+		(EAPL("CEapGeneralSettingsImpl::complete_get_802_11_authentication_mode(): calls iWait.AsyncStop()\n")));
 	EAP_ASSERT(m_am_tools->get_global_mutex()->get_is_reserved() == true);
+	m_completion_status = completion_status;
+	// This is needed to continue the execution after iWait->Start();
+	iWait.AsyncStop();
+	EAP_TRACE_DEBUG(
+		m_am_tools,
+		TRACE_FLAGS_DEFAULT,
+		(EAPL("CEapGeneralSettingsImpl::complete_get_802_11_authentication_mode(): iWait.AsyncStop() returns, m_completion_status=%d\n"),
+		m_completion_status));
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
-	return EAP_STATUS_RETURN(m_am_tools, eap_status_not_supported);
+	return EAP_STATUS_RETURN(m_am_tools, m_completion_status);
 }
 //--------------------------------------------------
 eap_status_e CEapVpnInterfaceImplementation::complete_remove_eap_session(

changeset 52	c23bdf5a328a
parent 39	fe6b6762fccd