MCL/sf/mw/accesssec: comparison eapol/eapol_framework/eapol_symbian/am/type/gsmsim/symbian/EapSimInterface.cpp

equal deleted inserted replaced

-:75a6055b8ce3
+:30e048a7b597
 * Description:  EAP and WLAN authentication protocols.
 *
 */
 /*
-* %version: 15 %
+* %version: 15.1.5 %
 */
 // This is enumeration of EAPOL source code.
 #if defined(USE_EAP_MINIMUM_RELEASE_TRACES)
 	#undef EAP_FILE_NUMBER_ENUM
 #endif //#if defined(USE_EAP_MINIMUM_RELEASE_TRACES)
 // INCLUDE FILES
 #include "EapSimInterface.h"
+#include "eap_automatic_variable.h"
 #include <mmtsy_names.h>
 #include "eap_sim_triplets.h" // For SIM_SRES_LENGTH.
 , iAuthenticationData(NULL)
 , iQueryId(EQueryNone)
 , iMMETELConnectionStatus(EFalse)
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
+	EAP_TRACE_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("CEapSimIsaInterface::CEapSimIsaInterface()\n")));
+	EAP_TRACE_RETURN_STRING(m_am_tools, "returns: CEapSimIsaInterface::CEapSimIsaInterface()");
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 }
 //--------------------------------------------------
 //--------------------------------------------------
 CEapSimIsaInterface::~CEapSimIsaInterface()
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
+	EAP_TRACE_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("CEapSimIsaInterface::~CEapSimIsaInterface()\n")));
+	EAP_TRACE_RETURN_STRING(m_am_tools, "returns: CEapSimIsaInterface::~CEapSimIsaInterface()");
 	if(IsActive())
 	{
 		Cancel();
 	}
-	EAP_TRACE_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("Closing RMobilePhone and MMETEL.\n")));
+	DisconnectMMETel();
-	iPhone.Close();
-	iServer.Close(); // Phone module is unloaded automatically when RTelServer session is closed
 	delete iAuthenticationData;
 	iAuthenticationData = NULL;
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 }
 //--------------------------------------------------
 void CEapSimIsaInterface::QueryIMSIL()
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
-	EAP_TRACE_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("ISA interface: Querying IMSI.\n")));
+	EAP_TRACE_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("CEapSimIsaInterface::QueryIMSIL()\n")));
+	EAP_TRACE_RETURN_STRING(m_am_tools, "returns: CEapSimIsaInterface::QueryIMSIL()");
 	iQueryId = EQueryIMSI;
 	// Create MMETEl connection.
 	User::LeaveIfError( CreateMMETelConnectionL() );
 //--------------------------------------------------
 void CEapSimIsaInterface::QueryKcAndSRESL(const TDesC8& aRand)
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
-	EAP_TRACE_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("ISA interface: Querying Kc and SRES.\n")));
+	EAP_TRACE_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("CEapSimIsaInterface::QueryKcAndSRESL()\n")));
+	EAP_TRACE_RETURN_STRING(m_am_tools, "returns: CEapSimIsaInterface::QueryKcAndSRESL()");
 	iQueryId = EQuerySRESandKC;
 	EAP_TRACE_DATA_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("RAND"),
 			aRand.Ptr(),
 //--------------------------------------------------
 void CEapSimIsaInterface::DoCancel()
 {
-	EAP_TRACE_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("CEapSimIsaInterface::DoCancel() - Cancelling MMETEL query.\n") ) );
+	EAP_TRACE_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("CEapSimIsaInterface::DoCancel(): iQueryId=%d\n"),
+		iQueryId) );
-	// Cancel the request.
+	EAP_TRACE_RETURN_STRING(m_am_tools, "returns: CEapSimIsaInterface::DoCancel()");
-	iCustomAPI.CancelAsyncRequest( ECustomGetSimAuthenticationDataIPC );
+	if (iQueryId == EQuerySRESandKC)
+	{
+		iQueryId = EQueryNone;
+		// Cancel the request.
+		iCustomAPI.CancelAsyncRequest( ECustomGetSimAuthenticationDataIPC );
+		EAP_TRACE_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("CEapSimIsaInterface::DoCancel(): CANCELLED CUSTOM API REQUEST\n") ) );
+	}
 }
 //--------------------------------------------------
 void CEapSimIsaInterface::RunL()
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
-	EAP_TRACE_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("CEapSimIsaInterface::RunL(). iStatus.Int() =%d \n"), iStatus.Int() ));
+	EAP_TRACE_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("CEapSimIsaInterface::RunL(). iStatus.Int()=%d, iQueryId=%d\n"),
+		iStatus.Int(),
+		iQueryId));
+	EAP_TRACE_RETURN_STRING(m_am_tools, "returns: CEapSimIsaInterface::RunL()");
 	TInt error = KErrNone;
 	eap_variable_data_c imsi(m_am_tools); // Keeping it here to avoid "error" in ARMV5 build.
 	// This is to store the IMSI, which is in Unicode form.
 	eap_variable_data_c imsiInUnicode(m_am_tools); // Keeping it here to avoid "error" in ARMV5 build.
 				EAP_TRACE_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("ISA interface: Got IMSI reply.\n")));
 				EAP_TRACE_DATA_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("IMSI"),
 						iSubscriberId.Ptr(),
 						iSubscriberId.Size()));
