Revision: 201035 RCL_3
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Tue, 14 Sep 2010 23:33:57 +0300
branchRCL_3
changeset 21 4814c5a49428
parent 20 07a122eea281
Revision: 201035 Kit: 201035
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/TE_spudNetworkSide.iby
telephonyprotocols/rawipnif/inc/Constants.h
telephonyprotocols/rawipnif/src/IPv4Binder.cpp
telephonyprotocols/rawipnif/src/RawIPFlow.cpp
telephonyserverplugins/common_tsy/customapi/bwins/CUSTOMAPIU.def
telephonyserverplugins/common_tsy/customapi/eabi/customapiU.def
telephonyserverplugins/common_tsy/customapi/inc/RMmCustomAPI.h
telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/eabi/licenseetsyu.def
telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/bwins/mockltsydllu.def
telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/eabi/mockltsydllu.def
telephonyserverplugins/common_tsy/test/component/src/cctsycustomipcfu.cpp
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/TE_spudNetworkSide.iby	Wed Sep 01 12:40:21 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/TE_spudNetworkSide.iby	Tue Sep 14 23:33:57 2010 +0300
@@ -39,6 +39,7 @@
 data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_PppLoopback.xml		testdata\configs\te_spudnetworkside_PppLoopback.xml
 data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_nifman.xml		testdata\configs\te_spudnetworkside_nifman.xml
 data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_r4_and_r5.xml 			testdata\configs\te_spudnetworkside_r4_and_r5.xml
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_promptforauth.xml	testdata\configs\te_spudnetworkside_promptforauth.xml
 data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside.ini 			testdata\configs\te_spudnetworkside.ini
 data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_nifman.ini		testdata\configs\te_spudnetworkside_nifman.ini
 data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_platsec.ini 	testdata\configs\te_spudnetworkside_platsec.ini
--- a/telephonyprotocols/rawipnif/inc/Constants.h	Wed Sep 01 12:40:21 2010 +0100
+++ b/telephonyprotocols/rawipnif/inc/Constants.h	Tue Sep 14 23:33:57 2010 +0300
@@ -64,7 +64,11 @@
 const TUint16 KIp6FrameType = 0x57;
 
 const TUint KDefaultSpeedMetric = 1;
-const TUint KDefaultMtu = 1500;
+// generally, the default MTU should be 1500 bytes but it has been 
+// determined that for a number of real world use cases, 1500 bytes
+// provides fairly poor performance, so we're limiting it 1400 here
+// this can be overridden by patchable constant (iby file).
+const TUint KDefaultMtu = 1400; 
 
 const TUint KDataPacketMaxSize = 4096;
 
@@ -78,7 +82,11 @@
 _LIT8(KRefFile, "RawIP"); 
 
 // Max size of IP packet 
-const TUint KMaxIPPacket = 1500;
+// generally, the default MTU should be 1500 bytes but it has been 
+// determined that for a number of real world use cases, 1500 bytes
+// provides fairly poor performance, so we're limiting it 1400 here
+// this can be overridden by patchable constant (iby file).
+const TUint KMaxIPPacket = 1400;
 const TUint KIPTagHeaderLength = 2;
 const TUint KMaxIPPacketAndHeader = KMaxIPPacket + KIPTagHeaderLength;
 
--- a/telephonyprotocols/rawipnif/src/IPv4Binder.cpp	Wed Sep 01 12:40:21 2010 +0100
+++ b/telephonyprotocols/rawipnif/src/IPv4Binder.cpp	Tue Sep 14 23:33:57 2010 +0300
@@ -177,6 +177,9 @@
     // Default value for Tx and Rx packet size
     config->iInfo.iMtu = KMtuIPv4;
     config->iInfo.iRMtu = KRMtuIPv4;
+    
+    _LOG_L1C3(_L8("CIPv4Binder::GetConfig [TxMtu=%d, RxMtu=%d]"),
+        config->iInfo.iMtu, config->iInfo.iRMtu);
 #else // WINS
     // Set default values in case patch is not present in epoc.ini
     config->iInfo.iMtu = KDefaultMtu;
--- a/telephonyprotocols/rawipnif/src/RawIPFlow.cpp	Wed Sep 01 12:40:21 2010 +0100
+++ b/telephonyprotocols/rawipnif/src/RawIPFlow.cpp	Tue Sep 14 23:33:57 2010 +0300
@@ -236,7 +236,13 @@
 	_LOG_L1C3(_L8("CRawIPFlow %08x:\tSendPacket(): length=%d"),
 		this, aPdu.Length() - aPdu.First()->Length());
 
