--- a/eapol/eapol_framework/eapol_symbian/am/type/aka/symbian/EapAkaInterface.cpp Thu Aug 19 09:58:27 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/am/type/aka/symbian/EapAkaInterface.cpp Tue Aug 31 15:16:37 2010 +0300
@@ -16,7 +16,7 @@
*/
/*
-* %version: 17.1.3 %
+* %version: 18 %
*/
// This is enumeration of EAPOL source code.
@@ -191,8 +191,6 @@
if (iQueryId == EQueryRES)
{
- iQueryId = EQueryNone;
-
// Cancel the request.
iCustomAPI.CancelAsyncRequest( ECustomGetSimAuthenticationDataIPC );
@@ -231,15 +229,12 @@
switch( iQueryId )
{
case EQueryIMSI:
-
EAP_TRACE_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("AKA 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);
@@ -268,7 +263,6 @@
break;
case EQueryRES:
-
EAP_TRACE_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("####AKA interface: Got RES, CK, IK and AUTS reply. ####\n")));
EAP_TRACE_DATA_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("RES"),
@@ -287,8 +281,6 @@
iEAPAka.iAUTS.Ptr(),
iEAPAka.iAUTS.Size()));
- iQueryId = EQueryNone;
-
delete iAuthenticationData;
iAuthenticationData = NULL;
@@ -343,7 +335,6 @@
case EQueryIMSI:
// Error with IMSI. Reset it and complete the request.
- iQueryId = EQueryNone;
imsi.reset();
EAP_TRACE_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("AKA interface: Error in IMSI.\n")));
@@ -355,7 +346,6 @@
// Re-synchronization needed or error with RES or CK or IK.
// We have to close the custom API anyway.
- iQueryId = EQueryNone;
iCustomAPI.Close();
EAP_TRACE_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("CEapAkaInterface::RunL() - error case: CLOSED CUSTOM API \n")));
@@ -493,8 +483,6 @@
EAP_TRACE_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("CEapAkaInterface::DisconnectMMETel()\n")));
EAP_TRACE_RETURN_STRING(m_am_tools, "returns: CEapAkaInterface::DisconnectMMETel()");
- iQueryId = EQueryNone;
-
// Close the custom API since we don't need it any more.
iCustomAPI.Close();