Revision: 201007 RCL_3 PDK_3.0.h
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Fri, 19 Feb 2010 23:59:33 +0200
branchRCL_3
changeset 9 962e6306d9d2
parent 0 3553901f7fa8
child 13 444fb3c6f233
child 14 7ef16719d8cb
Revision: 201007 Kit: 201007
smsprotocols/smsstack/gsmu/test/te_gsmu_ems/Te_gsmu_emsSuiteStepBase.h
smsprotocols/smsstack/smsu/group/bld.inf
smsprotocols/smsstack/smsu/inc/smsuaddr.H
smsprotocols/smsstack/wapprot/test/Te_wapprot/WapProtSuiteStepBase.h
telephonyprotocols/gprsumtsqosinterface/inc/UmtsNifControlIf.h
telephonyprotocols/pdplayer/group/bld.inf
telephonyprotocols/pdplayer/inc/PDPParamMapper.h
telephonyprotocols/pdplayer/inc/PDPProvision.h
telephonyprotocols/pdplayer/inc/PDPSCPR.h
telephonyprotocols/pdplayer/inc/pdpmcpr.h
telephonyprotocols/pdplayer/src/PDPConfig.cpp
telephonyprotocols/pdplayer/src/pdpmcpr.cpp
telephonyprotocols/pdplayer/src/pdpmcprfactory.cpp
telephonyprotocols/pdplayer/src/pdpmcprstates.cpp
telephonyprotocols/pdplayer/src/psdavailabilitylistener.cpp
telephonyprotocols/pdplayer/test/controlplane/configs/te_controlplanenetworkside1.xml
telephonyprotocols/pdplayer/test/controlplane/configs/te_controlplanenetworkside_config.txt
telephonyprotocols/pdplayer/test/controlplane/configs/te_controlplanenetworkside_test28.ini
telephonyprotocols/pdplayer/test/controlplane/configs/te_controlplanenetworkside_test29.ini
telephonyprotocols/pdplayer/test/controlplane/configs/te_controlplanenetworksideloopbackcsy.ini
telephonyprotocols/pdplayer/test/controlplane/group/bld.inf
telephonyprotocols/pdplayer/test/controlplane/scripts/te_pdp-controlplane.script
telephonyprotocols/pdplayer/test/controlplane/scripts/te_pdp-controlplane28.script
telephonyprotocols/pdplayer/test/controlplane/scripts/te_pdp-controlplane29.script
telephonyprotocols/pdplayer/umts/spudtel/src/eteldriverstrategies.cpp
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide.ini
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide_config_9x.txt
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/TE_spudNetworkSide.script
telephonyprotocols/qos3gppcpr/inc/Qos3GPP_subconparams.h
telephonyserver/etelpacketdata/group/bld.inf
telephonyserver/etelpacketdata/inc/etelQoS.h
telephonyserver/etelpacketdata/inc/eteldefaultqos.h
telephonyserver/etelserverandcore/group/BLD.INF
telephonyserverplugins/common_tsy/test/component/group/component_test.pkg
telephonyserverplugins/common_tsy/test/component/inc/cctsyfixeddiallingfu.h
telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_fixeddialling_individual.script
telephonyserverplugins/common_tsy/test/component/src/cctsyfixeddiallingfu.cpp
telephonyserverplugins/common_tsy/test/integration/group/integration_test.pkg
telephonyserverplugins/simtsy/inc/CSimPacketContext.h
telephonyserverplugins/simtsy/src/CSimPacketContext.cpp
telephonyserverplugins/simtsy/src/CSimPhone.cpp
telephonyserverplugins/simtsy/test/Te_SimPacket/Te_SimPacket.cpp
telephonyutils/telephonywatchers/group/signalstrengthwatcher.mmp
--- a/smsprotocols/smsstack/gsmu/test/te_gsmu_ems/Te_gsmu_emsSuiteStepBase.h	Tue Feb 02 01:41:59 2010 +0200
+++ b/smsprotocols/smsstack/gsmu/test/te_gsmu_ems/Te_gsmu_emsSuiteStepBase.h	Fri Feb 19 23:59:33 2010 +0200
@@ -27,6 +27,7 @@
 #include <test/testexecutestepbase.h>
 // Please add your include here if you have
 #include <fbs.h>
+#include <etelmm.h>
 #include <e32math.h>
 #include "gsmumsg.h"
 #include "gsmubuf.h"
--- a/smsprotocols/smsstack/smsu/group/bld.inf	Tue Feb 02 01:41:59 2010 +0200
+++ b/smsprotocols/smsstack/smsu/group/bld.inf	Fri Feb 19 23:59:33 2010 +0200
@@ -30,7 +30,7 @@
 ../inc/smsuset.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(smsuset.h)
 ../inc/smsuset.inl SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(smsuset.inl)
 ../inc/smsustrm.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(smsustrm.h)
-../inc/smsustrm.inl SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(smsustrm.inl)
+../inc/smsustrm.inl SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(smsustrm.inl)
 ../inc/smsulog.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(smsulog.h)
 ../inc/smsulog.inl SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(smsulog.inl)
 ../inc/smsuact.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(smsuact.h)
--- a/smsprotocols/smsstack/smsu/inc/smsuaddr.H	Tue Feb 02 01:41:59 2010 +0200
+++ b/smsprotocols/smsstack/smsu/inc/smsuaddr.H	Fri Feb 19 23:59:33 2010 +0200
@@ -28,7 +28,6 @@
 
 #include <e32property.h>
 #include <es_sock.h>
-#include <etelmm.h>
 
 /** SMS sockets family identifier.*/
 const TUint KSMSAddrFamily = 0x010;
--- a/smsprotocols/smsstack/wapprot/test/Te_wapprot/WapProtSuiteStepBase.h	Tue Feb 02 01:41:59 2010 +0200
+++ b/smsprotocols/smsstack/wapprot/test/Te_wapprot/WapProtSuiteStepBase.h	Fri Feb 19 23:59:33 2010 +0200
@@ -37,6 +37,7 @@
 #include <e32property.h>
 #include <simtsy.h>
 #include <smsuaddr.h>
+#include <etelmm.h>
 #include "WapProtSuiteDefs.h"
 #include "wap_sock.h"
 #include "smsustrm.h"
--- a/telephonyprotocols/gprsumtsqosinterface/inc/UmtsNifControlIf.h	Tue Feb 02 01:41:59 2010 +0200
+++ b/telephonyprotocols/gprsumtsqosinterface/inc/UmtsNifControlIf.h	Fri Feb 19 23:59:33 2010 +0200
@@ -19,7 +19,7 @@
 #define __UMTSNIF_CONTROL__
 
 #include <nifman.h>
-
+#include <es_prot.h>
 #if MM_ETEL_API
 #include "uscl_packet.h"	// RPacketContext from UMTSSim
 #include "uscl_qos.h"		// RPacketQoS from UMTSSim
--- a/telephonyprotocols/pdplayer/group/bld.inf	Tue Feb 02 01:41:59 2010 +0200
+++ b/telephonyprotocols/pdplayer/group/bld.inf	Fri Feb 19 23:59:33 2010 +0200
@@ -29,5 +29,8 @@
 
 PRJ_TESTMMPFILES
 
+
+#include "..\test\controlplane\group\bld.inf"
+
 #endif
 
--- a/telephonyprotocols/pdplayer/inc/PDPParamMapper.h	Tue Feb 02 01:41:59 2010 +0200
+++ b/telephonyprotocols/pdplayer/inc/PDPParamMapper.h	Fri Feb 19 23:59:33 2010 +0200
@@ -23,6 +23,7 @@
 #ifndef SYMBIAN_PDPPARAMMAPPER_H
 #define SYMBIAN_PDPPARAMMAPPER_H
 
+#include <etelqos.h>
 #include <comms-infras/ss_parameterfamilybundle.h>
 
 #include <networking/qos3gpp_subconparams.h>
--- a/telephonyprotocols/pdplayer/inc/PDPProvision.h	Tue Feb 02 01:41:59 2010 +0200
+++ b/telephonyprotocols/pdplayer/inc/PDPProvision.h	Fri Feb 19 23:59:33 2010 +0200
@@ -27,9 +27,9 @@
 #ifndef PDPPROVISION_H_
 #define PDPPROVISION_H_
 
+#include <etelqos.h>
 #include <comms-infras/metadata.h>
 #include <metadatabase.h>		// TMDBElementId
-#include <etelqos.h>
 
 namespace ESock 
 	{
--- a/telephonyprotocols/pdplayer/inc/PDPSCPR.h	Tue Feb 02 01:41:59 2010 +0200
+++ b/telephonyprotocols/pdplayer/inc/PDPSCPR.h	Fri Feb 19 23:59:33 2010 +0200
@@ -23,6 +23,7 @@
 #ifndef SYMBIAN_PDPSPR_H
 #define SYMBIAN_PDPSPR_H
 
+#include <etelqos.h>
 #include <comms-infras/corescpr.h>
 #include <comms-infras/corescprstates.h>
 #include <networking/qos3gpp_subconparams.h>
@@ -30,9 +31,11 @@
 #include <networking/pdpprovision.h>
 #include <comms-infras/linkprovision.h>
 #include <networking/ipaddrinfoparams.h>
+#include <comms-infras/commsdebugutility.h>
+
 #include "PDPFSM.h"
 #include "PDPParamMapper.h"
-#include <comms-infras/commsdebugutility.h>
+
 namespace PDPSCprStates
     {
     class TSelfInit;
--- a/telephonyprotocols/pdplayer/inc/pdpmcpr.h	Tue Feb 02 01:41:59 2010 +0200
+++ b/telephonyprotocols/pdplayer/inc/pdpmcpr.h	Fri Feb 19 23:59:33 2010 +0200
@@ -23,6 +23,7 @@
 #ifndef SYMBIAN_PDPMCPR_H
 #define SYMBIAN_PDPMCPR_H
 
+#include <etelqos.h>
 #include <comms-infras/ss_mcprnodemessages.h>
 #include <comms-infras/linkprovision.h>
 #include <networking/pppconfig.h>
@@ -31,8 +32,10 @@
 
 #include <comms-infras/agentmcpr.h>
 #include <comms-infras/coremcprstates.h>
+
+#include "PDPProvision.h"
 #include "pdpmcprfactory.h"
-#include "PDPProvision.h"
+
 
 #if defined __CFLOG_ACTIVE || defined SYMBIAN_TRACE_ENABLE
 #define KPdpMCprTag KESockMetaConnectionTag
--- a/telephonyprotocols/pdplayer/src/PDPConfig.cpp	Tue Feb 02 01:41:59 2010 +0200
+++ b/telephonyprotocols/pdplayer/src/PDPConfig.cpp	Fri Feb 19 23:59:33 2010 +0200
@@ -82,6 +82,10 @@
 	    getErr = KErrNone;
 	    iUmtsGprsRelease = TPacketDataConfigBase::KConfigGPRS;
 	    }
+	    
+	TBool useEdge = EFalse;
+	
+	aIapView->GetBoolL(KCDTIdWCDMAUseEdge | KCDTIdOutgoingGprsRecord, useEdge);
 	
 	getErr = InitialiseScratchContext(iUmtsGprsRelease);
 	//-====================================================
@@ -104,7 +108,7 @@
             // GPRS specific
         	RetrieveGprsCompression(contextGPRS.iPdpCompression, aIapView);
         	RetrieveGprsAnonymousAccess(contextGPRS.iAnonymousAccessReqd, aIapView);
-        	contextGPRS.iUseEdge = EFalse;
+        	contextGPRS.iUseEdge = useEdge;
 			}
 			break;
 	    case TPacketDataConfigBase::KConfigRel5:
@@ -119,7 +123,7 @@
             		contextR5.iProtocolConfigOption.iDnsAddresses.iPrimaryDns,
             		contextR5.iProtocolConfigOption.iDnsAddresses.iSecondaryDns, aIapView);
             RetrieveAuthenticationInfoL(contextR5.iProtocolConfigOption, aIapView);
-            contextR5.iUseEdge = EFalse;
+            contextR5.iUseEdge = useEdge;
 
     		RetrieveUmtsPacketFlowIdentifierL(contextR5.iPFI, aIapView);
 			}
@@ -134,7 +138,7 @@
                 contextUMTS.iProtocolConfigOption.iDnsAddresses.iPrimaryDns,
                 contextUMTS.iProtocolConfigOption.iDnsAddresses.iSecondaryDns, aIapView);
             RetrieveAuthenticationInfoL(contextUMTS.iProtocolConfigOption, aIapView);
-            contextUMTS.iUseEdge = EFalse;
+            contextUMTS.iUseEdge = useEdge;
             RetrieveUmtsPacketFlowIdentifierL(contextUMTS.iPFI, aIapView);
 			}
 			break;
--- a/telephonyprotocols/pdplayer/src/pdpmcpr.cpp	Tue Feb 02 01:41:59 2010 +0200
+++ b/telephonyprotocols/pdplayer/src/pdpmcpr.cpp	Fri Feb 19 23:59:33 2010 +0200
@@ -20,15 +20,16 @@
  @internalComponent
 */
 
+#include <etelqos.h>
+#include <comms-infras/agentmcpractivities.h>
+#include <comms-infras/coremcpractivities.h>
+#include <comms-infras/ss_msgintercept.h>
+#include <elements/nm_messages_errorrecovery.h>
 #include <comms-infras/ss_log.h>
 #include "pdpmcpr.h"
 #include "pdpmcprstates.h"
 #include "PDPProvision.h"
 #include "psdavailabilitylistener.h"
-#include <comms-infras/agentmcpractivities.h>
-#include <comms-infras/coremcpractivities.h>
-#include <comms-infras/ss_msgintercept.h>
-#include <elements/nm_messages_errorrecovery.h>
 
 using namespace Messages;
 using namespace MeshMachine;
--- a/telephonyprotocols/pdplayer/src/pdpmcprfactory.cpp	Tue Feb 02 01:41:59 2010 +0200
+++ b/telephonyprotocols/pdplayer/src/pdpmcprfactory.cpp	Fri Feb 19 23:59:33 2010 +0200
@@ -20,15 +20,19 @@
  @internalComponent
 */
 
+#include <etelqos.h>
 #include <ecom/implementationproxy.h>
-#include "pdpmcprfactory.h"
-#include "pdpmcpr.h"
 #include <comms-infras/ss_log.h>
 #include <ss_glob.h>
 #include <ecom/ecom.h>
 
 #include <comms-infras/ss_msgintercept.h>
 
+#include "pdpmcprfactory.h"
+#include "pdpmcpr.h"
+
+
+
 #ifdef _DEBUG
 #define KPdpMCprFactoryTag KESockMetaConnectionTag
 _LIT8(KPdpMCprFactorySubTag, "pdpmcprfactory");
--- a/telephonyprotocols/pdplayer/src/pdpmcprstates.cpp	Tue Feb 02 01:41:59 2010 +0200
+++ b/telephonyprotocols/pdplayer/src/pdpmcprstates.cpp	Fri Feb 19 23:59:33 2010 +0200
@@ -13,6 +13,7 @@
 // Description:
 //
 
+#include <etelqos.h>
 #include <comms-infras/ss_metaconnprov.h>
 #include <comms-infras/ss_nodeinterfaces.h>
 #include <elements/nm_messages_errorrecovery.h>
--- a/telephonyprotocols/pdplayer/src/psdavailabilitylistener.cpp	Tue Feb 02 01:41:59 2010 +0200
+++ b/telephonyprotocols/pdplayer/src/psdavailabilitylistener.cpp	Fri Feb 19 23:59:33 2010 +0200
@@ -204,6 +204,7 @@
 		}
 	else
 		{
+        // Kick off this class' mini state machine in the RunL
 		TRequestStatus* status = &iStatus;
 		User::RequestComplete(status, KErrNone);
 		}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/pdplayer/test/controlplane/configs/te_controlplanenetworkside1.xml	Fri Feb 19 23:59:33 2010 +0200