-    __PACKETLOG_WRITE_PACKET(aPdu, 0);
+#ifdef _DEBUG
+	if (__packetLogger__ != NULL)
+	    {
+	    __PACKETLOG_WRITE_PACKET(aPdu, 0);
+	    }
+#endif
+
     return iBcaController->Send(aPdu);
 	}
 
--- a/telephonyserverplugins/common_tsy/customapi/bwins/CUSTOMAPIU.def	Wed Sep 01 12:40:21 2010 +0100
+++ b/telephonyserverplugins/common_tsy/customapi/bwins/CUSTOMAPIU.def	Tue Sep 14 23:33:57 2010 +0300
@@ -4,8 +4,8 @@
 	??0TGprsInformation@RMmCustomAPI@@QAE@XZ @ 3 NONAME ; public: __thiscall RMmCustomAPI::TGprsInformation::TGprsInformation(void)
 	??0TLifeTimeData@RMmCustomAPI@@QAE@XZ @ 4 NONAME ; public: __thiscall RMmCustomAPI::TLifeTimeData::TLifeTimeData(void)
 	??0TSimFileInfo@RMmCustomAPI@@QAE@XZ @ 5 NONAME ; public: __thiscall RMmCustomAPI::TSimFileInfo::TSimFileInfo(void)
-	?ActivateSimLock@RMmCustomAPI@@QBEHABV?$TBuf@$0P@@@W4TLockNumber@1@@Z @ 6 NONAME ; public: int __thiscall RMmCustomAPI::ActivateSimLock(class TBuf<15> const &,enum RMmCustomAPI::TLockNumber)const 
-	?ActivateSimLock@RMmCustomAPI@@QBEXAAVTRequestStatus@@ABV?$TBuf@$0P@@@W4TLockNumber@1@@Z @ 7 NONAME ; public: void __thiscall RMmCustomAPI::ActivateSimLock(class TRequestStatus &,class TBuf<15> const &,enum RMmCustomAPI::TLockNumber)const 
+	?ActivateSimLock@RMmCustomAPI@@QBEHABV?$TBuf@$0BO@@@W4TLockNumber@1@@Z @ 6 NONAME ; int RMmCustomAPI::ActivateSimLock(class TBuf<30> const &, enum RMmCustomAPI::TLockNumber) const 
+	?ActivateSimLock@RMmCustomAPI@@QBEXAAVTRequestStatus@@ABV?$TBuf@$0BO@@@W4TLockNumber@1@@Z @ 7 NONAME ; void RMmCustomAPI::ActivateSimLock(class TRequestStatus &, class TBuf<30> const &, enum RMmCustomAPI::TLockNumber) const 
 	?CallOrigin@RMmCustomAPI@@QBEHAAV?$TBuf@$0IA@@@AAW4TCallOrigin@1@@Z @ 8 NONAME ; public: int __thiscall RMmCustomAPI::CallOrigin(class TBuf<128> &,enum RMmCustomAPI::TCallOrigin &)const 
 	?CancelUssdSession@RMmCustomAPI@@QAEXAAVTRequestStatus@@@Z @ 9 NONAME ; public: void __thiscall RMmCustomAPI::CancelUssdSession(class TRequestStatus &)
 	?CancelUssdSession@RMmCustomAPI@@QBEHXZ @ 10 NONAME ; public: int __thiscall RMmCustomAPI::CancelUssdSession(void)const 
@@ -21,8 +21,8 @@
 	?ClearCallBlackList@RMmCustomAPI@@QBEHXZ @ 20 NONAME ; public: int __thiscall RMmCustomAPI::ClearCallBlackList(void)const 
 	?Close@RMmCustomAPI@@QAEXXZ @ 21 NONAME ; public: void __thiscall RMmCustomAPI::Close(void)
 	?ConstructL@RMmCustomAPI@@IAEXXZ @ 22 NONAME ; protected: void __thiscall RMmCustomAPI::ConstructL(void)