+				iQueryId = EQueryNone;
 				// Convert the IMSI from unicode to UTF8 characters.
 				completion_status = imsiInUnicode.set_buffer(iSubscriberId.Ptr(), iSubscriberId.Size(), false, false);
 				if (completion_status != eap_status_ok)
 					{
 						imsi.reset();
 						EAP_TRACE_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("ISA interface: Could not convert IMSI from UNICODE to UTF8. Not proceeding further here.\n")));
 					}
 				}
+				DisconnectMMETel();
 				TRAP(error, iParent->complete_SIM_imsi_L(&imsi, completion_status));
 			break;
 			case EQuerySRESandKC:
 				EAP_TRACE_DATA_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("KC"),
 						iEAPSim.iKC.Ptr(),
 						iEAPSim.iKC.Size()));
+				iQueryId = EQueryNone;
 				// Trim the length of SRES -  Remove once the correct length is set for SRES, may be by the API or some where else.
 				iEAPSim.iSRES.SetLength(SIM_SRES_LENGTH);
 				EAP_TRACE_DATA_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("SRES after Trimming"),
 						iEAPSim.iSRES.Ptr(),
 						iEAPSim.iSRES.Size()));
 				delete iAuthenticationData;
 				iAuthenticationData = NULL;
-				// Close the custom API since we don't need it any more.
+				DisconnectMMETel();
-				iCustomAPI.Close();
 				// Complete
 				TRAP(error, iParent->complete_SIM_kc_and_sres_L(iEAPSim.iKC, iEAPSim.iSRES, completion_status));
 			break;
 		}
 	{
 		EAP_TRACE_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("ISA interface: Got error reply.\n")));
 		if( EQuerySRESandKC == iQueryId )
 		{
-			// We have to close the custom API anyway.
+			iQueryId = EQueryNone;
-			// Rest will be taken care in destructor.
-			iCustomAPI.Close();
+			DisconnectMMETel();
 			// Handle duplicate RAND values.
 			// If duplicate RAND values are being used, we get KErrArgument here.
 			if(iStatus.Int() == KErrArgument)
 			{
 		}
 		else if(EQueryIMSI == iQueryId)
 		{
 			completion_status = m_am_tools->convert_am_error_to_eapol_error(iStatus.Int());
+			iQueryId = EQueryNone;
+			DisconnectMMETel();
 			TRAP(error, iParent->complete_SIM_imsi_L(&imsi, completion_status));
 		}
 	}
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 }
+//--------------------------------------------------
 TInt CEapSimIsaInterface::CreateMMETelConnectionL()
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
-	EAP_TRACE_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("Creating MMETel connection.\n")));
+	EAP_TRACE_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("CEapSimIsaInterface::CreateMMETelConnectionL()\n")));
+	EAP_TRACE_RETURN_STRING(m_am_tools, "returns: CEapSimIsaInterface::CreateMMETelConnectionL()");
 	TInt errorCode = KErrNone;
 	// MMETel need to be connected only once.
 if( !iMMETELConnectionStatus )
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 return errorCode;
 }
+void CEapSimIsaInterface::DisconnectMMETel()
+{
+	EAP_TRACE_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("CEapSimIsaInterface::DisconnectMMETel()\n")));
+	EAP_TRACE_RETURN_STRING(m_am_tools, "returns: CEapSimIsaInterface::DisconnectMMETel()");
+	iQueryId = EQueryNone;
+	// Close the custom API since we don't need it any more.
+	iCustomAPI.Close();
+if( iMMETELConnectionStatus )
+{
+		EAP_TRACE_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("Closing RMobilePhone and MMETEL.\n")));
+		iPhone.Close();
+		iServer.Close(); // Phone module is unloaded automatically when RTelServer session is closed
+		iMMETELConnectionStatus = EFalse;
+}
+else
+{
+		EAP_TRACE_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("RMobilePhone and MMETEL already closed.\n")));
+}
+}
 // End of file

branch	RCL_3
changeset 17	30e048a7b597
parent 2	1c7bc153c08e
child 18	bad0cc58d154