diff -r 8ab6687fb94c -r 3adadc800673 telephonyserverplugins/simtsy/src/CSimPhoneIMSAuth.cpp --- a/telephonyserverplugins/simtsy/src/CSimPhoneIMSAuth.cpp Thu May 27 14:05:07 2010 +0300 +++ b/telephonyserverplugins/simtsy/src/CSimPhoneIMSAuth.cpp Fri Jun 11 14:49:29 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -19,10 +19,16 @@ @file */ + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSimPhoneIMSAuthTraces.h" +#endif + #include #include #include "CSimPhone.h" -#include "Simlog.h" // // CSimPhoneIMSAuth @@ -60,10 +66,10 @@ { iTimer=CSimTimer::NewL(iPhone); iGetAuthorizationData = new CArrayPtrFlat(1); - LOGPHONE1("Starting to parse Phone IMS Authorization/Authentication config params..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_CONSTRUCTL_1, "Starting to parse Phone IMS Authorization/Authentication config params..."); ParseAuthorizationInfoL(); ParseAuthenticationInfoL(); - LOGPHONE1("Finished parsing Phone IMS Authorization/Authentication config params..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_CONSTRUCTL_2, "Finished parsing Phone IMS Authorization/Authentication config params..."); } @@ -101,7 +107,7 @@ * @return CTestConfigSection a pointer to the configuration file data section */ { - LOGPHONE1(">>CSimPhoneIMSAuth::CfgFile"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_CFGFILE_1, ">>CSimPhoneIMSAuth::CfgFile"); return iPhone->CfgFile(); } @@ -134,7 +140,7 @@ TInt IMPUCount, authorizationDataSource, infoChangeDelay; TAuthorizationInfo authorizationInfo; - LOGPHONE1("Starting to Parse IMS Authorization Info"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_1, "Starting to Parse IMS Authorization Info"); TInt count = CfgFile()->ItemCount(KAuthorizationInfo); TInt index; @@ -151,7 +157,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterNum,IMPI); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_2, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG"); continue; } else @@ -164,7 +170,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterNum,IMPUCount); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_3, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG"); continue; } else @@ -180,7 +186,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterNum,IMPUValue); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_4, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG"); IMPUError = ETrue; break; } @@ -193,7 +199,7 @@ if(IMPUError) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_5, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG"); continue; } else @@ -206,7 +212,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterNum,HNDN); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_6, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG"); continue; } else @@ -219,7 +225,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterNum,authorizationDataSource); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_7, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG"); continue; } else @@ -234,7 +240,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterNum,infoChangeDelay); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_8, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG"); continue; } else @@ -259,7 +265,7 @@ TInt authErr; TAuthenticationInfo authenticationInfo; - LOGPHONE1("Starting to Parse IMS Authentication Info"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_1, "Starting to Parse IMS Authentication Info"); TInt count = CfgFile()->ItemCount(KAuthenticationInfo); TInt index; @@ -275,7 +281,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,AUTN); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_2, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG"); continue; } else @@ -287,7 +293,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,RAND); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_3, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG"); continue; } else @@ -299,7 +305,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,RES); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_4, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG"); continue; } else @@ -311,7 +317,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,IK); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_5, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG"); continue; } else @@ -323,7 +329,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,CK); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_6, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG"); continue; } else @@ -335,7 +341,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,AUTS); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_7, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG"); continue; } else @@ -347,7 +353,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,authErr); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_8, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG"); continue; } else @@ -362,7 +368,7 @@ TInt CSimPhoneIMSAuth::GetAuthorizationInfoPhase1(const TTsyReqHandle aTsyReqHandle, RMobilePhone::TClientId* aClientId,TInt* aBufSize) { - LOGPHONE1("CSimPhoneIMSAuth::GetAuthorizationInfoPhase1 called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_GETAUTHORIZATIONINFOPHASE1_1, "CSimPhoneIMSAuth::GetAuthorizationInfoPhase1 called"); TInt ret(KErrNone); TInt leaveCode(KErrNone); TRAP(leaveCode, ret=ProcessGetAuthorizationInfoPhase1L(aTsyReqHandle, aClientId, aBufSize);); @@ -378,7 +384,7 @@ TInt CSimPhoneIMSAuth::ProcessGetAuthorizationInfoPhase1L(const TTsyReqHandle aTsyReqHandle, RMobilePhone::TClientId* aClientId, TInt* aBufSize) { - LOGPHONE1("CSimPhoneIMSAuth::GetAuthorizationInfoPhase1 called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PROCESSGETAUTHORIZATIONINFOPHASE1L_1, "CSimPhoneIMSAuth::GetAuthorizationInfoPhase1 called"); // Store the streamed list and the client ID CListReadAllAttempt* read=CListReadAllAttempt::NewL(*aClientId,aTsyReqHandle); @@ -439,7 +445,7 @@ TInt CSimPhoneIMSAuth::GetAuthorizationInfoPhase2(const TTsyReqHandle aTsyReqHandle, RMobilePhone::TClientId* aClientId, TDes8* aBuffer) { - LOGPHONE1("CSimPhoneIMSAuth::GetAuthorizationInfoPhase2 called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_GETAUTHORIZATIONINFOPHASE2_1, "CSimPhoneIMSAuth::GetAuthorizationInfoPhase2 called"); CListReadAllAttempt* read=NULL; // Find the get Authorization Info attempt from this client @@ -466,7 +472,7 @@ TInt CSimPhoneIMSAuth::GetAuthorizationInfoCancel(const TTsyReqHandle aTsyReqHandle) { - LOGPHONE1("CSimPhoneIMSAuth::GetAuthorizationInfoCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_GETAUTHORIZATIONINFOCANCEL_1, "CSimPhoneIMSAuth::GetAuthorizationInfoCancel called"); // Remove the read all attempt from iGetAuthorizationData CListReadAllAttempt* read=NULL; @@ -489,7 +495,7 @@ TInt CSimPhoneIMSAuth::NotifyImsAuthorizationInfoChanged(const TTsyReqHandle aTsyReqHandle) { - LOGPHONE1("CSimPhoneIMSAuth::NotifyImsAuthorizationInfoChanged called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_NOTIFYIMSAUTHORIZATIONINFOCHANGED_1, "CSimPhoneIMSAuth::NotifyImsAuthorizationInfoChanged called"); __ASSERT_ALWAYS(!iAuthInfoChangeNotifyPending,SimPanic(ENotificationReqAlreadyOutstanding)); TInt count=iAuthorizationInfoList.Count(); @@ -508,7 +514,7 @@ TInt CSimPhoneIMSAuth::NotifyImsAuthorizationInfoChangedCancel(const TTsyReqHandle aTsyReqHandle) { - LOGPHONE1("CSimPhoneIMSAuth::NotifyImsAuthorizationInfoChangedCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_NOTIFYIMSAUTHORIZATIONINFOCHANGEDCANCEL_1, "CSimPhoneIMSAuth::NotifyImsAuthorizationInfoChangedCancel called"); if(iAuthInfoChangeNotifyPending) { if(iTimerStarted) @@ -526,7 +532,7 @@ TInt CSimPhoneIMSAuth::GetAuthenticationData(const TTsyReqHandle aTsyReqHandle,TDes8* aAuthenticationData) { - LOGPHONE1("CSimPhoneIMSAuth::AuthentificationData called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_GETAUTHENTICATIONDATA_1, "CSimPhoneIMSAuth::AuthentificationData called"); RMobilePhone::TImsAuthenticateDataV5Pckg* authenticateDataPckgd = (RMobilePhone::TImsAuthenticateDataV5Pckg*)aAuthenticationData; @@ -574,7 +580,7 @@ TInt CSimPhoneIMSAuth::GetAuthenticationDataCancel(const TTsyReqHandle aTsyReqHandle) { - LOGPHONE1("CSimPhoneIMSAuth::AuthentificationDatCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_GETAUTHENTICATIONDATACANCEL_1, "CSimPhoneIMSAuth::AuthentificationDatCancel called"); iPhone->ReqCompleted(aTsyReqHandle, KErrCancel); return KErrNone; }