FCL/sf/incubator/modemadaptation: comparison adaptationlayer/tsy/nokiatsy

equal deleted inserted replaced

-:6295dc2169f3
+:8486d82aef45
 #include <gpdsisi.h>
 #include "tsylogger.h"
 #include <gpds_sharedisi.h>
 #include <ctsy/pluginapi/cmmdatapackage.h>
 #include <call_modemisi.h>
+#include <nsisi.h>
+#include <pep_bca_types.h>
 #if (NCP_COMMON_S60_VERSION_SUPPORT==S60_VERSION_32)
 #include <cmmcommonstaticutility.h>
 #endif // (NCP_COMMON_S60_VERSION_SUPPORT==S60_VERSION_32)
 #include "OstTraceDefinitions.h"
 // CONSTANTS
 // Offset to subblock length in EIsiSubBlockTypeId8Len8 subblock
 const TUint KSubblockTypeId8Len8LengthOffset = 1;
+// Can be used as parameter in places where tr id is needed, but
+// the value is not relevant
+const TUint8 KNoTrId                         = 0;
+// Masks for getting bytes out of name_add_ind and name_remove_ind
+const TUint KMaskNameByte1 = 0x000000FF;
+const TUint KMaskNameByte2 = 0x0000FF00;
+const TUint KMaskNameByte3 = 0x00FF0000;
 // MACROS
 //None
 // LOCAL CONSTANTS AND MACROS
 //None
 CMmPacketQoSMessHandler* aMmPacketQoSMessHandler,
 CMmMessageRouter* aMessageRouter )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::NewL." );
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_NEWL, "CMmPacketContextMessHandler::NewL" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_NEWL_TD, "CMmPacketContextMessHandler::NewL" );
 CMmPacketContextMessHandler* packetContextMessHandler =
 new ( ELeave ) CMmPacketContextMessHandler();
 CleanupStack::PushL( packetContextMessHandler );
 aPhoNetReceiver->RegisterL(
 packetContextMessHandler, PN_MODEM_CALL, CALL_MODEM_RESOURCE_IND );
 aPhoNetReceiver->RegisterL(
 packetContextMessHandler, PN_MODEM_CALL, CALL_MODEM_RESOURCE_RESP );
+aPhoNetReceiver->RegisterL(
+packetContextMessHandler, PN_NAMESERVICE, PNS_NAME_ADD_IND );
+aPhoNetReceiver->RegisterL(
+packetContextMessHandler, PN_NAMESERVICE, PNS_NAME_REMOVE_IND );
 CleanupStack::Pop( packetContextMessHandler );
 return packetContextMessHandler;
 }
 //
 CMmPacketContextMessHandler::CMmPacketContextMessHandler()
 {
 //None
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::CMmPacketContextMessHandler" );
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_CMMPACKETCONTEXTMESSHANDLER, "CMmPacketContextMessHandler::CMmPacketContextMessHandler" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_CMMPACKETCONTEXTMESSHANDLER_TD, "CMmPacketContextMessHandler::CMmPacketContextMessHandler" );
 }
 // -----------------------------------------------------------------------------
 // CMmPacketContextMessHandler::ConstructL
 //
 void CMmPacketContextMessHandler::ConstructL()
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::ConstructL.");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_CONSTRUCTL, "CMmPacketContextMessHandler::ConstructL" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_CONSTRUCTL_TD, "CMmPacketContextMessHandler::ConstructL" );
 #ifdef DUMMY_NIF_PEP_FOR_PACKET_DATA_TESTING_DOS
 iTransIdForProxies = 0;
 #endif // DUMMY_NIF_PEP_FOR_PACKET_DATA_TESTING_DOS
 //
 CMmPacketContextMessHandler::~CMmPacketContextMessHandler()
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::~CMmPacketContextMessHandler." );
-OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_CMMPACKETCONTEXTMESSHANDLER, "CMmPacketContextMessHandler::~CMmPacketContextMessHandler" );
+OstTrace0( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_CMMPACKETCONTEXTMESSHANDLER_TD, "CMmPacketContextMessHandler::~CMmPacketContextMessHandler" );
 // Delete owned iMmPipeControl object
 if ( iMmPipeController )
 {
 delete iMmPipeController;
 void CMmPacketContextMessHandler::ReceiveMessageL(
 const TIsiReceiveC& aIsiMessage )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::ReceiveMessageL" );
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_RECEIVEMESSAGEL, "CMmPacketContextMessHandler::ReceiveMessageL" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmPacketContextMessHandler::ReceiveMessageL" );
 TInt resource( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_RESOURCEID ) );
 TInt messageId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) );
 switch ( resource )
 }
 default:
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::ReceiveMessageL. Switch messageId case default");
-OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_RECEIVEMESSAGEL, "CMmPacketContextMessHandler::ReceiveMessageL" );
+OstTrace0( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmPacketContextMessHandler::ReceiveMessageL" );
 //None
 break;
 }
 }
 }
 //no else
 break;
 }
+case PN_NAMESERVICE:
+{
+switch( messageId )
+{
+case PNS_NAME_ADD_IND:
+{
+PnsNameAddInd( aIsiMessage );
+break;
+}
+case PNS_NAME_REMOVE_IND:
+{
+PnsNameRemoveInd( aIsiMessage );
+break;
+}
+default:
+{
+TFLOGSTRING2("TSY: CMmPacketContextMessHandler::ReceiveMessageL - PN_NAMESERVICE - unknown msgId: %d", messageId);
+OstTrace1( TRACE_NORMAL,  DUP2_CMMPACKETCONTEXTMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmPacketContextMessHandler::ReceiveMessageL;unknown messageId=%d", messageId );
+break;
+}
+}
+break;
+}
 default:
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::ReceiveMessageL. Switch resource case default");
-OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_RECEIVEMESSAGEL, "CMmPacketContextMessHandler::ReceiveMessageL" );
+OstTrace0( TRACE_NORMAL,  DUP3_CMMPACKETCONTEXTMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmPacketContextMessHandler::ReceiveMessageL" );
 //None
 break;
 }
 } // switch
 TInt CMmPacketContextMessHandler::GpdsContextIdCreateReq(
 const TUint8 aCreateContextIdTransId ) const
 {
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextIdCreateReq. TransId: %d", aCreateContextIdTransId );
-OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTIDCREATEREQ, "CMmPacketContextMessHandler::GpdsContextIdCreateReq;aCreateContextIdTransId=%hhu", aCreateContextIdTransId );
+OstTraceExt1( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTIDCREATEREQ_TD, "CMmPacketContextMessHandler::GpdsContextIdCreateReq;aCreateContextIdTransId=%hhu", aCreateContextIdTransId );
 //Append data for ISI message
 TBuf8<1> data;
 // Send Isi message via Phonet
 return iPhoNetSender->Send(
 // Get transaction id
 TUint8 createContextIdTraId( aIsiMessage.Get8bit(
 ISI_HEADER_SIZE + GPDS_CONTEXT_ID_CREATE_RESP_OFFSET_UTID ) );
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextIdCreateResp.CreateTraId: %d", createContextIdTraId );
-OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTIDCREATERESP, "CMmPacketContextMessHandler::GpdsContextIdCreateResp;createContextIdTraId=%hhu", createContextIdTraId );
+OstTraceExt1( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTIDCREATERESP_TD, "CMmPacketContextMessHandler::GpdsContextIdCreateResp;createContextIdTraId=%hhu", createContextIdTraId );
 // context stuff exists
 TInt ret = iContextList->CreateContextIdTraIdOK( createContextIdTraId );
 if ( KErrNone == ret )
 // Store the context id to contextList
 iContextList->SetContextId( contextId, createContextIdTraId );
 }
 else
 {
-InitialiseContextPhase3( status, contextId );
+InitialiseContextPhase3( status, contextId, createContextIdTraId );
 }
 }
 //no else
 }
 void CMmPacketContextMessHandler::GpdsContextIdCreateInd(
 const TIsiReceiveC& aIsiMessage )
 {
 TFLOGSTRING( "TSY: CMmPacketContextMessHandler::GpdsContextIdCreateInd." );
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTIDCREATEIND, "CMmPacketContextMessHandler::GpdsContextIdCreateInd" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTIDCREATEIND_TD, "CMmPacketContextMessHandler::GpdsContextIdCreateInd" );
 // Get context id
 TUint8 contextId(  aIsiMessage.Get8bit(
 ISI_HEADER_SIZE + GPDS_CONTEXT_ID_CREATE_IND_OFFSET_CID ) );
 // Context stuff exists in list
 if ( KErrNone == ret )
 {
 // Creation of context id succeeded -> Call
 // InitialiseContextPhase3L with GPDS_OK
-InitialiseContextPhase3( GPDS_OK, contextId );
+InitialiseContextPhase3( GPDS_OK, contextId, KNoTrId );
 }
 // no else
 }
 // -----------------------------------------------------------------------------
 const TUint8 aContextId,
 const TUint8 aPipeHandle ) const
 {
 TFLOGSTRING3( "TSY: CMmPacketContextMessHandler::GpdsLlConfigureReq. TransId: %d, ContextId: %d", aTransactionId, aContextId );
-OstTraceExt2( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSLLCONFIGUREREQ, "CMmPacketContextMessHandler::GpdsLlConfigureReq;aTransactionId=%hhu;aContextId=%hhu", aTransactionId, aContextId );
+OstTraceExt2( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_GPDSLLCONFIGUREREQ_TD, "CMmPacketContextMessHandler::GpdsLlConfigureReq;aTransactionId=%hhu;aContextId=%hhu", aTransactionId, aContextId );
 TFLOGSTRING2( "TSY: CMmPacketContextMessHandler::GpdsLlConfigureReq. PipeHandle: %d", aPipeHandle );
-OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSLLCONFIGUREREQ, "CMmPacketContextMessHandler::GpdsLlConfigureReq;aPipeHandle=%hhu", aPipeHandle );
+OstTraceExt1( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSLLCONFIGUREREQ_TD, "CMmPacketContextMessHandler::GpdsLlConfigureReq;aPipeHandle=%hhu", aPipeHandle );
 // Set the message data that consists of three parameters
 TBuf8<SIZE_GPDS_LL_CONFIGURE_REQ> messageData;
 messageData.Append( aContextId );
 messageData.Append( aPipeHandle );
 void CMmPacketContextMessHandler::GpdsLlConfigureResp(
 const TIsiReceiveC& aIsiMessage )
 {
 TFLOGSTRING( "TSY: CMmPacketContextMessHandler::GpdsLlConfigureResp.");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSLLCONFIGURERESP, "CMmPacketContextMessHandler::GpdsLlConfigureResp" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_GPDSLLCONFIGURERESP_TD, "CMmPacketContextMessHandler::GpdsLlConfigureResp" );
 // Get transaction id
 TUint8 transActionId( aIsiMessage.Get8bit(
 ISI_HEADER_SIZE + GPDS_LL_CONFIGURE_RESP_OFFSET_UTID ) );
 }
 else if( KErrArgument == ret )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsLlConfigureResp. Initialisation Complete failed" );
-OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSLLCONFIGURERESP, "CMmPacketContextMessHandler::GpdsLlConfigureResp, Initialisation Complete failed" );
+OstTrace0( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSLLCONFIGURERESP_TD, "CMmPacketContextMessHandler::GpdsLlConfigureResp, Initialisation Complete failed" );
 }
 //no else
 }
 else
 {
 TBool aPCFCSAddressIndication,
 TBool aDNSAddressRequestIndication )
 {
 TFLOGSTRING3("TSY: CMmPacketContextMessHandler::GpdsContextConfigureReq. TransId: %d ContextId: %d", aTransactionId, aContextId );
-OstTraceExt2( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGUREREQ, "CMmPacketContextMessHandler::GpdsContextConfigureReq;aTransactionId=%hhu;aContextId=%hhu", aTransactionId, aContextId );
+OstTraceExt2( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGUREREQ_TD, "CMmPacketContextMessHandler::GpdsContextConfigureReq;aTransactionId=%hhu;aContextId=%hhu", aTransactionId, aContextId );
 // Initializing ret value to KErrNone
 TInt ret( KErrNone );
 // Create isi message
 // QoS sub-block or IM CN Subsystem Signaling Flag sub-block.
 if( aSignallingIndication )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextConfigureReq. signalling indication ON");
-OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGUREREQ, "CMmPacketContextMessHandler::GpdsContextConfigureReq, signalling indication ON" );
+OstTrace0( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGUREREQ_TD, "CMmPacketContextMessHandler::GpdsContextConfigureReq, signalling indication ON" );
 TBuf8<SIZE_GPDS_SHARED_IM_CN_SIGNALING_FLAG_INFO> tempSbBuffer;
 TIsiSubBlock flagInfoSubBlock(
 tempSbBuffer,
 GPDS_SHARED_IM_CN_SIGNALING_FLAG_INFO,
 // An OPTIONAL sub block of Configure Req
 if( aDNSAddressRequestIndication )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextConfigureReq. DNS address request indication indication ON");
-OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGUREREQ, "CMmPacketContextMessHandler::GpdsContextConfigureReq, DNS address request indication indication ON" );
+OstTrace0( TRACE_NORMAL,  DUP2_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGUREREQ_TD, "CMmPacketContextMessHandler::GpdsContextConfigureReq, DNS address request indication indication ON" );
 TInt ret( iContextList->SetDNSAddressInfoToContextInfo( aContextId ) );
 if ( KErrNone == ret )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextConfigureReq. DNS Requested");
-OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGUREREQ, "CMmPacketContextMessHandler::GpdsContextConfigureReq, DNS Requested" );
+OstTrace0( TRACE_NORMAL,  DUP3_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGUREREQ_TD, "CMmPacketContextMessHandler::GpdsContextConfigureReq, DNS Requested" );
 TBuf8<SIZE_GPDS_DNS_ADDRESS_REQ_INFO> tempDnsAddrInfo;
 TIsiSubBlock reqInfoSubBlock(
 tempDnsAddrInfo,
 GPDS_DNS_ADDRESS_REQ_INFO,
 if ( KErrNone == ret )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextConfigureReq. PCSCF Requested");
-OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGUREREQ, "CMmPacketContextMessHandler::GpdsContextConfigureReq, PCSCF Requested" );
+OstTrace0( TRACE_NORMAL,  DUP4_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGUREREQ_TD, "CMmPacketContextMessHandler::GpdsContextConfigureReq, PCSCF Requested" );
 TBuf8<SIZE_GPDS_SHARED_PCSCF_ADDRESS_REQ_INFO> tempPscfAddrInfo;
 TIsiSubBlock reqInfoSubBlock(
 tempPscfAddrInfo,
 GPDS_SHARED_PCSCF_ADDRESS_REQ_INFO,
 // GPDS_TFT_INFO
 // An OPTIONAL sub block of Configure Req.
 if ( aMediaAuthorization || aPacketFilterPtr )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextConfigureReq. MediaAuthorization || PacketFilterPtr");
-OstTrace0( TRACE_NORMAL, DUP5_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGUREREQ, "CMmPacketContextMessHandler::GpdsContextConfigureReq, MediaAuthorization || PacketFilterPtr" );
+OstTrace0( TRACE_NORMAL,  DUP5_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGUREREQ_TD, "CMmPacketContextMessHandler::GpdsContextConfigureReq, MediaAuthorization || PacketFilterPtr" );
 TBuf8<KMaximumLengthOfGpdsTftInfo> gpdsTftInfoSbBuffer;
 TIsiSubBlock gpdsTftInfoSubBlock(
 gpdsTftInfoSbBuffer,
 GPDS_TFT_INFO,
 // If there were no errors
 if ( KErrNone == ret )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextConfigureReq. there were no errors");
-OstTrace0( TRACE_NORMAL, DUP7_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGUREREQ, "CMmPacketContextMessHandler::GpdsContextConfigureReq, there were no errors" );
+OstTrace0( TRACE_NORMAL,  DUP7_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGUREREQ_TD, "CMmPacketContextMessHandler::GpdsContextConfigureReq, there were no errors" );
 // Add GPDS_COMP_INFO subblock
 // sub block of Configure Req
 TBuf8<SIZE_GPDS_COMP_INFO> compInfo;
 TIsiSubBlock compInfoSubBlock(
 TInfoName contextName;
 ret = iContextList->GetContextNameByContextId( contextId, contextName );
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextConfigureResp. GetContextNameByContextId returns:%d", ret);
-OstTrace1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGURERESP, "CMmPacketContextMessHandler::GpdsContextConfigureResp;returns=%d", ret );
+OstTrace1( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGURERESP_TD, "CMmPacketContextMessHandler::GpdsContextConfigureResp;returns=%d", ret );
 // Check that transactionId and context exists
 if ( transactionId == proxyId && KErrNone == ret )
 {
 CMmDataPackage dataPackage;
 dataPackage.PackData( &contextName );
 TUint8 status( aIsiMessage.Get8bit(
 ISI_HEADER_SIZE + GPDS_CONTEXT_CONFIGURE_RESP_OFFSET_STATUS ) );
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextConfigureResp. status: %d", status);
-OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGURERESP, "CMmPacketContextMessHandler::GpdsContextConfigureResp;status=%hhu", status );
+OstTraceExt1( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGURERESP_TD, "CMmPacketContextMessHandler::GpdsContextConfigureResp;status=%hhu", status );
 if ( GPDS_OK == status )
 {
 TInt configurationType( iContextList->
 GetContextConfigurationType( contextId ) );
 if( KTIntNotDefined != configurationType )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextConfigureResp. KTIntNotDefined != configurationType");
-OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGURERESP, "CMmPacketContextMessHandler::GpdsContextConfigureResp, KTIntNotDefined != configurationType" );
+OstTrace0( TRACE_NORMAL,  DUP2_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGURERESP_TD, "CMmPacketContextMessHandler::GpdsContextConfigureResp, KTIntNotDefined != configurationType" );
 if( TPacketDataConfigBase::KConfigGPRS == configurationType )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextConfigureResp. configurationType == KConfigGPRS");
-OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGURERESP, "CMmPacketContextMessHandler::GpdsContextConfigureResp, configurationType == KConfigGPRS" );
+OstTrace0( TRACE_NORMAL,  DUP3_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGURERESP_TD, "CMmPacketContextMessHandler::GpdsContextConfigureResp, configurationType == KConfigGPRS" );
 // authentication info included in setconfig. Send auth reg
 RPacketContext::TContextConfigGPRS* config =
 reinterpret_cast<RPacketContext::TContextConfigGPRS*>(
 iContextList->GetConfig( contextId,
 const TDesC8& aPdpAddress,
 const TUint8 aPdpType ) const
 {
 TFLOGSTRING3("TSY: CMmPacketContextMessHandler::GpdsContextActivateReq. TransId: %d ContextId: %d", aTransactionId, aContextId );
-OstTraceExt2( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEREQ, "CMmPacketContextMessHandler::GpdsContextActivateReq;aTransactionId=%hhu;aContextId=%hhu", aTransactionId, aContextId );
+OstTraceExt2( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEREQ_TD, "CMmPacketContextMessHandler::GpdsContextActivateReq;aTransactionId=%hhu;aContextId=%hhu", aTransactionId, aContextId );
 TInt ret(iContextList->SetActivationTraId( aContextId, aTransactionId ));
 if( KErrNone == ret )
 {
 gpdsActivateReq.Append( 0 ); //sub block count
 }
 if ( KErrNone == ret )
 {
+// Use channel id as transaction id
+TUint8 channelId( iContextList->ProxyIdByContextId( aContextId ) );
 // Send Isi message via Phonet
 ret = iPhoNetSender->Send( PN_GPDS,
-aTransactionId, GPDS_CONTEXT_ACTIVATE_REQ, gpdsActivateReq );
+channelId, GPDS_CONTEXT_ACTIVATE_REQ, gpdsActivateReq );
 }
 // no else
 }
 // no else
 // Get transaction id for completion
 iContextList->GetAndResetActivationTraId( contextId );
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextActivatingInd. ContextId: %d", contextId );
-OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATINGIND, "CMmPacketContextMessHandler::GpdsContextActivatingInd;contextId=%hhu", contextId );
+OstTraceExt1( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATINGIND_TD, "CMmPacketContextMessHandler::GpdsContextActivatingInd;contextId=%hhu", contextId );
 CMmDataPackage data;
 TInt dialUpContext( KTIntNotDefined );
 TInfoName contextName;
 TInt ret( KErrNone );
 TUint sbStartOffSet( 0 );
 ret = iContextList->GetContextNameByContextId( contextId, contextName );
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextActivatingInd. GetContextNameByContextId returns: %d", ret );
-OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATINGIND, "CMmPacketContextMessHandler::GpdsContextActivatingInd;ret=%d", ret );
+OstTrace1( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATINGIND_TD, "CMmPacketContextMessHandler::GpdsContextActivatingInd;ret=%d", ret );
 // context not found, check dial-up context
 if ( KErrArgument == ret  )
 {
 dialUpContext = iContextList->DialUpContextName( contextId, contextName );
 if( TPacketDataConfigBase::KConfigGPRS == configurationType )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextActivatingInd. KConfigGPRS");
-OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATINGIND, "CMmPacketContextMessHandler::GpdsContextActivatingInd, KConfigGPRS" );
+OstTrace0( TRACE_NORMAL,  DUP2_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATINGIND_TD, "CMmPacketContextMessHandler::GpdsContextActivatingInd, KConfigGPRS" );
 RPacketContext::TContextConfigGPRS* config =
 reinterpret_cast<RPacketContext::TContextConfigGPRS*>(
 configBase );
 if ( NULL != apn.Ptr() )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextActivatingInd. apn is not null");
-OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATINGIND, "CMmPacketContextMessHandler::GpdsContextActivatingInd, apn is not null" );
+OstTrace0( TRACE_NORMAL,  DUP3_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATINGIND_TD, "CMmPacketContextMessHandler::GpdsContextActivatingInd, apn is not null" );
 config->iAccessPointName.Copy( apn );
 }
 else
 {
 }
 else if( TPacketDataConfigBase::KConfigRel99Rel4 == configurationType )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextActivatingInd. KConfigRel99Rel4");
-OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATINGIND, "CMmPacketContextMessHandler::GpdsContextActivatingInd, KConfigRel99Rel4" );
+OstTrace0( TRACE_NORMAL,  DUP4_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATINGIND_TD, "CMmPacketContextMessHandler::GpdsContextActivatingInd, KConfigRel99Rel4" );
 RPacketContext::TContextConfigR99_R4* config =
 reinterpret_cast<RPacketContext::TContextConfigR99_R4*>(
 configBase );
 if ( NULL != apn.Ptr() )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextActivatingInd. accesspointname is not null");
-OstTrace0( TRACE_NORMAL, DUP5_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATINGIND, "CMmPacketContextMessHandler::GpdsContextActivatingInd, accesspointname is not null" );
+OstTrace0( TRACE_NORMAL,  DUP5_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATINGIND_TD, "CMmPacketContextMessHandler::GpdsContextActivatingInd, accesspointname is not null" );
 config->iAccessPointName.Copy( apn );
 }
 else if ( NULL == apn.Ptr() )
 {
 TUint8 contextId( aIsiMessage.Get8bit(
 ISI_HEADER_SIZE + GPDS_CONTEXT_ACTIVATE_IND_OFFSET_CID ) );
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. ContextId: %d", contextId);
-OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL;contextId=%hhu", contextId );
+OstTraceExt1( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL;contextId=%hhu", contextId );
 TUint sbStartOffSet( 0 );
 TInfoName contextName;
 TInt ret( iContextList->
 GetContextNameByContextId( contextId, contextName ) );
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. GetContextNameByContextId returns:%d", ret );
-OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL;ret=%d", ret );
+OstTrace1( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL;ret=%d", ret );
 if( KErrArgument == ret )
 {
 ret = iContextList->DialUpContextName( contextId, contextName );
 }
 addrLen ) );
 }
 // no else
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. pdpAddress length:%d", pdpAddress.Length() );
-OstTrace1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL; pdpAddress length=%d", pdpAddress.Length() );
+OstTrace1( TRACE_NORMAL,  DUP2_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL; pdpAddress length=%d", pdpAddress.Length() );
 // Get PDP address
 if ( 0 < pdpAddress.Length() )
 {
 CMmStaticUtility::ConvertIPAddressToClient(
 GPDS_APN_INFO,
 EIsiSubBlockTypeId8Len8,
 sbStartOffSet );
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. find sub block. retValue:%d", retValue );
-OstTrace1( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL;retValue=%d", retValue );
+OstTrace1( TRACE_NORMAL,  DUP3_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL;retValue=%d", retValue );
 if ( KErrNone == retValue )
 {
 TUint8 nameLen ( aIsiMessage.Get8bit(
 sbStartOffSet + GPDS_APN_INFO_OFFSET_ADDRLENGTH ) );
 // Get Access point name.
 if ( NULL != apn.Ptr() )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. apn.Ptr is not null");
-OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL, apn.Ptr is not null" );
+OstTrace0( TRACE_NORMAL,  DUP4_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL, apn.Ptr is not null" );
 config.iAccessPointName.Copy( apn );
 }
 // no else
 addrLen ) );
 }
 // no else
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. primary DNS address length:%d", pDnsAddress.Length() );
-OstTrace1( TRACE_NORMAL, DUP5_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL;primary DNS address length=%d", pDnsAddress.Length() );
+OstTrace1( TRACE_NORMAL,  DUP5_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL;primary DNS address length=%d", pDnsAddress.Length() );
 // Get Primary DNS address.
 if ( 0 < pDnsAddress.Length() )
 {
 CMmStaticUtility::ConvertIPAddressToClient(
 addrLen ) );
 }
 // no else
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. secondary DNS address length:%d", sDnsAddress.Length());
-OstTrace1( TRACE_NORMAL, DUP6_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL;secondary DNS address length=%d", sDnsAddress.Length() );
+OstTrace1( TRACE_NORMAL,  DUP6_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL;secondary DNS address length=%d", sDnsAddress.Length() );
 // Get Secondary DNS address.
 if ( 0 < sDnsAddress.Length() )
 {
 CMmStaticUtility::ConvertIPAddressToClient(
 if ( GPDS_PDP_DCOMP_DEFAULT != dataCompression )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. GPDS_PDP_DCOMP_DEFAULT != dataCompression");
-OstTrace0( TRACE_NORMAL, DUP7_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL, GPDS_PDP_DCOMP_DEFAULT != dataCompression" );
+OstTrace0( TRACE_NORMAL,  DUP7_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL, GPDS_PDP_DCOMP_DEFAULT != dataCompression" );
 if ( GPDS_PDP_DCOMP_ON == dataCompression )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. GPDS_PDP_DCOMP_ON == dataCompression");
-OstTrace0( TRACE_NORMAL, DUP8_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL,  GPDS_PDP_DCOMP_ON == dataCompression" );
+OstTrace0( TRACE_NORMAL,  DUP8_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL,  GPDS_PDP_DCOMP_ON == dataCompression" );
 if ( !( config.iPdpCompression &
 RPacketContext::KPdpDataCompression ) )
 {
 config.iPdpCompression ^=
 if ( GPDS_PDP_DCOMP_DEFAULT != headerCompression )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. GPDS_PDP_DCOMP_DEFAULT != headerCompression");
-OstTrace0( TRACE_NORMAL, DUP9_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateInd, GPDS_PDP_DCOMP_DEFAULT != headerCompressionL" );
+OstTrace0( TRACE_NORMAL,  DUP9_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateInd, GPDS_PDP_DCOMP_DEFAULT != headerCompressionL" );
 if ( GPDS_PDP_DCOMP_ON == headerCompression )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. GPDS_PDP_DCOMP_ON == headerCompression");
-OstTrace0( TRACE_NORMAL, DUP10_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL, GPDS_PDP_DCOMP_ON == headerCompression" );
+OstTrace0( TRACE_NORMAL,  DUP10_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL, GPDS_PDP_DCOMP_ON == headerCompression" );
 if ( !( config.iPdpCompression &
 RPacketContext::KPdpHeaderCompression ) )
 {
 config.iPdpCompression ^=
 // If asked add to TLV struct
 if ( iContextList->GetDNSAddressInfoToContextInfo( contextId ) )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. add to TLV struct");
-OstTrace0( TRACE_NORMAL, DUP11_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL, add to TLV struct" );
+OstTrace0( TRACE_NORMAL,  DUP11_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL, add to TLV struct" );
 // Type is always ipv6
 if ( KIpv6AddressLen == pDnsAddress.Length() )
 {
 for ( TInt i = 0; i < KIpv6AddressLen; i++ )
 // add secondary DNS
 if ( iContextList->GetDNSAddressInfoToContextInfo( contextId ) )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. add secondary DNS");
-OstTrace0( TRACE_NORMAL, DUP12_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL, add secondary DNS" );
+OstTrace0( TRACE_NORMAL,  DUP12_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL, add secondary DNS" );
 // Type is allways ipv6
 if ( KIpv6AddressLen == sDnsAddress.Length() )
 {
 for ( TInt i = 0; i < KIpv6AddressLen; i++ )
 GPDS_SHARED_PCSCF_ADDRESS_INFO,
 EIsiSubBlockTypeId8Len8,
 sbStartOffSet );
 TFLOGSTRING2("TSY: GPDS_SHARED_PCSCF_ADDRESS_INFO sub-block, retValue %d.", retValue );
-OstTrace1( TRACE_NORMAL, DUP13_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL;GPDS_SHARED_PCSCF_ADDRESS_INFO sub-block retValue=%d", retValue );
+OstTrace1( TRACE_NORMAL,  DUP13_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL;GPDS_SHARED_PCSCF_ADDRESS_INFO sub-block retValue=%d", retValue );
 if( KErrNone == retValue )
 {
 TUint8 addrLen ( aIsiMessage.Get8bit(
 sbStartOffSet +
 addrLen ) );
 }
 // no else
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. PCSCF address length:%d", pcScfAddress.Length() );
-OstTrace1( TRACE_NORMAL, DUP14_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL;PCSCF address length=%d", pcScfAddress.Length() );
+OstTrace1( TRACE_NORMAL,  DUP14_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL;PCSCF address length=%d", pcScfAddress.Length() );
 // PCSCF address types IPv6 and IPv4 are valid
 // The length of IPv4 address is 4
 if( KIpv4AddressLen == pcScfAddress.Length() )
 {
 tlvLen += KIpv4AddressLen;
 }
 // no else
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. tlv length:%d", tlvLen );
-OstTrace1( TRACE_NORMAL, DUP15_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL;tlvLen=%d", tlvLen );
+OstTrace1( TRACE_NORMAL,  DUP15_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL;tlvLen=%d", tlvLen );
 // Initialise buffer
 if( 0 < tlvLen )
 {
 config.iProtocolConfigOption.iMiscBuffer.SetLength( tlvLen );
 pDnsBuffer.Length() );
 pcoId = RPacketContext::EEtelPcktDNSServerAddressRequest;
 ret = smallTLV.AppendItemL( pcoId, pDnsBufferPtr );
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd.EEtelPcktDNSServerAddressRequest, Prim. DNS, AppendItemL ret=%d ",ret );
-OstTrace1( TRACE_NORMAL, DUP16_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL;Prim. DNS, AppendItemL ret=%d", ret );
+OstTrace1( TRACE_NORMAL,  DUP16_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL;Prim. DNS, AppendItemL ret=%d", ret );
 }
 // no else
 // Append secondary DNS
 if( KDNSBufferLength == sDnsBuffer.Length() )
 sDnsBuffer.Length() );
 pcoId = RPacketContext::EEtelPcktDNSServerAddressRequest;
 ret = smallTLV.AppendItemL( pcoId, sDnsBufferPtr );
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd.EEtelPcktDNSServerAddressRequest, Sec. DNS, AppendItemL ret=%d ",ret );
-OstTrace1( TRACE_NORMAL, DUP17_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL; Sec. DNS, AppendItemL ret=%d", ret );
+OstTrace1( TRACE_NORMAL,  DUP17_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL; Sec. DNS, AppendItemL ret=%d", ret );
 }
 // no else
 // Append PCSCFBuffer address
 // (IPv6 (length 16) and IPv4 (length 4) address supported)
 pCSCFBuffer.Length() );
 pcoId = RPacketContext::EEtelPcktPCSCFAddressRequest;
 ret = smallTLV.AppendItemL( pcoId, pCSCFBufferPtr );
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd.EEtelPcktPCSCFAddressRequest AppendItemL ret=%d ",ret );
-OstTrace1( TRACE_NORMAL, DUP18_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL;EEtelPcktPCSCFAddressRequest AppendItemL ret=%d", ret );
+OstTrace1( TRACE_NORMAL,  DUP18_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL;EEtelPcktPCSCFAddressRequest AppendItemL ret=%d", ret );
 }
 // no else
 // Append IM CNMS sub system Signalling Flag
 if( KSignallingFlagBuffer == signallingFlagBuffer.Length() )
 signallingFlagBuffer.Length() );
 pcoId = RPacketContext::EEtelPcktIMCNMSSubsystemSignallingFlag;
 ret = smallTLV.AppendItemL( pcoId, signallingFlagBufferPtr );
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd.EEtelPcktIMCNMSSubsystemSignallingFlag AppendItemL ret=%d ",ret );
-OstTrace1( TRACE_NORMAL, DUP19_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL;EEtelPcktIMCNMSSubsystemSignallingFlag AppendItemL ret=%d", ret );
+OstTrace1( TRACE_NORMAL,  DUP19_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL;EEtelPcktIMCNMSSubsystemSignallingFlag AppendItemL ret=%d", ret );
 }
 // no else
 }
 // no else
 KErrNone );
 }
 // no else
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. End point.");
-OstTrace0( TRACE_NORMAL, DUP20_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL, End point" );
+OstTrace0( TRACE_NORMAL,  DUP20_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL, End point" );
 }
 // -----------------------------------------------------------------------------
 // CMmPacketContextMessHandler::GpdsContextActivateFailIndL
 // Breaks gpds context activate fail indication message.
 void CMmPacketContextMessHandler::GpdsContextActivateFailInd(
 const TIsiReceiveC& aIsiMessage )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextActivateFailInd.");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEFAILIND, "CMmPacketContextMessHandler::GpdsContextActivateFailInd" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEFAILIND_TD, "CMmPacketContextMessHandler::GpdsContextActivateFailInd" );
 // initialise struct for completion
 #if (NCP_COMMON_S60_VERSION_SUPPORT==S60_VERSION_32)
 CMmCommonStaticUtility::TContextMisc misc;
 #else
 ISI_HEADER_SIZE + GPDS_CONTEXT_ACTIVATE_FAIL_IND_OFFSET_CID ) );
 TInfoName contextName;
 TInt ret( iContextList->
 GetContextNameByContextId( contextId, contextName ) );
+if ( KErrNone != ret )
+{
+ret = iContextList->DialUpContextName( contextId, contextName );
+}
 if ( KErrNone == ret )
 {
 TUint8 cause( aIsiMessage.Get8bit(  ISI_HEADER_SIZE +
 GPDS_CONTEXT_ACTIVATE_FAIL_IND_OFFSET_CAUSE ) );
 TInfoName contextName;
 TInt ret( iContextList->
 GetContextNameByContextId( contextId, contextName ) );
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextModifyInd. ContextId:%d", contextId);
-OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTMODIFYIND, "CMmPacketContextMessHandler::GpdsContextModifyInd;contextId=%hhu", contextId );
+OstTraceExt1( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTMODIFYIND_TD, "CMmPacketContextMessHandler::GpdsContextModifyInd;contextId=%hhu", contextId );
 if( KErrArgument == ret )
 {
 ret = iContextList->DialUpContextName( contextId, contextName );
 }
 if ( GPDS_CID_VOID != contextId )
 {
 TUint8 transactionId( GenerateTraId( contextId ) );
 TFLOGSTRING3("TSY: CMmPacketContextMessHandler::GpdsContextDeactivateReq. TransId: %d ContextId: %d", transactionId, contextId );
-OstTraceExt2( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATEREQ, "CMmPacketContextMessHandler::GpdsContextDeactivateReq;transactionId=%hhu;contextId=%hhu", transactionId, contextId );
+OstTraceExt2( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATEREQ_TD, "CMmPacketContextMessHandler::GpdsContextDeactivateReq;transactionId=%hhu;contextId=%hhu", transactionId, contextId );
 // Set the message data that consists of one parameter
 TBuf8<KMessageDataBufSize1> messageData;
 messageData.Append( contextId );
 // Send Isi message via Phonet
 transactionId, GPDS_CONTEXT_DEACTIVATE_REQ, messageData );
 }
 else
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextDeactivateReq. Context ID not found, return KErrNotFound" );
-OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATEREQ, "CMmPacketContextMessHandler::GpdsContextDeactivateReq. Context ID not found, return KErrNotFound" );
+OstTrace0( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATEREQ_TD, "CMmPacketContextMessHandler::GpdsContextDeactivateReq. Context ID not found, return KErrNotFound" );
 ret = KErrNotFound;
 }
 return ret;
 }
 void CMmPacketContextMessHandler::GpdsContextDeactivateRespL(
 const TIsiReceiveC& aIsiMessage )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextDeactivateRespL.");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATERESPL, "CMmPacketContextMessHandler::GpdsContextDeactivateRespL" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATERESPL_TD, "CMmPacketContextMessHandler::GpdsContextDeactivateRespL" );
 // Get transaction id
 TUint8 transactionId( aIsiMessage.Get8bit(
 ISI_HEADER_SIZE + GPDS_CONTEXT_DEACTIVATE_RESP_OFFSET_UTID ) );
 TUint8 status( aIsiMessage.Get8bit(
 if( KErrNone != ret )
 {
 TFLOGSTRING( "TSY: CMmPacketContextMessHandler::GpdsContextDeactivateRespL. SetPipeResetTraId failed " );
-OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATERESPL, "CMmPacketContextMessHandler::GpdsContextDeactivateRespL, SetPipeResetTraId failed" );
+OstTrace0( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATERESPL_TD, "CMmPacketContextMessHandler::GpdsContextDeactivateRespL, SetPipeResetTraId failed" );
 }
 // no else
 }
 // no else
 }
 result );
 }
 // no else
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextDeactivateRespL. Error(0=OK): %d ", found );
-OstTrace1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATERESPL, "CMmPacketContextMessHandler::GpdsContextDeactivateRespL;Error(0=OK)=%d", found );
+OstTrace1( TRACE_NORMAL,  DUP2_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATERESPL_TD, "CMmPacketContextMessHandler::GpdsContextDeactivateRespL;Error(0=OK)=%d", found );
 // check if incoming call allowation is requested
 // (for allow incoming call feature)
 if ( GPDS_OK == status &&
 CALL_MODEM_ID_NONE != iCallModemResourceCallId )
 TUint8 contextId( aIsiMessage.Get8bit(
 ISI_HEADER_SIZE + GPDS_CONTEXT_DEACTIVATING_IND_OFFSET_CID ) );
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextDeactivatingInd. Context id: %d", contextId );
-OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATINGIND, "CMmPacketContextMessHandler::GpdsContextDeactivatingInd;contextId=%hhu", contextId );
+OstTraceExt1( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATINGIND_TD, "CMmPacketContextMessHandler::GpdsContextDeactivatingInd;contextId=%hhu", contextId );
 TInfoName contextName;
 TInt ret( iContextList->
 GetContextNameByContextId( contextId, contextName ) );
 }
 // no else
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextDeactivatingInd. Error(0=OK): %d ", ret );
-OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATINGIND, "CMmPacketContextMessHandler::GpdsContextDeactivatingInd;Error(0=OK)=%d", ret );
+OstTrace1( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATINGIND_TD, "CMmPacketContextMessHandler::GpdsContextDeactivatingInd;Error(0=OK)=%d", ret );
 }
 // -----------------------------------------------------------------------------
 // CMmPacketContextMessHandler::GpdsContextDeactivateInd
 // Breaks gpds context deactivate indication message.
 void CMmPacketContextMessHandler::GpdsContextDeactivateInd(
 const TIsiReceiveC& aIsiMessage )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextDeactivateInd.");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATEIND, "CMmPacketContextMessHandler::GpdsContextDeactivateInd" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATEIND_TD, "CMmPacketContextMessHandler::GpdsContextDeactivateInd" );
 TUint8 contextId( aIsiMessage.Get8bit(
 ISI_HEADER_SIZE + GPDS_CONTEXT_DEACTIVATE_IND_OFFSET_CID ) );
 TInfoName contextName;
 TInt ret( KErrNotReady );
 TUint8 transactionId( GenerateTraId( contextId ) );
 TFLOGSTRING3("TSY: CMmPacketContextMessHandler::GpdsContextStatusReq. TransId: %d ContextId: %d", transactionId, contextId );
-OstTraceExt2( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTSTATUSREQ, "CMmPacketContextMessHandler::GpdsContextStatusReq;transactionId=%hhu;contextId=%hhu", transactionId, contextId );
+OstTraceExt2( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTSTATUSREQ_TD, "CMmPacketContextMessHandler::GpdsContextStatusReq;transactionId=%hhu;contextId=%hhu", transactionId, contextId );
 if(  GPDS_CID_VOID != contextId  )
 {
 // Set the message data that consists of one parameter
 TBuf8<KMessageDataBufSize1> messageData;
 void CMmPacketContextMessHandler::GpdsContextStatusResp(
 const TIsiReceiveC& aIsiMessage )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextStatusResp.");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTSTATUSRESP, "CMmPacketContextMessHandler::GpdsContextStatusResp" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTSTATUSRESP_TD, "CMmPacketContextMessHandler::GpdsContextStatusResp" );
 // Get context id
 TUint8 contextId( aIsiMessage.Get8bit(
 ISI_HEADER_SIZE + GPDS_CONTEXT_STATUS_RESP_OFFSET_CID ) );
 TInfoName contextName;
 void CMmPacketContextMessHandler::GpdsContextStatusInd(
 const TIsiReceiveC& aIsiMessage )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextStatusInd.");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTSTATUSIND, "CMmPacketContextMessHandler::GpdsContextStatusInd" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTSTATUSIND_TD, "CMmPacketContextMessHandler::GpdsContextStatusInd" );
 // Get context id
 TUint8 contextId( aIsiMessage.Get8bit(
 ISI_HEADER_SIZE + GPDS_CONTEXT_STATUS_IND_OFFSET_CID  ) );
 TInfoName contextName;
 void CMmPacketContextMessHandler::GpdsContextIdDeleteInd(
 const TIsiReceiveC& aIsiMessage )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextIdDeleteInd.");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTIDDELETEIND, "CMmPacketContextMessHandler::GpdsContextIdDeleteInd" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTIDDELETEIND_TD, "CMmPacketContextMessHandler::GpdsContextIdDeleteInd" );
 TUint8 contextId( aIsiMessage.Get8bit(
 ISI_HEADER_SIZE + GPDS_CONTEXT_ID_DELETE_IND_OFFSET_CID  ) );
 // Get transaction id
 TUint8 transactionId( iContextList->
 if( KErrNone == ret )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextIdDeleteInd. Context name found.");
-OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTIDDELETEIND, "CMmPacketContextMessHandler::GpdsContextIdDeleteInd, Context name found" );
+OstTrace0( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTIDDELETEIND_TD, "CMmPacketContextMessHandler::GpdsContextIdDeleteInd, Context name found" );
 // initialise struct for completion
 #if (NCP_COMMON_S60_VERSION_SUPPORT==S60_VERSION_32)
 CMmCommonStaticUtility::TContextMisc misc;
 #else
 aDataPackage->UnPackData( configuration, mediaAuthorizationArray );
 contextName = configuration.iContextName;
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextModifyReq. Context:%s", &contextName );
-OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTMODIFYREQ, "CMmPacketContextMessHandler::GpdsContextModifyReq;contextName=%S", contextName );
+OstTraceExt1( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTMODIFYREQ_TD, "CMmPacketContextMessHandler::GpdsContextModifyReq;contextName=%S", contextName );
 TUint8 contextId(iContextList->GetContextIdByContextName( &contextName ));
 // Initializing ret value to KErrNone
 TInt ret( KErrNone );
 if( GPDS_CID_VOID != contextId )
 {
 TUint8 modifyTraId( GenerateTraId( contextId ) );
 TFLOGSTRING3("TSY: CMmPacketContextMessHandler::GpdsContextModifyReq. TransId: %d ContextId: %d", modifyTraId, contextId );
-OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTMODIFYREQ, "CMmPacketContextMessHandler::GpdsContextModifyReq;modifyTraId=%hhu;contextId=%hhu", modifyTraId, contextId );
+OstTraceExt2( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTMODIFYREQ_TD, "CMmPacketContextMessHandler::GpdsContextModifyReq;modifyTraId=%hhu;contextId=%hhu", modifyTraId, contextId );
 TUint8 tftOperation( 0 );
 MapTftOperation( configuration.iTftOperation, tftOperation );
 TInt errorValue( KErrNone );
 TUint8 contextId( aIsiMessage.Get8bit(
 ISI_HEADER_SIZE + GPDS_CONTEXT_MODIFY_RESP_OFFSET_CID ) );
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextModifyResp. Context id:%d", contextId );
-OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTMODIFYRESP, "CMmPacketContextMessHandler::GpdsContextModifyResp;contextId=%hhu", contextId );
+OstTraceExt1( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTMODIFYRESP_TD, "CMmPacketContextMessHandler::GpdsContextModifyResp;contextId=%hhu", contextId );
 sbStartOffSet = 0;
 if( GPDS_CID_VOID != contextId )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextModifyResp. Context != GPDS_CID_VOID");
-OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTMODIFYRESP, "CMmPacketContextMessHandler::GpdsContextModifyResp, Context != GPDS_CID_VOID" );
+OstTrace0( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTMODIFYRESP_TD, "CMmPacketContextMessHandler::GpdsContextModifyResp, Context != GPDS_CID_VOID" );
 // Get transaction id
 TUint8 transactionId( aIsiMessage.Get8bit(
 ISI_HEADER_SIZE + GPDS_CONTEXT_MODIFY_RESP_OFFSET_UTID ) );
 TUint8 modifyTraId( GenerateTraId( contextId ) );
 TBuf8<1> rejectionCauseBuf;
 rejectionCauseBuf.Zero();
 rejectionCauseBuf.Append( rejectionCause );
 TFLOGSTRING4("TSY: CMmPacketContextMessHandler::GpdsContextModifyResp. status:%d, errorValue:%d, rejCause:%d", status, errorValue, rejectionCause);
-OstTraceExt3( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTMODIFYRESP, "CMmPacketContextMessHandler::GpdsContextModifyResp;status=%hhu;errorValue=%d;rejectionCause=%hhu", status, errorValue, rejectionCause );
+OstTraceExt3( TRACE_NORMAL,  DUP2_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTMODIFYRESP_TD, "CMmPacketContextMessHandler::GpdsContextModifyResp;status=%hhu;errorValue=%d;rejectionCause=%hhu", status, errorValue, rejectionCause );
 // Make sure that buffer is empty if rejection code is not there
 if( KErrNone == rejectionCause )
 {
 rejectionCauseBuf.Zero();
 RPacketContext::TPacketFilterV2* aFilter,
 TDes8& aBuffer ) const
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::AddPacketFilterInfo");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO, "CMmPacketContextMessHandler::AddPacketFilterInfo" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO_TD, "CMmPacketContextMessHandler::AddPacketFilterInfo" );
 // Initialize variable which indicates number of components
 // in PacketFilter
 TUint8 numberOfSubSubBlocks( 0 );
 // Create tftFilterInfo
 // Checking also is given value valid. Value 0 means Optional
 if ( ( 0 < aFilter->iFlowLabel ) && ( GPDS_PDP_TYPE_IPV6 == aPdpType ) )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::AddPacketFilterInfo. GPDS_PDP_TYPE_IPV6");
-OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO, "CMmPacketContextMessHandler::AddPacketFilterInfo, GPDS_PDP_TYPE_IPV6" );
+OstTrace0( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO_TD, "CMmPacketContextMessHandler::AddPacketFilterInfo, GPDS_PDP_TYPE_IPV6" );
 AppendGpdsFilterFlowLabelInfo( *aFilter, tftFilterInfo,
 numberOfSubSubBlocks );
 }
 // no else
 // If TOSorTrafficClass have valid value
 // Value 0 means Optional
 if ( 0 < aFilter->iTOSorTrafficClass )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::AddPacketFilterInfo. TOSorTrafficClass have valid value");
-OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO, "CMmPacketContextMessHandler::AddPacketFilterInfo, TOSorTrafficClass have valid value" );
+OstTrace0( TRACE_NORMAL,  DUP2_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO_TD, "CMmPacketContextMessHandler::AddPacketFilterInfo, TOSorTrafficClass have valid value" );
 AppendGpdsFilterTosInfo( *aFilter, tftFilterInfo, numberOfSubSubBlocks );
 }
 // no else
 // If IPSecSPI have valid value
 // Value 0 means Optional
 if ( 0 < aFilter->iIPSecSPI )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::AddPacketFilterInfo. IPSecSPI have valid value");
-OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO, "CMmPacketContextMessHandler::AddPacketFilterInfo, IPSecSPI have valid value" );
+OstTrace0( TRACE_NORMAL,  DUP3_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO_TD, "CMmPacketContextMessHandler::AddPacketFilterInfo, IPSecSPI have valid value" );
 AppendGpdsFilterSpiInfo( *aFilter, tftFilterInfo, numberOfSubSubBlocks );
 }
 // no else
 // Value 0 means Optional
 if ( ( 0 < aFilter->iSrcPortMin ) && ( 0 < aFilter->iSrcPortMax ) )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::AddPacketFilterInfo. SrcPortMin and SrcPortMax both have valid value");
-OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO, "CMmPacketContextMessHandler::AddPacketFilterInfo, SrcPortMin and SrcPortMax both have valid value" );
+OstTrace0( TRACE_NORMAL,  DUP4_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO_TD, "CMmPacketContextMessHandler::AddPacketFilterInfo, SrcPortMin and SrcPortMax both have valid value" );
 AppendGpdsFilterSrcPortRangeInfo( *aFilter, tftFilterInfo,
 numberOfSubSubBlocks );
 }
 // no else
 // If DestPortMin and DestPortMax both have valid value
 // Value 0 means Optional
 if ( ( 0 < aFilter->iDestPortMin ) && ( 0 < aFilter->iDestPortMax ) )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::AddPacketFilterInfo. DestPortMin and DestPortMax both have valid value");
-OstTrace0( TRACE_NORMAL, DUP5_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO, "CMmPacketContextMessHandler::AddPacketFilterInfo, DestPortMin and DestPortMax both have valid value" );
+OstTrace0( TRACE_NORMAL,  DUP5_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO_TD, "CMmPacketContextMessHandler::AddPacketFilterInfo, DestPortMin and DestPortMax both have valid value" );
 AppendGpdsFilterDstPortRangeInfo( *aFilter, tftFilterInfo,
 numberOfSubSubBlocks );
 }
 // no else
 // If ProtocolNumberOrNextHeader have valid value
 // Value 0 means Optional
 if ( 0 < aFilter->iProtocolNumberOrNextHeader )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::AddPacketFilterInfo. ProtocolNumberOrNextHeader have valid value");
-OstTrace0( TRACE_NORMAL, DUP6_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO, "CMmPacketContextMessHandler::AddPacketFilterInfo, ProtocolNumberOrNextHeader have valid value" );
+OstTrace0( TRACE_NORMAL,  DUP6_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO_TD, "CMmPacketContextMessHandler::AddPacketFilterInfo, ProtocolNumberOrNextHeader have valid value" );
 AppendGpdsFilterProtocolInfo( *aFilter, tftFilterInfo,
 numberOfSubSubBlocks );
 }
 // no else
 // If given aPdpType indicates the Src Addr is type IPv4
 if ( GPDS_PDP_TYPE_IPV4 == aPdpType )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::AddPacketFilterInfo. aPdpType == GPDS_PDP_TYPE_IPV4");
-OstTrace0( TRACE_NORMAL, DUP7_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO, "CMmPacketContextMessHandler::AddPacketFilterInfo, aPdpType == GPDS_PDP_TYPE_IPV4" );
+OstTrace0( TRACE_NORMAL,  DUP7_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO_TD, "CMmPacketContextMessHandler::AddPacketFilterInfo, aPdpType == GPDS_PDP_TYPE_IPV4" );
 AppendGpdsFilterSrcIPv4AddressInfo( *aFilter, tftFilterInfo,
 numberOfSubSubBlocks );
 }
 // If given aPdpType indicates the Src Addr is type IPv6
 else if ( GPDS_PDP_TYPE_IPV6 == aPdpType )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::AddPacketFilterInfo. aPdpType == GPDS_PDP_TYPE_IPV6");