-	?DeActivateSimLock@RMmCustomAPI@@QBEHABV?$TBuf@$0P@@@W4TLockNumber@1@@Z @ 23 NONAME ; public: int __thiscall RMmCustomAPI::DeActivateSimLock(class TBuf<15> const &,enum RMmCustomAPI::TLockNumber)const 
-	?DeActivateSimLock@RMmCustomAPI@@QBEXAAVTRequestStatus@@ABV?$TBuf@$0P@@@W4TLockNumber@1@@Z @ 24 NONAME ; public: void __thiscall RMmCustomAPI::DeActivateSimLock(class TRequestStatus &,class TBuf<15> const &,enum RMmCustomAPI::TLockNumber)const 
+	?DeActivateSimLock@RMmCustomAPI@@QBEHABV?$TBuf@$0BO@@@W4TLockNumber@1@@Z @ 23 NONAME ; int RMmCustomAPI::DeActivateSimLock(class TBuf<30> const &, enum RMmCustomAPI::TLockNumber) const 
+	?DeActivateSimLock@RMmCustomAPI@@QBEXAAVTRequestStatus@@ABV?$TBuf@$0BO@@@W4TLockNumber@1@@Z @ 24 NONAME ; void RMmCustomAPI::DeActivateSimLock(class TRequestStatus &, class TBuf<30> const &, enum RMmCustomAPI::TLockNumber) const 
 	?DeleteSimCbTopic@RMmCustomAPI@@QAEHABI@Z @ 25 NONAME ; public: int __thiscall RMmCustomAPI::DeleteSimCbTopic(unsigned int const &)
 	?DeleteSimCbTopic@RMmCustomAPI@@QAEXAAVTRequestStatus@@ABI@Z @ 26 NONAME ; public: void __thiscall RMmCustomAPI::DeleteSimCbTopic(class TRequestStatus &,unsigned int const &)
 	?Destruct@RMmCustomAPI@@IAEXXZ @ 27 NONAME ; protected: void __thiscall RMmCustomAPI::Destruct(void)
--- a/telephonyserverplugins/common_tsy/customapi/eabi/customapiU.def	Wed Sep 01 12:40:21 2010 +0100
+++ b/telephonyserverplugins/common_tsy/customapi/eabi/customapiU.def	Tue Sep 14 23:33:57 2010 +0300
@@ -65,13 +65,13 @@
 	_ZNK12RMmCustomAPI13SetAlsBlockedENS_12TSetAlsBlockE @ 64 NONAME
 	_ZNK12RMmCustomAPI13TerminateCallER4TBufILi128EE @ 65 NONAME
 	_ZNK12RMmCustomAPI14ResetNetServerEv @ 66 NONAME
-	_ZNK12RMmCustomAPI15ActivateSimLockER14TRequestStatusRK4TBufILi15EENS_11TLockNumberE @ 67 NONAME
-	_ZNK12RMmCustomAPI15ActivateSimLockERK4TBufILi15EENS_11TLockNumberE @ 68 NONAME
+	_ZNK12RMmCustomAPI15ActivateSimLockER14TRequestStatusRK4TBufILi30EENS_11TLockNumberE @ 67 NONAME
+	_ZNK12RMmCustomAPI15ActivateSimLockERK4TBufILi30EENS_11TLockNumberE @ 68 NONAME	
 	_ZNK12RMmCustomAPI16DisablePhoneLockER14TRequestStatusR4TBufILi10EE @ 69 NONAME
 	_ZNK12RMmCustomAPI17CancelUssdSessionEv @ 70 NONAME
 	_ZNK12RMmCustomAPI17CheckAlsPpSupportERNS_11TAlsSupportE @ 71 NONAME
-	_ZNK12RMmCustomAPI17DeActivateSimLockER14TRequestStatusRK4TBufILi15EENS_11TLockNumberE @ 72 NONAME
-	_ZNK12RMmCustomAPI17DeActivateSimLockERK4TBufILi15EENS_11TLockNumberE @ 73 NONAME
+	_ZNK12RMmCustomAPI17DeActivateSimLockER14TRequestStatusRK4TBufILi30EENS_11TLockNumberE @ 72 NONAME
+	_ZNK12RMmCustomAPI17DeActivateSimLockERK4TBufILi30EENS_11TLockNumberE @ 73 NONAME
 	_ZNK12RMmCustomAPI17GetPndCacheStatusER14TRequestStatusRNS_15TPndCacheStatusERK4TBufILi128EE @ 74 NONAME
 	_ZNK12RMmCustomAPI18ClearCallBlackListEv @ 75 NONAME
 	_ZNK12RMmCustomAPI18GetAirTimeDurationER20TTimeIntervalSeconds @ 76 NONAME