@@ -0,0 +1,669 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 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"
+ which accompanies this distribution, and is available
+ at the URL "http://www.eclipse.org/legal/epl-v10.html".
+
+ Initial Contributors:
+ Nokia Corporation - initial contribution.
+
+ Contributors:
+
+ Description:
+ CommDB Settings File for GT0233 PREQ398 Raw IP NIF testing.
+ All Rights Reserved
+
+-->
+
+
+
+<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:xlink="http://www.w3.org/1999/xlink"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
+
+<InformationTable>
+</InformationTable>
+
+<NetworkTable>
+    <Network operation="add">
+        <Name>Intranet</Name>
+    </Network>
+    
+    <Network operation="add">
+        <Name>Intranet2</Name>
+    </Network>
+    
+    <Network operation="add">
+        <Name>Intranet3</Name>
+    </Network>
+    
+    <Network operation="add">
+        <Name>Intranet4</Name>
+    </Network>
+
+    <Network operation="add">
+        <Name>Intranet5</Name>
+    </Network>
+
+    <Network operation="add">
+        <Name>Intranet6</Name>
+    </Network>
+
+</NetworkTable>
+
+<IAPTable>
+    <IAP operation="add">
+        <Name>Loopback_GRPS_1</Name>
+        <IAPService>OutgoingGPRS.RawIP_Bounce_1</IAPService>
+        <IAPBearer>ModemBearer.Loopback_RawIP_1</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Mobile</LocationRef>
+    </IAP>    
+    <IAP operation="add">
+        <Name>Loopback_GRPS_2</Name>
+        <IAPService>OutgoingGPRS.SPUD_Echo_2</IAPService>
+        <IAPBearer>ModemBearer.Loopback_SPUD_2</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Mobile</LocationRef>
+    </IAP>
+    
+    <IAP operation="add">
+        <Name>Loopback_GRPS_3</Name>
+        <IAPService>OutgoingGPRS.RawIP_Bounce_3</IAPService>
+        <IAPBearer>ModemBearer.Loopback_RawIP_3</IAPBearer>
+        <IAPNetwork>Network.Intranet2</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Mobile</LocationRef>
+    </IAP>    
+    <IAP operation="add">
+        <Name>Loopback_GRPS_4</Name>
+        <IAPService>OutgoingGPRS.SPUD_Echo_4</IAPService>
+        <IAPBearer>ModemBearer.Loopback_SPUD_4</IAPBearer>
+        <IAPNetwork>Network.Intranet2</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Mobile</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Loopback_GRPS_5</Name>
+        <IAPService>OutgoingGPRS.RawIP_Bounce_1</IAPService>
+        <IAPBearer>ModemBearer.Loopback_RawIP_3</IAPBearer>
+        <IAPNetwork>Network.Intranet2</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Mobile</LocationRef>
+    </IAP>    
+    <IAP operation="add">
+        <Name>Loopback_GRPS_6</Name>
+        <IAPService>OutgoingGPRS.SPUD_Multi_1</IAPService>
+        <IAPBearer>ModemBearer.Loopback_SPUD_5</IAPBearer>
+        <IAPNetwork>Network.Intranet3</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Mobile</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Loopback_GRPS_7</Name>
+        <IAPService>OutgoingGPRS.SPUD_Multi_2</IAPService>
+        <IAPBearer>ModemBearer.Loopback_SPUD_6</IAPBearer>
+        <IAPNetwork>Network.Intranet4</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Mobile</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Loopback_GRPS_8</Name>
+        <IAPService>OutgoingGPRS.SPUD_Multi_3</IAPService>
+        <IAPBearer>ModemBearer.Loopback_SPUD_7</IAPBearer>
+        <IAPNetwork>Network.Intranet5</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Mobile</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Loopback_GRPS_9</Name>
+        <IAPService>OutgoingGPRS.SPUD_Multi_4</IAPService>
+        <IAPBearer>ModemBearer.Loopback_SPUD_8</IAPBearer>
+        <IAPNetwork>Network.Intranet6</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Mobile</LocationRef>
+    </IAP>
+</IAPTable>
+
+
+<ModemBearerTable>
+    <ModemBearer operation="template">
+        <Name>Default Loopback Modem</Name>
+        <Agent>NULLAGT</Agent>
+        <CSYName>PKTLOOPBACK</CSYName>
+        <BCAStack>C32Bca</BCAStack>
+        <TSYName>SIM</TSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>0</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <DialPauseLength>S8=</DialPauseLength>
+        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
+        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
+        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
+        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
+        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
+        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
+        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
+        <DialToneWaitModifier>W</DialToneWaitModifier>
+        <CallProgress1>X1</CallProgress1>
+        <CallProgress2>X2</CallProgress2>
+        <CallProgress3>X3</CallProgress3>
+        <CallProgress4>X4</CallProgress4>
+        <EchoOff>E0</EchoOff>
+        <VerboseText>V1</VerboseText>
+        <QuietOff>Q0</QuietOff>
+        <QuietOn>Q1</QuietOn>
+        <DialCommandStateModifier>;</DialCommandStateModifier>
+        <OnLine>O</OnLine>
+        <ResetConfiguration>Z</ResetConfiguration>
+        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
+        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
+        <DTRHangUp>&amp;D2</DTRHangUp>
+        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
+        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
+        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
+        <EscapeCharacter>+</EscapeCharacter>
+        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
+        <NoDialTone>NO DIAL TONE</NoDialTone>
+        <Busy>BUSY</Busy>
+        <NoAnswer>NO ANSWER</NoAnswer>
+        <Carrier>CARRIER</Carrier>
+        <Connect>CONNECT</Connect>
+        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
+        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
+        <CompressionNone>COMPRESSION:NONE</CompressionNone>
+        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
+        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
+        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
+        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
+        <MessageValidityPeriod>0</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <LastSessionClosedTimeout>4</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>6</LastSocketClosedTimeout>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    
+    <ModemBearer operation="add">
+        <Name>Loopback_RawIP_1</Name>
+        <IfName>RAWIP</IfName>
+        <CSYName>PKTLOOPBACK</CSYName>
+        <PortName>PKTLOOPBACK::501</PortName>
+    </ModemBearer>
+    
+    <ModemBearer operation="add">
+        <Name>Loopback_SPUD_2</Name>
+        <IfName>SPUD</IfName>
+    </ModemBearer>
+    
+    <ModemBearer operation="add">
+        <Name>Loopback_RawIP_3</Name>
+        <IfName>RAWIP</IfName>
+        <CSYName>PKTLOOPBACK</CSYName>
+        <PortName>PKTLOOPBACK::503</PortName>
+    </ModemBearer>
+    
+    <ModemBearer operation="add">
+        <Name>Loopback_SPUD_4</Name>
+        <IfName>SPUD</IfName>
+    </ModemBearer>
+    
+    <ModemBearer operation="add">
+        <Name>WinTunnel_SPUD_5</Name>
+        <Agent>NULLAGT</Agent>
+        <IfName>SPUD</IfName>
+    </ModemBearer>
+    
+    <ModemBearer operation="add">
+        <Name>Loopback_SPUD_5</Name>
+        <IfName>SPUD</IfName>
+    </ModemBearer>
+    
+    <ModemBearer operation="add">
+        <Name>Loopback_SPUD_6</Name>
+        <IfName>SPUD</IfName>
+    </ModemBearer>
+    
+    <ModemBearer operation="add">
+        <Name>Loopback_SPUD_7</Name>
+        <IfName>SPUD</IfName>
+    </ModemBearer>
+
+    <ModemBearer operation="add">
+        <Name>Loopback_SPUD_8</Name>
+        <IfName>SPUD</IfName>
+    </ModemBearer>
+
+</ModemBearerTable>
+
+<LANBearerTable>
+</LANBearerTable>
+
+<LANServiceTable>
+</LANServiceTable>
+
+<DialInISPTable>
+</DialInISPTable>
+
+<DialOutISPTable>
+</DialOutISPTable>
+
+<AgentLookupTable>
+</AgentLookupTable>
+
+<CDMA2000PacketServiceTable>
+</CDMA2000PacketServiceTable>
+
+<DefaultCDMA2000Table>
+</DefaultCDMA2000Table>
+
+<ChargecardTable>
+</ChargecardTable>
+
+<ConnectionPreferencesTable>
+    <!-- We must have at least one record with ranking of 1, else Netcon fails. -->
+    <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable1</Name>
+        <Ranking>1</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>DONOTPROMPT</DialogPref>
+        <BearerSet>PSD</BearerSet>
+        <IAPRef>IAP.Loopback_GRPS_2</IAPRef>
+    </ConnectionPreferences>    
+</ConnectionPreferencesTable>
+
+<GlobalSettingsTable>
+    <GlobalSettings operation="add">
+        <Name>GlobalSettingsTable1</Name>
+        <RedialAttempts>3</RedialAttempts>
+        <SmsReceiveMode>2</SmsReceiveMode>
+        <GPRSAttachMode>1</GPRSAttachMode>
+        <AcceptIncomingGprs>1</AcceptIncomingGprs>
+        <ConnectionAttempts>2</ConnectionAttempts>
+        <ModemForDataAndFax>2</ModemForDataAndFax>
+        <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
+        <LocationForDataAndFax>Location.Mobile</LocationForDataAndFax>
+        <LocationForPhoneServicesAndSMS>Location.Mobile</LocationForPhoneServicesAndSMS>
+        <GPRSClassCBearer>GSM</GPRSClassCBearer>
+        <DefaultNetwork>Network.Intranet</DefaultNetwork>
+        <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
+    </GlobalSettings>
+</GlobalSettingsTable>
+
+<IncomingGPRSTable>
+</IncomingGPRSTable>
+
+<OutgoingGPRSTable>
+    <OutgoingGPRS operation="template">
+    	<Name>Default Outgoing GPRS</Name>
+        <APN>Test</APN>
+        <PDPType>IPV4</PDPType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>FALSE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <ReqPrecedence>2</ReqPrecedence>
+        <ReqDelay>4</ReqDelay>
+        <ReqReliability>3</ReqReliability>
+        <ReqPeakThroughput>3</ReqPeakThroughput>
+        <ReqMeanThroughput>31</ReqMeanThroughput>
+        <MinPrecedence>2</MinPrecedence>
+        <MinDelay>4</MinDelay>
+        <MinReliability>3</MinReliability>
+        <MinPeakThroughput>3</MinPeakThroughput>
+        <MinMeanThroughput>31</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IpNetMask>255.255.255.0</IpNetMask>
+        <IfNetworks>ip</IfNetworks>
+      	<IfAuthName>RasUser</IfAuthName>
+        <AuthRetries>1</AuthRetries>
+        <IpNameServer1>194.72.6.51</IpNameServer1>
+        <IpNameServer2>194.72.6.51</IpNameServer2>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <UmtsR99QoSAndOnRef>UmtsR99QoSAndOn.PRIMARY1</UmtsR99QoSAndOnRef>         
+    </OutgoingGPRS>
+    
+    <OutgoingGPRS operation="add">
+        <Name>RawIP_Bounce_1</Name>
+        <PDPType>IPV4</PDPType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>FALSE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <IpAddr>192.168.1.1</IpAddr>
+    </OutgoingGPRS>
+    
+    <OutgoingGPRS operation="add">
+        <Name>SPUD_Echo_2</Name>
+      	<PDPType>IPV4</PDPType>
+        <IfParams>lowernif=RAWIP</IfParams>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>  
+        <IpAddr>192.168.1.2</IpAddr>
+    </OutgoingGPRS>
+    
+    <OutgoingGPRS operation="add">
+        <Name>RawIP_Bounce_3</Name>
+        <PDPType>IPV4</PDPType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>FALSE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <IpAddr>192.168.2.3</IpAddr>
+    </OutgoingGPRS>
+    
+    <OutgoingGPRS operation="add">
+        <Name>SPUD_Echo_4</Name>
+      	<PDPType>IPV4</PDPType>
+        <IfParams>lowernif=RAWIP</IfParams>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>FALSE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>  
+        <IpAddr>192.168.2.4</IpAddr>        
+    </OutgoingGPRS>
+    <OutgoingGPRS operation="add">
+        <Name>SPUD_Multi_1</Name>
+      	<PDPType>IPV4</PDPType>
+        <IfParams>lowernif=RAWIP</IfParams>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>  
+        <IpAddr>192.168.1.10</IpAddr>
+    </OutgoingGPRS>
+    <OutgoingGPRS operation="add">
+        <Name>SPUD_Multi_2</Name>
+      	<PDPType>IPV4</PDPType>
+        <IfParams>lowernif=RAWIP</IfParams>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>  
+        <IpAddr>192.168.1.11</IpAddr>
+    </OutgoingGPRS>
+    <OutgoingGPRS operation="add">
+        <Name>SPUD_Multi_3</Name>
+      	<PDPType>IPV4</PDPType>
+        <IfParams>lowernif=RAWIP</IfParams>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>  
+        <IpAddr>192.168.1.12</IpAddr>
+    </OutgoingGPRS>
+    <OutgoingGPRS operation="add">
+        <Name>SPUD_Multi_4</Name>
+      	<PDPType>IPV4</PDPType>
+        <IfParams>lowernif=RAWIP</IfParams>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>  
+        <IpAddr>192.168.1.13</IpAddr>
+    </OutgoingGPRS>
+</OutgoingGPRSTable>
+
+<DefaultGPRSTable>
+    <DefaultGPRS operation="add">
+        <Name>Dummy Default GPRS Settings</Name>
+        <APN>Access point name</APN>
+        <PDPType>IPV6</PDPType>
+        <PDPAddress>www.wid.com</PDPAddress>
+        <Usage>1</Usage>
+        <Precedence>1</Precedence>
+        <Delay>1</Delay>
+        <Reliability>1</Reliability>
+        <PeakThroughput>1</PeakThroughput>
+        <MeanThroughput>1</MeanThroughput>
+        <MinPrecedence>1</MinPrecedence>
+        <MinDelay>1</MinDelay>
+        <MinReliability>1</MinReliability>
+        <MinPeakThroughput>1</MinPeakThroughput>
+        <MinMeanThroughput>1</MinMeanThroughput>
+        <DataCompression>TRUE</DataCompression>
+        <HeaderCompression>TRUE</HeaderCompression>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <AnonymousAccess>TRUE</AnonymousAccess>
+    </DefaultGPRS>
+</DefaultGPRSTable>
+
+<ProxyTable>
+</ProxyTable>
+
+<LocationTable>
+    <Location operation="template">
+        <Name>Default Location</Name>
+        <Mobile>TRUE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>+</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+    </Location>
+ 
+    <Location operation="add">
+        <Name>Office</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>171</AreaCode>
+        <DialOutCode>9,</DialOutCode>
+    </Location>
+ 
+    <Location operation="add">
+        <Name>Mobile</Name>
+        <Mobile>TRUE</Mobile>
+        <UsePulseDial>FALSE</UsePulseDial>
+        <WaitForDialTone>FALSE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>+</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+    </Location>
+
+</LocationTable>
+
+<SecureSocketTable>
+</SecureSocketTable>
+
+<UmtsR99QoSAndOnTable>
+	<UmtsR99QoSAndOn operation ="add">
+	  	<Name>PRIMARY1</Name>
+		<ReqTrafficClass>1</ReqTrafficClass>
+		<MinTrafficClass>1</MinTrafficClass>
+		<ReqDeliveryOrder>1</ReqDeliveryOrder>
+		<MinDeliveryOrder>1</MinDeliveryOrder>
+		<ReqDeliverErroneousSDU>1</ReqDeliverErroneousSDU>
+		<MinDeliverErroneousSDU>1</MinDeliverErroneousSDU>
+		<ReqMaxSDUSize>0</ReqMaxSDUSize>
+		<MinAcceptableMaxSDUSize>0</MinAcceptableMaxSDUSize>
+		<ReqMaxUplinkRate>0</ReqMaxUplinkRate>
+		<ReqMinUplinkRate>0</ReqMinUplinkRate>
+		<ReqMaxDownlinkRate>0</ReqMaxDownlinkRate>
+		<ReqMinDownlinkRate>0</ReqMinDownlinkRate>
+		<ReqBER>1</ReqBER>
+		<MaxBER>1</MaxBER>
+		<ReqSDUErrorRatio>1</ReqSDUErrorRatio>
+		<MaxSDUErrorRatio>1</MaxSDUErrorRatio>
+		<ReqTrafficHandlingPriority>1</ReqTrafficHandlingPriority>
+		<MinTrafficHandlingPriority>1</MinTrafficHandlingPriority>
+		<ReqTransferDelay>0</ReqTransferDelay>
+		<MaxTransferDelay>0</MaxTransferDelay>
+		<ReqGuaranteedUplinkRate>0</ReqGuaranteedUplinkRate>
+		<MinGuaranteedUplinkRat>0</MinGuaranteedUplinkRat>
+		<ReqGuaranteedDownlinkRate>0</ReqGuaranteedDownlinkRate>
+		<MinGuaranteedDownlinkRate>0</MinGuaranteedDownlinkRate>
+		<SignallingIndication>FALSE</SignallingIndication>
+		<IMCNSignallingIndication>FALSE</IMCNSignallingIndication>
+		<SourceStatisticsDescriptor>0</SourceStatisticsDescriptor>
+	</UmtsR99QoSAndOn>
+
+	<UmtsR99QoSAndOn operation ="add">
+		<Name>SECONDARY1</Name>
+		<ReqTrafficClass>4</ReqTrafficClass>
+		<MinTrafficClass>4</MinTrafficClass>
+		<ReqDeliveryOrder>1</ReqDeliveryOrder>
+		<MinDeliveryOrder>1</MinDeliveryOrder>
+		<ReqDeliverErroneousSDU>8</ReqDeliverErroneousSDU>
+		<MinDeliverErroneousSDU>8</MinDeliverErroneousSDU>
+		<ReqMaxSDUSize>768</ReqMaxSDUSize>
+		<MinAcceptableMaxSDUSize>512</MinAcceptableMaxSDUSize>
+		<ReqMaxUplinkRate>1024</ReqMaxUplinkRate>
+		<ReqMinUplinkRate>1024</ReqMinUplinkRate>
+		<ReqMaxDownlinkRate>1024</ReqMaxDownlinkRate>
+		<ReqMinDownlinkRate>1024</ReqMinDownlinkRate>
+		<ReqBER>0</ReqBER>
+		<MaxBER>0</MaxBER>
+		<ReqSDUErrorRatio>1</ReqSDUErrorRatio>
+		<MaxSDUErrorRatio>1</MaxSDUErrorRatio>
+		<ReqTrafficHandlingPriority>1</ReqTrafficHandlingPriority>
+		<MinTrafficHandlingPriority>1</MinTrafficHandlingPriority>
+		<ReqTransferDelay>250</ReqTransferDelay>
+		<MaxTransferDelay>250</MaxTransferDelay>
+		<ReqGuaranteedUplinkRate>1024</ReqGuaranteedUplinkRate>
+		<MinGuaranteedUplinkRat>1024</MinGuaranteedUplinkRat>
+		<ReqGuaranteedDownlinkRate>1024</ReqGuaranteedDownlinkRate>
+		<MinGuaranteedDownlinkRate>1024</MinGuaranteedDownlinkRate>
+		<SignallingIndication>FALSE</SignallingIndication>
+		<IMCNSignallingIndication>FALSE</IMCNSignallingIndication>
+		<SourceStatisticsDescriptor>0</SourceStatisticsDescriptor>
+	</UmtsR99QoSAndOn>
+
+	<UmtsR99QoSAndOn operation ="add">
+	  	<Name>PRIMARY2</Name>
+		<ReqTrafficClass>1</ReqTrafficClass>
+		<MinTrafficClass>1</MinTrafficClass>
+		<ReqDeliveryOrder>1</ReqDeliveryOrder>
+		<MinDeliveryOrder>1</MinDeliveryOrder>
+		<ReqDeliverErroneousSDU>1</ReqDeliverErroneousSDU>
+		<MinDeliverErroneousSDU>1</MinDeliverErroneousSDU>
+		<ReqMaxSDUSize>0</ReqMaxSDUSize>
+		<MinAcceptableMaxSDUSize>0</MinAcceptableMaxSDUSize>
+		<ReqMaxUplinkRate>0</ReqMaxUplinkRate>
+		<ReqMinUplinkRate>0</ReqMinUplinkRate>
+		<ReqMaxDownlinkRate>0</ReqMaxDownlinkRate>
+		<ReqMinDownlinkRate>0</ReqMinDownlinkRate>
+		<ReqBER>1</ReqBER>
+		<MaxBER>1</MaxBER>
+		<ReqSDUErrorRatio>1</ReqSDUErrorRatio>
+		<MaxSDUErrorRatio>1</MaxSDUErrorRatio>
+		<ReqTrafficHandlingPriority>1</ReqTrafficHandlingPriority>
+		<MinTrafficHandlingPriority>1</MinTrafficHandlingPriority>
+		<ReqTransferDelay>0</ReqTransferDelay>
+		<MaxTransferDelay>0</MaxTransferDelay>
+		<ReqGuaranteedUplinkRate>0</ReqGuaranteedUplinkRate>
+		<MinGuaranteedUplinkRat>0</MinGuaranteedUplinkRat>
+		<ReqGuaranteedDownlinkRate>0</ReqGuaranteedDownlinkRate>
+		<MinGuaranteedDownlinkRate>0</MinGuaranteedDownlinkRate>
+		<SignallingIndication>FALSE</SignallingIndication>
+		<IMCNSignallingIndication>FALSE</IMCNSignallingIndication>
+		<SourceStatisticsDescriptor>0</SourceStatisticsDescriptor>
+	</UmtsR99QoSAndOn>
+
+	<UmtsR99QoSAndOn operation ="add">
+		<Name>SECONDARY2</Name>
+		<ReqTrafficClass>4</ReqTrafficClass>
+		<MinTrafficClass>4</MinTrafficClass>
+		<ReqDeliveryOrder>1</ReqDeliveryOrder>
+		<MinDeliveryOrder>1</MinDeliveryOrder>
+		<ReqDeliverErroneousSDU>8</ReqDeliverErroneousSDU>
+		<MinDeliverErroneousSDU>8</MinDeliverErroneousSDU>
+		<ReqMaxSDUSize>768</ReqMaxSDUSize>
+		<MinAcceptableMaxSDUSize>512</MinAcceptableMaxSDUSize>
+		<ReqMaxUplinkRate>1024</ReqMaxUplinkRate>
+		<ReqMinUplinkRate>1024</ReqMinUplinkRate>
+		<ReqMaxDownlinkRate>1024</ReqMaxDownlinkRate>
+		<ReqMinDownlinkRate>1024</ReqMinDownlinkRate>
+		<ReqBER>0</ReqBER>
+		<MaxBER>0</MaxBER>
+		<ReqSDUErrorRatio>1</ReqSDUErrorRatio>
+		<MaxSDUErrorRatio>1</MaxSDUErrorRatio>
+		<ReqTrafficHandlingPriority>1</ReqTrafficHandlingPriority>
+		<MinTrafficHandlingPriority>1</MinTrafficHandlingPriority>
+		<ReqTransferDelay>250</ReqTransferDelay>
+		<MaxTransferDelay>250</MaxTransferDelay>
+		<ReqGuaranteedUplinkRate>1024</ReqGuaranteedUplinkRate>
+		<MinGuaranteedUplinkRat>1024</MinGuaranteedUplinkRat>
+		<ReqGuaranteedDownlinkRate>1024</ReqGuaranteedDownlinkRate>
+		<MinGuaranteedDownlinkRate>1024</MinGuaranteedDownlinkRate>
+		<SignallingIndication>FALSE</SignallingIndication>
+		<IMCNSignallingIndication>FALSE</IMCNSignallingIndication>
+		<SourceStatisticsDescriptor>0</SourceStatisticsDescriptor>
+	</UmtsR99QoSAndOn>
+
+</UmtsR99QoSAndOnTable>
+<BTDeviceTable>
+</BTDeviceTable>
+
+<BTPersistTable>
+</BTPersistTable>
+
+<BTSecurityTable>
+</BTSecurityTable>
+
+<BTDefaultTable>
+</BTDefaultTable>
+
+<WAPAccessPointTable>
+</WAPAccessPointTable>
+
+<WAPIPBearerTable>
+</WAPIPBearerTable>
+
+<WAPSMSBearerTable>
+</WAPSMSBearerTable>
+
+<VirtualBearerTable>
+</VirtualBearerTable>
+
+<VpnServiceTable>
+</VpnServiceTable>
+
+<PolicySelectorTable>
+	<PolicySelector operation ="add">
+		<PolicyId>1</PolicyId>
+		<SrcAddress>0.0.0.0</SrcAddress>
+		<SrcMask>255.255.255.255</SrcMask>
+		<DstAddress>192.168.1.1</DstAddress>
+		<DstMask>255.255.255.255</DstMask>
+		<SrcPort>0</SrcPort>
+		<SrcPortMax>1031</SrcPortMax>
+		<DstPort>3461</DstPort>
+		<DstPortMax>3461</DstPortMax>
+		<ProtocolId>17</ProtocolId>
+		<IapId>2</IapId>
+		<Priority>1</Priority>
+	</PolicySelector>
+
+	<PolicySelector operation ="add">
+		<PolicyId>2</PolicyId>
+		<SrcPort>0</SrcPort>
+		<SrcPortMax>0</SrcPortMax>
+		<ProtocolId>1</ProtocolId>
+		<IapId>2</IapId>
+		<Priority>1</Priority>
+	</PolicySelector>
+</PolicySelectorTable>
+
+</CommDB:Config>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/pdplayer/test/controlplane/configs/te_controlplanenetworkside_config.txt	Fri Feb 19 23:59:33 2010 +0200
@@ -0,0 +1,163 @@
+############################################################################
+############################################################################
+###################              T E S T 0              ####################
+############################################################################
+############################################################################
+# Test case for success results
+############################################################################
+[test0]
+# DefaultContextparamGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <PdpDataCompression>, <TAnonymousAccess>, <TUseEdge>
+# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
+# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
+DefaultContextparamGPRS= 3, SYMBIAN EMPLOYEE INTRANET, A WAP PORTAL, 2, 1, 1, 1, USER2, PASSWORD2, NULL, NULL, PRIMARYSERVER2, SECONDARYSERVER2, 2
+
+# ContextConfigGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <PdpDataCompression>, <TAnonymousAccess>, <TUseEdge>
+# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
+# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
+SetContextConfigGPRS = 0,Test,,0,2,0,1,RasUser,,,,,,1
+# TRel99ContextConfig = <TName iContextName>,  <TUint iActivatePause>, <TUint iActivateErrorCode>, <TUint iDeactivatePause>, 
+# <TUint iDeactivateErrorCode>, <TUint iDeletionPause>, <TUint iDeletionErrorCode> <TBool iConnectToNtRas>
+R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0
+R99ContextConfig = SECONDARY1, 0, 0, 0, 0, 0, 0, 0
+R99ContextConfig = SECONDARY2, 0, 0, 0, 0, 0, 0, 0
+
+# TFTfilter = 0<id> 1<evaluationPrecedenceIndex> 2<srcAddr> 3<srcAddrSubnetMask>  4<protocolNumberOrNextHeader>
+#	      5<srcPortMin> 6<srcPortMax> 7<destPortMin> 8<destPortMax> 9<ipSecSPI> 10<toSorTrafficClass>
+#	      11<flowLabel>
+TFTfilter = 1, 96, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.1, 255.255.255.255.255.255.255.255.255.255.255.255.255.255.255.255, 17, 3461, 3461, 1031, 1031, 0, 0, 0
+TFTfilter = 1, 0, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.1, 255.255.255.255.255.255.255.255.255.255.255.255.255.255.255.255, 17, 3461, 3461, 1031, 1031, 0, 0, 0
+TFTfilter = 1, 1, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.1, 255.255.255.255.255.255.255.255.255.255.255.255.255.255.255.255, 17, 3461, 3461, 1031, 1031, 0, 0, 0
+
+#TProfileReqR99 = 0<contextName> 1<reqTraffic> 2<minTraffic> 3<reqDeliveryOrder> 4<minDeliveryOrder>
+#		  5<reqErroneousSDU> 6<minErroneousSDU> 7<maxSDUSize> 8<minSDUSize>
+#		 9<reqUpLinkBitRate> 10<reqDownLinkBitRate> 11<minUpLinkBitRate> 12<minDownLinkBitRate> 
+#		 
+#		 13<reqBitErrorRatio> 14<minBitErrorRatio> 15<reqSDUErrorRatio> 16<minSDUErrorRatio>
+#		 17<reqTrafficHandlingPriority> 18<minTrafficHandlingPriority>
+#		 19<reqTransferDelay> 20<minTransferDelay> 21<reqGuaranteedUpLinkBitRate> 22<reqGuaranteedDownLinkBitRate>
+#		 23<minGuaranteedUpLinkBitRate> 24<minGuaranteedDownLinkBitRate>
+QosProfileReqR99 = PRIMARY1,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0
+QosProfileReqR99 = SECONDARY1,0x04, 0x04, 0x01, 0x01, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 250, 250, -1, -1, 0, 0
+QosProfileReqR99 = SECONDARY1,0x04, 0x04, 0x01, 0x01, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 250, 250, -1, -1, 0, 0
+QosProfileReqR99 = SECONDARY1,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0
+QosProfileReqR99 = SECONDARY2,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0
+
+QosProfileReqR5 = PRIMARY1,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0, 0
+QosProfileReqR5 = SECONDARY1,0x04, 0x04, 0x01, 0x01, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 250, 250, -1, -1, 0, 0, 0, 0
+QosProfileReqR5 = SECONDARY1,0x04, 0x04, 0x01, 0x01, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 250, 250, -1, -1, 0, 0, 0, 0
+QosProfileReqR5 = SECONDARY1,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0, 0
+QosProfileReqR5 = SECONDARY2,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0, 0
+
+
+
+#TProfileNegR99 =<contextName> <duration> <negTraffic> <negDeliveryOrder> <negErroneousSDUDelivery> <negMaxSDUSize>
+#		 <negBitErrorRatio> <negSDUErrorRatio> <negTrafficHandlingPriority>
+#		 <negTransferDelay> <negGuaranteedUpLinkBitRate> <negGuaranteedDownLinkBitRate>
+#		 <negMaxUpLinkRate> <negMaxDownLinkRate> 
+QosProfileNegR99 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
+QosProfileNegR99 = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
+QosProfileNegR99 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
+QosProfileNegR99 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
+QosProfileNegR99 = SECONDARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
+QosProfileNegR99 = SECONDARY2, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
+
+QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
+QosProfileNegR5 = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
+QosProfileNegR5 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
+QosProfileNegR5 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
+QosProfileNegR5 = SECONDARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
+QosProfileNegR5 = SECONDARY2, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
+
+
+#TQosProfileCapsR99 = <trafficCap> <deliveryOrderReqCap> <deliverErroneousSDUCap>
+#		      <BERCap> <SDUErrorRatioCap> <trafficHandlingPriorityCap>
+QosProfileCapsR99= 0x08, 0x04, 0x02, 0x04, 0x02, 0x04
+
+QosNetworkNotificationType = PublishSubscribe
+# QosNetworkNotification = <contextName> <duration> <negTraffic> <negDeliveryOrder> <negErroneousSDUDelivery>
+#		 <negBitErrorRatio> <negSDUErrorRatio> <negTrafficHandlingPriority>
+#		 <negTransferDelay> <negGuaranteedUpLinkBitRate> <negGuaranteedDownLinkBitRate>
+#		 <negMaxUpLinkRate> <negMaxDownLinkRate> <negMaxSDUSize>
+QosNetworkNotification = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
+QosNetworkNotification = PRIMARY2, 0x04, 0x02, 0x04, 0x02, 1, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
+QosNetworkNotification = SECONDARY1, 0x04, 0x02, 0x04, 0x02, 1, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
+
+QosR5NetworkNotification = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
+QosR5NetworkNotification = PRIMARY2, 0x04, 0x02, 0x04, 0x02, 1, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
+QosR5NetworkNotification = SECONDARY1, 0x04, 0x02, 0x04, 0x02, 1, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
+
+
+#SetProfileFail= <contextName> <numberOfTimes> <errorCode> <setProfileDigit>
+SetProfileFail = NEG_99, 0x04, 0x02
+
+#QosprofileReqGPRS= <minPrecedence> <reqPrecedence> <minDelay> <reqDelay> <minReliability> <reqReliability> <minPeek> <reqPeek>
+#		    <minMean> <reqMean>
+QosProfileReqGPRS= 0x08, 0x04, 0x02, 0x04, 0x02, 0x04, 0x020, 0x080, 0x00004, 0x00020
+QosProfileReqGPRS= 0x04, 0x04, 0x02, 0x04, 0x02, 0x04, 0x020, 0x080, 0x00004, 0x00020
+
+#QosProfileNegGPRS=<negPrecedence> <negDelay><negReliability> <negPeek> <negMean>
+QosProfileNegGPRS= 0x04, 0x04, 0x04, 0x080, 0x00002
+QosProfileNegGPRS= 0x04, 0x04, 0x04, 0x080, 0x00002
+
+#QosProfileCapsGPRS=<negPrecedenceCap> <negDelayCap> <negReliabilityCap><negPeekCap> <negMeanCap>
+QosProfileCapsGPRS= 0x04, 0x04, 0x04, 0x080, 0x00002 
+
+# QosProfileReq
+# = <TTrafficClass>, <TTrafficClass>, <TDeliveryOrder>, <TDeliveryOrder>
+# <TErroneousSDUDelivery>, <TErroneousSDUDelivery>
+# <TErroneousSDUDelivery>, <TInt iReqMaxSDUSize>, <TInt iMinAcceptableMaxSDUSize>
+# <TBitRate>, <TBitRate>, <TBitErrorRatio>, 
+# <TBitErrorRatio>, <TSDUErrorRatio>, <TSDUErrorRatio>, <TTrafficHandlingPriority>, <TTrafficHandlingPriority>
+# <TInt	iReqTransferDelay>, <TInt iMaxTransferDelay>, <TBitRate>, <TBitRate>
+
+# QosProfileNeg = <TQoSPrecedence>, <TQoSDelay>, <TQoSReliability>, <TQoSPeakThroughput>, <TQoSMeanThroughput>
+# <TTrafficClass>, <TDeliveryOrder>, <TErroneousSDUDelivery>, <TInt iMaxSDUSize>, <TBitRate>, 
+# <TBitErrorRatio>, <TSDUErrorRatio>, <TTrafficHandlingPriority>
+# <TInt iTransferDelay>, <TBitRate>		
+
+DefaultContextparamRel99= 3, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, USER2, PASSWORD2, NULL, NULL, PRIMARYSERVER2, SECONDARYSERVER2, 2
+# DefaultContextparamRel99 = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>
+# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
+# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
+
+ReleaseMode = 5, 5
+# Packet Release mode = <Release> <Duration>
+
+#RegStatus=<duration> <regStat> <networkIndex> 
+RegStatus= 5,3
+RegStatus= 2,5,0
+RegStatus= 2,7,3
+RegStatus= 5,2
+RegStatus= 2,5,0
+
+# NetworkRegStatus = <Duration>, <RegistrationStatus>
+NetworkRegStatusType = PublishSubscribe
+NetworkRegStatus= 5,2
+NetworkRegStatus= 5,1
+NetworkRegStatus= 5,1
+
+# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
+CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::502, 18, 0, PRIMARY1
+CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
+CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::506, 18, 0, SECONDARY2
+
+############################################################################
+# failure events
+# Configure the context's status to be changed using publish and subscribe
+NotifyContextStatusChangeType = PublishSubscribe
+# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
+
+# EStatusDeactivating = 4 EStatusInactive = 1 EStatusDeleted = 6
+NotifyContextStatusChange = PRIMARY1, 0, 6
+NotifyContextStatusChange = PRIMARY1, 0, 4
+NotifyContextStatusChange = PRIMARY1, 0, 1
+NotifyContextStatusChange = SECONDARY1, 0, 6
+NotifyContextStatusChange = SECONDARY1, 0, 4
+NotifyContextStatusChange = SECONDARY1, 0, 1
+
+# EStatusSuspended = 5 EStatusActive = 3
+NotifyContextStatusChange = PRIMARY1, 0, 5
+NotifyContextStatusChange = PRIMARY1, 0, 3
+NotifyContextStatusChange = SECONDARY1, 0, 5
+NotifyContextStatusChange = SECONDARY1, 0, 3
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/pdplayer/test/controlplane/configs/te_controlplanenetworkside_test28.ini	Fri Feb 19 23:59:33 2010 +0200
@@ -0,0 +1,101 @@
+[SimTsy]
+TestSection=0
+
+[CreateSockSvr1]
+SocketServName=SockSvr1
+
+[ConnectSockSvr1]
+SocketServName=SockSvr1
+
+[CreateConn1]
+ConnName=Conn1
+
+[OpenConn1]
+ConnName=Conn1
+SocketServName=SockSvr1
+
+[CreateConnectionServA]
+ConnServName=ConnServA
+
+[ConnectConnectionServA]
+ConnServName=ConnServA
+TierName=LinkTier
+
+[CreateConnectionServS]
+ConnServName=ConnServS
+
+[ConnectConnectionServS]
+ConnServName=ConnServS
+TierName=LinkTier
+
+[APNotificationRequest1A]
+ConnServName=ConnServA
+NotificationName=NotifA
+QueryAPStatusFilter=C-R-AYS-
+QueryAPMatch0=2
+
+[APNotificationRequest1S]
+ConnServName=ConnServS
+NotificationName=NotifS
+QueryAPStatusFilter=C-R-A-SY
+
+[StartConn1_1]
+ConnName=Conn1
+SocketServName=SockSvr1
+IAP=2
+
+[ReceiveNotification1A]
+NotificationName=NotifA
+WaitPeriod=5
+ExpectedNumberOfAPs=1
+ExpectedAP1=2
+ExpectedAP1Status=C?R?AYS?
+
+[ReceiveNotification1S]
+NotificationName=NotifS
+WaitPeriod=5
+ExpectedNumberOfAPs=1
+ExpectedAP1=2
+ExpectedAP1Status=C?R?A?SY
+
+[StopConn1_1]
+ConnName=Conn1
+ConnStopType=EStopNormal
+
+[SetSimTsyUnavailable]
+AccessPointId=2
+AccessPointState=Unavailable
+
+[ReceiveNotification2A]
+NotificationName=NotifA
+WaitPeriod=5
+ExpectedNumberOfAPs=1
+ExpectedAP1=2
+ExpectedAP1Status=C?R?ANS?
+
+[ReceiveNotification2S]
+NotificationName=NotifS
+WaitPeriod=5
+ExpectedNumberOfAPs=1
+ExpectedAP1=2
+ExpectedAP1Status=C?R?A?SN
+
+[CancelAPNotifRequestA]
+ConnServName=ConnServA
+NotificationName=NotifA
+
+[CancelAPNotifRequestS]
+ConnServName=ConnServS
+NotificationName=NotifS
+
+[CloseConn1]
+ConnName=Conn1
+
+[CloseConnectionServA]
+ConnServName=ConnServA
+
+[CloseConnectionServS]
+ConnServName=ConnServS
+
+[CloseSockSvr1]
+SocketServName=SockSvr1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/pdplayer/test/controlplane/configs/te_controlplanenetworkside_test29.ini	Fri Feb 19 23:59:33 2010 +0200
@@ -0,0 +1,71 @@
+[SimTsy]
+TestSection=0
+
+[CreateSockSvr1]
+SocketServName=SockSvr1
+
+[ConnectSockSvr1]
+SocketServName=SockSvr1
+
+[CreateConn1]
+ConnName=Conn1
+
+[OpenConn1]
+ConnName=Conn1
+SocketServName=SockSvr1
+
+[CreateConnectionServ1]
+ConnServName=ConnServ1
+
+[ConnectConnectionServ1]
+ConnServName=ConnServ1
+TierName=LinkTier
+
+[SetSimTsyAvailable]
+AccessPointId=2
+AccessPointState=Available
+
+[APQuery1]
+ConnServName=ConnServ1
+QueryAPStatusFilter=C-R-A?S-
+QueryAPMatch0=2
+ExpectedNumberOfAPs=1
+ExpectedAP1=2
+ExpectedAP1Status=C?R?AYS?
+
+[SetSimTsyUnavailable]
+AccessPointId=2
+AccessPointState=Unavailable
+
+[APQuery1a]
+ConnServName=ConnServ1
+QueryAPStatusFilter=C-R-A?S?
+QueryAPMatch0=2
+ExpectedNumberOfAPs=1
+ExpectedAP1=2
+ExpectedAP1Status=C?R?ANSN
+
+[StartConn1_1]
+ConnName=Conn1
+SocketServName=SockSvr1
+IAP=2
+
+[APQuery2]
+ConnServName=ConnServ1
+QueryAPStatusFilter=C-R-A?SY
+ExpectedNumberOfAPs=1
+ExpectedAP1=2
+ExpectedAP1Status=C?R?AYSY
+
+[StopConn1_1]
+ConnName=Conn1
+ConnStopType=EStopNormal
+
+[CloseConn1]
+ConnName=Conn1
+
+[CloseConnectionServ1]
+ConnServName=ConnServ1
+
+[CloseSockSvr1]
+SocketServName=SockSvr1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/pdplayer/test/controlplane/configs/te_controlplanenetworksideloopbackcsy.ini	Fri Feb 19 23:59:33 2010 +0200
@@ -0,0 +1,29 @@
+# Defining a loopback between port A and B is as follows:
+# Port = <PortA>,<PortB>,<delay>,<queue size>,<element (packet) size>
+# Ports 501 to 522 are mapped to contexts on the default SIM
+# Ports 523 to 544 are mapped to contexts on SIM2
+#
+[Defaults]
+Port= 0,1,1,10,1500
+Port= 501,502,0,10,1500
+Port= 503,504,0,10,1500
+Port= 505,506,0,10,1500
+Port= 507,508,0,10,1500
+Port= 509,510,0,10,1500
+Port= 511,512,0,10,1500
+Port= 513,514,0,10,1500
+Port= 515,516,0,10,1500
+Port= 517,518,0,10,1500
+Port= 519,520,0,10,1500
+Port= 521,522,0,10,1500
+Port= 523,524,0,10,1500
+Port= 525,526,0,10,1500
+Port= 527,528,0,10,1500
+Port= 529,530,0,10,1500
+Port= 531,532,0,10,1500
+Port= 533,534,0,10,1500
+Port= 535,536,0,10,1500
+Port= 537,538,0,10,1500
+Port= 539,540,0,10,1500
+Port= 541,542,0,10,1500
+Port= 543,544,0,10,1500
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/pdplayer/test/controlplane/group/bld.inf	Fri Feb 19 23:59:33 2010 +0200
@@ -0,0 +1,42 @@
+// Copyright (c) 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Network-side events / errors SPUD testing
+// 
+//
+
+/**
+ @file
+*/
+
+PRJ_EXPORTS
+
+PRJ_TESTEXPORTS
+
+../configs/te_controlplanenetworkside1.xml                z:/testdata/configs/te_controlplanenetworkside1.xml
+../configs/te_controlplanenetworkside_config.txt          z:/testdata/configs/te_controlplanenetworkside_config.txt
+../configs/te_controlplanenetworkside_test28.ini          z:/testdata/configs/te_controlplanenetworkside_test28.ini
+../configs/te_controlplanenetworkside_test29.ini          z:/testdata/configs/te_controlplanenetworkside_test29.ini
+
+../configs/te_controlplanenetworksideloopbackcsy.ini      z:/testdata/configs/te_controlplanenetworksideloopbackcsy.ini
+
+
+../scripts/te_PDP-ControlPlane.script                     z:/testdata/scripts/te_PDP-ControlPlane.script
+../scripts/te_PDP-ControlPlane28.script                   z:/testdata/scripts/te_PDP-ControlPlane28.script
+../scripts/te_PDP-ControlPlane29.script                   z:/testdata/scripts/te_PDP-ControlPlane29.script
+
+PRJ_MMPFILES
+
+PRJ_TESTMMPFILES
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/pdplayer/test/controlplane/scripts/te_pdp-controlplane.script	Fri Feb 19 23:59:33 2010 +0200
@@ -0,0 +1,43 @@
+//
+// Copyright (c) 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Run Control Plane Networkside Tests.
+
+run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
+ced z:\TestData\Configs\te_controlplanenetworkside1.xml
+run_script z:\TestData\scripts\te_esock_test_loadesock.script
+
+RUN_UTILS  MkDir c:\simtsy\
+RUN_UTILS  MkDir c:\private\
+RUN_UTILS  MkDir c:\private\101F7989\
+RUN_UTILS  MkDir c:\private\101F7989\esock\
+RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
+RUN_UTILS  MakeReadWrite c:\config.txt
+RUN_UTILS  MakeReadWrite c:\loopback.ini
+RUN_UTILS  DeleteFile c:\simtsy\config.txt
+RUN_UTILS  DeleteFile c:\config.txt
+RUN_UTILS  DeleteFile c:\loopback.ini
+RUN_UTILS  CopyFile z:\TestData\Configs\te_controlplanenetworkside_config.txt c:\simtsy\config.txt
+RUN_UTILS  CopyFile z:\TestData\Configs\te_controlplanenetworkside_config.txt c:\config.txt
+RUN_UTILS  CopyFile z:\TestData\Configs\te_controlplanenetworksideloopbackcsy.ini c:\loopback.ini 
+
+LOAD_SUITE te_esockteststepsSuite -SharedData
+
+RUN_SCRIPT Z:\TestData\Scripts\te_PDP-ControlPlane28.script
+RUN_SCRIPT Z:\TestData\Scripts\te_PDP-ControlPlane29.script
+
+PRINT Complete_te_controlplanenetworkside tests
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/pdplayer/test/controlplane/scripts/te_pdp-controlplane28.script	Fri Feb 19 23:59:33 2010 +0200
@@ -0,0 +1,86 @@
+//
+// Copyright (c) 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+PRINT Running CASE28
+PRINT Validating notifications on the PDP tier
+
+//
+LOAD_SUITE te_esockteststepsSuite -SharedData
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+
+START_TESTCASE			PDP-ControlPlane-0028
+//! @SYMTestCaseID		PDP-ControlPlane-0028
+//! @SYMTestCaseDesc  Validating notifications on the PDP tier
+//! @SYMPREQ 2624
+//! @SYMTestActions         Creating server connection to PDP tier, opening connections on SIM1/SIM2. 
+//! @SYMTestExpectedResults Validating that notifications are received when a connection is opened on SIM1/SIM2
+//! @SYMTestPriority High
+//! @SYMTestStatus Under development
+//! @SYMTestType UT
+
+// start simtsy
+RUN_TEST_STEP 100 te_esockteststepsSuite StartSimTSYStep  z:\testdata\configs\te_controlplanenetworkside_test28.ini SimTsy
+
+// create and open the first connection
+RUN_TEST_STEP 100 te_esockteststepsSuite creatersocketservStep z:\testdata\configs\te_controlplanenetworkside_test28.ini CreateSockSvr1
+RUN_TEST_STEP 100 te_esockteststepsSuite connectrsocketservStep z:\testdata\configs\te_controlplanenetworkside_test28.ini ConnectSockSvr1
+RUN_TEST_STEP 100 te_esockteststepsSuite createrconnectionStep z:\testdata\configs\te_controlplanenetworkside_test28.ini CreateConn1
+RUN_TEST_STEP 100 te_esockteststepsSuite openrconnectionStep z:\testdata\configs\te_controlplanenetworkside_test28.ini OpenConn1
+
+// Connect at *link* tier
+RUN_TEST_STEP 100 te_esockteststepsSuite CreateRConnectionServStep z:\testdata\configs\te_controlplanenetworkside_test28.ini CreateConnectionServA
+RUN_TEST_STEP 100 te_esockteststepsSuite ConnectRConnectionServStep z:\testdata\configs\te_controlplanenetworkside_test28.ini ConnectConnectionServA
+RUN_TEST_STEP 100 te_esockteststepsSuite CreateRConnectionServStep z:\testdata\configs\te_controlplanenetworkside_test28.ini CreateConnectionServS
+RUN_TEST_STEP 100 te_esockteststepsSuite ConnectRConnectionServStep z:\testdata\configs\te_controlplanenetworkside_test28.ini ConnectConnectionServS
+
+// Request all changes to AP active status
+RUN_TEST_STEP 100 te_esockteststepsSuite RequestAccessPointNotificationStep z:\testdata\configs\te_controlplanenetworkside_test28.ini APNotificationRequest1A
+RUN_TEST_STEP 100 te_esockteststepsSuite RequestAccessPointNotificationStep z:\testdata\configs\te_controlplanenetworkside_test28.ini APNotificationRequest1S
+
+// Start connection on bearer and detect change at AP
+RUN_TEST_STEP 100 te_esockteststepsSuite startrconnectionStep z:\testdata\configs\te_controlplanenetworkside_test28.ini StartConn1_1
+RUN_TEST_STEP 100 te_esockteststepsSuite ReceiveAccessPointNotificationStep z:\testdata\configs\te_controlplanenetworkside_test28.ini ReceiveNotification1A
+RUN_TEST_STEP 100 te_esockteststepsSuite ReceiveAccessPointNotificationStep z:\testdata\configs\te_controlplanenetworkside_test28.ini ReceiveNotification1S
+
+// Stop connection and detect change at AP
+RUN_TEST_STEP 100 te_esockteststepsSuite stoprconnectionStep z:\testdata\configs\te_controlplanenetworkside_test28.ini StopConn1_1
+RUN_TEST_STEP 100 te_esockteststepsSuite SetPacketDataAccessPointAvailabilityStep z:\testdata\configs\te_controlplanenetworkside_test29.ini SetSimTsyUnavailable
+RUN_TEST_STEP 100 te_esockteststepsSuite ReceiveAccessPointNotificationStep z:\testdata\configs\te_controlplanenetworkside_test28.ini ReceiveNotification2A
+RUN_TEST_STEP 100 te_esockteststepsSuite ReceiveAccessPointNotificationStep z:\testdata\configs\te_controlplanenetworkside_test28.ini ReceiveNotification2S
+
+
+// Cancel the notification request
+RUN_TEST_STEP 100 te_esockteststepsSuite CancelAccessPointNotificationStep z:\testdata\configs\te_controlplanenetworkside_test28.ini CancelAPNotifRequestA
+RUN_TEST_STEP 100 te_esockteststepsSuite CancelAccessPointNotificationStep z:\testdata\configs\te_controlplanenetworkside_test28.ini CancelAPNotifRequestS
+
+// Clean up connections
+RUN_TEST_STEP 100 te_esockteststepsSuite closerconnectionStep z:\testdata\configs\te_controlplanenetworkside_test28.ini CloseConn1
+
+// Close and cleanup resources
+RUN_TEST_STEP 100 te_esockteststepsSuite CloseRConnectionServStep z:\testdata\configs\te_controlplanenetworkside_test28.ini CloseConnectionServA
+RUN_TEST_STEP 100 te_esockteststepsSuite CloseRConnectionServStep z:\testdata\configs\te_controlplanenetworkside_test28.ini CloseConnectionServS
+RUN_TEST_STEP 100 te_esockteststepsSuite closersocketservStep z:\testdata\configs\te_controlplanenetworkside_test28.ini CloseSockSvr1
+RUN_TEST_STEP 100 te_esockteststepsSuite cleanallStep
+
+// stop simtsy
+RUN_TEST_STEP 100 te_esockteststepsSuite StopSimTSYStep z:\testdata\configs\te_controlplanenetworkside_test28.ini SimTsy
+
+// Shutdown
+RUN_SCRIPT Z:\TestData\Scripts\te_esock_test_stopallinterfaces.script
+RUN_SCRIPT Z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+END_TESTCASE			PDP-ControlPlane-0028
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/pdplayer/test/controlplane/scripts/te_pdp-controlplane29.script	Fri Feb 19 23:59:33 2010 +0200
@@ -0,0 +1,90 @@
+//
+// Copyright (c) 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+PRINT Running CASE29
+PRINT Validating AP Queries on the PDP tier.
+
+//
+LOAD_SUITE te_esockteststepsSuite -SharedData
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+
+START_TESTCASE			PDP-ControlPlane-0029
+//! @SYMTestCaseID		PDP-ControlPlane-0029
+//! @SYMTestCaseDesc  Validating AP Queries on the PDP tier.
+//! @SYMPREQ 2624
+//! @SYMTestActions         Creating server connection, opening connections on SIM1/SIM2 validating AP Query for PDP Tier.
+//! @SYMTestExpectedResults AP Queries successful.
+//! @SYMTestPriority High
+//! @SYMTestStatus Under development
+//! @SYMTestType UT
+
+// start simtsy
+RUN_TEST_STEP 100 te_esockteststepsSuite StartSimTSYStep  z:\testdata\configs\te_controlplanenetworkside_test29.ini SimTsy
+
+// create and open the first connection
+RUN_TEST_STEP 100 te_esockteststepsSuite creatersocketservStep z:\testdata\configs\te_controlplanenetworkside_test29.ini CreateSockSvr1
+RUN_TEST_STEP 100 te_esockteststepsSuite connectrsocketservStep z:\testdata\configs\te_controlplanenetworkside_test29.ini ConnectSockSvr1
+RUN_TEST_STEP 100 te_esockteststepsSuite createrconnectionStep z:\testdata\configs\te_controlplanenetworkside_test29.ini CreateConn1
+RUN_TEST_STEP 100 te_esockteststepsSuite openrconnectionStep z:\testdata\configs\te_controlplanenetworkside_test29.ini OpenConn1
+
+// Connect at *link* tier
+RUN_TEST_STEP 100 te_esockteststepsSuite CreateRConnectionServStep z:\testdata\configs\te_controlplanenetworkside_test29.ini CreateConnectionServ1
+RUN_TEST_STEP 100 te_esockteststepsSuite ConnectRConnectionServStep z:\testdata\configs\te_controlplanenetworkside_test29.ini ConnectConnectionServ1
+
+// Make first *link* AP unavailable *AP2*
+RUN_TEST_STEP 100 te_esockteststepsSuite SetPacketDataAccessPointAvailabilityStep z:\testdata\configs\te_controlplanenetworkside_test29.ini SetSimTsyAvailable
+
+RUN_TEST_STEP 100 te_esockteststepsSuite AccessPointStatusQueryStep z:\testdata\configs\te_controlplanenetworkside_test29.ini APQuery1
+
+// Make first *link* AP available *AP2*
+RUN_TEST_STEP 100 te_esockteststepsSuite SetPacketDataAccessPointAvailabilityStep z:\testdata\configs\te_controlplanenetworkside_test29.ini SetSimTsyUnavailable
+
+RUN_TEST_STEP 100 te_esockteststepsSuite AccessPointStatusQueryStep z:\testdata\configs\te_controlplanenetworkside_test29.ini APQuery1a
+
+// Start connection on bearer and detect change at AP
+RUN_TEST_STEP 100 te_esockteststepsSuite startrconnectionStep z:\testdata\configs\te_controlplanenetworkside_test29.ini StartConn1_1
+// This will tell us the number of started APs (1) and its id.
+RUN_TEST_STEP 100 te_esockteststepsSuite AccessPointStatusQueryStep z:\testdata\configs\te_controlplanenetworkside_test29.ini APQuery2
+
+// Clean up connections
+
+RUN_TEST_STEP 100 te_esockteststepsSuite stoprconnectionStep z:\testdata\configs\te_controlplanenetworkside_test29.ini StopConn1_1
+RUN_TEST_STEP 100 te_esockteststepsSuite SetPacketDataAccessPointAvailabilityStep z:\testdata\configs\te_controlplanenetworkside_test29.ini SetSimTsyUnavailable
+
+RUN_TEST_STEP 100 te_esockteststepsSuite AccessPointStatusQueryStep z:\testdata\configs\te_controlplanenetworkside_test29.ini APQuery1a
+
+RUN_TEST_STEP 100 te_esockteststepsSuite closerconnectionStep z:\testdata\configs\te_controlplanenetworkside_test29.ini CloseConn1
+
+// Close and cleanup resources
+RUN_TEST_STEP 100 te_esockteststepsSuite CloseRConnectionServStep z:\testdata\configs\te_controlplanenetworkside_test29.ini CloseConnectionServ1
+RUN_TEST_STEP 100 te_esockteststepsSuite closersocketservStep z:\testdata\configs\te_controlplanenetworkside_test29.ini CloseSockSvr1
+RUN_TEST_STEP 100 te_esockteststepsSuite cleanallStep
+
+// stop simtsy
+RUN_TEST_STEP 100 te_esockteststepsSuite StopSimTSYStep z:\testdata\configs\te_controlplanenetworkside_test29.ini SimTsy
+
+// Shutdown
+RUN_SCRIPT Z:\TestData\Scripts\te_esock_test_stopallinterfaces.script
+RUN_SCRIPT Z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+END_TESTCASE			PDP-ControlPlane-0029
+
+
+
+
+
+
--- a/telephonyprotocols/pdplayer/umts/spudtel/src/eteldriverstrategies.cpp	Tue Feb 02 01:41:59 2010 +0200
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/eteldriverstrategies.cpp	Fri Feb 19 23:59:33 2010 +0200
@@ -1122,7 +1122,7 @@
                         {
                         if (errTsy == KErrNone)
                         	{
-                        	err = KErrNone;
+                        	err = KErrCompletion;
                         	}
                         else if ((errTsy & 0xFFFF0000) != 0xFFFF0000)
                             {
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide.ini	Tue Feb 02 01:41:59 2010 +0200
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide.ini	Fri Feb 19 23:59:33 2010 +0200
@@ -410,3 +410,23 @@
 ParametersType = UmtsR99QoSAndOnTableRecord
 ParametersRecordId = 2
 PolicySelector = 1
+
+[PrimaryActivationEndUpWithInactiveContext]
+SimTsyTestNum = 103
+PrimaryIapId1 = 2
+PrimaryActivationErr1 = -17
+
+[PrimaryActivationEndUpWithInactiveContext2]
+SimTsyTestNum = 104
+PrimaryIapId1 = 2
+PrimaryActivationErr1 = -2
+
+[PrimaryActivationEndUpWithInactiveContext3]
+SimTsyTestNum = 105
+PrimaryIapId1 = 2
+PrimaryActivationErr1 = -65536
+
+[PrimaryActivationEndUpWithInactiveContext4]
+SimTsyTestNum = 106
+PrimaryIapId1 = 2
+PrimaryActivationErr1 = -17
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide_config_9x.txt	Tue Feb 02 01:41:59 2010 +0200
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide_config_9x.txt	Fri Feb 19 23:59:33 2010 +0200
@@ -2566,3 +2566,297 @@
 NotifyContextStatusChange = SECONDARY1, 0, 5
 NotifyContextStatusChange = SECONDARY1, 0, 3
 
+
+############################################################################
+############################################################################
+###################              T E S T 103	        ####################
+############################################################################
+############################################################################
+# Test case for the case when context becomes inactive during activation and the error returned to PDP is KErrNone. This will be translated to 
+
+KErrCompletion
+############################################################################
+[test103]
+# DefaultContextparamGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <PdpDataCompression>, <TAnonymousAccess>, <TUseEdge>
+# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
+# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
+DefaultContextparamGPRS= 3, SYMBIAN EMPLOYEE INTRANET, A WAP PORTAL, 2, 1, 1, 1, USER2, PASSWORD2, NULL, NULL, PRIMARYSERVER2, SECONDARYSERVER2, 
+
+2
+
+# ContextConfigGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <PdpDataCompression>, <TAnonymousAccess>, <TUseEdge>
+# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
+# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
+SetContextConfigGPRS = 0,Test,,0,2,0,1,RasUser,,,,,,1
+# TRel99ContextConfig = <TName iContextName>,  <TUint iActivatePause>, <TUint iActivateErrorCode>, <TUint iDeactivatePause>, 
+# <TUint iDeactivateErrorCode>, <TUint iDeletionPause>, <TUint iDeletionErrorCode> <TBool iConnectToNtRas>
+R99ContextConfig = PRIMARY1, 0, -600, 0, 0, 0, 0, 0
+
+
+# TFTfilter = 0<id> 1<evaluationPrecedenceIndex> 2<srcAddr> 3<srcAddrSubnetMask>  4<protocolNumberOrNextHeader>
+#	      5<srcPortMin> 6<srcPortMax> 7<destPortMin> 8<destPortMax> 9<ipSecSPI> 10<toSorTrafficClass>
+#	      11<flowLabel>
+TFTfilter = 1, 96, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.1, 255.255.255.255.255.255.255.255.255.255.255.255.255.255.255.255, 17, 3461, 3461, 
+
+1031, 1031, 0, 0, 0
+TFTfilter = 1, 0, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.1, 255.255.255.255.255.255.255.255.255.255.255.255.255.255.255.255, 17, 3461, 3461, 1031, 
+
+1031, 0, 0, 0
+TFTfilter = 1, 1, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.1, 255.255.255.255.255.255.255.255.255.255.255.255.255.255.255.255, 17, 3461, 3461, 1031, 
+
+1031, 0, 0, 0
+
+#TProfileReqR99 = 0<contextName> 1<reqTraffic> 2<minTraffic> 3<reqDeliveryOrder> 4<minDeliveryOrder>
+#		  5<reqErroneousSDU> 6<minErroneousSDU> 7<maxSDUSize> 8<minSDUSize>
+#		 9<reqUpLinkBitRate> 10<reqDownLinkBitRate> 11<minUpLinkBitRate> 12<minDownLinkBitRate> 
+#		 
+#		 13<reqBitErrorRatio> 14<minBitErrorRatio> 15<reqSDUErrorRatio> 16<minSDUErrorRatio>
+#		 17<reqTrafficHandlingPriority> 18<minTrafficHandlingPriority>
+#		 19<reqTransferDelay> 20<minTransferDelay> 21<reqGuaranteedUpLinkBitRate> 22<reqGuaranteedDownLinkBitRate>
+#		 23<minGuaranteedUpLinkBitRate> 24<minGuaranteedDownLinkBitRate>
+QosProfileReqR99 = PRIMARY1,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0
+
+QosProfileReqR5 = PRIMARY1,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0, 0
+
+
+
+#TProfileNegR99 =<contextName> <duration> <negTraffic> <negDeliveryOrder> <negErroneousSDUDelivery> <negMaxSDUSize>
+#		 <negBitErrorRatio> <negSDUErrorRatio> <negTrafficHandlingPriority>
+#		 <negTransferDelay> <negGuaranteedUpLinkBitRate> <negGuaranteedDownLinkBitRate>
+#		 <negMaxUpLinkRate> <negMaxDownLinkRate> 
+QosProfileNegR99 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
+QosProfileNegR99 = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
+
+QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
+QosProfileNegR5 = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
+
+# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
+CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::502, 18, 0, PRIMARY1
+
+
+############################################################################
+# failure events
+# Configure the context's status to be changed using publish and subscribe
+NotifyContextStatusChangeType = PublishSubscribe
+# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
+
+# EStatusDeactivating = 4 EStatusInactive = 1 EStatusDeleted = 6
+
+############################################################################
+############################################################################
+###################              T E S T 104	        ####################
+############################################################################
+############################################################################
+# Test case for the case when context becomes inactive during activation and the error returned to PDP is KErrGeneral
+############################################################################
+[test104]
+# DefaultContextparamGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <PdpDataCompression>, <TAnonymousAccess>, <TUseEdge>
+# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
+# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
+DefaultContextparamGPRS= 3, SYMBIAN EMPLOYEE INTRANET, A WAP PORTAL, 2, 1, 1, 1, USER2, PASSWORD2, NULL, NULL, PRIMARYSERVER2, SECONDARYSERVER2, 
+
+2
+
+# ContextConfigGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <PdpDataCompression>, <TAnonymousAccess>, <TUseEdge>
+# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
+# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
+SetContextConfigGPRS = 0,Test,,0,2,0,1,RasUser,,,,,,1
+# TRel99ContextConfig = <TName iContextName>,  <TUint iActivatePause>, <TUint iActivateErrorCode>, <TUint iDeactivatePause>, 
+# <TUint iDeactivateErrorCode>, <TUint iDeletionPause>, <TUint iDeletionErrorCode> <TBool iConnectToNtRas>
+R99ContextConfig = PRIMARY1, 0, -602, 0, 0, 0, 0, 0
+
+
+# TFTfilter = 0<id> 1<evaluationPrecedenceIndex> 2<srcAddr> 3<srcAddrSubnetMask>  4<protocolNumberOrNextHeader>
+#	      5<srcPortMin> 6<srcPortMax> 7<destPortMin> 8<destPortMax> 9<ipSecSPI> 10<toSorTrafficClass>
+#	      11<flowLabel>
+TFTfilter = 1, 96, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.1, 255.255.255.255.255.255.255.255.255.255.255.255.255.255.255.255, 17, 3461, 3461, 
+
+1031, 1031, 0, 0, 0
+TFTfilter = 1, 0, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.1, 255.255.255.255.255.255.255.255.255.255.255.255.255.255.255.255, 17, 3461, 3461, 1031, 
+
+1031, 0, 0, 0
+TFTfilter = 1, 1, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.1, 255.255.255.255.255.255.255.255.255.255.255.255.255.255.255.255, 17, 3461, 3461, 1031, 
+
+1031, 0, 0, 0
+
+#TProfileReqR99 = 0<contextName> 1<reqTraffic> 2<minTraffic> 3<reqDeliveryOrder> 4<minDeliveryOrder>
+#		  5<reqErroneousSDU> 6<minErroneousSDU> 7<maxSDUSize> 8<minSDUSize>
+#		 9<reqUpLinkBitRate> 10<reqDownLinkBitRate> 11<minUpLinkBitRate> 12<minDownLinkBitRate> 
+#		 
+#		 13<reqBitErrorRatio> 14<minBitErrorRatio> 15<reqSDUErrorRatio> 16<minSDUErrorRatio>
+#		 17<reqTrafficHandlingPriority> 18<minTrafficHandlingPriority>
+#		 19<reqTransferDelay> 20<minTransferDelay> 21<reqGuaranteedUpLinkBitRate> 22<reqGuaranteedDownLinkBitRate>
+#		 23<minGuaranteedUpLinkBitRate> 24<minGuaranteedDownLinkBitRate>
+QosProfileReqR99 = PRIMARY1,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0
+
+QosProfileReqR5 = PRIMARY1,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0, 0
+
+
+
+#TProfileNegR99 =<contextName> <duration> <negTraffic> <negDeliveryOrder> <negErroneousSDUDelivery> <negMaxSDUSize>
+#		 <negBitErrorRatio> <negSDUErrorRatio> <negTrafficHandlingPriority>
+#		 <negTransferDelay> <negGuaranteedUpLinkBitRate> <negGuaranteedDownLinkBitRate>
+#		 <negMaxUpLinkRate> <negMaxDownLinkRate> 
+QosProfileNegR99 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
+QosProfileNegR99 = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
+
+QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
+QosProfileNegR5 = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
+
+# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
+CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::502, 18, 0, PRIMARY1
+
+
+############################################################################
+# failure events
+# Configure the context's status to be changed using publish and subscribe
+NotifyContextStatusChangeType = PublishSubscribe
+# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
+
+# EStatusDeactivating = 4 EStatusInactive = 1 EStatusDeleted = 6
+
+############################################################################
+############################################################################
+###################              T E S T 105	        ####################
+############################################################################
+############################################################################
+# Test case for the case when context becomes inactive during activation and the error returned to PDP is tsy extended error code.
+############################################################################
+[test105]
+# DefaultContextparamGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <PdpDataCompression>, <TAnonymousAccess>, <TUseEdge>
+# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
+# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
+DefaultContextparamGPRS= 3, SYMBIAN EMPLOYEE INTRANET, A WAP PORTAL, 2, 1, 1, 1, USER2, PASSWORD2, NULL, NULL, PRIMARYSERVER2, SECONDARYSERVER2, 
+
+2
+
+# ContextConfigGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <PdpDataCompression>, <TAnonymousAccess>, <TUseEdge>
+# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
+# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
+SetContextConfigGPRS = 0,Test,,0,2,0,1,RasUser,,,,,,1
+# TRel99ContextConfig = <TName iContextName>,  <TUint iActivatePause>, <TUint iActivateErrorCode>, <TUint iDeactivatePause>, 
+# <TUint iDeactivateErrorCode>, <TUint iDeletionPause>, <TUint iDeletionErrorCode> <TBool iConnectToNtRas>
+R99ContextConfig = PRIMARY1, 0, -401, 0, 0, 0, 0, 0
+
+
+# TFTfilter = 0<id> 1<evaluationPrecedenceIndex> 2<srcAddr> 3<srcAddrSubnetMask>  4<protocolNumberOrNextHeader>
+#	      5<srcPortMin> 6<srcPortMax> 7<destPortMin> 8<destPortMax> 9<ipSecSPI> 10<toSorTrafficClass>
+#	      11<flowLabel>
+TFTfilter = 1, 96, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.1, 255.255.255.255.255.255.255.255.255.255.255.255.255.255.255.255, 17, 3461, 3461, 
+
+1031, 1031, 0, 0, 0
+TFTfilter = 1, 0, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.1, 255.255.255.255.255.255.255.255.255.255.255.255.255.255.255.255, 17, 3461, 3461, 1031, 
+
+1031, 0, 0, 0
+TFTfilter = 1, 1, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.1, 255.255.255.255.255.255.255.255.255.255.255.255.255.255.255.255, 17, 3461, 3461, 1031, 
+
+1031, 0, 0, 0
+
+#TProfileReqR99 = 0<contextName> 1<reqTraffic> 2<minTraffic> 3<reqDeliveryOrder> 4<minDeliveryOrder>
+#		  5<reqErroneousSDU> 6<minErroneousSDU> 7<maxSDUSize> 8<minSDUSize>
+#		 9<reqUpLinkBitRate> 10<reqDownLinkBitRate> 11<minUpLinkBitRate> 12<minDownLinkBitRate> 
+#		 
+#		 13<reqBitErrorRatio> 14<minBitErrorRatio> 15<reqSDUErrorRatio> 16<minSDUErrorRatio>
+#		 17<reqTrafficHandlingPriority> 18<minTrafficHandlingPriority>
+#		 19<reqTransferDelay> 20<minTransferDelay> 21<reqGuaranteedUpLinkBitRate> 22<reqGuaranteedDownLinkBitRate>
+#		 23<minGuaranteedUpLinkBitRate> 24<minGuaranteedDownLinkBitRate>
+QosProfileReqR99 = PRIMARY1,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0
+
+QosProfileReqR5 = PRIMARY1,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0, 0
+
+
+
+#TProfileNegR99 =<contextName> <duration> <negTraffic> <negDeliveryOrder> <negErroneousSDUDelivery> <negMaxSDUSize>
+#		 <negBitErrorRatio> <negSDUErrorRatio> <negTrafficHandlingPriority>
+#		 <negTransferDelay> <negGuaranteedUpLinkBitRate> <negGuaranteedDownLinkBitRate>
+#		 <negMaxUpLinkRate> <negMaxDownLinkRate> 
+QosProfileNegR99 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
+QosProfileNegR99 = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
+
+QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
+QosProfileNegR5 = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
+
+# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
+CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::502, 18, 0, PRIMARY1
+
+
+############################################################################
+# failure events
+# Configure the context's status to be changed using publish and subscribe
+NotifyContextStatusChangeType = PublishSubscribe
+# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
+
+# EStatusDeactivating = 4 EStatusInactive = 1 EStatusDeleted = 6
+
+############################################################################
+############################################################################
+###################              T E S T 106	        ####################
+############################################################################
+############################################################################
+# Test case for the case when context becomes inactive during activation and get last error function returns an error.
+############################################################################
+[test106]
+# DefaultContextparamGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <PdpDataCompression>, <TAnonymousAccess>, <TUseEdge>
+# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
+# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
+DefaultContextparamGPRS= 3, SYMBIAN EMPLOYEE INTRANET, A WAP PORTAL, 2, 1, 1, 1, USER2, PASSWORD2, NULL, NULL, PRIMARYSERVER2, SECONDARYSERVER2, 
+
+2
+
+# ContextConfigGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <PdpDataCompression>, <TAnonymousAccess>, <TUseEdge>
+# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
+# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
+SetContextConfigGPRS = 0,Test,,0,2,0,1,RasUser,,,,,,1
+# TRel99ContextConfig = <TName iContextName>,  <TUint iActivatePause>, <TUint iActivateErrorCode>, <TUint iDeactivatePause>, 
+# <TUint iDeactivateErrorCode>, <TUint iDeletionPause>, <TUint iDeletionErrorCode> <TBool iConnectToNtRas>
+R99ContextConfig = PRIMARY1, 0, -300, 0, 0, 0, 0, 0
+
+
+# TFTfilter = 0<id> 1<evaluationPrecedenceIndex> 2<srcAddr> 3<srcAddrSubnetMask>  4<protocolNumberOrNextHeader>
+#	      5<srcPortMin> 6<srcPortMax> 7<destPortMin> 8<destPortMax> 9<ipSecSPI> 10<toSorTrafficClass>
+#	      11<flowLabel>
+TFTfilter = 1, 96, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.1, 255.255.255.255.255.255.255.255.255.255.255.255.255.255.255.255, 17, 3461, 3461, 
+
+1031, 1031, 0, 0, 0
+TFTfilter = 1, 0, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.1, 255.255.255.255.255.255.255.255.255.255.255.255.255.255.255.255, 17, 3461, 3461, 1031, 
+
+1031, 0, 0, 0
+TFTfilter = 1, 1, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.1, 255.255.255.255.255.255.255.255.255.255.255.255.255.255.255.255, 17, 3461, 3461, 1031, 
+
+1031, 0, 0, 0
+
+#TProfileReqR99 = 0<contextName> 1<reqTraffic> 2<minTraffic> 3<reqDeliveryOrder> 4<minDeliveryOrder>
+#		  5<reqErroneousSDU> 6<minErroneousSDU> 7<maxSDUSize> 8<minSDUSize>
+#		 9<reqUpLinkBitRate> 10<reqDownLinkBitRate> 11<minUpLinkBitRate> 12<minDownLinkBitRate> 
+#		 
+#		 13<reqBitErrorRatio> 14<minBitErrorRatio> 15<reqSDUErrorRatio> 16<minSDUErrorRatio>
+#		 17<reqTrafficHandlingPriority> 18<minTrafficHandlingPriority>
+#		 19<reqTransferDelay> 20<minTransferDelay> 21<reqGuaranteedUpLinkBitRate> 22<reqGuaranteedDownLinkBitRate>
+#		 23<minGuaranteedUpLinkBitRate> 24<minGuaranteedDownLinkBitRate>
+QosProfileReqR99 = PRIMARY1,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0
+
+QosProfileReqR5 = PRIMARY1,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0, 0
+
+
+
+#TProfileNegR99 =<contextName> <duration> <negTraffic> <negDeliveryOrder> <negErroneousSDUDelivery> <negMaxSDUSize>
+#		 <negBitErrorRatio> <negSDUErrorRatio> <negTrafficHandlingPriority>
+#		 <negTransferDelay> <negGuaranteedUpLinkBitRate> <negGuaranteedDownLinkBitRate>
+#		 <negMaxUpLinkRate> <negMaxDownLinkRate> 
+QosProfileNegR99 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
+QosProfileNegR99 = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
+
+QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
+QosProfileNegR5 = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
+
+# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
+CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::502, 18, 0, PRIMARY1
+
+
+############################################################################
+# failure events
+# Configure the context's status to be changed using publish and subscribe
+NotifyContextStatusChangeType = PublishSubscribe
+# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
+
+# EStatusDeactivating = 4 EStatusInactive = 1 EStatusDeleted = 6
\ No newline at end of file
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/TE_spudNetworkSide.script	Tue Feb 02 01:41:59 2010 +0200
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/TE_spudNetworkSide.script	Fri Feb 19 23:59:33 2010 +0200
@@ -481,7 +481,78 @@
 END_TESTCASE            NET-Spud-NetworkSide-0825
 
 run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
+run_script z:\TestData\scripts\te_esock_test_loadesock.script
 
+// Unusual cases tests. This happens if TSY acting wrong.
+
+START_TESTCASE          NET-Spud-NetworkSide-0826
+//! @SYMTestCaseID      NET-Spud-NetworkSide-0826
+//! @SYMTestCaseDesc Sanity check: Primary context activation ends up with inactive context.
+//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
+//! @SYMTestActions Activate a primary PDP context, simtsy is set up to make context activation end up with an inactive context but return error code = KErrNone. SpudTel should treat this situation accordingly and return KErrCompletion.
+//! @SYMTestExpectedResults  Primary context activation should return KErrCompletion.
+//! @SYMTestPriority Normal
+//! @SYMTestStatus Implemented
+//! @SYMTestType CIT
+RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryActivationEndUpWithInactiveContext
+DELAY 3000
+RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
+END_TESTCASE            NET-Spud-NetworkSide-0826
+
+run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
+run_script z:\TestData\scripts\te_esock_test_loadesock.script
+
+START_TESTCASE          NET-Spud-NetworkSide-0827
+//! @SYMTestCaseID      NET-Spud-NetworkSide-0827
+//! @SYMTestCaseDesc  Sanity check: Primary context activation ends up with inactive context.
+//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
+//! @SYMTestActions Activate a primary PDP context, simtsy is set up to make context activation end up with an inactive context but return error code = KErrGeneral. SpudTel should treat this situation accordingly and return KErrGeneral.
+//! @SYMTestExpectedResults  Primary context activation should return KErrGeneral.
+//! @SYMTestPriority Normal
+//! @SYMTestStatus Implemented
+//! @SYMTestType CIT
+RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryActivationEndUpWithInactiveContext2
+DELAY 3000
+RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
+END_TESTCASE            NET-Spud-NetworkSide-0827
+
+run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
+run_script z:\TestData\scripts\te_esock_test_loadesock.script
+
+START_TESTCASE          NET-Spud-NetworkSide-0828
+//! @SYMTestCaseID      NET-Spud-NetworkSide-0828
+//! @SYMTestCaseDesc  Sanity check: Primary context activation ends up with inactive context.
+//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
+//! @SYMTestActions Activate a primary PDP context, simtsy is set up to make context activation end up with an inactive context but return an extended error code. SpudTel should treat this situation accordingly and return that extended error code.
+//! @SYMTestExpectedResults  Primary context activation should return -65536.
+//! @SYMTestPriority Normal
+//! @SYMTestStatus Implemented
+//! @SYMTestType CIT
+RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryActivationEndUpWithInactiveContext3
+DELAY 3000
+RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
+END_TESTCASE            NET-Spud-NetworkSide-0828
+
+run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
+run_script z:\TestData\scripts\te_esock_test_loadesock.script
+
+//The following testcase is for covering all the corner of the code for the case when primary context activation ends up with inactive context.
+
+START_TESTCASE          NET-Spud-NetworkSide-0829
+//! @SYMTestCaseID      NET-Spud-NetworkSide-0829
+//! @SYMTestCaseDesc  Sanity check: Primary context activation ends up with inactive context.
+//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
+//! @SYMTestActions Activate a primary PDP context, simtsy is set up to make context activation end up with an inactive context. The function GetLastErrorCause, which is used for getting the last error code, will complete with KErrGeneral. 
+//! @SYMTestExpectedResults  Primary context activation should return KErrCompletion.
+//! @SYMTestPriority Normal
+//! @SYMTestStatus Implemented
+//! @SYMTestType CIT
+RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryActivationEndUpWithInactiveContext4
+DELAY 3000
+RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
+END_TESTCASE            NET-Spud-NetworkSide-0829
+
+run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
 
 RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
 RUN_UTILS  MakeReadWrite c:\config.txt
--- a/telephonyprotocols/qos3gppcpr/inc/Qos3GPP_subconparams.h	Tue Feb 02 01:41:59 2010 +0200
+++ b/telephonyprotocols/qos3gppcpr/inc/Qos3GPP_subconparams.h	Fri Feb 19 23:59:33 2010 +0200
@@ -28,7 +28,12 @@
 #include <es_sock.h>
 #include <comms-infras/metadata.h>
 #include <comms-infras/metatype.h>
+
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
 #include <etelqos.h>
+#else
+#include <eteldefaultqos.h>
+#endif
 #include <comms-infras/es_parameterfamily.h>
 
 const TInt KSubCon3GPPExtParamsFactoryUid = 0x1020D460;
--- a/telephonyserver/etelpacketdata/group/bld.inf	Tue Feb 02 01:41:59 2010 +0200
+++ b/telephonyserver/etelpacketdata/group/bld.inf	Fri Feb 19 23:59:33 2010 +0200
@@ -22,6 +22,7 @@
 PRJ_EXPORTS
 ../inc/etelpckt.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(etelpckt.h)
 ../inc/etelQoS.h 			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(etelqos.h)
+../inc/eteldefaultqos.h 	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(eteldefaultqos.h)
 ../inc/pcktlist.h 			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(pcktlist.h)
 ../inc/pcktretrieve.h 		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(pcktretrieve.h)
 ../inc/mbmstypes.h 			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mbmstypes.h)
--- a/telephonyserver/etelpacketdata/inc/etelQoS.h	Tue Feb 02 01:41:59 2010 +0200
+++ b/telephonyserver/etelpacketdata/inc/etelQoS.h	Fri Feb 19 23:59:33 2010 +0200
@@ -17,10 +17,10 @@
 // Copyright (c) Symbian Software Ltd. 2002-2009.  All rights reserved.
 // 
 //
-
+#ifndef __ETELQOS_H__
+#define __ETELQOS_H__
 
-#if!defined(__ETELQOS_H__)
-#define __ETELQOS_H__
+#ifndef __ETELDEFAULTQOS_H__
 
 #include "etelpckt.h"
 
@@ -753,3 +753,4 @@
 
 #endif
 	
+#endif
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserver/etelpacketdata/inc/eteldefaultqos.h	Fri Feb 19 23:59:33 2010 +0200
@@ -0,0 +1,103 @@
+// Copyright (c) 2007-2009 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+#ifndef __ETELDEFAULTQOS_H__
+#define __ETELDEFAULTQOS_H__
+
+#ifndef __ETELQOS_H__
+
+class RPacketQoS
+    {
+    // The enums TTrafficClass, TDeliveryOrder,TErroneousSDUDelivery, TBitErrorRatio,
+     // TSDUErrorRatio, TTrafficHandlingPriority have been assigned values because
+     // the same enums are used both in the TQoSR99_R4Requested / Negotiated classes and 
+     // in the TQoSCapsR99_R4 class. The Caps class has to indicate which, for instance, 
+     // traffic classes are supported in a bitfield, so the enums have been defined as 
+     // different bits in a bit field.
+public: 
+    enum TTrafficClass          
+         {
+         ETrafficClassUnspecified    = 0x01,     //< Traffic class - Unspecified
+         ETrafficClassConversational = 0x02,     //< Traffic class - Conversational
+         ETrafficClassStreaming      = 0x04,     //< Traffic class - Streaming
+         ETrafficClassInteractive    = 0x08,     //< Traffic class - Interactive
+         ETrafficClassBackground     = 0x10      //< Traffic class - Background
+         };
+
+     enum TDeliveryOrder     
+         {
+         EDeliveryOrderUnspecified   = 0x01,     //< SDU Delivery order - Unspecified
+         EDeliveryOrderRequired      = 0x02,     //< SDU Delivery order - Required to be in sequence
+         EDeliveryOrderNotRequired   = 0x04      //< SDU Delivery order - Not Required to be in sequence
+         };
+
+     enum TErroneousSDUDelivery      // Erroneous SDU Delivery
+         {
+         EErroneousSDUDeliveryUnspecified    = 0x01, //< Unspecified
+         EErroneousSDUNoDetection            = 0x02, //< Erroneous SDUs delivered - Error detection not considered.
+         EErroneousSDUDeliveryRequired       = 0x04, //< Erroneous SDUs delivered + error indication - Error detection employed.
+         EErroneousSDUDeliveryNotRequired    = 0x08  //< Erroneous SDUs discarded - Error detection is employed.
+         };
+
+     enum TBitErrorRatio             // Residual Bit Error Rate
+         {
+         EBERUnspecified             = 0x01,     //< Target residual undetected BER - Unspecified
+         EBERFivePerHundred          = 0x02,     //< Target residual BER - 0.05
+         EBEROnePerHundred           = 0x04,     //< Target residual BER - 0.01
+         EBERFivePerThousand         = 0x08,     //< Target residual BER - 0.005
+         EBERFourPerThousand         = 0x10,     //< Target residual BER - 0.004
+         EBEROnePerThousand          = 0x20,     //< Target residual BER - 0.001
+         EBEROnePerTenThousand       = 0x40,     //< Target residual BER - 0.0001
+         EBEROnePerHundredThousand   = 0x80,     //< Target residual BER - 0.00001
+         EBEROnePerMillion           = 0x100,    //< Target residual BER - 0.000001
+         EBERSixPerHundredMillion    = 0x200     //< Target residual BER - 0.00000006
+         };
+
+     enum TSDUErrorRatio             // SDU Error Ratio
+         {
+         ESDUErrorRatioUnspecified           = 0x01, //< Target value of Erroneous SDUs - Unspecified
+         ESDUErrorRatioOnePerTen             = 0x02, //< Target SDU error ratio - 0.1
+         ESDUErrorRatioOnePerHundred         = 0x04, //< Target SDU error ratio - 0.01
+         ESDUErrorRatioSevenPerThousand      = 0x08, //< Target SDU error ratio - 0.007
+         ESDUErrorRatioOnePerThousand        = 0x10, //< Target SDU error ratio - 0.001
+         ESDUErrorRatioOnePerTenThousand     = 0x20, //< Target SDU error ratio - 0.0001
+         ESDUErrorRatioOnePerHundredThousand = 0x40, //< Target SDU error ratio - 0.00001
+         ESDUErrorRatioOnePerMillion         = 0x80  //< Target SDU error ratio - 0.000001
+         };
+
+     enum TTrafficHandlingPriority   // Traffic handling priority
+         {
+         ETrafficPriorityUnspecified = 0x01,     //< Unspecified Priority level
+         ETrafficPriority1           = 0x02,     //< Priority level 1
+         ETrafficPriority2           = 0x04,     //< Priority level 2
+         ETrafficPriority3           = 0x08      //< Priority level 3
+         };
+     /**
+      Source statistics descriptor - as defined in 3GPP TS 23.107 and TS 24.008.
+      
+      @publishedPartner
+      @released
+      */
+      enum TSourceStatisticsDescriptor    
+          {
+          /** Unknown source statistics descriptor. */
+          ESourceStatisticsDescriptorUnknown  = 0x0,      
+          /** Speech source statistics descriptor. */
+          ESourceStatisticsDescriptorSpeech   = 0x01,      
+          };
+    };
+
+#endif//#ifndef__ETELQOS_H__
+
+#endif//#ifndef__ETELDEFAULTQOS_H__
--- a/telephonyserver/etelserverandcore/group/BLD.INF	Tue Feb 02 01:41:59 2010 +0200
+++ b/telephonyserver/etelserverandcore/group/BLD.INF	Fri Feb 19 23:59:33 2010 +0200
@@ -29,10 +29,10 @@
 ../INC/ET_PHONE.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(et_phone.h)
 ../INC/et_phone_util.h  SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(et_phone_util.h)
 ../INC/ET_PHONE.INL SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(et_phone.inl)
-../INC/ET_TSY.H SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(et_tsy.h)
+../INC/ET_TSY.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(et_tsy.h)
 ../INC/secure/ET_CLSVR.H SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(et_clsvr.h)
 ../INC/ET_STRUC.H SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(et_struc.h)
-../INC/et_struct.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(et_struct.h)
+../INC/et_struct.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(et_struct.h)
 ../INC/EXTERROR.H SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(exterror.h)
 ../INC/ETBUFFER.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(etbuffer.h)
 ../INC/etslotnum.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(etslotnum.h)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/common_tsy/test/component/group/component_test.pkg	Fri Feb 19 23:59:33 2010 +0200
@@ -0,0 +1,51 @@
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_onstore_individual.script"-"c:\testdata\scripts\te_ctsycomponent_onstore_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_packetservice_individual.script"-"c:\testdata\scripts\te_ctsycomponent_packetservice_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_phonebookstore_individual.script"-"c:\testdata\scripts\te_ctsycomponent_phonebookstore_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_packetqos_individual.script"-"c:\testdata\scripts\te_ctsycomponent_packetqos_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_networksecurity_individual.script"-"c:\testdata\scripts\te_ctsycomponent_networksecurity_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_networkcontrol_individual.script"-"c:\testdata\scripts\te_ctsycomponent_networkcontrol_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_packetcontext_individual.script"-"c:\testdata\scripts\te_ctsycomponent_packetcontext_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_airtimeduration_individual.script"-"c:\testdata\scripts\te_ctsycomponent_airtimeduration_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_alternatelineservice_individual.script"-"c:\testdata\scripts\te_ctsycomponent_alternatelineservice_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_phonepower_individual.script"-"c:\testdata\scripts\te_ctsycomponent_phonepower_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_phonesecurity_individual.script"-"c:\testdata\scripts\te_ctsycomponent_phonesecurity_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_personalisation_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_personalisation_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_alternatingcall_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_alternatingcall_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_apncontrollist_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_apncontrollist_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_authorisation_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_authorisation_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_featmgr_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_featmgr_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_systemstate_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_systemstate_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_callemergency_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_callemergency_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_callcontrol_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_callcontrol_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_callinformation_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_callinformation_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_telephonyaudiocontrol_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_telephonyaudiocontrol_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_onstore_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_onstore_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_broadcastmessaging_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_broadcastmessaging_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_callbarring_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_callbarring_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_callcompletion_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_callcompletion_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_callcost_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_callcost_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_eapauthentication_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_eapauthentication_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_mms_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_mms_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_fax_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_fax_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_fixeddialling_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_fixeddialling_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_ims_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_ims_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_indicator_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_indicator_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_lbs_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_lbs_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_mailboxnumbers_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_mailboxnumbers_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_messagewaiting_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_messagewaiting_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_enstore_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_enstore_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_mbmscontext_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_mbmscontext_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\group\commsdbg.ini"-"c:\logs\commsdbg.ini"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\cenrep_ini\102029A2.txt"-"c:\private\10202be9\102029A2.txt"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\cenrep_ini\10282DFE.txt"-"c:\private\10202be9\10282DFE.txt"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\cenrep_ini\10282826.txt"-"c:\private\10202be9\10282826.txt"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\cenrep_ini\10282827.txt"-"c:\private\10202be9\10282827.txt"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\testdata\standard.ini"-"c:\testdata\configs\standard.ini"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\testdata\testgetphoneid0001b.ini"-"c:\testdata\configs\testgetphoneid0001b.ini"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\testdata\testgetphoneid0001c.ini"-"c:\testdata\configs\testgetphoneid0001c.ini"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\testdata\testgetphoneid0001d.ini"-"c:\testdata\configs\testgetphoneid0001d.ini"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\testdata\testgetphoneid0001e.ini"-"c:\testdata\configs\testgetphoneid0001e.ini"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\testdata\testgetphoneid0001f.ini"-"c:\testdata\configs\testgetphoneid0001f.ini"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\testdata\testgetphoneid0001g.ini"-"c:\testdata\configs\testgetphoneid0001g.ini"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\testdata\testgetphoneid0001h.ini"-"c:\testdata\configs\testgetphoneid0001h.ini"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\testdata\testgetphoneid0001i.ini"-"c:\testdata\configs\testgetphoneid0001i.ini"
\ No newline at end of file
--- a/telephonyserverplugins/common_tsy/test/component/inc/cctsyfixeddiallingfu.h	Tue Feb 02 01:41:59 2010 +0200
+++ b/telephonyserverplugins/common_tsy/test/component/inc/cctsyfixeddiallingfu.h	Fri Feb 19 23:59:33 2010 +0200
@@ -39,7 +39,6 @@
 	void TestDialNoFdnCheck0001bL();
 	void TestDialNoFdnCheck0001cL();
 	void TestDialNoFdnCheck0002L();
-	void TestDialNoFdnCheck0003L();
 	void TestDialNoFdnCheck0004L();
 	void TestDialNoFdnCheck0005L();
 	void TestDialNoFdnCheck0006L();
--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_fixeddialling_individual.script	Tue Feb 02 01:41:59 2010 +0200
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_fixeddialling_individual.script	Fri Feb 19 23:59:33 2010 +0200
@@ -24,7 +24,7 @@
 //!@SYMTestActions Invokes RMobileCall::DialNoFdnCheck for voice calls
 //!@SYMTestExpectedResults Pass
 //!@SYMTestType CT
-//RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyFixedDiallingFU.TestDialNoFdnCheck0001L
+RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyFixedDiallingFU.TestDialNoFdnCheck0001L
 END_TESTCASE BA-CTSY-FXD-CDNFC-0001
 
 START_TESTCASE BA-CTSY-FXD-CDNFC-0001c
@@ -49,17 +49,6 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyFixedDiallingFU.TestDialNoFdnCheck0002L
 END_TESTCASE BA-CTSY-FXD-CDNFC-0002
 
-START_TESTCASE BA-CTSY-FXD-CDNFC-0003
-//!@SYMTestCaseID BA-CTSY-FXD-CDNFC-0003
-//!@SYMComponent telephony_ctsy
-//!@SYMTestCaseDesc Test support in CTSY for RMobileCall::DialNoFdnCheck with bad parameter data for voice calls
-//!@SYMTestPriority High
-//!@SYMTestActions Invokes RMobileCall::DialNoFdnCheck with bad parameter data for voice calls
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyFixedDiallingFU.TestDialNoFdnCheck0003L
-END_TESTCASE BA-CTSY-FXD-CDNFC-0003
-
 START_TESTCASE BA-CTSY-FXD-CDNFC-0006b
 //!@SYMTestCaseID BA-CTSY-FXD-CDNFC-0006b
 //!@SYMComponent telephony_ctsy
--- a/telephonyserverplugins/common_tsy/test/component/src/cctsyfixeddiallingfu.cpp	Tue Feb 02 01:41:59 2010 +0200
+++ b/telephonyserverplugins/common_tsy/test/component/src/cctsyfixeddiallingfu.cpp	Fri Feb 19 23:59:33 2010 +0200
@@ -36,7 +36,6 @@
 	ADD_TEST_STEP_ISO_CPP(CCTsyFixedDiallingFU, TestDialNoFdnCheck0001bL);
     ADD_TEST_STEP_ISO_CPP(CCTsyFixedDiallingFU, TestDialNoFdnCheck0001cL);
 	ADD_TEST_STEP_ISO_CPP(CCTsyFixedDiallingFU, TestDialNoFdnCheck0002L);
-	ADD_TEST_STEP_ISO_CPP(CCTsyFixedDiallingFU, TestDialNoFdnCheck0003L);
 	ADD_TEST_STEP_ISO_CPP(CCTsyFixedDiallingFU, TestDialNoFdnCheck0004L);	
 	ADD_TEST_STEP_ISO_CPP(CCTsyFixedDiallingFU, TestDialNoFdnCheck0005L);
 		
@@ -372,19 +371,18 @@
 	// TEST to show defect 120102
  	//-------------------------------------------------------------------------
 
-    // get out before it panics
-    ERR_PRINTF2(_L("<font color=Orange>$CTSYKnownFailure: defect id = %d</font>"), 120102);
-    ASSERT_TRUE(EFalse);
-  
   	iMockLTSY.ExpectL(EMobileCallDialNoFdnCheck, expectData);   	
- 	// call of this API should lead to set CallId = 1, but because of defect 120102 it doesn't occure
- 	CallGetMobileCallInfoL(callId, mobileService, KSomeNumber); 	
+ 	CallGetMobileCallInfoL(callId, mobileService, KSomeNumber); 
+ 	
+ 	completeData.Close();
+ 	TMockLtsyCallData0 mockDataComplete2(callId, mobileService);
+ 	mockDataComplete2.SerialiseL(completeData);
   	iMockLTSY.CompleteL(EMobileCallDialNoFdnCheck, KErrNone, completeData);   	
   	
     call.DialNoFdnCheck(requestStatus, pckgCallParams, KSomeNumber);   
     
     User::WaitForRequest(requestStatus);      
-    ERR_PRINTF2(_L("<font color=Orange>$CTSYKnownFailure: defect id = %d</font>"), 120102);      
+     
     ASSERT_EQUALS(KErrNone, requestStatus.Int());      
     
     AssertMockLtsyStatusL();
@@ -393,7 +391,7 @@
 	
 	
 /**
-@SYMTestCaseID BA-CTSY-FXD-CDNFC-0001
+@SYMTestCaseID BA-CTSY-FXD-CDNFC-0001b
 @SYMComponent  telephony_ctsy
 @SYMTestCaseDesc Test support in CTSY for RMobileCall::DialNoFdnCheck for voice calls
 @SYMTestPriority High
@@ -623,267 +621,163 @@
 void CCTsyFixedDiallingFU::TestDialNoFdnCheck0002L()
 	{
 
-// This test should test cancellation of GetCallParams
-// If this API does not have a cancel, the test step should be completely removed.
-
-	OpenEtelServerL(EUseExtendedError);
-	CleanupStack::PushL(TCleanupItem(Cleanup,this));
-	OpenPhoneL();
+     OpenEtelServerL(EUseExtendedError);
+     CleanupStack::PushL(TCleanupItem(Cleanup,this));
+     OpenPhoneL();
 
-	RBuf8 expectData;
-	CleanupClosePushL(expectData);
-	
-	RBuf8 completeData;
-	CleanupClosePushL(completeData);	
-	
-	 //-- For Voice1 -------------------------    
-    TBuf<256> lineName(KMmTsyVoice1LineName);
-    
-    // Open new line
-    RLine line;
-    TInt errorCode = line.Open(iPhone, lineName);
-    ASSERT_EQUALS(KErrNone, errorCode);
-    CleanupClosePushL(line);  
-    
-    // some data for opening call
-    _LIT(KDoubleColon, "::");
-    
-    TBuf<256> name;
-    name = KMmTsyPhoneName;
-    name.Append(KDoubleColon);
-    name.Append(lineName);
-    name.Append(KDoubleColon);
-        
-   	TInt callId = 1;   	
- 	// create new incoming call
- 	TName incomingCallName;
- 	RMobileCall::TMobileCallStatus mobileCallStatus = RMobileCall::EStatusIdle; 
- 	RMobilePhone::TMobileService mobileService = RMobilePhone::EVoiceService;	
- 	
- 	TRequestStatus requestStatus;
-	errorCode = CreateIncomingCallL(line, callId, lineName, incomingCallName, 
-                             mobileService, mobileCallStatus);	
-	ASSERT_EQUALS(KErrNone, errorCode);	 	
+     RBuf8 expectData;
+     CleanupClosePushL(expectData);
+     
+     RBuf8 completeData;
+     CleanupClosePushL(completeData);
+     
+     TInt errorCode = KErrNone;    
+     
+     //-- For Voice1 -------------------------
+         
+     TBuf<256> lineName(KMmTsyVoice1LineName);    
+     // Open new line
+     RLine line;
+     errorCode = line.Open(iPhone, lineName);
+     ASSERT_EQUALS(KErrNone, errorCode);
+     CleanupClosePushL(line);      
+     // open call
+     _LIT(KDoubleColon, "::");    
+     TBuf<256> name;
+     name = KMmTsyPhoneName;
+     name.Append(KDoubleColon);
+     name.Append(lineName);
+     name.Append(KDoubleColon);
+     
+     RMobileCall call;
+     errorCode = call.OpenNewCall(line, name);
+     ASSERT_EQUALS(KErrNone, errorCode);
+     CleanupClosePushL(call);   
+     
+     TRequestStatus requestStatus;    
+     _LIT(KSomeNumber, "123456789");
+     
+     RMobilePhone::TMobileService mobileService = RMobilePhone::EVoiceService;
+     
+     TInt expectCallId = 0;
  	   
     // --------  make for this call callId > 0 --------------------------------------   
-    RMobileCall::TMobileCallInfoV1 callInfo;  
-            
-	line.NotifyIncomingCall(requestStatus, incomingCallName);
+    RMobileCall::TMobileCallInfoV8 callInfo;  
 
-    callInfo.iService = mobileService;
-    TMockLtsyCallData1<RMobileCall::TMobileCallInfoV1> idleCallData(callId, mobileService, callInfo);
-    idleCallData.SerialiseL(completeData);
-	
-	TRequestStatus mockLtsyStatus;
-    iMockLTSY.NotifyTerminated(mockLtsyStatus);
-    iMockLTSY.CompleteL(EEtelLineNotifyIncomingCall, KErrNone, completeData);
-    User::WaitForRequest(mockLtsyStatus);
-    AssertMockLtsyStatusL();
-    ASSERT_EQUALS(KErrNone, mockLtsyStatus.Int());
-    
-    User::WaitForRequest(requestStatus);
-    AssertMockLtsyStatusL();
-    ASSERT_EQUALS(KErrNone, requestStatus.Int());
-    
-    RMobileCall call;
-    errorCode = call.OpenExistingCall(line, incomingCallName);
-    ASSERT_EQUALS(KErrNone, errorCode);
-	CleanupClosePushL(call);
-	//------------------------------------------------------------------------- 
-	
+    //-------------------------------------------------------------------------
+	// Test cancelling of RMobileCall::DialNoFdnCheck
  	//-------------------------------------------------------------------------
-	// Test cancelling of RCall::GetCallParams
- 	//-------------------------------------------------------------------------
- 	_LIT(KSomeNumber, "123456789"); 
- 	// data for ExpextL
+ 	
+    // data for ExpextL
  	RMobileCall::TMobileCallParamsV1 callParams; 
     RMobileCall::TMobileCallParamsV1Pckg    pckgCallParams(callParams); 	
  	 	
- 	callInfo.iRemoteParty.iDirection = RMobileCall::EMobileTerminated;  
- 	callInfo.iValid = RMobileCall::KCallDialledParty | RMobileCall::KCallAlternating;    
-	callInfo.iService	= mobileService;  
-	callInfo.iDialledParty.iTelNumber.Copy( KSomeNumber );
-	    
+    callInfo.iValid = RMobileCall::KCallDialledParty | RMobileCall::KCallAlternating;    
+    callInfo.iService   = mobileService;
+    callInfo.iStatus    = RMobileCall::EStatusUnknown;
+    callInfo.iCallId    = -1;
+    callInfo.iExitCode  =0; 
+    callInfo.iEmergency =0;
+    callInfo.iForwarded =0; 
+    callInfo.iPrivacy               = RMobilePhone::EPrivacyUnspecified;
+    callInfo.iAlternatingCall       = RMobilePhone::EAlternatingModeUnspecified;    
+    callInfo.iTch = RMobileCall::ETchUnknown;               
+    callInfo.iRemoteParty.iCallingName = KNullDesC;
+    callInfo.iRemoteParty.iRemoteIdStatus = RMobileCall::ERemoteIdentityUnknown;
+    callInfo.iRemoteParty.iRemoteNumber.iTelNumber = KNullDesC;
+    callInfo.iRemoteParty.iRemoteNumber.iNumberPlan = RMobilePhone::EUnknownNumberingPlan;
+    callInfo.iRemoteParty.iRemoteNumber.iTypeOfNumber = RMobilePhone::EUnknownNumber;
+    callInfo.iDialledParty.iTelNumber.Copy( KSomeNumber );
+    callInfo.iDialledParty.iNumberPlan = 
+            RMobilePhone::EUnknownNumberingPlan;
+    callInfo.iDialledParty.iTypeOfNumber = 
+            RMobilePhone::EUnknownNumber;   
+	
     TMockLtsyCallData2< RMobileCall::TMobileCallParamsV1, RMobileCall::TMobileCallInfoV1 >
-    											 mockCallData(callId, mobileService, callParams, callInfo);
+    											 mockCallData(expectCallId, mobileService, callParams, callInfo);
     mockCallData.SerialiseL(expectData);
     
+    // Expect the dial
+    
     iMockLTSY.ExpectL(EMobileCallDialNoFdnCheck, expectData, KErrNone);   
      
+    // Dial and cancel
     call.DialNoFdnCheck(requestStatus, pckgCallParams, KSomeNumber);
     call.CancelAsyncRequest(EMobileCallDialNoFdnCheck);
+    
+    // prepare and complete Mobile Call info
+    
+    TInt callId = 1;
+    
+    _LIT(KNullDesC , "");
         
-    User::WaitForRequest(requestStatus);    
-          
-    ASSERT_EQUALS(KErrCancel, requestStatus.Int());      
-    AssertMockLtsyStatusL();
-     
-	CleanupStack::PopAndDestroy(5, this); // expectData, this ...
-	
-	}
-
+    RBuf8 data;
+    CleanupClosePushL(data);
 
-/**
-@SYMTestCaseID BA-CTSY-FXD-CDNFC-0003
-@SYMComponent  telephony_ctsy
-@SYMTestCaseDesc Test support in CTSY for RMobileCall::DialNoFdnCheck with bad parameter data for voice calls
-@SYMTestPriority High
-@SYMTestActions Invokes RMobileCall::DialNoFdnCheck with bad parameter data for voice calls
-@SYMTestExpectedResults Pass
-@SYMTestType CT
-*/
-void CCTsyFixedDiallingFU::TestDialNoFdnCheck0003L()
-	{
-
-	OpenEtelServerL(EUseExtendedError);
-	CleanupStack::PushL(TCleanupItem(Cleanup,this));
-	OpenPhoneL();
+    RMobileCall::TMobileCallInfoV1 callInfo2;
+    callInfo2.iDialledParty.iTelNumber.Copy(KSomeNumber);
+    callInfo2.iService = mobileService;
+    callInfo2.iEmergency = EFalse;
+    callInfo2.iRemoteParty.iCallingName = KNullDesC;
+    callInfo2.iRemoteParty.iRemoteIdStatus = RMobileCall::ERemoteIdentityUnknown;
+    callInfo2.iRemoteParty.iRemoteNumber.iTelNumber = KNullDesC;
+    callInfo2.iRemoteParty.iRemoteNumber.iNumberPlan = RMobilePhone::EUnknownNumberingPlan;
+    callInfo2.iRemoteParty.iRemoteNumber.iTypeOfNumber = RMobilePhone::EUnknownNumber;
+    callInfo2.iForwarded = EFalse;
+    callInfo2.iValid = RMobileCall::KCallDialledParty | RMobileCall::KCallRemoteParty;
 
-	RBuf8 expectData;
-	CleanupClosePushL(expectData);
-	
-	RBuf8 completeData;
-	CleanupClosePushL(completeData);
-	
-	 //-- For Voice1 -------------------------    
-    TBuf<256> lineName(KMmTsyVoice1LineName);
-    
-    // Open new line
-    RLine line;
-    TInt errorCode = line.Open(iPhone, lineName);
-    ASSERT_EQUALS(KErrNone, errorCode);
-    CleanupClosePushL(line);  
-    
-    // some data for opening call
-    _LIT(KDoubleColon, "::");
+    TMockLtsyCallData1<RMobileCall::TMobileCallInfoV1> callInfoData(callId, mobileService, callInfo2);
+    callInfoData.SerialiseL(data);
+
+    iMockLTSY.CompleteL(EMobileCallGetMobileCallInfo, KErrNone, data);
+
+    //Pause the MockLTSY so we can program the sequence of Expect - Completes involved 
+    //with cancelling 
+    iMockLTSY.PauseCompletion();
     
-    TBuf<256> name;
-    name = KMmTsyPhoneName;
-    name.Append(KDoubleColon);
-    name.Append(lineName);
-    name.Append(KDoubleColon);
-        
-   	TInt callId = 1;   	
- 	// create new incoming call
- 	TName incomingCallName;
- 	RMobileCall::TMobileCallStatus mobileCallStatus = RMobileCall::EStatusIdle; 
- 	RMobilePhone::TMobileService mobileService = RMobilePhone::EVoiceService;	
- 	
- 	TRequestStatus requestStatus;
-	errorCode = CreateIncomingCallL(line, callId, lineName, incomingCallName, 
-                             mobileService, mobileCallStatus);	
-	ASSERT_EQUALS(KErrNone, errorCode);	 	
- 	   
-    // --------  make for this call callId > 0 --------------------------------------   
-    RMobileCall::TMobileCallInfoV1 callInfo;  
-            
-	line.NotifyIncomingCall(requestStatus, incomingCallName);
+    RMobileCall::TMobileCallStatus  mobileCallStatus = RMobileCall::EStatusDialling; 
+    TMockLtsyCallData1<RMobileCall::TMobileCallStatus> mockCallDataStatus(callId, mobileService, mobileCallStatus);
+    completeData.Close();
+    mockCallDataStatus.SerialiseL(completeData);
+    
+    //Change state to dialling, this set the call ID
+    iMockLTSY.CompleteL(EMobileCallNotifyMobileCallStatusChange, KErrNone, completeData);
 
-    callInfo.iService = mobileService;
-    TMockLtsyCallData1<RMobileCall::TMobileCallInfoV1> idleCallData(callId, mobileService, callInfo);
-    idleCallData.SerialiseL(completeData);
-	
-	TRequestStatus mockLtsyStatus;
-    iMockLTSY.NotifyTerminated(mockLtsyStatus);
-    iMockLTSY.CompleteL(EEtelLineNotifyIncomingCall, KErrNone, completeData);
-    User::WaitForRequest(mockLtsyStatus);
-    AssertMockLtsyStatusL();
-    ASSERT_EQUALS(KErrNone, mockLtsyStatus.Int());
+    
+    TInt hangUpCause = KErrGsmReleaseByUser;
+    TBool autoStChangeDisable = ETrue;
+    TMockLtsyCallData2<TInt, TBool> mockCallData2(callId, mobileService, 
+                                                          hangUpCause, 
+                                                          autoStChangeDisable);    
+    expectData.Close();
+    mockCallData2.SerialiseL(expectData);
+    // Since the call ID has been set, the CTSY will go ahead with the cancellation
+    // by hanging up.
+    iMockLTSY.ExpectL(EEtelCallHangUp, expectData);
     
-    User::WaitForRequest(requestStatus);
-    AssertMockLtsyStatusL();
-    ASSERT_EQUALS(KErrNone, requestStatus.Int());
+    // Cancelled Dial request. After this CTSY hangs up the call and it goes to idle state.
+   
     
-    RMobileCall call;
-    errorCode = call.OpenExistingCall(line, incomingCallName);
-    ASSERT_EQUALS(KErrNone, errorCode);
-	CleanupClosePushL(call);
-	//------------------------------------------------------------------------- 
-	    
-    _LIT(KSomeNumber, "123456789");    
+    RMobileCall::TMobileCallStatus  mobileCallStatus2 = RMobileCall::EStatusIdle; 
+    TMockLtsyCallData1<RMobileCall::TMobileCallStatus> mockCallDataStatus2(callId, mobileService, mobileCallStatus2);
+    completeData.Close();
+    mockCallDataStatus2.SerialiseL(completeData);
+
+    // Complete the hangup
+    iMockLTSY.CompleteL(EMobileCallNotifyMobileCallStatusChange, KErrGsmReleaseByUser, completeData);
+ 
+    // Release the MockLTSY so that the above sequence is triggered.
+    iMockLTSY.ResumeCompletion();
     
     
-	//-------------------------------------------------------------------------
-	// Test B: Test passing wrong descriptor size to parameter in
-	// RCall::GetCallParams
- 	//-------------------------------------------------------------------------
- 	RMobileCall::TMobileCallParamsV1 		callParams; 	
- 	RMobileCall::TMobileCallParamsV1Pckg    pckgCallParams(callParams);	
- 	
- 	// --- data for ExpectL ---
- 	// set up callParams for case of pckgCallParams zero length
- 	callParams.iSpeakerControl = 
-	            RCall::EMonitorSpeakerControlOnUntilCarrier;
-	callParams.iSpeakerVolume = RCall::EMonitorSpeakerVolumeLow;
-	callParams.iInterval = 0;
-	callParams.iWaitForDialTone = RCall::EDialToneWait;
-	callParams.iIdRestrict = RMobileCall::EIdRestrictDefault;
-	callParams.iCug.iExplicitInvoke = EFalse;
-	callParams.iCug.iCugIndex = 0xFFFF;
-	callParams.iCug.iSuppressPrefCug = EFalse;
-	callParams.iCug.iSuppressOA = EFalse;
-	callParams.iAutoRedial = EFalse; 	
- 	// set up callInfo#
+    // Check results.
+    User::WaitForRequest(requestStatus);    
+    AssertMockLtsyStatusL();
+    ASSERT_EQUALS(KErrCancel, requestStatus.Int());      
+
+     
+	CleanupStack::PopAndDestroy(6, this); // expectData, this ...
 	
-	RMobileCall::TMobileCallInfoV8 callInformation; 
-	callInformation.iRemoteParty.iDirection = RMobileCall::EMobileTerminated;  
-	callInformation.iValid = RMobileCall::KCallDialledParty | RMobileCall::KCallAlternating;    
-	callInformation.iService	= mobileService;  
-	callInformation.iDialledParty.iTelNumber.Copy( KSomeNumber ); 	
- 	TMockLtsyCallData2< RMobileCall::TMobileCallParamsV1, RMobileCall::TMobileCallInfoV8 >
-    											 mockCallData2(callId, mobileService, callParams, callInformation);
-    mockCallData2.SerialiseL(expectData);
-    
- 	// --- data for CompleteL ---
- 	TMockLtsyCallData0 mockDataComplete(callId, mobileService);
- 	completeData.Close();
- 	mockDataComplete.SerialiseL(completeData);
- 
-	iMockLTSY.ExpectL(EMobileCallDialNoFdnCheck, expectData);   	
-  	iMockLTSY.CompleteL(EMobileCallDialNoFdnCheck, KErrNone, completeData);   	
-  	
-    // set Length of param to 0 
-  	pckgCallParams.SetLength(0);
-  	// call DialNoFdnCheck itself
-    call.DialNoFdnCheck(requestStatus, pckgCallParams, KSomeNumber);   
-    
-    User::WaitForRequest(requestStatus);          
-    ASSERT_EQUALS(KErrNone, requestStatus.Int());
-    AssertMockLtsyStatusL();   
- 			
-	//-------------------------------------------------------------------------
-	// Test A: Test passing wrong version of parameters to
-	// RCall::GetCallParams use TMobileCallParamsV2 instead of TMobileCallParamsV1
- 	//------------------------------------------------------------------------- 	
-    RMobileCall::TMobileCallParamsV2 callParamsV2; 
-    RMobileCall::TMobileCallParamsV2Pckg    pckgCallParamsV2(callParamsV2);    	
- 
- 	// data for ExpextL 	
- 	callInfo.iRemoteParty.iDirection = RMobileCall::EMobileTerminated;  
- 	callInfo.iValid = RMobileCall::KCallDialledParty | RMobileCall::KCallAlternating;    
-	callInfo.iService	= mobileService;  
-	callInfo.iDialledParty.iTelNumber.Copy( KSomeNumber );
-	    
-    TMockLtsyCallData2< RMobileCall::TMobileCallParamsV1, RMobileCall::TMobileCallInfoV1 >
-    											 mockCallData(callId, mobileService, callParams, callInfo);
-    expectData.Close();
-    mockCallData.SerialiseL(expectData);    
-       
-	iMockLTSY.ExpectL(EMobileCallDialNoFdnCheck, expectData, KErrGeneral);  // use KErrGeneral just only to avoid waiting for timeout
-   	call.DialNoFdnCheck(requestStatus, pckgCallParamsV2, KSomeNumber);
-   	User::WaitForRequest(requestStatus);
-   	
-   	// Possible defect. There is no checking of iExtensionId of geting params in 
-   	// TInt CMmVoiceCallTsy::DialNoFdnCheck(const TTsyReqHandle aTsyReqHandle, const TDesC8* aCallParams, TDesC* aTelNumber )
-   	// and in 
-   	// TInt CMmCallGsmWcdmaExt::DialL(RMobilePhone::TMobileService aCallMode,  const TDesC8* aCallParams, const TDesC* aTelNumber, TInt aExtensionId )
-    ERR_PRINTF2(_L("<font color=Orange>$CTSYKnownFailure: defect id = %d</font>"), 120105);      
-    ASSERT_EQUALS(KErrArgument, requestStatus.Int());     
-	AssertMockLtsyStatusL();
-	
-	// Done !
-	CleanupStack::PopAndDestroy(5, this); // this...
-
 	}
 
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/common_tsy/test/integration/group/integration_test.pkg	Fri Feb 19 23:59:33 2010 +0200
@@ -0,0 +1,1 @@
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_dtmf_auto.script"-"c:\testdata\scripts\te_ctsyintegration_dtmf_auto.script"
--- a/telephonyserverplugins/simtsy/inc/CSimPacketContext.h	Tue Feb 02 01:41:59 2010 +0200
+++ b/telephonyserverplugins/simtsy/inc/CSimPacketContext.h	Fri Feb 19 23:59:33 2010 +0200
@@ -34,6 +34,10 @@
 #include <ctsy/serviceapi/cmmutility.h>
 
 const TUint KNotFound=0xfffffff;
+const TInt KLimitForErrorCodeForContextGoToInactive=-700;
+const TInt KContextGoToInactiveWithNormalErrorCode=-600;
+const TInt KContextGoToInactiveWithExtendedErrorCode=-400;
+const TInt KContextGoToInactiveWithErrorWhenTryingToGetLastErrorCode = -300;
 
 enum TContextEvent //< Enum for the state machine
 	{
@@ -454,6 +458,9 @@
 	virtual void TimerCallBack(TInt aId);
 	TCommSetupItem FindCommSettings();
 
+private:
+    TInt iLastError;
+    TInt iErrorCodeForGetLastErrorCause;
 	};
 
 #endif
--- a/telephonyserverplugins/simtsy/src/CSimPacketContext.cpp	Tue Feb 02 01:41:59 2010 +0200
+++ b/telephonyserverplugins/simtsy/src/CSimPacketContext.cpp	Fri Feb 19 23:59:33 2010 +0200
@@ -99,7 +99,7 @@
 	  iTFTCreated(EFalse), iNumTFTsCreated(-1), iNumFiltersAdded(0),
       iContextConfigParamsIndex(0), iCommPortLoaned(EFalse),iQoSObjectCount(0),
       iNotifyContextConfigChangeArray(NULL), iSetConfigData(NULL), iSetConfigCallCount(0), iTFTChangeBool(0),
-      iNotifyContextStatusChangeIndex(0),iState(RPacketContext::EStatusInactive)
+      iNotifyContextStatusChangeIndex(0),iState(RPacketContext::EStatusInactive), iLastError(KErrNone), iErrorCodeForGetLastErrorCause(KErrNone)
 	  
 /**
 * Trivial Constructor.  Initialises all the data members
@@ -2476,7 +2476,7 @@
 	return KErrNone;
 	}
 
-TInt CSimPacketContext::GetLastErrorCause(const TTsyReqHandle aTsyReqHandle,TInt* /*aError*/)
+TInt CSimPacketContext::GetLastErrorCause(const TTsyReqHandle aTsyReqHandle, TInt* aError)
 /**
 * This method is not supported in this TSY
 *
@@ -2486,7 +2486,9 @@
 */
 	{
 	LOGPACKET1("CSimPacketContext::GetLastErrorCause called");
-	ReqCompleted(aTsyReqHandle,KErrNotSupported);
+	*aError = iLastError;
+	ReqCompleted(aTsyReqHandle,iErrorCodeForGetLastErrorCause);
+	iErrorCodeForGetLastErrorCause = KErrNone;
 	return KErrNone;
 	}
 