-OstTrace0( TRACE_NORMAL, DUP8_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO, "CMmPacketContextMessHandler::AddPacketFilterInfo, aPdpType == GPDS_PDP_TYPE_IPV6" );
+OstTrace0( TRACE_NORMAL,  DUP8_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO_TD, "CMmPacketContextMessHandler::AddPacketFilterInfo, aPdpType == GPDS_PDP_TYPE_IPV6" );
 AppendGpdsFilterSrcIPv6AddressInfo( *aFilter, tftFilterInfo,
 numberOfSubSubBlocks );
 }
 // no else
 GPDS_TFT_FILTER_INFO_OFFSET_NUMBEROFSUBBLOCKS, sbCountBuf );
 // Add GPDS_TFT_FILTER_INFO subblock
 aBuffer.Append( tftFilterInfoSubBlock.CompleteSubBlock() );
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::AddPacketFilterInfo. Return tftFilterInfo length: %d", tftFilterInfo.Length() );
-OstTrace1( TRACE_NORMAL, DUP9_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO, "CMmPacketContextMessHandler::AddPacketFilterInfo;Return tftFilterInfo length=%d", tftFilterInfo.Length() );
+OstTrace1( TRACE_NORMAL,  DUP9_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO_TD, "CMmPacketContextMessHandler::AddPacketFilterInfo;Return tftFilterInfo length=%d", tftFilterInfo.Length() );
 return static_cast<TUint16>( tftFilterInfo.Length() );
 }
 // -----------------------------------------------------------------------------
 RPacketContext::TAuthData aChallenge,
 TUint8  aId )
 {
 TFLOGSTRING3("TSY: CMmPacketContextMessHandler::SetAuthenticationConfigReq. TransId: %d ContextId: %d", aTransactionId, aContextId );
-OstTraceExt2( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_SETAUTHENTICATIONCONFIGREQ, "CMmPacketContextMessHandler::SetAuthenticationConfigReq;aTransactionId=%hhu;aContextId=%hhu", aTransactionId, aContextId );
+OstTraceExt2( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_SETAUTHENTICATIONCONFIGREQ_TD, "CMmPacketContextMessHandler::SetAuthenticationConfigReq;aTransactionId=%hhu;aContextId=%hhu", aTransactionId, aContextId );
 TInt ret( KErrNone );
 // Create isi message
 TIsiSend gpdsContextAuthReq( iPhoNetSender->SendBufferDes() );
 if ( RPacketContext::KMaxAuthDataLength >=
 aAuthInfo.iUsername.Length() )
 {
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::SetAuthenticationConfigReq. aAuthInfo.iUsername.Length: %d", aAuthInfo.iUsername.Length());
-OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_SETAUTHENTICATIONCONFIGREQ, "CMmPacketContextMessHandler::SetAuthenticationConfigReq;aAuthInfo.iUsername.Length=%d", aAuthInfo.iUsername.Length() );
+OstTrace1( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_SETAUTHENTICATIONCONFIGREQ_TD, "CMmPacketContextMessHandler::SetAuthenticationConfigReq;aAuthInfo.iUsername.Length=%d", aAuthInfo.iUsername.Length() );
 // Add GPDS_USERNAME_INFO subblock
 // Set the Username info
 // Length must correspond to KMaxAuthDataLength (+6 for ISI message)
 const TInt KBytesForISIMessage( 6 );
 ( RPacketContext::KMaxAuthDataLength >=
 aAuthInfo.iPassword.Length() ) )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::SetAuthenticationConfigReq. Protocol EProtocolPAP");
-OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_SETAUTHENTICATIONCONFIGREQ, "CMmPacketContextMessHandler::SetAuthenticationConfigReq, Protocol EProtocolPAP" );
+OstTrace0( TRACE_NORMAL,  DUP2_CMMPACKETCONTEXTMESSHANDLER_SETAUTHENTICATIONCONFIGREQ_TD, "CMmPacketContextMessHandler::SetAuthenticationConfigReq, Protocol EProtocolPAP" );
 // Add GPDS_PASSWORD_INFO subblock
 // Set the Password info
 // Length must correspond to KMaxAuthDataLength (+6 for isi message)
 TBuf8<RPacketContext::KMaxAuthDataLength + 6> passwordInfo;
 aAuthInfo.iUsername.Length() ) &&
 ( RPacketContext::KMaxAuthDataLength >= aResponse.Length() ) )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::SetAuthenticationConfigReq. Protocol EProtocolCHAP");
-OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_SETAUTHENTICATIONCONFIGREQ, "CMmPacketContextMessHandler::SetAuthenticationConfigReq, Protocol EProtocolCHAP" );
+OstTrace0( TRACE_NORMAL,  DUP3_CMMPACKETCONTEXTMESSHANDLER_SETAUTHENTICATIONCONFIGREQ_TD, "CMmPacketContextMessHandler::SetAuthenticationConfigReq, Protocol EProtocolCHAP" );
 // Add GPDS_CHALLENGE_INFO subblock
 // Set the Challenge info
 // Length must correspond to KMaxAuthDataLength (+6 for ISI message)
 TBuf8<RPacketContext::KMaxAuthDataLength + 6> challengeInfo;
 }
 else
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::SetAuthenticationConfigReq. return KErrTooBig");
-OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_SETAUTHENTICATIONCONFIGREQ, "CMmPacketContextMessHandler::SetAuthenticationConfigReq,return KErrTooBig" );
+OstTrace0( TRACE_NORMAL,  DUP4_CMMPACKETCONTEXTMESSHANDLER_SETAUTHENTICATIONCONFIGREQ_TD, "CMmPacketContextMessHandler::SetAuthenticationConfigReq,return KErrTooBig" );
 ret = KErrTooBig;
 }
 if ( KErrNone == ret )
 gpdsContextAuthReq.Set8bit(
 ISI_HEADER_SIZE + GPDS_CONTEXT_AUTH_REQ_OFFSET_NUMBEROFSUBBLOCKS,
 numOfSbInMessage );
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::SetAuthenticationConfigReq. Send GPDS_CONTEXT_AUTH_REQ message");
-OstTrace0( TRACE_NORMAL, DUP5_CMMPACKETCONTEXTMESSHANDLER_SETAUTHENTICATIONCONFIGREQ, "CMmPacketContextMessHandler::SetAuthenticationConfigReq, Send GPDS_CONTEXT_AUTH_REQ message" );
+OstTrace0( TRACE_NORMAL,  DUP5_CMMPACKETCONTEXTMESSHANDLER_SETAUTHENTICATIONCONFIGREQ_TD, "CMmPacketContextMessHandler::SetAuthenticationConfigReq, Send GPDS_CONTEXT_AUTH_REQ message" );
 // Send GPDS_CONTEXT_AUTH_REQ message
 ret = iPhoNetSender->Send( gpdsContextAuthReq.Complete() );
 }
 // no else
 TInt aIpc,
 const CMmDataPackage* aDataPackage )
 {
 TFLOGSTRING2( "TSY: CMmPacketContextMessHandler::ExtFuncL. IPC: %d", aIpc );
-OstTrace1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_EXTFUNCL, "CMmPacketContextMessHandler::ExtFuncL;aIpc=%d", aIpc );
+OstTrace1( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_EXTFUNCL_TD, "CMmPacketContextMessHandler::ExtFuncL;aIpc=%d", aIpc );
 // add the usage of ASSERT MACRO for aDataPackage when it's available
 TInt ret( KErrNotSupported );
 switch ( aIpc )
 ret = SetConfigL( *aDataPackage );
 break;
 }
 case EPacketContextActivate:
 {
-ret = iMmPipeController->PnsPipeEnableReq( *aDataPackage );
+// Call ActivatePhase2L
+ret = ActivatePhase2( *aDataPackage );
 break;
 }
 case EPacketContextDeactivate:
 {
 ret = GpdsContextDeactivateReq( *aDataPackage );
 default:
 {
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::ExtFuncL - Unknown IPC: %d", aIpc);
-OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_EXTFUNCL, "CMmPacketContextMessHandler::ExtFuncL;Unknown aIpc=%d", aIpc );
+OstTrace1( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_EXTFUNCL_TD, "CMmPacketContextMessHandler::ExtFuncL;Unknown aIpc=%d", aIpc );
 break;
 }
 }
+TFLOGSTRING2("TSY: CMmPacketContextMessHandler::ExtFuncL exit: 0x%x", ret);
+OstTrace1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_EXTFUNCL_TD, "CMmPacketContextMessHandler::ExtFuncL;ret=%x", ret );
 return ret;
 }
 // -----------------------------------------------------------------------------
 // CMmPacketContextMessHandler::InitialiseContext
 TInt CMmPacketContextMessHandler::InitialiseContext(
 const CMmDataPackage& aDataPackage )
 {
 TFLOGSTRING( "TSY: CMmPacketContextMessHandler::InitialiseContext");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_INITIALISECONTEXT, "CMmPacketContextMessHandler::InitialiseContext" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_INITIALISECONTEXT_TD, "CMmPacketContextMessHandler::InitialiseContext" );
 TInt channelId( KTUint8NotDefined );
 TInfoName* contextName = NULL;
 TInfoName* hostCidName = NULL;
 TInt ret( KErrNone );
 TInt CMmPacketContextMessHandler::InitialiseContextPhase2(
 TUint8 aPipeHandle )
 {
 TFLOGSTRING("TSY: CMmPacketContextGsmWcdmaExt::InitialiseContextPhase2.");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_INITIALISECONTEXTPHASE2, "CMmPacketContextMessHandler::InitialiseContextPhase2" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_INITIALISECONTEXTPHASE2_TD, "CMmPacketContextMessHandler::InitialiseContextPhase2" );
 TInt ret( KErrNone );
 TUint8 createContextIdTransId( iContextList->
 CreateContextIdTransIdByPipeHandle( aPipeHandle ) );
 }
 // no else
 TFLOGSTRING2("TSY: CMmPacketContextGsmWcdmaExt::InitialiseContextPhase2. Error(0=OK) %d", ret );
-OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_INITIALISECONTEXTPHASE2, "CMmPacketContextMessHandler::InitialiseContextPhase2;Error(0=OK) %d", ret );
+OstTrace1( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_INITIALISECONTEXTPHASE2_TD, "CMmPacketContextMessHandler::InitialiseContextPhase2;Error(0=OK) %d", ret );
 }
 // no else
 }
 // no else
 // CMmPacketContextMessHandler::InitialiseContextPhase3
 // This function starts the third phase of the context initialisation.
 // -----------------------------------------------------------------------------
 //
 void CMmPacketContextMessHandler::InitialiseContextPhase3(
-const TUint8 aStatus,
+TUint8 aStatus,
-const TUint8 aContextId )
+TUint8 aContextId,
+TUint8 aTrId )
 {
 TFLOGSTRING3("TSY: CMmPacketContextGsmWcdmaExt::InitialiseContextPhase3. ContextId:%d aStatus:%d", aContextId, aStatus );
-OstTraceExt2( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_INITIALISECONTEXTPHASE3, "CMmPacketContextMessHandler::InitialiseContextPhase3;aContextId=%d;aStatus=%d", aContextId, aStatus );
+OstTraceExt2( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_INITIALISECONTEXTPHASE3_TD, "CMmPacketContextMessHandler::InitialiseContextPhase3;aContextId=%d;aStatus=%d", aContextId, aStatus );
 TInt ret( KErrGeneral );
 if ( GPDS_OK == aStatus )
 {
 CMmDataPackage data;
 TInt found( iContextList->
 GetContextNameByContextId( aContextId, contextname ) );
 TFLOGSTRING2("TSY: CMmPacketContextGsmWcdmaExt::InitialiseContextPhase3. Error:%d", ret );
-OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_INITIALISECONTEXTPHASE3, "CMmPacketContextMessHandler::InitialiseContextPhase3;Error=%d", ret );
+OstTrace1( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_INITIALISECONTEXTPHASE3_TD, "CMmPacketContextMessHandler::InitialiseContextPhase3;Error=%d", ret );
 iInitialiseError = ret;
 // Remove the pipe
 // Context not found->pipehandle not found
 if( KErrNotFound == ret )
 if ( GPDS_ERROR == aStatus )
 {
 // If GPDS_STATUS in GPDS_CONTEXT_ID_CREATE_RESP is
 // GPDS_ERROR, max number of contexts already in use
 // (~=ALL_PIPES_IN_USE). => remove pipe if created
-TUint8 pipeRemoveTraId( GenerateTraId( aContextId ) );
 TUint8 pipeHandle( iContextList->
 PipeHandleByContextName( &contextname ) );
 ret = iMmPipeController->PnsPipeRemoveReq(
-pipeRemoveTraId, pipeHandle );
+aTrId, pipeHandle );
 if ( KErrNone == ret )
 {
 // Store the trans id
 ret = iContextList->
-SetRemovePipeTraId( pipeRemoveTraId, pipeHandle );
+SetRemovePipeTraId( aTrId, pipeHandle );
 }
 ret = CMmStaticUtility::EpocErrorCode(
 KErrOverflow, KErrUmtsMaxNumOfContextExceededByPhone );
 }
 // no else
 const TUint8 aPipeHandle,
 const TUint8 aErrorCause )
 {
 TFLOGSTRING3("TSY: CMmPacketContextMessHandler::CompletePipeOperation. MessageId:%d Pipe handle:%d", aMessageId, aPipeHandle );
-OstTraceExt2( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION, "CMmPacketContextMessHandler::CompletePipeOperation;aMessageId=%d;aPipeHandle=%hhu", aMessageId, aPipeHandle );
+OstTraceExt2( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION_TD, "CMmPacketContextMessHandler::CompletePipeOperation;aMessageId=%d;aPipeHandle=%hhu", aMessageId, aPipeHandle );
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::CompletePipeOperation. Error cause:%d", aErrorCause );
-OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION, "CMmPacketContextMessHandler::CompletePipeOperation;aErrorCause=%hhu", aErrorCause );
+OstTraceExt1( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION_TD, "CMmPacketContextMessHandler::CompletePipeOperation;aErrorCause=%hhu", aErrorCause );
 TInt errorCause( KErrNone );
 if ( PN_PIPE_NO_ERROR != aErrorCause )
 {
 switch ( aMessageId )
 {
 case PNS_PIPE_CREATE_RESP:
 {
+TFLOGSTRING("TSY: CMmPacketContextMessHandler::CompletePipeOperation - PNS_PIPE_CREATE_RESP" );
+OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION_TD, "CMmPacketContextMessHandler::CompletePipeOperation - PNS_PIPE_CREATE_RESP" );
 if ( PN_PIPE_NO_ERROR == aErrorCause )
 {
 // Store the pipe handle
 TInt ret( iContextList->
 SetPipeHandle( aTransactionId, aPipeHandle ) );
 if( KErrNone != ret2 )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::CompletePipeOperation. Cannot Complete Initialisation");
-OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION, "CMmPacketContextMessHandler::CompletePipeOperation, Cannot Complete Initialisation" );
+OstTrace0( TRACE_NORMAL,  DUP3_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION_TD, "CMmPacketContextMessHandler::CompletePipeOperation, Cannot Complete Initialisation" );
 }
 // no else
 }
 // no else
 }
 // no else
 if( KErrNone != ret )
 {
 TFLOGSTRING("LTSY: CMmPacketContextMessHandler::CompletePipeOperationL. Cannot Complete failed initialisation" );
-OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION, "CMmPacketContextMessHandler::CompletePipeOperation, Cannot Complete failed initialisation" );
+OstTrace0( TRACE_NORMAL,  DUP4_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION_TD, "CMmPacketContextMessHandler::CompletePipeOperation, Cannot Complete failed initialisation" );
 }
 // no else
 }
 else if( PN_PIPE_ERR_GENERAL == aErrorCause  )
 {
 if( KErrNone == ret  )
 {
 TFLOGSTRING2("LTSY: CMmPacketContextMessHandler::CompletePipeOperationL.Complete context initialisation with %d", errorCause );
-OstTraceExt1( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION, "CMmPacketContextMessHandler::CompletePipeOperation;Complete context initialisation with=%hhu", aErrorCause );
+OstTraceExt1( TRACE_NORMAL,  DUP5_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION_TD, "CMmPacketContextMessHandler::CompletePipeOperation;Complete context initialisation with=%hhu", aErrorCause );
 //Completion because of some error in PIPE
 CMmDataPackage data;
 data.PackData( &contextname );
 iMessageRouter->Complete(
 EPacketContextInitialiseContext,
 if( KErrNone != ret )
 {
 TFLOGSTRING("LTSY: CMmPacketContextMessHandler::CompletePipeOperationL. Cannot Complete failed initialisation");
-OstTrace0( TRACE_NORMAL, DUP5_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION, "CMmPacketContextMessHandler::CompletePipeOperation, Cannot Complete failed initialisation" );
+OstTrace0( TRACE_NORMAL,  DUP6_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION_TD, "CMmPacketContextMessHandler::CompletePipeOperation, Cannot Complete failed initialisation" );
 }
 // no else
 }
 else
 {
 if( KErrNone != ret )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::CompletePipeOperation. Cannot Complete Initialisation");
-OstTrace0( TRACE_NORMAL, DUP6_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION, "CMmPacketContextMessHandler::CompletePipeOperation, Cannot Complete Initialisation" );
+OstTrace0( TRACE_NORMAL,  DUP7_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION_TD, "CMmPacketContextMessHandler::CompletePipeOperation, Cannot Complete Initialisation" );
 }
 // no else
 }
 // no else
 }
 }
 break;
 }
 case PNS_PIPE_ENABLE_RESP:
 {
+TFLOGSTRING("TSY: CMmPacketContextMessHandler::CompletePipeOperation - PNS_PIPE_ENABLE_RESP");
+OstTrace0( TRACE_NORMAL, DUP8_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION_TD, "CMmPacketContextMessHandler::CompletePipeOperation - PNS_PIPE_ENABLE_RESP" );
+// Pipe status is enabled
+iContextList->SetPipeStatus( aPipeHandle, PN_PIPE_ENABLE );
+TUint8 proxyId( iContextList->ProxyIdByPipeHandle( aPipeHandle ) );
+TUint8 devId( 0 );
+TUint8 objId( 0 );
+iContextList->GetExternalDevice( proxyId, devId, objId );
 if ( PN_PIPE_NO_ERROR == aErrorCause )
 {
-// Pipe status is enabled
+iMmPipeController->PnsPepCtrlReq(
-iContextList->SetPipeStatus( aPipeHandle, PN_PIPE_ENABLE );
+devId,
-// Call ActivatePhase2L
+objId,
-ActivatePhase2( aPipeHandle, aTransactionId );
+aTransactionId,
-}
+aPipeHandle,
-// no else
+PEP_CTRL_ID_LOAN,
+PEP_BCA_OK,
+proxyId );
+}
+else
+{
+iMmPipeController->PnsPepCtrlReq(
+devId,
+objId,
+aTransactionId,
+aPipeHandle,
+PEP_CTRL_ID_LOAN,
+PEP_BCA_FAIL,
+proxyId );
+}
 // This is executed in special case when user has cancelled
 // activation, NIF's pep is desctructed and due that pipe server
 // returns an error in PNS_PIPE_ENABLE_RESP message.
 if ( PN_PIPE_ERR_GENERAL == aErrorCause )
 {
 TUint8 contextId( iContextList->
 ContextIdByPipeHandle( aPipeHandle ) );
 TInfoName contextname;
 TInt ret( iContextList->
 GetContextNameByContextId( contextId, contextname ) );
-if ( ret == KErrNone )
-{
-TFLOGSTRING("LTSY: CMmPacketContextMessHandler::CompletePipeOperationL.Complete ACTIVATION with KErrGeneral");
-OstTrace0( TRACE_NORMAL, DUP7_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION, "CMmPacketContextMessHandler::CompletePipeOperation, Complete ACTIVATION with KErrGeneral" );
-CMmDataPackage data;
-TAny* ptr = NULL;
-data.PackData( &contextname, ptr );
-iMessageRouter->Complete(
-EPacketContextActivate,
-&data,
-KErrGeneral );
-}
-// no else
 TUint8 pipeHandle( iContextList->
 PipeHandleByContextName( &contextname ) );
 ret = iMmPipeController->
 PnsPipeRemoveReq( aTransactionId, pipeHandle );
 }
 case PNS_PIPE_REMOVE_RESP:
 {
 TUint8 channelId( iContextList->ProxyIdByPipeHandle( aPipeHandle ) );
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::CompletePipeOperation;closing channelId=%d", channelId);
-OstTraceExt1( TRACE_NORMAL, DUP9_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION, "CMmPacketContextMessHandler::CompletePipeOperation;closing channelId=%hhu", channelId );
+OstTraceExt1( TRACE_NORMAL,  DUP9_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION_TD, "CMmPacketContextMessHandler::CompletePipeOperation;closing channelId=%hhu", channelId );
 iContextList->CloseChannel( channelId );
 TUint8 contextId( iContextList->
 ContextIdByPipeHandle( aPipeHandle ) );
 if( iContextList->GetInitialiseMember( aPipeHandle ) )
 {
 // Reset pipe handle and pipe status
 iContextList->ResetPipeHandleAndStatus( aPipeHandle );
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::CompletePipeOperation.");
-OstTrace0( TRACE_NORMAL, DUP8_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION, "CMmPacketContextMessHandler::CompletePipeOperation" );
+OstTrace0( TRACE_NORMAL,  DUP10_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION_TD, "CMmPacketContextMessHandler::CompletePipeOperation" );
 iContextList->RemoveObject( contextId );
 }
 // no else
 break;
 }