@@ -113,15 +113,15 @@
 	_ZNK12RMmCustomAPI23SetSimMessageStatusReadER5TTimeRi @ 112 NONAME
 	_ZNK12RMmCustomAPI31WriteViagHomeZoneUHZIUESettingsER14TRequestStatusRNS_19TViagUHZIUESettingsE @ 113 NONAME
 	_ZNK12RMmCustomAPI31WriteViagHomeZoneUHZIUESettingsERNS_19TViagUHZIUESettingsE @ 114 NONAME
-	_ZTI18CMmCustomPtrHolder @ 115 NONAME DATA 12 ; #<TI>#
-	_ZTV18CMmCustomPtrHolder @ 116 NONAME DATA 20 ; #<VT>#
+	_ZTI18CMmCustomPtrHolder @ 115 NONAME ; #<TI>#
+	_ZTV18CMmCustomPtrHolder @ 116 NONAME ; #<VT>#
 	_ZNK12RMmCustomAPI11SetAlwaysOnER14TRequestStatusRNS_16TSetAlwaysOnModeE @ 117 NONAME
 	_ZN12RMmCustomAPI14NotifyRauEventER14TRequestStatusRNS_15TRauEventStatusE @ 118 NONAME
 	_ZN12RMmCustomAPI15ReadHSxPAStatusER14TRequestStatusRNS_12THSxPAStatusE @ 119 NONAME
 	_ZN12RMmCustomAPI16WriteHSxPAStatusER14TRequestStatusRNS_12THSxPAStatusE @ 120 NONAME
 	_ZN12RMmCustomAPI17NotifyHSxPAStatusER14TRequestStatusRNS_12THSxPAStatusE @ 121 NONAME
 	_ZNK12RMmCustomAPI35GetIccCallForwardingIndicatorStatusER14TRequestStatusR5TDes8 @ 122 NONAME
- 	_ZN12RMmCustomAPI35NotifyIccCallForwardingStatusChangeER14TRequestStatusR5TDes8 @ 123 NONAME
+	_ZN12RMmCustomAPI35NotifyIccCallForwardingStatusChangeER14TRequestStatusR5TDes8 @ 123 NONAME
 	_ZN12RMmCustomAPI13TCFIndicatorsC1Ev @ 124 NONAME
 	_ZN12RMmCustomAPI13TCFIndicatorsC2Ev @ 125 NONAME
 	_ZNK12RMmCustomAPI11GetCellInfoER14TRequestStatusR5TDes8 @ 126 NONAME
@@ -146,3 +146,4 @@
 	_ZN12RMmCustomAPI36TSimAuthenticationGbaBootstrapUpdateC2Ev @ 145 NONAME
 	_ZNK12RMmCustomAPI21GetUSIMServiceSupportER14TRequestStatusRNS_11TAppSupportE @ 146 NONAME
 	_ZN12RMmCustomAPI36NotifyRemoteAlertingToneStatusChangeER14TRequestStatusRNS_25TRemoteAlertingToneStatusE @ 147 NONAME
+	
--- a/telephonyserverplugins/common_tsy/customapi/inc/RMmCustomAPI.h	Wed Sep 01 12:40:21 2010 +0100
+++ b/telephonyserverplugins/common_tsy/customapi/inc/RMmCustomAPI.h	Tue Sep 14 23:33:57 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -38,7 +38,7 @@
 
 _LIT(KCustomAPIName,"CUSTOMAPI");
 _LIT(KTerminateAllCalls,"ALL_CALLS");
-const TInt KSimLockMaxPasswordSize = 15;
+const TInt KSimLockMaxPasswordSize = 30;
 const TInt KSimCbTopicNameLength = 20;
 const TInt KSubAddressSize = 20;
 const TInt KBearerCapabilitySize = 14;
--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/eabi/licenseetsyu.def	Wed Sep 01 12:40:21 2010 +0100
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/eabi/licenseetsyu.def	Tue Sep 14 23:33:57 2010 +0300
@@ -14,7 +14,7 @@
 	_ZTI14TMockLtsyData1I31TMmMbmsMonitorServiceListParamsE @ 13 NONAME
 	_ZTI14TMockLtsyData1I4TBufILi10EEE @ 14 NONAME
 	_ZTI14TMockLtsyData1I4TBufILi128EEE @ 15 NONAME