@@ -2837,8 +2839,49 @@
 						if (found)
 							activateValue = iContextConfigsRel99->At(i).iActivateErrorCode;
 						else
-							activateValue = iActivateFail;				
-
+							activateValue = iActivateFail;	
+						if(activateValue == KContextGoToInactiveWithErrorWhenTryingToGetLastErrorCode)
+						    {
+						    //this will allow context activation move to the next state but with context being inactive 
+						    ret=ChangeState(RPacketContext::EStatusInactive);
+						    iCurrentEvent=EContextEventNone;
+						    iLastError = activateValue;
+						    iErrorCodeForGetLastErrorCause=KErrGeneral;
+						    
+						    iContextConfigsRel99->At(i).iActivateErrorCode = iLastError;
+						    ReqCompleted(iActivateRequestHandle, KErrNone);
+						    
+						    break;
+						    }
+						if(activateValue <= KContextGoToInactiveWithExtendedErrorCode && activateValue > KContextGoToInactiveWithNormalErrorCode)
+                            {
+                            //this will allow context activation move to the next state but with context being inactive     
+                            //tsy extended error case
+                            ret=ChangeState(RPacketContext::EStatusInactive);
+                            iCurrentEvent=EContextEventNone;
+                            iLastError = activateValue - KContextGoToInactiveWithExtendedErrorCode;
+                            //move the error code to the higher 16 bit.
+                            iLastError<<=16;
+                            
+                            iContextConfigsRel99->At(i).iActivateErrorCode = iLastError;
+                            ReqCompleted(iActivateRequestHandle, KErrNone);
+                            
+                            break;
+                            }
+						if(activateValue <= KContextGoToInactiveWithNormalErrorCode && activateValue > KLimitForErrorCodeForContextGoToInactive)
+						    {
+						    //this will allow context activation move to the next state but with context being inactive
+						    //normal error case
+						    ret=ChangeState(RPacketContext::EStatusInactive);
+						    iCurrentEvent=EContextEventNone;
+						    iLastError = activateValue - KContextGoToInactiveWithNormalErrorCode;
+						    
+						    iContextConfigsRel99->At(i).iActivateErrorCode = iLastError;
+						    ReqCompleted(iActivateRequestHandle, KErrNone);
+						    
+						    break;
+						    }
+						else
 						if(activateValue != KErrNone)
 							{
 							ReqCompleted(iActivateRequestHandle,activateValue);
--- a/telephonyserverplugins/simtsy/src/CSimPhone.cpp	Tue Feb 02 01:41:59 2010 +0200
+++ b/telephonyserverplugins/simtsy/src/CSimPhone.cpp	Fri Feb 19 23:59:33 2010 +0200
@@ -222,6 +222,7 @@
 	iSectionName.Format(KSectionNameFormat,testNumber);
 	if(iConfigFile->Section(iSectionName)==NULL)
 		{
+        LOGPHONE2("Section for requested test number (%d) not found in the Config File",testNumber);
 		CleanupStack::Pop();
 		User::Leave(KErrNotFound);
 		}
--- a/telephonyserverplugins/simtsy/test/Te_SimPacket/Te_SimPacket.cpp	Tue Feb 02 01:41:59 2010 +0200
+++ b/telephonyserverplugins/simtsy/test/Te_SimPacket/Te_SimPacket.cpp	Fri Feb 19 23:59:33 2010 +0200
@@ -606,8 +606,6 @@
     User::WaitForRequest(stat1);
     TESTL(stat1.Int() == KErrNotSupported);
 
-    TESTL(iPacketContext[0].GetLastErrorCause(err) == KErrNotSupported);
-
     iPacketContext[0].Close();
     iPacketService.Close();
 	iPhone.Close();
--- a/telephonyutils/telephonywatchers/group/signalstrengthwatcher.mmp	Tue Feb 02 01:41:59 2010 +0200
+++ b/telephonyutils/telephonywatchers/group/signalstrengthwatcher.mmp	Fri Feb 19 23:59:33 2010 +0200
@@ -39,7 +39,7 @@
 SOURCE			../src/signalstrengthwatcher.cpp
 SOURCE			../src/SignalstrengthWatcherImplementationTable.cpp
 USERINCLUDE		../inc
-LIBRARY			euser.lib watcher.lib etel.lib etelmm.lib telwatcherbase.lib
+LIBRARY			euser.lib etel.lib etelmm.lib telwatcherbase.lib
 DEBUGLIBRARY	comsdbgutil.lib