+case PNS_PIPE_REDIRECT_RESP:
+{
+TUint8 channelId( iContextList->ProxyIdByPipeHandle( aPipeHandle ) );
+TFLOGSTRING2("TSY: CMmPacketContextMessHandler::CompletePipeOperation - PNS_PIPE_REDIRECT_RESP;channelId=0x%x", channelId);
+OstTrace1( TRACE_NORMAL, DUP11_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION_TD, "CMmPacketContextMessHandler::CompletePipeOperation - PNS_PIPE_REDIRECT_RESP;channelId=%x", channelId );
+TBool isLoan( !iContextList->IsLoanReturning( aPipeHandle ) );
+TUint8 controlId( 0 );
+TUint8 devId( 0 );
+TUint8 objId( 0 );
+iContextList->GetExternalDevice( channelId, devId, objId );
+if ( isLoan )
+{
+controlId = PEP_CTRL_ID_LOAN;
+}
+else
+{
+controlId = PEP_CTRL_ID_RETURNLOAN;
+}
+if ( aErrorCause == KErrNone )
+{
+if ( isLoan )
+{
+iMmPipeController->PnsPipeEnableReq( aPipeHandle, aTransactionId );
+}
+else
+{
+iMmPipeController->PnsPepCtrlReq(
+devId,
+objId,
+aTransactionId,
+aPipeHandle,
+controlId,
+PEP_BCA_OK,
+channelId );
+}
+}
+else
+{
+iMmPipeController->PnsPepCtrlReq(
+devId,
+objId,
+aTransactionId,
+aPipeHandle,
+controlId,
+PEP_BCA_FAIL,
+channelId );
+}
+break;
+}
+case PNS_PEP_CTRL_RESP:
+{
+TUint8 channelId( iContextList->ProxyIdByPipeHandle( aPipeHandle ) );
+TFLOGSTRING2("TSY: CMmPacketContextMessHandler::CompletePipeOperation - PNS_PEP_CTRL_RESP;channelId=0x%x", channelId);
+OstTrace1( TRACE_NORMAL, DUP12_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION_TD, "CMmPacketContextMessHandler::CompletePipeOperation - PNS_PEP_CTRL_RESP;channelId=%x", channelId );
+if ( KErrNone != aErrorCause )
+{
+TFLOGSTRING("TSY: CMmPacketContextMessHandler::CompletePipeOperation - PNS_PEP_CTRL_RESP - Error!");
+OstTrace0( TRACE_NORMAL, DUP13_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION_TD, "CMmPacketContextMessHandler::CompletePipeOperation -  - PNS_PEP_CTRL_RESP - Error!" );
+}
+break;
+}
 default:
 {
 break;
 }
 }
 TInt CMmPacketContextMessHandler::Delete(
 const CMmDataPackage& aDataPackage )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::Delete");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_DELETE, "CMmPacketContextMessHandler::Delete" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_DELETE_TD, "CMmPacketContextMessHandler::Delete" );
 TInt ret( KErrNone );
 TInfoName* contextName = NULL;
 aDataPackage.UnPackData( &contextName );
 TInt CMmPacketContextMessHandler::SetConfigL(
 const CMmDataPackage& aDataPackage )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::SetConfigL");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL, "CMmPacketContextMessHandler::SetConfigL" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL_TD, "CMmPacketContextMessHandler::SetConfigL" );
 TInt ret( KErrNone );
 TInfoName* contextName = NULL;
 TPacketDataConfigBase* config = NULL;
 if ( TPacketDataConfigBase::KConfigGPRS == config->ExtensionId() )
 {
 if ( GPDS_CID_VOID != contextId )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::SetConfig -> Rel97");
-OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL, "CMmPacketContextMessHandler::SetConfigL -> Rel97" );
+OstTrace0( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL_TD, "CMmPacketContextMessHandler::SetConfigL -> Rel97" );
 iContextList->SetInitialiseMember( contextId, ETrue );
 RPacketContext::TContextConfigGPRS& configGPRS =
 *reinterpret_cast<RPacketContext::TContextConfigGPRS*>(
 config );
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::SetConfig IP.Length() = %d", configGPRS.iPdpAddress.Length());
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::SetConfig iPrimaryDns.Length() = %d", configGPRS.iProtocolConfigOption.iDnsAddresses.iPrimaryDns.Length() );
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::SetConfig iSecondaryDns.Length() = %d", configGPRS.iProtocolConfigOption.iDnsAddresses.iSecondaryDns.Length());
-OstTrace1( TRACE_NORMAL, DUP10_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL, "CMmPacketContextMessHandler::SetConfigL;configGPRS.iPdpAddress.Length()=%d", configGPRS.iPdpAddress.Length() );
+OstTrace1( TRACE_NORMAL,  DUP10_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL_TD, "CMmPacketContextMessHandler::SetConfigL;configGPRS.iPdpAddress.Length()=%d", configGPRS.iPdpAddress.Length() );
-OstTrace1( TRACE_NORMAL, DUP11_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL, "CMmPacketContextMessHandler::SetConfigL;configGPRS.iProtocolConfigOption.iDnsAddresses.iPrimaryDns.Length()=%d", configGPRS.iProtocolConfigOption.iDnsAddresses.iPrimaryDns.Length() );
+OstTrace1( TRACE_NORMAL,  DUP11_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL_TD, "CMmPacketContextMessHandler::SetConfigL;configGPRS.iProtocolConfigOption.iDnsAddresses.iPrimaryDns.Length()=%d", configGPRS.iProtocolConfigOption.iDnsAddresses.iPrimaryDns.Length() );
-OstTrace1( TRACE_NORMAL, DUP12_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL, "CMmPacketContextMessHandler::SetConfigL;configGPRS.iProtocolConfigOption.iDnsAddresses.iSecondaryDns.Length()=%d", configGPRS.iProtocolConfigOption.iDnsAddresses.iSecondaryDns.Length() );
+OstTrace1( TRACE_NORMAL,  DUP12_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL_TD, "CMmPacketContextMessHandler::SetConfigL;configGPRS.iProtocolConfigOption.iDnsAddresses.iSecondaryDns.Length()=%d", configGPRS.iProtocolConfigOption.iDnsAddresses.iSecondaryDns.Length() );
 iContextList->SetContextConfigurationType(
 contextId, TPacketDataConfigBase::KConfigGPRS );
 // save authentication data
 ret = iContextList->SaveConfig(
 if ( GPDS_CID_VOID != contextId )
 {
 if ( TPacketDataConfigBase::KConfigRel5 == config->ExtensionId() )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::SetConfig -> R5");
-OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL, "CMmPacketContextMessHandler::SetConfigL -> R5" );
+OstTrace0( TRACE_NORMAL,  DUP4_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL_TD, "CMmPacketContextMessHandler::SetConfigL -> R5" );
 }
 else
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::SetConfig -> R99");
-OstTrace0( TRACE_NORMAL, DUP5_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL, "CMmPacketContextMessHandler::SetConfigL -> R99" );
+OstTrace0( TRACE_NORMAL,  DUP5_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL_TD, "CMmPacketContextMessHandler::SetConfigL -> R99" );
 }
 RPacketContext::TContextConfigR99_R4& configR99_R4 =
 *reinterpret_cast<RPacketContext::TContextConfigR99_R4*>(
 config );
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::SetConfig iMiscBuffer:%S", &configR99_R4.iProtocolConfigOption.iMiscBuffer );
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::SetConfig IP.Length() = %d", configR99_R4.iPdpAddress.Length());
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::SetConfig iPrimaryDns.Length() = %d", configR99_R4.iProtocolConfigOption.iDnsAddresses.iPrimaryDns.Length() );
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::SetConfig iSecondaryDns.Length() = %d", configR99_R4.iProtocolConfigOption.iDnsAddresses.iSecondaryDns.Length());
-OstTrace1( TRACE_NORMAL, DUP6_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL, "CMmPacketContextMessHandler::SetConfigL;configGPRS.iPdpAddress.Length()=%d", configR99_R4.iPdpAddress.Length() );
+OstTrace1( TRACE_NORMAL,  DUP6_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL_TD, "CMmPacketContextMessHandler::SetConfigL;configGPRS.iPdpAddress.Length()=%d", configR99_R4.iPdpAddress.Length() );
-OstTrace1( TRACE_NORMAL, DUP7_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL, "CMmPacketContextMessHandler::SetConfigL;configGPRS.iProtocolConfigOption.iDnsAddresses.iPrimaryDns.Length()=%d", configR99_R4.iProtocolConfigOption.iDnsAddresses.iPrimaryDns.Length() );
+OstTrace1( TRACE_NORMAL,  DUP7_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL_TD, "CMmPacketContextMessHandler::SetConfigL;configGPRS.iProtocolConfigOption.iDnsAddresses.iPrimaryDns.Length()=%d", configR99_R4.iProtocolConfigOption.iDnsAddresses.iPrimaryDns.Length() );
-OstTrace1( TRACE_NORMAL, DUP8_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL, "CMmPacketContextMessHandler::SetConfigL;configGPRS.iProtocolConfigOption.iDnsAddresses.iSecondaryDns.Length()=%d", configR99_R4.iProtocolConfigOption.iDnsAddresses.iSecondaryDns.Length() );
+OstTrace1( TRACE_NORMAL,  DUP8_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL_TD, "CMmPacketContextMessHandler::SetConfigL;configGPRS.iProtocolConfigOption.iDnsAddresses.iSecondaryDns.Length()=%d", configR99_R4.iProtocolConfigOption.iDnsAddresses.iSecondaryDns.Length() );
 iContextList->SetContextConfigurationType(
 contextId, TPacketDataConfigBase::KConfigRel99Rel4 );
 // save authentication data
 // No need to save REL5 type-> more complexity later as there is no
 TInt CMmPacketContextMessHandler::AddPacketFilter(
 const CMmDataPackage* aDataPackage )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::AddPacketFilter" );
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTER, "CMmPacketContextMessHandler::AddPacketFilter" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTER_TD, "CMmPacketContextMessHandler::AddPacketFilter" );
 // includes context configuration information
 TInt contextConfigurationType;
 RPacketContext::TContextConfigGPRS config;
 CArrayFixFlat<RPacketContext::TPacketFilterV2>* filterTemporaryArray = NULL;
 // -----------------------------------------------------------------------------
 // CMmPacketContextMessHandler::ActivatePhase2
 // This function starts the second phase of the context activation.
 // -----------------------------------------------------------------------------
 //
-void CMmPacketContextMessHandler::ActivatePhase2(
+TInt CMmPacketContextMessHandler::ActivatePhase2(
-const TUint8 aPipeHandle,
+const CMmDataPackage& aDataPackage )
-const TUint8 aTransactionId )
+{
-{
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::ActivatePhase2.");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_ACTIVATEPHASE2, "CMmPacketContextMessHandler::ActivatePhase2" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_ACTIVATEPHASE2_TD, "CMmPacketContextMessHandler::ActivatePhase2" );
+TInfoName* contextName = NULL;
+aDataPackage.UnPackData( &contextName );
+TUint8 contextId( iContextList->GetContextIdByContextName( contextName ) );
+TUint8 transId = iContextList->GetActivationTraId( contextId );
 TUint8 pdpType( 0 );
 TInt ret( KErrNone );
-TUint8 contextId( iContextList->
-ContextIdByPipeHandle( aPipeHandle ) );
 TInt configurationType( iContextList->
 GetContextConfigurationType( contextId ) );
 TPacketDataConfigBase* configBase = NULL;
 configBase = iContextList->
 RPacketContext::TContextConfigGPRS* config = NULL;
 config = reinterpret_cast<RPacketContext::TContextConfigGPRS*>(
 configBase );
 MapPdpType( pdpType, config->iPdpType );
 ret = GpdsContextActivateReq(
-aTransactionId, contextId, config->iPdpAddress, pdpType );
+transId, contextId, config->iPdpAddress, pdpType );
 }
 else if( TPacketDataConfigBase::KConfigRel99Rel4 == configurationType )
 {
 RPacketContext::TContextConfigR99_R4* config99 = NULL;
 config99 = reinterpret_cast<RPacketContext::TContextConfigR99_R4*>(
 configBase );
 MapPdpType( pdpType, config99->iPdpType );
 ret = GpdsContextActivateReq(
-aTransactionId, contextId, config99->iPdpAddress, pdpType );
+transId, contextId, config99->iPdpAddress, pdpType );
 }
 // no else
 if ( KErrNone != ret )
 {
 TFLOGSTRING2("TSY: CMmPacketContextGsmWcdmaExt::ActivatePhase2. Error: %d", ret );
+OstTrace1( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_ACTIVATEPHASE2_TD, "CMmPacketContextMessHandler::ActivatePhase2;Error=%d", ret );
-OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_ACTIVATEPHASE2, "CMmPacketContextMessHandler::ActivatePhase2;Error=%d", ret );
 TInfoName contextname;
 // Context name found
 if( KErrNone == iContextList->
 GetContextNameByContextId( contextId, contextname ) )
 {
 // Complete with KErrNone -> setLastErrorCause is NOT set then.
 iMessageRouter->Complete(
 EPacketContextNotifyConfigChanged,
 &data,
 ret );
-TUint8 transId( GenerateTraId( contextId ) );
-// Reset the pipe
-ret = iMmPipeController->PnsPipeResetReq(
-transId, aPipeHandle, PN_PIPE_DISABLE );
-if ( KErrNone == ret )
-{
-// Store the trans id
-iContextList->SetPipeResetTraId( contextId, transId );
-}
-else if( KErrNotFound == ret)
-{
-TFLOGSTRING("TSY: CMmPacketContextMessHandler::ActivatePhase2. SetPipeResetTraId failed");
-OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_ACTIVATEPHASE2, "CMmPacketContextMessHandler::ActivatePhase2, SetPipeResetTraId failed" );
-}
-// no else
 }
 // no else
 }
 // no else
 }
 // no else