-	_ZTI14TMockLtsyData1I4TBufILi15EEE @ 16 NONAME
+	_ZTI14TMockLtsyData1I4TBufILi30EEE @ 16 NONAME
 	_ZTI14TMockLtsyData1I4TBufILi16EEE @ 17 NONAME
 	_ZTI14TMockLtsyData1I4TBufILi32EEE @ 18 NONAME
 	_ZTI14TMockLtsyData1I4TBufILi6EEE @ 19 NONAME
@@ -125,7 +125,7 @@
 	_ZTI14TMockLtsyData2I14TContextParamsN10RPacketQoS19TQoSR99_R4RequestedEE @ 124 NONAME
 	_ZTI14TMockLtsyData2I21TContextConfigurationP13CArrayPtrFlatIN14RPacketContext24CTFTMediaAuthorizationV3EEE @ 125 NONAME
 	_ZTI14TMockLtsyData2I4TBufILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 126 NONAME
-	_ZTI14TMockLtsyData2I4TBufILi15EEN12RMmCustomAPI11TLockNumberEE @ 127 NONAME
+	_ZTI14TMockLtsyData2I4TBufILi30EEN12RMmCustomAPI11TLockNumberEE @ 127 NONAME
 	_ZTI14TMockLtsyData2I4TBufILi16EE12TContextMiscE @ 128 NONAME
 	_ZTI14TMockLtsyData2I4TBufILi16EE30TMmMbmsActiveServiceListParamsE @ 129 NONAME
 	_ZTI14TMockLtsyData2I4TBufILi16EE5TBuf8ILi1EEE @ 130 NONAME
@@ -197,7 +197,7 @@
 	_ZTI17TMockLtsyData1BufI31TMmMbmsMonitorServiceListParamsE @ 196 NONAME
 	_ZTI17TMockLtsyData1BufI4TBufILi10EEE @ 197 NONAME
 	_ZTI17TMockLtsyData1BufI4TBufILi128EEE @ 198 NONAME
-	_ZTI17TMockLtsyData1BufI4TBufILi15EEE @ 199 NONAME
+	_ZTI17TMockLtsyData1BufI4TBufILi30EEE @ 199 NONAME
 	_ZTI17TMockLtsyData1BufI4TBufILi16EEE @ 200 NONAME
 	_ZTI17TMockLtsyData1BufI4TBufILi32EEE @ 201 NONAME
 	_ZTI17TMockLtsyData1BufI4TBufILi6EEE @ 202 NONAME
@@ -308,7 +308,7 @@
 	_ZTI17TMockLtsyData2BufI14TContextParamsN10RPacketQoS19TQoSR99_R4RequestedEE @ 307 NONAME
 	_ZTI17TMockLtsyData2BufI21TContextConfigurationP13CArrayPtrFlatIN14RPacketContext24CTFTMediaAuthorizationV3EEE @ 308 NONAME
 	_ZTI17TMockLtsyData2BufI4TBufILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 309 NONAME
-	_ZTI17TMockLtsyData2BufI4TBufILi15EEN12RMmCustomAPI11TLockNumberEE @ 310 NONAME
+	_ZTI17TMockLtsyData2BufI4TBufILi30EEN12RMmCustomAPI11TLockNumberEE @ 310 NONAME
 	_ZTI17TMockLtsyData2BufI4TBufILi16EE12TContextMiscE @ 311 NONAME
 	_ZTI17TMockLtsyData2BufI4TBufILi16EE30TMmMbmsActiveServiceListParamsE @ 312 NONAME
 	_ZTI17TMockLtsyData2BufI4TBufILi16EE5TBuf8ILi1EEE @ 313 NONAME
@@ -480,7 +480,7 @@
 	_ZTV14TMockLtsyData1I31TMmMbmsMonitorServiceListParamsE @ 479 NONAME
 	_ZTV14TMockLtsyData1I4TBufILi10EEE @ 480 NONAME
 	_ZTV14TMockLtsyData1I4TBufILi128EEE @ 481 NONAME
-	_ZTV14TMockLtsyData1I4TBufILi15EEE @ 482 NONAME
+	_ZTV14TMockLtsyData1I4TBufILi30EEE @ 482 NONAME
 	_ZTV14TMockLtsyData1I4TBufILi16EEE @ 483 NONAME
 	_ZTV14TMockLtsyData1I4TBufILi32EEE @ 484 NONAME
 	_ZTV14TMockLtsyData1I4TBufILi6EEE @ 485 NONAME
@@ -591,7 +591,7 @@
 	_ZTV14TMockLtsyData2I14TContextParamsN10RPacketQoS19TQoSR99_R4RequestedEE @ 590 NONAME
 	_ZTV14TMockLtsyData2I21TContextConfigurationP13CArrayPtrFlatIN14RPacketContext24CTFTMediaAuthorizationV3EEE @ 591 NONAME
 	_ZTV14TMockLtsyData2I4TBufILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 592 NONAME
-	_ZTV14TMockLtsyData2I4TBufILi15EEN12RMmCustomAPI11TLockNumberEE @ 593 NONAME
+	_ZTV14TMockLtsyData2I4TBufILi30EEN12RMmCustomAPI11TLockNumberEE @ 593 NONAME
 	_ZTV14TMockLtsyData2I4TBufILi16EE12TContextMiscE @ 594 NONAME
 	_ZTV14TMockLtsyData2I4TBufILi16EE30TMmMbmsActiveServiceListParamsE @ 595 NONAME
 	_ZTV14TMockLtsyData2I4TBufILi16EE5TBuf8ILi1EEE @ 596 NONAME
@@ -663,7 +663,7 @@
 	_ZTV17TMockLtsyData1BufI31TMmMbmsMonitorServiceListParamsE @ 662 NONAME
 	_ZTV17TMockLtsyData1BufI4TBufILi10EEE @ 663 NONAME
 	_ZTV17TMockLtsyData1BufI4TBufILi128EEE @ 664 NONAME
-	_ZTV17TMockLtsyData1BufI4TBufILi15EEE @ 665 NONAME
+	_ZTV17TMockLtsyData1BufI4TBufILi30EEE @ 665 NONAME
 	_ZTV17TMockLtsyData1BufI4TBufILi16EEE @ 666 NONAME
 	_ZTV17TMockLtsyData1BufI4TBufILi32EEE @ 667 NONAME
 	_ZTV17TMockLtsyData1BufI4TBufILi6EEE @ 668 NONAME
@@ -774,7 +774,7 @@
 	_ZTV17TMockLtsyData2BufI14TContextParamsN10RPacketQoS19TQoSR99_R4RequestedEE @ 773 NONAME
 	_ZTV17TMockLtsyData2BufI21TContextConfigurationP13CArrayPtrFlatIN14RPacketContext24CTFTMediaAuthorizationV3EEE @ 774 NONAME
 	_ZTV17TMockLtsyData2BufI4TBufILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 775 NONAME
-	_ZTV17TMockLtsyData2BufI4TBufILi15EEN12RMmCustomAPI11TLockNumberEE @ 776 NONAME
+	_ZTV17TMockLtsyData2BufI4TBufILi30EEN12RMmCustomAPI11TLockNumberEE @ 776 NONAME
 	_ZTV17TMockLtsyData2BufI4TBufILi16EE12TContextMiscE @ 777 NONAME
 	_ZTV17TMockLtsyData2BufI4TBufILi16EE30TMmMbmsActiveServiceListParamsE @ 778 NONAME
 	_ZTV17TMockLtsyData2BufI4TBufILi16EE5TBuf8ILi1EEE @ 779 NONAME
--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/bwins/mockltsydllu.def	Wed Sep 01 12:40:21 2010 +0100
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/bwins/mockltsydllu.def	Tue Sep 14 23:33:57 2010 +0300
@@ -46,7 +46,7 @@
 	?DeserialiseL@?$TSerializer@UTContextConfiguration@@@@SAXABVTDesC8@@AAUTContextConfiguration@@@Z @ 45 NONAME ; void TSerializer<struct TContextConfiguration>::DeserialiseL(class TDesC8 const &, struct TContextConfiguration &)
 	??0TMockLtsyContextData0@@QAE@XZ @ 46 NONAME ; TMockLtsyContextData0::TMockLtsyContextData0(void)
 	?SerialiseL@TMockLtsyPacketQoSData0@@QBEXAAVRBuf8@@@Z @ 47 NONAME ; void TMockLtsyPacketQoSData0::SerialiseL(class RBuf8 &) const