+return ret;
 }
 // -----------------------------------------------------------------------------
 // CMmPacketContextMessHandler::MapPdpType
 // This function maps the client pdp type to Gpds server pdp type.
 TUint8& aPdpTypeServer,
 const RPacketContext::TProtocolType aPdpTypeClient )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::MapPdpType");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_MAPPDPTYPE, "CMmPacketContextMessHandler::MapPdpType" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_MAPPDPTYPE_TD, "CMmPacketContextMessHandler::MapPdpType" );
 TInt ret( KErrNone );
 switch ( aPdpTypeClient )
 {
 }
 default:
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::MapPdpType. Switch aPdpTypeClient case - default");
-OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_MAPPDPTYPE, "CMmPacketContextMessHandler::MapPdpType,Switch aPdpTypeClient case - default" );
+OstTrace0( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_MAPPDPTYPE_TD, "CMmPacketContextMessHandler::MapPdpType,Switch aPdpTypeClient case - default" );
 ret = KErrArgument;
 break;
 }
 }
 const TUint8 aConnectionSpeedServer,
 TInt& aConnectionSpeedClient )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::MapConnectionSpeed");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_MAPCONNECTIONSPEED, "CMmPacketContextMessHandler::MapConnectionSpeed" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_MAPCONNECTIONSPEED_TD, "CMmPacketContextMessHandler::MapConnectionSpeed" );
 switch ( aConnectionSpeedServer )
 {
 // Connection speed rate varies between 0 and 2097152 bps
 case GPDS_QOS_PETC_1:
 // case GPDS_QOS_PETC_0:
 default:
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::MapConnectionSpeed. Switch aConnectionSpeedServer case - default");
-OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_MAPCONNECTIONSPEED, "CMmPacketContextMessHandler::MapConnectionSpeed, Switch aConnectionSpeedServer case - default" );
+OstTrace0( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_MAPCONNECTIONSPEED_TD, "CMmPacketContextMessHandler::MapConnectionSpeed, Switch aConnectionSpeedServer case - default" );
 aConnectionSpeedClient = KClientSpeeed0;
 break;
 }
 }
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::SetConnectionSpeed. Connection Speed: %d bps", aConnectionSpeedClient );
-OstTrace1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_MAPCONNECTIONSPEED, "CMmPacketContextMessHandler::MapConnectionSpeed;Connection Speed=%d bps", aConnectionSpeedClient );
+OstTrace1( TRACE_NORMAL,  DUP2_CMMPACKETCONTEXTMESSHANDLER_MAPCONNECTIONSPEED_TD, "CMmPacketContextMessHandler::MapConnectionSpeed;Connection Speed=%d bps", aConnectionSpeedClient );
 }
 // -----------------------------------------------------------------------------
 // CMmPacketContextMessHandler::GenerateTraId
 // Generate transaction id for use of current context.
 TUint8 CMmPacketContextMessHandler::GenerateTraId(
 const TUint8 aContextId )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::GenerateTraId");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GENERATETRAID, "CMmPacketContextMessHandler::GenerateTraId" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_GENERATETRAID_TD, "CMmPacketContextMessHandler::GenerateTraId" );
 TUint8 proxyId( iContextList->
 ProxyIdByContextId( aContextId ) );
 #ifdef DUMMY_NIF_PEP_FOR_PACKET_DATA_TESTING_DOS
 const TInt aClientTypeOperation,
 TUint8& aTftOperation )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::MapTftOperation");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_MAPTFTOPERATION, "CMmPacketContextMessHandler::MapTftOperation" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_MAPTFTOPERATION_TD, "CMmPacketContextMessHandler::MapTftOperation" );
 switch( aClientTypeOperation )
 {
 case ETftCreateNew:
 {
 }
 default:
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::MapTftOperation. Switch aClientTypeOperation case - default");
-OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_MAPTFTOPERATION, "CMmPacketContextMessHandler::MapTftOperation,Switch aClientTypeOperation case - default" );
+OstTrace0( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_MAPTFTOPERATION_TD, "CMmPacketContextMessHandler::MapTftOperation,Switch aClientTypeOperation case - default" );
 aTftOperation = GPDS_TFT_DELETE_EXISTING;
 break;
 }
 }
 TInt CMmPacketContextMessHandler::AddMediaAuthorizationL(
 const CMmDataPackage* aDataPackage )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::AddMediaAuthorizationL.");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_ADDMEDIAAUTHORIZATIONL, "CMmPacketContextMessHandler::AddMediaAuthorizationL" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_ADDMEDIAAUTHORIZATIONL_TD, "CMmPacketContextMessHandler::AddMediaAuthorizationL" );
 const CMmPacketDataPackage* data =
 reinterpret_cast<const CMmPacketDataPackage*>( aDataPackage );
 TInt ret( KErrGeneral );
 TInt ret( 0 == count && aMediaAuthorizationArray ?
 KErrNone : KErrGeneral );
 TInt arrayIndex( 0 );
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::AddMediaAuthorizationInfo. aMediaAuthorizationArray count: %d", count);
-OstTrace1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_ADDMEDIAAUTHORIZATIONINFO, "CMmPacketContextMessHandler::AddMediaAuthorizationInfo;aMediaAuthorizationArray count=%d", count );
+OstTrace1( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_ADDMEDIAAUTHORIZATIONINFO_TD, "CMmPacketContextMessHandler::AddMediaAuthorizationInfo;aMediaAuthorizationArray count=%d", count );
 while ( KErrNone == ret && count > 0 )
 {
 ret = AppendMediaAuthorizationUnit(
 aMediaAuthorizationArray->At( arrayIndex ),
 const RPacketContext::CTFTMediaAuthorizationV3& aMediaAuthorization,
 TDes8& aBuffer,
 TUint8& aNumOfSbs ) const
 {
 TFLOGSTRING("TSY:CMmPacketContextMessHandler::AppendMediaAuthorizationUnit");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDMEDIAAUTHORIZATIONUNIT, "CMmPacketContextMessHandler::AppendMediaAuthorizationUnit" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_APPENDMEDIAAUTHORIZATIONUNIT_TD, "CMmPacketContextMessHandler::AppendMediaAuthorizationUnit" );
 //Add GPDS_SHARED_TFT_PARAMETER_AUTH_TOKEN_INFO sub block
 TInt ret = AppendGpdsSharedTFTParameterAuthTokenInfo(
 aMediaAuthorization.iAuthorizationToken, aBuffer, aNumOfSbs );
 //GPDS_SHARED_TFT_PARAMETER_IP_FLOW_INFO sub block
 // GPDS_SHARED_TFT_PARAMETER_AUTH_TOKEN_INFO (= 0xF1)
 // Make sub block for (2 and 3)
 if ( KErrNone == ret )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::AddMediaAuthorizationUnit. Make sub block for (2 and 3)");
-OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_APPENDMEDIAAUTHORIZATIONUNIT, "CMmPacketContextMessHandler::AppendMediaAuthorizationUnit, Make sub block for (2 and 3)" );
+OstTrace0( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_APPENDMEDIAAUTHORIZATIONUNIT_TD, "CMmPacketContextMessHandler::AppendMediaAuthorizationUnit, Make sub block for (2 and 3)" );
 ret = AppendGpdsSharedTFTParameterAuthTokenInfo(
 aMediaAuthorization.iAuthorizationToken, aBuffer, aNumOfSbs );
 }
 // GPDS_SHARED_TFT_PARAMETER_IP_FLOW_INFO (2 and 3)
 // make sure that there is more than one class in Array
 TInt flowIdsArrayCount( aMediaAuthorization.iFlowIds.Count() );
 if ( KErrNone == ret && KGdpsSharedTftParamIPFlowInfo2 <= flowIdsArrayCount )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::AddMediaAuthorizationUnit. make sure that there is more than one class in Array");
-OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_APPENDMEDIAAUTHORIZATIONUNIT, "CMmPacketContextMessHandler::AppendMediaAuthorizationUnit, Make sure that there is more than one class in Array" );
+OstTrace0( TRACE_NORMAL,  DUP2_CMMPACKETCONTEXTMESSHANDLER_APPENDMEDIAAUTHORIZATIONUNIT_TD, "CMmPacketContextMessHandler::AppendMediaAuthorizationUnit, Make sure that there is more than one class in Array" );
 for (TInt flowIdsArrayIndex = KFlowIdsArrayIndex1;
 flowIdsArrayIndex < flowIdsArrayCount && KErrNone == ret;
 flowIdsArrayIndex++)
 {
 ret = AppendGpdsSharedTFTParameterIPFlowInfo(
 aMediaAuthorization.iFlowIds[flowIdsArrayIndex],
 aBuffer, aNumOfSbs );
 }
 }
 TFLOGSTRING2("TSY:CMmPacketContextMessHandler::AppendMediaAuthorizationUnit;ret=%d", ret);
-OstTrace1( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_APPENDMEDIAAUTHORIZATIONUNIT, "CMmPacketContextMessHandler::AppendMediaAuthorizationUnit;ret=%d", ret );
+OstTrace1( TRACE_NORMAL,  DUP3_CMMPACKETCONTEXTMESSHANDLER_APPENDMEDIAAUTHORIZATIONUNIT_TD, "CMmPacketContextMessHandler::AppendMediaAuthorizationUnit;ret=%d", ret );
 return ret;
 }
 // -----------------------------------------------------------------------------
 // CMmPacketContextMessHandler::AllowIncomingCallActivationL
 // -----------------------------------------------------------------------------
 //
 void CMmPacketContextMessHandler::AllowIncomingCallActivationL()
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::AllowIncomingCallActivationL");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_ALLOWINCOMINGCALLACTIVATIONL, "CMmPacketContextMessHandler::AllowIncomingCallActivationL" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_ALLOWINCOMINGCALLACTIVATIONL_TD, "CMmPacketContextMessHandler::AllowIncomingCallActivationL" );
 if ( CALL_MODEM_ID_NONE != iCallModemResourceCallId &&
 NULL == iDeactivateContextList )
 {
 TUint8 contextId( GPDS_CID_VOID );
 iDeactivateContextList = new (ELeave) CArrayFixFlat<TUint8>(
 KMmMaxNumberOfContexts );
 iDeactivateContextList->Reset();
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::AllowIncomingCallActivationL, Find secondary context");
-OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_ALLOWINCOMINGCALLACTIVATIONL, "CMmPacketContextMessHandler::AllowIncomingCallActivationL, Find secondary context" );
+OstTrace0( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_ALLOWINCOMINGCALLACTIVATIONL_TD, "CMmPacketContextMessHandler::AllowIncomingCallActivationL, Find secondary context" );
 // check if there is contexts created
 if ( 1 < contextCount )
 {
 // check if there is active secondary context
 for ( TInt i = 0; i < contextCount; i++ )
 ( PN_PIPE_ENABLE == iContextList->
 GetPipeStatus( contextId ) ))
 {
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::AllowIncomingCallActivationL, Secondary context found, List index: %d", i );
-OstTrace1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_ALLOWINCOMINGCALLACTIVATIONL, "CMmPacketContextMessHandler::AllowIncomingCallActivationL;, Secondary context found, List index=%d", i );
+OstTrace1( TRACE_NORMAL,  DUP2_CMMPACKETCONTEXTMESSHANDLER_ALLOWINCOMINGCALLACTIVATIONL_TD, "CMmPacketContextMessHandler::AllowIncomingCallActivationL;, Secondary context found, List index=%d", i );
 // secondary context found
 iDeactivateContextList->AppendL( contextId );
 // break the loop
 i = contextCount;
 }
 contextId = iContextList->GetDialUpContextIdByName( &contextName );
 if ( GPDS_CID_VOID != contextId )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::AllowIncomingCallActivationL, Secondary dial-up context found");
-OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_ALLOWINCOMINGCALLACTIVATIONL, "CMmPacketContextMessHandler::AllowIncomingCallActivationL, Secondary dial-up context found" );
+OstTrace0( TRACE_NORMAL,  DUP3_CMMPACKETCONTEXTMESSHANDLER_ALLOWINCOMINGCALLACTIVATIONL_TD, "CMmPacketContextMessHandler::AllowIncomingCallActivationL, Secondary dial-up context found" );
 // secondary context found
 iDeactivateContextList->AppendL( contextId );
 }
 //no else
 }
 TUint8 transactionId(
 GenerateTraId( iDeactivateContextList->At( 0 ) ) );
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::AllowIncomingCallActivationL, Deactivating context, ContextId: %d", iDeactivateContextList->At( 0 ) );
-OstTrace1( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_ALLOWINCOMINGCALLACTIVATIONL, "CMmPacketContextMessHandler::AllowIncomingCallActivationL;ContextId=%d", iDeactivateContextList->At( 0 ) );
+OstTrace1( TRACE_NORMAL,  DUP4_CMMPACKETCONTEXTMESSHANDLER_ALLOWINCOMINGCALLACTIVATIONL_TD, "CMmPacketContextMessHandler::AllowIncomingCallActivationL;ContextId=%d", iDeactivateContextList->At( 0 ) );
 // Set the message data that consists of one parameter
 TBuf8<1> messageData;
 // deactivate first context from the list
 messageData.Append( iDeactivateContextList->At( 0 ) );
 // detailed cause values.
 // see 3GPP TS 24.008 V5.16.0 spec
 _LIT8(KDetailedCause, "\xc0\x95\x82\x02");
 CallModemResourceReqDenied(
 CALL_MODEM_CAUSE_TYPE_CLIENT,
 CALL_MODEM_CAUSE_RELEASE_BY_USER,
 KDetailedCause );
 }
 //no else
 }
 else // no secondary contexts found => allow incoming call
 const TDesC8& aAuthorizationToken,
 TDes8& aBuffer,
 TUint8& aNumOfSbs ) const
 {
 TFLOGSTRING("TSY:CMmPacketContextMessHandler::AppendGpdsSharedTFTParameterAuthTokenInfo");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSSHAREDTFTPARAMETERAUTHTOKENINFO, "CMmPacketContextMessHandler::AppendGpdsSharedTFTParameterAuthTokenInfo" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSSHAREDTFTPARAMETERAUTHTOKENINFO_TD, "CMmPacketContextMessHandler::AppendGpdsSharedTFTParameterAuthTokenInfo" );
 TInt ret( KErrTooBig );
 TInt authTokenLength( aAuthorizationToken.Length() );
 if ( authTokenLength < ( KMaximumLengthOfGpdsTftAuthTokenInfo -
 KAuthTokenInfoChecking ) )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::AppendGpdsSharedTFTParameterAuthTokenInfo. Add GPDS_SHARED_TFT_PARAMETER_AUTH_TOKEN_INFO sub block");
-OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSSHAREDTFTPARAMETERAUTHTOKENINFO, "CMmPacketContextMessHandler::AppendGpdsSharedTFTParameterAuthTokenInfo, Add GPDS_SHARED_TFT_PARAMETER_AUTH_TOKEN_INFO sub block" );
+OstTrace0( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSSHAREDTFTPARAMETERAUTHTOKENINFO_TD, "CMmPacketContextMessHandler::AppendGpdsSharedTFTParameterAuthTokenInfo, Add GPDS_SHARED_TFT_PARAMETER_AUTH_TOKEN_INFO sub block" );
 ret = KErrNone;
 TBuf<RPacketContext::KMaxFQDNLength> tempAuthorizationTokenInfo;
 tempAuthorizationTokenInfo.Copy( aAuthorizationToken );
 TBuf8<KMaximumLengthOfGpdsTftAuthTokenInfo>
 authorizationTokenInfo;
 aBuffer.Append( authTokenSubBlock.CompleteSubBlock() );
 // increase subblock count
 aNumOfSbs++;
 }
 TFLOGSTRING2("TSY:CMmPacketContextMessHandler::AppendGpdsSharedTFTParameterAuthTokenInfo;ret=%d", ret);
-OstTrace1( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSSHAREDTFTPARAMETERAUTHTOKENINFO, "CMmPacketContextMessHandler::AppendGpdsSharedTFTParameterAuthTokenInfo;ret=%d", ret );
+OstTrace1( TRACE_NORMAL,  DUP3_CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSSHAREDTFTPARAMETERAUTHTOKENINFO_TD, "CMmPacketContextMessHandler::AppendGpdsSharedTFTParameterAuthTokenInfo;ret=%d", ret );
 return ret;
 }
 // -----------------------------------------------------------------------------
 // CMmPacketContextMessHandler::AppendGpdsSharedTFTParameterIPFlowInfo
 aFlowIdentifier,
 TDes8& aBuffer,
 TUint8& aNumOfSbs ) const
 {
 TFLOGSTRING("TSY:CMmPacketContextMessHandler::AppendGpdsSharedTFTParameterIPFlowInfo");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSSHAREDTFTPARAMETERIPFLOWINFO, "CMmPacketContextMessHandler::AppendGpdsSharedTFTParameterIPFlowInfo" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSSHAREDTFTPARAMETERIPFLOWINFO_TD, "CMmPacketContextMessHandler::AppendGpdsSharedTFTParameterIPFlowInfo" );
 TBuf8<SIZE_GPDS_SHARED_TFT_PARAMETER_IP_FLOW_INFO> tempIPFlowInfo;
 TIsiSubBlock ipFlowInfoSubBlock( tempIPFlowInfo,
 GPDS_SHARED_TFT_PARAMETER_IP_FLOW_INFO,
 EIsiSubBlockTypeId8Len8 );
 CArrayFixFlat<RPacketContext::TPacketFilterV2>* aPacketFilterPtr,
 TUint8 aPdpType,
 TDes8& aBuffer ) const
 {
 TFLOGSTRING("TSY:CMmPacketContextMessHandler::FillGpdsTFTInfo");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_FILLGPDSTFTINFO, "CMmPacketContextMessHandler::FillGpdsTFTInfo" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_FILLGPDSTFTINFO_TD, "CMmPacketContextMessHandler::FillGpdsTFTInfo" );
 TInt ret( KErrNone );
 TUint8 numOfSbsInsideSb( 0 );
 // setting desired operation
 aBuffer.Append( aOperation );
 // GPDS_SHARED_TFT_PARAMETER_AUTH_TOKEN_INFO
 // and GPDS_SHARED_TFT_PARAMETER_IP_FLOW_INFO of GPDS_TFT_INFO
 if ( aMediaAuthorization )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::AppendGpdsTFTInfo. MediaAuthorization");
-OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_FILLGPDSTFTINFO, "CMmPacketContextMessHandler::FillGpdsTFTInfo, MediaAuthorization" );
+OstTrace0( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_FILLGPDSTFTINFO_TD, "CMmPacketContextMessHandler::FillGpdsTFTInfo, MediaAuthorization" );
 ret = AppendMediaAuthorizationUnit( *aMediaAuthorization, aBuffer,
 numOfSbsInsideSb );
 }
 // end for sub blocks GPDS_SHARED_TFT_PARAMETER_AUTH_TOKEN_INFO
 // and GPDS_SHARED_TFT_PARAMETER_IP_FLOW_INFO of GPDS_TFT_INFO
 // Complete GPDS_TFT_INFO subblock and set subblock count
 TBuf8<1> sbCountbuf;
 sbCountbuf.Append( numOfSbsInsideSb );
 aBuffer.Insert( GPDS_TFT_INFO_OFFSET_NUMBEROFSUBBLOCKS, sbCountbuf );
 TFLOGSTRING2("TSY:CMmPacketContextMessHandler::FillGpdsTFTInfo;ret=%d", ret);
-OstTrace1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_FILLGPDSTFTINFO, "CMmPacketContextMessHandler::FillGpdsTFTInfo;ret=%d", ret );
+OstTrace1( TRACE_NORMAL,  DUP2_CMMPACKETCONTEXTMESSHANDLER_FILLGPDSTFTINFO_TD, "CMmPacketContextMessHandler::FillGpdsTFTInfo;ret=%d", ret );
 return ret;
 }
 // -----------------------------------------------------------------------------
 // CMmPacketContextMessHandler::FillGpdsQos99ReqInfo
 TInt CMmPacketContextMessHandler::FillGpdsQos99ReqInfo(
 const RPacketQoS::TQoSR99_R4Requested& aQos99Params,
 TDes8& aBuffer)
 {
 TFLOGSTRING("TSY:CMmPacketContextMessHandler::FillGpdsQos99ReqInfo");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_FILLGPDSQOS99REQINFO, "CMmPacketContextMessHandler::FillGpdsQos99ReqInfo" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_FILLGPDSQOS99REQINFO_TD, "CMmPacketContextMessHandler::FillGpdsQos99ReqInfo" );
 TInt ret( KErrNone );
 CMmPacketQoSMessHandler::TQoS99Info qoS99ReqInfoServer;
 // Map classified QoS R99 requested parameter values to server
 // side struct
 qoS99ReqInfoServer.iGuaranteedDownlinkRate >> KShift8Bits ) );
 aBuffer.Append( static_cast<TUint8>(
 qoS99ReqInfoServer.iGuaranteedDownlinkRate ) );
 }
 TFLOGSTRING2("TSY:CMmPacketContextMessHandler::FillGpdsQos99ReqInfo;ret=%d", ret);
-OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_FILLGPDSQOS99REQINFO, "CMmPacketContextMessHandler::FillGpdsQos99ReqInfo;ret=%d", ret );
+OstTrace1( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_FILLGPDSQOS99REQINFO_TD, "CMmPacketContextMessHandler::FillGpdsQos99ReqInfo;ret=%d", ret );
 return ret;
 }
 // -----------------------------------------------------------------------------
 // CMmPacketContextMessHandler::FillGpdsQosReqInfo
 TInt CMmPacketContextMessHandler::FillGpdsQosReqInfo(
 const RPacketQoS::TQoSGPRSRequested& aQos97Params,
 TDes8& aBuffer )
 {
 TFLOGSTRING("TSY:CMmPacketContextMessHandler::FillGpdsQosReqInfo");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_FILLGPDSQOSREQINFO, "CMmPacketContextMessHandler::FillGpdsQosReqInfo" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_FILLGPDSQOSREQINFO_TD, "CMmPacketContextMessHandler::FillGpdsQosReqInfo" );
 TInt ret( KErrNone );
 // Map QoS R97/98 requested parameter values to server
 // side struct
 CMmPacketQoSMessHandler::TQoSInfo qosInfo;
 aBuffer.Append( qosInfo.iPeakThroughput );
 aBuffer.Append( qosInfo.iMeanThroughput );
 aBuffer.Append( KGpdsPadding );
 }
 TFLOGSTRING2("TSY:CMmPacketContextMessHandler::FillGpdsQosReqInfo;ret=%d", ret);
-OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_FILLGPDSQOSREQINFO, "CMmPacketContextMessHandler::FillGpdsQosReqInfo;ret=%d", ret );
+OstTrace1( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_FILLGPDSQOSREQINFO_TD, "CMmPacketContextMessHandler::FillGpdsQosReqInfo;ret=%d", ret );
 return ret;
 }
 // -----------------------------------------------------------------------------
 // CMmPacketContextMessHandler::AppendGpdsFilterFlowLabelInfo
 const RPacketContext::TPacketFilterV2& aFilter,
 TDes8& aBuffer,
 TUint8& aNumOfSbs ) const
 {
 TFLOGSTRING("TSY:CMmPacketContextMessHandler::AppendGpdsFilterFlowLabelInfo");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERFLOWLABELINFO, "CMmPacketContextMessHandler::AppendGpdsFilterFlowLabelInfo" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERFLOWLABELINFO_TD, "CMmPacketContextMessHandler::AppendGpdsFilterFlowLabelInfo" );
 // Create flowlabelInfo buffer for parameters
 TBuf8<SIZE_GPDS_FILT_FLOW_LABEL_INFO> flowLabelInfo;
 TIsiSubBlock flowLabelInfoSubBlock(
 flowLabelInfo,
 GPDS_FILT_FLOW_LABEL_INFO,
 const RPacketContext::TPacketFilterV2& aFilter,
 TDes8& aBuffer,
 TUint8& aNumOfSbs ) const
 {
 TFLOGSTRING("TSY:CMmPacketContextMessHandler::AppendGpdsFilterTosInfo");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERTOSINFO, "CMmPacketContextMessHandler::AppendGpdsFilterTosInfo" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERTOSINFO_TD, "CMmPacketContextMessHandler::AppendGpdsFilterTosInfo" );
 // Create tosInfo buffer for parameters
 TBuf8<SIZE_GPDS_FILT_TOS_INFO> tosInfo;
 TIsiSubBlock tosInfoSubBlock(
 tosInfo,
 GPDS_FILT_TOS_INFO,
 const RPacketContext::TPacketFilterV2& aFilter,
 TDes8& aBuffer,
 TUint8& aNumOfSbs ) const
 {
 TFLOGSTRING("TSY:CMmPacketContextMessHandler::AppendGpdsFilterSpiInfo");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERSPIINFO, "CMmPacketContextMessHandler::AppendGpdsFilterSpiInfo" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERSPIINFO_TD, "CMmPacketContextMessHandler::AppendGpdsFilterSpiInfo" );
 // Create spiInfo buffer for parameters
 TBuf8<SIZE_GPDS_FILT_SPI_INFO> spiInfo;
 TIsiSubBlock spiInfoSubBlock(
 spiInfo,
 GPDS_FILT_SPI_INFO,
 const RPacketContext::TPacketFilterV2& aFilter,
 TDes8& aBuffer,
 TUint8& aNumOfSbs ) const
 {
 TFLOGSTRING("TSY:CMmPacketContextMessHandler::AppendGpdsFilterSrcPortRangeInfo");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERSRCPORTRANGEINFO, "CMmPacketContextMessHandler::AppendGpdsFilterSrcPortRangeInfo" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERSRCPORTRANGEINFO_TD, "CMmPacketContextMessHandler::AppendGpdsFilterSrcPortRangeInfo" );
 // Create srcPortRangeInfo buffer for parameters
 TBuf8<SIZE_GPDS_FILT_SRC_PORT_RANGE_INFO> srcPortRangeInfo;
 TIsiSubBlock srcPortRangeSubBlock(
 srcPortRangeInfo,
 GPDS_FILT_SRC_PORT_RANGE_INFO,
 TInt CMmPacketContextMessHandler::AppendGpdsFilterDstPortRangeInfo(
 const RPacketContext::TPacketFilterV2& aFilter,
 TDes8& aBuffer, TUint8& aNumOfSbs ) const
 {
 TFLOGSTRING("TSY:CMmPacketContextMessHandler::AppendGpdsFilterDstPortRangeInfo");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERDSTPORTRANGEINFO, "CMmPacketContextMessHandler::AppendGpdsFilterDstPortRangeInfo" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERDSTPORTRANGEINFO_TD, "CMmPacketContextMessHandler::AppendGpdsFilterDstPortRangeInfo" );
 // Create destPortRangeInfo buffer for parameters
 TBuf8<SIZE_GPDS_FILT_DST_PORT_RANGE_INFO> destPortRangeInfo;
 TIsiSubBlock destPortRangeSubBlock(
 destPortRangeInfo,
 GPDS_FILT_DST_PORT_RANGE_INFO,
 const RPacketContext::TPacketFilterV2& aFilter,
 TDes8& aBuffer,
 TUint8& aNumOfSbs ) const
 {
 TFLOGSTRING("TSY:CMmPacketContextMessHandler::AppendGpdsFilterProtocolInfo");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERPROTOCOLINFO, "CMmPacketContextMessHandler::AppendGpdsFilterProtocolInfo" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERPROTOCOLINFO_TD, "CMmPacketContextMessHandler::AppendGpdsFilterProtocolInfo" );
 // Create protocolInfo buffer for parameter, length 1 byte
 TBuf8<SIZE_GPDS_FILT_PROTOCOL_INFO> protocolInfo;
 TIsiSubBlock protocolInfoSubBlock(
 protocolInfo,
 GPDS_FILT_PROTOCOL_INFO,
 const RPacketContext::TPacketFilterV2& aFilter,
 TDes8& aBuffer,
 TUint8& aNumOfSbs ) const
 {
 TFLOGSTRING("TSY:CMmPacketContextMessHandler::AppendGpdsFilterSrcIPv4AddressInfo");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERSRCIPV4ADDRESSINFO, "CMmPacketContextMessHandler::AppendGpdsFilterSrcIPv4AddressInfo" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERSRCIPV4ADDRESSINFO_TD, "CMmPacketContextMessHandler::AppendGpdsFilterSrcIPv4AddressInfo" );
 // Create ipv4AddrInfo buffer for parameters
 TBuf8<SIZE_GPDS_FILT_SRC_IPV4_ADDR_INFO> ipv4AddrInfo;
 TIsiSubBlock ipv4AddrInfoSubBlock(
 ipv4AddrInfo,
 GPDS_FILT_SRC_IPV4_ADDR_INFO,
 const RPacketContext::TPacketFilterV2& aFilter,
 TDes8& aBuffer,
 TUint8& aNumOfSbs ) const
 {
 TFLOGSTRING("TSY:CMmPacketContextMessHandler::AppendGpdsFilterSrcIPv6AddressInfo");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERSRCIPV6ADDRESSINFO, "CMmPacketContextMessHandler::AppendGpdsFilterSrcIPv6AddressInfo" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERSRCIPV6ADDRESSINFO_TD, "CMmPacketContextMessHandler::AppendGpdsFilterSrcIPv6AddressInfo" );
 // Create ipv6AddrInfo buffer for parameters
 TBuf8<SIZE_GPDS_FILT_SRC_IPV6_ADDR_INFO> ipv6AddrInfo;
 TIsiSubBlock ipv6AddrInfoSubBlock(
 ipv6AddrInfo,
 GPDS_FILT_SRC_IPV6_ADDR_INFO,
 const TDesC8& aInputIpAddress,
 const TDesC8& aInputIpAddressMask,
 TDes8& aBuffer ) const
 {
 TFLOGSTRING("TSY:CMmPacketContextMessHandler::AppendIpAddressInfo");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDIPADDRESSINFO, "CMmPacketContextMessHandler::AppendIpAddressInfo" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_APPENDIPADDRESSINFO_TD, "CMmPacketContextMessHandler::AppendIpAddressInfo" );
 TInt ret( KErrArgument );
 // check that address 0.0.0.0 is not used.
 TUint addressCounter( 0 );
 for ( TInt i = 0; i < aInputIpAddress.Length(); i++ )
 aBuffer.Append( amountOfBitsMasked );
 aBuffer.Append( KGpdsPadding );
 aBuffer.Append( aInputIpAddress );
 }
 TFLOGSTRING2("TSY:CMmPacketContextMessHandler::AppendIpAddressInfo;ret=%d", ret);
-OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_APPENDIPADDRESSINFO, "CMmPacketContextMessHandler::AppendIpAddressInfo;ret=%d", ret );
+OstTrace1( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_APPENDIPADDRESSINFO_TD, "CMmPacketContextMessHandler::AppendIpAddressInfo;ret=%d", ret );
 return ret;
 }
 // -----------------------------------------------------------------------------
 // CMmPacketContextMessHandler::AppendGpdsTftFilterInfo
 TUint8 aFilterId,
 TDes8& aBuffer,
 TUint8& aNumOfSbs ) const
 {
 TFLOGSTRING("TSY:CMmPacketContextMessHandler::AppendGpdsTftFilterInfo");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSTFTFILTERINFO, "CMmPacketContextMessHandler::AppendGpdsTftFilterInfo" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSTFTFILTERINFO_TD, "CMmPacketContextMessHandler::AppendGpdsTftFilterInfo" );
 // Add GPDS_TFT_FILTER_INFO subblock
 TBuf8<SIZE_GPDS_TFT_FILTER_INFO> filterInfoSbBuffer;
 TIsiSubBlock gpdsFilterInfoSubBlock(
 filterInfoSbBuffer,
 GPDS_TFT_FILTER_INFO,
 //
 void CMmPacketContextMessHandler::CallModemResourceIndL(
 const TIsiReceiveC &aIsiMessage )
 {
 TFLOGSTRING( "TSY: CMmPacketContextMessHandler::CallModemResourceIndL" );
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEINDL, "CMmPacketContextMessHandler::CallModemResourceIndL" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEINDL_TD, "CMmPacketContextMessHandler::CallModemResourceIndL" );
 TUint sbStartOffset( 0 );
 //Default, 0 is unused value
 TUint resourceId( 0 );
 TBool callModeFound( EFalse );
 iResourceControlMsg = HBufC8::NewL( aIsiMessage.GetBuffer().Length() );
 // Copy data.
 *iResourceControlMsg = aIsiMessage.GetBuffer();
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::CallModemResourceIndL, messagedata saved");
-OstTrace0( TRACE_NORMAL, DUP9_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEINDL, "CMmPacketContextMessHandler::CallModemResourceIndL, messagedata saved" );
+OstTrace0( TRACE_NORMAL,  DUP9_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEINDL_TD, "CMmPacketContextMessHandler::CallModemResourceIndL, messagedata saved" );
 TUint8 callId = aIsiMessage.Get8bit(
 ISI_HEADER_SIZE + CALL_MODEM_RESOURCE_IND_OFFSET_CALLID );
 if ( KErrNone == aIsiMessage.FindSubBlockOffsetById(
 {
 // if DCM drive mode flag is enabled
 if ( iDriveModeFlag )
 {
 TFLOGSTRING( "TSY: CMmPacketContextMessHandler::CallModemResourceIndL - DCM Drive Mode enabled" );
-OstTrace0( TRACE_NORMAL, DUP8_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEINDL, "CMmPacketContextMessHandler::CallModemResourceIndL - DCM Drive Mode enabled" );
+OstTrace0( TRACE_NORMAL,  DUP8_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEINDL_TD, "CMmPacketContextMessHandler::CallModemResourceIndL - DCM Drive Mode enabled" );
 // Complete DCM specific functionality
 // Drive mode rejects automatically incoming calls
 CompleteDCMdrivemodeFunctionalityL();
 // detailed cause values.
 // see 3GPP TS 24.008 V5.16.0 spec
 _LIT8(KDetailedCause, "\xc0\x95\x82\x02");
 CallModemResourceReqDenied(
 CALL_MODEM_CAUSE_TYPE_CLIENT,
 CALL_MODEM_CAUSE_RELEASE_BY_USER,
 KDetailedCause );
 }
 else
 {
 TFLOGSTRING( "TSY: CMmPacketContextMessHandler::CallModemResourceIndL - Allow incoming call activation" );
-OstTrace0( TRACE_NORMAL, DUP6_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEINDL, "CMmPacketContextMessHandler::CallModemResourceIndL - Allow incoming call activation" );
+OstTrace0( TRACE_NORMAL,  DUP6_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEINDL_TD, "CMmPacketContextMessHandler::CallModemResourceIndL - Allow incoming call activation" );
 // allow incoming call activation
 iCallModemResourceCallId = callId;
 AllowIncomingCallActivationL();
 }
 }
 else
 {
 TFLOGSTRING( "TSY: CMmPacketContextMessHandler::CallModemResourceIndL - Call mode missing, resource is denied" );
-OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEINDL, "CMmPacketContextMessHandler::CallModemResourceIndL - Call mode missing, resource is denied" );
+OstTrace0( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEINDL_TD, "CMmPacketContextMessHandler::CallModemResourceIndL - Call mode missing, resource is denied" );
 // detailed cause values.
 // see 3GPP TS 24.008 V5.16.0 spec
 // in this case we need to return detailed cause as
 // 0xE0 (coding standard GSM PLMN, location user)
 // 0xD8 (cause 88)
 _LIT8(KDetailedCause, "\xe0\xd8");
 CallModemResourceReqDenied(
 CALL_MODEM_CAUSE_TYPE_NETWORK,
 CALL_MODEM_NW_CAUSE_INCOMPATIBLE_DEST,
 KDetailedCause );
 }
 }
 else
 // -----------------------------------------------------------------------------
 //
 void CMmPacketContextMessHandler::CallModemResourceReqAllowed()
 {
 TFLOGSTRING( "TSY: CMmPacketContextMessHandler::CallModemResourceReqAllowed" );
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEREQALLOWED, "CMmPacketContextMessHandler::CallModemResourceReqAllowed" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEREQALLOWED_TD, "CMmPacketContextMessHandler::CallModemResourceReqAllowed" );
 TIsiSend callModemResourceReq( iPhoNetSender->SendBufferDes() );
 // Copy message from buffer.
 const TDesC8& message( *iResourceControlMsg );
 //
 void CMmPacketContextMessHandler::CallModemResourceResp(
 const TIsiReceiveC &aIsiMessage )
 {
 TFLOGSTRING( "TSY: CMmPacketContextMessHandler::CallModemResourceResp" );
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCERESP, "CMmPacketContextMessHandler::CallModemResourceResp" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCERESP_TD, "CMmPacketContextMessHandler::CallModemResourceResp" );
 TUint8 callId( aIsiMessage.Get8bit(
 ISI_HEADER_SIZE + CALL_MODEM_RESOURCE_RESP_OFFSET_CALLID ) );
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::CallModemResourceResp, CallId %d", callId );
-OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCERESP, "CMmPacketContextMessHandler::CallModemResourceResp - CallId=%hhu", callId );
+OstTraceExt1( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCERESP_TD, "CMmPacketContextMessHandler::CallModemResourceResp - CallId=%hhu", callId );
 }
 // -----------------------------------------------------------------------------
 // CMmPacketContextMessHandler::CallModemResourceReqDenied
 const TUint8 aCauseType,
 const TUint8 aCause,
 const TDesC8& aDetailedCause )
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::CallModemResourceReqDenied");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEREQDENIED, "CMmPacketContextMessHandler::CallModemResourceReqDenied" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEREQDENIED_TD, "CMmPacketContextMessHandler::CallModemResourceReqDenied" );
 TIsiSend callModemResourceDenied( iPhoNetSender->SendBufferDes() );
 // Copy message from buffer.
 const TDesC8& message( *iResourceControlMsg );
 {
 TUint subblockLength( isimessage.Get8bit(
 subblockOffset + KSubblockTypeId8Len8LengthOffset ) );
 callModemResourceDenied.CopyData(
 currentMsgOffset,
 isimessage.GetData(
 subblockOffset,
 subblockLength ) );
 numOfSbInMessage++;
 currentMsgOffset += subblockLength;
 }
 {
 TUint subblockLength( isimessage.Get8bit(
 subblockOffset + KSubblockTypeId8Len8LengthOffset ) );
 callModemResourceDenied.CopyData(
 currentMsgOffset,
 isimessage.GetData(
 subblockOffset,
 subblockLength ) );
 numOfSbInMessage++;
 currentMsgOffset += subblockLength;
 }
 currentMsgOffset + resourceStatus.Length();
 // increase subblock count
 numOfSbInMessage++;
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::CallModemResourceReqDenied - CALL_MODEM_SB_RESOURCE_STATUS - Subblock Count:  %d", numOfSbInMessage );
-OstTraceExt1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEREQDENIED, "CMmPacketContextMessHandler::CallModemResourceReqDenied- CALL_MODEM_SB_RESOURCE_STATUS - Subblock Count=%hhu", numOfSbInMessage );
+OstTraceExt1( TRACE_NORMAL,  DUP2_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEREQDENIED_TD, "CMmPacketContextMessHandler::CallModemResourceReqDenied- CALL_MODEM_SB_RESOURCE_STATUS - Subblock Count=%hhu", numOfSbInMessage );
 // buffer for CALL_MODEM_SB_CAUSE subblock
 TBuf8<CALL_MODEM_SB_CAUSE> modemSbCause;
 // Add CALL_MODEM_SB_CAUSE subblock
 currentMsgOffset + modemSbCause.Length();
 // increase subblock count
 numOfSbInMessage++;
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::CallModemResourceReqDenied - CALL_MODEM_SB_CAUSE - Subblock Count:  %d", numOfSbInMessage );
-OstTraceExt1( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEREQDENIED, "CMmPacketContextMessHandler::CallModemResourceReqDenied- CALL_MODEM_SB_CAUSE - Subblock Count=%hhu", numOfSbInMessage );
+OstTraceExt1( TRACE_NORMAL,  DUP4_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEREQDENIED_TD, "CMmPacketContextMessHandler::CallModemResourceReqDenied- CALL_MODEM_SB_CAUSE - Subblock Count=%hhu", numOfSbInMessage );
 // buffer for CALL_MODEM_SB_DETAILED_CAUSE subblock
 TBuf8<CALL_MODEM_SB_DETAILED_CAUSE> detailedCause;
 // Add CALL_MODEM_SB_DETAILED_CAUSE subblock
 currentMsgOffset + detailedCause.Length();
 // increase subblock count
 numOfSbInMessage++;
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::CallModemResourceReqDenied - CALL_MODEM_SB_DETAILED_CAUSE - Subblock Count:  %d", numOfSbInMessage );
-OstTraceExt1( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEREQDENIED, "CMmPacketContextMessHandler::CallModemResourceReqDenied- CALL_MODEM_SB_DETAILED_CAUSE - Subblock Count=%hhu", numOfSbInMessage );
+OstTraceExt1( TRACE_NORMAL,  DUP3_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEREQDENIED_TD, "CMmPacketContextMessHandler::CallModemResourceReqDenied- CALL_MODEM_SB_DETAILED_CAUSE - Subblock Count=%hhu", numOfSbInMessage );
 // Set number of subblokcs in CALL_MODEM_RESOURCE_REQ message
 callModemResourceDenied.Set8bit(
 ISI_HEADER_SIZE + CALL_MODEM_RESOURCE_REQ_OFFSET_SUBBLOCKS,
 numOfSbInMessage );
 // -----------------------------------------------------------------------------
 //
 void CMmPacketContextMessHandler::CompleteDCMdrivemodeFunctionalityL()
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::CompleteDCMdrivemodeFunctionalityL");
-OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_COMPLETEDCMDRIVEMODEFUNCTIONALITYL, "CMmPacketContextMessHandler::CompleteDCMdrivemodeFunctionalityL" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_COMPLETEDCMDRIVEMODEFUNCTIONALITYL_TD, "CMmPacketContextMessHandler::CompleteDCMdrivemodeFunctionalityL" );
 TInt result( KErrNone );
 // Create call package (used for all completions)
 CCallDataPackage callData;
 TInt pos = contextName.Find( KUnderscore );
 if ( pos != KErrNotFound )
 {
 TLex(contextName.Mid(pos+1)).Val(channelId);
 TFLOGSTRING2("TSY: CMmPacketContextMessHandler::getProxyId channelId = %d", channelId );
-OstTrace1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GETPROXYID, "CMmPacketContextMessHandler::getProxyId;channelId=%d", channelId );
+OstTrace1( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_GETPROXYID_TD, "CMmPacketContextMessHandler::getProxyId;channelId=%d", channelId );
 }
 else
 {
 TFLOGSTRING("TSY: CMmPacketContextMessHandler::getProxyId channelId NOT FOUND !!!" );
-OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GETPROXYID, "CMmPacketContextMessHandler::getProxyId: channelId NOT FOUND !!!" );
+OstTrace0( TRACE_NORMAL,  DUP1_CMMPACKETCONTEXTMESSHANDLER_GETPROXYID_TD, "CMmPacketContextMessHandler::getProxyId: channelId NOT FOUND !!!" );
 // FAIL, this should never happen..
 }
 return channelId;
 }
+// ----------------------------------------------------------------------------
+// CMmPacketContextMessHandler::PnsNameAddInd
+// Breaks a PNS_NAME_ADD_IND ISI-message
+// ----------------------------------------------------------------------------
+//
+void CMmPacketContextMessHandler::PnsNameAddInd(
+const TIsiReceiveC& aIsiMessage )
+{
+TUint16 matchesInThisMsg( aIsiMessage.Get16bit(
+ISI_HEADER_SIZE + PNS_NAME_QUERY_RESP_OFFSET_MATCHESINMSG ) );
+TFLOGSTRING2("TSY: CMmPacketContextMessHandler::PnsNameAddInd - matches in this msg: %d", matchesInThisMsg);
+OstTraceExt1( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_PNSNAMEADDIND_TD, "CMmPacketContextMessHandler::PnsNameAddInd;matchesInThisMsg=%hu", matchesInThisMsg );
+TUint name( 0 );
+for( TInt i = 0; i < matchesInThisMsg; i++ )
+{
+name = aIsiMessage.Get32bit(
+		    ISI_HEADER_SIZE +
+PNS_NAME_ADD_IND_OFFSET_NAMEENTRYTBL +
+			SIZE_PN_NAME_SRV_ITEM_STR * i +
+			PN_NAME_SRV_ITEM_STR_OFFSET_NAME );
+TFLOGSTRING3("TSY: CMmPacketContextMessHandler::PnsNameAddInd - name[%d]: 0x%x", i, name );
+OstTraceExt2( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_PNSNAMEADDIND, "CMmPacketContextMessHandler::PnsNameAddInd;i=%d;name=%x", i, name );
+if ( PN_PIPE == ( name & KMaskNameByte1 ) &&
+PN_PEP_TYPE_COMMON == ( ( name & KMaskNameByte2 ) >> 8 ) &&
+PN_PEP_SUB_TYPE_SYMBIAN_INTERNAL == ( ( name & KMaskNameByte3 ) >> 16 ) )
+{
+// Match found. Check also if existing context for channelId.
+TFLOGSTRING("TSY: CMmPacketContextMessHandler::PnsNameAddInd - Right kind of name_add_ind. Checking also channelId" );
+OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_PNSNAMEADDIND, "CMmPacketContextMessHandler::PnsNameAddInd - Right kind of name_add_ind. Checking also channelId" );
+TUint8 channelId( name >> 24 );
+TInfoName contextName;
+if ( iContextList->ContextNameByProxyId( channelId, contextName ) == KErrNone )
+{
+TFLOGSTRING("TSY: CMmPacketContextMessHandler::PnsNameAddInd - Also channelId was created by us" );
+OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_PNSNAMEADDIND, "CMmPacketContextMessHandler::PnsNameAddInd - Also channelId was created by us" );
+TUint8 devId( aIsiMessage.Get8bit( ISI_HEADER_SIZE +
+PNS_NAME_ADD_IND_OFFSET_NAMEENTRYTBL +
+SIZE_PN_NAME_SRV_ITEM_STR * i +
+PN_NAME_SRV_ITEM_STR_OFFSET_DEV ) );
+TUint8 objId( aIsiMessage.Get8bit( ISI_HEADER_SIZE +
+PNS_NAME_ADD_IND_OFFSET_NAMEENTRYTBL +
+SIZE_PN_NAME_SRV_ITEM_STR * i +
+PN_NAME_SRV_ITEM_STR_OFFSET_OBJ ) );
+iContextList->SetExternalDevice( channelId, devId, objId );
+TUint8 pipeHandle( iContextList->PipeHandleByContextName( &contextName ) );
+iContextList->SetLoanReturning( pipeHandle, EFalse );
+TInt ret( iMmPipeController->PnsPipeRedirectReq(
+channelId, pipeHandle, KFirstPepDevice, channelId, devId, objId ) );
+if ( KErrNone != ret )
+{
+TFLOGSTRING2("TSY: CMmPacketContextMessHandler::PnsNameAddInd - error! redirect failed: %d", ret );
+OstTrace1( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_PNSNAMEADDIND, "CMmPacketContextMessHandler::PnsNameAddInd - error! redirect failed:;ret=%d", ret );
+}
+}
+}
+else
+{
+TFLOGSTRING("TSY: CMmPacketContextMessHandler::PnsNameAddInd - no match" );
+OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_PNSNAMEADDIND, "CMmPacketContextMessHandler::PnsNameAddInd - no match" );
+}
+}
+}
+// ----------------------------------------------------------------------------
+// CMmPacketContextMessHandler::PnsNameRemoveInd
+// Breaks a PNS_NAME_REMOVE_IND ISI-message
+// ----------------------------------------------------------------------------
+//
+void CMmPacketContextMessHandler::PnsNameRemoveInd(
+const TIsiReceiveC& aIsiMessage )
+{
+TUint16 matchesInThisMsg( aIsiMessage.Get16bit(
+ISI_HEADER_SIZE + PNS_NAME_QUERY_RESP_OFFSET_MATCHESINMSG ) );
+TFLOGSTRING2("TSY: CMmPacketContextMessHandler::PnsNameRemoveInd - matches in this msg: %d", matchesInThisMsg);
+OstTraceExt1( TRACE_NORMAL,  CMMPACKETCONTEXTMESSHANDLER_PNSNAMEREMOVEIND_TD, "CMmPacketContextMessHandler::PnsNameRemoveInd;matchesInThisMsg=%hu", matchesInThisMsg );
+TUint name( 0 );
+for( TInt i = 0; i < matchesInThisMsg; i++ )
+{
+name = aIsiMessage.Get32bit(
+		    ISI_HEADER_SIZE +
+PNS_NAME_ADD_IND_OFFSET_NAMEENTRYTBL +
+			SIZE_PN_NAME_SRV_ITEM_STR * i +
+			PN_NAME_SRV_ITEM_STR_OFFSET_NAME );
+TFLOGSTRING3("TSY: CMmPacketContextMessHandler::PnsNameRemoveInd - name[%d]: 0x%x", i, name );
+OstTraceExt2( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_PNSNAMEREMOVEIND, "CMmPacketContextMessHandler::PnsNameRemoveInd;i=%d;name=%x", i, name );
+if ( PN_PIPE == ( name & KMaskNameByte1 ) &&
+PN_PEP_TYPE_COMMON == ( ( name & KMaskNameByte2 ) >> 8 ) &&
+PN_PEP_SUB_TYPE_SYMBIAN_INTERNAL == ( ( name & KMaskNameByte3 ) >> 16 ) )
+{
+// Match found. Check also if existing context for channelId.
+TFLOGSTRING("TSY: CMmPacketContextMessHandler::PnsNameRemoveInd - Right kind of name_add_ind. Checking also channelId" );
+OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_PNSNAMEREMOVEIND, "CMmPacketContextMessHandler::PnsNameRemoveInd - Right kind of name_remove_ind. Checking also channelId" );
+TUint8 channelId( name >> 24 );
+TInfoName contextName;
+if ( iContextList->ContextNameByProxyId( channelId, contextName ) == KErrNone )
+{
+TFLOGSTRING("TSY: CMmPacketContextMessHandler::PnsNameRemoveInd - Also channelId was created by us" );
+OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_PNSNAMEREMOVEIND, "CMmPacketContextMessHandler::PnsNameRemoveInd - Also channelId was created by us" );
+TUint8 devId( aIsiMessage.Get8bit( ISI_HEADER_SIZE +
+PNS_NAME_ADD_IND_OFFSET_NAMEENTRYTBL +
+SIZE_PN_NAME_SRV_ITEM_STR * i +
+PN_NAME_SRV_ITEM_STR_OFFSET_DEV ) );
+TUint8 objId( aIsiMessage.Get8bit( ISI_HEADER_SIZE +
+PNS_NAME_ADD_IND_OFFSET_NAMEENTRYTBL +
+SIZE_PN_NAME_SRV_ITEM_STR * i +
+PN_NAME_SRV_ITEM_STR_OFFSET_OBJ ) );
+TUint8 transId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_TRANSID ) );
+TUint8 pipeHandle( iContextList->PipeHandleByContextName( &contextName ) );
+iContextList->SetLoanReturning( pipeHandle, ETrue );
+TInt ret( iMmPipeController->PnsPipeRedirectReq(
+channelId, pipeHandle, devId, objId, KFirstPepDevice, channelId ) );
+if ( ret != KErrNone )
+{
+TFLOGSTRING2("TSY: CMmPacketContextMessHandler::PnsNameRemoveInd - error! redirect failed: %d", ret );
+OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_PNSNAMEREMOVEIND, "CMmPacketContextMessHandler::PnsNameRemoveInd - error! redirect failed" );
+}
+}
+}
+else
+{
+TFLOGSTRING("TSY: CMmPacketContextMessHandler::PnsNameRemoveInd - no match" );
+OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_PNSNAMEREMOVEIND, "CMmPacketContextMessHandler::PnsNameRemoveInd - no match" );
+}
+}
+}
 // ========================== OTHER EXPORTED FUNCTIONS =========================
 // None
 // End of File

changeset 9	8486d82aef45
parent 8	6295dc2169f3