-	?IsEqual@?$TComparator@V?$TBuf@$0P@@@@@SAHABV?$TBuf@$0P@@@0@Z @ 48 NONAME ; int TComparator<class TBuf<15> >::IsEqual(class TBuf<15> const &, class TBuf<15> const &)
+	?IsEqual@?$TComparator@V?$TBuf@$0BO@@@@@SAHABV?$TBuf@$0BO@@@0@Z @ 48 NONAME ; int TComparator<class TBuf<30> >::IsEqual(class TBuf<30> const &, class TBuf<30> const &)
 	?SerialiseL@?$TSerializer@UTMmMbmsActiveServiceListParams@@@@SAXABUTMmMbmsActiveServiceListParams@@AAVRBuf8@@@Z @ 49 NONAME ; void TSerializer<struct TMmMbmsActiveServiceListParams>::SerialiseL(struct TMmMbmsActiveServiceListParams const &, class RBuf8 &)
 	?IsEqual@?$TComparator@VTMobileUssdAttributesV1@RMobileUssdMessaging@@@@SAHABVTMobileUssdAttributesV1@RMobileUssdMessaging@@0@Z @ 50 NONAME ; int TComparator<class RMobileUssdMessaging::TMobileUssdAttributesV1>::IsEqual(class RMobileUssdMessaging::TMobileUssdAttributesV1 const &, class RMobileUssdMessaging::TMobileUssdAttributesV1 const &)
 	?InternalizeL@TPacketQoSR5Negotiated@@QAEXAAVRReadStream@@@Z @ 51 NONAME ; void TPacketQoSR5Negotiated::InternalizeL(class RReadStream &)
--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/eabi/mockltsydllu.def	Wed Sep 01 12:40:21 2010 +0100
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/eabi/mockltsydllu.def	Tue Sep 14 23:33:57 2010 +0300
@@ -25,7 +25,7 @@
 	_ZN11TComparatorI30TMmMbmsActiveServiceListParamsE7IsEqualERKS0_S3_ @ 24 NONAME
 	_ZN11TComparatorI31TMmMbmsMonitorServiceListParamsE7IsEqualERKS0_S3_ @ 25 NONAME
 	_ZN11TComparatorI4TBufILi10EEE7IsEqualERKS1_S4_ @ 26 NONAME
-	_ZN11TComparatorI4TBufILi15EEE7IsEqualERKS1_S4_ @ 27 NONAME
+	_ZN11TComparatorI4TBufILi30EEE7IsEqualERKS1_S4_ @ 27 NONAME
 	_ZN11TComparatorI4TBufILi16EEE7IsEqualERKS1_S4_ @ 28 NONAME
 	_ZN11TComparatorI4TBufILi32EEE7IsEqualERKS1_S4_ @ 29 NONAME
 	_ZN11TComparatorI4TBufILi6EEE7IsEqualERKS1_S4_ @ 30 NONAME
--- a/telephonyserverplugins/common_tsy/test/component/src/cctsycustomipcfu.cpp	Wed Sep 01 12:40:21 2010 +0100
+++ b/telephonyserverplugins/common_tsy/test/component/src/cctsycustomipcfu.cpp	Tue Sep 14 23:33:57 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -626,7 +626,7 @@
  	//-------------------------------------------------------------------------
 	// TEST A: failure to dispatch request to LTSY
  	//-------------------------------------------------------------------------
-	RMmCustomAPI::TSimLockPassword password(_L("changeme"));
+	RMmCustomAPI::TSimLockPassword password(_L("changemechangemechangemechange"));
 	RMmCustomAPI::TLockNumber lockNumber(RMmCustomAPI::EOperator);	
 	
 	// data for ExpectL
@@ -749,7 +749,7 @@
  	//-------------------------------------------------------------------------
 	// Test cancelling of RMmCustomAPI::ActivateSimLock
  	//-------------------------------------------------------------------------
- 	RMmCustomAPI::TSimLockPassword password(_L("changeme"));
+ 	RMmCustomAPI::TSimLockPassword password(_L("changemechangemechangemechange"));
 	RMmCustomAPI::TLockNumber lockNumber(RMmCustomAPI::EImsi);	
 	
 	// data for ExpectL
@@ -806,7 +806,7 @@
 	// Test A: Test passing wrong parameters to
 	// RMmCustomAPI::ActivateSimLock
  	//-------------------------------------------------------------------------
-	RMmCustomAPI::TSimLockPassword password(_L("changeme"));
+	RMmCustomAPI::TSimLockPassword password(_L("changemechangemechangemechange"));
 	RMmCustomAPI::TLockNumber lockNumber((RMmCustomAPI::TLockNumber) 0); 	
 	  
     customAPI.ActivateSimLock(requestStatus, password, lockNumber);
@@ -863,11 +863,11 @@
 	// Test A: Test multiple clients requesting RMmCustomAPI::ActivateSimLock
  	//-------------------------------------------------------------------------	
 	// data for the first request
-	RMmCustomAPI::TSimLockPassword password(_L("changeme"));
+	RMmCustomAPI::TSimLockPassword password(_L("changemechangemechangemechange"));
 	RMmCustomAPI::TLockNumber lockNumber(RMmCustomAPI::EOperator_Gid1);	
 	
 	// data for the second request
-	RMmCustomAPI::TSimLockPassword password2(_L("changeme2"));
+	RMmCustomAPI::TSimLockPassword password2(_L("changemechangemechangemechang2"));
 	RMmCustomAPI::TLockNumber lockNumber2(RMmCustomAPI::EOperator_Gid2);	
 	
 	// data for the first ExpectL
@@ -924,7 +924,7 @@
 	//-------------------------------------------------------------------------
 	// Test A: Test timeout of RMmCustomAPI::ActivateSimLock
  	//-------------------------------------------------------------------------
- 	RMmCustomAPI::TSimLockPassword password(_L("changeme"));
+ 	RMmCustomAPI::TSimLockPassword password(_L("changemechangemechangemechange"));
 	RMmCustomAPI::TLockNumber lockNumber(RMmCustomAPI::EOperator_Gid2);	
 	
 	// data for ExpectL
@@ -974,7 +974,7 @@
  	//-------------------------------------------------------------------------
 	// TEST A: failure to dispatch request to LTSY
  	//-------------------------------------------------------------------------
-	RMmCustomAPI::TSimLockPassword password(_L("changeme"));
+	RMmCustomAPI::TSimLockPassword password(_L("changemechangemechangemechange"));
 	RMmCustomAPI::TLockNumber lockNumber(RMmCustomAPI::EOperator);	
 	
 	// data for ExpectL
@@ -1113,7 +1113,7 @@
  	//-------------------------------------------------------------------------
 	// Test cancelling of RMmCustomAPI::DeActivateSimLock
  	//-------------------------------------------------------------------------
- 	RMmCustomAPI::TSimLockPassword password(_L("changeme"));
+ 	RMmCustomAPI::TSimLockPassword password(_L("changemechangemechangemechange"));
 	RMmCustomAPI::TLockNumber lockNumber(RMmCustomAPI::EImsi);	
 	
 	// data for ExpectL
@@ -1171,7 +1171,7 @@
 	// Test A: Test passing wrong version of parameters to
 	// RMmCustomAPI::DeActivateSimLock
  	//-------------------------------------------------------------------------
-	RMmCustomAPI::TSimLockPassword password(_L("changeme"));
+	RMmCustomAPI::TSimLockPassword password(_L("changemechangemechangemechange"));
 	RMmCustomAPI::TLockNumber lockNumber((RMmCustomAPI::TLockNumber) 0); 	
 	  
     customAPI.DeActivateSimLock(requestStatus, password, lockNumber);
@@ -1228,11 +1228,11 @@
 	// Test A: Test multiple clients requesting RMmCustomAPI::DeActivateSimLock
  	//-------------------------------------------------------------------------	
 	// data for the first request
-	RMmCustomAPI::TSimLockPassword password(_L("changeme"));
+	RMmCustomAPI::TSimLockPassword password(_L("changemechangemechangemechange"));
 	RMmCustomAPI::TLockNumber lockNumber(RMmCustomAPI::EOperator_Gid1);	
 	
 	// data for the second request
-	RMmCustomAPI::TSimLockPassword password2(_L("changeme2"));
+	RMmCustomAPI::TSimLockPassword password2(_L("changemechangemechangemechang2"));
 	RMmCustomAPI::TLockNumber lockNumber2(RMmCustomAPI::EOperator_Gid2);	
 	
 	// data for the first ExpectL
@@ -1289,7 +1289,7 @@
 	//-------------------------------------------------------------------------
 	// Test A: Test timeout of RMmCustomAPI::DeActivateSimLock
  	//-------------------------------------------------------------------------
- 	RMmCustomAPI::TSimLockPassword password(_L("changeme"));
+ 	RMmCustomAPI::TSimLockPassword password(_L("changemechangemechangemechange"));
 	RMmCustomAPI::TLockNumber lockNumber(RMmCustomAPI::EOperator_Gid2);	
 	
 	// data for ExpectL