201035_04
authorhgs
Tue, 14 Sep 2010 17:55:14 +0100
changeset 69 b982c3e940f3
parent 59 ac20d6a0a19d
child 73 70d75957b98f
201035_04
package_definition.xml
smsprotocols/smsstack/smsprot/Group/sms_test.pkg
smsprotocols/smsstack/smsprot/Group/smsport_test.pkg
smsprotocols/smsstack/smsprot/Group/smsprt_test.pkg
smsprotocols/smsstack/smsprot/Src/smspclass0stor.cpp
smsprotocols/smsstack/wapprot/Group/wapport_test.pkg
smsprotocols/smsstack/wapprot/test/Te_wapprot/TE_WapProt.mmp
smsprotocols/smsstack/wapprot/test/Te_wapprot/Te_WapProt.script
smsprotocols/smsstack/wapprot/test/Te_wapprot/WapIoctlSteps.cpp
smsprotocols/smsstack/wapprot/test/Te_wapprot/WapIoctlSteps.h
smsprotocols/smsstack/wapprot/test/Te_wapprot/WapProtSuite.ini
smsprotocols/smsstack/wapprot/test/Te_wapprot/WapProtSuiteServer.cpp
smsprotocols/smsstack/wapprot/test/Te_wapprot/WapProtSuiteStepBase.h
telephonyprotocols/csdagt/group/CSD.MMP
telephonyprotocols/csdagt/script/SCHAT.CPP
telephonyprotocols/pdplayer/group/pdp.mmp
telephonyprotocols/pdplayer/inc/PDPFSM.h
telephonyprotocols/pdplayer/inc/pdp_contention.h
telephonyprotocols/pdplayer/inc/pdpmcpr.h
telephonyprotocols/pdplayer/inc/pdptiermanager.h
telephonyprotocols/pdplayer/inc/psdavailabilitylistener.h
telephonyprotocols/pdplayer/src/PDPCPR.cpp
telephonyprotocols/pdplayer/src/PDPSCPR.cpp
telephonyprotocols/pdplayer/src/PDPSCPRStates.cpp
telephonyprotocols/pdplayer/src/pdp_contention.cpp
telephonyprotocols/pdplayer/src/pdpmcpr.cpp
telephonyprotocols/pdplayer/src/pdpservices.cpp
telephonyprotocols/pdplayer/src/pdptiermanager.cpp
telephonyprotocols/pdplayer/src/psdavailabilitylistener.cpp
telephonyprotocols/pdplayer/traces/fixed_id.definitions
telephonyprotocols/pdplayer/umts/spudfsm/src/PDPSCPRFSM.cpp
telephonyprotocols/pdplayer/umts/spudfsm/src/cpdpfsm.h
telephonyprotocols/pdplayer/umts/spudtel/src/cpdpconfigchangenotifier.cpp
telephonyprotocols/pdplayer/umts/spudtel/src/cpdpstatuschangenotifier.cpp
telephonyprotocols/pdplayer/umts/spudtel/src/cqoschangenotifier.cpp
telephonyprotocols/pdplayer/umts/spudtel/src/eteldriverstrategies.cpp
telephonyprotocols/pdplayer/umts/test/te_spud/inc/CPdpFsmInterface.h
telephonyprotocols/pdplayer/umts/test/te_spud/src/CPdpFsmInterface.cpp
telephonyprotocols/pdplayer/umts/test/te_spud/traces/fixed_id.definitions
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/TE_PppSize_config.txt
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/TE_PppSize_spud.ini
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/TE_PppSize_spud.xml
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/qospolicies.ini
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/configs/version1/TE_PppSize_config.txt
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/TE_PppSize_spud.ini
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/TE_PppSize_spud.xml
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/TE_SpudNetworkSideLoopbackCSY.ini
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/TE_SpudNetworkSideLoopbackCSY_serial.ini
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/TE_SpudNetworkSide_9x.ini
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/TE_SpudNetworkSide_Channel_config.txt
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/TE_SpudNetworkSide_PppLoopback.xml
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/qospolicies.ini
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/te_SpudNetworkSide.xml
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/te_SpudNetworkSide_nifman.xml
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/te_SpudNetworkSide_ppp.xml
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/te_spudNetworkSide.ini
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/te_spudNetworkSide_config_9x.txt
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/te_spudNetworkSide_nifman.ini
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/te_spudNetworkSide_nifman_config.txt
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/te_spudNetworkSide_nifman_config_9x.txt
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/TE_spudNetworkSide.iby
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/bld.inf
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/te_spudNetworkSide.pkg
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/TE_PppSize_spud.script
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/TE_spudNetworkSide.script
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/version1/TE_PppSize_spud.script
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/version1/TE_SpudNetworkside_Channel.script
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/version1/TE_spudNetworkSide.script
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/version1/TE_spudNetworkSide_nifman.script
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/version1/TE_spudNetworkSide_ppp.script
telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/version1/TE_spudNetworkSide_ppp_9x.script
telephonyprotocols/rawipnif/group/bld.inf
telephonyprotocols/rawipnif/version1/bmarm/RawIPNifU.DEF
telephonyprotocols/rawipnif/version1/bwins/RawIPNifU.DEF
telephonyprotocols/rawipnif/version1/data/rawip.ini
telephonyprotocols/rawipnif/version1/eabi/RawIPNifU.def
telephonyprotocols/rawipnif/version1/group/RawIPNif.mmp
telephonyprotocols/rawipnif/version1/group/RawIpNif.iby
telephonyprotocols/rawipnif/version1/group/bld.inf
telephonyprotocols/rawipnif/version1/group/networking_rawipnif.history.xml
telephonyprotocols/rawipnif/version1/group/networking_rawipnif.mrp
telephonyprotocols/rawipnif/version1/inc/BcaController.h
telephonyprotocols/rawipnif/version1/inc/BcaIoController.h
telephonyprotocols/rawipnif/version1/inc/Constants.h
telephonyprotocols/rawipnif/version1/inc/IPTagHeader.h
telephonyprotocols/rawipnif/version1/inc/IPv4ProtocolIf.h
telephonyprotocols/rawipnif/version1/inc/IPv6ProtocolIf.h
telephonyprotocols/rawipnif/version1/inc/MControllerObserver.h
telephonyprotocols/rawipnif/version1/inc/MRawIPNifObserverBase.h
telephonyprotocols/rawipnif/version1/inc/ProtocolIfBase.h
telephonyprotocols/rawipnif/version1/inc/RawIPNifMain.h
telephonyprotocols/rawipnif/version1/inc/RawIPNifMainFactory.h
telephonyprotocols/rawipnif/version1/inc/Receiver.h
telephonyprotocols/rawipnif/version1/inc/Sender.h
telephonyprotocols/rawipnif/version1/inc/bttlog.h
telephonyprotocols/rawipnif/version1/src/BcaController.cpp
telephonyprotocols/rawipnif/version1/src/BcaIoController.cpp
telephonyprotocols/rawipnif/version1/src/DllMain.cpp
telephonyprotocols/rawipnif/version1/src/IPTagHeader.cpp
telephonyprotocols/rawipnif/version1/src/IPv4ProtocolIf.cpp
telephonyprotocols/rawipnif/version1/src/IPv6ProtocolIf.cpp
telephonyprotocols/rawipnif/version1/src/ProtocolIfBase.cpp
telephonyprotocols/rawipnif/version1/src/RawIPNifMain.cpp
telephonyprotocols/rawipnif/version1/src/RawIPNifMainFactory.cpp
telephonyprotocols/rawipnif/version1/src/Receiver.cpp
telephonyprotocols/rawipnif/version1/src/Sender.cpp
telephonyprotocols/rawipnif/version1/src/bttlog.cpp
telephonyprotocols/secondarypdpcontextumtsdriver/group/bld.inf
telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.history.xml
telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp
telephonyprotocols/secondarypdpcontextumtsdriver/group/spud.iby
telephonyprotocols/secondarypdpcontextumtsdriver/group/spud_v1.iby
telephonyprotocols/secondarypdpcontextumtsdriver/inc/cpdpfsm.h
telephonyprotocols/secondarypdpcontextumtsdriver/inc/cpdpfsmfactory.h
telephonyprotocols/secondarypdpcontextumtsdriver/inc/eteldrivernmspace.h
telephonyprotocols/secondarypdpcontextumtsdriver/inc/pdpfsmnmspace.h
telephonyprotocols/secondarypdpcontextumtsdriver/inc/reteldriverinput.h
telephonyprotocols/secondarypdpcontextumtsdriver/inc/rpdpfsminterface.h
telephonyprotocols/secondarypdpcontextumtsdriver/inc/tpdpstate.h
telephonyprotocols/secondarypdpcontextumtsdriver/inc/tpdpstates.h
telephonyprotocols/secondarypdpcontextumtsdriver/spudman/bmarm/SPUDU.DEF
telephonyprotocols/secondarypdpcontextumtsdriver/spudman/bwins/SPUDU.DEF
telephonyprotocols/secondarypdpcontextumtsdriver/spudman/eabi/SPUDU.DEF
telephonyprotocols/secondarypdpcontextumtsdriver/spudman/group/spud.mmp
telephonyprotocols/secondarypdpcontextumtsdriver/spudman/inc/bindman.h
telephonyprotocols/secondarypdpcontextumtsdriver/spudman/inc/bindman.inl
telephonyprotocols/secondarypdpcontextumtsdriver/spudman/inc/mux.h
telephonyprotocols/secondarypdpcontextumtsdriver/spudman/inc/spudfactory.h
telephonyprotocols/secondarypdpcontextumtsdriver/spudman/inc/spudman.h
telephonyprotocols/secondarypdpcontextumtsdriver/spudman/inc/spudnotify.h
telephonyprotocols/secondarypdpcontextumtsdriver/spudman/src/bindman.cpp
telephonyprotocols/secondarypdpcontextumtsdriver/spudman/src/mux.cpp
telephonyprotocols/secondarypdpcontextumtsdriver/spudman/src/rpdpfsminterface.cpp
telephonyprotocols/secondarypdpcontextumtsdriver/spudman/src/spudfactory.cpp
telephonyprotocols/secondarypdpcontextumtsdriver/spudman/src/spudman.cpp
telephonyprotocols/secondarypdpcontextumtsdriver/spudman/src/spudnotify.cpp
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/bmarm/TE_SPUDNETWORKSIDEU.DEF
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/bwins/TE_SPUDNETWORKSIDEU.DEF
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/TE_PppSize_config.txt
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/TE_PppSize_spud.ini
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/TE_PppSize_spud.xml
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/TE_SpudNetworkSideLoopbackCSY.ini
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/TE_SpudNetworkSideLoopbackCSY_serial.ini
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/TE_SpudNetworkSide_8x.ini
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/TE_SpudNetworkSide_9x.ini
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/TE_SpudNetworkSide_Channel_config.txt
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/TE_SpudNetworkSide_PppLoopback.xml
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/qospolicies.ini
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/te_SpudNetworkSide.xml
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/te_SpudNetworkSide_nifman.xml
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/te_SpudNetworkSide_ppp.xml
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/te_spudNetworkSide.ini
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/te_spudNetworkSide_config_9x.txt
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/te_spudNetworkSide_config_r4_and_r5.txt
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/te_spudNetworkSide_nifman.ini
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/te_spudNetworkSide_nifman_config.txt
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/te_spudNetworkSide_nifman_config_9x.txt
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/te_spudNetworkSide_ppp_config_9x.txt
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/te_spudNetworkSide_r4_and_r5.ini
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/te_spudNetworkSide_r4_and_r5.xml
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/te_spudnetworkside_ppp_config2_9x.txt
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/TE_PppSize_config.txt
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/TE_PppSize_spud.ini
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/TE_PppSize_spud.xml
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/TE_SpudNetworkSideLoopbackCSY.ini
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/TE_SpudNetworkSideLoopbackCSY_serial.ini
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/TE_SpudNetworkSide_9x.ini
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/TE_SpudNetworkSide_Channel_config.txt
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/TE_SpudNetworkSide_PppLoopback.xml
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/qospolicies.ini
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/te_SpudNetworkSide.xml
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/te_SpudNetworkSide_nifman.xml
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/te_SpudNetworkSide_ppp.xml
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/te_spudNetworkSide.ini
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/te_spudNetworkSide_config_9x.txt
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/te_spudNetworkSide_nifman.ini
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/te_spudNetworkSide_nifman_config.txt
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/te_spudNetworkSide_nifman_config_9x.txt
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/group/TE_SpudNetworkSide.mmp
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/group/TE_spudNetworkSide.iby
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/group/bld.inf
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/scripts/TE_PppSize_spud.script
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/scripts/TE_SpudNetworkside_Channel.script
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/scripts/TE_spudNetworkSide.script
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/scripts/TE_spudNetworkSide_R4_and_R5.script
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/scripts/TE_spudNetworkSide_nifman.script
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/scripts/TE_spudNetworkSide_ppp.script
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/scripts/TE_spudNetworkSide_ppp_9x.script
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/scripts/version1/TE_PppSize_spud.script
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/scripts/version1/TE_SpudNetworkside_Channel.script
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/scripts/version1/TE_spudNetworkSide.script
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/scripts/version1/TE_spudNetworkSide_nifman.script
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/scripts/version1/TE_spudNetworkSide_ppp.script
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/scripts/version1/TE_spudNetworkSide_ppp_9x.script
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/src/spudNetSideQos.cpp
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/src/spudNetSideQos.h
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/src/te_spudNetworkSideR5Steps.cpp
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/src/te_spudNetworkSideR5Steps.h
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/src/te_spudNetworkSideServer.cpp
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/src/te_spudNetworkSideServer.h
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/src/te_spudNetworkSideSteps.cpp
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/src/te_spudNetworkSideSteps.h
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/bmarm/TE_SPUDRSUBCONNU.DEF
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/bwins/TE_SPUDRSUBCONNU.DEF
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/configs/spudRSubConnPPP.ini
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/configs/spudRSubConnPPP_config.txt
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/configs/spudRSubConnPPP_loopback.ini
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/configs/spudRSubConnPPP_loopback.xml
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/configs/spudRSubConnPPP_pcktloopback.ini
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/configs/spudRSubConnPPP_qospolicies.ini
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/configs/spud_staticip/connection.ini
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/configs/spud_staticip/simtsy.ini
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/configs/spud_staticip/socketserv.ini
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/configs/spud_staticip/subconnection.ini
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/configs/spud_staticip/te_spud_staticip.xml
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/configs/spud_staticip/te_spud_staticip_config.txt
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/configs/spud_staticip/te_spud_staticip_loopback.ini
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/group/TE_SpudRSubConn.mmp
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/group/TE_spudRSubConn.iby
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/group/bld.inf
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/scripts/TE_spudRSubConn.script
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/scripts/te_spud_staticip.script
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/src/te_spudRSubConnSteps.cpp
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/src/te_spudRSubConnSteps.h
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/src/te_spudRSubConnSvr.cpp
telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/src/te_spudRSubConnSvr.h
telephonyprotocols/umtsgprsscpr/Test/te_spud/BWINS/TE_SPUDUNITU.DEF
telephonyprotocols/umtsgprsscpr/Test/te_spud/group/TE_SpudUnit.iby
telephonyprotocols/umtsgprsscpr/Test/te_spud/group/TE_SpudUnit.mmp
telephonyprotocols/umtsgprsscpr/Test/te_spud/group/bld.inf
telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/CPdpFsmInterface.h
telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/CompareContextParameters.h
telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/DefaultContextParameters.h
telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/InputRequestListener.h
telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/PdpFsmInterfaceTest.h
telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/SpudManInterfaceTest.h
telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/SpudUnitTestServer.h
telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/SpudUnitTestStep.h
telephonyprotocols/umtsgprsscpr/Test/te_spud/scripts/TE_SpudUnitTest.script
telephonyprotocols/umtsgprsscpr/Test/te_spud/src/ActiveSchedulerThread.cpp
telephonyprotocols/umtsgprsscpr/Test/te_spud/src/CPdpFsmInterface.cpp
telephonyprotocols/umtsgprsscpr/Test/te_spud/src/CompareContextParameters.cpp
telephonyprotocols/umtsgprsscpr/Test/te_spud/src/DefaultContextParameters.cpp
telephonyprotocols/umtsgprsscpr/Test/te_spud/src/InputRequestListener.cpp
telephonyprotocols/umtsgprsscpr/Test/te_spud/src/PdpFsmInterfaceTest.cpp
telephonyprotocols/umtsgprsscpr/Test/te_spud/src/SpudFsmUnitTestStep.cpp
telephonyprotocols/umtsgprsscpr/Test/te_spud/src/SpudManInterfaceTest.cpp
telephonyprotocols/umtsgprsscpr/Test/te_spud/src/SpudTelUnitTestStep.cpp
telephonyprotocols/umtsgprsscpr/Test/te_spud/src/SpudUnitTestServer.cpp
telephonyprotocols/umtsgprsscpr/Test/te_spud/src/SpudUnitTestStepBase.cpp
telephonyprotocols/umtsgprsscpr/Test/te_spud/testdata/Spud_config.txt
telephonyprotocols/umtsgprsscpr/group/UmtsGprsSCPR.iby
telephonyprotocols/umtsgprsscpr/group/UmtsGprsSCPR.mmp
telephonyprotocols/umtsgprsscpr/group/bld.inf
telephonyprotocols/umtsgprsscpr/group/networking_UmtsGprsSCPR.mrp
telephonyprotocols/umtsgprsscpr/group/networking_umtsgprsscpr.history.xml
telephonyprotocols/umtsgprsscpr/inc/MPdpFsmInterface.h
telephonyprotocols/umtsgprsscpr/inc/MSpudManInterface.h
telephonyprotocols/umtsgprsscpr/inc/PdpFsmRequest.h
telephonyprotocols/umtsgprsscpr/inc/RSpudManInterface.h
telephonyprotocols/umtsgprsscpr/inc/UmtsGprs_defaultSubconnProv.h
telephonyprotocols/umtsgprsscpr/inc/UmtsGprs_defaultSubconnProv.inl
telephonyprotocols/umtsgprsscpr/inc/UmtsGprs_subconnProv.h
telephonyprotocols/umtsgprsscpr/inc/UmtsGprs_subconnProv.inl
telephonyprotocols/umtsgprsscpr/inc/UmtsGprs_subconnProvFactory.h
telephonyprotocols/umtsgprsscpr/spudfsm/inc/PDPFSM.h
telephonyprotocols/umtsgprsscpr/spudfsm/inc/pdpfsmnmspace.h
telephonyprotocols/umtsgprsscpr/spudfsm/src/PDPFSM.cpp
telephonyprotocols/umtsgprsscpr/spudfsm/src/PDPSCPRFSM.cpp
telephonyprotocols/umtsgprsscpr/spudfsm/src/cpdpfsm.cpp
telephonyprotocols/umtsgprsscpr/spudfsm/src/cpdpfsm.h
telephonyprotocols/umtsgprsscpr/spudfsm/src/cpdpfsmfactory.cpp
telephonyprotocols/umtsgprsscpr/spudfsm/src/cpdpfsmfactory.h
telephonyprotocols/umtsgprsscpr/spudfsm/src/spudfsmdebuglogger.h
telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstate.cpp
telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstate.h
telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstateactivatingprimary.cpp
telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstateactivatingsecondary.cpp
telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatechangingqos.cpp
telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatechangingtft.cpp
telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstateclosing.cpp
telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatecreatedSecondary.cpp
telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatecreatingSecondary.cpp
telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatecreatingprimary.cpp
telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstategettingnegqos.cpp
telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstateinitialised.cpp
telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatemodifingactive.cpp
telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstateopen.cpp
telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstateopeningphone.cpp
telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstates.h
telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatesettingqos.cpp
telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatesettingqosprimary.cpp
telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatesettingtft.cpp
telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatestopping.cpp
telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatesuspended.cpp
telephonyprotocols/umtsgprsscpr/spudtel/inc/ceteldrivercontext.h
telephonyprotocols/umtsgprsscpr/spudtel/inc/ceteldriverfactory.h
telephonyprotocols/umtsgprsscpr/spudtel/inc/ceteldrivernotifier.h
telephonyprotocols/umtsgprsscpr/spudtel/inc/cpdpconfigchangenotifier.h
telephonyprotocols/umtsgprsscpr/spudtel/inc/cpdpstatuschangenotifier.h
telephonyprotocols/umtsgprsscpr/spudtel/inc/cqoschangenotifier.h
telephonyprotocols/umtsgprsscpr/spudtel/inc/cservicechangenotifier.h
telephonyprotocols/umtsgprsscpr/spudtel/inc/cspudcontextelem.h
telephonyprotocols/umtsgprsscpr/spudtel/inc/eteldrivernmspace.h
telephonyprotocols/umtsgprsscpr/spudtel/inc/eteldriverstrategies.h
telephonyprotocols/umtsgprsscpr/spudtel/inc/meteldriverstrategy.h
telephonyprotocols/umtsgprsscpr/spudtel/inc/reteldriverinput.h
telephonyprotocols/umtsgprsscpr/spudtel/inc/spudteldebuglogger.h
telephonyprotocols/umtsgprsscpr/spudtel/src/ceteldrivercontext.cpp
telephonyprotocols/umtsgprsscpr/spudtel/src/ceteldriverfactory.cpp
telephonyprotocols/umtsgprsscpr/spudtel/src/ceteldrivernotifier.cpp
telephonyprotocols/umtsgprsscpr/spudtel/src/cpdpconfigchangenotifier.cpp
telephonyprotocols/umtsgprsscpr/spudtel/src/cpdpstatuschangenotifier.cpp
telephonyprotocols/umtsgprsscpr/spudtel/src/cqoschangenotifier.cpp
telephonyprotocols/umtsgprsscpr/spudtel/src/cservicechangenotifier.cpp
telephonyprotocols/umtsgprsscpr/spudtel/src/cspudcontextelem.cpp
telephonyprotocols/umtsgprsscpr/spudtel/src/eteldriverstrategies.cpp
telephonyprotocols/umtsgprsscpr/spudtel/src/reteldriverinput.cpp
telephonyprotocols/umtsgprsscpr/src/1020D45E.rss
telephonyprotocols/umtsgprsscpr/src/PdpFsmRequest.cpp
telephonyprotocols/umtsgprsscpr/src/RSpudManInterface.cpp
telephonyprotocols/umtsgprsscpr/src/UmtsGprs_defaultSubconnProv.cpp
telephonyprotocols/umtsgprsscpr/src/UmtsGprs_subconnProv.cpp
telephonyprotocols/umtsgprsscpr/src/UmtsGprs_subconnProvFactory.cpp
telephonyserverplugins/common_tsy/commontsy/inc/mmcustomtsy/CMmCustomTsy.h
telephonyserverplugins/common_tsy/commontsy/inc/mmcustomtsy/CMmPacketTsy.h
telephonyserverplugins/common_tsy/commontsy/inc/mmpacket/Cmmpacketservicetsy.h
telephonyserverplugins/common_tsy/commontsy/inc/mmutility/CMmSubTsyBase.h
telephonyserverplugins/common_tsy/commontsy/inc/mmutility/CMmTsyBase.h
telephonyserverplugins/common_tsy/commontsy/inc/mmutility/cmmtsyreqhandlestore.h
telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmCustomTsy.cpp
telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmPacketTsy.cpp
telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmcallgsmwcdmaext.cpp
telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketcontexttsy.cpp
telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketqostsy.cpp
telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketservicetsy.cpp
telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmmbmscontexttsy.cpp
telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmbroadcasttsy.cpp
telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmsstoragetsy.cpp
telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmstsy.cpp
telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmussdtsy.cpp
telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmenstoretsy.cpp
telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmonstoretsy.cpp
telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmphonebookstoretsy.cpp
telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmcalltsy.cpp
telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmconferencecalltsy.cpp
telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmlinetsy.cpp
telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmphonetsy.cpp
telephonyserverplugins/common_tsy/commontsy/src/mmutility/CMmTsyBase.cpp
telephonyserverplugins/common_tsy/commontsy/src/mmutility/cmmtsyreqhandlestore.cpp
telephonyserverplugins/common_tsy/customapi/bwins/CUSTOMAPIU.def
telephonyserverplugins/common_tsy/customapi/eabi/customapiU.def
telephonyserverplugins/common_tsy/customapi/inc/RMmCustomAPI.h
telephonyserverplugins/common_tsy/test/component/group/te_ctsy_component.mmp
telephonyserverplugins/common_tsy/test/component/inc/cctsyfixeddiallingfu.h
telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/eabi/mocklicenseetsyu.def
telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/bwins/mockltsydllu.def
telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/eabi/mockltsydllu.def
telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_fixeddialling_individual.script
telephonyserverplugins/common_tsy/test/component/src/cctsycallcontrolfu.cpp
telephonyserverplugins/common_tsy/test/component/src/cctsycustomipcfu.cpp
telephonyserverplugins/common_tsy/test/component/src/cctsyfixeddiallingfu.cpp
telephonyserverplugins/ctsydispatchlayer/src/ltsylogger.cpp
telephonyserverplugins/multimodetsy/Multimode/gprs/Gprs.cpp
telephonyserverplugins/multimodetsy/Multimode/mSLOGGER.CPP
telephonyserverplugins/multimodetsy/hayes/SCHAT.CPP
telephonyserverplugins/simtsy/group/bld.inf
telephonyserverplugins/simtsy/src/CSimPacketService.cpp
telephonyserverplugins/simtsy/testconfigfileparser/bmarm/TESTCONFIGFILEPARSERU.DEF
telephonyserverplugins/simtsy/testconfigfileparser/bwins/TESTCONFIGFILEPARSERU.DEF
telephonyserverplugins/simtsy/testconfigfileparser/eabi/testconfigfileparserU.def
telephonyserverplugins/simtsy/testconfigfileparser/group/bld.inf
telephonyserverplugins/simtsy/testconfigfileparser/group/testconfigfileparser.iby
telephonyserverplugins/simtsy/testconfigfileparser/group/testconfigfileparser.mmp
telephonyserverplugins/simtsy/testconfigfileparser/group/tools_testconfigfileparser.history.xml
telephonyserverplugins/simtsy/testconfigfileparser/group/tools_testconfigfileparser.mrp
telephonyserverplugins/simtsy/testconfigfileparser/inc/testconfigfileparser.h
telephonyserverplugins/simtsy/testconfigfileparser/inc/testconfigfileparser.inl
telephonyserverplugins/simtsy/testconfigfileparser/src/testconfigfile.cpp
telephonyserverplugins/simtsy/testconfigfileparser/src/testconfigitem.cpp
telephonyserverplugins/simtsy/testconfigfileparser/src/testconfigsection.cpp
telephonyserverplugins/simtsy/testconfigfileparser/test/t_testconfigfileparser.cpp
telephonyserverplugins/simtsy/testconfigfileparser/test/t_testconfigfileparser.mmp
telephonyserverplugins/simtsy/testconfigfileparser/test/t_testconfigfileparser.txt
telephonyserverplugins/simtsy/testconfigfileparser/test/t_testconfigfileparser2.txt
telephonyutils/telephonywatchers/group/telwatcher_test.pkg
wapstack/wapmessageapi/group/wapmessage_test.pkg
--- a/package_definition.xml	Mon Aug 09 17:43:08 2010 +0100
+++ b/package_definition.xml	Tue Sep 14 17:55:14 2010 +0100
@@ -36,9 +36,6 @@
       <component id="qosextnapi" name="QoS Extn API" introduced="9.2" purpose="optional">
         <unit bldFile="telephonyprotocols/qosextnapi/group" mrp="telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
       </component>
-      <component id="secondarypdpcontextumtsdriver" name="Secondary PDP Context UMTS Driver" introduced="8.1" deprecated="^3" purpose="optional" filter="test">
-        <unit bldFile="telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-      </component>
       <component id="qos3gppcpr" name="QoS 3GPP CPR" introduced="9.2" purpose="optional" class="plugin">
         <unit bldFile="telephonyprotocols/qos3gppcpr/group" mrp="telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
       </component>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/smsprot/Group/sms_test.pkg	Tue Sep 14 17:55:14 2010 +0100
@@ -0,0 +1,17 @@
+// Copyright (c) 2007-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:
+//
+
+"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_SMSSTOR\te_smsstor.script"-"c:\testdata\scripts\te_smsstor.script"
+"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_Smsprt\Te_SMSStackOutOfDiskSpace.script"-"c:\testdata\scripts\Te_SMSStackOutOfDiskSpace.script"
--- a/smsprotocols/smsstack/smsprot/Group/smsport_test.pkg	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-// Copyright (c) 2007-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:
-//
-
-
-"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_SMSEMSPRT\TE_SMSEMSPRT.script"-"c:\testdata\scripts\TE_SMSEMSPRT.script"
-"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_SMSEMSPRT\te_smsemsprt_commdb.cfg"-"c:\testdata\scripts\te_smsemsprt_commdb.cfg"
-
-"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_SMSPRTSTRESS\te_smsprtstress.script"-"c:\testdata\scripts\te_smsprtstress.script"
-"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_SMSPRTSTRESS\te_smsprtstress_commdb.cfg"-"c:\testdata\scripts\te_smsprtstress_commdb.cfg"
-
-
-"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_SMSSTOR\te_smsstor.script"-"c:\testdata\scripts\te_smsstor.script"
-
-"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_Smsprt\TE_smsprt_gsmu.script"-"c:\testdata\scripts\TE_smsprt_gsmu.script"
-"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_Smsprt\TE_smsprt_prot.script"-"c:\testdata\scripts\TE_smsprt_prot.script"
-"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_Smsprt\TE_smsprt_smsstack.script"-"c:\testdata\scripts\TE_smsprt_smsstack.script"
-
-"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_Smsprt\Te_SMSStackOutOfDiskSpace.script"-"c:\testdata\scripts\Te_SMSStackOutOfDiskSpace.script"
-"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_Smsprt\TE_SetupSMSStackOutOfDiskSpace.script"-"c:\testdata\scripts\TE_SetupSMSStackOutOfDiskSpace.script"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/smsprot/Group/smsprt_test.pkg	Tue Sep 14 17:55:14 2010 +0100
@@ -0,0 +1,26 @@
+// Copyright (c) 2007-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:
+//
+
+
+"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_SMSEMSPRT\TE_SMSEMSPRT.script"-"c:\testdata\scripts\TE_SMSEMSPRT.script"
+"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_SMSEMSPRT\te_smsemsprt_commdb.cfg"-"c:\testdata\scripts\te_smsemsprt_commdb.cfg"
+
+"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_SMSPRTSTRESS\te_smsprtstress.script"-"c:\testdata\scripts\te_smsprtstress.script"
+"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_SMSPRTSTRESS\te_smsprtstress_commdb.cfg"-"c:\testdata\scripts\te_smsprtstress_commdb.cfg"
+
+"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_Smsprt\TE_smsprt_gsmu.script"-"c:\testdata\scripts\TE_smsprt_gsmu.script"
+"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_Smsprt\TE_smsprt_prot.script"-"c:\testdata\scripts\TE_smsprt_prot.script"
+"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_Smsprt\TE_smsprt_smsstack.script"-"c:\testdata\scripts\TE_smsprt_smsstack.script"
+
--- a/smsprotocols/smsstack/smsprot/Src/smspclass0stor.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/smsprotocols/smsstack/smsprot/Src/smspclass0stor.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -996,10 +996,12 @@
 void CPreallocatedFile::OpenL()
 	{
 	User::LeaveIfError(iFile.Open(iFs, iFileName->Des(), EFileShareExclusive|EFileRead|EFileWrite));
+	CleanupClosePushL(iFile);
 	// Check the validity of the data.
 	CheckDataL();
 	// Internalize data
 	InternalizeEntryArrayL();
+	CleanupStack::Pop(&iFile);
 	}
 
 /**
--- a/smsprotocols/smsstack/wapprot/Group/wapport_test.pkg	Mon Aug 09 17:43:08 2010 +0100
+++ b/smsprotocols/smsstack/wapprot/Group/wapport_test.pkg	Tue Sep 14 17:55:14 2010 +0100
@@ -15,11 +15,8 @@
 
 
 "\sf\os\cellularsrv\smsprotocols\smsstack\wapprot\Test\TE_WAPDGRM\TE_wapdgrm.script"-"c:\testdata\scripts\TE_wapdgrm.script"
-
 "\sf\os\cellularsrv\smsprotocols\smsstack\wapprot\Test\TE_WAPTHDR\TE_wapthdr.script"-"c:\testdata\scripts\TE_wapthdr.script"
-"\sf\os\cellularsrv\smsprotocols\smsstack\wapprot\Test\TE_WAPTHDR\TE_wapthdr_setup.script"-"c:\testdata\scripts\TE_wapthdr_setup.script"
-
 "\sf\os\cellularsrv\smsprotocols\smsstack\wapprot\Test\Te_wapprot\Te_WapProt.script"-"c:\testdata\scripts\Te_WapProt.script"
-"\sf\os\cellularsrv\smsprotocols\smsstack\wapprot\Test\Te_wapprot\Te_WapStackOutOfDiskSpace_ARM_UREL.script"-"c:\testdata\scripts\Te_WapStackOutOfDiskSpace_ARM_UREL.script"
+"\sf\os\cellularsrv\smsprotocols\smsstack\wapprot\Test\Te_wapprot\Te_WapStackOutOfDiskSpace.script"-"c:\testdata\scripts\Te_WapStackOutOfDiskSpace.script"
 
 
--- a/smsprotocols/smsstack/wapprot/test/Te_wapprot/TE_WapProt.mmp	Mon Aug 09 17:43:08 2010 +0100
+++ b/smsprotocols/smsstack/wapprot/test/Te_wapprot/TE_WapProt.mmp	Tue Sep 14 17:55:14 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -30,8 +30,7 @@
 USERINCLUDE	  ../../../test
 USERINCLUDE	  ../../../smsprot/Inc
 
-MW_LAYER_SYSTEMINCLUDE_SYMBIAN
-
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 LIBRARY		euser.lib
 LIBRARY		etel.lib
 LIBRARY		smsu.lib
@@ -41,7 +40,6 @@
 LIBRARY		testexecutelogclient.lib
 LIBRARY		c32root.lib
 LIBRARY		efsrv.lib
-LIBRARY		sbeclient.lib
 LIBRARY		estor.lib
 LIBRARY     smsstacktestutilities.lib
 
--- a/smsprotocols/smsstack/wapprot/test/Te_wapprot/Te_WapProt.script	Mon Aug 09 17:43:08 2010 +0100
+++ b/smsprotocols/smsstack/wapprot/test/Te_wapprot/Te_WapProt.script	Tue Sep 14 17:55:14 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -207,18 +207,6 @@
 
 END_TESTCASE SMS-SMSStack-NA-8015
 
-START_TESTCASE SMS-SMSStack-NA-8014
-//!@SYMTestCaseID SMS-SMSStack-NA-8014
-//!@SYMREQ REQ0000
-//!@SYMTestCaseDesc IoctlStep_16
-//!@SYMTestPriority critical
-//!@SYMTestActions IoctlStep 16
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 100 TE_WapProt  BackupRestoreStep z:\testdata\configs\WapProtSuite\WapProtSuite.ini TestStep16
-
-END_TESTCASE SMS-SMSStack-NA-8014
-
 START_TESTCASE                 SMS-SMSStack-NA-8017
 //! @SYMTestCaseID               SMS-SMSStack-NA-8017
 //! @SYMTestCaseDesc             Sends a 7_Bit business card. Using IOCTL query SMS transport parameters
--- a/smsprotocols/smsstack/wapprot/test/Te_wapprot/WapIoctlSteps.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/smsprotocols/smsstack/wapprot/test/Te_wapprot/WapIoctlSteps.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -666,202 +666,6 @@
 	iSocket.Close();
 	return TestStepResult();
 	}
-
-TInt CBackupRestoreStep::SendWapL()
-	{
-	//modified from test 10
-	INFO_PRINTF1(_L("SendWapL: send 7-Bit business card using IOCTL"));
-
-	TInt ret = KErrNone;
-
-	TPtrC16 TelNumber;
-	TInt port=226;
-
-	if(!GetStringFromConfig(ConfigSection(),KSCNumber,TelNumber) ||
-	   !GetIntFromConfig(ConfigSection(),KWapPort,port)
-		)
-		{
-		// Leave if there's any error.
-		User::Leave(KErrNotFound);
-		}
-	
-	//
-	//	Setting the port number and service center number of the wap address
-	//	The service center number should be the same as the sim phone number used
-	//  for test (not required for SIM tsy)
-	//
-	TWapAddr wapAddr;
-	wapAddr.SetWapPort(TWapPortNumber(port));
-
-	TBuf8<100> scNumber;
-	scNumber.Copy(TelNumber);
-	TPtrC8 scAddr(scNumber);
-	wapAddr.SetWapAddress(scAddr);
-
-	//
-	//	Define and open the socket
-	//
-	RSocket sock;
-	ret = sock.Open(iSocketServer,KWAPSMSAddrFamily,KSockDatagram,KWAPSMSDatagramProtocol);
-	if (ret != KErrNone)
-		{
-		//
-		// PREQ399 changes mean that -1 is sometimes now returned from Open() when
-		// a Backup and Restore session is in progress (DEF114381).
-		//
-		INFO_PRINTF2(_L("Socket could not be opened (error %d)..."), ret);
-
-		return ret;
-		}
-	CleanupClosePushL(sock);
-
-	TRequestStatus status;
-
-	//
-	//	Indicating to the protocol that it's a new client
-	//
-	INFO_PRINTF1(_L("Socket set option for indicating new client"));
-	User::LeaveIfError(sock.SetOpt(KWapSmsOptionNewStyleClient,KWapSmsOptionLevel, 0));
-	//
-	//	Bind
-	//
-	User::LeaveIfError(sock.Bind(wapAddr));
-	
-    TTimeIntervalMicroSeconds32 InitPause=9000000;  //Pause to Allow SMSStack to Complete its Async Init
-    User::After(InitPause);                         //call to the TSY and finish its StartUp.
-
-	//
-	//	Send a calendar entry
-	//
-    TPtrC testData = GetStringFromConfigL(KTestData1);
-	TBuf8<200> data;
-	data.Copy(testData);
-	sock.SendTo(data, wapAddr, 0, status);
-	User::WaitForRequest(status);
-	ret = status.Int();
-
-	if(ret == KErrNone)
-		{
-		INFO_PRINTF1(_L("Message sent..."));
-		}
-	else
-		{
-		INFO_PRINTF2(_L("Message NOT sent (error %d)..."), ret);
-		}
-
-	CleanupStack::PopAndDestroy(&sock);
-	return ret;
-	}
-
-TBool CBackupRestoreStep::IsWapFileOpenL()
-	{
-	TBool ret = ETrue; //assume the file was open
-	RFs fsSession;
-	User::LeaveIfError(fsSession.Connect());
-	CleanupClosePushL(fsSession);
-
-	CFileMan*  fileManager = CFileMan::NewL(fsSession);
-	CleanupStack::PushL(fileManager);
-
-	_LIT(KWapFile,"C:\\Private\\101F7989\\sms\\wapreast.dat");
-	_LIT(KWapFileBackup,"C:\\Private\\101f7989\\sms\\wapreast.backup");
-
-	TEntry entry;
-	if (fsSession.Entry(KWapFile,entry)==KErrNone)  //  File found
-		{
-		TInt moveStatus = fileManager->Move(KWapFile,KWapFileBackup);
-		TESTL(moveStatus == KErrNone || moveStatus == KErrInUse);
-
-		// If the move was successful, the file is not opened
-		// If the move failed with KErrInUse the file is opened
-		if (moveStatus == KErrNone)
-			{
-			// move it back
-			TEST(fileManager->Move(KWapFileBackup,KWapFile) == KErrNone);
-			ret = EFalse;
-			}
-		else // moveStatus == KErrInUse
-			{
-			ret = ETrue;
-			}
-		}
-	else
-		{
-		//file not found so it couldn't be open
-		ret = EFalse;
-		}
-
-	CleanupStack::PopAndDestroy(fileManager);
-	CleanupStack::PopAndDestroy(&fsSession);
-
-	if(ret)
-		INFO_PRINTF1(_L("Wapfile open..."));
-	else
-		INFO_PRINTF1(_L("Wapfile closed..."));
-
-	return ret;
-	}
-
-TVerdict CBackupRestoreStep::doTestStepL()
-/**
- *  Test step 16:
- *  simulating backup and restore
- *  @return - TVerdict code
- */
-	{
-    INFO_PRINTF1(_L("IOCTL Test step 16: send 7-Bit business card using IOCTL to test backup and restore"));
-    CSBEClient*  secureBackupEngine = CSBEClient::NewL();
-    CleanupStack::PushL(secureBackupEngine);
-    secureBackupEngine->SetBURModeL(TDriveList(_L8("C")),
-                                     EBURNormal, ENoBackup);
-
-	INFO_PRINTF1(_L("Expecting SendWapL to succeed and the wap data file to be open"));
-	TEST(SendWapL() == KErrNone);
-	TEST(IsWapFileOpenL() != EFalse);
-
-	// Notify the WAPPROT server that a backup is about to take place and
-	// that the server should close the wapstor
-	INFO_PRINTF1(_L("Simulating a backup notification"));
-	secureBackupEngine->SetBURModeL(TDriveList(_L8("C")),
-									 EBURBackupFull, EBackupBase);
-
-	INFO_PRINTF1(_L("Expecting SendWapL to fail and the wap data file to be closed"));
-	TEST(SendWapL() != KErrNone);
-	TEST(IsWapFileOpenL() == EFalse);
-
-	// Notify the WAPPROT server that a backup has completed
-	// that the server should open the wapstor
-	INFO_PRINTF1(_L("Simulating a backup complete notification"));
-	secureBackupEngine->SetBURModeL(TDriveList(_L8("C")),
-									 EBURNormal, ENoBackup);
-
-	INFO_PRINTF1(_L("Expecting SendWapL to succeed and the wap data file to be open"));
-	TEST(SendWapL() == KErrNone);
-	TEST(IsWapFileOpenL() != EFalse);
-
-	// Notify the WAPPROT server that a restore is about to take place and
-	// that the server should close the wapstor
-	INFO_PRINTF1(_L("Simulating a restore notification"));
-	secureBackupEngine->SetBURModeL(TDriveList(_L8("C")),
-									 EBURRestorePartial, EBackupIncrement);
-
-	INFO_PRINTF1(_L("Expecting SendWapL to fail and the wap data file to be closed"));
-	TEST(SendWapL() != KErrNone);
-	TEST(IsWapFileOpenL() == EFalse);
-
-	// Notify the WAPPROT server that a restore has completed
-	// that the server should open the wapstor
-	INFO_PRINTF1(_L("Simulating a restore complete notification"));
-	secureBackupEngine->SetBURModeL(TDriveList(_L8("C")),
-									 EBURNormal, ENoBackup);
-
-	INFO_PRINTF1(_L("Expecting SendWapL to succeed and the wap data file to be open"));
-	TEST(SendWapL() == KErrNone);
-	TEST(IsWapFileOpenL() != EFalse);
-	
-    CleanupStack::PopAndDestroy(secureBackupEngine); // testNumberProperty, secureBackupEngine
-	return TestStepResult();
-	}
 	
 TVerdict CIoctlStep_17::doTestStepL()
 /**
--- a/smsprotocols/smsstack/wapprot/test/Te_wapprot/WapIoctlSteps.h	Mon Aug 09 17:43:08 2010 +0100
+++ b/smsprotocols/smsstack/wapprot/test/Te_wapprot/WapIoctlSteps.h	Tue Sep 14 17:55:14 2010 +0100
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -160,19 +160,6 @@
 	virtual TVerdict doTestStepL();
 	};
 
-class CBackupRestoreStep : public CWapProtSuiteStepBase
-/**
- *  Simulating client crash conditions with 8bit message
- */
-	{
-public:
-	virtual TVerdict doTestStepL();
-
-private:
-	TInt SendWapL();
-	TBool IsWapFileOpenL();
-	};
-
 class CIoctlStep_17 : public CWapProtSuiteStepBase
 /**
  *  Sends a 7_Bit business card. Using IOCTL query SMS transport parameters
--- a/smsprotocols/smsstack/wapprot/test/Te_wapprot/WapProtSuite.ini	Mon Aug 09 17:43:08 2010 +0100
+++ b/smsprotocols/smsstack/wapprot/test/Te_wapprot/WapProtSuite.ini	Tue Sep 14 17:55:14 2010 +0100
@@ -83,12 +83,6 @@
 Service_Center=+447765222315
 Wap_Port=9204
 
-[TestStep16]
-testNumber=16
-Test_Data1=BEGIN:VCARD\r\nVERSION:2.1\r\nFN:Jal\r\nN:Jal\r\nORG:PanSoftware\r\nTITLE:Director\r\nLABEL:Islington\r\nEND:VCARD\r\n
-Service_Center=+447765222315
-Wap_Port=2948
-
 [TestStep17_TestWapDatagramSegmentContainingNoData]
 testNumber=36
 Service_Center=+447765222315
--- a/smsprotocols/smsstack/wapprot/test/Te_wapprot/WapProtSuiteServer.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/smsprotocols/smsstack/wapprot/test/Te_wapprot/WapProtSuiteServer.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-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"
@@ -170,10 +170,6 @@
 		{
 		testStep = new CIoctlStep_15();
 		}
-	else if (aStepName == _L("BackupRestoreStep"))
-		{
-		testStep = new CBackupRestoreStep();
-		}
 	else if (aStepName == _L("IoctlStep_17"))
 		{
 		testStep = new CIoctlStep_17();
--- a/smsprotocols/smsstack/wapprot/test/Te_wapprot/WapProtSuiteStepBase.h	Mon Aug 09 17:43:08 2010 +0100
+++ b/smsprotocols/smsstack/wapprot/test/Te_wapprot/WapProtSuiteStepBase.h	Tue Sep 14 17:55:14 2010 +0100
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -25,7 +25,6 @@
 
 #include "smsstackbaseteststeps.h"
 
-#include <connect/sbeclient.h>
 #include <es_wsms.h>
 #include <etelmm.h>
 
@@ -38,8 +37,6 @@
 #define LDD_NAME _L("ECOMM")
 #endif
 
-using namespace conn;
-
 class CWapProtSuiteStepBase : public CSmsBaseTestStep
 	{
 public:
--- a/telephonyprotocols/csdagt/group/CSD.MMP	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/csdagt/group/CSD.MMP	Tue Sep 14 17:55:14 2010 +0100
@@ -59,12 +59,12 @@
 
 LIBRARY			commsdat.lib
 
-#if defined(WINS)
+#if defined(EABI)
+deffile    /epoc32/include/def/eabi/agent.def
+#elif defined(WINS)
 deffile    /epoc32/release/wins/agent.def
-#elif defined(GCC32)
+#else
 deffile    /epoc32/release/marm/agent.def
-#else
-deffile    /epoc32/include/def/eabi/agent.def
 #endif
 
 START WINS
--- a/telephonyprotocols/csdagt/script/SCHAT.CPP	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/csdagt/script/SCHAT.CPP	Tue Sep 14 17:55:14 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -114,7 +114,6 @@
 			: (cs->LastChar()==aChar && Match(cs)) )
 			{
 			iNotify->ChatStringMatch(index);
-			cs=iter;	// In case user removed cs;
 			}
 		index++;
 		}
--- a/telephonyprotocols/pdplayer/group/pdp.mmp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/group/pdp.mmp	Tue Sep 14 17:55:14 2010 +0100
@@ -41,11 +41,9 @@
 SOURCE		PDPConfig.cpp
 SOURCE		ecom_impl.cpp
 SOURCE		psdavailabilitylistener.cpp
-SOURCE		pdptiermanagerfactory.cpp
-SOURCE		pdptiermanager.cpp
 SOURCE		pdpservices.cpp
 SOURCE		mbmsengine.cpp
-SOURCE		pdptiermanagerselector.cpp
+
 SOURCE		PDPCPR.cpp
 SOURCE		PDPCPRFactory.cpp
 #ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
@@ -53,6 +51,15 @@
 #endif // SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 SOURCE		AuthenticationDialog.cpp
 
+// tier manager
+SOURCE    pdptiermanagerfactory.cpp
+SOURCE    pdptiermanager.cpp
+SOURCE    pdptiermanagerselector.cpp
+#ifdef SYMBIAN_NETWORKING_CONTENTION_MANAGEMENT
+SOURCE    pdp_contention.cpp
+#endif
+
+
 SOURCEPATH      ../umts/spudfsm/src
 SOURCE          PDPSCPRFSM.cpp
 SOURCE          cpdpfsm.cpp
--- a/telephonyprotocols/pdplayer/inc/PDPFSM.h	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/inc/PDPFSM.h	Tue Sep 14 17:55:14 2010 +0100
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-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"
@@ -151,6 +151,8 @@
 		return iUmtsRelease;
 		}
 
+	const TName& GetContextName(TContextId aPdpId);
+
  protected:
  private:
 	// DO NOT provide implementations to these methods: Copying this object should be disabled
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/pdplayer/inc/pdp_contention.h	Tue Sep 14 17:55:14 2010 +0100
@@ -0,0 +1,159 @@
+/**
+* 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:
+* Header file declaring the RawIP Provisioning structures.
+* 
+*
+*/
+
+/**
+ @file
+ @internalTechnology
+*/
+
+#ifdef SYMBIAN_NETWORKING_CONTENTION_MANAGEMENT
+
+#ifndef PDP_CONTENTION_H
+#define PDP_CONTENTION_H
+
+#include <comms-infras/contentionmanager.h>
+
+class CMBMSEngine;
+class CContextStatusMonitor;
+class CContextTypeChecker;
+
+
+class MContextEventsObserver
+    {
+public:
+    virtual void PrimaryContextAddedL(const TName* aContextName) = 0;
+    virtual void SecondaryContextAdded(const TName* aContextName) = 0;
+    virtual void PrimaryContextDeleted(const CContextStatusMonitor* aContextStatusMonitor) = 0;
+    virtual void ContextMonitoringError(const CContextStatusMonitor* aContextStatusMonitor, TInt aError) = 0;
+    virtual void ContextTypeCheckingError(const TName* aContextName, TInt aError) = 0;
+    };
+
+class CContextStatusMonitor : public CActive
+    {
+public:
+    CContextStatusMonitor(RPacketService& aPacketService, MContextEventsObserver& aCallback);
+    ~CContextStatusMonitor();
+
+public:
+    TBool StartL(const TName& aContextName);
+    inline TBool IsPassedThroughActiveState() const;
+
+private:
+    void RunL();
+    void DoCancel();
+    TInt RunError(TInt aError);
+
+private:
+    RPacketService& iPacketService;
+    RPacketContext iPacketContext;
+    RPacketContext::TContextStatus iContextStatus;
+    MContextEventsObserver& iCallback;
+    TName iContextName;
+    TBool iWasActive;
+    };
+
+
+class CPrimaryContextsMonitor : public CActive, MContextEventsObserver
+    {
+    enum TState {EEnumeratingContexts, EGettingInfo, EListening};
+public:
+    CPrimaryContextsMonitor(RPacketService& aPacketService, MContentionObserver& aCallback);
+    ~CPrimaryContextsMonitor();
+public:
+    void StartL();
+
+// from MContextEventsObserver
+    void PrimaryContextAddedL(const TName* aContextName);
+    void SecondaryContextAdded(const TName* aContextName);
+    void PrimaryContextDeleted(const CContextStatusMonitor* aContextStatusMonitor);
+    void ContextMonitoringError(const CContextStatusMonitor* aContextStatusMonitor, TInt aError);
+    void ContextTypeCheckingError(const TName* aContextName, TInt aError);
+
+private:
+    void RunL();
+    void DoCancel();
+    TInt RunError(TInt aError);
+    void DeleteContextStatusMonitor(const CContextStatusMonitor* aContextStatusMonitor);
+    void SwitchStateL();
+    void StartContextStatusMonitoringL(const TName& aContextName);
+    void RemoveContextNameAndCheckNext(const TName* aContextName);
+    void ProcessError(TInt aError);
+
+private:
+    RPointerArray<CContextStatusMonitor> iContextMonitors;
+    RPointerArray<TName> iAddedContextsNames;
+    CContextTypeChecker* iContextTypeChecker;
+    RPacketService& iPacketService;
+    TState iState;
+    RPacketService::TNifInfoV2 iCurrentNifInfo;
+    TInt iInitialNifsCount;
+    TInt iCurrentNifIndex;
+    TBool iFirstContextAdded;
+    MContentionObserver& iCallback;
+    };
+
+class CContextTypeChecker : public CActive
+    {
+public:
+    CContextTypeChecker(RPacketService& aPacketService, MContextEventsObserver& aCallback);
+    ~CContextTypeChecker();
+
+public:
+    void Start(const TName* aContextName);
+    void RunL();
+    TInt RunError(TInt aError);
+    void DoCancel();
+
+private:
+    RPacketService& iPacketService;
+    const TName* iContextName;
+    MContextEventsObserver& iCallback;
+    TInt iCountInNif;
+    };
+
+class CPdpContentionManager : public CContentionManager
+    {
+public:
+    static CPdpContentionManager* NewL(const ESock::CTierManagerBase& aTierManager, RPacketService& aPacketService);
+    ~CPdpContentionManager();
+
+public:
+    void StartMonitoringL();
+
+private:
+    void ConstructL(RPacketService& aPacketService);
+    CPdpContentionManager(const ESock::CTierManagerBase& aTierManager);
+
+private:
+    // from CContentionManager
+    virtual void ContentionResolved(const TContentionRequestItem& aContentionRequest, TBool aResult);
+    virtual void ContentionOccured(ESock::CMetaConnectionProviderBase& aMcpr);
+    virtual void ReportContentionAvailabilityStatus(ESock::CMetaConnectionProviderBase& aMcpr, const ESock::TAvailabilityStatus& aStatus) const;
+    
+private:
+    CPrimaryContextsMonitor* iPrimaryContextsMonitor;
+    };
+
+inline TBool CContextStatusMonitor::IsPassedThroughActiveState() const
+    {
+    return iWasActive;
+    }
+#endif
+
+#endif
--- a/telephonyprotocols/pdplayer/inc/pdpmcpr.h	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/inc/pdpmcpr.h	Tue Sep 14 17:55:14 2010 +0100
@@ -57,9 +57,11 @@
 	virtual ~CPdpMetaConnectionProvider();
 
 public:
+#ifdef SYMBIAN_NETWORKING_CONTENTION_MANAGEMENT
 	void ContentionResolved(const Messages::TNodeId& aPendingCprId, TBool aResult);
 	void ContentionOccured();
 	void ReportContentionAvailabilityStatus(const ESock::TAvailabilityStatus& aStatus) const;
+#endif
 	
 protected:
     CPdpMetaConnectionProvider(ESock::CMetaConnectionProviderFactoryBase& aFactory, const ESock::TProviderInfo& aProviderInfo);
--- a/telephonyprotocols/pdplayer/inc/pdptiermanager.h	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/inc/pdptiermanager.h	Tue Sep 14 17:55:14 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -24,6 +24,7 @@
 #include <comms-infras/coretiermanager.h>
 #include <comms-infras/contentionmanager.h>
 #include <etelpckt.h>
+#include <pdp_contention.h>
 using namespace ESock;
 
 class CMBMSEngine;
@@ -37,121 +38,6 @@
 	virtual void PacketServiceAttachedCallbackL() = 0;
 	};
 
-class MContextEventsObserver
-	{
-public:
-	virtual void PrimaryContextAddedL(const TName* aContextName) = 0;
-	virtual void SecondaryContextAdded(const TName* aContextName) = 0;
-	virtual void PrimaryContextDeleted(const CContextStatusMonitor* aContextStatusMonitor) = 0;
-	virtual void ContextMonitoringError(const CContextStatusMonitor* aContextStatusMonitor, TInt aError) = 0;
-	virtual void ContextTypeCheckingError(const TName* aContextName, TInt aError) = 0;
-	};
-
-class CContextStatusMonitor : public CActive
-	{
-public:
-	CContextStatusMonitor(RPacketService& aPacketService, MContextEventsObserver& aCallback);
-	~CContextStatusMonitor();
-
-public:
-	TBool StartL(const TName& aContextName);
-	inline TBool IsPassedThroughActiveState() const;
-
-private:
-	void RunL();
-	void DoCancel();
-	TInt RunError(TInt aError);
-
-private:
-	RPacketService& iPacketService;
-	RPacketContext iPacketContext;
-	RPacketContext::TContextStatus iContextStatus;
-	MContextEventsObserver& iCallback;
-	TName iContextName;
-	TBool iWasActive;
-	};
-
-
-class CPrimaryContextsMonitor : public CActive, MContextEventsObserver
-	{
-	enum TState {EEnumeratingContexts, EGettingInfo, EListening};
-public:
-	CPrimaryContextsMonitor(RPacketService& aPacketService, MContentionObserver& aCallback);
-	~CPrimaryContextsMonitor();
-public:
-	void StartL();
-
-// from MContextEventsObserver
-	void PrimaryContextAddedL(const TName* aContextName);
-	void SecondaryContextAdded(const TName* aContextName);
-	void PrimaryContextDeleted(const CContextStatusMonitor* aContextStatusMonitor);
-	void ContextMonitoringError(const CContextStatusMonitor* aContextStatusMonitor, TInt aError);
-	void ContextTypeCheckingError(const TName* aContextName, TInt aError);
-
-private:
-	void RunL();
-	void DoCancel();
-	TInt RunError(TInt aError);
-	void DeleteContextStatusMonitor(const CContextStatusMonitor* aContextStatusMonitor);
-	void SwitchStateL();
-	void StartContextStatusMonitoringL(const TName& aContextName);
-	void RemoveContextNameAndCheckNext(const TName* aContextName);
-	void ProcessError(TInt aError);
-
-private:
-	RPointerArray<CContextStatusMonitor> iContextMonitors;
-	RPointerArray<TName> iAddedContextsNames;
-	CContextTypeChecker* iContextTypeChecker;
-	RPacketService& iPacketService;
-	TState iState;
-	RPacketService::TNifInfoV2 iCurrentNifInfo;
-	TInt iInitialNifsCount;
-	TInt iCurrentNifIndex;
-	TBool iFirstContextAdded;
-	MContentionObserver& iCallback;
-	};
-
-class CContextTypeChecker : public CActive
-	{
-public:
-	CContextTypeChecker(RPacketService& aPacketService, MContextEventsObserver& aCallback);
-	~CContextTypeChecker();
-
-public:
-	void Start(const TName* aContextName);
-	void RunL();
-	TInt RunError(TInt aError);
-	void DoCancel();
-
-private:
-	RPacketService& iPacketService;
-	const TName* iContextName;
-	MContextEventsObserver& iCallback;
-	TInt iCountInNif;
-	};
-
-class CPdpContentionManager : public CContentionManager
-	{
-public:
-	static CPdpContentionManager* NewL(const ESock::CTierManagerBase& aTierManager, RPacketService& aPacketService);
-	~CPdpContentionManager();
-
-public:
-	void StartMonitoringL();
-
-private:
-	void ConstructL(RPacketService& aPacketService);
-	CPdpContentionManager(const ESock::CTierManagerBase& aTierManager);
-
-private:
-	// from CContentionManager
-	virtual void ContentionResolved(const TContentionRequestItem& aContentionRequest, TBool aResult);
-	virtual void ContentionOccured(ESock::CMetaConnectionProviderBase& aMcpr);
-	virtual void ReportContentionAvailabilityStatus(ESock::CMetaConnectionProviderBase& aMcpr, const ESock::TAvailabilityStatus& aStatus) const;
-	
-private:
-	CPrimaryContextsMonitor* iPrimaryContextsMonitor;
-	};
 
 //PDP Tier Manager
 class CPDPTierManager : public CCoreTierManager, public MPacketServiceNotifier
@@ -176,13 +62,13 @@
 
 private:
 	CMBMSEngine* iMBMSEngine;
+#ifdef SYMBIAN_NETWORKING_CONTENTION_MANAGEMENT
 	CPdpContentionManager* iPdpContentionManager;
+#endif
+	
 	};
 
-inline TBool CContextStatusMonitor::IsPassedThroughActiveState() const
-	{
-	return iWasActive;
-	}
+
 
 #endif // SYMBIAN_PDPTIERMANAGER_H
 
--- a/telephonyprotocols/pdplayer/inc/psdavailabilitylistener.h	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/inc/psdavailabilitylistener.h	Tue Sep 14 17:55:14 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -34,8 +34,11 @@
 public:
 	static CPsdAvailabilityListener* NewL(const Messages::TNodeCtxId& aAvailabilityActivity, const CTSYProvision& aTsyProvision, TUint aApId, TBool aUnavailableDueToContention);
 	virtual ~CPsdAvailabilityListener();
+	
+#ifdef SYMBIAN_NETWORKING_CONTENTION_MANAGEMENT
 	void ReportContentionAvailabilityStatusIfRequired(const ESock::TAvailabilityStatus& aAvailabilityStatus);
-
+#endif
+	
 private:
 	CPsdAvailabilityListener(const Messages::TNodeCtxId& aAvailabilityActivity, const CTSYProvision& aTsyProvision, TUint aApId, TBool aUnavailableDueToContention);
 	void StartL();
--- a/telephonyprotocols/pdplayer/src/PDPCPR.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/src/PDPCPR.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -49,19 +49,12 @@
 
 using namespace ESock;
 
-
 //-=========================================================
 //
 // CPDPConnectionProvider methods
 //
 //-=========================================================	
 
-//We reserve space for two preallocated activities that may start concurrently on the CPR
-//node: destroy and data client stop.
-static const TUint KDefaultMaxPreallocatedActivityCount = 2;
-static const TUint KMaxPreallocatedActivitySize = sizeof(MeshMachine::CNodeRetryParallelActivity) + sizeof(MeshMachine::APreallocatedOriginators<4>);
-static const TUint KPDPCPRPreallocatedActivityBufferSize = KDefaultMaxPreallocatedActivityCount * KMaxPreallocatedActivitySize;
-
 #ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 namespace PDPCprLinkCharacteristicActivity
 {
@@ -108,7 +101,7 @@
  * @return void
  */
 	{
-	CCoreConnectionProvider::ConstructL(KPDPCPRPreallocatedActivityBufferSize);
+	CCoreConnectionProvider::ConstructL();
 	}
 
 CPDPConnectionProvider::CPDPConnectionProvider(ESock::CConnectionProviderFactoryBase& aFactory)
--- a/telephonyprotocols/pdplayer/src/PDPSCPR.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/src/PDPSCPR.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -42,12 +42,6 @@
 using namespace NetStateMachine;
 using namespace Factories;
 
-//We reserve space for two preallocated activities that may start concurrently on the SCPR
-//node: destroy and data client stop.
-static const TUint KDefaultMaxPreallocatedActivityCount = 2;
-static const TUint KMaxPreallocatedActivitySize = sizeof(MeshMachine::CNodeRetryParallelActivity) + sizeof(MeshMachine::APreallocatedOriginators<4>);
-static const TUint KPDPSCPRPreallocatedActivityBufferSize = KDefaultMaxPreallocatedActivityCount * KMaxPreallocatedActivitySize;
-
 //-=========================================================
 //
 // CPDPSubConnectionProvider Activities
@@ -266,7 +260,7 @@
 IP SubConnection Provider Second Phase Constructor
 */
 	{
-	CCoreSubConnectionProvider::ConstructL(KPDPSCPRPreallocatedActivityBufferSize);
+	CCoreSubConnectionProvider::ConstructL();
 	}
 
 void CPDPSubConnectionProvider::Received(TNodeContextBase& aContext)
--- a/telephonyprotocols/pdplayer/src/PDPSCPRStates.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/src/PDPSCPRStates.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -1865,10 +1865,13 @@
 	RCFParameterFamilyBundle newBundle;
 	newBundle.CreateL();
 	newBundle.Open(iContext.Node().iParameterBundle);
+    CleanupClosePushL(newBundle);
+
 	RParameterFamily imcnFamily = newBundle.CreateFamilyL(KSubConnContextDescrParamsFamily);
 
 	CSubConImsExtParamSet *imcnFlag = CSubConImsExtParamSet::NewL(imcnFamily,RParameterFamily::EGranted);
-	newBundle.Close();
+
+	CleanupStack::PopAndDestroy(&newBundle);
 
 	RPacketContext::TProtocolConfigOptionV2* pco = NULL;
 	switch (gprsProvision->UmtsGprsRelease())
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/pdplayer/src/pdp_contention.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -0,0 +1,372 @@
+// 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:
+//
+
+/**
+ @file
+ @internalComponent
+*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "pdp_contentionTraces.h"
+#endif
+
+
+#include <pdpmcpr.h>
+#include <pdp_contention.h>
+#include <mbmsengine.h>
+#include <etelpckt.h>
+#include <pcktcs.h>
+
+CContextTypeChecker::CContextTypeChecker(RPacketService& aPacketService, MContextEventsObserver& aCallback):CActive(EPriorityStandard),
+    iPacketService(aPacketService), iCallback(aCallback)
+    {
+    CActiveScheduler::Add(this);
+    }
+
+CContextTypeChecker::~CContextTypeChecker()
+    {
+    iContextName = NULL;
+    }
+
+void CContextTypeChecker::Start(const TName* aContextName)
+    {
+    iContextName = aContextName;
+    iPacketService.EnumerateContextsInNif(iStatus, *iContextName, iCountInNif);
+    SetActive();
+    }
+
+void CContextTypeChecker::RunL()
+    {
+    User::LeaveIfError(iStatus.Int());
+    if (iCountInNif == 1) // This is a primary context
+        {
+        iCallback.PrimaryContextAddedL(iContextName);
+        }
+    else
+        {
+        iCallback.SecondaryContextAdded(iContextName);
+        }
+    }
+
+void CContextTypeChecker::DoCancel()
+    {
+    iPacketService.CancelAsyncRequest(EPacketEnumerateContextsInNif);
+    }
+
+TInt CContextTypeChecker::RunError(TInt aError)
+    {
+    // Report an error
+    iCallback.ContextTypeCheckingError(iContextName, aError);
+    return KErrNone; // Make ActiveScheduler happy
+    }
+
+
+CPrimaryContextsMonitor::CPrimaryContextsMonitor(RPacketService& aPacketService, MContentionObserver& aCallback) : CActive(EPriorityStandard),
+    iPacketService(aPacketService), iCallback(aCallback)
+    {
+    CActiveScheduler::Add(this);
+    }
+
+CPrimaryContextsMonitor::~CPrimaryContextsMonitor()
+    {
+    Cancel();
+    iContextMonitors.ResetAndDestroy();
+    delete iContextTypeChecker;
+    iAddedContextsNames.ResetAndDestroy();
+    }
+
+void CPrimaryContextsMonitor::StartL()
+    {
+    iContextTypeChecker = new(ELeave) CContextTypeChecker(iPacketService, *this);
+    iState = EEnumeratingContexts;
+    iPacketService.EnumerateNifs(iStatus, iInitialNifsCount);
+    SetActive();
+    }
+
+void CPrimaryContextsMonitor::PrimaryContextAddedL(const TName* aContextName)
+    {
+    // Create new status monitor for this context
+    StartContextStatusMonitoringL(*aContextName);
+    RemoveContextNameAndCheckNext(aContextName);
+    }
+
+void CPrimaryContextsMonitor::SecondaryContextAdded(const TName* aContextName)
+    {
+    // This is not a primary context, just delete its name.
+    RemoveContextNameAndCheckNext(aContextName);
+    }
+
+void CPrimaryContextsMonitor::RemoveContextNameAndCheckNext(const TName* aContextName)
+    {
+    TInt nameIndex = iAddedContextsNames.Find(aContextName);
+    __ASSERT_DEBUG(nameIndex != KErrNotFound, User::Invariant());
+    delete iAddedContextsNames[nameIndex];
+    iAddedContextsNames.Remove(nameIndex);
+
+    if (iAddedContextsNames.Count() > 1)
+        // Should be more than one here, coz we are waiting for new context added all the time,
+        // so the last one item is always empty.
+        {
+        iContextTypeChecker->Start(iAddedContextsNames[0]);
+        }
+    }
+
+void CPrimaryContextsMonitor::PrimaryContextDeleted(const CContextStatusMonitor* aContextStatusMonitor)
+    {
+    if (aContextStatusMonitor->IsPassedThroughActiveState())
+        {
+        iCallback.ContentionResolved();
+        }
+    DeleteContextStatusMonitor(aContextStatusMonitor);
+    }
+
+void CPrimaryContextsMonitor::ContextTypeCheckingError(const TName* aContextName, TInt aError)
+    {
+    RemoveContextNameAndCheckNext(aContextName);
+    ProcessError(aError);
+    }
+
+
+void CPrimaryContextsMonitor::ContextMonitoringError(const CContextStatusMonitor* aContextStatusMonitor, TInt aError)
+    {
+    DeleteContextStatusMonitor(aContextStatusMonitor);
+    ProcessError(aError);
+    }
+
+void CPrimaryContextsMonitor::DeleteContextStatusMonitor(const CContextStatusMonitor* aContextStatusMonitor)
+    {
+    TInt monitorIndex = iContextMonitors.Find(aContextStatusMonitor);
+    __ASSERT_DEBUG(monitorIndex != KErrNotFound, User::Invariant());
+    delete iContextMonitors[monitorIndex];
+    iContextMonitors.Remove(monitorIndex);
+    }
+
+void CPrimaryContextsMonitor::ProcessError(TInt aError)
+    {
+    __ASSERT_DEBUG(aError != KErrNone, User::Invariant());
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPRIMARYCONTEXTSMONITOR_PROCESSERROR_1, ("PDP context monitoring error: %d"), aError);
+    (void)aError;  //needed for debug builds 
+    }
+
+void CPrimaryContextsMonitor::RunL()
+    {
+    User::LeaveIfError(iStatus.Int());
+    SwitchStateL();
+    RPacketService::TNifInfoV2Pckg nifInfoV2Pckg(iCurrentNifInfo);
+    switch(iState)
+        {
+        case EGettingInfo:
+            StartContextStatusMonitoringL(iCurrentNifInfo.iContextName);
+            iPacketService.GetNifInfo(iStatus, iCurrentNifIndex, nifInfoV2Pckg);
+            ++iCurrentNifIndex;
+            SetActive();
+            break;
+        case EListening:
+            // All functions in RPacketService and RPacketContext,
+            // that can be used to check if context is primary, are asynchronous.
+            // We could not call them here, coz can miss some events from NotifyContextAdded
+            // So subscribe to NotifyContextAdded as soon as possible and check context
+            // type using CContextTypeChecker active object
+            TName *contextName = new (ELeave) TName;
+            CleanupStack::PushL(contextName);
+            iAddedContextsNames.AppendL(contextName);
+            CleanupStack::Pop(contextName);
+            // subscribe to NotifyContextAdded
+            iPacketService.NotifyContextAdded(iStatus, *contextName);
+            SetActive();
+            // if there are any items in iAddedContextsNames except that one that has been added above, i.e count > 1
+            // starting asynchronous context type checking
+            if (!iContextTypeChecker->IsActive() && iAddedContextsNames.Count()>1)
+                {
+                iContextTypeChecker->Start(iAddedContextsNames[0]);
+                }
+            break;
+        }
+    }
+void CPrimaryContextsMonitor::DoCancel()
+    {
+    switch(iState)
+        {
+        case EEnumeratingContexts:
+            iPacketService.CancelAsyncRequest(EPacketEnumerateNifs);
+            break;
+        case EGettingInfo:
+            iPacketService.CancelAsyncRequest(EPacketGetNifInfo);
+            break;
+        case EListening:
+            iPacketService.CancelAsyncRequest(EPacketNotifyContextAdded);
+            break;
+        }
+
+    }
+
+TInt CPrimaryContextsMonitor::RunError(TInt aError)
+    {
+    // Process an error
+    ProcessError(aError);
+    return KErrNone; // Make ActiveScheduler happy
+    }
+
+
+void CPrimaryContextsMonitor::SwitchStateL()
+    {
+    if (iState == EEnumeratingContexts)
+        {
+        if (iInitialNifsCount > 0)
+            {
+            iState = EGettingInfo;
+            }
+        else
+            {
+            iState = EListening;
+            }
+        }
+    else if (iState == EGettingInfo && iCurrentNifIndex == iInitialNifsCount)
+        {
+        StartContextStatusMonitoringL(iCurrentNifInfo.iContextName);
+        iState = EListening;
+        }
+    }
+
+void CPrimaryContextsMonitor::StartContextStatusMonitoringL(const TName& aContextName)
+    {
+    CContextStatusMonitor* newStatusMonitor = new (ELeave) CContextStatusMonitor(iPacketService, *this);
+    CleanupStack::PushL(newStatusMonitor);
+    iContextMonitors.AppendL(newStatusMonitor);
+    CleanupStack::Pop(newStatusMonitor);
+    newStatusMonitor->StartL(aContextName);
+    }
+
+CContextStatusMonitor::CContextStatusMonitor(RPacketService& aPacketService, MContextEventsObserver& aCallback):CActive(EPriorityStandard),
+    iPacketService(aPacketService), iCallback(aCallback)
+    {
+    CActiveScheduler::Add(this);
+    }
+
+CContextStatusMonitor::~CContextStatusMonitor()
+    {
+    Cancel();
+    iPacketContext.Close();
+    }
+
+TBool CContextStatusMonitor::StartL(const TName& aContextName)
+    {
+    iContextName.Copy(aContextName);
+    User::LeaveIfError(iPacketContext.OpenExistingContext(iPacketService, iContextName));
+    User::LeaveIfError(iPacketContext.GetStatus(iContextStatus));
+
+    if (iContextStatus == RPacketContext::EStatusDeleted)
+        {
+        return EFalse;
+        }
+
+    if (iContextStatus == RPacketContext::EStatusActive ||
+        iContextStatus == RPacketContext::EStatusSuspended ||
+        iContextStatus == RPacketContext::EStatusDeactivating)
+        {
+        iWasActive = ETrue;
+        }
+
+    iPacketContext.NotifyStatusChange(iStatus, iContextStatus);
+    SetActive();
+    return ETrue;
+    }
+
+void CContextStatusMonitor::RunL()
+    {
+    User::LeaveIfError(iStatus.Int());
+    if (iContextStatus == RPacketContext::EStatusActive)
+        {
+        iWasActive = ETrue;
+        }
+
+    if (iContextStatus == RPacketContext::EStatusDeleted)
+        {
+        iPacketContext.CancelAsyncRequest(EPacketContextNotifyStatusChange);
+        iCallback.PrimaryContextDeleted(this);
+        }
+    else
+        {
+        iPacketContext.NotifyStatusChange(iStatus, iContextStatus);
+        SetActive();
+        }
+    }
+
+void CContextStatusMonitor::DoCancel()
+    {
+    iPacketContext.CancelAsyncRequest(EPacketContextNotifyStatusChange);
+    }
+
+TInt CContextStatusMonitor::RunError(TInt aError)
+    {
+    iCallback.ContextMonitoringError(this, aError);
+    return KErrNone;
+    }
+
+
+CPdpContentionManager* CPdpContentionManager::NewL(const ESock::CTierManagerBase& aTierManager, RPacketService& aPacketService)
+    {
+    CPdpContentionManager* self = new (ELeave) CPdpContentionManager(aTierManager);
+    CleanupStack::PushL(self);
+    self->ConstructL(aPacketService);
+    CleanupStack::Pop(self);
+    return self;
+    }
+
+CPdpContentionManager::CPdpContentionManager(const ESock::CTierManagerBase& aTierManager):
+CContentionManager(aTierManager)
+    {
+    }
+
+CPdpContentionManager::~CPdpContentionManager()
+    {
+    delete iPrimaryContextsMonitor;
+    }
+
+void CPdpContentionManager::ConstructL(RPacketService& aPacketService)
+    {
+    iPrimaryContextsMonitor = new (ELeave) CPrimaryContextsMonitor(aPacketService, *this);
+    }
+
+void CPdpContentionManager::StartMonitoringL()
+    {
+    if (iPrimaryContextsMonitor)
+        {
+        iPrimaryContextsMonitor->StartL();
+        }
+    }
+
+void CPdpContentionManager::ContentionResolved(const TContentionRequestItem& aContentionRequest, TBool aResult)
+    {
+    CPdpMetaConnectionProvider* pdpMcpr = static_cast<CPdpMetaConnectionProvider*>(aContentionRequest.iMcpr);
+    
+    pdpMcpr->ContentionResolved(aContentionRequest.iPendingCprId, aResult);
+    }
+
+void CPdpContentionManager::ContentionOccured(ESock::CMetaConnectionProviderBase& aMcpr)
+    {
+    CPdpMetaConnectionProvider& pdpMcpr = static_cast<CPdpMetaConnectionProvider&>(aMcpr);
+    
+    pdpMcpr.ContentionOccured();
+    }
+
+void CPdpContentionManager::ReportContentionAvailabilityStatus(ESock::CMetaConnectionProviderBase& aMcpr, const ESock::TAvailabilityStatus& aStatus) const
+    {
+    CPdpMetaConnectionProvider& pdpMcpr = static_cast<CPdpMetaConnectionProvider&>(aMcpr);
+    
+    pdpMcpr.ReportContentionAvailabilityStatus(aStatus);
+    }
+
--- a/telephonyprotocols/pdplayer/src/pdpmcpr.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/src/pdpmcpr.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -290,6 +290,7 @@
 		}
 	}
 	
+#ifdef SYMBIAN_NETWORKING_CONTENTION_MANAGEMENT
 void CPdpMetaConnectionProvider::ContentionOccured()
 	{
 	// Send a stop request to the stop activity.
@@ -303,6 +304,7 @@
 	TRAP_IGNORE(ReceivedL(TNodeId(Id()), TNodeId(Id()), msg));
 	}
 
+
 void CPdpMetaConnectionProvider::ReportContentionAvailabilityStatus(const TAvailabilityStatus& aAvailabilityStatus) const
 	{
 	if (iAvailabilityListener)
@@ -310,4 +312,5 @@
 		iAvailabilityListener->ReportContentionAvailabilityStatusIfRequired(aAvailabilityStatus);
 		}
 	}
+#endif
 
--- a/telephonyprotocols/pdplayer/src/pdpservices.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/src/pdpservices.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -111,6 +111,7 @@
 	Cancel();
 	iObjectBundleOwner->Close();
 	delete iRetrievePcktMbms;
+	iRequestOriginator.Close();
 	}
 
 /**
--- a/telephonyprotocols/pdplayer/src/pdptiermanager.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/src/pdptiermanager.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -52,344 +52,6 @@
 }
 
 
-CContextTypeChecker::CContextTypeChecker(RPacketService& aPacketService, MContextEventsObserver& aCallback):CActive(EPriorityStandard),
-	iPacketService(aPacketService), iCallback(aCallback)
-	{
-	CActiveScheduler::Add(this);
-	}
-
-CContextTypeChecker::~CContextTypeChecker()
-	{
-	iContextName = NULL;
-	}
-
-void CContextTypeChecker::Start(const TName* aContextName)
-	{
-	iContextName = aContextName;
-	iPacketService.EnumerateContextsInNif(iStatus, *iContextName, iCountInNif);
-	SetActive();
-	}
-
-void CContextTypeChecker::RunL()
-	{
-	User::LeaveIfError(iStatus.Int());
-	if (iCountInNif == 1) // This is a primary context
-		{
-		iCallback.PrimaryContextAddedL(iContextName);
-		}
-	else
-		{
-		iCallback.SecondaryContextAdded(iContextName);
-		}
-	}
-
-void CContextTypeChecker::DoCancel()
-	{
-	iPacketService.CancelAsyncRequest(EPacketEnumerateContextsInNif);
-	}
-
-TInt CContextTypeChecker::RunError(TInt aError)
-	{
-	// Report an error
-	iCallback.ContextTypeCheckingError(iContextName, aError);
-	return KErrNone; // Make ActiveScheduler happy
-	}
-
-CPrimaryContextsMonitor::CPrimaryContextsMonitor(RPacketService& aPacketService, MContentionObserver& aCallback) : CActive(EPriorityStandard),
-	iPacketService(aPacketService), iCallback(aCallback)
-	{
-	CActiveScheduler::Add(this);
-	}
-
-CPrimaryContextsMonitor::~CPrimaryContextsMonitor()
-	{
-	Cancel();
-	iContextMonitors.ResetAndDestroy();
-	delete iContextTypeChecker;
-	iAddedContextsNames.ResetAndDestroy();
-	}
-
-void CPrimaryContextsMonitor::StartL()
-	{
-	iContextTypeChecker = new(ELeave) CContextTypeChecker(iPacketService, *this);
-	iState = EEnumeratingContexts;
-	iPacketService.EnumerateNifs(iStatus, iInitialNifsCount);
-	SetActive();
-	}
-
-void CPrimaryContextsMonitor::PrimaryContextAddedL(const TName* aContextName)
-	{
-	// Create new status monitor for this context
-	StartContextStatusMonitoringL(*aContextName);
-	RemoveContextNameAndCheckNext(aContextName);
-	}
-
-void CPrimaryContextsMonitor::SecondaryContextAdded(const TName* aContextName)
-	{
-	// This is not a primary context, just delete its name.
-	RemoveContextNameAndCheckNext(aContextName);
-	}
-
-void CPrimaryContextsMonitor::RemoveContextNameAndCheckNext(const TName* aContextName)
-	{
-	TInt nameIndex = iAddedContextsNames.Find(aContextName);
-	__ASSERT_DEBUG(nameIndex != KErrNotFound, User::Invariant());
-	delete iAddedContextsNames[nameIndex];
-	iAddedContextsNames.Remove(nameIndex);
-
-	if (iAddedContextsNames.Count() > 1)
-		// Should be more than one here, coz we are waiting for new context added all the time,
-		// so the last one item is always empty.
-		{
-		iContextTypeChecker->Start(iAddedContextsNames[0]);
-		}
-	}
-
-void CPrimaryContextsMonitor::PrimaryContextDeleted(const CContextStatusMonitor* aContextStatusMonitor)
-	{
-	if (aContextStatusMonitor->IsPassedThroughActiveState())
-		{
-		iCallback.ContentionResolved();
-		}
-	DeleteContextStatusMonitor(aContextStatusMonitor);
-	}
-
-void CPrimaryContextsMonitor::ContextTypeCheckingError(const TName* aContextName, TInt aError)
-	{
-	RemoveContextNameAndCheckNext(aContextName);
-	ProcessError(aError);
-	}
-
-
-void CPrimaryContextsMonitor::ContextMonitoringError(const CContextStatusMonitor* aContextStatusMonitor, TInt aError)
-	{
-	DeleteContextStatusMonitor(aContextStatusMonitor);
-	ProcessError(aError);
-	}
-
-void CPrimaryContextsMonitor::DeleteContextStatusMonitor(const CContextStatusMonitor* aContextStatusMonitor)
-	{
-	TInt monitorIndex = iContextMonitors.Find(aContextStatusMonitor);
-	__ASSERT_DEBUG(monitorIndex != KErrNotFound, User::Invariant());
-	delete iContextMonitors[monitorIndex];
-	iContextMonitors.Remove(monitorIndex);
-	}
-
-void CPrimaryContextsMonitor::ProcessError(TInt aError)
-	{
-	__ASSERT_DEBUG(aError != KErrNone, User::Invariant());
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPRIMARYCONTEXTSMONITOR_PROCESSERROR_1, ("PDP context monitoring error: %d"), aError);
-	(void)aError;  //needed for debug builds 
-	}
-
-void CPrimaryContextsMonitor::RunL()
-	{
-	User::LeaveIfError(iStatus.Int());
-	SwitchStateL();
-	RPacketService::TNifInfoV2Pckg nifInfoV2Pckg(iCurrentNifInfo);
-	switch(iState)
-		{
-		case EGettingInfo:
-			StartContextStatusMonitoringL(iCurrentNifInfo.iContextName);
-			iPacketService.GetNifInfo(iStatus, iCurrentNifIndex, nifInfoV2Pckg);
-			++iCurrentNifIndex;
-			SetActive();
-			break;
-		case EListening:
-			// All functions in RPacketService and RPacketContext,
-			// that can be used to check if context is primary, are asynchronous.
-			// We could not call them here, coz can miss some events from NotifyContextAdded
-			// So subscribe to NotifyContextAdded as soon as possible and check context
-			// type using CContextTypeChecker active object
-			TName *contextName = new (ELeave) TName;
-			CleanupStack::PushL(contextName);
-			iAddedContextsNames.AppendL(contextName);
-			CleanupStack::Pop(contextName);
-			// subscribe to NotifyContextAdded
-			iPacketService.NotifyContextAdded(iStatus, *contextName);
-			SetActive();
-			// if there are any items in iAddedContextsNames except that one that has been added above, i.e count > 1
-			// starting asynchronous context type checking
-			if (!iContextTypeChecker->IsActive() && iAddedContextsNames.Count()>1)
-				{
-				iContextTypeChecker->Start(iAddedContextsNames[0]);
-				}
-			break;
-		}
-	}
-void CPrimaryContextsMonitor::DoCancel()
-	{
-	switch(iState)
-		{
-		case EEnumeratingContexts:
-			iPacketService.CancelAsyncRequest(EPacketEnumerateNifs);
-			break;
-		case EGettingInfo:
-			iPacketService.CancelAsyncRequest(EPacketGetNifInfo);
-			break;
-		case EListening:
-			iPacketService.CancelAsyncRequest(EPacketNotifyContextAdded);
-			break;
-		}
-
-	}
-
-TInt CPrimaryContextsMonitor::RunError(TInt aError)
-	{
-	// Process an error
-	ProcessError(aError);
-	return KErrNone; // Make ActiveScheduler happy
-	}
-
-
-void CPrimaryContextsMonitor::SwitchStateL()
-	{
-	if (iState == EEnumeratingContexts)
-		{
-		if (iInitialNifsCount > 0)
-			{
-			iState = EGettingInfo;
-			}
-		else
-			{
-			iState = EListening;
-			}
-		}
-	else if (iState == EGettingInfo && iCurrentNifIndex == iInitialNifsCount)
-		{
-		StartContextStatusMonitoringL(iCurrentNifInfo.iContextName);
-		iState = EListening;
-		}
-	}
-
-void CPrimaryContextsMonitor::StartContextStatusMonitoringL(const TName& aContextName)
-	{
-	CContextStatusMonitor* newStatusMonitor = new (ELeave) CContextStatusMonitor(iPacketService, *this);
-	CleanupStack::PushL(newStatusMonitor);
-	iContextMonitors.AppendL(newStatusMonitor);
-	CleanupStack::Pop(newStatusMonitor);
-	newStatusMonitor->StartL(aContextName);
-	}
-
-CContextStatusMonitor::CContextStatusMonitor(RPacketService& aPacketService, MContextEventsObserver& aCallback):CActive(EPriorityStandard),
-	iPacketService(aPacketService), iCallback(aCallback)
-	{
-	CActiveScheduler::Add(this);
-	}
-
-CContextStatusMonitor::~CContextStatusMonitor()
-	{
-	Cancel();
-	iPacketContext.Close();
-	}
-
-TBool CContextStatusMonitor::StartL(const TName& aContextName)
-	{
-	iContextName.Copy(aContextName);
-	User::LeaveIfError(iPacketContext.OpenExistingContext(iPacketService, iContextName));
-	User::LeaveIfError(iPacketContext.GetStatus(iContextStatus));
-
-	if (iContextStatus == RPacketContext::EStatusDeleted)
-		{
-		return EFalse;
-		}
-
-	if (iContextStatus == RPacketContext::EStatusActive ||
-		iContextStatus == RPacketContext::EStatusSuspended ||
-		iContextStatus == RPacketContext::EStatusDeactivating)
-		{
-		iWasActive = ETrue;
-		}
-
-	iPacketContext.NotifyStatusChange(iStatus, iContextStatus);
-	SetActive();
-	return ETrue;
-	}
-
-void CContextStatusMonitor::RunL()
-	{
-	User::LeaveIfError(iStatus.Int());
-	if (iContextStatus == RPacketContext::EStatusActive)
-		{
-		iWasActive = ETrue;
-		}
-
-	if (iContextStatus == RPacketContext::EStatusDeleted)
-		{
-		iPacketContext.CancelAsyncRequest(EPacketContextNotifyStatusChange);
-		iCallback.PrimaryContextDeleted(this);
-		}
-	else
-		{
-		iPacketContext.NotifyStatusChange(iStatus, iContextStatus);
-		SetActive();
-		}
-	}
-
-void CContextStatusMonitor::DoCancel()
-	{
-	iPacketContext.CancelAsyncRequest(EPacketContextNotifyStatusChange);
-	}
-
-TInt CContextStatusMonitor::RunError(TInt aError)
-	{
-	iCallback.ContextMonitoringError(this, aError);
-	return KErrNone;
-	}
-
-CPdpContentionManager* CPdpContentionManager::NewL(const ESock::CTierManagerBase& aTierManager, RPacketService& aPacketService)
-	{
-	CPdpContentionManager* self = new (ELeave) CPdpContentionManager(aTierManager);
-	CleanupStack::PushL(self);
-	self->ConstructL(aPacketService);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-CPdpContentionManager::CPdpContentionManager(const ESock::CTierManagerBase& aTierManager):
-CContentionManager(aTierManager)
-	{
-	}
-
-CPdpContentionManager::~CPdpContentionManager()
-	{
-	delete iPrimaryContextsMonitor;
-	}
-
-void CPdpContentionManager::ConstructL(RPacketService& aPacketService)
-	{
-	iPrimaryContextsMonitor = new (ELeave) CPrimaryContextsMonitor(aPacketService, *this);
-	}
-
-void CPdpContentionManager::StartMonitoringL()
-	{
-	if (iPrimaryContextsMonitor)
-		{
-		iPrimaryContextsMonitor->StartL();
-		}
-	}
-
-void CPdpContentionManager::ContentionResolved(const TContentionRequestItem& aContentionRequest, TBool aResult)
-	{
-	CPdpMetaConnectionProvider* pdpMcpr = static_cast<CPdpMetaConnectionProvider*>(aContentionRequest.iMcpr);
-	
-	pdpMcpr->ContentionResolved(aContentionRequest.iPendingCprId, aResult);
-	}
-
-void CPdpContentionManager::ContentionOccured(ESock::CMetaConnectionProviderBase& aMcpr)
-	{
-	CPdpMetaConnectionProvider& pdpMcpr = static_cast<CPdpMetaConnectionProvider&>(aMcpr);
-	
-	pdpMcpr.ContentionOccured();
-	}
-
-void CPdpContentionManager::ReportContentionAvailabilityStatus(ESock::CMetaConnectionProviderBase& aMcpr, const ESock::TAvailabilityStatus& aStatus) const
-	{
-	CPdpMetaConnectionProvider& pdpMcpr = static_cast<CPdpMetaConnectionProvider&>(aMcpr);
-	
-	pdpMcpr.ReportContentionAvailabilityStatus(aStatus);
-	}
-
 /**
 The NewL factory function for PDPTierManager.
 This function also acts as the single ECom entry point into this object.
@@ -421,8 +83,12 @@
 CPDPTierManager::~CPDPTierManager()
 	{
 	LOG_NODE_DESTROY(KPDPTierMgrTag, CPDPTierManager);
+
+#ifdef SYMBIAN_NETWORKING_CONTENTION_MANAGEMENT
 	delete iPdpContentionManager;
 	iPdpContentionManager = NULL;
+#endif
+	
 	if (iMBMSEngine)
 		{
 		iMBMSEngine->Cancel();
@@ -458,11 +124,14 @@
 */
 void CPDPTierManager::PacketServiceAttachedCallbackL()
 	{
+    
+#ifdef SYMBIAN_NETWORKING_CONTENTION_MANAGEMENT
 	if (!iPdpContentionManager)
 		{
 		iPdpContentionManager = CPdpContentionManager::NewL(*this, iMBMSEngine->GetRPacketService());
 		}
 	static_cast<CPdpContentionManager*>(iPdpContentionManager)->StartMonitoringL();
+#endif
 	}
 
 /**
@@ -516,6 +185,8 @@
 	User::LeaveIfError(ctx.iReturn);
 	}
 
+#ifdef SYMBIAN_NETWORKING_CONTENTION_MANAGEMENT
+
 TBool CPDPTierManager::HandleContentionL(ESock::CMetaConnectionProviderBase* aMcpr, Messages::TNodeId& aPendingCprId, TUint aPriority)
 	{
 	User::LeaveIfNull(iMBMSEngine);
@@ -527,10 +198,38 @@
 	}
 
 TBool CPDPTierManager::IsUnavailableDueToContention(const ESock::CMetaConnectionProviderBase* aMetaConnectionProvider) const
-	{
-	if (!iPdpContentionManager)
-		return EFalse;
-	return iPdpContentionManager->IsUnavailableDueToContention(aMetaConnectionProvider);
-	}
+    {
+    TBool result(EFalse);
+    
+    if (!iPdpContentionManager)
+        {
+        result = EFalse;
+        }
+    else
+        {
+        result = iPdpContentionManager->IsUnavailableDueToContention(aMetaConnectionProvider);
+        }
+    return result;
+    }
+
+#else
+
+/* these are inherited from the tier manager base class in esock so they must be implemented
+ * even if this feature is disabled.  If it is disabled, then contention resolution will always
+ * be false.  Note: this functionality is done at a higher layer so it is unlikely that this feature
+ * will make (i.e. this code is depreciated).
+ */
+
+TBool CPDPTierManager::HandleContentionL(ESock::CMetaConnectionProviderBase* /*aMcpr */, Messages::TNodeId& /*aPendingCprId */, TUint /* aPriority */)
+    {
+    return EFalse;
+    }
 
 
+TBool CPDPTierManager::IsUnavailableDueToContention(const ESock::CMetaConnectionProviderBase* /* aMetaConnectionProvider */) const
+    {
+    return EFalse;
+    }
+
+#endif
+
--- a/telephonyprotocols/pdplayer/src/psdavailabilitylistener.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/src/psdavailabilitylistener.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -219,6 +219,7 @@
 	delete this;
 	}
 
+#ifdef SYMBIAN_NETWORKING_CONTENTION_MANAGEMENT
 void CPsdAvailabilityListener::ReportContentionAvailabilityStatusIfRequired(const TAvailabilityStatus& aAvailabilityStatus)
 	{
 	if (aAvailabilityStatus.Score() == TAvailabilityStatus::EMinAvailabilityScore && !iUnavailableDueToContention)
@@ -242,4 +243,5 @@
 		iUnavailableDueToContention = EFalse;
 		}
 	}
+#endif
 
--- a/telephonyprotocols/pdplayer/traces/fixed_id.definitions	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/traces/fixed_id.definitions	Tue Sep 14 17:55:14 2010 +0100
@@ -84,10 +84,9 @@
 [TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_DOCANCEL_1=0x1f8
 [TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_1=0x1f9
 [TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_2=0x1fa
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_3=0x1fb
 [TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_DOCANCEL_1=0x200
 [TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_1=0x201
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_2=0x202
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_2=0x29e
 [TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_3=0x203
 [TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_CANCELMESSAGE_1=0xd
 [TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_PREPAREBEARERRESULTBUNDLEL_1=0x1a
@@ -108,7 +107,6 @@
 [TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_DOCANCEL_1=0x1f4
 [TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_NOTIFY_1=0x1f5
 [TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_NOTIFY_2=0x1f6
-[TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_NOTIFY_3=0x1f7
 [TRACE]TRACE_INTERNALS[0x88]_CPDPDEFAULTSUBCONNECTIONPROVIDER_AUTHENTICATE_1=0x292
 [TRACE]TRACE_INTERNALS[0x88]_CPDPDEFAULTSUBCONNECTIONPROVIDER_AUTHENTICATE_2=0x293
 [TRACE]TRACE_INTERNALS[0x88]_CPDPDEFAULTSUBCONNECTIONPROVIDER_AUTHENTICATIONCOMPLETE_1=0x294
@@ -158,6 +156,7 @@
 [TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET8_2=0x5a
 [TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET9_1=0x5b
 [TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET9_2=0x5c
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GETCONTEXTNAME_1=0x29b
 [TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_1=0x49
 [TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_2=0x4a
 [TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_INPUT_1=0x31
@@ -373,7 +372,7 @@
 [TRACE]TRACE_INTERNALS[0x88]_CPDPPROVIDERSELECTOR_SELECTL_5=0x25
 [TRACE]TRACE_INTERNALS[0x88]_CPDPSTATUSCHANGENOTIFIER_DOCANCEL_1=0x1fc
 [TRACE]TRACE_INTERNALS[0x88]_CPDPSTATUSCHANGENOTIFIER_NOTIFY_1=0x1fd
-[TRACE]TRACE_INTERNALS[0x88]_CPDPSTATUSCHANGENOTIFIER_NOTIFY_2=0x1fe
+[TRACE]TRACE_INTERNALS[0x88]_CPDPSTATUSCHANGENOTIFIER_NOTIFY_2=0x29d
 [TRACE]TRACE_INTERNALS[0x88]_CPDPSTATUSCHANGENOTIFIER_NOTIFY_3=0x1ff
 [TRACE]TRACE_INTERNALS[0x88]_CPDPTIERMANAGERFACTORY_NEWL_1=0x20
 [TRACE]TRACE_INTERNALS[0x88]_CPDPTIERMANAGER_CONSTRUCTL_1=0x1f
@@ -384,7 +383,6 @@
 [TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_DTOR_1=0x205
 [TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_NOTIFY_1=0x209
 [TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_NOTIFY_2=0x20a
-[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_NOTIFY_3=0x20b
 [TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_START_1=0x206
 [TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_START_2=0x207
 [TRACE]TRACE_INTERNALS[0x88]_CSERVICECHANGENOTIFIER_DOCANCEL_1=0x20f
@@ -415,6 +413,9 @@
 [TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_CANCELASYNCREQUEST_4=0x27b
 [TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NEXT_1=0x273
 [TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NEXT_2=0x274
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NEXT_3=0x2d3
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NEXT_4=0x2d4
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NEXT_5=0x2d5
 [TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NOTIFYFSM_1=0x275
 [TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NOTIFYFSM_2=0x276
 [TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NOTIFYFSM_3=0x277
@@ -424,11 +425,15 @@
 [TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_4=0x258
 [TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_5=0x259
 [TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_1=0x24e
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_10=0x2cb
 [TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_2=0x24f
 [TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_3=0x296
 [TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_4=0x297
 [TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_5=0x298
 [TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_6=0x299
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_7=0x2c8
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_8=0x2c9
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_9=0x2ca
 [TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_1=0x250
 [TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_2=0x251
 [TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_3=0x252
@@ -439,11 +444,25 @@
 [TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_CANCELASYNCREQUEST_3=0x24c
 [TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_CANCELASYNCREQUEST_4=0x24d
 [TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_1=0x242
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_10=0x2bd
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_11=0x2be
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_12=0x2bf
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_13=0x2c0
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_14=0x2c1
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_15=0x2c2
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_16=0x2c3
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_17=0x2c4
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_18=0x2c5
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_19=0x2c6
 [TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_2=0x243
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_20=0x2c7
 [TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_3=0x244
 [TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_4=0x245
 [TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_5=0x246
 [TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_6=0x247
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_7=0x2ba
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_8=0x2bb
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_9=0x2bc
 [TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NOTIFYFSM_1=0x248
 [TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NOTIFYFSM_2=0x249
 [TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_CANCELASYNCREQUEST_1=0x21a
@@ -451,7 +470,17 @@
 [TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_CANCELASYNCREQUEST_3=0x21c
 [TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_CANCELASYNCREQUEST_4=0x21d
 [TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_1=0x216
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_10=0x2a7
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_11=0x2a8
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_12=0x2a9
 [TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_2=0x217
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_3=0x2a0
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_4=0x2a1
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_5=0x2a2
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_6=0x2a3
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_7=0x2a4
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_8=0x2a5
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_9=0x2a6
 [TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NOTIFYFSM_1=0x218
 [TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NOTIFYFSM_2=0x219
 [TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_1=0x224
@@ -463,6 +492,11 @@
 [TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_2=0x21f
 [TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_3=0x220
 [TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_4=0x221
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_5=0x2aa
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_6=0x2ab
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_7=0x2ac
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_8=0x2ad
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_9=0x2ae
 [TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NOTIFYFSM_1=0x222
 [TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NOTIFYFSM_2=0x223
 [TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_1=0x22e
@@ -470,6 +504,8 @@
 [TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_1=0x229
 [TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_2=0x22a
 [TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_3=0x22b
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_4=0x2af
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_5=0x2b0
 [TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NOTIFYFSM_1=0x22c
 [TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NOTIFYFSM_2=0x22d
 [TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_1=0x270
@@ -478,12 +514,16 @@
 [TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_1=0x26b
 [TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_2=0x26c
 [TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_3=0x26d
+[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_4=0x2d0
+[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_5=0x2d1
+[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_6=0x2d2
 [TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NOTIFYFSM_1=0x26e
 [TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NOTIFYFSM_2=0x26f
 [TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_CANCELASYNCREQUEST_1=0x260
 [TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_CANCELASYNCREQUEST_2=0x261
 [TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NEXT_1=0x25a
 [TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NEXT_2=0x25b
+[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NEXT_3=0x2cc
 [TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NOTIFYFSM_1=0x25c
 [TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NOTIFYFSM_2=0x25d
 [TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NOTIFYFSM_3=0x25e
@@ -492,6 +532,12 @@
 [TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_CANCELASYNCREQUEST_2=0x280
 [TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_CANCELASYNCREQUEST_3=0x281
 [TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_NEXT_1=0x27c
+[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_NEXT_2=0x2d6
+[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_NEXT_3=0x2d7
+[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_NEXT_4=0x2d8
+[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_NEXT_5=0x2d9
+[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_NEXT_6=0x2da
+[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_NEXT_7=0x2db
 [TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_NOTIFYFSM_1=0x27d
 [TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_NOTIFYFSM_2=0x27e
 [TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_CANCELASYNCREQUEST_1=0x268
@@ -499,6 +545,9 @@
 [TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_CANCELASYNCREQUEST_3=0x26a
 [TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NEXT_1=0x262
 [TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NEXT_2=0x263
+[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NEXT_3=0x2cd
+[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NEXT_4=0x2ce
+[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NEXT_5=0x2cf
 [TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NOTIFYFSM_1=0x264
 [TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NOTIFYFSM_2=0x265
 [TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NOTIFYFSM_3=0x266
@@ -507,6 +556,7 @@
 [TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_CANCELASYNCREQUEST_2=0x215
 [TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_NEXT_1=0x210
 [TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_NEXT_2=0x211
+[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_NEXT_3=0x29f
 [TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_NOTIFYFSM_1=0x212
 [TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_NOTIFYFSM_2=0x213
 [TRACE]TRACE_INTERNALS[0x88]_TPDPSELECTORFACTORY_NEWSELECTORL_1=0x26
@@ -650,17 +700,32 @@
 [TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_CANCELASYNCREQUEST_2=0x235
 [TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_NEXT_1=0x230
 [TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_NEXT_2=0x231
+[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_NEXT_3=0x2b1
+[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_NEXT_4=0x2b2
 [TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_NOTIFYFSM_1=0x232
 [TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_NOTIFYFSM_2=0x233
 [TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_CANCELASYNCREQUEST_1=0x23f
 [TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_CANCELASYNCREQUEST_2=0x240
 [TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_CANCELASYNCREQUEST_3=0x241
 [TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_1=0x236
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_10=0x2b5
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_11=0x2b6
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_12=0x2b7
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_13=0x2b8
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_14=0x2b9
 [TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_2=0x237
 [TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_3=0x238
 [TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_4=0x239
 [TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_5=0x23a
 [TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_6=0x23b
 [TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_7=0x23c
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_8=0x2b3
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_9=0x2b4
 [TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NOTIFYFSM_1=0x23d
 [TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NOTIFYFSM_2=0x23e
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERNOTIFIER_LOGCONTEXTNAME=0x29c
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_3=0x1fb
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_2=0x202
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_NOTIFY_3=0x1f7
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CPDPSTATUSCHANGENOTIFIER_NOTIFY_2=0x1fe
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_NOTIFY_3=0x20b
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/PDPSCPRFSM.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/PDPSCPRFSM.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -665,3 +665,17 @@
 	return KErrNone;
 	}
 
+/** Get context name
+
+@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
+@return - Context name in a TName
+*/
+const TName& CPdpFsmInterface::GetContextName(TContextId aPdpId)
+    {
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GETCONTEXTNAME_1, ">>CPdpFsmInterface::GetContextName() for context id [%d]", aPdpId);
+
+    ASSERT(iPdpFsmFactory);
+    ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
+    ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
+    return iPdpFsmFactory->GetFsmContext(aPdpId)->GetDataChannelV2().iChannelId;
+    }
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/cpdpfsm.h	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/cpdpfsm.h	Tue Sep 14 17:55:14 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -119,6 +119,11 @@
 	void EtelCancel (void);
     void SpudInput (TInt aNotification, TInt aParam);
     
+    const RPacketContext::TDataChannelV2& GetDataChannelV2()
+        {
+        return iDataChannelV2;
+        }
+
 #ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY	
 	void Set(MPdpFsmEventHandler& aPdpFsmEventHandler);
 #endif    
--- a/telephonyprotocols/pdplayer/umts/spudtel/src/cpdpconfigchangenotifier.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/cpdpconfigchangenotifier.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -136,16 +136,15 @@
 */
 void CPdpConfigChangeNotifier::Notify(const TRequestStatus& aStatus)
 	{
+    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPCONFIGCHANGENOTIFIER_NOTIFY_1, "Config Change Notification for Context [%S]", iPdpFsmInterface.GetContextName(iId));
 	if(aStatus == KErrNone)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPCONFIGCHANGENOTIFIER_NOTIFY_1, "FSM set ConfigGPRS");
 		iPdpFsmInterface.Set(iId, GetScratchContextAs<TPacketDataConfigBase>());
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPCONFIGCHANGENOTIFIER_NOTIFY_2, "FSM input EConfigGPRSChangeNetwork");
 		iPdpFsmInterface.Input(iId, PdpFsm::EConfigGPRSChangeNetwork);
 		}
 	else
 		{ 
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPCONFIGCHANGENOTIFIER_NOTIFY_3, "CPdpConfigChangeNotifier::Notify(), error: %d", aStatus.Int());
+		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPCONFIGCHANGENOTIFIER_NOTIFY_2, "CPdpConfigChangeNotifier::Notify(), error: %d", aStatus.Int());
 		// Not all TSYs support RPacketContext::NotifyConfigChanged so we handle
 		// KErrNotSupported silently (PDEF118981).
 		ASSERT((aStatus == KErrCancel) || (aStatus == KErrNotSupported));
@@ -201,18 +200,16 @@
 */
 void CMbmsPdpConfigChangeNotifier::Notify(const TRequestStatus& aStatus)
 	{
+    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_1, "MBMS Config Change Notification for Context [%S]", iPdpFsmInterface.GetContextName(iId));
 	if(aStatus == KErrNone)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_1, "FSM set ConfigMbms");
 		iPdpFsmInterface.Set(iId, iConfigMbms);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_2, "FSM input EConfigMbmsChangeNetwork");
 		iPdpFsmInterface.Input(iId, PdpFsm::EConfigGPRSChangeNetwork,SpudMan::EMbms);
-		//to be discussed...
-		
+		//to be discussed...		
 		}
 	else
 		{ 
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_3, "CMbmsPdpConfigChangeNotifier::Notify(), error: %d", aStatus.Int());
+		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_2, "CMbmsPdpConfigChangeNotifier::Notify(), error: %d", aStatus.Int());
 		// Not all TSYs support RPacketContext::NotifyConfigChanged so we handle
 		// KErrNotSupported silently (PDEF118981).
 		ASSERT((aStatus == KErrCancel) || (aStatus == KErrNotSupported));
--- a/telephonyprotocols/pdplayer/umts/spudtel/src/cpdpstatuschangenotifier.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/cpdpstatuschangenotifier.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -82,15 +82,15 @@
 */
 void CPdpStatusChangeNotifier::Notify(const TRequestStatus& aStatus)
 	{
-	if(aStatus == KErrNone)
+    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPSTATUSCHANGENOTIFIER_NOTIFY_1, "Status Change Notification for Context [%S]", iPdpFsmInterface.GetContextName(iId));
+    if(aStatus == KErrNone)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPSTATUSCHANGENOTIFIER_NOTIFY_1, "Notified of context status change");
 		RPacketContext::TContextStatus aOldContextStatus;
 		iPdpFsmInterface.Get(iId,aOldContextStatus);
 		// only notify of change if it has actually changed
 		if (iContextStatus != aOldContextStatus)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPSTATUSCHANGENOTIFIER_NOTIFY_2, "FSM input EContextStatusChangeNetwork");
+			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPSTATUSCHANGENOTIFIER_NOTIFY_2, "Context status changed from [%d] to [%d]", aOldContextStatus, iContextStatus);
 			iPdpFsmInterface.Set(iId, iContextStatus);
             TInt err = KErrNone;
             iPacketContext.GetLastErrorCause(err); // Ignore error return code.
@@ -154,15 +154,16 @@
 */
 void CMbmsPdpStatusChangeNotifier::Notify(const TRequestStatus& aStatus)
 	{
-	if(aStatus == KErrNone)
+    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_1, "MBMS Status Change Notification for Context [%S]", iPdpFsmInterface.GetContextName(iId));
+
+    if(aStatus == KErrNone)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_1, "Notified of context status change");
 		RPacketContext::TContextStatus aOldContextStatus;
 		iPdpFsmInterface.Get(iId,aOldContextStatus);
 		// only notify of change if it has actually changed
 		if (iContextStatus != aOldContextStatus)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_2, "FSM input EContextStatusChangeNetwork");
+            OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_2, "Context status changed from [%d] to [%d]", aOldContextStatus, iContextStatus);
 			iPdpFsmInterface.Set(iId, iContextStatus);
             TInt err = KErrNone;
             iMbmsPacketContext.GetLastErrorCause(err); // Ignore error return code.
--- a/telephonyprotocols/pdplayer/umts/spudtel/src/cqoschangenotifier.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/cqoschangenotifier.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -83,9 +83,10 @@
 */
 void CQoSChangeNotifier::Notify(const TRequestStatus& aStatus)
 	{
-	if(aStatus == KErrNone)
+    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_NOTIFY_1, "Qos Change Notification for Context [%S]", iPdpFsmInterface.GetContextName(iId));
+
+    if(aStatus == KErrNone)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_NOTIFY_1, "FSM set QoSProfile");
 
 #ifdef SYMBIAN_NETWORKING_UMTSR5
         iPdpFsmInterface.Set(iId, iProfileBuffer.NegotiatedQoSR5());
@@ -97,15 +98,11 @@
 #endif
 // SYMBIAN_NETWORKING_UMTSR5
 
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_NOTIFY_2, "FSM input EQoSProfileChangeNetwork");
 		iPdpFsmInterface.Input(iId, PdpFsm::EQoSProfileChangeNetwork);
 		}
 	else
 		{ 
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_NOTIFY_3, "CQoSChangeNotifier::Notify(), error: %d", aStatus.Int());
+		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_NOTIFY_2, "CQoSChangeNotifier::Notify(), error: %d", aStatus.Int());
 		ASSERT(aStatus == KErrCancel); 
 		}
 	}
-
-
-
--- a/telephonyprotocols/pdplayer/umts/spudtel/src/eteldriverstrategies.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/eteldriverstrategies.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -46,14 +46,13 @@
 */
 void TOpenStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TOPENSTRATEGY_NEXT_1, "TOpenStrategy::Next()");
-	
 	TInt err = KErrNone;
 	
 	switch(aContext.StrategyStep())
 		{
 		case EStartStep:
 			{
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TOPENSTRATEGY_NEXT_1, "TOpenStrategy::Next() - EStartStep - Initialize Phone");
 			aContext.Phone().Initialise (*aStatus);
 			aContext.SetStrategyStep(EInitPhoneStep);
 			break;
@@ -61,13 +60,14 @@
 			
 		case EInitPhoneStep:
 			{
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TOPENSTRATEGY_NEXT_2, "TOpenStrategy::Next() - EStartStep - TOpenStrategy::Next() - EInitPhoneStep");
 			aContext.SetStrategyStep(EFinishStep);
 			break;
 			}
 			
 		default:
 			// incorrect step
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TOPENSTRATEGY_NEXT_2, "Incorrect step");
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TOPENSTRATEGY_NEXT_3, "TOpenStrategy::Next() - EStartStep - TOpenStrategy::Next() - Incorrect step");
 			ASSERT(EFalse);
 			err = KErrNotSupported;
 			break;
@@ -135,7 +135,6 @@
 */
 void TContextDeleteStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_1, "TContextDeleteStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)");
 	
 	TInt err = KErrNone;
 	
@@ -159,11 +158,13 @@
 				{
 				if (aContext.PacketContext().SubSessionHandle())
 					{
+                    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_1, "TContextDeleteStrategy::Next() - EStartStep - PacketContext::Deactivate(), contextName = [%S]", aContext.Name());
 					aContext.PacketContext().Deactivate(*aStatus);
 					aContext.SetStrategyStep (EDeactivateStep);
 					}
 				else
 					{
+                    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_2, "TContextDeleteStrategy::Next() - EStartStep - PacketContext::SubSessionHandle() returned error, contextName = [%S]", aContext.Name());
 					aContext.SetStrategyStep(EDeactivateStep);
 					User::RequestComplete(aStatus, err);
 					}
@@ -172,11 +173,13 @@
 				{
 				if (aContext.MbmsPacketContext().SubSessionHandle())
 					{
+                    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_3, "TContextDeleteStrategy::Next() - EStartStep - MbmsPacketContext::Deactivate(), contextName = [%S]", aContext.Name());
 					aContext.MbmsPacketContext().Deactivate(*aStatus);
 					aContext.SetStrategyStep (EDeactivateStep);
 					}
 				else
 					{
+                    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_4, "TContextDeleteStrategy::Next() - EStartStep - MbmsPacketContext::SubSessionHandle() returned error, contextName = [%S]", aContext.Name());
 					aContext.SetStrategyStep(EDeleteContextStep);
 					User::RequestComplete(aStatus, err);
 					}	
@@ -190,16 +193,19 @@
 				{
 				if (aContext.PacketQoS().SubSessionHandle())
 					{
+                    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_5, "TContextDeleteStrategy::Next() - EDeactivateStep - PacketQoS::Close(), contextName = [%S]", aContext.Name());
 					aContext.PacketQoS().Close();
 					}
 				
 				if (aContext.PacketContext().SubSessionHandle())
 					{
+                    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_6, "TContextDeleteStrategy::Next() - EDeactivateStep - PacketContext::Delete(), contextName = [%S]", aContext.Name());
 					aContext.PacketContext().Delete(*aStatus);
 					aContext.SetStrategyStep(EDeleteContextStep);
 					}
 				else
 					{
+                    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_7, "TContextDeleteStrategy::Next() - EDeactivateStep - MbmsPacketContext::SubSessionHandle() returned error, contextName = [%S]", aContext.Name());
 					// jump to next step
 					aContext.SetStrategyStep(EDeleteContextStep);
 					User::RequestComplete( aStatus, err);
@@ -209,11 +215,13 @@
 				{
 				if (aContext.MbmsPacketContext().SubSessionHandle())
 					{
+                    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_8, "TContextDeleteStrategy::Next() - EDeactivateStep - MbmsPacketContext::Delete(), contextName = [%S]", aContext.Name());
 					aContext.MbmsPacketContext().Delete(*aStatus);
 					aContext.SetStrategyStep(EDeleteContextStep);
 					}
 				else
 					{
+                    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_9, "TContextDeleteStrategy::Next() - EDeactivateStep - MbmsPacketContext::SubSessionHandle() returned error, contextName = [%S]", aContext.Name());
 					// jump to next step
 					aContext.SetStrategyStep(EDeleteContextStep);
 					User::RequestComplete( aStatus, err);
@@ -227,10 +235,12 @@
 			{
 			if (aContext.ContextType() != SpudMan::EMbms)
 				{
+                OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_10, "TContextDeleteStrategy::Next() - EDeleteContextStep - PacketContext::Close(), contextName = [%S]", aContext.Name());
 				aContext.PacketContext().Close();
 				}
 			else
 				{
+                OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_11, "TContextDeleteStrategy::Next() - EDeleteContextStep - MbmsPacketContext::Close(), contextName = [%S]", aContext.Name());
 				aContext.MbmsPacketContext().Close();
 				}	
 			// clear the name
@@ -241,7 +251,7 @@
 			
 		default:
 			// incorrect step
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_2, "ERROR: Incorrect case");
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_12, "TContextDeleteStrategy::Next() - ERROR: Incorrect case, contextName = [%S]", aContext.Name());
 			ASSERT(EFalse);
 			err = KErrNotSupported;
 			break;
@@ -328,8 +338,6 @@
 */
 void TCreate1ryPdpContextStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_1, "TCreate1ryPdpContextStrategy::Next()");
-	
 	TInt err = KErrNone;
 	
 	// possible steps:
@@ -340,13 +348,14 @@
 		{
 		case EStartStep:
 			{
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_1, "TCreate1ryPdpContextStrategy::Next() - EStartStep, PacketContext::OpenNewContext()");  
 			err = aContext.PacketContext().OpenNewContext (aContext.PacketService(), aContext.Name());
 			if (err)
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_2, "PacketContextOpenNewContext returned %d", err);
+				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_2, "TCreate1ryPdpContextStrategy::Next() - PacketContext::OpenNewContext() returned %d", err);
 				break;
 				}
-				
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_3, "TCreate1ryPdpContextStrategy::Next() - PacketContext::InitialiseContext(), contextName = [%S]", aContext.Name());   	
 			aContext.PacketContext().InitialiseContext(*aStatus, aContext.DataChannelV2Pckg());						
 			aContext.SetStrategyStep (EInitialiseContextStep);
 			break;
@@ -357,6 +366,7 @@
 			// get packet config from fsm
 			aContext.PdpFsmInterface().Get (aContext.Id(), aContext.ContextPacketDataConfigBase());
 			// async set config
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_4, "TCreate1ryPdpContextStrategy::Next() - EInitialiseContextStep - PacketContext::SetConfig(), contextName = [%S]", aContext.Name()); 
 			aContext.PacketContext().SetConfig (*aStatus, aContext.ContextConfig());
 			// set next step
 			aContext.SetStrategyStep (ESetConfigStep);
@@ -365,12 +375,13 @@
 			
 		case ESetConfigStep:
 			{
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_5, "TCreate1ryPdpContextStrategy::Next() - ESetConfigStep - PacketQoS::OpenNewQoS(), contextName = [%S]", aContext.Name()); 
 			// QoS name is not used anywhere
 			TName newName;
 			err = aContext.PacketQoS().OpenNewQoS (aContext.PacketContext(), newName);
 			if (err)
 				{ 
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_3, "PacketQoS OpenNewQoS returned %d", err);
+				OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_6, "TCreate1ryPdpContextStrategy::Next() - ESetConfigStep - PacketQoS::OpenNewQoS() returned %d, contextName = [%S]", err, aContext.Name());
 				break; 
 				}
 				
@@ -389,19 +400,21 @@
 #if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
             aContext.DumpReqProfileParameters ();
 #endif			
-			aContext.PacketQoS().SetProfileParameters (*aStatus, aContext.QosRequestedPckg());
+            OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_7, "TCreate1ryPdpContextStrategy::Next() - ESetConfigStep - PacketQoS()::SetProfileParameters(), contextName = [%S]", aContext.Name()); 
+            aContext.PacketQoS().SetProfileParameters (*aStatus, aContext.QosRequestedPckg());
 			aContext.SetStrategyStep (ESetProfileParamsStep);
 			break;
 			}
 			
 		case ESetProfileParamsStep:
 			{
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_8, "TCreate1ryPdpContextStrategy::Next() - ESetProfileParamsStep, contextName = [%S]", aContext.Name());    
 			aContext.SetStrategyStep (EFinishStep);
 			break;
 			}
 			
 		default:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_4, "ERROR: Incorrect case");
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_9, "TCreate1ryPdpContextStrategy::Next() - ERROR: Incorrect case, contextName = [%S]", aContext.Name());   
 			ASSERT(EFalse);
 			err = KErrNotSupported;
 			break;
@@ -483,8 +496,6 @@
 */
 void TCreate2ryPdpContextStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_1, "TCreate2ryPdpContextStrategy::Next()");
-	
 	TInt err = KErrNone;
 	
 	// possible steps:
@@ -496,19 +507,22 @@
 		case EStartStep:
 			{
 			const TName& existingContextName = aContext.ExistingContextName();
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_1, "TCreate2ryPdpContextStrategy::Next() - EStartStep - PacketContext::OpenNewSecondaryContext(), existingContextName = [%S]", existingContextName);    
 			aContext.PacketContext().OpenNewSecondaryContext(aContext.PacketService(), existingContextName, aContext.Name());
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_2, "TCreate2ryPdpContextStrategy::Next() - EStartStep - PacketContext::InitialiseContext(), contextName = [%S]", aContext.Name());    
 			aContext.PacketContext().InitialiseContext(*aStatus, aContext.DataChannelV2Pckg());						
 			aContext.SetStrategyStep (EInitialiseContextStep);
 			break;
 			}
 		case EInitialiseContextStep:
 			{
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_3, "TCreate2ryPdpContextStrategy::Next() -  EInitialiseContextStep - PacketQoS::OpenNewQoS(), contextName = [%S]", aContext.Name()); 
 			// QoS name is not used anywhere
 			TName newName;
 			err = aContext.PacketQoS().OpenNewQoS (aContext.PacketContext(), newName);
 			if (err)
 				{ 
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_2, "PacketQoS OpenNewQoS returned %d", err);
+				OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_4, "TCreate2ryPdpContextStrategy::Next() - EInitialiseContextStep - PacketQoS OpenNewQoS returned %d, contextName = [%S]", err, aContext.Name());
 				break; 
 				}
 			aContext.SetStrategyStep (EFinishStep);
@@ -516,7 +530,7 @@
 			}
 			
 		default:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_3, "ERROR: Incorrect case");
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_5, "TCreate2ryPdpContextStrategy::Next() - ERROR: Incorrect case, contextName = [%S]", aContext.Name()); 
 			ASSERT(EFalse);
 			err = KErrNotSupported;
 			break;
@@ -571,8 +585,6 @@
 */
 void TSetQoSStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETQOSSTRATEGY_NEXT_1, "TSetQoSStrategy::Next()");
-	
 	TInt err = KErrNone;
 	
 	// possible steps:
@@ -581,6 +593,7 @@
 		{
 		case EStartStep:
 			{
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETQOSSTRATEGY_NEXT_1, "TSetQoSStrategy::Next() - EStartStep, contextName = [%S]", aContext.Name());    
 #ifdef SYMBIAN_NETWORKING_UMTSR5
             RPacketQoS::TQoSR5Requested req;
 #else
@@ -595,6 +608,7 @@
 #if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
             aContext.DumpReqProfileParameters ();
 #endif			
+            OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETQOSSTRATEGY_NEXT_2, "TSetQoSStrategy::Next() - EStartStep - PacketQoS::SetProfileParameters(), contextName = [%S]", aContext.Name()); 
             aContext.PacketQoS().SetProfileParameters (*aStatus, aContext.QosRequestedPckg());
 			aContext.SetStrategyStep (ESetProfileParamsStep);
 			break;
@@ -602,6 +616,7 @@
 			
 		case ESetProfileParamsStep:
 			{
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETQOSSTRATEGY_NEXT_3, "TSetQoSStrategy::Next() - ESetProfileParamsStep, contextName = [%S]", aContext.Name()); 
 			aContext.SetStrategyStep (EFinishStep);
 			break;
 			}
@@ -609,7 +624,7 @@
 		default:
 			{
 			// unexpected
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETQOSSTRATEGY_NEXT_2, "ERROR: Incorrect case");
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETQOSSTRATEGY_NEXT_4, "TSetQoSStrategy::Next() - ERROR: Incorrect case, contextName = [%S]", aContext.Name()); 
 			ASSERT(EFalse);
 			err = KErrNotSupported;
 			break;
@@ -676,8 +691,6 @@
 */
 void TSetTftStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_1, "TSetTftStrategy::Next()");
-	
 	TInt err = KErrNone;
 
 	// possible steps:
@@ -686,20 +699,22 @@
 		{
 		case EStartStep:
 			{
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_1, "TSetTftStrategy::Next() - EStartStep, contextName = [%S]", aContext.Name());
 			aContext.PdpFsmInterface().Get (aContext.Id(), aContext.TftOperationCode());
 			switch(aContext.TftOperationCode())
 				{
 				case KAddFilters:
 					aContext.PdpFsmInterface().Get (aContext.Id(), aContext.TftInfo());
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_2, "TftOperationCode - Add Filters %d", aContext.TftInfo().FilterCount());
+					OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_2, "TSetTftStrategy::Next() - EStartStep - TftOperationCode - Add Filters %d, contextName = [%S]", aContext.TftInfo().FilterCount(), aContext.Name());
 					// Set strategy assumes that TFT has to be created on a first place
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_3, "Creating TFT...");
 					if (aContext.ContextType() != SpudMan::EMbms)
 						{	
+                        OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_3, "TSetTftStrategy::Next() - EStartStep - TftOperationCode - PacketContext::CreateNewTFT(), contextName = [%S]", aContext.Name());
 						aContext.PacketContext().CreateNewTFT(*aStatus, aContext.TftInfo().FilterCount());
 						}
 					else
 						{
+                        OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_4, "TSetTftStrategy::Next() - EStartStep - TftOperationCode - MbmsPacketContext::CreateNewTFT, contextName = [%S]", aContext.Name());
 						aContext.MbmsPacketContext().CreateNewTFT(*aStatus, aContext.TftInfo().FilterCount());
 						}	
 					aContext.SetStrategyStep (ECreateNewTFTStep);
@@ -707,17 +722,17 @@
 
 				case KRemoveFilters:
 					err = KErrNotSupported;
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_4, "TftOperationCode - Remove is not supported in a Set strategy, return %d", err);
+					OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_5, "TSetTftStrategy::Next() - EStartStep - TftOperationCode - Remove is not supported in a Set strategy, return %d, contextName = [%S]", err, aContext.Name());
 					break;
 
 				case KDeleteTFT:
 					err = KErrNotSupported;
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_5, "TftOperationCode - Delete is not supported in a Set strategy, return %d", err);
+					OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_6, "TSetTftStrategy::Next() - EStartStep - TftOperationCode - Delete is not supported in a Set strategy, return %d, contextName = [%S]", err, aContext.Name());
 					break;
 
 				default:
 					// wrong case
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_6, "ERROR: Incorrect case");
+					OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_7, "TSetTftStrategy::Next() - EStartStep - TftOperationCode - ERROR: Incorrect case, contextName = [%S]", aContext.Name());
 					ASSERT(EFalse);
 					err = KErrNotSupported;
 					break;
@@ -727,15 +742,18 @@
 	
 		case ECreateNewTFTStep:
 			{
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_8, "TSetTftStrategy::Next() - ECreateNewTFTStep, contextName = [%S]", aContext.Name());
 			TInt err1st = aContext.FirstFilterV2();
 			if(err1st == KErrNone)
 				{
 				if (aContext.ContextType() != SpudMan::EMbms)
 					{
+                    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_9, "TSetTftStrategy::Next() - ECreateNewTFTStep - PacketContext::AddPacketFilter(), contextName = [%S]", aContext.Name());
 					aContext.PacketContext().AddPacketFilter( *aStatus, aContext.FilterV2Pckg());
 					}
 				else
 					{
+                    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_10, "TSetTftStrategy::Next() - ECreateNewTFTStep - MbmsPacketContext::AddPacketFilter(), contextName = [%S]", aContext.Name());
 					aContext.MbmsPacketContext().AddPacketFilter( *aStatus, aContext.FilterV2Pckg());
 					}	
 				aContext.SetStrategyStep (EAddTftStep);
@@ -752,15 +770,18 @@
 
 		case EAddTftStep:
 			{
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_11, "TSetTftStrategy::Next() - EAddTftStep, contextName = [%S]", aContext.Name());
 			TInt errV2 = aContext.NextFilterV2();
 			if(errV2 == KErrNone)
 				{
 				if (aContext.ContextType() != SpudMan::EMbms)
 					{
+                    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_12, "TSetTftStrategy::Next() - EAddTftStep - PacketContext::AddPacketFilter(), contextName = [%S]", aContext.Name());
 					aContext.PacketContext().AddPacketFilter( *aStatus, aContext.FilterV2Pckg());
 					}
 				else
 					{
+                    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_13, "TSetTftStrategy::Next() - EAddTftStep - MbmsPacketContext::AddPacketFilter(), contextName = [%S]", aContext.Name());
 					aContext.MbmsPacketContext().AddPacketFilter( *aStatus, aContext.FilterV2Pckg());
 					}
 				aContext.SetStrategyStep (EAddTftStep);
@@ -777,7 +798,7 @@
 
 		default:
 			// unexpected
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_7, "ERROR: Incorrect case");
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_14, "TSetTftStrategy::Next() - ERROR: Incorrect case, contextName = [%S]", aContext.Name());
 			ASSERT(EFalse);
 			err = KErrNotSupported;
 			break;
@@ -820,15 +841,15 @@
 		{
 		case ECreateNewTFTStep:
 			{
-			aContext.PacketQoS().CancelAsyncRequest(EPacketContextCreateNewTFT);
 			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_CANCELASYNCREQUEST_1, "Cancel PacketQoS::EPacketContextCreateNewTFT");
+	        aContext.PacketQoS().CancelAsyncRequest(EPacketContextCreateNewTFT);
 			break;
 			}
 			
 		case EAddTftStep:
 			{
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_CANCELASYNCREQUEST_2, "Cancel PacketQoS::EPacketContextAddPacketFilter");
 			aContext.PacketQoS().CancelAsyncRequest(EPacketContextAddPacketFilter);
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_CANCELASYNCREQUEST_2, "Cancel PacketQoS::EPacketContextAddPacketFilter");
 			break;
 			}
 
@@ -851,30 +872,29 @@
 */
 void TChangeTftStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_1, "TChangeTftStrategy::Next()");
-	
 	TInt err = KErrNone;
 
 	// special case. 
 	if(EStartStep == aContext.StrategyStep())
 		{
+        OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_1, "TChangeTftStrategy::Next() - EStartStep, contextName = [%S]", aContext.Name());
 		aContext.PdpFsmInterface().Get (aContext.Id(), aContext.TftOperationCode());
 		switch(aContext.TftOperationCode())
 			{
 			case KAddFilters:
 				aContext.PdpFsmInterface().Get (aContext.Id(), aContext.TftInfo());
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_2, "TftOperationCode - Add Filters %d", aContext.TftInfo().FilterCount());
+				OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_2, "TChangeTftStrategy::Next() - EStartStep - TftOperationCode - Add Filters %d, contextName = [%S]", aContext.TftInfo().FilterCount(), aContext.Name());
 				aContext.SetStrategyStep (EAddFirstTftStep);
 				break;
 
 			case KRemoveFilters:
 				aContext.PdpFsmInterface().Get (aContext.Id(), aContext.TftInfo());
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_3, "TftOperationCode - Remove %d Filters", aContext.TftInfo().FilterCount());
+				OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_3, "TChangeTftStrategy::Next() - EStartStep - TftOperationCode - Remove %d Filters, contextName = [%S]", aContext.TftInfo().FilterCount(), aContext.Name());
 				aContext.SetStrategyStep (ERemoveFirstTftStep);
 				break;
 
 			case KDeleteTFT:
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_4, "TftOperationCode - Delete TFT");
+				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_4, "TChangeTftStrategy::Next() - EStartStep - TftOperationCode - PacketContext::DeleteTFT(), contextName = [%S]", aContext.Name());
 				// delete old TFT
 				aContext.PacketContext().DeleteTFT(*aStatus);
 				aContext.SetStrategyStep (EDeleteTftStep);
@@ -883,7 +903,7 @@
 
 			default:
 				// wrong case
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_5, "ERROR: Incorrect case");
+				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_5, "TChangeTftStrategy::Next() - EStartStep - TftOperationCode - ERROR: Incorrect case, contextName = [%S]", aContext.Name());
 				ASSERT(EFalse);
 				err = KErrNotSupported;
 				break;
@@ -900,6 +920,7 @@
 			{
 			case EDeleteTftStep:
 				{
+				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_6, "TChangeTftStrategy::Next() - EDeleteTftStep, contextName = [%S]", aContext.Name());
 				aContext.SetStrategyStep (EChangeTftFinished);
 				User::RequestComplete( aStatus, KErrNone);
 				break;
@@ -907,15 +928,18 @@
 				
 			case EAddFirstTftStep:
 				{
+				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_7, "TChangeTftStrategy::Next() - EAddFirstTftStep, contextName = [%S]", aContext.Name());
 				TInt errV2 = aContext.FirstFilterV2();
 				if(errV2 == KErrNone)
 					{
 					if (aContext.ContextType() == SpudMan::EMbms)
 						{
+                        OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_8, "TChangeTftStrategy::Next() - EAddFirstTftStep - MbmsPacketContext::AddPacketFilter(), contextName = [%S]", aContext.Name());
 						aContext.MbmsPacketContext().AddPacketFilter( *aStatus, aContext.FilterV2Pckg());
 						}
 					else
 						{	
+                        OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_9, "TChangeTftStrategy::Next() - EAddFirstTftStep - PacketContext::AddPacketFilter(), contextName = [%S]", aContext.Name());
 						aContext.PacketContext().AddPacketFilter( *aStatus, aContext.FilterV2Pckg());
 						}
 					aContext.SetStrategyStep (EAddTftStep);
@@ -931,15 +955,18 @@
 
 			case EAddTftStep:
 				{
+				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_10, "TChangeTftStrategy::Next() - EAddTftStep, contextName = [%S]", aContext.Name());
 				TInt errV2 = aContext.NextFilterV2();
 				if(errV2 == KErrNone)
 					{
 					if (aContext.ContextType() == SpudMan::EMbms)
 						{
+                        OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_11, "TChangeTftStrategy::Next() - EAddFirstTftStep - MbmsPacketContext::AddPacketFilter(), contextName = [%S]", aContext.Name());
 						aContext.MbmsPacketContext().AddPacketFilter( *aStatus, aContext.FilterV2Pckg());
 						}
 					else
 						{
+                        OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_12, "TChangeTftStrategy::Next() - EAddFirstTftStep - PacketContext::AddPacketFilter(), contextName = [%S]", aContext.Name());
 						aContext.PacketContext().AddPacketFilter( *aStatus, aContext.FilterV2Pckg());
 						}
 					aContext.SetStrategyStep (EAddTftStep);
@@ -955,15 +982,18 @@
 
 			case ERemoveFirstTftStep:
 				{
+				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_13, "TChangeTftStrategy::Next() - ERemoveFirstTftStep, contextName = [%S]", aContext.Name());
 				TInt errV2 = aContext.FirstFilterV2();
 				if(errV2 == KErrNone)
 					{
 					if (aContext.ContextType() == SpudMan::EMbms)
 						{
+                        OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_14, "TChangeTftStrategy::Next() - EAddFirstTftStep - MbmsPacketContext::RemovePacketFilter(), contextName = [%S]", aContext.Name());
 						aContext.MbmsPacketContext().RemovePacketFilter( *aStatus, aContext.FilterV2().iId);
 						}
 					else
 						{
+                        OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_15, "TChangeTftStrategy::Next() - EAddFirstTftStep - PacketContext::RemovePacketFilter(), contextName = [%S]", aContext.Name());
 						aContext.PacketContext().RemovePacketFilter( *aStatus, aContext.FilterV2().iId);
 						}	
 					aContext.SetStrategyStep (ERemoveTftStep);
@@ -979,15 +1009,18 @@
 				
 			case ERemoveTftStep:
 				{
+				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_16, "TChangeTftStrategy::Next() - ERemoveTftStep, contextName = [%S]", aContext.Name());
 				TInt errV2 = aContext.NextFilterV2();
 				if(errV2 == KErrNone)
 					{
 					if (aContext.ContextType() == SpudMan::EMbms)
 						{
+                        OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_17, "TChangeTftStrategy::Next() - EAddFirstTftStep - MbmsPacketContext::RemovePacketFilter(), contextName = [%S]", aContext.Name());
 						aContext.MbmsPacketContext().RemovePacketFilter( *aStatus, aContext.FilterV2().iId);
 						}
 					else
-						{				
+						{	
+                        OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_18, "TChangeTftStrategy::Next() - EAddFirstTftStep - PacketContext::RemovePacketFilter(), contextName = [%S]", aContext.Name());
 						aContext.PacketContext().RemovePacketFilter( *aStatus, aContext.FilterV2().iId);
 						}
 					aContext.SetStrategyStep (ERemoveTftStep);
@@ -1003,6 +1036,7 @@
 
 			case EChangeTftFinished:
 				{
+				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_19, "TChangeTftStrategy::Next() - ERemoveTftStep, contextName = [%S]", aContext.Name());
 				aContext.SetStrategyStep (EFinishStep);
 				}
 				break;
@@ -1010,7 +1044,7 @@
 				
 			default:
 				// unexpected
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_6, "ERROR: Incorrect case");
+				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_20, "TChangeTftStrategy::Next() - ERROR: Incorrect case, contextName = [%S]", aContext.Name());
 				ASSERT(EFalse);
 				err = KErrNotSupported;
 				break;
@@ -1093,15 +1127,13 @@
 */
 void TActivatePdpStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_1, "TActivatePdpStrategy::Next()");
-	
 	TInt err = KErrNone;
 	
 	switch(aContext.StrategyStep())
 		{
 		case EStartStep:
-			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_3, "RPacketContext::Activate()");
+			{			 
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_1, "TActivatePdpStrategy::Next() - EStartStep - RPacketContext::Activate(), contextName = [%S]", aContext.Name());
 			aContext.PacketContext().Activate(*aStatus);
 			aContext.SetStrategyStep (EActivateStep);
 			break;
@@ -1110,7 +1142,7 @@
 		case EActivateStep:
 		case ENotifyStatusChange:
 			{
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_4, "RPacketContext::GetStatus()");
+            OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_2, "TActivatePdpStrategy::Next() - ENotifyStatusChange - RPacketContext::GetStatus(), contextName = [%S]", aContext.Name());
 
             if (aContext.PacketContext().GetStatus(aContext.ContextStatus()) != KErrNone)
                 {
@@ -1120,15 +1152,17 @@
             switch (aContext.ContextStatus())
             	{
             	case RPacketContext::EStatusActive:
+            	    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_3, "TActivatePdpStrategy::Next() - ENotifyStatusChange - EStatusActive, contextName = [%S]", aContext.Name());
                 	// Context is now active
     	            aContext.PdpFsmInterface().Get (aContext.Id(), aContext.ContextPacketDataConfigBase());
-    	            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_5, "RPacketContext::GetConfig()");
+    	            OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_4, "TActivatePdpStrategy::Next() - ENotifyStatusChange - RPacketContext::GetConfig(), contextName = [%S]", aContext.Name());
     				aContext.PacketContext().GetConfig (*aStatus, aContext.ContextConfig());
     				aContext.SetStrategyStep (EGetConfigStep);
     				break;
 
             	case RPacketContext::EStatusInactive:
                     {
+                    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_5, "TActivatePdpStrategy::Next() - ENotifyStatusChange - EStatusInactive - PacketContext::GetLastErrorCause(), contextName = [%S]", aContext.Name());
                     // Context is inactive so find out why
                     TInt errTsy = KErrNone;
                     TInt rc = aContext.PacketContext().GetLastErrorCause(errTsy);
@@ -1163,7 +1197,7 @@
             	
             	default:
             		// Not active, not inactive. Re-request the status and try again
-                    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_6, "RPacketContext::NotifyStatusChange()");
+                    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_6, "TActivatePdpStrategy::Next() - ENotifyStatusChange - default - RPacketContext::NotifyStatusChange(), status = %d, contextName = [%S]", aContext.ContextStatus(), aContext.Name());
                     aContext.PacketContext().NotifyStatusChange(*aStatus, aContext.ContextStatus());
                     aContext.SetStrategyStep (ENotifyStatusChange);
                     break;
@@ -1173,9 +1207,11 @@
 			
 		case EGetConfigStep:
 			{
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_7, "TActivatePdpStrategy::Next() - EGetConfigStep, contextName = [%S]", aContext.Name());
 			aContext.PdpFsmInterface().Set (aContext.Id(), aContext.ContextPacketDataConfigBase());
 			if (KPrimaryContextId == aContext.Id())
 				{
+                OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_8, "TActivatePdpStrategy::Next() - EGetConfigStep - PacketQoS::GetProfileParameters(), contextName = [%S]", aContext.Name());
                 aContext.PacketQoS().GetProfileParameters (*aStatus, aContext.QosNegotiatedPckg());	
 #if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
                 aContext.DumpNegProfileParameters ();
@@ -1196,6 +1232,7 @@
 			
 		case EGetProfileParamsStep:
 			{
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_9, "TActivatePdpStrategy::Next() - EGetProfileParamsStep, contextName = [%S]", aContext.Name());
 			// start notifications in case of normal creation of a context
 			// -- 	StatusChangeNotifier
 			// --	QoSChangeNotifier
@@ -1207,7 +1244,7 @@
 			
 		default:
 			// unexpected
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_2, "ERROR: Incorrect case");
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_10, "TActivatePdpStrategy::Next() - ERROR: Incorrect case, contextName = [%S]", aContext.Name());
 			ASSERT(EFalse);
 			err = KErrNotSupported;
 			break;
@@ -1312,14 +1349,13 @@
 */
 void TGetNegQoSStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TGETNEGQOSSTRATEGY_NEXT_1, "TGetNegQoSStrategy::Next()");
-	
 	TInt err = KErrNone;
 	
 	switch(aContext.StrategyStep())
 		{
 		case EStartStep:
 			{
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TGETNEGQOSSTRATEGY_NEXT_1, "TGetNegQoSStrategy::Next() - EStartStep - PacketQoS::GetProfileParameters(), contextName = [%S]", aContext.Name());
 			aContext.PacketQoS().GetProfileParameters (*aStatus, aContext.QosNegotiatedPckg());
 #if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
             aContext.DumpNegProfileParameters ();
@@ -1330,13 +1366,14 @@
 
 		case EGetProfileParamsStep:
 			{
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TGETNEGQOSSTRATEGY_NEXT_2, "TGetNegQoSStrategy::Next() - EGetProfileParamsStep, contextName = [%S]", aContext.Name());
 			aContext.SetStrategyStep (EFinishStep);
 			break;
 			}
 			
 		default:
 			// unexpected
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TGETNEGQOSSTRATEGY_NEXT_2, "ERROR: Incorrect case");
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TGETNEGQOSSTRATEGY_NEXT_3, "TGetNegQoSStrategy::Next() - ERROR: Incorrect case, contextName = [%S]", aContext.Name());
 			ASSERT(EFalse);
 			err = KErrNotSupported;
 			break;
@@ -1416,8 +1453,6 @@
 */
 void TModifyActiveStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_NEXT_1, "TModifyActiveStrategy::Next()");
-	
 	TInt err = KErrNone;
 	
 	switch(aContext.StrategyStep())
@@ -1426,11 +1461,13 @@
 			{
 			if (aContext.ContextType() != SpudMan::EMbms)
 				{
+                 OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_NEXT_1, "TModifyActiveStrategy::Next() - EStartStep - PacketContext::ModifyActiveContext(), contextName = [%S]", aContext.Name());
 				aContext.PacketContext().ModifyActiveContext(*aStatus);
 				aContext.SetStrategyStep (EModifyActiveStep);
 				}
 			else
 				{
+                 OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_NEXT_2, "TModifyActiveStrategy::Next() - EStartStep - MbmsPacketContext::ModifyActiveContext(), contextName = [%S]", aContext.Name());
 				aContext.MbmsPacketContext().ModifyActiveContext(*aStatus);
 				aContext.SetStrategyStep (EGetProfileParamsStep);
 				}	
@@ -1440,6 +1477,7 @@
 		
 		case EModifyActiveStep:
 			{
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_NEXT_3, "TModifyActiveStrategy::Next() - EModifyActiveStep - PacketQoS::GetProfileParameters(), contextName = [%S]", aContext.Name());
 			aContext.PacketQoS().GetProfileParameters (*aStatus, aContext.QosNegotiatedPckg());
 #if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
             aContext.DumpNegProfileParameters ();
@@ -1450,13 +1488,14 @@
 			
 		case EGetProfileParamsStep:
 			{
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_NEXT_4, "TModifyActiveStrategy::Next() - EGetProfileParamsStep, contextName = [%S]", aContext.Name());
 			aContext.SetStrategyStep (EFinishStep);
 			break;
 			}
 			
 		default:
 			// unexpected
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_NEXT_2, "ERROR: Incorrect case");
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_NEXT_5, "TModifyActiveStrategy::Next() - ERROR: Incorrect case, contextName = [%S]", aContext.Name());
 			ASSERT(EFalse);
 			err = KErrNotSupported;
 			break;
@@ -1534,12 +1573,6 @@
 	}
 
 
-
-
-
-
-
-
 // 
 //	TCreateMbmsPdpContextStrategy 
 //
@@ -1550,8 +1583,6 @@
 */
 void TCreateMbmsPdpContextStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_1, "TCreateMbmsPdpContextStrategy::Next()");
-	
 	TInt err = KErrNone;
 	
 	// possible steps:
@@ -1562,13 +1593,14 @@
 		{
 		case EStartStep:
 			{
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_1, "TCreateMbmsPdpContextStrategy::Next() - EStartStep - MbmsPacketContext::OpenNewContext()");
 			err = aContext.MbmsPacketContext().OpenNewContext (aContext.PacketService(), aContext.Name());
 			if (err)
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_2, "PacketContextOpenNewContext returned for MBMS %d", err);
+				OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_2, "TCreateMbmsPdpContextStrategy::Next() - EStartStep - PacketContextOpenNewContext returned for MBMS %d, contextName = [%S]", err, aContext.Name());
 				break;
 				}
-				
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_3, "TCreateMbmsPdpContextStrategy::Next() - EStartStep - MbmsPacketContext::InitialiseContext(), contextName = [%S]", aContext.Name());	
 			aContext.MbmsPacketContext().InitialiseContext(*aStatus, aContext.DataChannelV2Pckg());						
 			aContext.SetStrategyStep (EInitialiseContextStep);
 			break;
@@ -1576,6 +1608,7 @@
 			
 		case EInitialiseContextStep:
 			{
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_4, "TCreateMbmsPdpContextStrategy::Next() - EInitialiseContextStep - MbmsPacketContext::SetConfig(), contextName = [%S]", aContext.Name());    
 			// get mbms packet config from fsm
 			aContext.PdpFsmInterface().Get (aContext.Id(), aContext.ContextConfigMbms());
 			// async set config
@@ -1585,11 +1618,12 @@
 			break;
 			}
 		case ESetConfigStep:
+		    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_5, "TCreateMbmsPdpContextStrategy::Next() - ESetConfigStep, contextName = [%S]", aContext.Name());    
 			aContext.SetStrategyStep (EFinishStep);
 			break;	
 	
 		default:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_3, "ERROR: Incorrect case");
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_6, "TCreateMbmsPdpContextStrategy::Next() - ERROR: Incorrect case, contextName = [%S]", aContext.Name());    
 			ASSERT(EFalse);
 			err = KErrNotSupported;
 			break;
@@ -1659,14 +1693,13 @@
 */
 void TActivateMbmsPdpStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_NEXT_1, "TActivatePdpStrategy::Next()");
-	
 	TInt err = KErrNone;
 	
 	switch(aContext.StrategyStep())
 		{
 		case EStartStep:
 			{
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_NEXT_1, "TActivatePdpStrategy::Next() - EStartStep - MbmsPacketContext::Activate(), contextName = [%S]", aContext.Name());    
 			aContext.MbmsPacketContext().Activate(*aStatus);
 			aContext.SetStrategyStep (EActivateStep);
 			break;
@@ -1674,6 +1707,7 @@
 		
 		case EActivateStep:
 			{
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_NEXT_2, "TActivatePdpStrategy::Next() - EActivateStep - MbmsPacketContext::GetConfig(), contextName = [%S]", aContext.Name());    
 			aContext.PdpFsmInterface().Get (aContext.Id(), aContext.ContextConfigMbms());
 			aContext.MbmsPacketContext().GetConfig (*aStatus, aContext.ContextConfigMbmsPckg());
 			aContext.SetStrategyStep (EGetConfigStep);
@@ -1682,6 +1716,7 @@
 			
 		case EGetConfigStep:
 			{
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_NEXT_3, "TActivatePdpStrategy::Next() - EGetConfigStep - MbmsPacketContext::InitialiseContext(), contextName = [%S]", aContext.Name());    
 			aContext.PdpFsmInterface().Set (aContext.Id(), aContext.ContextConfigMbms());
 			aContext.MbmsPacketContext().InitialiseContext(*aStatus, aContext.DataChannelV2Pckg());
 			aContext.SetStrategyStep (EGetProfileParamsStep);
@@ -1691,6 +1726,7 @@
 				
 		case EGetProfileParamsStep:
 			{
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_NEXT_4, "TActivatePdpStrategy::Next() - EGetProfileParamsStep, contextName = [%S]", aContext.Name());    
 			// start notifications in case of normal creation of a context
 			// -- 	StatusChangeNotifier
 			// --	QoSChangeNotifier
@@ -1702,7 +1738,7 @@
 			
 		default:
 			// unexpected
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_NEXT_2, "ERROR: Incorrect case");
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_NEXT_5, "TActivatePdpStrategy::Next() - ERROR: Incorrect case, contextName = [%S]", aContext.Name());    
 			ASSERT(EFalse);
 			err = KErrNotSupported;
 			break;
@@ -1788,13 +1824,12 @@
 */	
 void TMbmsSessionUpdateStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMBMSSESSIONUPDATESTRATEGY_NEXT_1, "TMbmsSessionUpdateStrategy::Next()");
-	
 	TInt err = KErrNone;
 	switch(aContext.StrategyStep())
 		{
 		case EStartStep:
 			{
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMBMSSESSIONUPDATESTRATEGY_NEXT_1, "TMbmsSessionUpdateStrategy::Next() - EStartStep, contextName = [%S]", aContext.Name());    
 			TInt sessionId=KErrNotFound;
 			aContext.PdpFsmInterface().Get (aContext.Id(), aContext.GetSessionInfo());
 			TSessionOperatioInfo sessionInfo = aContext.GetSessionInfo();
@@ -1813,18 +1848,21 @@
 			if ((sessionInfo.iOperation == CSubConMBMSExtensionParamSet::EAddSession) 
 				  && (sessionId != KErrNotFound))
 				{
+                OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMBMSSESSIONUPDATESTRATEGY_NEXT_2, "TMbmsSessionUpdateStrategy::Next() - EStartStep - MbmsPacketContext::UpdateMbmsSessionList() with EAddEntries, contextName = [%S]", aContext.Name());    
 				aContext.MbmsPacketContext().UpdateMbmsSessionList(*aStatus,EAddEntries,sessionId);
 				break;
 				}
 			else if ((sessionInfo.iOperation == CSubConMBMSExtensionParamSet::ERemoveSession) 
 					&& (sessionId != KErrNotFound))
 				{
+                OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMBMSSESSIONUPDATESTRATEGY_NEXT_3, "TMbmsSessionUpdateStrategy::Next() - EStartStep - MbmsPacketContext::UpdateMbmsSessionList() with ERemoveEntries, contextName = [%S]", aContext.Name());   
 				aContext.MbmsPacketContext().UpdateMbmsSessionList(*aStatus,ERemoveEntries,sessionId);
 				break;
 				}
 			else if ((sessionInfo.iOperation == CSubConMBMSExtensionParamSet::ERemoveAll) 
 					&& (sessionId != KErrNotFound))
 				{
+                OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMBMSSESSIONUPDATESTRATEGY_NEXT_4, "TMbmsSessionUpdateStrategy::Next() - EStartStep - MbmsPacketContext::UpdateMbmsSessionList() with ERemoveAllEntries, contextName = [%S]", aContext.Name());   
 				aContext.MbmsPacketContext().UpdateMbmsSessionList(*aStatus,ERemoveAllEntries,sessionId);
 				aContext.SetStrategyStep(EUpdateMbmsSessionList);	
 				break;
@@ -1842,6 +1880,7 @@
 
 		case EUpdateMbmsSessionList:
 			{
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMBMSSESSIONUPDATESTRATEGY_NEXT_5, "TMbmsSessionUpdateStrategy::Next() - EUpdateMbmsSessionList - CRetrievePcktMbmsSessionList::Start(), contextName = [%S]", aContext.Name());  
 			TRAP_IGNORE(aContext.SetMbmsSession(RPacketMbmsContext::CMbmsSession::NewL()));
 			TRAP_IGNORE(aContext.SetRetrievePcktMbmsSessionList(CRetrievePcktMbmsSessionList::NewL(aContext.MbmsPacketContext(),*aContext.MbmsSession())));
 			aContext.RetrievePcktMbmsSessionList()->Start(*aStatus);
@@ -1851,6 +1890,7 @@
 			
 		case EPrepareSessionList:
 			{
+			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMBMSSESSIONUPDATESTRATEGY_NEXT_6, "TMbmsSessionUpdateStrategy::Next() - EPrepareSessionList, contextName = [%S]", aContext.Name());  
 			RPacketMbmsContext::CMbmsSession *mbmsSession =	aContext.MbmsSession();
 			if (mbmsSession)
 				{
@@ -1869,6 +1909,7 @@
 			}
 		
 		default: 
+		    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMBMSSESSIONUPDATESTRATEGY_NEXT_7, "TMbmsSessionUpdateStrategy::Next() - default, contextName = [%S]", aContext.Name());  
 			CRetrievePcktMbmsSessionList *retrievePktMbmsSessionList=aContext.RetrievePcktMbmsSessionList();
 			if (retrievePktMbmsSessionList)
 				delete retrievePktMbmsSessionList;
--- a/telephonyprotocols/pdplayer/umts/test/te_spud/inc/CPdpFsmInterface.h	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/test/te_spud/inc/CPdpFsmInterface.h	Tue Sep 14 17:55:14 2010 +0100
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -157,6 +157,7 @@
 	    return iUmtsRelease;
 	    }
 
+	const TName& GetContextName(TContextId aPdpId);
 
 protected:
 private:
--- a/telephonyprotocols/pdplayer/umts/test/te_spud/src/CPdpFsmInterface.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/test/te_spud/src/CPdpFsmInterface.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -786,5 +786,17 @@
 	return KErrNone;
 	}
 
+/** Get context name
 
+@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
+@return - Context name in a TName
+*/
+const TName& CPdpFsmInterface::GetContextName(TContextId aPdpId)
+    {
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GETCONTEXTNAME_1, ">>CPdpFsmInterface::GetContextName() for context id [%d]", aPdpId);
 
+    ASSERT(iPdpFsmFactory);
+    ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
+    ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
+    return iPdpFsmFactory->GetFsmContext(aPdpId)->GetDataChannelV2().iChannelId;
+    }
--- a/telephonyprotocols/pdplayer/umts/test/te_spud/traces/fixed_id.definitions	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/test/te_spud/traces/fixed_id.definitions	Tue Sep 14 17:55:14 2010 +0100
@@ -77,7 +77,6 @@
 [TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_DOCANCEL_1=0x192
 [TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_1=0x193
 [TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_2=0x194
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_3=0x195
 [TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_DOCANCEL_1=0x19a
 [TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_1=0x19b
 [TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_2=0x19c
@@ -85,7 +84,6 @@
 [TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_DOCANCEL_1=0x18e
 [TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_NOTIFY_1=0x18f
 [TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_NOTIFY_2=0x190
-[TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_NOTIFY_3=0x191
 [TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_CLOSE_1=0xb2
 [TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_CLOSE_2=0xb3
 [TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_CTOR_1=0xac
@@ -111,6 +109,7 @@
 [TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_CTOR_2=0x22d
 [TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_DTOR_1=0x22e
 [TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_DTOR_2=0x22f
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GETCONTEXTNAME_1=0x26d
 [TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_1=0x24c
 [TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_10_1=0x262
 [TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_10_2=0x263
@@ -342,7 +341,6 @@
 [TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_DTOR_1=0x19f
 [TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_NOTIFY_1=0x1a3
 [TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_NOTIFY_2=0x1a4
-[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_NOTIFY_3=0x1a5
 [TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_START_1=0x1a0
 [TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_START_2=0x1a1
 [TRACE]TRACE_INTERNALS[0x88]_CSERVICECHANGENOTIFIER_DOCANCEL_1=0x1a9
@@ -382,6 +380,10 @@
 [TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_5=0x1f3
 [TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_1=0x1e8
 [TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_2=0x1e9
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_3=0x269
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_4=0x26a
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_5=0x26b
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_6=0x26c
 [TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_1=0x1ea
 [TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_2=0x1eb
 [TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_3=0x1ec
@@ -616,3 +618,6 @@
 [TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_7=0x1d6
 [TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NOTIFYFSM_1=0x1d7
 [TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NOTIFYFSM_2=0x1d8
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_3=0x195
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_NOTIFY_3=0x191
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_NOTIFY_3=0x1a5
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/TE_PppSize_config.txt	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-[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,,,0,2,0,1,RasUser,pass,,,,,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, 1
-
-# 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
-
-#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
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3,0,0
-
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= ECUART, COMM::0, 18, 0, PRIMARY1
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/TE_PppSize_spud.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-// Parameters configuration for Tpppsize.EXE test
-
-// Comms driver to load at startup
-
-[CommsDrivers]
-WinsPDDname = ECDRV
-WinsLDDname = ECOMM
-WinsLDDFname = ECOMM
-ThumbPDDname = EUART1
-ThumbLDDname = ECOMM
-ThumbLDDFname = FCOMM
-
-
-// Ip Address of the echo server machine
-// Note: this machine must be up and running and listening on the echo port
-// This can be checked on NT4 by typing  NETSTAT -a
-
-[AddressInfo]
-TestPPPIPAddr = 192.168.30.13
-
-[MMUInfo]
-TestPPPminMMU = 1
-TestPPPmaxMMU = 1400
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/TE_PppSize_spud.xml	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,354 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-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:
- CommDB Settings File
- 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">
-
-<NetworkTable>
-    <Network operation="add">
-        <Name>NT RAS</Name>
-    </Network>
-</NetworkTable>
-
-<IAPTable>
-    <IAP operation="add">
-        <Name>Actual NT RAS</Name>
-        <IAPService>OutgoingGPRS.NT RAS</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.NT RAS</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-</IAPTable>
-
-<ModemBearerTable>
-    <ModemBearer operation="template">
-        <Name>Default Modem</Name>
-        <Agent>NULLAGT</Agent>
-        <BCAStack>C32Bca</BCAStack>
-        <TSYName>SIM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <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>AFTERDIALUNTILANSWER</SpeakerPref>
-        <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>
-        <LastSocketActivityTimeout>32</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>8</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>16</LastSocketClosedTimeout>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    
-    <ModemBearer operation="add">
-        <Name>Null Modem 115200bps</Name>
-        <BCAStack>C32Bca</BCAStack> <!-- This may be overwriten by some tests -->
-        <IfName>SPUD</IfName>        
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>4</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>
-        <MinimumSignalLevel>0</MinimumSignalLevel>
-        <LastSocketActivityTimeout>15</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>5</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
-    </ModemBearer>
-</ModemBearerTable>
-
-<LANBearerTable>
-</LANBearerTable>
-
-<DialInISPTable>
-</DialInISPTable>
-
-<DialOutISPTable>
-</DialOutISPTable>
-
-<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.Actual NT RAS</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.Office</LocationForDataAndFax>
-        <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
-        <GPRSClassCBearer>GSM</GPRSClassCBearer>
-        <DefaultNetwork>Network.NT RAS</DefaultNetwork>
-        <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
-    </GlobalSettings>
-</GlobalSettingsTable>
-
-<IncomingGPRSTable>
-</IncomingGPRSTable>
-
-<OutgoingGPRSTable>
-    <OutgoingGPRS operation="template">
-        <Name>Default Dial Out ISP</Name>
-        <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>
-        <IfAuthPass>pass</IfAuthPass>
-        <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.R99Default1</UmtsR99QoSAndOnRef>         
-    </OutgoingGPRS>
-    
-    <OutgoingGPRS operation="add">
-        <Name>NT RAS</Name>
-      	<PDPType>IPV4</PDPType>
-        <IfParams>lowernif=PPP</IfParams>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>  
-        <IfAuthPass>pass</IfAuthPass>
-    </OutgoingGPRS>
-</OutgoingGPRSTable>
-
-<DefaultGPRSTable>
-</DefaultGPRSTable>
-
-<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>
-</LocationTable>
-
-<SecureSocketTable>
-</SecureSocketTable>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-</VpnServiceTable>
-
-<UmtsR99QoSAndOnTable>
-    <UmtsR99QoSAndOn operation="add">
-        <Name>R99Default1</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> 
-    </UmtsR99QoSAndOn>
-</UmtsR99QoSAndOnTable>
-</CommDB:Config>
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/qospolicies.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-# ModuleSpecs
-modulespec guqos= {
-	STRING module = guqos.prt
-	INTEGER id=368
-	INTEGER flags = 1
-	}
-
-# FlowSpecs
-flowspec override = {
-	INTEGER token_rate_uplink = 1500
-	}
-
-flowspec default_flow_spec = {
-	INTEGER max_transfer_rate_uplink = 1500
-	INTEGER token_rate_uplink = 1500
-	INTEGER token_bucket_size_uplink = 3000
-	INTEGER max_packet_size_uplink = 1500
-	INTEGER min_policed_unit_uplink = 1500
-	INTEGER priority_uplink = 1
-	INTEGER drop_mode_uplink = 8
-	INTEGER max_transfer_rate_downlink = 1500
-	INTEGER token_rate_downlink = 1500
-	INTEGER token_bucket_size_downlink = 3000
-	INTEGER max_packet_size_downlink = 1500
-	INTEGER min_policed_unit_downlink = 1500
-	INTEGER priority_downlink = 1
-	INTEGER drop_mode_downlink = 8
-	}
-
-# UMTS Specs
-
-# Default APN should always be specified!
-extension_spec default_extension_spec = {
-	INTEGER	type = 5
-	INTEGER extension_type = 5
-	INTEGER TrafficClassRequested = 4
-	INTEGER MaxBitrateUplinkRequested = 2048
-	INTEGER MaxBitrateDownlinkRequested = 2048
-	INTEGER GuaBitrateUplinkRequested = 1024
-	INTEGER GuaBitrateDownlinkRequested = 1024
-	INTEGER HeaderCompressionRequested = 1
-	}
-
-extension_spec guqos_default = {
-	INTEGER type = 5
-	INTEGER extension_type = 5
-	# Subscribed
-	INTEGER TrafficClassRequested = 1
-	# Subscribed
-	INTEGER TrafficClassMinimum = 1
-	# Subscribed
-	INTEGER DeliveryOrderRequested = 1
-	# Subscribed
-	INTEGER DeliveryOrderMinimum = 1
-	# Subscribed
-	INTEGER DeliveryOfErroneusSduRequested = 1
-	# Subscribed
-	INTEGER DeliveryOfErroneusSduMinimum = 1
-	# Subscribed
-	INTEGER MaxSduSizeRequested = 0
-	# Subscribed
-	INTEGER MaxSduSizeMinimum = 0
-	# Subscribed
-	INTEGER MaxBitrateUplinkRequested = 0
-	# Subscribed
-	INTEGER MaxBitrateDownlinkRequested = 0
-	# Subscribed
-	INTEGER MaxBitrateUplinkMinimum = 0
-	# Subscribed
-	INTEGER MaxBitrateDownlinkMinimum = 0
-	# iReqBER Subscribed
-	INTEGER ResidualBerRequested = 1
-	# iMaxBER Subscribed
-	INTEGER ResidualBerMinimum = 1
-	# ReqSDUErrorratio Subscribed
-	INTEGER ErrorRatioRequested = 1
-	# MaxSDUErrorratio Subscribed
-	INTEGER ErrorRatioMinimum =1
-	INTEGER PriorityRequested = 1
-	INTEGER PriorityMinimum = 1
-    # Subscribed
-	INTEGER TransferDelayRequested = 0
-    # Subscribed
-	INTEGER TransferDelayMinimum = 0
-    # Subscribed
-	INTEGER GuaBitrateUplinkRequested = 0
-    # Subscribed
-	INTEGER GuaBitrateUplinkMinimum = 0
-    # Subscribed
-	INTEGER GuaBitrateDownlinkRequested = 0
-    # Subscribed
-	INTEGER GuaBitrateDownlinkMinimum = 0
-}
-
-
-
-# Default APN should always be specified!
-extension_spec web = {
-	INTEGER type = 5
-	INTEGER extension_type = 5
-	INTEGER TrafficClassRequested = 3
-	INTEGER MaxBitrateUplinkRequested = 2048
-	INTEGER MaxBitrateDownlinkRequested = 2048
-	INTEGER GuaBitrateUplinkRequested = 1024
-	INTEGER GuaBitrateDownlinkRequested = 1024
-	INTEGER HeaderCompressionRequested = 1
-	}
-
-
-# Module selectors (none)
-#module_policy dst_port 0 dst_port_max 65535 priority 1 = { guqos }
-
-# Flowspec selectors
-flowspec_policy dst_port 9 priority 1 = { default_flow_spec }
-#flowspec_policy dst_port 0 dst_port_max 65535 priority 2 = { override }
-#flowspec_policy dst_port 0 priority 0 = { default }
-
-# GPRS selectors
-# extension_policy src_port 0 src_port_max 65535 priority 0  = { default_extension_spec }
-
-# guqos_default 
-extension_policy src_port 0 src_port_max 65535 priority 0 = { guqos_default }
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide.ini	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide.ini	Tue Sep 14 17:55:14 2010 +0100
@@ -139,6 +139,11 @@
 PrimaryIapId1 = 2
 PrimaryActivationErr1 = -19
 
+[PrimaryActivationFails202]
+SimTsyTestNum = 202
+PrimaryIapId1 = 2
+PrimaryActivationErr1 = -4178
+
 [SecondaryActivationFails301]
 SimTsyTestNum = 301
 SubConnectionCount1 = 0
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide_config_9x.txt	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide_config_9x.txt	Tue Sep 14 17:55:14 2010 +0100
@@ -842,6 +842,54 @@
 # CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
 CommSetup= PKTLOOPBACK, INVALID::1, 18, 0, PRIMARY1
 
+
+############################################################################
+############################################################################
+###################              T E S T 2 0 2          ####################
+############################################################################
+############################################################################
+# Failure to Activate Primary PDP context (too many contexts)
+############################################################################
+[test202]
+# 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, -4178, 0, 0, 0, 0, 0
+R99ContextConfig = PRIMARY1, 0, -4178, 0, 0, 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
+
+QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
+
+# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
+CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
+
+
 ############################################################################
 ############################################################################
 ###################              T E S T 2 1 1          ####################
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/TE_PppSize_config.txt	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-[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,,, 0, 2, 0, 0,RasUser,pass,,,,,0
-
-# 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, 1
-
-# 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
-
-#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
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3,0,0
-
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= ECUART, COMM::0, 18, 0, PRIMARY1
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/TE_PppSize_spud.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-// Parameters configuration for Tpppsize.EXE test
-
-// Comms driver to load at startup
-
-[CommsDrivers]
-WinsPDDname = ECDRV
-WinsLDDname = ECOMM
-WinsLDDFname = ECOMM
-ThumbPDDname = EUART1
-ThumbLDDname = ECOMM
-ThumbLDDFname = FCOMM
-
-
-// Ip Address of the echo server machine
-// Note: this machine must be up and running and listening on the echo port
-// This can be checked on NT4 by typing  NETSTAT -a
-
-[AddressInfo]
-TestPPPIPAddr = 192.168.30.13
-
-[MMUInfo]
-TestPPPminMMU = 1
-TestPPPmaxMMU = 1500
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/TE_PppSize_spud.xml	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,325 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-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:
- CommDB Settings File
- 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">
-
-<NetworkTable>
-    <Network operation="add">
-        <Name>NT RAS</Name>
-    </Network>
-</NetworkTable>
-
-<IAPTable>
-    <IAP operation="add">
-        <Name>Actual NT RAS</Name>
-        <IAPService>OutgoingGPRS.NT RAS</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.NT RAS</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-</IAPTable>
-
-<ModemBearerTable>
-    <ModemBearer operation="template">
-        <Name>Default Modem</Name>
-        <Agent>NULLAGT</Agent>
-        <BCAStack>C32Bca</BCAStack>
-        <TSYName>SIM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <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>AFTERDIALUNTILANSWER</SpeakerPref>
-        <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>
-        <LastSocketActivityTimeout>32</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>8</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>16</LastSocketClosedTimeout>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    
-    <ModemBearer operation="add">
-        <Name>Null Modem 115200bps</Name>
-        <BCAStack>C32Bca</BCAStack> <!-- This may be overwriten by some tests -->
-        <IfName>SPUD</IfName>        
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>4</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>
-        <MinimumSignalLevel>0</MinimumSignalLevel>
-        <LastSocketActivityTimeout>15</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>5</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
-    </ModemBearer>
-</ModemBearerTable>
-
-<LANBearerTable>
-</LANBearerTable>
-
-<DialInISPTable>
-</DialInISPTable>
-
-<DialOutISPTable>
-</DialOutISPTable>
-
-<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.Actual NT RAS</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.Office</LocationForDataAndFax>
-        <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
-        <GPRSClassCBearer>GSM</GPRSClassCBearer>
-        <DefaultNetwork>Network.NT RAS</DefaultNetwork>
-        <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
-    </GlobalSettings>
-</GlobalSettingsTable>
-
-<IncomingGPRSTable>
-</IncomingGPRSTable>
-
-<OutgoingGPRSTable>
-    <OutgoingGPRS operation="template">
-        <Name>Default Dial Out ISP</Name>
-        <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>
-        <IfAuthPass>pass</IfAuthPass>
-        <AuthRetries>1</AuthRetries>
-        <IpNameServer1>194.72.6.51</IpNameServer1>
-        <IpNameServer2>194.72.6.51</IpNameServer2>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-    </OutgoingGPRS>
-    
-    <OutgoingGPRS operation="add">
-        <Name>NT RAS</Name>
-      	<PDPType>IPV4</PDPType>
-        <IfParams>lowernif=PPP</IfParams>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>  
-        <IfAuthPass>pass</IfAuthPass>
-    </OutgoingGPRS>
-</OutgoingGPRSTable>
-
-<DefaultGPRSTable>
-</DefaultGPRSTable>
-
-<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>
-</LocationTable>
-
-<SecureSocketTable>
-</SecureSocketTable>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-</VpnServiceTable>
-
-
-</CommDB:Config>
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/TE_SpudNetworkSideLoopbackCSY.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-# Defining a loopback between port A and B is as follows:
-# Port = <PortA>,<PortB>,<delay>,<queue size>,<element (packet) size>
-
-[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
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/TE_SpudNetworkSideLoopbackCSY_serial.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-# Loopback CSY ports are configured to be in serial mode (because of SerialLoopbackPort=0). The '=0' is needed for the config file parser to retrieve the value.
-# Defining a loopback between port A and B is as follows for serial mode loopback:
-# Port = <PortA>,<PortB>,<delay>,<buffer size>
-
-[Defaults]
-SerialLoopbackPort=0
-Port= 0,1,1,15000
-Port= 501,502,0,15000
-Port= 503,504,0,15000
-Port= 505,506,0,15000
-Port= 507,508,0,15000
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/TE_SpudNetworkSide_9x.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-[PrimaryLowerNifStartFails210]
-SimTsyTestNum = 210
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = -46
-
-[PrimaryLowerNifStartError210]
-SimTsyTestNum = 210
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = -1
-
-
-[SecondaryLowerNifStartFails310]
-SimTsyTestNum = 310
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SecondaryActivationEvent2Reason = -46
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/TE_SpudNetworkSide_Channel_config.txt	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-############################################################################
-############################################################################
-###################              T E S T 1              ####################
-############################################################################
-############################################################################
-# 
-############################################################################
-[test1]
-# 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, 0,RasUser,,,,,,0
-
-# 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 = 2, 33, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.2, 255.255.255.255.255.255.255.255.255.255.255.255.255.255.255.255, 17, 3462, 3462, 1032, 1032, 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, 0x02, 0x02, 0x08, 0x08, 1500, 1500, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY2, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-
-#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
-
-#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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-# failure events
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-
-# EStatusInactive = 5 EStatusDeleted = 6)
-NotifyContextStatusChange = PRIMARY1, 5, 6
-NotifyContextStatusChange = PRIMARY1, 5, 5
-NotifyContextStatusChange = SECONDARY1, 5, 6
-NotifyContextStatusChange = SECONDARY1, 5, 5
-
-
-############################################################################
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/TE_SpudNetworkSide_PppLoopback.xml	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,398 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2004-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:
- 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>
-</NetworkTable>
-
-<IAPTable>
-    <IAP operation="add">
-        <Name>Loopback_GRPS_1</Name>
-        <IAPService>DialOutISP.Ppp_Bounce_1</IAPService>
-        <IAPBearer>ModemBearer.Loopback_Ppp_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>DialOutISP.Ppp_Bounce_3</IAPService>
-        <IAPBearer>ModemBearer.Loopback_Ppp_3</IAPBearer>
-        <IAPNetwork>Network.Intranet</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_Ppp_1</Name>
-        <IfName>PPP</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_Ppp_3</Name>
-        <IfName>PPP</IfName>
-        <CSYName>PKTLOOPBACK</CSYName>
-        <PortName>PKTLOOPBACK::503</PortName>
-    </ModemBearer>
-
-</ModemBearerTable>
-
-<LANBearerTable>
-</LANBearerTable>
-
-<LANServiceTable>
-</LANServiceTable>
-
-<DialInISPTable>
-</DialInISPTable>
-
-<DialOutISPTable>
-    <DialOutISP operation="template">
-        <Name>Default Dial Out ISP</Name>
-		<DialResolution>FALSE</DialResolution> 
-		<UseLoginScript>FALSE</UseLoginScript>
-		<PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-
-      	<IfAuthName>RasUser</IfAuthName>
-        <AuthRetries>1</AuthRetries>
-        <IpNetMask>255.255.255.0</IpNetMask>
-        <IfNetworks>ip</IfNetworks>
-		<IfServerMode>TRUE</IfServerMode>
-        <IpNameServer1>194.72.6.51</IpNameServer1>
-        <IpNameServer2>194.72.6.51</IpNameServer2>
-    </DialOutISP>    
-
-    <DialOutISP operation="add">
-		<Name>Ppp_Bounce_1</Name>
-		<DialResolution>FALSE</DialResolution> 
-		<UseLoginScript>FALSE</UseLoginScript>
-		<PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-
-        <IpAddr>192.168.1.1</IpAddr>
-		<IpGateway>192.168.1.2</IpGateway>
-    </DialOutISP>    
-
-    <DialOutISP operation="add">
-		<Name>Ppp_Bounce_3</Name>
-		<DialResolution>FALSE</DialResolution> 
-		<UseLoginScript>FALSE</UseLoginScript>
-		<PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-
-        <IpAddr>192.168.1.1</IpAddr>
-		<IpGateway>192.168.1.2</IpGateway>
-    </DialOutISP>    
-</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>
-    </OutgoingGPRS>
-    
-    <OutgoingGPRS operation="add">
-        <Name>SPUD_Echo_2</Name>
-      	<PDPType>IPV4</PDPType>
-        <IfParams>lowernif=PPP</IfParams>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>  
-    </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>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-</VpnServiceTable>
-
-
-</CommDB:Config>
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/qospolicies.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-# ModuleSpecs
-modulespec guqos= {
-	STRING module = guqos.prt
-	INTEGER id=368
-	INTEGER flags = 1
-	}
-
-# FlowSpecs
-flowspec override = {
-	INTEGER token_rate_uplink = 1500
-	}
-
-flowspec default_flow_spec = {
-	INTEGER max_transfer_rate_uplink = 1500
-	INTEGER token_rate_uplink = 1500
-	INTEGER token_bucket_size_uplink = 3000
-	INTEGER max_packet_size_uplink = 1500
-	INTEGER min_policed_unit_uplink = 1500
-	INTEGER priority_uplink = 1
-	INTEGER drop_mode_uplink = 8
-	INTEGER max_transfer_rate_downlink = 1500
-	INTEGER token_rate_downlink = 1500
-	INTEGER token_bucket_size_downlink = 3000
-	INTEGER max_packet_size_downlink = 1500
-	INTEGER min_policed_unit_downlink = 1500
-	INTEGER priority_downlink = 1
-	INTEGER drop_mode_downlink = 8
-	}
-
-# UMTS Specs
-
-# Default APN should always be specified!
-extension_spec default_extension_spec = {
-	INTEGER	type = 5
-	INTEGER extension_type = 5
-	INTEGER TrafficClassRequested = 4
-	INTEGER MaxBitrateUplinkRequested = 2048
-	INTEGER MaxBitrateDownlinkRequested = 2048
-	INTEGER GuaBitrateUplinkRequested = 1024
-	INTEGER GuaBitrateDownlinkRequested = 1024
-	INTEGER HeaderCompressionRequested = 1
-	}
-
-extension_spec guqos_default = {
-	INTEGER type = 5
-	INTEGER extension_type = 5
-	# Subscribed
-	INTEGER TrafficClassRequested = 1
-	# Subscribed
-	INTEGER TrafficClassMinimum = 1
-	# Subscribed
-	INTEGER DeliveryOrderRequested = 1
-	# Subscribed
-	INTEGER DeliveryOrderMinimum = 1
-	# Subscribed
-	INTEGER DeliveryOfErroneusSduRequested = 1
-	# Subscribed
-	INTEGER DeliveryOfErroneusSduMinimum = 1
-	# Subscribed
-	INTEGER MaxSduSizeRequested = 0
-	# Subscribed
-	INTEGER MaxSduSizeMinimum = 0
-	# Subscribed
-	INTEGER MaxBitrateUplinkRequested = 0
-	# Subscribed
-	INTEGER MaxBitrateDownlinkRequested = 0
-	# Subscribed
-	INTEGER MaxBitrateUplinkMinimum = 0
-	# Subscribed
-	INTEGER MaxBitrateDownlinkMinimum = 0
-	# iReqBER Subscribed
-	INTEGER ResidualBerRequested = 1
-	# iMaxBER Subscribed
-	INTEGER ResidualBerMinimum = 1
-	# ReqSDUErrorratio Subscribed
-	INTEGER ErrorRatioRequested = 1
-	# MaxSDUErrorratio Subscribed
-	INTEGER ErrorRatioMinimum =1
-	INTEGER PriorityRequested = 1
-	INTEGER PriorityMinimum = 1
-    # Subscribed
-	INTEGER TransferDelayRequested = 0
-    # Subscribed
-	INTEGER TransferDelayMinimum = 0
-    # Subscribed
-	INTEGER GuaBitrateUplinkRequested = 0
-    # Subscribed
-	INTEGER GuaBitrateUplinkMinimum = 0
-    # Subscribed
-	INTEGER GuaBitrateDownlinkRequested = 0
-    # Subscribed
-	INTEGER GuaBitrateDownlinkMinimum = 0
-}
-
-
-
-# Default APN should always be specified!
-extension_spec web = {
-	INTEGER type = 5
-	INTEGER extension_type = 5
-	INTEGER TrafficClassRequested = 3
-	INTEGER MaxBitrateUplinkRequested = 2048
-	INTEGER MaxBitrateDownlinkRequested = 2048
-	INTEGER GuaBitrateUplinkRequested = 1024
-	INTEGER GuaBitrateDownlinkRequested = 1024
-	INTEGER HeaderCompressionRequested = 1
-	}
-
-
-# Module selectors (none)
-#module_policy dst_port 0 dst_port_max 65535 priority 1 = { guqos }
-
-# Flowspec selectors
-flowspec_policy dst_port 9 priority 1 = { default_flow_spec }
-#flowspec_policy dst_port 0 dst_port_max 65535 priority 2 = { override }
-#flowspec_policy dst_port 0 priority 0 = { default }
-
-# GPRS selectors
-# extension_policy src_port 0 src_port_max 65535 priority 0  = { default_extension_spec }
-
-# guqos_default 
-extension_policy src_port 0 src_port_max 65535 priority 0 = { guqos_default }
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/te_SpudNetworkSide.xml	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,517 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2004-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:
- 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>
-    </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>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-</VpnServiceTable>
-
-
-</CommDB:Config>
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/te_SpudNetworkSide_nifman.xml	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,312 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2005-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:
- CommDB Settings File for GT0233 PREQ397 SPUD 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">
-
-<NetworkTable>
-    <Network operation="add">
-        <Name>Intranet</Name>
-    </Network>
-    
-    <Network operation="add">
-        <Name>Intranet2</Name>
-    </Network>
-</NetworkTable>
-
-<IAPTable>
-    <IAP operation="add">
-        <Name>SPUD_1</Name>
-        <IAPService>OutgoingGPRS.RawIP_1</IAPService>
-        <IAPBearer>ModemBearer.SPUD_1</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Mobile</LocationRef>
-    </IAP>
-    
-    <IAP operation="add">
-        <Name>GRPS_2</Name>
-        <IAPService>OutgoingGPRS.RawIP_1</IAPService>
-        <IAPBearer>ModemBearer.SPUD_2</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Mobile</LocationRef>
-    </IAP>
-    
-    <IAP operation="add">
-        <Name>CrashIAP</Name>
-        <IAPService>OutgoingGPRS.LeaveInNifCreation</IAPService>
-        <IAPBearer>ModemBearer.SPUD_1</IAPBearer>
-        <IAPNetwork>Network.Intranet</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>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    
-    <!-- Normal timeouts -->
-    <ModemBearer operation="add">
-        <Name>SPUD_1</Name>
-        <IfName>SPUD</IfName>
-        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>                
-    </ModemBearer>
-    
-    <!-- Short timeouts -->
-    <ModemBearer operation="add">
-        <Name>SPUD_2</Name>
-        <IfName>SPUD</IfName>
-        <LastSessionClosedTimeout>4</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>6</LastSocketClosedTimeout>
-        <LastSocketActivityTimeout>8</LastSocketActivityTimeout>                
-    </ModemBearer>    
-</ModemBearerTable>
-
-
-
-<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.SPUD_1</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>
-    </OutgoingGPRS>
-
-    
-    <OutgoingGPRS operation="add">
-        <Name>RawIP_1</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>LeaveInNifCreation</Name>
-        <PDPType>IPV4</PDPType>
-        <IfParams>lowernif=Crash</IfParams>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>  
-        <IpAddr>192.168.1.2</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>
-
-
-
-
-</CommDB:Config>
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/te_SpudNetworkSide_ppp.xml	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,303 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2005-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:
- CommDB Settings File for GT0233 PREQ397 SPUD Network-side events /errors testing using PPP as lower NIF.
- 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">
-
-<NetworkTable>
-    <Network operation="add">
-        <Name>Intranet</Name>
-    </Network>
-    
-    <Network operation="add">
-        <Name>Intranet2</Name>
-    </Network>
-</NetworkTable>
-
-<IAPTable>
-    <IAP operation="add">
-        <Name>SPUD_PPP_GRPS_1</Name>
-        <IAPService>OutgoingGPRS.PPP_1</IAPService>
-        <IAPBearer>ModemBearer.SPUD_PPP_1</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Mobile</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>SPUD_PPP_GRPS_2</Name>
-        <IAPService>OutgoingGPRS.PPP_1</IAPService>
-        <IAPBearer>ModemBearer.SPUD_PPP_2</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Mobile</LocationRef>
-    </IAP>
-    
-    <IAP operation="add">
-        <Name>SPUD_PPP_GRPS_3</Name>
-        <IAPService>OutgoingGPRS.PPP_1</IAPService>
-        <IAPBearer>ModemBearer.SPUD_PPP_3</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Mobile</LocationRef>
-    </IAP>
-    
-</IAPTable>
-
-
-<ModemBearerTable>
-    <ModemBearer operation="template">
-        <Name>Default Modem</Name>
-        <Agent>NULLAGT</Agent>
-        <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>8</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>16</LastSocketClosedTimeout>
-        <LastSocketActivityTimeout>32</LastSocketActivityTimeout>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    
-    <ModemBearer operation="add">
-        <Name>SPUD_PPP_1</Name>
-        <CSYName>LOOPBACK</CSYName>
-        <BCAStack>C32Bca</BCAStack> <!-- This may be overwriten by some tests -->
-        <IfName>SPUD</IfName>        
-    </ModemBearer>
-
-    <ModemBearer operation="add">
-        <Name>SPUD_PPP_2</Name>
-        <IfName>SPUD</IfName>        
-        <BCAStack>INVALID_BCA_NAME</BCAStack>
-    </ModemBearer>
-    
-    <ModemBearer operation="add">
-        <Name>SPUD_PPP_3</Name>
-        <CSYName>PKTLOOPBACK</CSYName>
-        <BCAStack>C32Bca</BCAStack> 
-        <IfName>SPUD</IfName>        
-    </ModemBearer>
-
-</ModemBearerTable>
-
-
-<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.SPUD_PPP_GRPS_1</IAPRef>
-    </ConnectionPreferences>    
-</ConnectionPreferencesTable>
-
-<GlobalSettingsTable>
-    <GlobalSettings operation="add">
-        <Name>GlobalSettingsTable1</Name>
-        <RedialAttempts>3</RedialAttempts>
-        <SmsReceiveMode>2</SmsReceiveMode>
-        <GPRSAttachMode>1</GPRSAttachMode>
-        <AcceptIncomingGprs>1</AcceptIncomingGprs>
-        <ConnectionAttempts>1</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>
-    </OutgoingGPRS>
-    
-    <OutgoingGPRS operation="add">
-        <Name>PPP_1</Name>
-      	<PDPType>IPV4</PDPType>
-        <IfParams>lowernif=PPP</IfParams>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>  
-        <IpAddr>192.168.2.4</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>
-
-
-</CommDB:Config>
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/te_spudNetworkSide.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,261 +0,0 @@
-[ESockCheck]
-SimTsyTestNum = 0
-
-
-[PrimaryActivationOk1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-
-[SecondaryActivationOk1]
-SimTsyTestNum = 1
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-
-
-[PrimaryDeleteOnLowerNifStart212]
-SimTsyTestNum = 212
-PrimaryIapId1 = 3
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 0
-ExpectedNifProgress = 8000
-ExpectedNifError    = -36
-MillisBeforeEvent = 10000000
-
-
-[PrimaryDeleteBeforeLowerNif]
-SimTsyTestNum = 801
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = -4
-
-[SecondaryDeleteBeforeLowerNif]
-SimTsyTestNum = 901
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SecondaryActivationEvent2Reason = -4
-
-[SecondaryActivationJoin]
-SimTsyTestNum = 1
-SecondaryActivationEvent1 = EQoSEventConfirm
-OptionalQoSEvent1 = EQoSEventAdapt
-OptionalQoSEvent1Reason = 0
-ExpQoSEvent1 = EQoSEventJoin
-ExpQoSEvent1Reason = 0
-
-[SecondaryActivationChangeQoS]
-SimTsyTestNum = 1
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-ExpQoSEvent1 = EQoSEventAddPolicy
-ExpQoSEvent1Reason = 0
-OptionalQoSEvent1 = EQoSEventAdapt
-OptionalQoSEvent1Reason = 0
-ExpQoSEvent2 = EQoSEventConfirm
-
-
-[KContextDelete]
-SimTsyTestNum = 701
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SecondaryActivationEvent2Reason = 2
-
-[ENetworkQoSChangePrimary]
-SimTsyTestNum = 1
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-QoSEventReq1 = ENetworkQoSChange
-QoSEventReq1Idx = 0
-ExpectedNifProgress = 8000
-ExpectedNifError    = -33
-
-[ENetworkQoSChangeSecondary]
-SimTsyTestNum = 1
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-QoSEventReq1 = ENetworkQoSChange
-QoSEventReq1Idx = 2
-ExpQoSEvent1 = EQoSEventAdapt
-ExpQoSEvent1Reason = 0
-
-
-[PrimaryActivationFails201]
-SimTsyTestNum = 201
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = -19
-
-[SecondaryActivationFails301]
-SimTsyTestNum = 301
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SecondaryActivationEvent2Reason = -19
-
-[PrimaryActivationFails18]
-SimTsyTestNum = 18
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = -19
-
-[SecondaryActivationFails19]
-SimTsyTestNum = 19
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SecondaryActivationEvent2Reason = -2
-
-[SecondaryActivationFails20]
-SimTsyTestNum = 20
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SecondaryActivationEvent2Reason = -20
-
-[PrimaryDeletionFails21]
-SimTsyTestNum = 21
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-
-[SecondaryDeletionFails22]
-SimTsyTestNum = 22
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-
-
-[SecondaryQosEventDelete1]
-SimTsyTestNum = 1
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 3
-OptionalQoSEvent1 = EQoSEventAdapt
-OptionalQoSEvent1Reason = 0
-ExpQoSEvent1 = EQoSEventFailure
-ExpQoSEvent1Reason = 0
-
-[SecondaryQosEventDeactivate1]
-SimTsyTestNum = 1
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 4
-ExpQoSEvent1 = EQoSEventAdapt
-ExpQoSEvent1Reason = 0
-QoSEventReq2 = EContextStatusChange
-QoSEventReq2Idx = 5
-ExpQoSEvent2 = EQoSEventAdapt
-ExpQoSEvent2Reason = 0
-
-[PrimaryQoSEventDelete1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 0
-ExpectedNifProgress = 8000
-ExpectedNifError    = -36
-
-[PrimaryQoSEventDeleteWithSecondary]
-SimTsyTestNum = 1
-IapId = 5
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-QoSEventReq1Idx = 0
-
-[PrimaryQoSEventDeactivate1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 1
-ExpectedNifProgress = 8000
-ExpectedNifError    = 0
-
-
-[PrimaryContextSuspendAndResume]
-SimTsyTestNum = 1
-ContextType = EPrimaryContext
-LoopbackPort = PKTLOOPBACK::501
-CommRole = ECommRoleDCE
-QoSEventReq1Idx = 6
-QoSEventReq2Idx = 7
-
-
-[SecondaryContextSuspendAndResume]
-SimTsyTestNum = 1
-ContextType = ESecondaryContext
-LoopbackPort = PKTLOOPBACK::503
-CommRole = ECommRoleDCE
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-QoSEventReq1Idx = 8
-QoSEventReq2Idx = 9
-
-[PppPrimaryOk]
-SimTsyTestNum = 1
-PrimarySpudIapId = 1
-PppIapId1 = 2
-
-[PppSecondarySend]
-SimTsyTestNum = 1
-PppIapId1 = 1
-PppIapId2 = 3
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-
-[PrimarySlowInitialisePhone]
-SimTsyTestNum = 24
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = -3
-
-
-[MultiPrimaryActivationOk1]
-SimTsyTestNum = 25
-NumberOfIaps = 5
-PrimaryIapId1 = 2
-PrimaryIapId2 = 6
-PrimaryIapId3 = 7
-PrimaryIapId4 = 8
-PrimaryIapId5 = 9
-PrimaryActivationErr1 = 0
-
-[SecondaryR5ActivationOk1]
-SimTsyTestNum = 100
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-
-[SecondaryR5ActivationFails20]
-SimTsyTestNum = 101
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SecondaryActivationEvent2Reason = -20
-
-[ENetworkQoSR5ChangeSecondary]
-SimTsyTestNum = 100
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-QoSEventReq1 = ENetworkQoSChange
-QoSEventReq1Idx = 2
-ExpQoSEvent1 = EQoSEventAdapt
-ExpQoSEvent1Reason = 0
-
-[ENetworkQoSR5ChangeSecondary1]
-SimTsyTestNum = 102
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-QoSEventReq1 = ENetworkQoSChange
-QoSEventReq1Idx = 2
-ExpQoSEvent1 = EQoSEventAdapt
-ExpQoSEvent1Reason = 0
-
-[SecondaryActivationChangeQoSR5]
-SimTsyTestNum = 100
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-ExpQoSEvent1 = EQoSEventAddPolicy
-ExpQoSEvent1Reason = 0
-OptionalQoSEvent1 = EQoSEventAdapt
-OptionalQoSEvent1Reason = 0
-ExpQoSEvent2 = EQoSEventConfirm
-
-[PrimaryQoSR5EventDeleteWithSecondary]
-SimTsyTestNum = 100
-IapId = 5
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-QoSEventReq1Idx = 0
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/te_spudNetworkSide_config_9x.txt	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2425 +0,0 @@
-############################################################################
-############################################################################
-###################              T E S T 1              ####################
-############################################################################
-############################################################################
-# Test case for success results
-############################################################################
-[test1]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-############################################################################
-############################################################################
-###################              T E S T 7 0 1          ####################
-############################################################################
-############################################################################
-# This test messes up with QosProfileNegR99 entry to trigger KContextDelete on SPUDMAN
-############################################################################
-[test701]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 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
-
-#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
-
-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
-
-
-
-#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, 700, 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, 700, 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
-
-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
-
-#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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-# failure events
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-
-# EStatusInactive = 5 EStatusDeleted = 6)
-NotifyContextStatusChange = PRIMARY1, 5, 6
-NotifyContextStatusChange = PRIMARY1, 5, 5
-NotifyContextStatusChange = SECONDARY1, 5, 6
-NotifyContextStatusChange = SECONDARY1, 5, 5
-
-
-############################################################################
-############################################################################
-###################              T E S T 8 0 1          ####################
-############################################################################
-############################################################################
-# This test sets the R99ContextConfig's iActivateErrorCode to -4 for Primary PDP Context
-############################################################################
-[test801]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = <TName iContextName>,  <TUint iActivatePause>, <TUint iActivateErrorCode>, <TUint iDeactivatePause>, 
-# <TUint iDeactivateErrorCode>, <TUint iDeletionPause>, <TUint iDeletionErrorCode> <TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, -4, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-# failure events
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-
-# EStatusInactive = 5 EStatusDeleted = 6)
-NotifyContextStatusChange = PRIMARY1, 5, 6
-NotifyContextStatusChange = PRIMARY1, 5, 5
-NotifyContextStatusChange = SECONDARY1, 5, 6
-NotifyContextStatusChange = SECONDARY1, 5, 5
-
-
-############################################################################
-############################################################################
-###################              T E S T 9 0 1          ####################
-############################################################################
-############################################################################
-# This test sets the R99ContextConfig's iActivateErrorCode to -4 for Secondary PDP Context
-############################################################################
-[test901]
-# 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, 0,RasUser,,,,,,0
-
-# 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, -4, 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, 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
-
-#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
-
-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
-
-
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-# failure events
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-
-# EStatusInactive = 5 EStatusDeleted = 6)
-NotifyContextStatusChange = PRIMARY1, 5, 6
-NotifyContextStatusChange = PRIMARY1, 5, 5
-NotifyContextStatusChange = SECONDARY1, 5, 6
-NotifyContextStatusChange = SECONDARY1, 5, 5
-
-
-############################################################################
-############################################################################
-###################              T E S T 2 0 1          ####################
-############################################################################
-############################################################################
-# Failure to Activate Primary PDP context
-############################################################################
-[test201]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = <TName iContextName>,  <TUint iActivatePause>, <TUint iActivateErrorCode>, <TUint iDeactivatePause>, 
-# <TUint iDeactivateErrorCode>, <TUint iDeletionPause>, <TUint iDeletionErrorCode> <TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, -19, 0, 0, 0, 0, 0
-R99ContextConfig = PRIMARY1, 0, -19, 0, 0, 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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 1 0          ####################
-############################################################################
-############################################################################
-# Failure to Start the Lower Nif for the Primary Context
-############################################################################
-[test210]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-
-#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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-
-# Supply an invalid port name for primary context to SPUD
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, INVALID::1, 18, 0, PRIMARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 1 1          ####################
-############################################################################
-############################################################################
-# 
-############################################################################
-NTRAS PPP
-[test211]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 1
-
-
-#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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= ECUART, COMM::0, 18, 0, PRIMARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 1 2         ####################
-############################################################################
-############################################################################
-# 'la-la land loopback' PPP: No peer is provided, all LPC frames are discarded by the CSY.
-# This results in the LCP negotiation taking as long as we want. This gives up time to inject events.
-############################################################################
-[test212]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-
-#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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::0, 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
-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
-
-############################################################################
-############################################################################
-###################              T E S T 3 0 1          ####################
-############################################################################
-############################################################################
-# failure to activate secondary PDP context
-############################################################################
-[test301]
-# 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, 0,RasUser,,,,,,0
-
-# 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, -19, 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, 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
-
-
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-# When the value 0 is published to KPSSimtsyPacketContextStatusChange the first primary context will be deleted (status = EStatusDeleted = 6)
-NotifyContextStatusChange = SECONDARY1, 0, 6
-
-#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
-
-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
-
-#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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-
-#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
-
-QosR5NetworkNotification = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
-
-
-
-#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>
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 3 1 0          ####################
-############################################################################
-############################################################################
-# failure to Start the lower NIF for the Secondary PDP context
-############################################################################
-[test310]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-# 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, 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
-
-
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-# When the value 0 is published to KPSSimtsyPacketContextStatusChange the first primary context will be deleted (status = EStatusDeleted = 6)
-NotifyContextStatusChange = SECONDARY1, 0, 6
-
-#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
-
-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
-
-
-#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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-#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
-
-QosR5NetworkNotification = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
-
-
-#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>
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, INVALID_PORT::0, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 3 1 1          ####################
-############################################################################
-############################################################################
-# failure to Start the lower NIF for the Secondary PDP context 
-# (PPP as lower NIF)
-############################################################################
-[test311]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 1
-R99ContextConfig = SECONDARY1, 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, 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
-
-
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-# When the value 0 is published to KPSSimtsyPacketContextStatusChange the first primary context will be deleted (status = EStatusDeleted = 6)
-NotifyContextStatusChange = SECONDARY1, 0, 6
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-#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
-
-QosR5NetworkNotification = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
-
-
-
-#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>
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= ECUART, COMM::0, 18, 0, PRIMARY1
-CommSetup= ECUART, INVALID::1, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 1 8            ####################
-############################################################################
-############################################################################
-# R99ContextConfig ActivateErrorCode is modified to -19 for PRIMARY1. This 
-# way primary context activation will fail with an error code (-19)
-############################################################################
-[test18]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, -19, 0, 0, 0, 0, 0
-R99ContextConfig = SECONDARY1, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 1 9            ####################
-############################################################################
-############################################################################
-# TFT filter, srcAddr value is modified so that the secondary context 
-# creation fails due to TFT settings failure.
-############################################################################
-[test19]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = SECONDARY1, 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, 0, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.3, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-
-############################################################################
-############################################################################
-###################              T E S T 2 0            ####################
-############################################################################
-############################################################################
-# QosProfileReqR99 for SECONDARY1 reqTraffic and minTraffic values are 
-# modified so that secondary PDP context creation fails due to Requested QoS
-# parameter mismatch.
-############################################################################
-[test20]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = SECONDARY1, 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, 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
-
-#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,0x08, 0x08, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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,0x08, 0x08, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 1            ####################
-############################################################################
-############################################################################
-# R99ContextConfig DeletionErrorCode is modified to -19 for PRIMARY1. This 
-# way primary context deletion will fail with an error code (-19)
-############################################################################
-[test21]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, -19, 0
-R99ContextConfig = SECONDARY1, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-
-############################################################################
-############################################################################
-###################              T E S T 2 2            ####################
-############################################################################
-############################################################################
-# R99ContextConfig DeletionErrorCode is modified to -19 for SECONDARY1. This 
-# way primary context deletion will fail with an error code (-19)
-############################################################################
-[test22]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = SECONDARY1, 0, 0, 0, 0, 0, -19, 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, 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
-
-#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
-
-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
-
-#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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 24             ####################
-############################################################################
-############################################################################
-[test24]
-PhoneInitialiseDelay = 999
-
-############################################################################
-############################################################################
-############################################################################
-############################################################################
-
-############################################################################
-############################################################################
-###################              T E S T 25             ####################
-############################################################################
-############################################################################
-# Test case for success results
-############################################################################
-[test25]
-# 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, 0,RasUser,,,,,,0
-
-# 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 = PRIMARY2, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = PRIMARY3, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = PRIMARY4, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = PRIMARY5, 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 = PRIMARY2,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 = PRIMARY3,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 = PRIMARY4,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 = PRIMARY5,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 = PRIMARY2,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 = PRIMARY3,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 = PRIMARY4,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 = PRIMARY5,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 = PRIMARY2, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-QosProfileNegR99 = PRIMARY3, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-QosProfileNegR99 = PRIMARY4, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-QosProfileNegR99 = PRIMARY5, 0x03, 0x01, 0x03, 0x01, 1, 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, 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 = PRIMARY2, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-QosProfileNegR5 = PRIMARY3, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-QosProfileNegR5 = PRIMARY4, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-QosProfileNegR5 = PRIMARY5, 0x03, 0x01, 0x03, 0x01, 1, 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, 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 = PRIMARY3, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-QosNetworkNotification = PRIMARY4, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-QosNetworkNotification = PRIMARY5, 0x04, 0x02, 0x04, 0x02, 2, 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 = PRIMARY3, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
-QosR5NetworkNotification = PRIMARY4, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
-QosR5NetworkNotification = PRIMARY5, 0x04, 0x02, 0x04, 0x02, 2, 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::510, 18, 0, PRIMARY2
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::512, 18, 0, PRIMARY3
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::514, 18, 0, PRIMARY4
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::516, 18, 0, PRIMARY5
-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 = PRIMARY2, 0, 6
-NotifyContextStatusChange = PRIMARY3, 0, 6
-NotifyContextStatusChange = PRIMARY4, 0, 6
-NotifyContextStatusChange = PRIMARY5, 0, 6
-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 = PRIMARY2, 0, 5
-NotifyContextStatusChange = PRIMARY3, 0, 5
-NotifyContextStatusChange = PRIMARY4, 0, 5
-NotifyContextStatusChange = PRIMARY5, 0, 5
-NotifyContextStatusChange = SECONDARY1, 0, 5
-NotifyContextStatusChange = SECONDARY1, 0, 3
-
-
-############################################################################
-############################################################################
-###################              T E S T 100              ####################
-############################################################################
-############################################################################
-# Test case for success results
-############################################################################
-[test100]
-# 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, 0,RasUser,,,,,,0
-
-#SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-SetContextConfigR5= 0, SYMBIAN INTERNET PROVIDER, PROTOCOL ADDRESS, 0, 2, USER3, PASSWORD3, CHALLENGE3, RESPONSE3, PRIMARYSERVER3, SECONDARYSERVER3, 3, 2, 1, 1
-
-#AdditionalParamItem= <TPcoProtocolId>, <TBuf8 AdditionalParamData>
-AdditionalParamItem= 0x04, ADDITIONALPARAM1
-
-# 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
-
-
-# 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, 0x04, 0x01, 0x08, 0x08, -1, -1, -1, -1,0,0, 0x20, 1, 0x10 ,1 ,2 ,1 ,1 ,250 ,-1 ,-1 ,0 ,0
-#Added for test case 29
-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
-#Added for test case 30
-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
-
-
-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, 0x04, 0x01, 0x08, 0x08, -1, -1, -1, -1,0,0, 0x20, 1, 0x10 ,1 ,2 ,1 ,1 ,250 ,-1 ,-1 ,0 ,0 ,1 ,1
-#Added for test case 29
-QosProfileReqR5 = SECONDARY1,0x04, 0x04, 0x04, 0x01, 0x08, 0x08, -1, -1, -1, -1,0,0, 0x20, 1, 0x10 ,1 ,2 ,1 ,1 ,250 ,-1 ,-1 ,0 ,0 ,0 ,0
-#Added for test case 30
-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
-
-
-#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 = 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, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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, 1, 1
-#for test case 29
-QosProfileNegR5 = SECONDARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-#for test case 30
-QosProfileNegR5 = SECONDARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 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 = SECONDARY1, 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 = SECONDARY1, 0x04, 0x02, 0x04, 0x02, 1, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 1
-QosR5NetworkNotification = SECONDARY1, 0x04, 0x02, 0x04, 0x02, 1, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 1
-
-
-#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
-
-
-############################################################################
-# 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
-
-############################################################################
-############################################################################
-###################              T E S T 1 0 1           ####################
-############################################################################
-############################################################################
-# QosProfileReqR99 for SECONDARY1 reqTraffic and minTraffic values are 
-# modified so that secondary PDP context creation fails due to Requested QoS
-# parameter mismatch.
-############################################################################
-[test101]
-# 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, 0,RasUser,,,,,,0
-
-#SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-SetContextConfigR5= 0, SYMBIAN INTERNET PROVIDER, PROTOCOL ADDRESS, 0, 2, USER3, PASSWORD3, CHALLENGE3, RESPONSE3, PRIMARYSERVER3, SECONDARYSERVER3, 3, 2, 1, 1
-
-#AdditionalParamItem= <TPcoProtocolId>, <TBuf8 AdditionalParamData>
-AdditionalParamItem= 0x04, ADDITIONALPARAM1
-
-
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = SECONDARY1, 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, 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
-
-#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,0x08, 0x08, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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,0x08, 0x08, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 102              ####################
-############################################################################
-############################################################################
-# Test case for success results
-############################################################################
-[test102]
-# 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, 0,RasUser,,,,,,0
-
-#SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-SetContextConfigR5= 0, SYMBIAN INTERNET PROVIDER, PROTOCOL ADDRESS, 0, 2, USER3, PASSWORD3, CHALLENGE3, RESPONSE3, PRIMARYSERVER3, SECONDARYSERVER3, 3, 2, 1, 1
-
-#AdditionalParamItem= <TPcoProtocolId>, <TBuf8 AdditionalParamData>
-AdditionalParamItem= 0x04, ADDITIONALPARAM1
-
-# 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
-
-
-# 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, 0x04, 0x01, 0x08, 0x08, -1, -1, -1, -1,0,0, 0x20, 1, 0x10 ,1 ,2 ,1 ,1 ,250 ,-1 ,-1 ,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, 0x04, 0x01, 0x08, 0x08, -1, -1, -1, -1,0,0, 0x20, 1, 0x10 ,1 ,2 ,1 ,1 ,250 ,-1 ,-1 ,0 ,0 ,1 ,1
-
-
-#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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 1, 1
-QosProfileNegR5 = SECONDARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 1, 1
-
-
-#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 = SECONDARY1, 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 = SECONDARY1, 0x04, 0x02, 0x04, 0x02, 1, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 1, 0
-QosR5NetworkNotification = SECONDARY1, 0x04, 0x02, 0x04, 0x02, 1, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 1, 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
-
-
-############################################################################
-# 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
-
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/te_spudNetworkSide_nifman.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,224 +0,0 @@
-[ESockCheck]
-SimTsyTestNum = 0
-
-
-[PrimaryOnlyNormalStop1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 1
-PrimaryActivationErr1 = 0
-MillisBeforeStop = 2000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-
-
-[PrimaryOnlyAuthoritativeStop1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 1
-PrimaryActivationErr1 = 0
-MillisBeforeStop = 10000000
-IfaceStopType = EStopAuthoritative
-IfaceStopErrCode = -17210
-
-
-[TimeoutStopPrimaryDeleting1]
-SimTsyTestNum = 11
-PrimaryLoopbackPort = 502
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-MillisBeforeStop = 0
-IfaceStopType = NifmanIdleTimeout
-IfaceStopErrCode = -33
-
-
-
-
-[NormalStopPrimaryDeleting1]
-SimTsyTestNum = 11
-PrimaryLoopbackPort = 502
-PrimaryIapId1 = 1
-PrimaryActivationErr1 = 0
-MillisBeforeStop = 4000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-
-
-
-[NormalStopOnPrimaryDeactivating1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 1
-PrimaryStartErr1 = 0
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 4
-MillisBeforeStop = 3000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-
-
-[NormalStopOnPrimarySuspended1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 1
-PrimaryStartErr1 = 0
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 5
-MillisBeforeStop = 3000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-
-
-
-[NormalStopOnPrimaryInactive1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 1
-PrimaryStartErr1 = 0
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 1
-MillisBeforeStop = 3000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-
-
-[AuthStopOnPrimarySuspended1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 1
-PrimaryStartErr1 = 0
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 5
-MillisBeforeStop = 3000000
-IfaceStopType = EStopAuthoritative
-IfaceStopErrCode = -17210
-
-
-[AuthStopOnPrimaryDeactivating1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 1
-PrimaryStartErr1 = 0
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 4
-MillisBeforeStop = 3000000
-IfaceStopType = EStopAuthoritative
-IfaceStopErrCode = -17210
-
-
-[AuthStopOnPrimaryInactive1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 1
-PrimaryStartErr1 = 0
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 1
-MillisBeforeStop = 3000000
-IfaceStopType = EStopAuthoritative
-IfaceStopErrCode = -17210
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; STOP on secondary
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-[NormalStopSecondaryActive1]
-SimTsyTestNum = 2
-PrimaryIapId1 = 1
-PrimaryActivationErr1 = 0
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-PrimaryActivationErr1 = 0
-MillisBeforeStop = 2000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-
-[AuthStopSecondaryActive1]
-SimTsyTestNum = 2
-PrimaryIapId1 = 1
-PrimaryActivationErr1 = 0
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-PrimaryActivationErr1 = 0
-MillisBeforeStop = 2000000
-IfaceStopType = EStopAuthoritative
-IfaceStopErrCode = -17210
-
-
-[NormalStopGUQoSDeletingSecondary1]
-SimTsyTestNum = 23
-PrimaryIapId1 = 1
-PrimaryActivationErr1 = 0
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-MillisBeforeStop = 12000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-
-
-[NormalStopSecondaryLowerNifDown1]
-SimTsyTestNum = 23
-SecondaryLoopbackPort = 504
-PrimaryIapId1 = 1
-PrimaryActivationErr1 = 0
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-MillisBeforeStop = 12000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-
-
-
-
-
-[NormalStopSecondaryActivating1]
-SimTsyTestNum = 24
-PrimaryIapId1 = 1
-PrimaryActivationErr1 = 0
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-MillisBeforeStop = 30000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-
-
-[NormalStopSecondarySettingTFT25]
-SimTsyTestNum = 25
-PrimaryIapId1 = 1
-PrimaryActivationErr1 = 0
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-MillisBeforeStop = 30000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-
-
-
-
-[GUQoSDeleteOnNormalStop1]
-SimTsyTestNum = 23
-PrimaryIapId1 = 1
-PrimaryActivationErr1 = 0
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-MillisBeforeStop = 0
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-
-
-; #######################################
-; PPP dependent tests
-
-[NormalStopPrimaryStartingLowerNif1]
-SimTsyTestNum = 27
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-MillisBeforeStop = 15000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-
-
-
-[NormalStopSecondaryStartingLowerNif1]
-SimTsyTestNum = 26
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-MillisBeforeStop = 15000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-
-[LeaveInSpudCreation]
-SimTsyTestNum = 1010101010
-PrimaryIapId1 = 3
-PrimaryActivationErr1 = -1
-
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/te_spudNetworkSide_nifman_config.txt	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,841 +0,0 @@
-############################################################################
-############################################################################
-###################              T E S T 1              ####################
-############################################################################
-############################################################################
-# Successful Start of Primary PDP context
-############################################################################
-[test1]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-
-#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
-
-#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
-
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
-
-# failure events
-NotifyContextStatusChangeType = PublishSubscribe
-NotifyContextStatusChange = PRIMARY1, 0, 1
-NotifyContextStatusChange = PRIMARY1, 0, 1
-NotifyContextStatusChange = PRIMARY1, 0, 2
-NotifyContextStatusChange = PRIMARY1, 0, 3
-NotifyContextStatusChange = PRIMARY1, 0, 4
-NotifyContextStatusChange = PRIMARY1, 0, 5
-NotifyContextStatusChange = PRIMARY1, 0, 6
-
-
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-# EStatusDeactivating = 4 EStatusInactive = 1 EStatusDeleted = 6
-# EStatusSuspended = 5 EStatusActive = 3
-
-############################################################################
-############################################################################
-###################              T E S T 1 1            ####################
-############################################################################
-############################################################################
-# Successful Start of Primary PDP context, delay on primary deletion
-############################################################################
-[test11]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = <TName iContextName>,  <TUint iActivatePause>, <TUint iActivateErrorCode>, <TUint iDeactivatePause>, 
-# <TUint iDeactivateErrorCode>, <TUint iDeletionPause>, <TUint iDeletionErrorCode> <TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 30, 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
-
-#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
-
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2              ####################
-############################################################################
-############################################################################
-# Primary and Secondary: delay on secondary deletion.
-############################################################################
-[test2]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 20, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 250, 250, -1, -1, 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 = SECONDARY2, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-
-#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
-
-#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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 2            ####################
-############################################################################
-############################################################################
-# Secondary delay on Activation
-# Primary and Secondary.
-############################################################################
-[test22]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-# 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY2, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-
-#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
-
-#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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 3            ####################
-############################################################################
-############################################################################
-# Secondary delay on Deletion
-# Primary and Secondary.
-############################################################################
-[test23]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 20, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 250, 250, -1, -1, 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 = SECONDARY2, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-
-#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
-
-#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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 4            ####################
-############################################################################
-############################################################################
-# Secondary delay on Activation
-# Primary and Secondary.
-############################################################################
-[test24]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 60, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY2, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-
-#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
-
-#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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 5            ####################
-############################################################################
-############################################################################
-# Secondary delay on Setting TFT
-# Primary and Secondary.
-############################################################################
-[test25]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-# delay creating TFT for secondary
-CreateTftConfig = PRIMARY1, 0, 0, 60
-
-# 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY2, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-
-#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
-
-#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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 6            ####################
-############################################################################
-############################################################################
-#Primary and secondary: test long secondary start on lower NIF: 
-# Valid wintunnel for Primary, loopback to nothing for secondary.
-# Secondary delay on Starting Lower NIF
-# Primary and Secondary.
-############################################################################
-[test26]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 1
-R99ContextConfig = SECONDARY1, 0, 0, 0, 0, 0, 0, 0
-
-# delay creating TFT for secondary
-CreateTftConfig = PRIMARY1, 0, 0, 60
-
-# 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY2, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-
-#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
-
-#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= ECUART, COMM::0, 18, 0, PRIMARY1
-CommSetup= LOOPBACK, LOOPBACK::0, 18, 0, SECONDARY1
-
-
-# Primary context loops back to nothing: this causes PPP LCP negotiation to take a long time.
-[test27]
-## Successful Start of Primary PDP context
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-
-#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
-
-#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
-
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= LOOPBACK, LOOPBACK::0, 18, 0, PRIMARY1
-
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/version1/te_spudNetworkSide_nifman_config_9x.txt	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,934 +0,0 @@
-############################################################################
-############################################################################
-###################              T E S T 1              ####################
-############################################################################
-############################################################################
-# Successful Start of Primary PDP context
-############################################################################
-[test1]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-
-#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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
-
-# failure events
-NotifyContextStatusChangeType = PublishSubscribe
-NotifyContextStatusChange = PRIMARY1, 0, 1
-NotifyContextStatusChange = PRIMARY1, 0, 1
-NotifyContextStatusChange = PRIMARY1, 0, 2
-NotifyContextStatusChange = PRIMARY1, 0, 3
-NotifyContextStatusChange = PRIMARY1, 0, 4
-NotifyContextStatusChange = PRIMARY1, 0, 5
-NotifyContextStatusChange = PRIMARY1, 0, 6
-
-
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-# EStatusDeactivating = 4 EStatusInactive = 1 EStatusDeleted = 6
-# EStatusSuspended = 5 EStatusActive = 3
-
-############################################################################
-############################################################################
-###################              T E S T 1 1            ####################
-############################################################################
-############################################################################
-# Successful Start of Primary PDP context, delay on primary deletion
-############################################################################
-[test11]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = <TName iContextName>,  <TUint iActivatePause>, <TUint iActivateErrorCode>, <TUint iDeactivatePause>, 
-# <TUint iDeactivateErrorCode>, <TUint iDeletionPause>, <TUint iDeletionErrorCode> <TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 30, 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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2              ####################
-############################################################################
-############################################################################
-# Primary and Secondary: delay on secondary deletion.
-############################################################################
-[test2]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 20, 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, 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
-
-#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
-
-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
-
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 2            ####################
-############################################################################
-############################################################################
-# Secondary delay on Activation
-# Primary and Secondary.
-############################################################################
-[test22]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-# 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 3            ####################
-############################################################################
-############################################################################
-# Secondary delay on Deletion
-# Primary and Secondary.
-############################################################################
-[test23]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 20, 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, 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
-
-#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
-
-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
-
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 4            ####################
-############################################################################
-############################################################################
-# Secondary delay on Activation
-# Primary and Secondary.
-############################################################################
-[test24]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 60, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 5            ####################
-############################################################################
-############################################################################
-# Secondary delay on Setting TFT
-# Primary and Secondary.
-############################################################################
-[test25]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-# delay creating TFT for secondary
-CreateTftConfig = PRIMARY1, 0, 0, 60
-
-# 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 6            ####################
-############################################################################
-############################################################################
-#Primary and secondary: test long secondary start on lower NIF: 
-# Valid wintunnel for Primary, loopback to nothing for secondary.
-# Secondary delay on Starting Lower NIF
-# Primary and Secondary.
-############################################################################
-[test26]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 1
-R99ContextConfig = SECONDARY1, 0, 0, 0, 0, 0, 0, 0
-
-# delay creating TFT for secondary
-CreateTftConfig = PRIMARY1, 0, 0, 60
-
-# 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = 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 = 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= ECUART, COMM::0, 18, 0, PRIMARY1
-CommSetup= LOOPBACK, LOOPBACK::0, 18, 0, SECONDARY1
-
-
-# Primary context loops back to nothing: this causes PPP LCP negotiation to take a long time.
-[test27]
-## Successful Start of Primary PDP context
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-
-#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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= LOOPBACK, LOOPBACK::0, 18, 0, PRIMARY1
-
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/TE_spudNetworkSide.iby	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/TE_spudNetworkSide.iby	Tue Sep 14 17:55:14 2010 +0100
@@ -26,7 +26,6 @@
 data=EPOCROOT##epoc32\data\z\testdata\scripts\te_spudnetworkside.script 		testdata\scripts\te_spudnetworkside.script 
 data=EPOCROOT##epoc32\data\z\testdata\scripts\te_spudnetworkside_ppp.script 	testdata\scripts\te_spudnetworkside_ppp.script 
 data=EPOCROOT##epoc32\data\z\testdata\scripts\te_spudnetworkside_nifman.script 	testdata\scripts\te_spudnetworkside_nifman.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_pppsize_spud.script 			testdata\scripts\te_pppsize_spud.script
 data=EPOCROOT##epoc32\data\z\testdata\scripts\te_spudnetworkside_channel.script 	testdata\scripts\te_spudnetworkside_channel.script
 data=EPOCROOT##epoc32\data\z\testdata\scripts\te_spudnetworkside_r4_and_r5.script 		testdata\scripts\te_spudnetworkside_r4_and_r5.script
 data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_config.txt 	testdata\configs\te_spudnetworkside_config.txt
@@ -39,18 +38,13 @@
 data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_PppLoopback.xml		testdata\configs\te_spudnetworkside_PppLoopback.xml
 data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_nifman.xml		testdata\configs\te_spudnetworkside_nifman.xml
 data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_r4_and_r5.xml 			testdata\configs\te_spudnetworkside_r4_and_r5.xml
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_promptforauth.xml	testdata\configs\te_spudnetworkside_promptforauth.xml
 data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside.ini 			testdata\configs\te_spudnetworkside.ini
 data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_nifman.ini		testdata\configs\te_spudnetworkside_nifman.ini
 data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_platsec.ini 	testdata\configs\te_spudnetworkside_platsec.ini
 data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworksideLoopbackcsy.ini testdata\configs\te_spudnetworksideLoopbackcsy.ini
 data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworksideLoopbackcsy_serial.ini	testdata\configs\te_spudnetworksideLoopbackcsy_serial.ini
 data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_r4_and_r5.ini 			testdata\configs\te_spudnetworkside_r4_and_r5.ini
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-data=EPOCROOT##epoc32\data\z\testdata\configs\qospolicies.ini 					testdata\configs\qospolicies.ini
-#endif
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_pppsize_spud.ini								testdata\configs\te_pppsize_spud.ini
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_pppsize_spud.xml								testdata\configs\te_pppsize_spud.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_pppsize_config.txt								testdata\configs\te_pppsize_config.txt
 data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_channel_config.txt			testdata\configs\te_spudnetworkside_channel_config.txt
 
 data=EPOCROOT##epoc32\data\z\testdata\scripts\te_pdplayer_ip6.script 		testdata\scripts\te_pdplayer_ip6.script
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/bld.inf	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/bld.inf	Tue Sep 14 17:55:14 2010 +0100
@@ -23,17 +23,9 @@
 
 PRJ_TESTEXPORTS
 
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-// script files 
-../scripts/version1/TE_spudNetworkSide.script				z:/testdata/scripts/te_spudnetworkside.script
-../scripts/version1/TE_spudNetworkSide_nifman.script			z:/testdata/scripts/te_spudnetworkside_nifman.script
-../scripts/version1/TE_PppSize_spud.script					z:/testdata/scripts/te_pppsize_spud.script
-../scripts/version1/Te_SpudNetworkside_Channel.script					z:/testdata/scripts/Te_SpudNetworkside_Channel.script
-#else
 // script files
 ../scripts/TE_spudNetworkSide.script				z:/testdata/scripts/te_spudnetworkside.script
 ../scripts/TE_spudNetworkSide_nifman.script			z:/testdata/scripts/te_spudnetworkside_nifman.script
-../scripts/TE_PppSize_spud.script					z:/testdata/scripts/te_pppsize_spud.script
 ../scripts/Te_SpudNetworkside_Channel.script					z:/testdata/scripts/Te_SpudNetworkside_Channel.script
 ../scripts/TE_spudNetworkSide_R4_and_R5.script				z:/testdata/scripts/te_spudnetworkside_r4_and_r5.script
 ../scripts/te_pdplayer_ip6.script				z:/testdata/scripts/te_pdplayer_ip6.script
@@ -48,8 +40,6 @@
 //Min Max MMU tests
 ../scripts/TE_RawIpSize.script			z:/testdata/scripts/te_rawipsize.script
 
-#endif
-
 ../scripts/TE_spudNetworkSide_ppp_9x.script			z:/testdata/scripts/te_spudnetworkside_ppp.script
 ../configs/te_spudNetworkSide_ppp_config_9x.txt     z:/testdata/configs/te_spudnetworkside_ppp_config.txt
 ../configs/te_spudnetworkside_ppp_config2_9x.txt    z:/testdata/configs/te_spudnetworkside_ppp_config2.txt
@@ -57,26 +47,6 @@
 ../configs/te_spudNetworkSide_config_9x.txt			z:/testdata/configs/te_spudnetworkside_config.txt
 ../configs/te_spudNetworkSide_config_r4_and_r5.txt		z:/testdata/configs/te_spudnetworkside_config_r4_and_r5.txt
 
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-../configs/version1/te_SpudNetworkSide.xml					z:/testdata/configs/te_spudnetworkside.xml
-../configs/version1/te_SpudNetworkSide_ppp.xml				z:/testdata/configs/te_spudnetworkside_ppp.xml
-../configs/version1/TE_SpudNetworkSide_PppLoopback.xml			z:/testdata/configs/te_spudnetworkside_ppploopback.xml
-../configs/version1/te_SpudNetworkSide_nifman.xml				z:/testdata/configs/te_spudnetworkside_nifman.xml
-../configs/version1/te_spudNetworkSide.ini					z:/testdata/configs/te_spudnetworkside.ini
-../configs/version1/TE_SpudNetworkSideLoopbackCSY.ini		z:/testdata/configs/te_spudnetworksideloopbackcsy.ini
-../configs/version1/TE_SpudNetworkSideLoopbackCSY_serial.ini	z:/testdata/configs/te_spudnetworksideloopbackcsy_serial.ini
-../configs/version1/te_spudNetworkSide_nifman.ini			z:/testdata/configs/te_spudnetworkside_nifman.ini
-
-../configs/version1/TE_PppSize_spud.ini						z:/testdata/configs/te_pppsize_spud.ini
-../configs/version1/TE_PppSize_spud.xml						z:/testdata/configs/te_pppsize_spud.xml
-../configs/version1/TE_PppSize_config.txt					z:/testdata/configs/te_pppsize_config.txt
-
-../configs/version1/TE_SpudNetworkSide_Channel_config.txt		z:/testdata/configs/TE_SpudNetworkSide_Channel_config.txt
-
-// Some error codes are platsec dependent
-../configs/version1/TE_SpudNetworkSide_9x.ini 	z:/testdata/configs/te_spudnetworkside_platsec.ini
-
-#else
 // requires 399 config values
 ../configs/te_SpudNetworkSide.xml					z:/testdata/configs/te_spudnetworkside.xml
 ../configs/te_spudnetworkside_promptforauth.xml		z:/testdata/configs/te_spudnetworkside_promptforauth.xml
@@ -90,18 +60,11 @@
 ../configs/te_spudNetworkSide_nifman.ini            z:/testdata/configs/te_spudnetworkside_nifman.ini
 ../configs/te_spudNetworkSide_r4_and_r5.ini         z:/testdata/configs/te_spudnetworkside_r4_and_r5.ini
 
-../configs/TE_PppSize_spud.ini						z:/testdata/configs/te_pppsize_spud.ini
-../configs/TE_PppSize_spud.xml						z:/testdata/configs/te_pppsize_spud.xml
-../configs/TE_PppSize_config.txt                    z:/testdata/configs/te_pppsize_config.txt
-
 ../configs/TE_SpudNetworkSide_Channel_config.txt    z:/testdata/configs/TE_SpudNetworkSide_Channel_config.txt
 
 // Some error codes are platsec dependent
 ../configs/TE_SpudNetworkSide_9x.ini                z:/testdata/configs/te_spudnetworkside_platsec.ini
 
-//Used to trigger GuQos to use Qospolicies.ini file for SetDefaultQoS
-../configs/qospolicies.ini                          z:/testdata/configs/qospolicies.ini
-
 // IPv6 testing
 ../configs/te_pdplayer_ip6.ini                      z:/testdata/configs/te_pdplayer_ip6.ini
 ../configs/te_pdplayer_ip6_pdpcpr.cfg               z:/testdata/configs/te_pdplayer_ip6.cfg
@@ -120,8 +83,6 @@
 ../configs/TE_RawIpSize_config.txt			z:/testdata/configs/te_rawipsize_config.txt
 ../configs/TE_RawIpSize.cfg			z:/testdata/configs/te_rawipsize.cfg
 
-#endif // SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-
 TE_spudNetworkSide.iby	/epoc32/rom/include/te_spudnetworkside.iby 
 
 PRJ_MMPFILES
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/te_spudNetworkSide.pkg	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/te_spudNetworkSide.pkg	Tue Sep 14 17:55:14 2010 +0100
@@ -14,10 +14,10 @@
 //
 "\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudNetworkSide\scripts\te_pdplayer_ip6.script"-"c:\testdata\scripts\te_pdplayer_ip6.script"
 "\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudNetworkSide\scripts\te_pdpstresstests.script"-"c:\testdata\scripts\te_pdpstresstests.script"
-"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudNetworkSide\scripts\TE_PppSize_spud.script"-"c:\testdata\scripts\TE_PppSize_spud.script"
+"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudNetworkSide\scripts\te_rawipsize.script"-"c:\testdata\scripts\te_rawipsize.script"
 "\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudNetworkSide\scripts\TE_spudNetworkSide.script"-"c:\testdata\scripts\TE_spudNetworkSide.script"
 "\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudNetworkSide\scripts\TE_SpudNetworkside_Channel.script"-"c:\testdata\scripts\TE_SpudNetworkside_Channel.script"
 "\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudNetworkSide\scripts\TE_spudNetworkSide_nifman.script"-"c:\testdata\scripts\TE_spudNetworkSide_nifman.script"
-""\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudNetworkSide\scripts\TE_spudNetworkSide_ppp_9x.script"-"c:\testdata\scripts\TE_spudNetworkSide_ppp.script"
+"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudNetworkSide\scripts\TE_spudNetworkSide_ppp_9x.script"-"c:\testdata\scripts\TE_spudNetworkSide_ppp.script"
 "\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudNetworkSide\scripts\TE_spudNetworkSide_R4_and_R5.script"-"c:\testdata\scripts\TE_spudNetworkSide_R4_and_R5.script"
 "\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudNetworkSide\scripts\te_spudnetworkside_sipaddress.script"-"c:\testdata\scripts\te_spudnetworkside_sipaddress.script"
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/TE_PppSize_spud.script	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-//
-// Copyright (c) 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:
-//
-// backup the old commsdb
-
-RUN_UTILS  MkDir c:\simtsy\
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-
-LOAD_SUITE TE_PPPSize -SharedData
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-ced -i z:\testdata\configs\te_pppsize_spud.xml te_pppsize_spud.log
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_PPPSize_config.txt c:\simtsy\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_PPPSize_config.txt c:\config.txt
-
-START_TESTCASE          NET-Spud-NetworkSide-0701
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0701
-RUN_TEST_STEP 2000 TE_PPPSize PPPMinMaxMMU z:\testdata\configs\te_pppsize_spud.ini
-END_TESTCASE            NET-Spud-NetworkSide-0701
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/TE_spudNetworkSide.script	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/TE_spudNetworkSide.script	Tue Sep 14 17:55:14 2010 +0100
@@ -136,21 +136,21 @@
 
 START_TESTCASE          NET-Spud-NetworkSide-0806
 //! @SYMTestCaseID      NET-Spud-NetworkSide-0806
-//! @SYMTestCaseDesc  GUQoS triggers the KContextDelete on SPUDMAN after the Seondary PDP Context is created. -  This does not happen anymore in Guqos
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Activate the primary and the secondary contexts by opening a socket & setting QoS on it, GuQoS deletes the created secondary context.
-//! @SYMTestExpectedResults EQoSEventAddPolicy, EQoSEventFailure are received by the test app.
+//! @SYMTestCaseDesc Activation of Primary fails. 
+//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
+//! @SYMTestActions Explicitly start Spud. SIM TSY returns an error on activation of the primary context (-4178 too many contexts) 
+//! @SYMTestExpectedResults Spud cannot be started: RConnection::Start returns an error.
 //! @SYMTestPriority Critical
 //! @SYMTestStatus Implemented
 //! @SYMTestType CIT
-//! DUE TO BEHAVIOURAL CHANGES IN GUQOS - THIS CASE IS NO LONGER VALID AND THEREFORE NOT RUN
-//RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide.ini KContextDelete
-//DELAY 3000
-//RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
+RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryActivationFails202
+DELAY 3000
+RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
 END_TESTCASE            NET-Spud-NetworkSide-0806
 
-//run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-//run_script z:\TestData\scripts\te_esock_test_loadesock.script
+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-0807
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/version1/TE_PppSize_spud.script	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-//
-// Copyright (c) 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:
-//
-// backup the old commsdb
-
-RUN_UTILS  MkDir c:\simtsy\
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-
-LOAD_SUITE TE_PPPSize -SharedData
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-ced -i z:\testdata\configs\te_pppsize_spud.xml te_pppsize_spud.log
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_PPPSize_config.txt c:\simtsy\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_PPPSize_config.txt c:\config.txt
-
-START_TESTCASE          NET-Spud-NetworkSide-0101
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0101
-RUN_TEST_STEP 2000 TE_PPPSize PPPMinMaxMMU z:\testdata\configs\te_pppsize_spud.ini
-END_TESTCASE            NET-Spud-NetworkSide-0101
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/version1/TE_SpudNetworkside_Channel.script	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-// Copyright (c) 2005-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:
-// Secondary PDP-context UMTS Driver integration tests using RQoSChannel
-// 
-//
-
-//! @file TE_SpudNetworkside_Channel.script
-
-
-RUN_UTILS  MkDir c:\simtsy\
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  MakeReadWrite c:\loopback.ini
-RUN_UTILS  MakeReadWrite c:\qospolicies.ini
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  DeleteFile c:\loopback.ini
-RUN_UTILS  DeleteFile c:\qospolicies.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_Channel_config.txt c:\simtsy\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_Channel_config.txt c:\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSideLoopbackCSY.ini c:\loopback.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\qospolicies.ini c:\qospolicies.ini
-
-// Configure CommDB for the tests
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-ced -i z:\TestData\Configs\TE_SpudNetworkSide.xml
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-LOAD_SUITE TE_SpudNetworkSide
-
-START_TESTCASE          NET-Spud-NetworkSide-0301
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0301
-//! @SYMTestCaseDesc Network initiates TFT modification, GuQoS sends the KContextModifyActive to SPUD.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMTestActions Creates the primary and 2ndry Context successfully,initiates TFT modification, then GuQoS sends the KContextModifyActive to SPUD.
-//! @SYMTestExpectedResults EQoSEventConfirm and EQoSEventJoin are received bt the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondaryJoin z:\testdata\configs\te_spudNetworkSide.ini SecondaryActivationJoin
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0301
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  MakeReadWrite c:\qospolicies.ini
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  DeleteFile c:\loopback.ini
-RUN_UTILS  DeleteFile c:\qospolicies.ini
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/version1/TE_spudNetworkSide.script	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,613 +0,0 @@
-// Copyright (c) 2004-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:
-// Secondary PDP-context UMTS Driver integration tests of network-initiated conditions.
-//
-
-//! @file TE_spudNetworkSide.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  MakeReadWrite c:\qospolicies.ini
-RUN_UTILS  MakeReadWrite c:\private\101F7989\esock\qospolicies.ini
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  DeleteFile c:\loopback.ini
-RUN_UTILS  DeleteFile c:\qospolicies.ini
-RUN_UTILS  DeleteFile c:\private\101F7989\esock\qospolicies.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_config.txt c:\simtsy\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_config.txt c:\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSideLoopbackCSY.ini c:\loopback.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\qospolicies.ini c:\qospolicies.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\qospolicies.ini c:\private\101F7989\esock\qospolicies.ini
-
-// Configure CommDB for the tests
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-ced -i z:\TestData\Configs\TE_SpudNetworkSide.xml
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-LOAD_SUITE TE_SpudNetworkSide
-
-
-// TestSection suffix numbers correspond to SIM TSY's test section numbers. i.e. PrimaryActivationFails201 uses SIM TSYs test201 
-
-//
-// Sanity check tests: before testing the error cases, we test the success cases to make sure the system is OK.
-//
-
-START_TESTCASE          NET-Spud-NetworkSide-0201
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0201
-//! @SYMTestCaseDesc Sanity check: successfully activate Primary context. 
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start the SPUD interface. SIM TSY, etc successfully activate the primary context.
-//! @SYMTestExpectedResults  Primary PDP context is activated, SPUD is started: RConnection::Start on SPUD returns KErrNone.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryActivationOk1
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0201
-
-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-0202
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0202
-//! @SYMTestCaseDesc Sanity check: successfully activate Secondary context. 
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions Implicitly start the SPUD interface by opening a socket bound to its secondary context. Set QoS on the socket, prompting GUQoS to activate secondary context.
-//! @SYMTestExpectedResults Both the primary & secondary contexts are activated. EQoSEventAddPolicy and EQoSEventConfirm are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide.ini SecondaryActivationOk1
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0202
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-//
-// Operation errors: Creation, TFT, QoS, Activation, Deactivation, Deletion errors.
-//
-START_TESTCASE          NET-Spud-NetworkSide-0203
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0203
-//! @SYMTestCaseDesc Activation of Primary fails. 
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start Spud. SIM TSY returns an error on activation of the primary context. 
-//! @SYMTestExpectedResults Spud cannot be started: RConnection::Start returns an error.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryActivationFails201
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0203
-
-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-0204
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0204
-//! @SYMTestCaseDesc Activation of Secondary fails.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions Implicitly start SPUD by opening a socket bound to the secondary context. Set QoS on the socket, prompting GUQoS to activate secondary context. SIM TSY errors secondary context activation request. 
-//! @SYMTestExpectedResults  EQoSEventAddPolicy and EQoSEventFailure are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide.ini SecondaryActivationFails301
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0204
-
-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-0205
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0205
-//! @SYMTestCaseDesc Network deletes Activated Primary.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Activate the primary context only by explicitly starting Spud. After a pause, SIM.TSY deletes the primary context. 
-//! @SYMTestExpectedResults Spud is started successfully - the RConnection is started with KErrNone. KLinkLayerClosed / KErrDisconnected notification is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimaryEvent z:\testdata\configs\te_spudNetworkSide.ini PrimaryQoSEventDelete1
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0205
-
-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-0206
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0206
-//! @SYMTestCaseDesc Network deactivates (suspends?) Secondary
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMTestActions Activate the primary and the secondary contexts by opening a socket & setting QoS on it. After a pause, SIM TSY deactivates the active secondary context. 
-//! @SYMTestExpectedResults EQoSEventAddPolicy, EQoSEventConfirm, and  EQoSEventAdapt are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudTwoSecondaryEvents z:\testdata\configs\te_spudNetworkSide.ini SecondaryQosEventDeactivate1
-DELAY 3000 
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0206
-
-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-0207
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0207
-//! @SYMTestCaseDesc Network deletes Activated Secondary
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Activate the primary and the secondary contexts by opening a socket & setting QoS on it. After a pause, SIM TSY deletes the active secondary context.
-//! @SYMTestExpectedResults EQoSEventAddPolicy, EQoSEventConfirm, and  EQoSEventFailure are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondaryEvent z:\testdata\configs\te_spudNetworkSide.ini SecondaryQosEventDelete1
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0207
-
-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-0208
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0208
-//! @SYMTestCaseDesc  GUQoS triggers the KContextDelete on SPUDMAN after the Seondary PDP Context is created. -  This does not happen anymore in Guqos
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Activate the primary and the secondary contexts by opening a socket & setting QoS on it, GuQoS deletes the created secondary context.
-//! @SYMTestExpectedResults EQoSEventAddPolicy, EQoSEventFailure are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-//! DUE TO BEHAVIOURAL CHANGES IN GUQOS - THIS CASE IS NO LONGER VALID AND THEREFORE NOT RUN
-//RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide.ini KContextDelete
-//DELAY 3000
-//RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0208
-
-//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-0209
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0209
-//! @SYMTestCaseDesc  The QoS parameter changes on the Primary PDP Context.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMTestActions Explicitly start the SPUD interface to activate the primary context, use sim.tsy to trigger the QoS parameter changes on the Primary PDP Context.
-//! @SYMTestExpectedResults SPUD starts successfully. SPUD receives the QoS parameter change event successfully. RConnection times out and returns the error code KErrTimedOut.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimaryEvent z:\testdata\configs\te_spudNetworkSide.ini ENetworkQoSChangePrimary
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0209
-
-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-0210
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0210
-//! @SYMTestCaseDesc The QoS parameter changes on the Secondary PDP Context
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMTestActions Activate the primary and the secondary contexts by opening a socket & setting QoS on it. Change the QoS parameters on the active secondary context.
-//! @SYMTestExpectedResults EQoSEventAddPolicy, EQoSEventConfirm, and  EQoSEventAdapt are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondaryEvent z:\testdata\configs\te_spudNetworkSide.ini ENetworkQoSChangeSecondary
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0210
-
-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-0211
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0211
-//! @SYMTestCaseDesc  Sets a new set of QoS parameters for the established Secondary PDP Context.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMTestActions Activate the primary and the secondary contexts by opening a socket & setting QoS on it,sets a new set of QoS parameters for the established Secondary PDP Context.
-//! @SYMTestExpectedResults EQoSEventAddPolicy, EQoSEventConfirm, and  EQoSEventAddPolicy, EQoSEventConfirm are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondaryChangeQoS z:\testdata\configs\te_spudNetworkSide.ini SecondaryActivationChangeQoS
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0211
-
-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-0212
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0212
-//! @SYMTestCaseDesc Triggers the Primary PDP Context deletion before the lower NIF is up.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Explicitly start the SPUD interface to activate the primary context, it fails then deletes the Primary Context. 
-//! @SYMTestExpectedResults Spud start fails. RConnection::Start returns the error.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryDeleteBeforeLowerNif
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0212
-
-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-0213
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0213
-//! @SYMTestCaseDesc Triggers the Secondary PDP Context deletion before the lower NIF is up.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Activate the primary and the secondary contexts by opening a socket & setting QoS on it,fails to creat the secondary context.
-//! @SYMTestExpectedResults EQoSEventAddPolicy, EQoSEventFailure are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide.ini SecondaryDeleteBeforeLowerNif
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0213
-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-0214
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0214
-//! @SYMTestCaseDesc Failure to Start a lower NIF for primary context (LinkLayerDown from lower NIF) 
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start SPUD. Spud starts the lower NIF for the primary context. Lower NIF reports LinkLayerDown with an error. 
-//! @SYMTestExpectedResults Spud start fails. RConnection::Start returns the error.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide_platsec.ini PrimaryLowerNifStartFails210
-DELAY 3000
-RUN_TEST_STEP 30 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0214
-
-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-0215
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0215
-//! @SYMTestCaseDesc Failure to Start a lower NIF for secondary context (LinkLayerDown from lower NIF) 
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions Request activation of the secondary PDP context by opening a socket & setting QoS on it. Spud start the lower NIF for the secondary context. Lower NIF reports LinkLayerDown with error. 
-//! @SYMTestExpectedResults The primary context is activated, secondary is not. EQoSEventAddPolicy and EQoSEventFailure with the error code are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide_platsec.ini SecondaryLowerNifStartFails310
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0215
-
-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-0216
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0216
-//! @SYMTestCaseDesc Test Etel suspension of primary context
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMTestActions Create/send data on a socket with no QoS parameters (therefore a primary context), and read from the opposite loopback port. Suspend the context. Send more data and attempt to read from the opposite port. Resume the context. Send more data and attempt to read from the opposite port.
-//! @SYMTestExpectedResults The read on the loopback comm port should work before the context is suspended, and after it is resumed. It should time-out when the context is suspended.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudSuspendContext z:\testdata\configs\te_spudNetworkSide.ini PrimaryContextSuspendAndResume
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0216
-
-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-0217
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0217
-//! @SYMTestCaseDesc Test Etel suspension of secondary context
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMTestActions Create/send data on a socket with QoS parameters (therefore a secondary context), and read from the opposite loopback port. Suspend the context. Send more data and attempt to read from the opposite port. Resume the context. Send more data and attempt to read from the opposite port.
-//! @SYMTestExpectedResults The read on the loopback comm port should work before the context is suspended, and after it is resumed. It should time-out when the context is suspended.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudSuspendContext z:\testdata\configs\te_spudNetworkSide.ini SecondaryContextSuspendAndResume
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0217
-
-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-0218
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0218
-//! @SYMTestCaseDesc Primary PDP context activation fails
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Primary PDP context activation fails by modifying the TFT values
-//! @SYMTestExpectedResults The SpudMan code should respond to this event correctly without Leave and Panic.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryActivationFails18
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0218
-
-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-0219
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0219
-//! @SYMTestCaseDesc Secondary PDP context: Setting TFT fails
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions Setting TFT values on secondary PDP context fails due to using incorrect TFT values
-//! @SYMTestExpectedResults The SpudMan code should respond to this event correctly without Leave and Panic.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide.ini SecondaryActivationFails19
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0219
-
-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-0220
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0220
-//! @SYMTestCaseDesc Secondary PDP context: Setting requested QoS parameters fails
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions Setting QoS parameters on secondary PDP context fails due to using incorrect QoS parameter values
-//! @SYMTestExpectedResults The SpudMan code should respond to this event correctly without Leave and Panic.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide.ini SecondaryActivationFails20
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0220
-
-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-0221
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0221
-//! @SYMTestCaseDesc Primary PDP context deletion fails
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Primary PDP context deletion fails by modifying the TFT values
-//! @SYMTestExpectedResults The SpudMan code should respond to this event correctly without Leave and Panic.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryDeletionFails21
-DELAY 8000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0221
-
-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-0222
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0222
-//! @SYMTestCaseDesc Secondary PDP context deletion fails
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Secondary PDP context deletion fails by modifying the TFT values
-//! @SYMTestExpectedResults The SpudMan code should respond to this event correctly without Leave and Panic.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide.ini SecondaryDeletionFails22
-DELAY 8000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0222
-
-
-START_TESTCASE          NET-Spud-NetworkSide-0223
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0223
-//! @SYMTestCaseDesc  Network deletes a primary context
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions  Starts a secondary context by creating a socket with QoS, starts a rawipnif instance opposite the secondary context, deletes the primary context then sends data on the primary context's socket.
-//! @SYMTestExpectedResults   Since the primary context is down, the data is sent on the secondary context, and is received by the rawipnif instance opposite the secondary context.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 600 TE_SpudNetworkSide CSpudDeletePrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryQoSEventDeleteWithSecondary
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0223
-
-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-0224
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0224
-//! @SYMTestCaseDesc Call RConnection::Stop while SPUDFSM is initialising the phone  
-//! @SYMFssId NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions  Cause RPhone::Initialise to take a very long time to complete, and call RConnection::Stop while it is running
-//! @SYMTestExpectedResults Connection stops successfully.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudPrimayStartingStop z:\testdata\configs\te_spudNetworkSide.ini PrimarySlowInitialisePhone
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0224
-
-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-0225
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0225
-//! @SYMTestCaseDesc Sanity check: successfully activate many primary contexts. 
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start the SPUD interfaces. SIM TSY, etc successfully activate the primary contexts.
-//! @SYMTestExpectedResults  The Primary PDP contexts are activated, SPUD started: RConnection::Start on the SPUDs returns KErrNone.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 100 TE_SpudNetworkSide CSpudMultiPrimary z:\testdata\configs\te_spudNetworkSide.ini MultiPrimaryActivationOk1
-DELAY 3000
-RUN_TEST_STEP 100 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0225
-
-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-0226
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0226
-//! @SYMTestCaseDesc Set requested Qos (SSD, IM CN SI) on a Secondary PDP context.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions  Activate the primary and the secondary contexts by opening a socket & setting requested Qos (SSD = Speech, SI = True, IM CN SI = True) on secondary PDP context
-//! @SYMTestExpectedResults Both the primary & secondary contexts are activated. EQoSEventAddPolicy and EQoSEventConfirm are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudQosR5Secondary z:\testdata\configs\te_spudNetworkSide.ini SecondaryR5ActivationOk1
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0226
-
-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-0227
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0227
-//! @SYMTestCaseDesc Secondary PDP context: Setting requested QoS parameters fails
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions Setting QoS parameters on secondary PDP context fails due to using incorrect QoS parameter values
-//! @SYMTestExpectedResults The SpudMan code should respond to this event correctly without Leave and Panic.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudQosR5Secondary z:\testdata\configs\te_spudNetworkSide.ini SecondaryR5ActivationFails20
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0227
-
-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-0228
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0228
-//! @SYMTestCaseDesc The QoS R5 parameter changes on the Secondary PDP Context.The Network turns off SI Parameter
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMTestActions Activate the primary and the secondary contexts by opening a socket & setting QoS on it. Change the QoS parameters on the active secondary context.
-//! @SYMTestExpectedResults EQoSEventAddPolicy, EQoSEventConfirm, and  EQoSEventAdapt are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondaryQosR5Event z:\testdata\configs\te_spudNetworkSide.ini ENetworkQoSR5ChangeSecondary
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0228
-
-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-0229
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0229
-//! @SYMTestCaseDesc The QoS parameter changes on the Secondary PDP Context.The Network changes the SSD to Unknown.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMTestActions Activate the primary and the secondary contexts by opening a socket & setting QoS on it. Change the QoS parameters on the active secondary context.
-//! @SYMTestExpectedResults EQoSEventAddPolicy, EQoSEventConfirm, and  EQoSEventAdapt are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondaryQosR5Event z:\testdata\configs\te_spudNetworkSide.ini ENetworkQoSR5ChangeSecondary1
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0229
-
-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-0230
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0230
-//! @SYMTestCaseDesc  Sets a new set of R5 QoS parameters for the established Secondary PDP Context.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMTestActions Activate the primary and the secondary contexts by opening a socket & setting QoS on it,sets a new set of QoS parameters for the established Secondary PDP Context.
-//! @SYMTestExpectedResults EQoSEventAddPolicy, EQoSEventConfirm, and  EQoSEventAddPolicy, EQoSEventConfirm are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondaryChangeR5QoS z:\testdata\configs\te_spudNetworkSide.ini SecondaryActivationChangeQoSR5
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0230
-
-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-0231
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0231
-//! @SYMTestCaseDesc  Network deletes a primary context where SI is set on Secondary PDP context.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions  Starts a secondary context by creating a socket with QoS, starts a rawipnif instance opposite the secondary context, deletes the primary context then sends data on the primary context's socket.
-//! @SYMTestExpectedResults   Since the primary context is down, the data is sent on the secondary context, and is received by the rawipnif instance opposite the secondary context.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 600 TE_SpudNetworkSide CSpudDeletePrimaryR5Qos z:\testdata\configs\te_spudNetworkSide.ini PrimaryQoSR5EventDeleteWithSecondary
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0231
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-
-
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  MakeReadWrite c:\qospolicies.ini
-RUN_UTILS  MakeReadWrite c:\private\101F7989\esock\qospolicies.ini
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  DeleteFile c:\loopback.ini
-RUN_UTILS  DeleteFile c:\qospolicies.ini
-RUN_UTILS  DeleteFile c:\private\101F7989\esock\qospolicies.ini
-
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/version1/TE_spudNetworkSide_nifman.script	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,348 +0,0 @@
-// Copyright (c) 2005-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:
-// Secondary PDP-context UMTS Driver integration tests using NIFMAN
-//
-
-//! @file TE_SpudNetworkSide_nifman.script
-
-RUN_UTILS  MkDir c:\simtsy\
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_nifman_config.txt c:\simtsy\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_nifman_config.txt c:\config.txt
-
-RUN_UTILS  MakeReadWrite c:\loopback.ini
-RUN_UTILS  DeleteFile c:\loopback.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSideLoopbackCSY.ini c:\loopback.ini
-
-RUN_UTILS  DeleteFile c:\qospolicies.ini
-RUN_UTILS  DeleteFile c:\private\101F7989\esock\qospolicies.ini
-
-RUN_UTILS  CopyFile z:\TestData\Configs\qospolicies.ini c:\qospolicies.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\qospolicies.ini c:\private\101F7989\esock\qospolicies.ini
-
-
-LOAD_SUITE TE_SpudNetworkSide
-
-// TestSection suffix numbers correspond to SIM TSY's test section numbers. i.e. PrimaryActivationFails201 uses SIM TSYs test201 
-
-//
-// Configure CommDB for the tests using RawIP as lower NIF.
-//
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-ced -i z:\TestData\Configs\TE_SpudNetworkSide_nifman.xml
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-
-//
-// Nifman stops SPUD when there is just the primary PDP context.
-//
-
-
-START_TESTCASE          NET-Spud-NetworkSide-0401
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0401
-//! @SYMTestCaseDesc Stop the interface when SPUD is deleting the primary context as a result of lower NIF LinkLayerDown.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Start Spud & successfully activate the primary context. Write to the primary, such that the lower NIF errors our on the read and report LinkLayerDown. Spud issues deletion request on the primary. When the request is outstanding, RConnection::Stop(EStopNormal) is called on Spud.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app on Spud.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudPrimaryDeletionInterfaceStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopPrimaryDeleting1
-DELAY 3000
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-END_TESTCASE            NET-Spud-NetworkSide-0401
-
-
-
-START_TESTCASE          NET-Spud-NetworkSide-0402
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0402
-//! @SYMTestCaseDesc Stop the interface using Idle timeout, when SPUD is deleting the primary context as a result of lower NIF LinkLayerDown.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Start Spud & successfully activate the primary context. Write to the primary, such that the lower NIF errors our on the read and report LinkLayerDown. Spud issues deletion request on the primary. When the request is outstanding, Nifman idle timeout stops the Spud with KErrTimedOut.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrTimedOut is received by the test app on Spud.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudPrimaryDeletionInterfaceStop z:\testdata\configs\te_spudNetworkSide_nifman.ini TimeoutStopPrimaryDeleting1
-DELAY 3000
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-END_TESTCASE            NET-Spud-NetworkSide-0402
-
-
-
-START_TESTCASE          NET-Spud-NetworkSide-0403
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0403
-//! @SYMTestCaseDesc Stop (EStopNormal) the interface when the primary context is suspended.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Start Spud & successfully activate the primary context. SIM TSY suspends the primary. RConnection::Stop(EStopNormal) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudPrimaryInterfaceEventStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopOnPrimarySuspended1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0403
-
-START_TESTCASE          NET-Spud-NetworkSide-0404
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0404
-//! @SYMTestCaseDesc Stop (EStopNormal) the interface when the primary context is being deactivated.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Start Spud & successfully activate the primary context. SIM TSY changes the state of the primary to Deactivating. RConnection::Stop(EStopNormal) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudPrimaryInterfaceEventStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopOnPrimaryDeactivating1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0404
-
-START_TESTCASE          NET-Spud-NetworkSide-0405
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0405
-//! @SYMTestCaseDesc Stop (EStopNormal) the interface when the primary context is inactive.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Start Spud & successfully activate the primary context. SIM TSY changes the state of the primary to Inactive. RConnection::Stop(EStopNormal) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app on Spud.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudPrimaryInterfaceEventStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopOnPrimaryInactive1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0405
-
-START_TESTCASE          NET-Spud-NetworkSide-0406
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0406
-//! @SYMTestCaseDesc Stop (EStopAuthoritative) the interface when the primary context is suspended.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Start Spud & successfully activate the primary context. SIM TSY changes the state of the primary to Suspended. RConnection::Stop(EStopAuhoritative) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrConnectionTerminated is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudPrimaryInterfaceEventStop z:\testdata\configs\te_spudNetworkSide_nifman.ini AuthStopOnPrimarySuspended1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0406
-
-START_TESTCASE          NET-Spud-NetworkSide-0407
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0407
-//! @SYMTestCaseDesc Stop (EStopAuthoritative) the interface when the primary context is being deactivated.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Start Spud & successfully activate the primary context. SIM TSY changes the state of the primary to Deactivating. RConnection::Stop(EStopAuthoritative) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrConnectionTerminated is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudPrimaryInterfaceEventStop z:\testdata\configs\te_spudNetworkSide_nifman.ini AuthStopOnPrimaryDeactivating1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0407
-
-
-START_TESTCASE          NET-Spud-NetworkSide-0408
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0408
-//! @SYMTestCaseDesc Stop (EStopAuthoritative) the interface when the primary context is inactive.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Start Spud & successfully activate the primary context. SIM TSY changes the state of the primary to Inactive. RConnection::Stop(EStopAuthoritative) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrConnectionTerminated is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudPrimaryInterfaceEventStop z:\testdata\configs\te_spudNetworkSide_nifman.ini AuthStopOnPrimaryInactive1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0408
-
-START_TESTCASE          NET-Spud-NetworkSide-0409
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0409
-//! @SYMTestCaseDesc Stop (EStopAuthoritative) the interface when the primary context is the only context, and is active.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Start Spud & successfully activate the primary context. RConnection::Stop(EStopAuthoritative) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrConnectionTerminated is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudPrimaryInterfaceStop z:\testdata\configs\te_spudNetworkSide_nifman.ini PrimaryOnlyAuthoritativeStop1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0409
-
-START_TESTCASE          NET-Spud-NetworkSide-0410
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0410
-//! @SYMTestCaseDesc Stop (EStopNormal) the interface when the primary context is the only context, and is active.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Start Spud & successfully activate the primary context. SIM TSY changes the state of the primary to Inactive. RConnection::Stop(EStopNormal) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudPrimaryInterfaceStop z:\testdata\configs\te_spudNetworkSide_nifman.ini PrimaryOnlyNormalStop1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0410
-
-
-
-//
-// Nifman stops SPUD where there is a primary and a secondary context.
-//
-
-
-// ****** GUQoS crashes ESock.
-START_TESTCASE          NET-Spud-NetworkSide-0411
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0411
-//! @SYMTestCaseDesc Stop the interface when SPUD is activating the secondary context.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Open a socket, set QoS and trigger 2ndary context activation. When activation request on SIM TSY is outstanding, RConnection::Stop(EStopNormal) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT 
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudSecondaryStartingStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopSecondaryActivating1
-DELAY 3000
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-END_TESTCASE            NET-Spud-NetworkSide-0411
-
-
-// ****** GUQoS crashes ESock.
-START_TESTCASE          NET-Spud-NetworkSide-0412
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0412
-//! @SYMTestCaseDesc Stop the interface when SPUD is setting TFT on the secondary context.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Open a socket, set QoS and trigger 2ndary context creation. When setting TFT request on SIM TSY is outstanding, RConnection::Stop(EStopNormal) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT 
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudSecondaryStartingStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopSecondarySettingTFT25
-DELAY 3000
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-END_TESTCASE            NET-Spud-NetworkSide-0412
-
-
-
-
-START_TESTCASE          NET-Spud-NetworkSide-0413
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0413
-//! @SYMTestCaseDesc Trigger GUQoS deletion request due to timeout, after stop was called by Nifman.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Open a socket, set QoS and sucessfully activate the 2ndary context. Close the socket and wait. RConnection::Stop(EStopNormal) is called. Spud deletes the 2ndary.  When the deletion request on SIM TSY is outstading, GUQoS deletes the secondary due to its timeout. 
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudSecondaryInterfaceEventStop z:\testdata\configs\te_spudNetworkSide_nifman.ini GUQoSDeleteOnNormalStop1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0413
-
-
-// ****** GUQoS crashes ESock.
-START_TESTCASE          NET-Spud-NetworkSide-0414
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0414
-//! @SYMTestCaseDesc Stop the interface when SPUD is deleting the 2ndary context as a result of lower NIF LinkLayerDown.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Open a socket, set QoS and sucessfully activate the 2ndary context. Trigger 2ndary's lower NIF to signal LinkLayerDown. Spud deletes the 2ndary. When the deletion request on SIM TSY is outstading,  RConnection::Stop(EStopNormal) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudSecondaryLowerNifDownStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopSecondaryLowerNifDown1
-DELAY 3000
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-END_TESTCASE            NET-Spud-NetworkSide-0414
-
-
-START_TESTCASE          NET-Spud-NetworkSide-0415
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0415
-//! @SYMTestCaseDesc Stop the interface when SPUD is deleting the 2ndary context following a GUQoS deletion request due to timeout.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Open a socket, set QoS and sucessfully activate the 2ndary context. Close the socket. GUQoS deletes the secondary after a timeout. When the deletion request on SIM TSY is outstading,  RConnection::Stop(EStopNormal) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudSecondaryInterfaceEventStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopGUQoSDeletingSecondary1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0415
-
-
-
-START_TESTCASE          NET-Spud-NetworkSide-0416
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0416
-//! @SYMTestCaseDesc Stop (EStopAuthoritative) the interface when the primary & 2ndary contexts are active.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Successfully activate the primary and the secondary contexts. RConnection::Stop(EStopAuthoritative) is called.
-//! @SYMTestExpectedResults EQoSEventConfirm is received. Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrConnectionTerminated is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT 
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudSecondaryInterfaceStop z:\testdata\configs\te_spudNetworkSide_nifman.ini AuthStopSecondaryActive1
-DELAY 3000
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-END_TESTCASE            NET-Spud-NetworkSide-0416
-
-START_TESTCASE          NET-Spud-NetworkSide-0417
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0417
-//! @SYMTestCaseDesc Stop (EStopNormal) the interface when the primary & 2ndary contexts are active.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Successfully activate the primary and the secondary contexts. RConnection::Stop(EStopNormal) is called.
-//! @SYMTestExpectedResults EQoSEventConfirm is received. Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT 
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudSecondaryInterfaceStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopSecondaryActive1
-DELAY 3000
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-END_TESTCASE            NET-Spud-NetworkSide-0417
-
-
-
-
-
-// We must make sure SIM TSY fails when opening RPhone. We get rid of the config file.
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-
-
-START_TESTCASE          NET-Spud-NetworkSide-0418
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0418
-//! @SYMTestCaseDesc Leave when trying to construct SPUD.  
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions  Cause RPhone::Open to fail, resulting CSpudMan construction to Leave with KErrNone.
-//! @SYMTestExpectedResults Spud start fails gracefully. No crash in ESock. KLinkLayerClosed with KErrNotFound is received by the test app. 
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide_nifman.ini LeaveInSpudCreation
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0418
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-
-RUN_UTILS  DeleteFile c:\loopback.ini
-RUN_UTILS  DeleteFile c:\qospolicies.ini
-RUN_UTILS  DeleteFile c:\private\101F7989\esock\qospolicies.ini
-
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/version1/TE_spudNetworkSide_ppp.script	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,162 +0,0 @@
-// Copyright (c) 2004-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:
-// Secondary PDP-context UMTS Driver integration tests using PPP as the NIF.
-//
-
-//! @file TE_SpudNetworkSide_ppp.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  MakeReadWrite c:\qospolicies.ini
-RUN_UTILS  MakeReadWrite c:\private\101F7989\esock\qospolicies.ini
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  DeleteFile c:\loopback.ini
-RUN_UTILS  DeleteFile c:\qospolicies.ini
-RUN_UTILS  DeleteFile c:\private\101F7989\esock\qospolicies.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\qospolicies.ini c:\qospolicies.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\qospolicies.ini c:\private\101F7989\esock\qospolicies.ini
-
-LOAD_SUITE TE_SpudNetworkSide
-
-// TestSection suffix numbers correspond to SIM TSY's test section numbers. i.e. PrimaryActivationFails201 uses SIM TSYs test201 
-
-//
-// Configure CommDB for the tests using PPP as lower NIF
-//
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-ced -i z:\TestData\Configs\TE_SpudNetworkSide_ppp.xml
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_nifman_config.txt c:\simtsy\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_nifman_config.txt c:\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSideLoopbackCSY.ini c:\loopback.ini
-
-START_TESTCASE          NET-Spud-NetworkSide-0501
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0501
-//! @SYMTestCaseDesc Stop the interface when SPUD is starting lower NIF for the primary context.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions SPUD starts the lower NIF, which "takes a long time to start", i.e. no LinkLayerUp / Down. Stop SPUD using RConnection::Stop(EStopNormal)
-//! @SYMTestExpectedResults KLinkLayerClosed / KErrCancel progress.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType IT 
-// Note: this test case uses CSpudSecondaryStartingStop by design, because the sequence of events is identical, the only difference is timing.
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudSecondaryStartingStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopPrimaryStartingLowerNif1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0501
-
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_config.txt c:\simtsy\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_config.txt c:\config.txt
-
-
-
-START_TESTCASE          NET-Spud-NetworkSide-0502
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0502
-//! @SYMTestCaseDesc Error on Start of a lower NIF for primary context.  
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start Spud. Spud starts a lower NIF for the primary context, which returns an error.
-//! @SYMTestExpectedResults starting Spud fails. RConnection::Start returns an error.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 30 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide_platsec.ini PrimaryLowerNifStartError210
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0502
-
-
-# Wait for Nifman Idle timeout to kill the interface
-DELAY 10000
-
-START_TESTCASE          NET-Spud-NetworkSide-0503
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0503
-//! @SYMTestCaseDesc Network Deletes primary context when lower NIF was started, and SPUD waits for LinkLayerUp.  
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start Spud. Spud starts the lower NIF for the primary, which "takes a long time to start, i.e. no LinkLayerUp/Down. SIM TSY deletes the primary context.
-//! @SYMTestExpectedResults Start on Spud fails. Nifman progress 8000 with KErrDisconnected is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 30 TE_SpudNetworkSide CSpudPrimaryEventOnLowerNifStarting z:\testdata\configs\te_spudNetworkSide.ini PrimaryDeleteOnLowerNifStart212
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0503
-
-
-// The following tests use different CommDB entries
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-ced -i z:\TestData\Configs\TE_SpudNetworkSide_PppLoopback.xml
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-RUN_UTILS  MakeReadWrite c:\loopback.ini
-RUN_UTILS  DeleteFile c:\loopback.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSideLoopbackCSY_serial.ini c:\loopback.ini
-
-
-START_TESTCASE          NET-Spud-NetworkSide-0504
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0504
-//! @SYMTestCaseDesc Sanity check: successfully activate Primary context using PPP as a lower NIF
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start the SPUD interface using PPP. Also start a PPP server connected to the port from the SPUD. SIM TSY, etc successfully activate the primary context.
-//! @SYMTestExpectedResults  Primary PDP context is activated, SPUD is started: RConnection::Start on SPUD returns KErrNone.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPppPrimary z:\testdata\configs\te_spudNetworkSide.ini PppPrimaryOk
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0504
-
-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-0505
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0505
-//! @SYMTestCaseDesc Successfully activate a secondary context and send data using the secondary context, using PPP as the lower NIF
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions Open a socket with QoS parameters. Also start 2 PPP server instances on loopback ports opposite the primary and secondary contexts of the SPUD. Send data to and from the secondary context of SPUD.
-//! @SYMTestExpectedResults  Primary PDP context is activated, SPUD is started: RConnection::Start on SPUD returns KErrNone. Send as well as RecvFrom complete successfully.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 600 TE_SpudNetworkSide CSpudPppSecondarySend z:\testdata\configs\te_spudNetworkSide.ini PppSecondarySend
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0505
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  MakeReadWrite c:\qospolicies.ini
-RUN_UTILS  MakeReadWrite c:\private\101F7989\esock\qospolicies.ini
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  DeleteFile c:\loopback.ini
-RUN_UTILS  DeleteFile c:\qospolicies.ini
-RUN_UTILS  DeleteFile c:\private\101F7989\esock\qospolicies.ini
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/version1/TE_spudNetworkSide_ppp_9x.script	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,180 +0,0 @@
-// Copyright (c) 2004-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:
-// Secondary PDP-context UMTS Driver integration tests using PPP as the NIF.
-//
-
-//! @file TE_SpudNetworkSide_ppp_9x.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  MakeReadWrite c:\qospolicies.ini
-RUN_UTILS  MakeReadWrite c:\private\101F7989\esock\qospolicies.ini
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  DeleteFile c:\loopback.ini
-RUN_UTILS  DeleteFile c:\qospolicies.ini
-RUN_UTILS  DeleteFile c:\private\101F7989\esock\qospolicies.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\qospolicies.ini c:\qospolicies.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\qospolicies.ini c:\private\101F7989\esock\qospolicies.ini
-
-LOAD_SUITE TE_SpudNetworkSide
-
-// TestSection suffix numbers correspond to SIM TSY's test section numbers. i.e. PrimaryActivationFails201 uses SIM TSYs test201 
-
-//
-// Configure CommDB for the tests using PPP as lower NIF
-//
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-ced -i z:\TestData\Configs\TE_SpudNetworkSide_ppp.xml
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_nifman_config.txt c:\simtsy\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_nifman_config.txt c:\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSideLoopbackCSY.ini c:\loopback.ini
-
-START_TESTCASE          NET-Spud-NetworkSide-0601
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0601
-//! @SYMTestCaseDesc Stop the interface when SPUD is starting lower NIF for the primary context.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions SPUD starts the lower NIF, which "takes a long time to start", i.e. no LinkLayerUp / Down. Stop SPUD using RConnection::Stop(EStopNormal)
-//! @SYMTestExpectedResults KLinkLayerClosed / KErrCancel progress.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType IT 
-// Note: this test case uses CSpudSecondaryStartingStop by design, because the sequence of events is identical, the only difference is timing.
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudSecondaryStartingStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopPrimaryStartingLowerNif1
-DELAY 6000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0601
-
-
-// Unload and reload ESock TWICE. Once is not enough to correct the crash of the previous test
-// case. Afeter TESTCASE 1 is fixed, this can (and should) be safely removed.
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_config.txt c:\simtsy\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_config.txt c:\config.txt
-
-
-
-START_TESTCASE          NET-Spud-NetworkSide-0602
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0602
-//! @SYMTestCaseDesc Error on Start of a lower NIF for primary context.  
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start Spud. Spud starts a lower NIF for the primary context, which returns an error.
-//! @SYMTestExpectedResults starting Spud fails. RConnection::Start returns an error.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 30 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide_platsec.ini PrimaryLowerNifStartError210
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0602
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-
-// Wait for Nifman Idle timeout to kill the interface
-DELAY 10000
-
-START_TESTCASE          NET-Spud-NetworkSide-0603
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0603
-//! @SYMTestCaseDesc Network Deletes primary context when lower NIF was started, and SPUD waits for LinkLayerUp.  
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start Spud. Spud starts the lower NIF for the primary, which "takes a long time to start, i.e. no LinkLayerUp/Down. SIM TSY deletes the primary context.
-//! @SYMTestExpectedResults Start on Spud fails. Nifman progress 2000 with KErrDisconnected is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 30 TE_SpudNetworkSide CSpudPrimaryEventOnLowerNifStarting z:\testdata\configs\te_spudNetworkSide.ini PrimaryDeleteOnLowerNifStart212
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0603
-
-
-// The following tests use different CommDB entries
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-ced -i z:\TestData\Configs\TE_SpudNetworkSide_PppLoopback.xml
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-RUN_UTILS  MakeReadWrite c:\loopback.ini
-RUN_UTILS  DeleteFile c:\loopback.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSideLoopbackCSY_serial.ini c:\loopback.ini
-
-
-START_TESTCASE          NET-Spud-NetworkSide-0604
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0604
-//! @SYMTestCaseDesc Sanity check: successfully activate Primary context using PPP as a lower NIF
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start the SPUD interface using PPP. Also start a PPP server connected to the port from the SPUD. SIM TSY, etc successfully activate the primary context.
-//! @SYMTestExpectedResults  Primary PDP context is activated, SPUD is started: RConnection::Start on SPUD returns KErrNone.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPppPrimary z:\testdata\configs\te_spudNetworkSide.ini PppPrimaryOk
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0604
-
-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-0605
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0605
-//! @SYMTestCaseDesc Successfully activate a secondary context and send data using the secondary context, using PPP as the lower NIF
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions Open a socket with QoS parameters. Also start 2 PPP server instances on loopback ports opposite the primary and secondary contexts of the SPUD. Send data to and from the secondary context of SPUD.
-//! @SYMTestExpectedResults  Primary PDP context is activated, SPUD is started: RConnection::Start on SPUD returns KErrNone. Send as well as RecvFrom complete successfully.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 600 TE_SpudNetworkSide CSpudPppSecondarySend z:\testdata\configs\te_spudNetworkSide.ini PppSecondarySend
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0605
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  MakeReadWrite c:\qospolicies.ini
-RUN_UTILS  MakeReadWrite c:\private\101F7989\esock\qospolicies.ini
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  DeleteFile c:\loopback.ini
-RUN_UTILS  DeleteFile c:\qospolicies.ini
-RUN_UTILS  DeleteFile c:\private\101F7989\esock\qospolicies.ini
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-
--- a/telephonyprotocols/rawipnif/group/bld.inf	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyprotocols/rawipnif/group/bld.inf	Tue Sep 14 17:55:14 2010 +0100
@@ -19,12 +19,6 @@
  @file
 */
 
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-
-#include "../version1/group/bld.inf"
-
-#else
-
 PRJ_PLATFORMS
 
 DEFAULT
@@ -47,5 +41,3 @@
 #ifdef SYMBIAN_ZERO_COPY_NETWORKING
 #include "../rawipnif2/group/bld.inf"
 #endif
-
-#endif // SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
--- a/telephonyprotocols/rawipnif/version1/bmarm/RawIPNifU.DEF	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	NewInterfaceFactoryL @ 1 NONAME R3UNUSED ; (null)
-
--- a/telephonyprotocols/rawipnif/version1/bwins/RawIPNifU.DEF	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	NewInterfaceFactoryL @ 1 NONAME
-
--- a/telephonyprotocols/rawipnif/version1/data/rawip.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-[link]
-highmark= 5
--- a/telephonyprotocols/rawipnif/version1/eabi/RawIPNifU.def	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-EXPORTS
-	NewInterfaceFactoryL @ 1 NONAME ; extracted from ..\..\..\..\..\EPOC32\BUILD\gt139\dev_branch\gprsbtt\Nif\GROUP\BTTNIF\ARMV4\UDEB\Btt.in
--- a/telephonyprotocols/rawipnif/version1/group/RawIPNif.mmp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-// Copyright (c) 2002-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:
-//
-
-TARGET      rawip.nif
-TARGETTYPE  DLL
-UID         0x10003d3a 0x10206860
-
-// Used to specify if the rawip.nif should be specifically built to the
-// functionality of TI basebands, where a two-byte header is appended
-// to all incoming and outgoing packets (to specify the protocol being
-// used). This macro is commented out as part of fix INC113695 propagation to v94
-// MACRO RAWIP_HEADER_APPENDED_TO_PACKETS
-
-// Used by UmtsNifControlIf. Networking defect DEF027856 reversed the meaning
-// of this, so we don't define it any more.
-//MACRO	MM_ETEL_API
-
-// Do not add the non-callable exports to the DEF files
-// Remove this line temporarily if we need to add new exports
-NOEXPORTLIBRARY
-
-#if defined(WINS)
-DEFFILE RawIPNif.DEF
-#elif defined(GCC32)
-DEFFILE RawIPNif.DEF
-#else
-DEFFILE RawIPNif.def
-#endif
-
-SOURCEPATH  ../src
-
-SOURCE  DllMain.cpp 
-SOURCE  RawIPNifMain.cpp 
-SOURCE  RawIPNifMainFactory.cpp
-SOURCE  IPv4ProtocolIf.cpp
-SOURCE  IPv6ProtocolIf.cpp 
-SOURCE  ProtocolIfBase.cpp
-SOURCE  BcaIoController.cpp 
-SOURCE  BcaController.cpp 
-SOURCE  Sender.cpp 
-SOURCE  Receiver.cpp 
-SOURCE  IPTagHeader.cpp
-SOURCE  bttlog.cpp
-
-
-USERINCLUDE		../inc
-
-OS_LAYER_SYSTEMINCLUDE
-
-#include <networking/packetlogger.mmh>
-
-LIBRARY  euser.lib
-LIBRARY  nifman.lib
-LIBRARY  insock.lib
-LIBRARY  etelpckt.lib
-LIBRARY  mbufmgr.lib
-LIBRARY  esock.lib
-
-
-START WINS
-    BASEADDRESS 0x47E00000
-END
-
-CAPABILITY CommDD PowerMgmt ReadDeviceData WriteDeviceData TrustedUI ProtServ NetworkControl NetworkServices LocalServices ReadUserData WriteUserData
-VENDORID 0x70000001
-
-UNPAGED
--- a/telephonyprotocols/rawipnif/version1/group/RawIpNif.iby	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-// Copyright (c) 2004-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 __RAWIPNIF_IBY__
-#define __RAWIPNIF_IBY__
-
-// Raw IP NIF
-
-#include <packetlogger.iby>
-
-// The default BCA is C32, but may be replaced by another BCA if desired
-#include <c32bca.iby>
-
-file=ABI_DIR\DEBUG_DIR\rawip.nif    System\libs\rawip.nif
-
-#endif // __RAWIPNIF_IBY__
--- a/telephonyprotocols/rawipnif/version1/group/bld.inf	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-// Copyright (c) 2002-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:
-// Network interface for supporting multiple primary PDP contexts on the telephony reference platform 
-// 
-//
-
-/**
- @file
-*/
-
-PRJ_PLATFORMS
-
-DEFAULT
-
-PRJ_EXPORTS
-RawIpNif.iby 	/epoc32/rom/include/rawipnif.iby
-
-PRJ_MMPFILES
-
-RawIPNif.mmp
-
-// Note that there is no PRJ_TESTMMPFILES here. This is intentional, because
-// building the NIF unit test stops the other unit tests from working. If you
-// want to run the NIF unit test, build it explicitly.
--- a/telephonyprotocols/rawipnif/version1/group/networking_rawipnif.history.xml	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<relnotes schema="1.0.0" name="Raw IP NIF" purpose="" type="component">
-  <revision major="1" functional="0" minor="0" date="20071109">
-    <ref name="PDEF113864" type="defect"/>
-    <description>The RawIP NIF and TRP PCO implementation is not correct.  TProtocolConfigOptionV2::iMiscBuffer is not the correct way to pass a gateway address - data needs to be passed in TLV format but there are no TLV content tags defined for a gateway address and any UMTS/GPRS hardware which claims to be able to supply this address is erroneous (3gpp standard 24.008, section 10.5.6.3).  We no longer pass any gateway information in the buffer so that other correctly formed parameters can be passed.</description>
-  </revision>
-  <purpose>
-    Required to support multiple primary PDP contexts (multi-homing over GPRS) on the telephony reference platform.
-  </purpose>
-</relnotes>
--- a/telephonyprotocols/rawipnif/version1/group/networking_rawipnif.mrp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-component	networking_rawipnif
-source	\sf\os\cellularsrv\telephonyprotocols\rawipnif
-binary	\sf\os\cellularsrv\telephonyprotocols\rawipnif\group	all
-exports	\sf\os\cellularsrv\telephonyprotocols\rawipnif\group
-notes_source	\component_defs\release.src
--- a/telephonyprotocols/rawipnif/version1/inc/BcaController.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,142 +0,0 @@
-// Copyright (c) 2004-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:
-// Defines the interface to the BCA & flow control.
-// 
-//
-
-/**
- @file 
-*/
-
-#ifndef BCACONTROLLER_H
-#define BCACONTROLLER_H
-
-#include <e32base.h>
-#include <c32comm.h>
-
-#include "MControllerObserver.h"
-#include "bttlog.h"
-#include "Constants.h"
-
-#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
-#include "IPTagHeader.h"
-#endif // RAWIP_HEADER_APPENDED_TO_PACKETS
-
-class CBttLogger;
-
-/** 
-@internalComponent 
-*/	
-class CBcaController : public CBase
-	{
-public:
-	CBcaController(MControllerObserver& aObserver, CBttLogger* aTheLogger);
-	void BaseConstructL();
-	~CBcaController();
-
-public: // Flow Control
-	void UpdateInternalFlowFlag(TFlowControl aValue);
-	void UpdateContextStateFlag(TBool aValue);
-	TBool IsTxPossible();
-
-public:
-	virtual void StartL() = 0;
-	virtual void Stop(TInt aError = KErrNone) = 0;
-
-#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
-public: //tag headers
-	void SetType(TUint16 aType);
-	void AddHeader(TDes8& aDes);
-	TUint16 RemoveHeader(RMBufChain& aPdu);
-#endif // RAWIP_HEADER_APPENDED_TO_PACKETS
-
-public:  // Process Down/Up stack data packets 
-	void Process(TDesC8& aPdu);
-	TInt Send(RMBufChain& aPdu);
-	void SendComplete();
-	// Get the NIF reference.
-	inline MControllerObserver& GetObserver();
-protected:
-	virtual void BcaSend(RMBufChain& aPdu) = 0;
-	virtual void BcaProcess(TDesC8& aPdu) = 0;
-	virtual void BcaSendComplete() = 0;
-	virtual TInt BcaSendBufferLength() = 0;
-	
-protected:
-	enum TSendState
-		{
-		EIdle,
-		ESending,
-		EShuttingDown
-		};
-
-	enum TInitialisationState
-		{
-		EStart,
-		EBcaController,
-		EInitialised
-		};
-
-	inline TInt GetSendState();
-	inline void SendState(TSendState aState);
-	
-private: // Flow Control
-	void ResumeSending();
-	//Buffer control
-	TBool IsSendQueueEmpty();
-	TBool IsSendQueueFull();
-	void AppendToSendQueue(RMBufChain& aPdu);
-	TBool RemoveFromSendQueue(RMBufChain& aPdu);
-	void EmptySendQueue();
-	
-private: // Unowned data.
-    MControllerObserver& iObserver;
-protected:
-	CBttLogger* iTheLogger;
-	
-private:
-	// Flow control flags
-	TFlowControl iTxFlowControl;
-	TBool iTxContextActive;
-	TSendState iSendState;
-
-	/** The internal packet buffer */
-	RMBufPktQ iSendQueue;
-	/** The maximum number of packets that we want in an internal queue */
-	TInt iMaxSendQueueLen;
-	/** Current number of packets in the internal packet buffer */
-	TInt iNumPacketsInSendQueue;
-
-#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
-	CIPTagHeader* iIPTagHeader;
-#endif // RAWIP_HEADER_APPENDED_TO_PACKETS
-	};
-
-void CBcaController::SendState(TSendState aState)
-	{
-	iSendState = aState;
-	}
-
-TInt CBcaController::GetSendState()
-	{
-	return iSendState;
-	}
-
-
-MControllerObserver& CBcaController::GetObserver()
-	{
-	return iObserver;
-	}
-
-#endif // BCACONTROLLER_H
--- a/telephonyprotocols/rawipnif/version1/inc/BcaIoController.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,239 +0,0 @@
-// Copyright (c) 2004-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:
-// Defines the interface to the BCA interface
-// 
-//
-
-/**
- @file 
-*/
-
-#ifndef BCAIOCONTROLLER_H
-#define BCAIOCONTROLLER_H
-
-#include <e32base.h>
-#include <c32comm.h>
-#include <networking/bca.h>
-#include <networking/bcafactory.h>
-
-#include "BcaController.h"
-using namespace BasebandChannelAdaptation;
-
-class CBttLogger;
-class CSender;
-class CReceiver;
-class CBcaControl;
-
-/** 
-
-@internalComponent 
-*/	
-void Panic(TRawIPNifPanic aPanic);
-
-/**
-
-@internalComponent
-*/
-typedef MBcaFactory* (*TNewBcaFactoryL)();
-
-
-/** 
-@internalComponent 
-*/	
-class CBcaIoController : public CBcaController
-	{
-public:
-	CBcaIoController(MControllerObserver& aObserver, CBttLogger* aTheLogger);
-	static CBcaIoController* NewL(MControllerObserver& aObserver, CBttLogger* aTheLogger);
-	void ConstructL();
-	~CBcaIoController();
-
-public:
-	void StartL();
-	void Stop(TInt aError = KErrNone);
-
-public:  // Process Down/Up stack data packets 
-	void BcaProcess(TDesC8& aPdu);
-	void BcaSend(RMBufChain& aPdu);
-	void BcaSendComplete();
-
-public:
-	inline CSender& Sender();
-	inline CReceiver& Receiver();
-	inline TUint Nsapi();
-	void SetBcaStackAndName(TDesC& aBcaStack);
-	inline const TName& BcaStack()const;
-	inline const TName& BcaName()const;
-	inline MBca* Bca();
-	inline void SetBca(MBca* aBca);
-	inline void SetPort(TDesC& aPortName);
-	inline const TName& Port()const;
-	inline void SetIapId(TUint32 aIapId);
-	inline TUint32 IapId();
-	TInt BcaSendBufferLength();
-	
-private:
-	void InitialiseBcaL();
-
-private: // Flow Control
-	void ResumeSending();
-
-private: // Unowned data.
-	/** Pointer to the BCA */
-   	MBca* iMBca;
-
-	/** used to send data*/
-	CSender* iSender;
-	/** used to receive data*/
-	CReceiver* iReceiver;
-	/** used to load, open and close the BCA*/
-	CBcaControl* iLoader;
-	/** IAP ID used to open CommDB*/
-	TUint32 iIapId;
-	/** Bca name*/
-	TName iBcaName;
-	/** Bca Stack*/
-	TName iBcaStack;
-	/** CommPort Name*/
-	TName iCommPort;
-	};
-
-inline CSender& CBcaIoController::Sender()
-/**
- * Returns reference to CSender object
- *
- * @return iSender The CSender reference
- */
-	{
-	return *iSender;
-	}
-	
-inline CReceiver& CBcaIoController::Receiver()
-/**
- * Returns reference to CReceiver object
- *
- * @return iReceiver The CReceiver reference
- */
-	{
-	return *iReceiver;
-	}
-
-/** returns the BCA Stack*/
-inline const TName& CBcaIoController::BcaStack()const
-	{
-	return iBcaStack;
-	}
-	
-/** returns the BCA name*/
-inline const TName& CBcaIoController::BcaName()const
-	{
-	return iBcaName;
-	}
-	
-/** retrurns the BCA pointer.*/	
-inline MBca* CBcaIoController::Bca()
-	{
-	return iMBca;
-	}
-/** sets the BCA pointer.
-
-* @param aBca BCA pointer.
-*/
-inline void CBcaIoController::SetBca(MBca* aBca)
-	{
-	iMBca = aBca;
-	}
-
-/** sets the IAP ID
-
-* @param aIapId IAP ID to be set.
-*/	
-inline void CBcaIoController::SetIapId(TUint32 aIapId)
-	{
-	iIapId = aIapId;
-	}
-
-/** returns the IAP ID*/	
-inline TUint32 CBcaIoController::IapId()
-	{
-	return iIapId;
-	}
-
-/** sets the port name
-
-* @param aPortName port name to be set.
-*/	
-inline void CBcaIoController::SetPort(TDesC& aPortName)
-	{
-	iCommPort = aPortName;
-	}
-
-/** returns the port name*/	
-inline const TName& CBcaIoController::Port()const
-	{
-	return iCommPort;
-	}
-
-/** class used to load, open and shutdown the BCA and also start and shutdown the NIF.
-@internalComponent 
-*/
-class CBcaControl : public CActive
-	{
-public:
-	CBcaControl(CBcaIoController& aObserver, CBttLogger* aTheLogger);
-	~CBcaControl();
-public:
-	void StartLoadL();
-	void ShutdownBca(TInt aError);
-    inline MBca* Bca();
-protected:
-	// Inherited from CActive.
-	virtual void RunL();
-	virtual void DoCancel();	
-private: // Unowned data.
-	CBcaIoController& iObserver;
-	CBttLogger* iTheLogger;
-private:
-		enum TBcaState
-		{
-		/** Bca ready to start */
-		EIdling,
-		/** Bca to be closed*/
-		EClosing,
-		/** Bca IAP is set*/
-		EIAPSet,
-		/** Bca stack is set*/
-		EBcaStackSet
-		};
-	
-private:
-	
-	/** BCA owned by NIF*/	
-	MBca* iMBca;
-	/** used to load library*/
-	TAutoClose<RLibrary> iBcaDll;
-	/** BCA state*/
-	TBcaState iState;
-	/** NIF shut down error*/
-	TInt iError; 
-	};
-	
-/** returns the BCA pointer. */	
-inline MBca* CBcaControl::Bca()
-	{
-	return iMBca;
-	}	
-
-#endif // BCAIOCONTROLLER_H
-
--- a/telephonyprotocols/rawipnif/version1/inc/Constants.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-// Copyright (c) 2002-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:
-//
-
-/**
- @file
-*/
-
-#ifndef CONSTANTS_H
-#define CONSTANTS_H
-
-#include <e32base.h>
-#include <etelqos.h>
-
-const TUint KNifMajorVersionNumber=1;
-const TUint KNifMinorVersionNumber=0;
-const TUint KNifBuildVersionNumber=0;
-
-// For CommDb usage
-const TUint KSlashChar='\\';
-
-// Constants for IPv4 protocol interface
-_LIT(KDescIp, "ip");
-_LIT(KDescIcmp, "icmp");
-_LIT(KIPv4ProtocolIfName, "Bttint4");
-
-// Constants for IPv6 protocol interface
-_LIT(KDescIp6, "ip6");
-_LIT(KIPv6ProtocolIfName, "Bttint6");
-
-_LIT(KNifName, "rawipnif");
-enum TRawIPNifPanic
-    {
-	KNifUnknownInitState,
-	KNifUnknownShutDownState,
-	KNifProtocolInUse,
-	/** Bca in unkonwn State */
-	KBcaUnkownState,
-	/** BCA not exist*/
-	KBcaNotExist 	
-	};
-
-
-const TUint16 KIp4FrameType = 0x21;
-const TUint16 KVanJacCompTCPIPFrameType = 0x2d;
-const TUint16 KVanJacUnCompTCPIPFrameType = 0x2f;
-const TUint16 KIp6FrameType = 0x57;
-
-const TUint KDefaultSpeedMetric = 1;
-const TUint KDefaultMtu = 1500;
-
-const TUint KDataPacketMaxSize = 4096;
-
-// BTT TSY contants
-const TInt KTsyPhone = 0;
-
-// Flow control constants
-const TInt KStopSending		= 0;
-const TInt KContinueSending	= 1;
-
-_LIT(KRawIPNifName, "RawIP");
-
-// constants for diagnostic logging
-_LIT8(KNifSubDir, "RawIp"); 
-_LIT8(KRefFile, "RawIP.txt"); 
-
-// Max size of IP packet 
-const TInt KMaxIPPacket = 1500;
-const TInt KIPTagHeaderLength = 2;
-const TInt KMaxIPPacketAndHeader = KMaxIPPacket + KIPTagHeaderLength;
-
-const TInt KIPTagHeaderByte1 = 0x00;
-const TInt KIPTagHeaderByte2 = 0x21;
-
-#endif	//CONSTANTS_H
--- a/telephonyprotocols/rawipnif/version1/inc/IPTagHeader.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-// Copyright (c) 2004-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:
-// Defines the Class that adds and extracts specific header tags.
-// 
-//
-
-/**
- @file
-*/
-
-#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
-
-#ifndef IPTAGHEADER_H__
-#define IPTAGHEADER_H__
-
-#include "bttlog.h"
-#include "Constants.h"
-#include <nifmbuf.h>
-
-class CBttLogger;
-
-class CIPTagHeader : public CBase
-	{
-public:
-	CIPTagHeader(CBttLogger* aTheLogger);
-	~CIPTagHeader();
-	void SetType(TUint16 aType);
-	void AddHeader(TDes8& aDes);
-	TUint16 RemoveHeader(RMBufChain& aPdu);
-
-private: // Unowned data.
-	CBttLogger* iTheLogger;
-
-	//CLASSNAMEDECL(CIPTagHeader);
-
-	TBuf8<KIPTagHeaderLength> iHeaderByte; // Owned
-	};
-
-#endif // IPTAGHEADER_H__
-
-#endif // RAWIP_HEADER_APPENDED_TO_PACKETS
--- a/telephonyprotocols/rawipnif/version1/inc/IPv4ProtocolIf.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-// Copyright (c) 2002-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:
-// This file defines the CIPv4ProtocolIf class, which handles the transmission
-// of IPv4 data to and from the TCP/IP stack.
-// 
-//
-
-/**
- @file
-*/
-
-#ifndef IPV4PROTOCOLIF_H__
-#define IPV4PROTOCOLIF_H__
-
-#include "ProtocolIfBase.h"
-
-class CBttLogger;
-
-class CIPv4ProtocolIf : public CProtocolIfBase
-{
-public:
-	CIPv4ProtocolIf(CRawIPNifMain& aNifMain, CBttLogger* aTheLogger);
-	~CIPv4ProtocolIf();
-
-public:	//NifIfBase support.
-	virtual void BindL(TAny *aId);
-	virtual TInt Control(TUint aLevel,TUint aName,TDes8& aOption, TAny* aSource);
-	virtual TInt Send(RMBufChain& aPdu, TAny* aSource);
-	virtual void Info(TNifIfInfo& aInfo) const;
-	virtual TInt Notification(TAgentToNifEventType aEvent, void * aInfo);
-	virtual void StartSending(CProtocolBase* aProtocol);
-
-	virtual TBool WantsProtocol(TUint16 aProtocolCode);
-	virtual void Process(RMBufChain& aPdu);
-
-	virtual void UpdateContextConfigL(const RPacketContext::TContextConfigGPRS&
-		aConfig);
-	virtual void UpdateConnectionSpeed(TUint aConnectionSpeed);
-
-	// Define the class that will hold the IPv4 setting required by the Nif.
-	class TIPv4Settings
-		{
-	public:
-		// As this is IPv4, all addresses are 32-bit.
-		TUint32	iLocalAddr;
-		TUint32	iNetMask;
-		TUint32	iBroadcastAddr;
-		TUint32	iDefGateway;
-		TUint32	iPrimaryDns;
-		TUint32	iSecondaryDns;
-		TBool iGetGatewayFromServer;
-		TBool iGetDnsFromServer;
-		};
-
-private:
-	void ReadCommDbGprsSettingsL();
-	void ReadIPv4SettingL(const TDesC& aFieldName, TUint32& aIpAddr);
-
-	TInt WriteIfConfig(TDes8& aIfConfig);
-	TInt WriteIfInfo(TDes8& aIfInfo);
-
-	TInt WriteConnectionInfo(TDes8& aConnectionInfo);
-
-#ifdef WCDMA_STUB
-	TInt DeleteContext(TDes8& aContextParameters);
-#endif
-
-	inline void WriteIfName(TDes& aName) const;
-
-#ifdef __BTT_LOGGING__
-	void LogPacket(const RMBufChain& aPacket);
-#endif // __BTT_LOGGING__
-
-private: //unowned
-	CBttLogger* iTheLogger;
-
-private: //owned
-	TIPv4Settings iSettings;
-	TUint iSpeedMetric;
-};
-
-void CIPv4ProtocolIf::WriteIfName(TDes& aName) const
-/**
- * Used to uniquely identify the current Nif instance
- *
- * @param aName Descriptor that will be initialised.
- */
-	{
-	aName.Format(_L("%S[0x%X]"), &KIPv4ProtocolIfName, this);
-	}
-
-#endif // IPV4PROTOCOLIF_H__
--- a/telephonyprotocols/rawipnif/version1/inc/IPv6ProtocolIf.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-// Copyright (c) 2002-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:
-// This file defines the CIPv6ProtocolIf class, which handles the transmission
-// of IPv6 data to and from the TCP/IP stack.
-// 
-//
-
-/**
- @file
-*/
-
-#ifndef IPV6PROTOCOLIF_H__
-#define IPV6PROTOCOLIF_H__
-
-#include "ProtocolIfBase.h"
-#include <eui_addr.h>
-
-class CBttLogger;
-
-class CIPv6ProtocolIf : public CProtocolIfBase
-{
-public:
-	CIPv6ProtocolIf(CRawIPNifMain& aNifMain, CBttLogger* aTheLogger);
-	~CIPv6ProtocolIf();
-
-public:	//NifIfBase support.
-	virtual void BindL(TAny *aId);
-	virtual TInt Control(TUint aLevel,TUint aName,TDes8& aOption, TAny* aSource);
-	virtual TInt Send(RMBufChain& aPdu, TAny* aSource);
-	virtual void Info(TNifIfInfo& aInfo) const;
-	virtual TInt Notification(TAgentToNifEventType aEvent, void * aInfo);
-	virtual void StartSending(CProtocolBase* aProtocol); // It seems not needed for ipv6
-
-	virtual TBool WantsProtocol(TUint16 aProtocolCode);
-	virtual void Process(RMBufChain& aPdu);
-
-
-	virtual void UpdateContextConfigL(const RPacketContext::TContextConfigGPRS&
-		aConfig);
-	virtual void UpdateConnectionSpeed(TUint aConnectionSpeed);
-
-	// Define the class that will hold the IPv6 setting required by the Nif.
-	class TIPv6Settings
-		{
-	public:
-		TIp6Addr iLocalAddr;
-		TIp6Addr iPrimaryDns;
-		TIp6Addr iSecondaryDns;
-		TBool iGetDnsFromServer;
-		TBool iGetIpFromServer;
-		TE64Addr iLocalIfId;
-		//TE64Addr iRemoteIfId;
-		};
-
-private:
-	void ReadCommDbGprsSettingsL();
-	// This method is only used to get GPRS_IP_ADDR.
-	void ReadIPv4SettingL(const TDesC& aFieldName, TUint32& aIpAddr);	
-	void ReadIPv6SettingL(const TDesC& aFieldName, TIp6Addr& aIpAddr);
-
-	TInt WriteIfConfig(TDes8& aIfConfig);
-	TInt WriteIfInfo(TDes8& aIfInfo);
-
-	TInt WriteConnectionInfo(TDes8& aConnectionInfo);
-#ifdef WCDMA_STUB
-	TInt DeleteContext(TDes8& aContextParameters);
-#endif
-	inline void WriteIfName(TDes& aName) const;
-
-#ifdef __BTT_LOGGING__
-	void LogPacket(const RMBufChain& aPacket);
-#endif // __BTT_LOGGING__
-
-private: //unowned
-	CBttLogger* iTheLogger;
-
-private: //owned
-	TIPv6Settings iSettings;
-	TUint iSpeedMetric;
-};
-
-void CIPv6ProtocolIf::WriteIfName(TDes& aName) const
-/**
- * Used to uniquely identify the current Nif instance
- *
- * @param aName Descriptor that will be initialised.
- */
-	{
-	aName.Format(_L("%S[0x%X]"), &KIPv6ProtocolIfName, this);
-	}
-
-#endif // IPV6PROTOCOLIF_H__
--- a/telephonyprotocols/rawipnif/version1/inc/MControllerObserver.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-// Copyright (c) 2002-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:
-// Interface class for objects which need to observe the BCA controller.
-// 
-//
-
-/**
- @file
-*/
-
-#ifndef MCONTROLLEROBSERVER_H__
-#define MCONTROLLEROBSERVER_H__
-
-#include "MRawIPNifObserverBase.h"
-#include <es_mbuf.h>
-
-class MControllerObserver : public MRawIPNifObserverBase
-	{
-public:
-	virtual void Process(RMBufChain& aPdu, TUint16 aProtocolCode)=0;
-	virtual void ResumeSending()=0;
-	};
-
-#endif // MCONTROLLEROBSERVER_H__
--- a/telephonyprotocols/rawipnif/version1/inc/MRawIPNifObserverBase.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-// Copyright (c) 2002-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:
-// Defines the class MRawIPNifObserverBase. All internal NIF observer mixins
-// derive from this class.
-// 
-//
-
-/**
- @file
-*/
-
-#ifndef MRAWIPNIFOBSERVERBASE_H__
-#define MRAWIPNIFOBSERVERBASE_H__
-
-class MNifIfNotify;
-class CBcaIoController;
-class CProtocolIfBase;
-
-class MRawIPNifObserverBase
-	{
-public:
-	enum TInitialisationState
-		{
-		EStart,
-		EBcaController,
-		EInitialised
-		};
-
-public:
-	virtual void InitialiseL(TInitialisationState aState, TInt aError)=0;
-	virtual void ShutDown(TInitialisationState aState, TInt aError=KErrNone)=0;
-
-public:
-	virtual MNifIfNotify* GetAgent()=0;
-	virtual CProtocolIfBase* GetProtocolIf()=0;
-	};
-
-#endif // MRAWIPNIFOBSERVERBASE_H__
--- a/telephonyprotocols/rawipnif/version1/inc/ProtocolIfBase.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-// Copyright (c) 2002-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:
-// This file defines the base class for the protocol interface classes.
-// 
-//
-
-/**
- @file
-*/
-
-#ifndef PROTOCOLIFBASE_H__
-#define PROTOCOLIFBASE_H__
-
-#include <comms-infras/nifif.h>
-#include <es_mbuf.h>
-
-#include "Constants.h"
-
-class CRawIPNifMain;
-class CBttLogger;
-
-class CProtocolIfBase : public CNifIfBase
-	{
-public:
-	CProtocolIfBase(CRawIPNifMain& aNifMain, CBttLogger* aTheLogger);
-	virtual ~CProtocolIfBase();
-
-public:
-	virtual void BindL(TAny *aId);
-	virtual TInt State();
-	virtual TInt Control(TUint aLevel,TUint aName,TDes8& aOption, TAny* aSource);
-	virtual TInt Send(RMBufChain& aPdu, TAny* aSource);
-	virtual void Info(TNifIfInfo& aInfo) const;
-	virtual TInt Notification(TAgentToNifEventType aEvent, void * aInfo);
-	virtual void StartSending(CProtocolBase* aProtocol);
-
-public:
-	virtual void UpdateContextConfigL(const RPacketContext::TContextConfigGPRS&
-		aConfig);
-	virtual void UpdateConnectionSpeed(TUint aConnectionSpeed);
-
-	virtual TBool WantsProtocol(TUint16 aProtocolCode)=0;
-	virtual void Process(RMBufChain& aPdu) = 0; 
-
-public:
-	inline CRawIPNifMain& GetNifMain();
-
-protected:
-    CProtocolBase* iProtocol;
-	CRawIPNifMain& iNifMain;
-
-private:
-	CBttLogger* iTheLogger;
-	};
-
-CRawIPNifMain& CProtocolIfBase::GetNifMain()
-/**
- * Returns to reference to RawIPNifMain
- *
- * @return reference to CRawIPNifMain class
- */
-	{
-	return iNifMain;
-	}
-
-#endif
--- a/telephonyprotocols/rawipnif/version1/inc/RawIPNifMain.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-// Copyright (c) 2002-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:
-// Defines the CRawIPNifMain class, which provides a central point for the NIF
-// to communicate with NifMan and the BCA controller. This class creates an
-// interface to the IPv4 protocol when it is required.
-// 
-//
-
-/**
- @file
-*/
-
-#ifndef RAWIPNIFMAIN_H
-#define RAWIPNIFMAIN_H
-
-#include <comms-infras/nifif.h>
-#include <networking/packetlogger.h>
-#include <in_sock.h>
-#include "ProtocolIfBase.h"
-#include "BcaIoController.h"
-#include "MControllerObserver.h"
-#include "bttlog.h"
-
-class CBttLogger;
-class CPacketLogger;
-
-class CRawIPNifMain : public CNifIfLink, public MControllerObserver
-	{
-public:
- 	CRawIPNifMain(CNifIfFactory& aFactory, MNifIfNotify* aNotify, CBttLogger* aTheLogger);
-	~CRawIPNifMain();
-	void ConstructL(const TDesC& aName);
-	// Used to be :Pure virtuals inherited from MContextSmObserver
-	CBcaIoController* GetBcaController();
-	void UpdateContextState(RPacketContext::TContextStatus aState,
-		TInt aError);
-	void UpdateContextConfig(
-		RPacketContext::TContextConfigGPRS aConfig);
-
-public: // Pure virtuals inherited from CNifIfBase
-	virtual void Info(TNifIfInfo&) const;
-	virtual TInt Send(RMBufChain& aPdu, TAny* aSource=0);
-	virtual TInt Notification(TAgentToNifEventType aEvent, void * aInfo); 
-
-public: // Virtuals inherited from CNifIfBase
-	virtual void BindL(TAny *aId);
-	virtual TInt Control(TUint aLevel, TUint aName, TDes8& aOption, 
-		TAny* aSource);
-	virtual TInt State();
-
-public: // Pure virtuals inherited from CNifIfLink 
-	virtual TInt Start();
-	virtual void Stop(TInt aReason,MNifIfNotify::TAction aAction);
-    virtual CNifIfBase* GetBinderL(const TDesC& aName);
-	virtual void Restart(CNifIfBase* aIf);
-
-public: // Virtuals inherited from CNifIfLink
-	virtual void AuthenticateComplete(TInt aResult);
- 
-public: // Pure virtuals inherited from MRawIPNifObserverBase
-	virtual void InitialiseL(TInitialisationState aState, TInt aError);
-	virtual void ShutDown(TInitialisationState aState, TInt aError);
-	virtual MNifIfNotify* GetAgent();
-	
-	virtual CProtocolIfBase* GetProtocolIf();
-
-public: // Pure virtuals inherited from MControllerObserver
-	// Data going upstack
-	virtual void Process(RMBufChain& aPdu, TUint16 aProtocolCode);
-	// Flow Control unblocked
-	virtual void ResumeSending();
-
-public:  // Inherited from MNifIfNotify
-	// Notify that link is Up/Down
-	virtual void LinkLayerUp();
-	virtual void LinkLayerDown(TInt aError);
-
-public:	// Send data to CBcaIoController
-	TInt SendPacket(RMBufChain& aPdu, TAny* /*aSource=0*/, 
-		TUint16 /*aType=KIp4FrameType*/);	
-
-public:	// Context status retrieval.
-	inline RPacketContext::TContextStatus GetContextStatus();
-	
-private:// Unowned
-	/** networking packet logger for debugging packets */
-	__PACKETLOG_DECLARATION_MEMBER;
-	CBttLogger* iTheLogger;
-
-	// Upstack bound protocol reference
-	CProtocolBase* iProtocol;
-
-	// The protocol to use (IPv4).Note: This is not owned by this class.
-	CProtocolIfBase* iProtocolIf;
-
-private:// Owned 
-	TInt iInitError; 
-	TIfStatus iState; // One of EIfPending, EIfUp, EIfBusy or EIfDown.
-
-	RPacketContext::TContextStatus iContextStatus;
-	RPacketContext::TContextConfigGPRS iContextConfig;
-
-	CBcaIoController* iBcaController;
-	};
-
-inline RPacketContext::TContextStatus CRawIPNifMain::GetContextStatus()
-/**
- * Returns Context status
- *
- * @return iContextStatus The context status
- */
-	{
-	return iContextStatus;
-	}
-
-#endif // RAWIPNIFMAIN_H
--- a/telephonyprotocols/rawipnif/version1/inc/RawIPNifMainFactory.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-// Copyright (c) 2002-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:
-// Defines the factory class which is used to instantiate the RAW IP NIF.
-// 
-//
-
-/**
- @file
-*/
-
-#ifndef RAWIPNIFMAINFACTORY_H__
-#define RAWIPNIFMAINFACTORY_H__
-
-#include <comms-infras/nifif.h>
-#include "bttlog.h"
-
-class CRawIPNifMainFactory : public CNifIfFactory
-	{
-public:
-	virtual CNifIfBase* NewInterfaceL(const TDesC& aName);
-	virtual CNifIfBase* NewInterfaceL(const TDesC& aName,MNifIfNotify* aNotify);
-
-protected:
-	virtual void InstallL();
-	virtual TInt Info(TNifIfInfo& aInfo, TInt aIndex) const;
-
-private:
-	CBttLogger* iTheLogger;
-	};
-
-#endif
--- a/telephonyprotocols/rawipnif/version1/inc/Receiver.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-// Copyright (c) 2002-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:
-// Defines the active object that controls the BCA Read() requests. 
-// 
-//
-
-/**
- @file
-*/
-
-#ifndef RECEIVER_H
-#define RECEIVER_H
-
-#include "BcaIoController.h"
-#include "bttlog.h"
-#include "Constants.h"
-
-class CBttLogger;
-
-class CReceiver : public CActive
-	{
-public:
-	CReceiver(CBcaIoController& aObserver, CBttLogger* aTheLogger);
-	~CReceiver();
-
-public: // Inherited from CActive.
-	virtual void RunL();
-	virtual void DoCancel();
-
-public:
-	void StartListening();
-
-private: // Unowned data.
-	CBcaIoController& iObserver;
-	CBttLogger* iTheLogger;
-	
-private:
-	TBuf8<KMaxIPPacketAndHeader> iData;
-	};
-
-#endif // RECEIVER_H
--- a/telephonyprotocols/rawipnif/version1/inc/Sender.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-// Copyright (c) 2002-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:
-// Defines the active object that controls the BCA Write() requests. 
-// 
-//
-
-/**
- @file
-*/
-
-#ifndef SENDER_H
-#define SENDER_H
-
-#include "BcaIoController.h"
-#include "bttlog.h"
-#include "Constants.h"
-
-class CBttLogger;
-
-class CSender : public CActive
-	{
-public:
-	CSender(CBcaIoController& aObserver, CBttLogger* aTheLogger);
-	~CSender();
-
-public: // Inherited from CActive.
-	virtual void RunL();
-	virtual void DoCancel();
-
-public:
-	void Send(RMBufChain& aPdu);
-	void SendBuffer(const TDesC8& aBuffer);
-	inline TInt SendBufferLength();
-
-private: // Unowned data.
-	CBcaIoController& iObserver;
-	CBttLogger* iTheLogger;	
-	
-private:
-	//CLASSNAMEDECL(CSender);
-
-	TBuf8<KMaxIPPacketAndHeader> iSendBuffer;
-	};
-
-TInt CSender::SendBufferLength()
-	{
-	return iSendBuffer.MaxLength();
-	}
-
-#endif // SENDER_H
--- a/telephonyprotocols/rawipnif/version1/inc/bttlog.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,135 +0,0 @@
-// Copyright (c) 2002-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:
-// Defines logger for RawIP NIF.
-// 
-//
-
-/**
- @file
-*/
-
-#ifndef BTTLOG_H__
-#define BTTLOG_H__
-
-#include <comms-infras/commsdebugutility.h>
-
-#if defined(__FLOG_ACTIVE) || defined(__DEBUGRAWIPSERIALPORT__)
-// Uncomment any of these macros if you want logging.
-// -> BTT_LOG_1 : For general logging
-// -> BTT_LOG_2 : For error and warning logging
-// -> BTT_LOG_3 : For IP packet information
-#define	__BTT_LOG_1__ 1
-//#define __BTT_LOG_2__ 1
-//#define __BTT_LOG_3__ 1
-#endif
-
-#ifdef __BTT_LOG_1__
-#define _LOG_L1C1(AAA)						iTheLogger->Write(AAA)
-#define _LOG_L1C2(AAA, BBB)					iTheLogger->WriteFormat(AAA, BBB)
-#define _LOG_L1C3(AAA, BBB, CCC)			iTheLogger->WriteFormat(AAA, BBB, CCC)
-#define _LOG_L1C4(AAA, BBB, CCC, DDD)		iTheLogger->WriteFormat(AAA, BBB, CCC, DDD)
-#define _LOG_L1C5(AAA, BBB, CCC, DDD, EEE)	iTheLogger->WriteFormat(AAA, BBB, CCC, DDD, EEE)
-#else
-#define _LOG_L1C1(AAA)
-#define _LOG_L1C2(AAA, BBB)
-#define _LOG_L1C3(AAA, BBB, CCC)
-#define _LOG_L1C4(AAA, BBB, CCC, DDD)
-#define _LOG_L1C5(AAA, BBB, CCC, DDD, EEE)  
-#endif // __BTT_LOG_1__
-
-#ifdef __BTT_LOG_2__
-#define _LOG_L2C1(AAA)						iTheLogger->Write(AAA)
-#define _LOG_L2C2(AAA, BBB)					iTheLogger->WriteFormat(AAA, BBB)
-#define _LOG_L2C3(AAA, BBB, CCC)			iTheLogger->WriteFormat(AAA, BBB, CCC)
-#define _LOG_L2C4(AAA, BBB, CCC, DDD)		iTheLogger->WriteFormat(AAA, BBB, CCC, DDD)
-#define _LOG_L2C5(AAA, BBB, CCC, DDD, EEE)	iTheLogger->WriteFormat(AAA, BBB, CCC, DDD, EEE)
-#else
-#define _LOG_L2C1(AAA)
-#define _LOG_L2C2(AAA, BBB)
-#define _LOG_L2C3(AAA, BBB, CCC)
-#define _LOG_L2C4(AAA, BBB, CCC, DDD)
-#define _LOG_L2C5(AAA, BBB, CCC, DDD, EEE)  
-#endif // __BTT_LOG_2__
-
-#ifdef __BTT_LOG_3__
-#define _LOG_L3C1(AAA)						iTheLogger->Write(AAA)
-#define _LOG_L3C2(AAA, BBB)					iTheLogger->WriteFormat(AAA, BBB)
-#define _LOG_L3C3(AAA, BBB, CCC)			iTheLogger->WriteFormat(AAA, BBB, CCC)
-#define _LOG_L3C4(AAA, BBB, CCC, DDD)		iTheLogger->WriteFormat(AAA, BBB, CCC, DDD)
-#define _LOG_L3C5(AAA, BBB, CCC, DDD, EEE)	iTheLogger->WriteFormat(AAA, BBB, CCC, DDD, EEE)
-#else
-#define _LOG_L3C1(AAA)
-#define _LOG_L3C2(AAA, BBB)
-#define _LOG_L3C3(AAA, BBB, CCC)
-#define _LOG_L3C4(AAA, BBB, CCC, DDD)
-#define _LOG_L3C5(AAA, BBB, CCC, DDD, EEE)  
-#endif // __BTT_LOG_3__
-
-#ifdef __BTT_LOG_1__
-#ifndef __BTT_LOGGING__
-#define __BTT_LOGGING__
-#endif
-#endif
-
-#ifdef __BTT_LOG_2__
-#ifndef __BTT_LOGGING__
-#define __BTT_LOGGING__
-#endif
-#endif
-
-#ifdef __BTT_LOG_3__
-#ifndef __BTT_LOGGING__
-#define __BTT_LOGGING__
-#endif
-#endif
-
-#ifdef __BTT_LOGGING__
-#define _BTT_LEAVEIFERROR(a)	iTheLogger->VerboseLeaveL(__FILE__, __LINE__, a)
-#define _BTT_PANIC(CAT,	CODE)	iTheLogger->VerbosePanic(__FILE__, __LINE__, CODE, (TText8*)#CODE, CAT)
-#else
-#define _BTT_LEAVEIFERROR(a)	User::LeaveIfError(a)
-#define _BTT_PANIC(CAT, CODE)	User::Panic(CAT, CODE)
-#endif // __BTT_LOGGING__
-
-/**
- * static class containing methods for logging
- * text to a logfile.
- */
-class CBttLogger : public CBase
-	{
-public:
-	static CBttLogger* NewL(const TDesC8& aTag, const TDesC8& aFileName, const TUint32 aInstanceId);
-	~CBttLogger();
-
-public:
-	void Write(const TDesC8& aText);
-	void WriteFormat(TRefByValue<const TDesC8> aFmt, ...);
-	void VerboseLeaveL(char* aFile, TInt aLine, TInt aReason);
-	void VerbosePanic(char* aFile, 
-		TInt aLine, 
-		TInt aPanicCode, 
-		TText8* aPanicName,
-		const TDesC& aPanicCategory);
-
-protected:
-	CBttLogger();
-	void ConstructL(const TDesC8& aSubDir, const TDesC8& aFileName, const TUint32 aInstanceId);
-
-private: // owned
-
-	TUint32 iInstanceId;
-	__FLOG_DECLARATION_MEMBER;
-	};
-
-#endif // BTTLOG_H__
--- a/telephonyprotocols/rawipnif/version1/src/BcaController.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,437 +0,0 @@
-// Copyright (c) 2004-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:
-// Implements the interface to Bca & flow control.
-// 
-//
-
-/**
- @file
-*/
-
-#include <e32uid.h>
-#include <nifmbuf.h>
-#include <es_ini.h>
-#include "BcaController.h"
-
-_LIT(KRawIpIniFile, "rawip.ini");
-_LIT(KLinkLit, "link");
-_LIT(KHighmarkLit, "highmark");
-//In order not to flow off SPUD everytime we set the default to 1
-const TUint KDefaultBufferSize=1;
-
-CBcaController::CBcaController(MControllerObserver& aObserver,
-	CBttLogger* aTheLogger)
-/**
- * Constructor. 
- */
-	: iObserver(aObserver),  
-	  iTheLogger(aTheLogger),
-	  iTxFlowControl(EFlowControlOff), 
-	  iTxContextActive(ETrue), 
-	  iSendState(EIdle),
-	  iMaxSendQueueLen(0),
-	  iNumPacketsInSendQueue(0)
-	{
-	iSendQueue.Init();
-	}
-
-
-CBcaController::~CBcaController()
-/**
- * Destructor.
- */
-	{
-	iSendQueue.Free();
-	iNumPacketsInSendQueue = 0;
-
-#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
-	delete iIPTagHeader;
-#endif // RAWIP_HEADER_APPENDED_TO_PACKETS
-	}
-
-void CBcaController::BaseConstructL()
-	{
-	_LOG_L1C1(_L8("CBcaController::BaseConstructL"));
-
-#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
-	iIPTagHeader = new (ELeave) CIPTagHeader(iTheLogger);
-#endif // RAWIP_HEADER_APPENDED_TO_PACKETS
-	CESockIniData* iniData = NULL;
-	TRAPD(res, iniData = CESockIniData::NewL(KRawIpIniFile));
-	CleanupStack::PushL(iniData);
-	
-	if(res!=KErrNone)
-		{
-		_LOG_L1C2(_L8("RawIp ini file %S not found. Default values will be used."), &KRawIpIniFile);
-		CleanupStack::PopAndDestroy();
-		return;
-		}
-	
-	//here process the file
-	if(!iniData->FindVar(KLinkLit(), KHighmarkLit(), iMaxSendQueueLen))
-		{
-		iMaxSendQueueLen = KDefaultBufferSize;
-		}
-	
-	CleanupStack::PopAndDestroy();
-	}
-
-void CBcaController::UpdateInternalFlowFlag(TFlowControl aValue)
-/**
- *  Updates Internal Flow flag and resumes the data flow if
- *  necessary.
- *
- * @param aValue the new state of iInternalFlow
- */
-	{
-	_LOG_L1C3(_L8("CBcaController::UpdateInternalFlowFlag[NewValue=%d, iSendState=%d]"),
-		aValue, iSendState);
-
-	if(iTxFlowControl == aValue)
-		{
-		// C32 Sent the same indication signal twice. Nif will ignore it.
-		_LOG_L2C1(_L8("WARNING CBcaController: Received same indication twice"));
-		return;
-		}
-	
-	// Update the flag value.
-	iTxFlowControl = aValue;
-
-	if(iTxFlowControl == EFlowControlOff)
-		{
-		// If the indication received turned flow control off...
-		if (IsTxPossible() && (iSendState == EIdle))
-			{
-			// ... if the NIF is in the EWaiting state
-			// then the data flow can be resumed. 
-			ResumeSending();
-			}
-		}		
-	else
-		{
-		// if the Flow Control is on we can remove all queued write requests
-		EmptySendQueue();
-		}
-	}
-
-void CBcaController::UpdateContextStateFlag(TBool aValue)
-/**
- *  Updates Context State flag and resumes the data flow if
- *  necessary.
- *
- * @param aValue the new state of iTxContextState
- */
-	{
-	_LOG_L1C3(_L8("CBcaController::UpdateContextStateFlag[NewValue=%d, OldValue=%d]"),
-		aValue, iTxContextActive);
-	
-	if(iTxContextActive == aValue)
-		{
-		return;
-		}
-
-	// Update the flag value.
-	iTxContextActive = aValue;
-
-	if(iTxContextActive)
-		{
-		// If the PDP context is active and...
-		if (IsTxPossible() && (iSendState == EIdle))
-			{
-			// ... if the NIF is in the EWaiting state
-			// then the data flow can be resumed. 
-			ResumeSending();
-			}
-		}
-	else
-		{
-		// if the PDP context is suspended we can remove all queued write requests
-		EmptySendQueue();
-		}
-	}
-
-TInt CBcaController::Send(RMBufChain& aPdu)
-/**
- *  This method is called by CRawIPNifMain in order to send a packet down
- * to the BCA. 
- *
- *	@param aPdu a data packet
- */
-	{
-	_LOG_L1C1(_L8(">>CBcaController::Send"));
-
-	// Check if NIF is shutting down
-	if (iSendState == EShuttingDown)
-		{
-		_LOG_L2C1(_L8("    ERROR: Nif is shutting down"));
-		
-		aPdu.Free();
-
-		return KErrDisconnected;
-		}
-	
-	// check that this packet isnt too big - If it is, we dont want to send it or
-	// add it to our queue
-	if ((aPdu.Length() - aPdu.First()->Length()) > BcaSendBufferLength())
-		{
-		_LOG_L2C1(_L8("Packet is too large - discarding"));
-		_LOG_L1C1(_L8("<<CSender::Send -> Error"));
-
-		aPdu.Free();
-		return KErrArgument;
-		}
-	
-	if (iSendState == ESending)
-		// If this happens, it means that TCP/IP has sent us an IP packet
-		// while we're still sending the previous one. 
-		{
-		// check that the queue isnt full NB. this check should not be needed as when the 
-		// queue becomes full the IP layer shouldnt send any more packets until it is told to
-		if (!IsSendQueueFull())
-			{
-			_LOG_L1C1(_L8("    Sender busy, appending packet to queue"));
-			//We know that flow control is off and context isnt suspended so can add to queue
-			AppendToSendQueue(aPdu);
-			
-			return IsSendQueueFull() ? KStopSending : KContinueSending;
-			}
-			
-		_LOG_L1C1(_L8("    Queue is full, upper layer is still sending packets, potential memory problems."));
-		AppendToSendQueue(aPdu);
-		return KStopSending;
-		}
-
-	// If we have got here then a write isnt currently happening
-	// We dont need to check flow control is off and context isnt suspended as the BCA always
-	// has room for one packet, so send the packet
-
-	if(!IsSendQueueEmpty())
-		{
-		//make sure that we don't change the order of packets!
-		//first send what has already been lined up
-		RMBufChain tmpPdu;
-		_LOG_L1C1(_L8("    Packet removed from queue to send"));
-		RemoveFromSendQueue(tmpPdu);
-		AppendToSendQueue(aPdu);
-		
-		// Update module state
-		_LOG_L2C1(_L8("     set State to ESending"));
-		iSendState = ESending;
-		
-		BcaSend(tmpPdu);
-		}
-	else
-		{
-		// Update module state
-		_LOG_L2C1(_L8("     set State to ESending"));
-		iSendState = ESending;
-		 
-		BcaSend(aPdu);
-		}
-		
-	_LOG_L2C1(_L8("<<CBcaController::Send - return StopSending/ContinueSending"));
-	return IsSendQueueFull() ? KStopSending : KContinueSending;
-	}
-
-void CBcaController::SendComplete()	
-/**
- *  This method is called after a packet was sent to the board. 
- *  If allowed by flow contol flags the NIF can signal the TCP/IP
- *  protocol indicating that is available to send more packets.
- */
-	{
-	_LOG_L1C1(_L8("CBcaController::SendComplete"));
-	_LOG_L2C1(_L8("     set State to EIdle"));
-	
-	iSendState = EIdle;
-
-	if (IsTxPossible())
-		ResumeSending();
-	}
-
-TBool CBcaController::IsTxPossible()
-/**
- *  This method returns ETrue if both TX flags are set to ETrue
- *
- * @return The Flow control state
- */
-	{
-	_LOG_L1C3(_L8("CBcaController::IsTxPossible (contextActive %d, flowcontrol %d)"), 
-		iTxContextActive, iTxFlowControl);
-
-	if(iTxContextActive && (iTxFlowControl == EFlowControlOff))
-		return ETrue;
-	else
-		return EFalse;
-	}
-
-void CBcaController::Process(TDesC8& aPdu)
-/**
- *  This method will pass on the received data to CBttNifMain. 
- *
- * @param aPdu a data packet
- */
-	{
-	_LOG_L1C1(_L8(">>CBcaController::Process"));
-
-	TInt ret;
-
-	// Create a packet object.
-	RMBufPacket packet;
-	TRAP(ret, packet.CreateL(aPdu));
-	if (ret != KErrNone)
-		{
-		// Couldn't create package. Packet will be ignored...
-		_LOG_L1C2(_L8("<<CBcaController::Process couldn't create MBuf [ret=%d]"), ret);
-		return;
-		}
-	else
-		// Package created...
-		{
-#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
-		TUint16 protocolCode = iIPTagHeader->RemoveHeader(packet);
-#else
-		TUint16 protocolCode = 0;
-#endif // RAWIP_HEADER_APPENDED_TO_PACKETS
-
-		packet.Pack();
-		// Process the packet
-		GetObserver().Process(packet, protocolCode);
-		}
-
-	_LOG_L1C1(_L8("<<CBcaController::Process"));
-	}
-
-void CBcaController::ResumeSending()
-/**
- *  Used to indicate to the TCP/IP protocol layer that the NIF is ready to 
- *	process more packets.
- */
-	{
-	_LOG_L1C1(_L8("CBcaIoController::ResumeSending"));
-
-	// If there are still some packets in the queue to be sent, then carry
-	// on sending them.
-	// NB. we only want to send more packets from the queue if we are currently EIdle
-	if (iSendState == EIdle) 
-		{
-		if(!IsSendQueueEmpty())
-			{
-			RMBufChain tmpPdu;
-			_LOG_L1C1(_L8("    Packet removed from queue to send"));
-			RemoveFromSendQueue(tmpPdu);
-			
-			// Update module state
-			_LOG_L2C1(_L8("     set State to ESending"));
-			iSendState = ESending;
-			
-			BcaSend(tmpPdu);
-			}
-		if(IsSendQueueEmpty())
-			{
-			iObserver.ResumeSending();
-			}
-		}
-	// if iSendState = ESending - do nothing
-	}
-	
-#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
-void CBcaController::SetType(TUint16 aType)
-{
-/**
- *  Used to specify the type of the IP header.
- */
-	_LOG_L1C1(_L8("CBcaController::SetType"));
-	
-	iIPTagHeader->SetType(aType);	
-}
-
-void CBcaController::AddHeader(TDes8& aDes)
-/**
- *  Used to add the IP header to the packet before sending to the BCA.
- */
-	{
-	_LOG_L1C1(_L8("CBcaController::AddHeader"));
-
-	iIPTagHeader->AddHeader(aDes);
-	}
-
-TUint16 CBcaController::RemoveHeader(RMBufChain& aPdu)
-/**
- *  Used to remove the IP header from the received the packet before sending to the 
- *  TCP/IP layer.  
- * @return The IP header that has been removed from the packet
- */
-	{
-	_LOG_L1C1(_L8("CBcaController::RemoveHeader"));
-
-	return (iIPTagHeader->RemoveHeader(aPdu));
-	}	
-#endif // RAWIP_HEADER_APPENDED_TO_PACKETS
-
-TBool CBcaController::IsSendQueueEmpty()
-/**
- *  Indicator of whether the BufferQueue is empty
- * @return TBool.  ETrue if bufferQueue is emtpy, EFalse if queue is not empty
- */
-	{
-	return iSendQueue.IsEmpty();
-	}
-	
-TBool CBcaController::IsSendQueueFull()
-/**
- *  Indicator of whether the BufferQueue is full
- * @return TBool.  ETrue if bufferQueue is full, EFalse if queue is not full
- */
-	{
-	return iNumPacketsInSendQueue >= iMaxSendQueueLen;
-	}	
-
-void CBcaController::AppendToSendQueue(RMBufChain& aPdu)
-/**
- * Appends the packet aPdu to the queue. 
- * Increments the packet count. Doesn't do error checking.
- * @param aChain buffer chain to be added
- */
-	{
-	iSendQueue.Append(aPdu);
-	iNumPacketsInSendQueue++;
-	}
-	
-TBool CBcaController::RemoveFromSendQueue(RMBufChain& aPdu)
-/**
- * Removes the packet aPdu from the queue. 
- * Decrements the packet count.
- * @param aChain buffer chain to be added
- * @return False if chain is empty
- */
-	{
-	TBool ret = iSendQueue.Remove(aPdu);
-	if(ret)
-		{
-		iNumPacketsInSendQueue--;
-		}
-	return ret;
-	}
-	
-void CBcaController::EmptySendQueue()
-/**
- * Removes all the packets from the send queue. Initializes the
- * send queue and sets the packet count to 0.
- */
-	{
-	iSendQueue.Free();
-	iSendQueue.Init();
-	iNumPacketsInSendQueue = 0;
-	}
--- a/telephonyprotocols/rawipnif/version1/src/BcaIoController.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,474 +0,0 @@
-// Copyright (c) 2004-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:
-// Implements the interface to BCA.
-// 
-//
-
-/**
- @file BcaIoController.cpp
-*/
-
-#include <e32uid.h>
-#include <nifmbuf.h>
-
-#include "Constants.h"
-#include "BcaIoController.h"
-#include "Sender.h"
-#include "Receiver.h"
-
-CBcaIoController::CBcaIoController(MControllerObserver& aObserver,
-	CBttLogger* aTheLogger)
-/**
- * Constructor. 
- *
- * @param aObserver Reference to the observer of this state machine
- * @param aTheLogger The logging object
- */
-	: 
-	  CBcaController(aObserver, aTheLogger),
-	  iMBca(NULL),
-	  iSender(NULL),
-	  iReceiver(NULL),
-	  iLoader(NULL)
-	{
-	}
-
-CBcaIoController* CBcaIoController::NewL(MControllerObserver& aObserver, CBttLogger* aTheLogger)
-/**
- * Two-phase constructor. Creates a new CBcaIoController object, performs 
- * second-phase construction, then returns it.
- *
- * @param aObserver The observer, to which events will be reported
- * @param aTheLogger The logging object
- * @return A newly constructed CBcaIoController object
- */
-	{
-	CBcaIoController* self = new (ELeave) CBcaIoController(aObserver, aTheLogger);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-void CBcaIoController::ConstructL()
-/**
- * Second-phase constructor. Creates all the state objects it owns.
- */
-	{
-	_LOG_L1C1(_L8("CBcaIoController::ConstructL"));
-	BaseConstructL();
-	iSender = new (ELeave) CSender(*this, iTheLogger);
-	iReceiver = new (ELeave) CReceiver(*this, iTheLogger);
-	iLoader = new (ELeave) CBcaControl(*this, iTheLogger);
-	}
-
-
-CBcaIoController::~CBcaIoController()
-/**
- * Destructor.
- */
-	{
-	delete iReceiver;
-	delete iSender;
-	delete iLoader;
-
-	}
-
-/** sets the BCA Stack name
-
-* @param aBcaStack Text composed of bca stack and next bca names
-*/	
-void CBcaIoController::SetBcaStackAndName(TDesC& aBcaStack)
-	{
-	const TChar stackDelimiter(',');
-	
-	TInt length = aBcaStack.Length();
-	TInt delimiterLoc = aBcaStack.Locate(stackDelimiter);
-	
-	if(delimiterLoc > 0)
-		{
-		iBcaName.Copy(aBcaStack.Left(delimiterLoc));
-		
-		if(delimiterLoc < length)
-			{
-			iBcaStack.Copy(aBcaStack.Right(length-delimiterLoc-1));
-			}
-		}
-	else
-		{
-		iBcaName.Copy(aBcaStack);
-		}
-	}
-	
-
-void CBcaIoController::StartL()
-/**
- *  Used to kick off the initialisation for this module
- */
-	{
-	_LOG_L1C1(_L8("CBcaIoController::StartL is called."));
-
-	InitialiseBcaL();
-	}
-
-void CBcaIoController::Stop(TInt aError)
-/**
- *  Used to shutdown this module. This will cancel all the outstanding 
- *  requests on the active objects owned by this module and shutdown.
- * @param aError the passed in error code as to why Stop has been called
- */
-	{
-	_LOG_L1C1(_L8("CBcaIoController::Stop is called."));
-
-	//Stop all the active objects
-	iReceiver->Cancel();
-
-	if(GetSendState() == ESending)
-		{
-		iSender->Cancel();
-		}
-
-	// Update module state
-	SendState(EShuttingDown);
-	
-	//It does nothing here.
-	iLoader->Cancel();
-	MBca* bca = iLoader->Bca();
-	if(bca)
-		{
-		if(aError == KErrConnectionTerminated )
-			{
-			_LOG_L1C1(_L8("This is an emergency shutdown, it kills the NIF immediately."));
-			// It is a emergency shutdown, it kills the NIF immediately.
-			bca->Close();
-			GetObserver().ShutDown(MControllerObserver::EBcaController, aError);
-			}
-	    
-		else
-			{
-			_LOG_L1C1(_L8("This is a graceful termination which takes a while."));
-			//It is a graceful termination which takes a while.
-			iLoader->ShutdownBca(aError); 	
-			}	
-		}
-	else //nothing to shutdown, just notify linklayer down.
-		{
-		_LOG_L1C1(_L8("Bca is not initialized, bring the linklayer down"));
-		GetObserver().ShutDown(MControllerObserver::EBcaController, aError);
-		}
-
-  	}
-
-void CBcaIoController::InitialiseBcaL()
-/**
- *  Load & Initialise Bca.
- */
-	{
-	_LOG_L1C1(_L8("<<CBcaIoController::InitialiseBcaL"));
-    iLoader->StartLoadL();
-	}
-
-void CBcaIoController::BcaProcess(TDesC8& aPdu)
-/**
- *  This method will pass on the received data to CRawIPNifMain. 
- *
- * @param aPdu a data packet
- */
-	{
-	_LOG_L1C1(_L8(">>CBcaIoController::Process"));
-
-	Process(aPdu);
-
-	_LOG_L1C1(_L8("<<CBcaIoController::Process"));
-	}
-
-void CBcaIoController::BcaSend(RMBufChain& aPdu)
-/**
- *  This method is called by CRawIPNifMain in order to send a packet down
- * to the BCA. The CSender active object will be activated by calling the send
- * method.
- *
- *	@param aPdu a data packet
- */
-	{
-	_LOG_L1C1(_L8("CBcaIoController::BcaSend"));
-
-	iSender->Send(aPdu);
-	}
-
-TInt CBcaIoController::BcaSendBufferLength()
-	{
-	return iSender->SendBufferLength();
-	}
-
-void CBcaIoController::BcaSendComplete()	
-/**
- *  This method is called after a packet was sent to the board. 
- *  If allowed by flow contol flags the NIF can signal the TCP/IP
- *  protocol indicating that is available to send more packets.
- */
-	{
-	_LOG_L1C1(_L8("CBcaController::SendComplete"));
-
-	SendComplete();
-	}
-
-	
-CBcaControl::CBcaControl(CBcaIoController& aObserver, CBttLogger* aTheLogger)
-/**
- * Constructor. Performs standard active object initialisation.
- *
- * @param aObserver Reference to the observer of this state machine
- * @param aTheLogger The logging object
- */
-	: CActive(EPriorityNormal), 
-	  iObserver(aObserver), 
-	  iTheLogger(aTheLogger),
-	  iMBca(NULL),
-	  iState(EIdling),
-	  iError(KErrNone)
-	  
-	{
-	CActiveScheduler::Add(this);
-	}
-	
-CBcaControl::~CBcaControl()
-/**
- * Destructor.
- */
-	{
-	Cancel();
-	if(iMBca)
-		{
-		iMBca->Release();	
-		}
-		
-	// Library will be Closed when iBcaDll is destroyed.
-	}
-
-void CBcaControl::RunL()
-/**
- *  Called after request is completed. 
- *  
- */
-	{
-	_LOG_L1C1(_L8("CBcaControl::RunL() called"));
-	switch (iState)
-		{
-		//in this state, Ioctl is called to set IAP ID, check the result of
-		// Ioctl, then either set the BCA stack with another Ioctl call, 
-		// open the BCA (if there's no BCA stack to set), or stop the NIF.
-		case EIdling:
-			{
-			if(iStatus == KErrNone || iStatus == KErrNotSupported)
-				{
-				if(iStatus == KErrNotSupported)
-					{
-					_LOG_L1C1(_L8("This BCA does not support IAPID set"));
-					}
-				else
-					{
-					_LOG_L2C1(_L8("This BCA supports IAPID set"));
-					}
-				
-				TPtrC bcaStack = iObserver.BcaStack();
-				if(bcaStack.Length())
-					{
-					TBuf8<KMaxName> remainingBcaStack8;
-					remainingBcaStack8.Copy(bcaStack);
-					iMBca->Ioctl(iStatus, KBcaOptLevelGeneric,KBCASetBcaStack,remainingBcaStack8);
-					}
-				else
-					{
-					TRequestStatus* statusPtr=&iStatus;
-					User::RequestComplete(statusPtr,KErrNone);
-					}
-				iState = EIAPSet;
-				SetActive();	
-				}
-			else
-				{
-				_LOG_L1C2(_L8("ERROR in BCA IAPID set = %d"), iStatus.Int());
-				iObserver.Stop(iStatus.Int());
-				}
-			
-			break;
-			}
-			
-		//in this case, we receive the result of Ioctl call to set Bca Stack.
-		// Check the result of Ioctl, then Open the Bca or stop the NIF
-		case EIAPSet:
-			{
-			if(iStatus == KErrNotSupported || iStatus == KErrNone)
-				{
-				if(iStatus == KErrNotSupported)
-					{
-					_LOG_L1C1(_L8("This BCA does not support BCA stacking"));
-					}
-				else
-					{
-					_LOG_L2C1(_L8("This BCA supports BCA stacking"));
-					}
-				iMBca->Open(iStatus, iObserver.Port());
-				iState = EBcaStackSet;
-				SetActive();	
-				}
-			else
-				{
-				_LOG_L2C2(_L8("ERROR in BCA stack set = %d"), iStatus.Int());
-				iObserver.Stop(iStatus.Int());
-				}
-			break;
-			}
-		
-		//in this state, BCA Open is called. Checks the result of Open.
-		// If it is successful,then start the NIF. Otherwise stops the NIF.
-		case EBcaStackSet:
-			{
-			if(iStatus != KErrNone && iStatus !=  KErrAlreadyExists)
-				{
-				_LOG_L2C2(_L8("ERROR in BCA Open = %d"), iStatus.Int());
-				iObserver.Stop(iStatus.Int());
-				}
-			else
-				{
-				iObserver.Receiver().StartListening();
-				_LOG_L1C1(_L8("CBcaIoController Is Initialised"));
-				TRAPD(err, iObserver.GetObserver().InitialiseL(MRawIPNifObserverBase::EBcaController,KErrNone));
-				if(err != KErrNone)
-					{
-					_LOG_L2C2(_L8("ERROR in BCA Open Initialise observer = %d"), err);
-					iObserver.Stop(err);
-					}
-				}
-			break;
-			}
-
-		//in this state, BCA is Shutdown, shutdown the NIF.
-		case EClosing:
-			{
-			// linklayer shutdown
-			iObserver.GetObserver().ShutDown(MControllerObserver::EBcaController, iError);
-			break;
-			}
-		// Wrong state.
-		default:
-			{
-			_LOG_L1C1(_L8("ERROR CBcaControl::RunL(): Unknown state"));
-			_BTT_PANIC(KNifName, KBcaUnkownState);
-			break;
-			}
-		}
-
-	}
-	
-void CBcaControl::DoCancel()
-/**
- *	cancel active request. 
- */
-	{
-	_LOG_L1C1(_L8("CBcaControl::DoCancel called."));
-	_LOG_L2C2(_L8("iState value is %d"), iState);
-	switch (iState)
-		{
-		case EIdling:
-		case EIAPSet:
-			if(iMBca)
-				{
-				iMBca->CancelIoctl();
-				}
-			iState = EIdling;
-			break;
-		case EBcaStackSet:
-		case EClosing:
-		    if(iMBca)
-			    {
-			    iMBca->Close();
-			    }
-			iState = EIdling;
-			break;
-		default:
-			_LOG_L2C1(_L8("ERROR CBcaControl::DoCancel(): Unknown state"));
-			_BTT_PANIC(KNifName, KBcaUnkownState);
-			break;
-		}
-	}
-	
-void CBcaControl::StartLoadL()
-/**
- *  This method loads the C32BCA library and uses Ioctl to set the Bca iIapId. 
- */
-	{
-	_LOG_L1C1(_L8("CBcaControl::StartLoad"));
-	
-	// Loads Bca Dll and creates a Bca instance;
-	User::LeaveIfError(iBcaDll.iObj.Load(iObserver.BcaName()));
-	
-	TNewBcaFactoryL newBcaFactoryProcL = (TNewBcaFactoryL)iBcaDll.iObj.Lookup(1);
-	if (NULL == newBcaFactoryProcL)
-		{
-		_LOG_L1C2(_L8("Library entry point found error %d"), KErrBadLibraryEntryPoint);
-		User::Leave(KErrBadLibraryEntryPoint);	
-		}
-	
-	MBcaFactory* bcaFactory = (*newBcaFactoryProcL)();
-
-	if(!bcaFactory)
-		{
-		_LOG_L1C2(_L8("BcaFactory creation error %d"), KErrCompletion);
-		User::Leave(KErrCompletion);	
-		}
-	CleanupReleasePushL(*bcaFactory);
-	
-	iMBca = bcaFactory->NewBcaL();
-	CleanupStack::PopAndDestroy(bcaFactory);
-	
-	iObserver.SetBca(iMBca); //Pass BCA pointer.
-
-	TPckg<TUint32> aOpt(iObserver.IapId());
-	iMBca->Ioctl(iStatus,KBcaOptLevelGeneric,KBCASetIapId,aOpt);
-	
-	iState = EIdling;
-	SetActive();
-	}
-
-	
-void CBcaControl::ShutdownBca(TInt aError)
-/**
- *  Bca Shutdown.
- 
- *  @param aError the error code to shutdown the NIF. 
- */
-	{
-	__ASSERT_DEBUG(iMBca,Panic(KBcaNotExist));
-	Cancel();
-    iError = aError;
-    iState = EClosing;	
-	if(iMBca)
-		{
-		iMBca->Shutdown(iStatus);
-	    SetActive();	
-		}
-	}
-
-/** Panic function for RawIpNif 
-
-* @param aPanic panic code */
-void Panic(TRawIPNifPanic aPanic)
-	{
-	_LOG_L2C2(_L8("Panic code for RawIpNif = %d"), aPanic);
-	User::Panic(KNifName,aPanic);
-
-	}
-
--- a/telephonyprotocols/rawipnif/version1/src/DllMain.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-// Copyright (c) 2002-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:
-// Defines the global functions which provide DLL entry points.
-// 
-//
-
-/**
- @file
-*/
-
-#include "RawIPNifMainFactory.h"
-
-
-extern "C"
-    {
-    IMPORT_C CNifFactory* NewInterfaceFactoryL();	// Force export
-    }
-
-EXPORT_C CNifFactory* NewInterfaceFactoryL()
-/**
- * Creates a new RAW IP NIF main factory. This must be the first exported function
- * in the NIF's DLL.
- *
- * @return A newly created RAW IP NIF main factory
- */
-	{
-	return new (ELeave) CRawIPNifMainFactory;
-	}
--- a/telephonyprotocols/rawipnif/version1/src/IPTagHeader.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-// Copyright (c) 2004-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:
-// Implements the adding and removal of tag headers.
-// 
-//
-
-/**
- @file
-*/
-
-#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
-
-#include "IPTagHeader.h"
-#include "Constants.h"
-
-/**
-Default constructor. 
-*/
-CIPTagHeader::CIPTagHeader(CBttLogger* aTheLogger)
-	: iTheLogger(aTheLogger)
-	{
-	iHeaderByte.SetMax();
-	iHeaderByte.FillZ();
-	}
-
-/**
-Default destructor.
-*/
-CIPTagHeader::~CIPTagHeader()
-	{
-	}
-
-/**
-This method will set the type of the IP header.
-
-@param aType IP header type
-*/
-void CIPTagHeader::SetType(TUint16 aType)
-	{
-	_LOG_L1C1(_L8("CIPTagHeader::SetType"));
-	
-	iHeaderByte[0] = (TUint8)(aType>>8); 
-	iHeaderByte[1] = (TUint8)(aType&0xff);	
-	}
-
-/**
-This method will add a two-byte header to the send buffer detailing the
-protocol the aDes data packet is encoded with; in this case an IPv4
-header tag is appended.
-
-@param aDes the send buffer
-*/
-void CIPTagHeader::AddHeader(TDes8& aDes)
-	{
-	_LOG_L1C1(_L8("CIPTagHeader::AddHeader"));
-
-	// Add the protocol code as a header to the buffer
-	aDes.Insert(0,iHeaderByte);
-	}
-
-/**
-This method will remove the two-byte header from the received data,
-which specifies whether it is an IPv4/IPv6 packet.  This information
-will be stored in protocolCode and returned to the caller.
-
-@param aPdu The received data packet
-@return The protocol header tag stripped from aPdu
-*/
-TUint16 CIPTagHeader::RemoveHeader(RMBufChain& aPdu)
-	{
-	_LOG_L1C1(_L8("CIPTagHeader::RemoveHeader"));
-
-	if (aPdu.Length() > KIPTagHeaderLength)
-		{
-		//Strip off the first part of the header
-		aPdu.TrimStart(1);
-		//Read the remaining part of the header as this contains the protocol code
-		TUint8* payloadPtr = aPdu.First()->Ptr();
-		TUint16 protocolCode = static_cast<TUint16>(*payloadPtr);
-		//Strip off the remaining protocol code part of the header
-
-		aPdu.TrimStart(1);
-
-		return protocolCode;
-		}
-
-	return 0;
-	}
-
-#endif // RAWIP_HEADER_APPENDED_TO_PACKETS
--- a/telephonyprotocols/rawipnif/version1/src/IPv4ProtocolIf.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,776 +0,0 @@
-// Copyright (c) 2002-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:
-// This file implements the CIPv4ProtocolIf class, which handles the transmission
-// of IPv4 data to and from the TCP/IP stack.
-// 
-//
-
-/**
- @file
-*/
-
-#include <etelpckt.h>
-#include <in_iface.h>
-#include "RawIPNifMain.h"
-#include "IPv4ProtocolIf.h"
-#ifdef WCDMA_STUB
-#include <UMTSNifControlIf.h>
-#endif
-#define LOG_IP_ADDRESS(desc,addr) _LOG_L2C5(_L8("    " desc " = %d.%d.%d.%d from context"), \
-			addr >> 24, (addr >> 16) & 0xFF, (addr >> 8) & 0xFF, addr & 0xFF);
-
-CIPv4ProtocolIf::CIPv4ProtocolIf(CRawIPNifMain& aNifMain, CBttLogger* aTheLogger)
-/**
- * Constructor
- */ 
-	: CProtocolIfBase(aNifMain,aTheLogger),
-	  iTheLogger(aTheLogger), 
-	  iSpeedMetric(KDefaultSpeedMetric)
-	{
-	}
-
-CIPv4ProtocolIf::~CIPv4ProtocolIf()
-/**
- *	Destructor
- */
-	{
-	}
-
-void CIPv4ProtocolIf::BindL(TAny* aId)
-/**
- *	Binds protocol to the Nif
- *
- *	@param aId A point the the protocol(TCP/IP)
- */
-	{
-	_LOG_L1C2(_L8("CIPv4ProtocolIf::BindL [aId=%X]"), aId);
-
-	CProtocolIfBase::BindL(aId); // Call the superclass's method.
-	iNotify = iNifMain.Notify();
-	}
-
-TInt CIPv4ProtocolIf::Control(TUint aLevel, TUint aName, TDes8& aOption,
-							TAny* /*aSource*/)
-/**
- * The main function called by the TCP/IP protocol to control the interface.
- * Can perform a variety of general IP tasks (such as getting IP config)
- * and "3G" specific tasks (such as deleting the context).
- *
- * @param aLevel The level of the interface to control - always KSOLInterface
- * @param aName The command to perform
- * @param aOption Data to be input/output as a result of the command
- * @param aSource The source of the command (unused)
- * @return Standard error codes
- */
-	{
-	_LOG_L1C3(_L8("CIPv4ProtocolIf::Control [aLevel=%d, aName=%d]"),
-		aLevel, aName);
-
-	if (aLevel == KSOLInterface)
-		{
-		switch (aName)
-			{
-		// General IP configuration commands are below this point.
-
-		case KSoIfInfo:
-			// Gets information about the interface, such as name and MTU.
-			return WriteIfInfo(aOption);
-
-		case KSoIfConfig:
-			// Gets interface configuration, eg. IP address and DNS servers.
-			return WriteIfConfig(aOption);
-
-		case KSoIfGetConnectionInfo:
-			// Gets IAP and network information.
-			return WriteConnectionInfo(aOption);
-
-		case KSoIfHardwareAddr:
-			// unsupported because we don't have a h/w address
-		case KSoIfCompareAddr:
-			// this never actually appears to be called
-			break;
-
-		// 3G-specific configuration commands are below this point.
-#ifdef WCDMA_STUB
-		case KRegisterEventHandler:
-			// Raw IP NIF Events are not supported
-		case KContextSetEvents:
-			// Raw IP NIF Events are not supported
-			break;
-
-		case KContextCreate:
-			// We don't support creating new secondary contexts.
-			break;
-
-		case KContextDelete:
-			// Deletes the primary PDP context. This will shut down the Nif.
-			return DeleteContext(aOption);
-
-		case KContextActivate:
-			// If the IPv4 interface is up, then the context will already have
-			// been activated. So this command should fail with 
-			// KErrAlreadyExists
-			{
-			TUint8* ptr = CONST_CAST(TUint8*, aOption.Ptr()); 
-			TContextParameters* contextParams =
-				REINTERPRET_CAST(TContextParameters*, ptr);
-
-			if (contextParams->iContextInfo.iContextId != 
-				STATIC_CAST(TInt8, GetNifMain().GetBcaController()->Nsapi()))
-				{
-				contextParams->iReasonCode = KErrNotFound;
-				}
-			else
-				{
-				contextParams->iContextInfo.iStatus =
-					GetNifMain().GetContextStatus();
-				contextParams->iReasonCode = KErrAlreadyExists;
-				}
-			return KErrNone;
-			}
-
-		case KNifSetDefaultQoS:
-		case KContextQoSSet:
-			// Setting the QoS is meaningless over GPRS, so we just return that
-			// we don't support these operations.
-			break;
-
-		case KContextTFTModify:
-			// As we only have one primary context, we don't support anything
-			// to do with traffic flow templates, which are used by secondary
-			// contexts.
-			break;
-
-		case KContextModifyActive:
-			// This command is only valid aftermodifying TFT/QoS parameters. 
-			// As we don't support any of these operations,
-			// this command is never valid.
-			break;
-#endif
-		default:
-			break;
-			}
-		}
-	return KErrNotSupported;
-	}
-
-TInt CIPv4ProtocolIf::WriteIfConfig(TDes8& aIfConfig)
-/**
- * Writes the configuration of the interface (eg. IP address, DNS servers)
- * into the supplied descriptor.
- *
- * @param aIfConfig Will contain the interface configuration
- * @return KErrNotSupported if an incorrect structure is passed, 
- * otherwise KErrNone
- */
-	{
-	_LOG_L1C1(_L8("CIPv4ProtocolIf::WriteIfConfig"));
-
-	if (aIfConfig.Length() != sizeof(TSoInetIfConfig))
-		{
-		return KErrArgument;
-		}
-
-	TUint8* ptr = CONST_CAST(TUint8*, aIfConfig.Ptr());
-	TSoInetIfConfig* config = REINTERPRET_CAST(TSoInetIfConfig*, ptr);
-
-	if (config->iFamily != KAfInet)
-		{
-		return KErrNotSupported;
-		}
-
-	TInetAddr::Cast(config->iConfig.iAddress).SetAddress(iSettings.iLocalAddr);
-	TInetAddr::Cast(config->iConfig.iNetMask).SetAddress(iSettings.iNetMask);
-	TInetAddr::Cast(config->iConfig.iBrdAddr).
-		SetAddress(iSettings.iBroadcastAddr);
-	TInetAddr::Cast(config->iConfig.iDefGate).SetAddress(iSettings.iDefGateway);
-	TInetAddr::Cast(config->iConfig.iNameSer1).
-		SetAddress(iSettings.iPrimaryDns);
-	TInetAddr::Cast(config->iConfig.iNameSer2).
-		SetAddress(iSettings.iSecondaryDns);
-
-	return KErrNone;
-	}
-
-TInt CIPv4ProtocolIf::WriteIfInfo(TDes8& aIfInfo)
-/**
- * Writes information about the interface into the supplied descriptor.
- *
- * @param aIfInfo Will contain the interface information
- * @return KErrArgument if an incorrect structure is passed, otherwise KErrNone
- */
-	{
-	_LOG_L1C1(_L8("CIPv4ProtocolIf::WriteIfInfo"));
-
-	if (aIfInfo.Length() != sizeof(TSoIfInfo))
-		{
-		return KErrArgument;
-		}
-
-	TSoIfInfo* info = (TSoIfInfo*) aIfInfo.Ptr();
-	info->iFeatures = KIfCanBroadcast | KIfCanMulticast;
-	info->iSpeedMetric = iSpeedMetric;
-	info->iMtu = KDefaultMtu;
-	WriteIfName(info->iName);
-
-	return KErrNone;
-	}
-
-TInt CIPv4ProtocolIf::WriteConnectionInfo(TDes8& aConnectionInfo)
-/**
- * Writes information about the IAP and network we're associated with. This
- * is used to route data in a multi-homing environment.
- *
- * @param aConnectionInfo Will contain the connection information
- * @return Standard CommDB error codes
- */
-	{
-	_LOG_L1C1(_L8("CIPv4ProtocolIf::WriteConnectionInfo"));
-
-	TSoIfConnectionInfo* connectionInfo =
-		(TSoIfConnectionInfo*) aConnectionInfo.Ptr();
-
-	TInt err;
-	// Append the 2 commdb filed into this descriptor
-	TBuf<2*KCommsDbSvrMaxColumnNameLength+1> fieldName;
-
-	fieldName.Copy(TPtrC(IAP));
-	fieldName.Append(KSlashChar);
-	fieldName.Append(TPtrC(COMMDB_ID));
-	err = GetNifMain().GetAgent()->ReadInt(fieldName, connectionInfo->iIAPId);
-	if (err != KErrNone)
-		{
-		return err;
-		}
-
-	fieldName.Copy(TPtrC(IAP));
-	fieldName.Append(KSlashChar);
-	fieldName.Append(TPtrC(IAP_NETWORK));
-	err = GetNifMain().GetAgent()->ReadInt(fieldName, connectionInfo->iNetworkId);
-	if (err != KErrNone)
-		{
-		return err;
-		}
-
-	return KErrNone;
-	}
-#ifdef WCDMA_STUB
-
-TInt CIPv4ProtocolIf::DeleteContext(TDes8& aContextParameters)
-/**
- * Deletes a context. As the NIF is responsible for one primary context,
- * this is equivalent to closing down the NIF.
- *
- * @param aContextParameters Parameters of the context to delete
- * @return KErrArgument if an incorrect structure is passed, otherwise KErrNone
- */
-	{
-	_LOG_L1C1(_L8("CIPv4ProtocolIf::DeleteContext"));
-
-	if (aContextParameters.Length() != sizeof(TContextParameters))
-		{
-		return KErrArgument;
-		}
-
-	TUint8* ptr = CONST_CAST(TUint8*, aContextParameters.Ptr());
-	TContextParameters* params = REINTERPRET_CAST(TContextParameters*, ptr);
-
-	if (params->iContextInfo.iContextId != 
-		STATIC_CAST(TInt8, GetNifMain().GetBcaController()->Nsapi()))
-		{
-		params->iReasonCode = KErrBadName;
-		}
-	else
-		{
-		params->iReasonCode = KErrNone; 
-		GetNifMain().Stop(KErrNone, MNifIfNotify::EDisconnect);
-		}
-
-	return KErrNone;
-	}
-
-#endif
-
-void CIPv4ProtocolIf::ReadCommDbGprsSettingsL()
-/**
- * Reads GPRS IP settings from CommDB via the agent.
- */
-	{
-	_LOG_L1C1(_L8("CIPv4ProtocolIf::ReadCommDbGprsSettings"));
-
-	// Read the IP address settings from CommDB.
-	ReadIPv4SettingL(TPtrC(GPRS_IP_ADDR), iSettings.iLocalAddr);
-	ReadIPv4SettingL(TPtrC(GPRS_IP_NETMASK), iSettings.iNetMask);
-	ReadIPv4SettingL(TPtrC(GPRS_IP_NAME_SERVER1), iSettings.iPrimaryDns);
-	ReadIPv4SettingL(TPtrC(GPRS_IP_NAME_SERVER2), iSettings.iSecondaryDns);
-	ReadIPv4SettingL(TPtrC(GPRS_IP_GATEWAY), iSettings.iDefGateway);
-
-	// Read whether to get the gateway IP address from the server.
-	_BTT_LEAVEIFERROR(GetNifMain().GetAgent()->ReadBool(
-		TPtrC(GPRS_IP_ADDR_FROM_SERVER),
-		iSettings.iGetGatewayFromServer));
-
-	// Read whether to get the DNS addresses from the server.
-	_BTT_LEAVEIFERROR(GetNifMain().GetAgent()->ReadBool(
-		TPtrC(GPRS_IP_DNS_ADDR_FROM_SERVER),
-		iSettings.iGetDnsFromServer));
-
-	// Because CommDB doesn't define a Broadcast Address field, we must
-	// calculate the broadcast address. This is based on the localAddr
-	// and the netMask.
-	TInetAddr localAddr(iSettings.iLocalAddr, 0);
-	TInetAddr netMask(iSettings.iNetMask, 0);
-	TInetAddr broadcast;
-	broadcast.SubNetBroadcast(localAddr, netMask);
-	iSettings.iBroadcastAddr = broadcast.Address();
-	}
-
-void CIPv4ProtocolIf::UpdateContextConfigL(const
-										  RPacketContext::TContextConfigGPRS&
-										  aConfig)
-/**
- * Called when the context has been activated to set our IP address and get
- * any other required settings from CommDB.
- *
- * @param aConfig The new context config
- */
-	{
-	_LOG_L1C1(_L8("CIPv4ProtocolIf::UpdateContextConfig"));
-
-	// Get the settings which are stored in CommDB.
-	ReadCommDbGprsSettingsL();
-
-	// Get our IP address from the GPRS context config.
-	TInetAddr address;
-	
-	TBuf<RPacketContext::KMaxPDPAddressLength> tempAddr;
-	tempAddr.Copy(aConfig.iPdpAddress);
-	TInt ret = address.Input(tempAddr);
-
-	// We've got our IP address! Let's save it.
-	if (ret == KErrNone)
-		{
-		iSettings.iLocalAddr = address.Address();
-		LOG_IP_ADDRESS("Got local IP address", iSettings.iLocalAddr);
-		}
-	else
-		{
-		_LOG_L2C2(_L8("Couldn't get IP address from GPRS config (err: %d)"),
-			ret);
-
-		// Don't leave on this error: we may still be OK if we read some
-		// settings from CommDB.
-		}
-
-	// @todo - is this correct. We can only get the DNS addresses
-	// from the TSY using the iProtocolConfigOption data. Yet a client could
-	// access those DNS config details without knowing about the state of the
-	// iSettings.iGetDnsFromServer flag.
-
-	if ((iSettings.iGetDnsFromServer) ||
-		((iSettings.iPrimaryDns == 0) &&
-		 (iSettings.iSecondaryDns == 0)) ) 
-		{
-		TBuf<RPacketContext::KMaxPDPAddressLength> tempAddr;
-		tempAddr.Copy(aConfig.iProtocolConfigOption.iDnsAddresses.iPrimaryDns);
-		ret = address.Input(tempAddr);
-
-		if (ret == KErrNone)
-			{
-			iSettings.iPrimaryDns = address.Address();
-			LOG_IP_ADDRESS("Got primary DNS", iSettings.iPrimaryDns);
-			}
-		else
-			{
-			_LOG_L2C2(_L8("Couldn't get primary DNS address from GPRS config (err: %d)"),
-				ret);
-
-			// Don't leave on this error: we may still be OK if we read some
-			// settings from CommDB.
-			}
-
-		tempAddr.Copy(aConfig.iProtocolConfigOption.iDnsAddresses.iSecondaryDns);
-		ret = address.Input(tempAddr);
-
-		if (ret == KErrNone)
-			{
-			iSettings.iSecondaryDns = address.Address();
-			LOG_IP_ADDRESS("Got secondary DNS", iSettings.iPrimaryDns);
-			}
-		else
-			{
-			_LOG_L2C2(_L8("Couldn't get secondary DNS address from GPRS config (err: %d)"),
-				ret);
-
-			// Don't leave on this error: we may still be OK if we read some
-			// settings from CommDB.
-			}
-		}
-	else
-		{
-		LOG_IP_ADDRESS("Using CommDB DNS address - Primary ", iSettings.iPrimaryDns);
-		LOG_IP_ADDRESS("                         - Secondary ", iSettings.iSecondaryDns);
-		}
-
-
-	// TProtocolConfigOptionV2::iMiscBuffer is not the correct way to pass a gateway
-	// address - data needs to be passed in TLV format but there are no TLV content tags
-	// defined for a gateway address and any UMTS/GPRS hardware which claims to be able
-	// to supply this address is erroneous (3gpp standard 24.008, section 10.5.6.3).
-	// This misuse of iMiscBuffer was preventing other correctly formed parameters from
-	// being passed (INC113612).
-/*	if (iSettings.iGetGatewayFromServer)
-		{
-		tempAddr.Copy(aConfig.iProtocolConfigOption.iMiscBuffer);
-		ret = address.Input(tempAddr);
-
-		if (ret == KErrNone)
-			{
-			iSettings.iDefGateway = address.Address();
-			LOG_IP_ADDRESS("Got default gateway", iSettings.iDefGateway);
-			}
-		else
-			{
-			_LOG_L2C2(_L8("Couldn't get default gateway from GPRS config (err: %d)"),
-				ret);
-			}
-		}*/
-	}
-
-void CIPv4ProtocolIf::UpdateConnectionSpeed(TUint aConnectionSpeed)
-/**
- * Sets the speed metric to return to TCP/IP, based on what the TSY tells us.
- *
- * @param aConnectionSpeed Our connection speed
- */
-	{
-	_LOG_L1C1(_L8("CIPv4ProtocolIf::UpdateConnectionSpeed"));
-
-	iSpeedMetric = aConnectionSpeed;
-	}
-
-void CIPv4ProtocolIf::ReadIPv4SettingL(const TDesC& aFieldName,
-									   TUint32& aIpAddr)
-/**
- * Reads an IPv4 address from CommDB, via the TRP agent. It leaves if an error
- * other than KErrNotFound occurs.
- *
- * @param aFieldName The name of the field to read
- * @param aIpAddr Will contain the IP address
- */
-	{
-#ifdef __BTT_LOGGING__
-	TBuf8<256> debugBuffer;
-	debugBuffer.Copy(aFieldName);
-	_LOG_L1C2(_L8("CIPv4ProtocolIf::ReadIp4Setting [aFieldName=%S]"),
-		&debugBuffer);
-#endif
-
-	TBuf<KCommsDbSvrMaxFieldLength> name;
-	TInetAddr ip4Addr;
-
-	TInt ret = GetNifMain().GetAgent()->ReadDes(aFieldName, name);
-
-	if (ret == KErrNone)
-		{
-		// We've successfully read an IP address, so convert it into a number.
-		ip4Addr.Input(name);
-		aIpAddr = ip4Addr.Address();
-		}
-	else
-		{
-		// We couldn't get the IP address, so set it to 0.0.0.0. Note that we
-		// only leave here if we got a more serious error than "not found".
-		aIpAddr = 0;
-		if (ret != KErrNotFound)
-			{
-			_BTT_LEAVEIFERROR(ret);
-			}
-		}
-	}
-
-TInt CIPv4ProtocolIf::Send(RMBufChain& aPdu, TAny* aSource)
-/**
- * Called by the protocol to send an outgoing IP packet to the network.
- *
- * @param aPdu The outgoing packet
- * @param aSource The source of the packet
- * @return Standard error codes
- */
-	{
-	_LOG_L1C1(_L8("CIPv4ProtocolIf::Send"));
-
-#ifdef __BTT_LOGGING__
-	LogPacket(aPdu);
-#endif
-
-	// Return <0: an error occurred
-	// Return  0: no error, but don't send any more packets
-
-	return GetNifMain().SendPacket(aPdu, aSource, KIp4FrameType);
-	}
-
-void CIPv4ProtocolIf::Info(TNifIfInfo& aInfo) const
-/**
- * Called by the protocol to get information about the NIF.
- *
- * @param aInfo Will contain NIF information
- */
-	{
-	_LOG_L1C1(_L8("CIPv4ProtocolIf::Info"));
-
-	// The parent class sets everything except the name...
-	CProtocolIfBase::Info(aInfo);
-	// ...which we set here.
-	WriteIfName(aInfo.iName);
-	}
-
-TInt CIPv4ProtocolIf::Notification(TAgentToNifEventType /*aEvent*/, 
-	void* /*aInfo*/)
-/**
- * The Nif will ignore any notification sent
- *
- * @param aEvent Not used
- * @param aInfo Not used 
- */
-	{
-	_LOG_L1C1(_L8("CIPv4ProtocolIf::Notification"));
-
-	return KErrNone;
-	}
-
-void CIPv4ProtocolIf::StartSending(CProtocolBase* aProtocol)
-/**
- * Indicates to the protocol layer that the NIF is ready to send packets.
- *
- * @param aProtocol A pointer to a protocol
- */
-	{
-	_LOG_L1C2(_L8("CIPv4ProtocolIf::StartSending [aProtocol=%X]"), aProtocol);
-
-	CProtocolIfBase::StartSending(aProtocol);
-	}
-
-TBool CIPv4ProtocolIf::WantsProtocol(TUint16 aProtocolCode)
-/**
- * Indicates the type of protocol implemented by this class.
- *
- * @param aProtocolCode The protocol type
- */
-	{
-	_LOG_L1C2(_L8("CIPv4ProtocolIf::WantsProtocol [aProtocolCode=%X]"),
-		aProtocolCode);
-
-#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
-	return ((aProtocolCode & 0x00FF) == KIp4FrameType);
-#else
-	(void) aProtocolCode; // disable compiler warning
-	return ETrue;
-#endif // RAWIP_HEADER_APPENDED_TO_PACKETS
-	}
-
-void CIPv4ProtocolIf::Process(RMBufChain& aPdu)
-/**
- * Called when an incoming IP packet has arrived. Send packets up to the
- * TCP/IP stack.
- *
- * @param aPdu The incoming packet
- */
-	{
-	_LOG_L1C1(_L8("CIPv4ProtocolIf::Process"));
-
-#ifdef __BTT_LOGGING__
-	LogPacket(aPdu);
-#endif
-
-	// Pass incoming packets up to the protocol, unless it hasn't
-	// been bound yet.
-	if (iProtocol)
-		{
-		_LOG_L1C1(_L8("CIPv4ProtocolIf: Packet Sent to TCP/IP Protocol!!!"));
-		iProtocol->Process(aPdu, reinterpret_cast<CProtocolBase*>(this));
-		}
-	else 
-		{
-		_LOG_L2C1(_L8("WARNING: dumping incoming packet, no protocol bound"));
-		aPdu.Free();
-		}
-	}
-
-#ifdef __BTT_LOGGING__
-void CIPv4ProtocolIf::LogPacket(const RMBufChain& aPacket)
-/**
-* Logs packet information into log file.
-*
-* @param aPacket The packet 
-*/
-	{
-	_LOG_L1C1(_L8("CIPv4ProtocolIf::LogPacket"));
-
-	TInt mBufLength = aPacket.Length() - aPacket.First()->Length();
-
-	_LOG_L3C2(_L8("Analysis of %d byte packet:"), mBufLength);
-
-	//Note: All the constants used on this method are a pragmatic guess of the
-	//IP header fields. The only porpose of this method is logging.
-
-	if (mBufLength < 20)
-		{
-		_LOG_L3C2(_L8(" -doesn't appear to be a valid IPv4 packet (length=%d)")
-			, mBufLength);
-		return;
-		}
-
-	// Get a pointer to the packet's payload.
-	const TUint8* payloadPtr = aPacket.First()->Next()->Ptr();
-
-	if ((payloadPtr[0] & 0xF0) != 0x40)
-		{
-		_LOG_L3C2(_L8(" - doesn't appear to be an IPv4 packet (version=0x%X)"),
-			(payloadPtr[0] & 0xF0) >> 4);
-		return;
-		}
-
-	if ((payloadPtr[0] & 0xF) != 0x5)
-		{
-		_LOG_L3C2(_L8(" - doesn't have a standard IP header (length=0x%X)"),
-			payloadPtr[0] & 0xF);
-		return;
-		}
-
-	_LOG_L3C5(_L8(" - src addr: %d.%d.%d.%d"), payloadPtr[12], payloadPtr[13],
-		payloadPtr[14], payloadPtr[15]);
-	_LOG_L3C5(_L8(" - dst addr: %d.%d.%d.%d"), payloadPtr[16], payloadPtr[17],
-		payloadPtr[18], payloadPtr[19]);
-
-	if (payloadPtr[9] == 0x06)
-		{
-		_LOG_L3C1(_L8(" - appears to be a TCP packet"));
-		if (mBufLength < 40)
-			{
-			_LOG_L3C2(_L8(" - but is too short (length=0x%X)"), mBufLength);
-			return;
-			}
-		_LOG_L3C3(_L8(" - src port: %d, dst port: %d"),
-			(payloadPtr[20] << 8) + payloadPtr[21],
-			(payloadPtr[22] << 8) + payloadPtr[23]);
-		_LOG_L3C3(_L8(" - seq #: 0x%08X, ack #: 0x%08X"),
-			(payloadPtr[24] << 24) + (payloadPtr[25] << 16) +
-			(payloadPtr[26] << 8) + payloadPtr[27],
-			(payloadPtr[28] << 24) + (payloadPtr[29] << 16) +
-			(payloadPtr[30] << 8) + payloadPtr[31]);
-
-		TBuf8<100> flagsSet;
-		flagsSet.Copy(_L8(" - flags set: "));
-
-		// Write description of payload's flags to "flagsSet"
-		if (payloadPtr[33] & 0x01)
-			{
-			flagsSet.Append(_L8("FIN "));
-			}
-		if (payloadPtr[33] & 0x02)
-			{
-			flagsSet.Append(_L8("SYN "));
-			}
-		if (payloadPtr[33] & 0x04)
-			{
-			flagsSet.Append(_L8("RST "));
-			}
-		if (payloadPtr[33] & 0x08)
-			{
-			flagsSet.Append(_L8("PSH "));
-			}
-		if (payloadPtr[33] & 0x10)
-			{
-			flagsSet.Append(_L8("ACK "));
-			}
-		if (payloadPtr[33] & 0x20)
-			{
-			flagsSet.Append(_L8("URG "));
-			}
-		_LOG_L3C1(flagsSet);
-
-		TInt dataOffset = payloadPtr[32] >> 2; // in bytes
-		if ((dataOffset > 0) && (mBufLength > dataOffset + 30))
-			{
-			TBuf8<100> data;
-			data.Copy(_L8(" - data begins: "));
-			for (TInt i = dataOffset + 20; i < dataOffset + 100; i++)
-				{
-				// We skip some bytes at the end of the MBuf, as they're junk.
-				if (i >= (mBufLength - 10))
-					{
-					break;
-					}
-				if (TChar(payloadPtr[i]).IsPrint())
-					{
-					data.Append(TChar(payloadPtr[i]));
-					}
-				else
-					{
-					data.Append(TChar('?'));
-					}
-				}
-			_LOG_L3C1(data);
-			}
-		}
-	else if (payloadPtr[9] == 0x01)
-		{
-		_LOG_L3C1(_L8(" - appears to be an ICMP packet"));
-		if (mBufLength < 24)
-			{
-			_LOG_L3C2(_L8(" - but is too short (length=0x%X)"), mBufLength);
-			return;
-			}
-
-		if (payloadPtr[20] == 0x8)
-			{
-			_LOG_L3C1(_L8(" - is an echo request"));
-			}
-		else if (payloadPtr[20] == 0x0)
-			{
-			_LOG_L3C1(_L8(" - is an echo reply"));
-			}
-		else
-			{
-			_LOG_L3C2(_L8(" - unknown type (0x%02X)"), payloadPtr[20]);
-			return;
-			}
-
-		if (mBufLength >= 28)
-			{
-			_LOG_L3C3(_L8(" - ID: 0x%04X, seq #: 0x%04X"),
-				(payloadPtr[24] << 8) + payloadPtr[25],
-				(payloadPtr[26] << 8) + payloadPtr[27]);
-			}
-		}
-	else if (payloadPtr[9] == 0x11)
-		{
-		_LOG_L3C1(_L8(" - appears to be a UDP packet"));
-		if (mBufLength < 28)
-			{
-			_LOG_L3C2(_L8(" - but is too short (length=0x%X)"), mBufLength);
-			return;
-			}
-		_LOG_L3C3(_L8(" - src port: %d, dst port: %d"),
-			(payloadPtr[20] << 8) + payloadPtr[21],
-			(payloadPtr[22] << 8) + payloadPtr[23]);
-		}
-	else
-		{
-		_LOG_L3C2(_L8(" - appears to be for an unknown protocol (0x%X)"),
-			payloadPtr[9]);
-		}
-	}
-#endif // __BTT_LOGGING__
--- a/telephonyprotocols/rawipnif/version1/src/IPv6ProtocolIf.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,696 +0,0 @@
-// Copyright (c) 2002-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:
-// This file implements the CIPv6ProtocolIf class, which handles the transmission
-// of IPv6 data to and from the TCP/IP stack.
-// 
-//
-
-/**
- @file
-*/
-
-#include <e32hal.h>	// UserHal::MachineInfo()
-#include <etelpckt.h>
-#include <in_iface.h>
-#include <in6_if.h>
-#include "RawIPNifMain.h"
-#include "IPv6ProtocolIf.h"
-#ifdef WCDMA_STUB
-#include <UMTSNifControlIf.h>
-#endif
-#define LOG_IP_ADDRESS(desc,addr) _LOG_L2C5(_L8("    " desc " = %d:%d:%d:%d from context"), \
-			addr[3], addr[2], addr[1], addr[0]);
-
-CIPv6ProtocolIf::CIPv6ProtocolIf(CRawIPNifMain& aNifMain, CBttLogger* aTheLogger)
-/**
- * Constructor
- */ 
-	: CProtocolIfBase(aNifMain,aTheLogger),
-	  iTheLogger(aTheLogger), 
-	  iSpeedMetric(KDefaultSpeedMetric)
-	{
-	}
-
-CIPv6ProtocolIf::~CIPv6ProtocolIf()
-/**
- *	Destructor
- */
-	{
-	}
-
-void CIPv6ProtocolIf::BindL(TAny* aId)
-/**
- *	Binds protocol to the Nif
- *
- *	@param aId A point the the protocol(TCP/IP)
- */
-	{
-	_LOG_L1C2(_L8("CIPv6ProtocolIf::BindL [aId=%X]"), aId);
-
-	CProtocolIfBase::BindL(aId); // Call the superclass's method.
-	iNotify = iNifMain.Notify();
-	}
-
-TInt CIPv6ProtocolIf::Control(TUint aLevel, TUint aName, TDes8& aOption,
-							TAny* /*aSource*/)
-/**
- * The main function called by the TCP/IP protocol to control the interface.
- * Can perform a variety of general IP tasks (such as getting IP config)
- * and "3G" specific tasks (such as deleting the context).
- *
- * @param aLevel The level of the interface to control - always KSOLInterface
- * @param aName The command to perform
- * @param aOption Data to be input/output as a result of the command
- * @param aSource The source of the command (unused)
- * @return Standard error codes
- */
-	{
-	_LOG_L1C3(_L8("CIPv6ProtocolIf::Control [aLevel=%d, aName=%d]"),
-		aLevel, aName);
-
-	if (aLevel == KSOLInterface)
-		{
-		switch (aName)
-			{
-		// General IP configuration commands are below this point.
-
-		case KSoIfInfo6:
-			// Gets information about the interface, such as name and MTU.
-			return WriteIfInfo(aOption);
-
-		case KSoIfConfig:
-			// Gets interface configuration, eg. IP address and DNS servers.
-			return WriteIfConfig(aOption);
-
-		case KSoIfGetConnectionInfo:
-			// Gets IAP and network information.
-			return WriteConnectionInfo(aOption);
-
-		case KSoIfHardwareAddr:
-			// unsupported because we don't have a h/w address
-		case KSoIfCompareAddr:
-			// this never actually appears to be called
-			break;
-
-		// 3G-specific configuration commands are below this point.
-#ifdef WCDMA_STUB
-		case KRegisterEventHandler:
-			// Raw IP NIF Events are not supported
-		case KContextSetEvents:
-			// Raw IP NIF Events are not supported
-			break;
-
-		case KContextCreate:
-			// We don't support creating new secondary contexts.
-			break;
-
-		case KContextDelete:
-			// Deletes the primary PDP context. This will shut down the Nif.
-			return DeleteContext(aOption);
-
-		case KContextActivate:
-			// If the IPv6 interface is up, then the context will already have
-			// been activated. So this command should fail with 
-			// KErrAlreadyExists
-			{
-			TUint8* ptr = CONST_CAST(TUint8*, aOption.Ptr()); 
-			TContextParameters* contextParams =
-				REINTERPRET_CAST(TContextParameters*, ptr);
-
-			if (contextParams->iContextInfo.iContextId != 
-				STATIC_CAST(TInt8, GetNifMain().GetBcaController()->Nsapi()))
-				{
-				contextParams->iReasonCode = KErrNotFound;
-				}
-			else
-				{
-				contextParams->iContextInfo.iStatus =
-					GetNifMain().GetContextStatus();
-				contextParams->iReasonCode = KErrAlreadyExists;
-				}
-			return KErrNone;
-			}
-
-		case KNifSetDefaultQoS:
-		case KContextQoSSet:
-			// Setting the QoS is meaningless over GPRS, so we just return that
-			// we don't support these operations.
-			break;
-
-		case KContextTFTModify:
-			// As we only have one primary context, we don't support anything
-			// to do with traffic flow templates, which are used by secondary
-			// contexts.
-			break;
-
-		case KContextModifyActive:
-			// This command is only valid aftermodifying TFT/QoS parameters. 
-			// As we don't support any of these operations,
-			// this command is never valid.
-			break;
-#endif
-		default:
-			break;
-			}
-		}
-	return KErrNotSupported;
-	}
-
-TInt CIPv6ProtocolIf::WriteIfConfig(TDes8& aIfConfig)
-/**
- * Writes the configuration of the interface (eg. IP address, DNS servers)
- * into the supplied descriptor.
- *
- * @param aIfConfig Will contain the interface configuration
- * @return KErrNotSupported if an incorrect structure is passed, 
- * otherwise KErrNone
- */
-	{
-	_LOG_L1C1(_L8("CIPv6ProtocolIf::WriteIfConfig"));
-	__ASSERT_DEBUG((TUint)aIfConfig.MaxLength() >= sizeof (TSoInet6IfConfig), User::Panic(KIPv6ProtocolIfName, 0));
-
-	if ((TUint)aIfConfig.MaxLength() < sizeof(TSoInet6IfConfig))
-		{
-		return KErrArgument;
-		}
-
-	TUint8* ptr = CONST_CAST(TUint8*, aIfConfig.Ptr());
-	TSoInet6IfConfig* config = REINTERPRET_CAST(TSoInet6IfConfig*, ptr);
-
-	TEui64Addr& localId = TEui64Addr::Cast(config->iLocalId);
-	localId = iSettings.iLocalIfId;
-
-	// If required, configure static DNS addresses
-	if (!iSettings.iPrimaryDns.IsUnspecified())
-		{
-		config->iNameSer1.SetAddress(iSettings.iPrimaryDns);
-		if (!iSettings.iSecondaryDns.IsUnspecified())
-			config->iNameSer2.SetAddress(iSettings.iSecondaryDns);
-		}
-		
-	config->idPaddingBits = 0;
-
-	return KErrNone;
-	}
-
-TInt CIPv6ProtocolIf::WriteIfInfo(TDes8& aIfInfo)
-/**
- * Writes information about the interface into the supplied descriptor.
- *
- * @param aIfInfo Will contain the interface information
- * @return KErrArgument if an incorrect structure is passed, otherwise KErrNone
- */
-	{
-	_LOG_L1C1(_L8("CIPv6ProtocolIf::WriteIfInfo"));
-	__ASSERT_DEBUG((TUint)aIfInfo.MaxLength() >= sizeof (TSoIfInfo6), User::Panic(KIPv6ProtocolIfName, 0));
-
-	if ((TUint)aIfInfo.MaxLength() < sizeof(TSoIfInfo6))
-		{
-		return KErrArgument;
-		}
-
-	TSoIfInfo6* info = (TSoIfInfo6*) aIfInfo.Ptr();
-	info->iFeatures = KIfCanBroadcast | KIfCanMulticast;
-	info->iSpeedMetric = iSpeedMetric;
-	info->iMtu = KDefaultMtu;
-	info->iRMtu = KDefaultMtu;
-	WriteIfName(info->iName);
-
-	return KErrNone;
-	}
-
-TInt CIPv6ProtocolIf::WriteConnectionInfo(TDes8& aConnectionInfo)
-/**
- * Writes information about the IAP and network we're associated with. This
- * is used to route data in a multi-homing environment.
- *
- * @param aConnectionInfo Will contain the connection information
- * @return Standard CommDB error codes
- */
-	{
-	_LOG_L1C1(_L8("CIPv6ProtocolIf::WriteConnectionInfo"));
-
-	TSoIfConnectionInfo* connectionInfo =
-		(TSoIfConnectionInfo*) aConnectionInfo.Ptr();
-
-	TInt err;
-	// Append the 2 commdb filed into this descriptor
-	TBuf<2*KCommsDbSvrMaxColumnNameLength+1> fieldName;
-
-	fieldName.Copy(TPtrC(IAP));
-	fieldName.Append(KSlashChar);
-	fieldName.Append(TPtrC(COMMDB_ID));
-	err = GetNifMain().GetAgent()->ReadInt(fieldName, connectionInfo->iIAPId);
-	if (err != KErrNone)
-		{
-		return err;
-		}
-
-	fieldName.Copy(TPtrC(IAP));
-	fieldName.Append(KSlashChar);
-	fieldName.Append(TPtrC(IAP_NETWORK));
-	err = GetNifMain().GetAgent()->ReadInt(fieldName, connectionInfo->iNetworkId);
-	if (err != KErrNone)
-		{
-		return err;
-		}
-
-	return KErrNone;
-	}
-#ifdef WCDMA_STUB
-
-TInt CIPv6ProtocolIf::DeleteContext(TDes8& aContextParameters)
-/**
- * Deletes a context. As the NIF is responsible for one primary context,
- * this is equivalent to closing down the NIF.
- *
- * @param aContextParameters Parameters of the context to delete
- * @return KErrArgument if an incorrect structure is passed, otherwise KErrNone
- */
-	{
-	_LOG_L1C1(_L8("CIPv6ProtocolIf::DeleteContext"));
-
-	if (aContextParameters.Length() != sizeof(TContextParameters))
-		{
-		return KErrArgument;
-		}
-
-	TUint8* ptr = CONST_CAST(TUint8*, aContextParameters.Ptr());
-	TContextParameters* params = REINTERPRET_CAST(TContextParameters*, ptr);
-
-	if (params->iContextInfo.iContextId != 
-		STATIC_CAST(TInt8, GetNifMain().GetBcaController()->Nsapi()))
-		{
-		params->iReasonCode = KErrBadName;
-		}
-	else
-		{
-		params->iReasonCode = KErrNone; 
-		GetNifMain().Stop(KErrNone, MNifIfNotify::EDisconnect);
-		}
-
-	return KErrNone;
-	}
-
-#endif
-
-void CIPv6ProtocolIf::ReadCommDbGprsSettingsL()
-/**
- * Reads GPRS IP settings from CommDB via the agent.
- */
-	{
-	_LOG_L1C1(_L8("CIPv6ProtocolIf::ReadCommDbGprsSettings"));
-	
-	// Read he DNS addresses..
-	ReadIPv6SettingL(TPtrC(GPRS_IP6_NAME_SERVER1), iSettings.iPrimaryDns);
-	ReadIPv6SettingL(TPtrC(GPRS_IP6_NAME_SERVER2), iSettings.iSecondaryDns);	
-	// Read whether to get the DNS addresses from the server.
-	_BTT_LEAVEIFERROR(GetNifMain().GetAgent()->ReadBool(
-		TPtrC(GPRS_IP6_DNS_ADDR_FROM_SERVER),
-		iSettings.iGetDnsFromServer));
-	
-	// Read whether to get IPv4 address from the server
-	// This is only needed for the integration tests. If it's true then 
-	// the IPv4 address will be used to build up the IPv6 address. 
-	_BTT_LEAVEIFERROR(GetNifMain().GetAgent()->ReadBool(
-		TPtrC(GPRS_IP_ADDR_FROM_SERVER),
-		iSettings.iGetIpFromServer));
-		
-
-	if (iSettings.iGetIpFromServer == EFalse)
-		{
-		// Sets the IPv6 Link-local address from IpAddr.
-		// LocalId is derived from IpAddr and it's further used to set the Link-local
-		// address elsewhere by adding a prefix (FE80::) in front.
-		// For IpAddr: 192.168.1.1, link-local address will be FE80::C0A8:101.
-		TUint32 ipAddr;	
-		ReadIPv4SettingL(TPtrC(GPRS_IP_ADDR), ipAddr);
-		const TUint8 constantId[8] = { 0, 0, 0, 0, 
-									ipAddr >> 24, (ipAddr >> 16) & 0xFF, 
-									(ipAddr >> 8) & 0xFF, ipAddr & 0xFF }; 
-		iSettings.iLocalIfId.SetAddr(constantId, sizeof (constantId));
-		}
-	else
-		{
-			
-		//
-		// Use the 64 bit id of MARM machines as our interface id
-		//
-		TMachineInfoV1Buf machineInfo;	
-		UserHal::MachineInfo(machineInfo);
-		iSettings.iLocalIfId.SetAddr(machineInfo().iMachineUniqueId);
-		iSettings.iLocalIfId.SetUniversalBit(0);
-		//
-		// In WINS environment the id is zero which is no-no
-		//
-		if (iSettings.iLocalIfId.IsZero())
-			{
-			iSettings.iLocalIfId.SetAddrRandomNZ();
-			}		
-
-		}
-	}
-
-void CIPv6ProtocolIf::UpdateContextConfigL(const
-										  RPacketContext::TContextConfigGPRS&
-										  aConfig)
-/**
- * Called when the context has been activated to set our IP address and get
- * any other required settings from CommDB.
- *
- * @param aConfig The new context config
- */
-	{
-	_LOG_L1C1(_L8("CIPv6ProtocolIf::UpdateContextConfig"));
-
-	// Get the settings which are stored in CommDB.
-	ReadCommDbGprsSettingsL();
-
-	// Get our IP address from the GPRS context config.
-	TInetAddr address;
-	
-	TBuf<RPacketContext::KMaxPDPAddressLength> tempAddr;
-	tempAddr.Copy(aConfig.iPdpAddress);
-	TInt ret = address.Input(tempAddr);
-
-	// We've got our IP address! Let's save it.
-	if (ret == KErrNone)
-		{
-		iSettings.iLocalAddr = address.Ip6Address();
-		LOG_IP_ADDRESS("Got local IP address", iSettings.iLocalAddr);
-		}
-	else
-		{
-		_LOG_L2C2(_L8("Couldn't get IP address from GPRS config (err: %d)"),
-			ret);
-
-		// Don't leave on this error: we may still be OK if we read some
-		// settings from CommDB.
-		}
-
-	// @todo - is this correct. We can only get the DNS addresses
-	// from the TSY using the iProtocolConfigOption data. Yet a client could
-	// access those DNS config details without knowing about the state of the
-	// iSettings.iGetDnsFromServer flag.
-
-	if ((iSettings.iGetDnsFromServer) ||
-		((iSettings.iPrimaryDns.IsUnspecified()) &&
-		 (iSettings.iSecondaryDns.IsUnspecified())) ) 
-		{
-		TBuf<RPacketContext::KMaxPDPAddressLength> tempAddr;
-		tempAddr.Copy(aConfig.iProtocolConfigOption.iDnsAddresses.iPrimaryDns);
-		ret = address.Input(tempAddr);
-
-		if (ret == KErrNone)
-			{
-			iSettings.iPrimaryDns = address.Ip6Address();
-			LOG_IP_ADDRESS("Got primary DNS", iSettings.iPrimaryDns);
-			}
-		else
-			{
-			_LOG_L2C2(_L8("Couldn't get primary DNS address from GPRS config (err: %d)"),
-				ret);
-
-			// Don't leave on this error: we may still be OK if we read some
-			// settings from CommDB.
-			}
-
-		tempAddr.Copy(aConfig.iProtocolConfigOption.iDnsAddresses.iSecondaryDns);
-		ret = address.Input(tempAddr);
-
-		if (ret == KErrNone)
-			{
-			iSettings.iSecondaryDns = address.Ip6Address();
-			LOG_IP_ADDRESS("Got secondary DNS", iSettings.iPrimaryDns);
-			}
-		else
-			{
-			_LOG_L2C2(_L8("Couldn't get secondary DNS address from GPRS config (err: %d)"),
-				ret);
-
-			// Don't leave on this error: we may still be OK if we read some
-			// settings from CommDB.
-			}
-		}
-	else
-		{
-		LOG_IP_ADDRESS("Using CommDB DNS address - Primary ", iSettings.iPrimaryDns);
-		LOG_IP_ADDRESS("                         - Secondary ", iSettings.iSecondaryDns);
-		}
-	}
-
-void CIPv6ProtocolIf::UpdateConnectionSpeed(TUint aConnectionSpeed)
-/**
- * Sets the speed metric to return to TCP/IP, based on what the TSY tells us.
- *
- * @param aConnectionSpeed Our connection speed
- */
-	{
-	_LOG_L1C1(_L8("CIPv6ProtocolIf::UpdateConnectionSpeed"));
-
-	iSpeedMetric = aConnectionSpeed;
-	}
-
-void CIPv6ProtocolIf::ReadIPv4SettingL(const TDesC& aFieldName,
-									   TUint32& aIpAddr)
-/**
- * Reads an IPv4 address from CommDB, via the TRP agent. It leaves if an error
- * other than KErrNotFound occurs.
- *
- * @param aFieldName The name of the field to read
- * @param aIpAddr Will contain the IP address
- */
-	{
-#ifdef __BTT_LOGGING__
-	TBuf8<256> debugBuffer;
-	debugBuffer.Copy(aFieldName);
-	_LOG_L1C2(_L8("CIPv6ProtocolIf::ReadIp4Setting [aFieldName=%S]"),
-		&debugBuffer);
-#endif
-
-	TBuf<KCommsDbSvrMaxFieldLength> name;
-	TInetAddr ip4Addr;
-
-	TInt ret = GetNifMain().GetAgent()->ReadDes(aFieldName, name);
-
-	if (ret == KErrNone)
-		{
-		// We've successfully read an IP address, so convert it into a number.
-		ip4Addr.Input(name);
-		aIpAddr = ip4Addr.Address();
-		}
-	else
-		{
-		// We couldn't get the IP address, so set it to 0.0.0.0. Note that we
-		// only leave here if we got a more serious error than "not found".
-		aIpAddr = 0;
-		if (ret != KErrNotFound)
-			{
-			_BTT_LEAVEIFERROR(ret);
-			}
-		}
-	}
-
-void CIPv6ProtocolIf::ReadIPv6SettingL(const TDesC& aFieldName,
-									   TIp6Addr& aIpAddr)
-/**
- * Reads an IPv6 address from CommDB, via the TRP agent. It leaves if an error
- * other than KErrNotFound occurs.
- *
- * @param aFieldName The name of the field to read
- * @param aIpAddr Will contain the IP address
- */
-	{
-#ifdef __BTT_LOGGING__
-	TBuf8<256> debugBuffer;
-	debugBuffer.Copy(aFieldName);
-	_LOG_L1C2(_L8("CIPv6ProtocolIf::ReadIp6Setting [aFieldName=%S]"),
-		&debugBuffer);
-#endif
-
-	TBuf<KCommsDbSvrMaxFieldLength> name;
-	TInetAddr ip6Addr;
-
-	TInt ret = GetNifMain().GetAgent()->ReadDes(aFieldName, name);
-
-	if (ret == KErrNone)
-		{
-		// We've successfully read an IP address, so convert it into a number.
-		ip6Addr.Input(name);
-		aIpAddr = ip6Addr.Ip6Address();
-		}
-	else
-		{
-		// We couldn't get the IP address, so set it to 0.0.0.0. Note that we
-		// only leave here if we got a more serious error than "not found".
-		aIpAddr = KInet6AddrNone;
-		if (ret != KErrNotFound)
-			{
-			_BTT_LEAVEIFERROR(ret);
-			}
-		}
-	}
-
-TInt CIPv6ProtocolIf::Send(RMBufChain& aPdu, TAny* aSource)
-/**
- * Called by the protocol to send an outgoing IP packet to the network.
- *
- * @param aPdu The outgoing packet
- * @param aSource The source of the packet
- * @return Standard error codes
- */
-	{
-	_LOG_L1C1(_L8("CIPv6ProtocolIf::Send"));
-
-#ifdef __BTT_LOGGING__
-	LogPacket(aPdu);
-#endif
-
-	// Return <0: an error occurred
-	// Return  0: no error, but don't send any more packets
-
-	return GetNifMain().SendPacket(aPdu, aSource, KIp6FrameType);
-	}
-
-void CIPv6ProtocolIf::Info(TNifIfInfo& aInfo) const
-/**
- * Called by the protocol to get information about the NIF.
- *
- * @param aInfo Will contain NIF information
- */
-	{
-	_LOG_L1C1(_L8("CIPv6ProtocolIf::Info"));
-
-	// The parent class sets everything except the name...
-	CProtocolIfBase::Info(aInfo);
-	// ...which we set here.
-	WriteIfName(aInfo.iName);
-	}
-
-TInt CIPv6ProtocolIf::Notification(TAgentToNifEventType /*aEvent*/, 
-	void* /*aInfo*/)
-/**
- * The Nif will ignore any notification sent
- *
- * @param aEvent Not used
- * @param aInfo Not used 
- */
-	{
-	_LOG_L1C1(_L8("CIPv6ProtocolIf::Notification"));
-
-	return KErrNone;
-	}
-
-void CIPv6ProtocolIf::StartSending(CProtocolBase* aProtocol)
-/**
- * Indicates to the protocol layer that the NIF is ready to send packets.
- *
- * @param aProtocol A pointer to a protocol
- */
-	{
-	_LOG_L1C2(_L8("CIPv6ProtocolIf::StartSending [aProtocol=%X]"), aProtocol);
-
-	CProtocolIfBase::StartSending(aProtocol);
-	}
-
-TBool CIPv6ProtocolIf::WantsProtocol(TUint16 aProtocolCode)
-/**
- * Indicates the type of protocol implemented by this class.
- *
- * @param aProtocolCode The protocol type
- */
-	{
-	_LOG_L1C2(_L8("CIPv6ProtocolIf::WantsProtocol [aProtocolCode=%X]"),
-		aProtocolCode);
-
-#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
-	return ((aProtocolCode & 0x00FF) == KIp6FrameType);
-#else
-	(void) aProtocolCode; // disable compiler warning
-	return ETrue;
-#endif // RAWIP_HEADER_APPENDED_TO_PACKETS
-	}
-
-void CIPv6ProtocolIf::Process(RMBufChain& aPdu)
-/**
- * Called when an incoming IP packet has arrived. Send packets up to the
- * TCP/IP stack.
- *
- * @param aPdu The incoming packet
- */
-	{
-	_LOG_L1C1(_L8("CIPv6ProtocolIf::Process"));
-
-#ifdef __BTT_LOGGING__
-	LogPacket(aPdu);
-#endif
-
-	// Pass incoming packets up to the protocol, unless it hasn't
-	// been bound yet.
-	if (iProtocol)
-		{
-		_LOG_L1C1(_L8("CIPv6ProtocolIf: Packet Sent to TCP/IP Protocol!!!"));
-		iProtocol->Process(aPdu, reinterpret_cast<CProtocolBase*>(this));
-		}
-	else 
-		{
-		_LOG_L2C1(_L8("WARNING: dumping incoming packet, no protocol bound"));
-		aPdu.Free();
-		}
-	}
-
-#ifdef __BTT_LOGGING__
-void CIPv6ProtocolIf::LogPacket(const RMBufChain& aPacket)
-/**
-* Logs packet information into log file.
-*
-* @param aPacket The packet 
-*/
-	{
-	_LOG_L1C1(_L8("CIPv6ProtocolIf::LogPacket"));
-
-	TInt mBufLength = aPacket.Length() - aPacket.First()->Length();
-
-	_LOG_L3C2(_L8("Analysis of %d byte packet:"), mBufLength);
-
-	//Note: All the constants used on this method are a pragmatic guess of the
-	//IP header fields. The only porpose of this method is logging.
-
-	if (mBufLength < 40)
-		{
-		_LOG_L3C2(_L8(" -doesn't appear to be a valid IPv6 packet (length=%d)")
-			, mBufLength);
-		return;
-		}
-
-	// Get a pointer to the packet's payload.
-	const TUint8* payloadPtr = aPacket.First()->Next()->Ptr();
-
-	if ((payloadPtr[0] & 0xF0) != 0x60)
-		{
-		_LOG_L3C2(_L8(" - doesn't appear to be an IPv6 packet (version=0x%X)"),
-			(payloadPtr[0] & 0xF0) >> 4);
-		return;
-		}
-
-	_LOG_L3C2(_L8(" - traffic class: 0x%X"), 
-					((payloadPtr[0] & 0xF) << 4) | ((payloadPtr[1] & 0xF0) >> 4));
-	_LOG_L3C2(_L8(" - flow label: 0x%X"), 
-					((payloadPtr[1] & 0x0F) << 16) | (payloadPtr[2] << 8) | payloadPtr[3]);
-	_LOG_L3C2(_L8(" - payload length: 0x%X"), 
-					(payloadPtr[4] << 16) | payloadPtr[5]);
-	_LOG_L3C2(_L8(" - next header: 0x%08X"), payloadPtr[6]);
-	_LOG_L3C2(_L8(" - hop limit: 0x%08X"), payloadPtr[7]);
-	}
-#endif // __BTT_LOGGING__
--- a/telephonyprotocols/rawipnif/version1/src/ProtocolIfBase.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,159 +0,0 @@
-// Copyright (c) 2002-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:
-// This file implements the base class for the protocol interface classes.
-// 
-//
-
-/**
- @file
-*/
-
-#include <nifmbuf.h>
-#include "ProtocolIfBase.h"
-#include "RawIPNifMain.h"
-
-CProtocolIfBase::CProtocolIfBase(CRawIPNifMain& aNifMain, CBttLogger* aTheLogger)
-/**
- * Constructor
- *
- * @param aNifMain A pointer to CRawIPNifMain
- */
-	:iNifMain(aNifMain),
-	 iTheLogger(aTheLogger)
-	{
-	}
-
-CProtocolIfBase::~CProtocolIfBase()
-/**
- * Destructor
- */
-	{
-	}
-
-void CProtocolIfBase::BindL(TAny *aId)
-/**
- * Binds TCP/IP protocol to Nif
- *
- * @param aId A pointer to protocol object 
- */
-
-	{
-	_LOG_L1C2(_L8("CProtocolIfBase::BindL [aId=%X]"), aId);
-
-	if (iProtocol)
-		_BTT_PANIC(KNifName, KNifProtocolInUse);
-	iProtocol = reinterpret_cast<CProtocolBase*>(aId);
-	}
-
-TInt CProtocolIfBase::State()
-/**
- * Used to retrieve the Nif state
- *
- * @return The Nif state
- */
-	{
-	_LOG_L1C1(_L8("CProtocolIfBase::State"));
-
-	return GetNifMain().State();
-	}
-
-TInt CProtocolIfBase::Control(TUint aLevel, TUint aName, TDes8& aOption, TAny* aSource)
-/**
- * This method will call the control method in IPv4Protocol
- *
- */
-	{
-	_LOG_L1C1(_L8("CProtocolIfBase::Control"));
-
-	return GetNifMain().Control(aLevel, aName, aOption, aSource);
-	}
-
-TInt CProtocolIfBase::Send(RMBufChain& aPdu, TAny* aSource)
-/**
- * Send and IP packet. This method is overriden by the IPv4ProtocolIf class.
- *
- * @param aPdu The outgoing packet
- * @param aSource The source of the packet
- * @return Standard error codes
- */
-	{
-	_LOG_L1C1(_L8("CProtocolIfBase::Send"));
-
-	return GetNifMain().Send(aPdu, aSource);
-	}
-
-void CProtocolIfBase::Info(TNifIfInfo& aInfo) const
-/**
- * Used to retrieved Nif information
- *
- * @param aInfo Nif Information structure
- */
-	{
-	_LOG_L1C1(_L8("CProtocolIfBase::Info"));
-
-	aInfo.iVersion = TVersion(KNifMajorVersionNumber, KNifMinorVersionNumber,
-		KNifBuildVersionNumber);
-	aInfo.iFlags = KNifIfIsBase | KNifIfUsesNotify | KNifIfCreatedByLink;
-	// Doesn't fill in aInfo.iName, as this is done by derived classes.
-	aInfo.iProtocolSupported = KProtocolInetIp;
-	}
-
-TInt CProtocolIfBase::Notification(TAgentToNifEventType /*aEvent*/, void* /*aInfo*/)
-/**
- * Method overidden by the notification method on IPv4ProtocolIf class.
- *
- * @param aEvent Not used
- * @param aInfo Not used 
- */
-	{
-	_LOG_L1C1(_L8("CProtocolIfBase::Notification"));
-
-	return KErrNone;
-	}
-
-void CProtocolIfBase::StartSending(CProtocolBase* /*aProtocol*/)
-/**
- * Indicates to the protocol layer that the NIF is ready to send packets.
- *
- * @param aProtocol A pointer to a protocol
- */
-	{
-	_LOG_L1C1(_L8("CProtocolIfBase::StartSending"));
-
-	// Default implementation.
-	// Uses iProtocol instead aProtocol.
-	iProtocol->StartSending(reinterpret_cast<CProtocolBase*>(this));
-	}
-
-
-void CProtocolIfBase::UpdateContextConfigL(const
-	RPacketContext::TContextConfigGPRS& /*aConfig*/)
-/**
- * Method overidden by UpdateContextConfig on IPv4ProtocolIf class
- *
- * @param aConfig Not used
- */
-	{
-	// Default implementation does nothing.
-	}
-
-void CProtocolIfBase::UpdateConnectionSpeed(TUint /*aConnectionSpeed*/)
-/**
- * Method overidden by UpdateConnectionSpeed on IPv4ProtocolIf class
- *
- * @param aConnectionSpeed Not used
- */
-	{
-	// Default implementation does nothing.
-	}
--- a/telephonyprotocols/rawipnif/version1/src/RawIPNifMain.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,670 +0,0 @@
-// Copyright (c) 2002-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:
-// Implements the CRawIPNifMain class, which provides a central point for the NIF
-// to communicate with NifMan and the BCA controllers. This class creates an interface
-// to the IPv4 protocol when it is required.
-// 
-//
-
-/**
- @file
-*/
-
-#include <f32file.h>
-#include <nifman.h>
-#include <nifmbuf.h>
-#include <in_iface.h>
-#include <nifvar.h>
-#include "IPv4ProtocolIf.h"
-#include "IPv6ProtocolIf.h"
-#include "RawIPNifMain.h"
-
-#ifdef __FLOG_ACTIVE
-//These variables are used only if flog is active.
-_LIT8(KTcpDumpFirstTag,"TcpDump");
-static const TUint16 KTcpDumpLinkType = 12;
-#endif
-
-CRawIPNifMain::CRawIPNifMain(CNifIfFactory& aFactory, MNifIfNotify* aNotify, CBttLogger* aTheLogger)
-/**
- * Constructor.
- *
- * @param aFactory Reference to the factory which created this object.
- * @param aTheLogger The logging object, ownership is passed to this object
- */
-	: CNifIfLink(aFactory), 
-	  iTheLogger(aTheLogger),
-	  iInitError(KErrNone), 
-	  iState(EIfDown)
-	{
-	// To aid debugging.
-	iNotify = aNotify;
-	}
-
-void CRawIPNifMain::Info(TNifIfInfo& aInfo) const
-/**
- * Provides information about the NIF.
- *
- * @param aInfo Information structure to be filled in
- */
-	{
-	_LOG_L1C1(_L8("CRawIPNifMain::Info"));
-
-	aInfo.iVersion = TVersion(KNifMajorVersionNumber, KNifMinorVersionNumber,
-		KNifBuildVersionNumber);
-	aInfo.iFlags = KNifIfIsBase | 
-				   KNifIfUsesNotify | 
-				   KNifIfIsLink |
-	               KNifIfCreatedByFactory |
-				   KNifIfCreatesBinder;
-	aInfo.iName = KRawIPNifName;
-	aInfo.iProtocolSupported = KProtocolUnknown;
-	}
-
-void CRawIPNifMain::ConstructL(const TDesC& /*aName*/)
-/**
- * Second-phase constructor. Creates the Etel
- * control engine
- *
- * @param aName The name of the NIF (unused)
- */
-	{
-	_LOG_L1C1(_L8("CRawIPNifMain::ConstructL"));
-
-	iBcaController = CBcaIoController::NewL(*this, iTheLogger);
-	}
-
-CRawIPNifMain::~CRawIPNifMain()
-/**
- * Destructor. Cancels and deletes all owned active objects.
- */
-	{
-	// Note that we don't delete iProtocolIf because it's not owned by us.
-	delete iBcaController;
-	// This class also deletes the logging object
-	delete iTheLogger;
-	// Cleanup when stop was not called - harmless as it null's the pointer
-	__PACKETLOG_DELETE;
-	}
-
-TInt CRawIPNifMain::Control(TUint /*aLevel*/, TUint /*aName*/,
-                             TDes8& /*aOption*/, TAny* /*aSource*/)
-/**
- * Method to set up NIF parameters. This is unused; instead, the Control()
- * method on the IPv4 interface will be called to configure the NIF.
- *
- * @param aLevel The network level of the parameter to be set (unused)
- * @param aName The name of the parameter to be set (unused)
- * @param aOption The parameter to be written to (unused)
- * @param aSource The source of the method call (unused)
- * @return Always KErrNotSupported
- */
-	{
-	_LOG_L1C1(_L8("CRawIPNifMain::Control"));
-
-	return KErrNotSupported;
-	}
-
-TInt CRawIPNifMain::State()
-/**
- * Returns the current state of the NIF. This will be one of EIfUp or EIfDown.
- *
- * @return The state of the NIF
- */
-	{
-	_LOG_L1C1(_L8("CRawIPNifMain::State"));
-
-	return iState;
-	}
-
-TInt CRawIPNifMain::Start()
-/**
- * Starts the NIF up. This process involves connecting to the BCA.  When startup is
- * complete, LinkLayerUp() will be called.
- *
- * @return Allways KErrNone
- */
-	{
-	_LOG_L1C1(_L8("CRawIPNifMain::Start"));
-
-	TRAPD(err1,InitialiseL(MControllerObserver::EStart, KErrNone));
-	if (err1)
-		{
-		return err1;
-		}
-	
-	
-	//the name calculation should be done only if logging is enabled
-#ifdef __FLOG_ACTIVE
-	const TUint KModemNameLen = KCommsDbSvrMaxColumnNameLength + 10;  // need enough for ppp-XXX.txt - e.g. ppp-comm-1.txt, ppp-btcomm-10.txt etc
-	TBuf8<KModemNameLen> modemName;
-	
-	//first add modem name
-	_LIT(KModemPortName, "ModemBearer\\PortName");
-	_LIT8(KStupidCharacters, "::");
-	iNotify->ReadDes(KModemPortName, modemName);
-	const TInt pos = modemName.FindC((const TDesC8&)KStupidCharacters);
-	if(pos != KErrNotFound)
-		{
-		modemName.Delete(pos, 2);
-		}
-		
-	//append time stamp
-	const TUint KTimeStampLen = 8;
-	TBuf8<KTimeStampLen> logFileName;
-	
-	_LIT8(KTimeFormat, "%08X");
-	TUint32 counter = User::FastCounter();
-	logFileName.Format(KTimeFormat, counter);
-		
-	TRAPD(err,__PACKETLOG_NEWL(KTcpDumpFirstTag, logFileName, CPacketLogger::ETcpDump, KTcpDumpLinkType));
-	if (err)
-		{
-		_LOG_L1C1(_L8("Trapped leave from __PACKETLOG_NEWL"));
-		}
-	
-	const TUint KLogTextLen = KModemNameLen+KTimeStampLen+30;
-	TBuf8<KLogTextLen> logText;
-	_LIT8(KLogTimeText, "TcpDump log file time stamp:");
-	_LIT8(KLogModemText, " for modem:");
-	logText.Append(KLogTimeText);
-	logText.Append(logFileName);
-	logText.Append(KLogModemText);
-	logText.Append(modemName);
-	_LOG_L1C1(logText);
-#endif
-
-	return KErrNone;
-	}
-
-
-void CRawIPNifMain::LinkLayerUp()
-/**
- * This function is called when initialisation is complete and the NIF is
- * ready to send/receive data. It notifies NifMan and the IP interface that it's
- * ready to go.
- */
-	{
-	_LOG_L1C1(_L8("CRawIPNifMain::LinkLayerUp"));
-
-	iState = EIfUp;
-	iNotify->LinkLayerUp();
-
-	iNotify->IfProgress(KLinkLayerOpen, KErrNone);
-
-	iProtocolIf->StartSending(reinterpret_cast<CProtocolBase*>(this));
-	}
-
-void CRawIPNifMain::LinkLayerDown(TInt aError)
-/**
- * This function is called when the context has been deactivated and the NIF
- * is ready to be deleted, or if there is an error on startup. Its job is to
- * notify NifMan that the link has gone down, so it can delete the NIF.
- *
- * @param aError An error code to propagate to NifMan
- */
-	{
-	_LOG_L1C2(_L8("CRawIPNifMain::LinkLayerDown [aError=%d]"), aError);
-
-	iState = EIfDown;
-
-	iNotify->IfProgress(KLinkLayerClosed, aError);
-
-	iNotify->LinkLayerDown(aError, MNifIfNotify::EDisconnect);
-	}
-
-void CRawIPNifMain::Stop(TInt aError, MNifIfNotify::TAction /*aAction*/)
-/**
- * This function is called by NifMan to bring down the link. It starts
- * the asynchronous context deactivation process; LinkLayerDown() will be
- * called when the context has been deactivated.
- *
- * @param aError A code specifying why the link is to be brought down
- * @param aAction The action to take: disconnect or reconnect
- */
-	{
-	_LOG_L1C2(_L8("CRawIPNifMain::Stop [aError=%d]"), aError);
-	__PACKETLOG_DELETE;
-	ShutDown(MControllerObserver::EInitialised, aError);
-	}
-
-void CRawIPNifMain::Restart(CNifIfBase* /*aIf*/)
-/**
- * This is just an empty implementation of the CNifIfLink derived method.
- * It is used as part of functionality to allow a NIF to specify that
- * one of its binders has gone down but the link layer has not.
- *
- * @param Pointer to the protocol interface object
- */
-	{
-	_LOG_L1C1(_L8("CRawIPNifMain::Restart called"));
-	}
-
-TInt CRawIPNifMain::Send(RMBufChain& /*aPdu*/, TAny* /*aProtocol*/)
-/**
- * Unused. The Send() method on the IPv4 protocol interface should be used
- * to send IPv4 packets.
- *
- * @return Always KErrNotSupported
- */
-	{
-	_LOG_L1C1(_L8("CRawIPNifMain::Send"));
-
-	// Only the bearers' Send functions should be called.
-	return KErrNotSupported;
-	}
-
-TInt CRawIPNifMain::SendPacket(RMBufChain& aPdu, TAny* /*aProtocol*/,
-							   TUint16 /*aType*/)
-/**
- * Sends a packet, via the BCA controller. This method is protocol-agnostic,
- * and is called by the IPv4 protocol interface to actually send packets.
- *
- * @param aPdu The packet to send
- * @return A standard error code
- */
-	{
-	_LOG_L1C2(_L8("CRawIPNifMain::SendPacket [length=%d]"),
-		aPdu.Length() - aPdu.First()->Length());
-
-	__PACKETLOG_WRITE_PACKET(aPdu, 0);
-	TInt ret = iBcaController->Send(aPdu);
-	
-	return ret;
-	}
-
-void CRawIPNifMain::Process(RMBufChain& aPdu, TUint16 aProtocolCode)
-/**
- * Handles incoming packets which have been passed up from the BCA controller.
- * If the IPv4 interface wants to process the packet, it hands it on; otherwise,
- * the packet is binned.
- *
- * @param aPdu The incoming packet
- */
-	{
-	_LOG_L1C2(_L8("CRawIPNifMain::Process [aPdu length=%d]"),
-		aPdu.Length() - aPdu.First()->Length());
-
-	// If the packet has zero or negative length, bin it.
-	if ((aPdu.Length() - aPdu.First()->Length()) <= 0)
-		{
-		_LOG_L1C1(_L8("Dumped packet: illegal length"));
-		aPdu.Free();
-		return;
-		}
-
-	// See if the protocol interface wants the packet.
-	if (iProtocolIf->WantsProtocol(aProtocolCode)) 
-		{
-		__PACKETLOG_WRITE_PACKET(aPdu, 0);
-		iProtocolIf->Process(aPdu);
-		}
-	else
-		{
-		// The protocol didn't want the packet, so bin it.
-		_LOG_L1C2(_L8("Packet was not processed: freeing (protocol code: %X)"),
-			aProtocolCode);
-		aPdu.Free();
-		}
-	}
-
-void CRawIPNifMain::ResumeSending()
-/**
- * Notifies the protocol interface that it can resume sending packets.
- */
-	{
-	_LOG_L1C1(_L8("CRawIPNifMain::ResumeSending"));
-
-	iProtocolIf->StartSending(reinterpret_cast<CProtocolBase*>(this));
-	}
-
-void CRawIPNifMain::AuthenticateComplete(TInt /*aResult*/)
-/**
- * Notifies NifMan when authentication is complete. This function is never
- * actually called.
- *
- * @param aResult The result of the authentication (unused)
- */
-	{
-	_LOG_L1C1(_L8("CRawIPNifMain::AuthenticateComplete"));
-	}
-
-TInt CRawIPNifMain::Notification(TAgentToNifEventType aEvent,
-								  void* aInfo)
-/**
- * Provides a mechanism for the notification of events. 
- *
- * @param aEvent The event type (unused)
- * @param aInfo Event information (unused)
- */
-	{
-	_LOG_L1C2(_L8("CRawIPNifMain::Notification [%d]"), aEvent);
-
-	
-	switch (aEvent)
-	{
-	case (EAgentToNifEventTypeDisableTimers) : //GPRS suspension
-		{
-		_LOG_L1C1(_L8("CRawIPNifMain::Received Suspend from Agent..."));
-
-		// Let the BCA controller know that data can no longer be sent over
-		// the PDP context.
-		iBcaController->UpdateContextStateFlag(EFalse);
-
-		break;
-		}
-				
-	case (EAgentToNifEventTypeEnableTimers) : //GPRS resumption
-		{
-		_LOG_L1C1(_L8("CRawIPNifMain::Received Resume from Agent..."));
-		iBcaController->UpdateContextStateFlag(ETrue);
-
-		break;
-		}
-			
-	case (EAgentToNifEventTsyConfig) : 
-		{
-		_LOG_L1C1(_L8("CRawIPNifMain::Received context config from Agent..."));
-		
-		RPacketContext::TContextConfigGPRS* localPtr = (reinterpret_cast<RPacketContext::TContextConfigGPRS*>(aInfo));
-
-		TRAPD(err, GetProtocolIf()->UpdateContextConfigL(*localPtr));
-
-		if (err)
-			{
-			_LOG_L1C1(_L8("Trapped leave from UpdateContextConfigL"));
-			}
-		break;
-		}
-			
-	case (EAgentToNifEventTsyConnectionSpeed) : 
-		{
-		TUint connectionSpeed = reinterpret_cast<TUint>(aInfo);
-		_LOG_L1C2(_L8("CRawIPNifMain::Connection Speed Received [%d]"), connectionSpeed);
-
-		GetProtocolIf()->UpdateConnectionSpeed(connectionSpeed);
-		break;
-		}
-			
-	case (EAgentToNifEventTypeDisableConnection) :
-		{
-		// This is handled by NIFMAN and passed to NifMain as a Stop() call
-		_LOG_L1C1(_L8("CRawIPNifMain::Received Disable connection from Agent..."));
-		break;
-		}
-			
-	case (EAgentToNifEventTypeGetDataTransfer) :
-		{
-		_LOG_L1C1(_L8("CRawIPNifMain::Received Get Data Transfer from Agent..."));
-		break;
-		}
-			
-	default : 
-		{
-		_LOG_L1C2(_L8("CRawIPNifMain::Received Notification [%d] from Agent..."), aEvent);
-		break;
-		}
-	}
-
-	return KErrNone;
-	}
-
-void CRawIPNifMain::BindL(TAny *aId)
-/**
- * Called by NifMan to bind the NIF to a specific protocol. This is never
- * actually called; instead, the BindL() function of the IPv4 interface is used.
- *
- * @param aId A pointer to the protocol to be bound to
- * @leave KErrAlreadyExists when already bound
- */
-	{
-	_LOG_L1C2(_L8("CRawIPNifMain::BindL [aId=%X]"), aId);
-	
-	if (iProtocol)
-		{
-		User::Leave(KErrAlreadyExists);
-		}
-	iProtocol = reinterpret_cast<CProtocolBase*>(aId);
-	}
-
-CNifIfBase* CRawIPNifMain::GetBinderL(const TDesC& aName)
-/**
- * Creates a new protocol interface, for supported protocols. This is currently
- * only IPv4 and ICMP, both of which use the IPv4 protocol interface class.
- *
- * @param aName The name of the protocol
- * @return A newly created protocol interface object
- * @leave KErrNotSupported if protocol is not supported
- */
-	{
-#ifdef __BTT_LOGGING__
-	TBuf8<256> debugBuffer;
-	debugBuffer.Copy(aName);
-	_LOG_L1C2(_L8("CRawIPNifMain::GetBinderL [aName=%S]"), &debugBuffer);
-#endif
-
-	// IPv4 and ICMP Protocols.
-	if (!aName.CompareF(KDescIp) || !aName.CompareF(KDescIcmp))
-		{
-		if (!iProtocolIf)
-			{
-			iProtocolIf = new (ELeave) CIPv4ProtocolIf(*this, iTheLogger);
-#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS			
-			iBcaController->SetType(KIp4FrameType);
-#endif // RAWIP_HEADER_APPENDED_TO_PACKETS
-			}
-		}
-	// IPv6 Protocol
-	else if (!aName.CompareF(KDescIp6))
-		{
-		if (!iProtocolIf)
-			{
-			iProtocolIf = new (ELeave) CIPv6ProtocolIf(*this, iTheLogger);
-#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS			
-			iBcaController->SetType(KIp6FrameType);
-#endif // RAWIP_HEADER_APPENDED_TO_PACKETS
-			}
-		}		
-	else
-		{
-		User::Leave(KErrNotSupported);
-		}
-
-    return iProtocolIf;
-	}
-
-void CRawIPNifMain::InitialiseL(TInitialisationState aState, TInt aError)
-/**
- * This method controls the initialisation sequence of the different modules
- * in the NIF. When a module completes all the initialisation tasks it will 
- * call again this method with the new state. If an error occurs then the 
- * ShutDown() method will be called.
- *  
- * @param aState The current initialisation step
- * @param aError A possible error
- */	
-	{
-	_LOG_L1C3(_L8("CRawIPNifMain::InitialiseL [aState=%d ,aError=%d]"),
-		aState, aError);
-
-	if (aError != KErrNone)
-		{
-		_LOG_L2C2(_L8("  *** FAILED to initialise NIF *** Error =%d"),aError);
-	
-		// Initialise shutdown sequence
-		switch (aState)
-		{
-		case MControllerObserver::EBcaController:
-			ShutDown(MControllerObserver::EInitialised, aError);
-			break;
-		default:
-			_LOG_L2C3(_L8("ERROR CRawIPNifMain: Unknown state:%d in NIF: %S"), aState, &KNifName);
-			User::Leave(KErrUnknown);	
-			break;
-			}
-		return;
-		}
-	
-	switch (aState)
-		{
-	case MControllerObserver::EStart:
-		{
-		_LOG_L1C1(_L8("Calling Agent for TSY Config"));
-
-		GetAgent()->Notification(ENifToAgentEventTsyConfig, NULL);
-
-		_LOG_L1C1(_L8("Calling Agent for TSY Connection Speed"));
-		GetAgent()->Notification(ENifToAgentEventTsyConnectionSpeed, NULL);
-
-		//Read the port name from CommDB.
-		_LOG_L1C1(_L8("Attempting to read Port Name..."));
-		TBuf<2*KCommsDbSvrMaxColumnNameLength> columnName;
-		_LIT(KModemNameFormatText,"%s\\%s");
-		columnName.Format(KModemNameFormatText ,MODEM_BEARER,MODEM_PORT_NAME);
-		TName tempBuf;
-		GetAgent()->ReadDes(columnName,tempBuf);
-
-		_LOG_L1C2(_L8("Port details %S"),&tempBuf);
-		iBcaController->SetPort(tempBuf);
-
-		//Read the BCA name from CommDB.
-		columnName.Format(KModemNameFormatText ,MODEM_BEARER,BCA_STACK);
-        tempBuf.SetLength(0); // Clear the buffer in case the next ReadDes() fails
-		GetAgent()->ReadDes(columnName,tempBuf);
-		
-		_LOG_L1C2(_L8("bcaName details %S"),&tempBuf);
-		iBcaController->SetBcaStackAndName(tempBuf);
-
-		//Read IAPID from CommDB.
-		//IAP ID is used in BCA Ioctl method to set IapId for accessing CommDB.
-		TUint32 iapId(0);
-		columnName.Format(KModemNameFormatText ,IAP,COMMDB_ID);
-		GetAgent()->ReadInt(columnName,iapId);
-		_LOG_L1C2(_L8("IAP ID details %u"),iapId);
-		iBcaController->SetIapId(iapId);
-		
-		UpdateContextState(RPacketContext::EStatusActive, KErrNone);
-
-		iBcaController->StartL();
-		}
-		break;
-	case MControllerObserver::EBcaController:
-		_LOG_L1C1(_L8("  ***** NIF INITIALISED *****"));
-		LinkLayerUp();
-		break;
-	default:
-		_LOG_L2C3(_L8("ERROR CRawIPNifMain: Unknown state:%d in NIF: %S"), aState, &KNifName);
-		User::Leave(KErrUnknown);	
-		break;
-		}
-	}
-
-void CRawIPNifMain::ShutDown(TInitialisationState aState, TInt aError)
-/**
- * This method controls the shutdown sequence of the different modules
- * in the NIF. When a module completes all the shutdown tasks it will 
- * call again this method with the new state. 
- * 
- * @param aState The current state
- * @param aError A possible error (only during initialisation)
- */	
-	{
-	_LOG_L1C3(_L8("CRawIPNifMain::ShutDown [aState=%d ,aError=%d]"),
-		aState, aError);
-
-	if (aError != KErrNone)
-		{
-		// NIF is shutting down due to an error. 
-		// The error code must be stored in order to call linklayer down 
-		// passing that value
-		iInitError = aError;
-		}
-
-	switch (aState)
-		{
-	case MControllerObserver::EInitialised:
-		iBcaController->Stop(aError);
-		break;
-	case MControllerObserver::EBcaController:
-		LinkLayerDown(iInitError);
-		break;
-	default:
-		_LOG_L2C1(_L8("ERROR CRawIPNifMain: Unknown Shutdown step"));
-		_BTT_PANIC(KNifName,KNifUnknownShutDownState);
-		break;
-		}
-	}
-
-MNifIfNotify* CRawIPNifMain::GetAgent()
-/**
- * Returns a pointer to the MNifIfNotify class used to comunicate with the Agent 
- * 
- * @return a pointer to MNifIfNotify
- */
-	{
-	return iNotify;
-	}
-	
-CProtocolIfBase* CRawIPNifMain::GetProtocolIf()
-/**
- * Returns a pointer to the CIPv4ProtocolIf class
- * 
- * @return a pointer to a CProtocolIfBase derived class
- */
-	{
-	return iProtocolIf; 
-	}
-
-CBcaIoController* CRawIPNifMain::GetBcaController()
-/**
- * Returns a pointer to the CBcaIoController class
- * 
- * @return a pointer to CBcaIoController 
- */
-	{
-	return iBcaController;
-	}
-
-void CRawIPNifMain::UpdateContextState(
-	RPacketContext::TContextStatus aState, TInt /*aError*/)
-/**
- * Updates the state of the iContextState variable 
- * 
- * @param aState The new state
- * @param aError A possible error
- */
-	{
-	_LOG_L1C2(_L8("CRawIPNifMain::UpdateContextState [State=%d]"), aState);
-
-	// Note that we do not need to close the NIF down if there's been an
-	// error, as the context state machine will do this for us.
-	
-	iContextStatus = aState;
-	}
-
-void CRawIPNifMain::UpdateContextConfig(
-	RPacketContext::TContextConfigGPRS aConfig)
-/**
- * Updates the state of the iContextConfig variable 
- * 
- * @param aConfig The new config
- */
-	{
-	_LOG_L1C1(_L8("CRawIPNifMain::UpdateContextConfig"));
-
-	// Note that we do not need to close the NIF down if there's been an
-	// error, as the context state machine will do this for us.
-	
-	iContextConfig = aConfig;
-	}
--- a/telephonyprotocols/rawipnif/version1/src/RawIPNifMainFactory.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-// Copyright (c) 2002-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:
-// Implements the factory class which is used to instantiate the RAW IP NIF.
-// 
-//
-
-/**
- @file
-*/
-
-#include <f32file.h>
-#include "RawIPNifMainFactory.h"
-#include "RawIPNifMain.h"
-#include "bttlog.h"
-
-void CRawIPNifMainFactory::InstallL()
-/**
- * This function is pure virtual in CNifFactory, so we have to define it
- * here. It is called by NifMan before NewInterfaceL().
- * However, it doesn't do anything.
- */
-	{
-	}
-
-CNifIfBase* CRawIPNifMainFactory::NewInterfaceL(const TDesC& aName) 
-/**
- * Factory function which creates an instance of the RAW IP NIF.
- *
- * @param aName The name of the NIF
- * @return A newly instantiated RAW IP NIF
- */
-	{
-	return NewInterfaceL(aName, NULL);
-	}
-
-CNifIfBase* CRawIPNifMainFactory::NewInterfaceL(const TDesC& aName,MNifIfNotify* aNotify)
-/**
- * Factory function which creates an instance of the RAW IP NIF.
- *
- * @param aName The name of the NIF
- * @param aNotify supplies details from "IfParams" field in CommDb - not used in btt
- * @return A newly instantiated RAW IP NIF
- */
-	{
-#ifdef __BTT_LOGGING__
-	iTheLogger = CBttLogger::NewL(KNifSubDir, KRefFile, User::FastCounter());
-#endif // __BTT_LOGGING__
-
-	_LOG_L1C1(_L8("Raw IP.NIF logging started."));
-	_LOG_L1C2(_L8("         aNotify = %x"), aNotify);
-
- 	CRawIPNifMain* s = new (ELeave) CRawIPNifMain(*this, aNotify, iTheLogger);
-	CleanupStack::PushL(s);
-	s->ConstructL(aName);
-	CleanupStack::Pop(s);
-
-	return s;
-	}
-
-TInt CRawIPNifMainFactory::Info(TNifIfInfo& /*aInfo*/, TInt /*aIndex*/) const
-/**
- * This function is pure virtual in CNifFactory, so we have to define it
- * here. However, it doesn't do anything, and is never called by NifMan.
- *
- * @param aInfo Ignored
- * @param aIndex Ignored
- * @return Always KErrNone
- */
-	{
-	return KErrNone;
-	}
--- a/telephonyprotocols/rawipnif/version1/src/Receiver.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-// Copyright (c) 2002-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:
-// Implements the active object that controls the Read() requests.
-// 
-//
-
-/**
- @file
-*/
-
-#include "Receiver.h"
-#include "Constants.h"
-
-
-CReceiver::CReceiver(CBcaIoController& aObserver, CBttLogger* aTheLogger)
-/**
- * Constructor. Performs standard active object initialisation.
- *
- * @param aObserver Reference to the observer of this state machine
- * @param aTheLogger The logging object
- */
-	: CActive(EPriorityNormal), 
-	  iObserver(aObserver), 
-	  iTheLogger(aTheLogger)
-	{
-	CActiveScheduler::Add(this);
-	}
-
-CReceiver::~CReceiver()
-/**
- * Destructor.
- */
-	{
-	Cancel();
-	}
-
-void CReceiver::RunL()
-/**
- *  Method called when read request completes. This will only be once the BCA has a full IP 
- *  packet in its buffer.
- */
-	{
-	_LOG_L1C2(_L8("CReceiver::RunL [iStatus=%d]"), iStatus.Int());
-
-	if (iStatus!=KErrNone)
-		{
-		if(iStatus == KErrNoMemory)
-			{
-			_LOG_L2C1(
-				_L8("WARNING! CReceiver: Read failed with KErrNoMemory"));
-			// Read operation failed!! Nif will re-issue the read request.
-			StartListening();
-			}
-		else 
-			{
-			_LOG_L2C1(_L8("WARNING! CReceiver: Read failed"));
-			iObserver.Stop(iStatus.Int());
-			}
-		return;
-		}
-
-	_LOG_L1C1(_L8("CReceiver: Data Packet Received"));
-
-	// Process Ip packet
-	iObserver.Process(iData);
-
-	// The packet received was processed. NIF can start listening
-	// for another one.
-	StartListening();
-
-	}
-
-void CReceiver::DoCancel()
-/**
- *	Cancel active request
- */
-	{
-	_LOG_L1C1(_L8("CReceiver::DoCancel"));
-
-	(iObserver.Bca())->CancelRead(); 
-	}
-
-void CReceiver::StartListening()
-/**
- *  This method issues a Read request. This is the API used to receive 
- *  packets from BCA.  
- */
-	{
-	_LOG_L1C1(_L8("CReceiver::StartListening"));
-
-	// The BCA will complete this read once it has a full IP packet in its buffer.
-	(iObserver.Bca())->Read(iStatus, iData);
-
-	SetActive();
-	}
--- a/telephonyprotocols/rawipnif/version1/src/Sender.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,132 +0,0 @@
-// Copyright (c) 2002-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:
-// Implements the active object that controls the Write() requests. 
-// 
-//
-
-/**
- @file
-*/
-
-#include "Sender.h"
-#include "Constants.h"
-
-CSender::CSender(CBcaIoController& aObserver, CBttLogger* aTheLogger)
-/**
- * Constructor. Performs standard active object initialisation.
- *
- * @param aObserver Reference to the observer of this state machine
- */
-	: CActive(EPriorityNormal), 
-	  iObserver(aObserver),
-	  iTheLogger(aTheLogger)
-	{
-	CActiveScheduler::Add(this);
-	}
-
-CSender::~CSender()
-/**
- * Destructor.
- */
-	{
-	Cancel();
-	}
-
-void CSender::RunL()
-/**
- * This method checks if any error occured in the write operation.  
- */
-	{
-	_LOG_L1C2(_L8("CSender::RunL [iStatus=%d]"), iStatus.Int());
-
-	if (iStatus!=KErrNone)
-		{
-		if(iStatus == KErrNoMemory)
-			{
-			_LOG_L2C1(_L8("WARNING! CSender: Write failed with KErrNoMemory"));
-			_LOG_L2C1(_L8("WARNING! CSender: Ignoring packet!!!!"));
-			// Write operation failed!! Nif will ignore this packet.
-			iObserver.SendComplete();
-			}
-		else if (iStatus == KErrNotReady)
-			{
-			_LOG_L2C1(_L8("WARNING! CSender: Write failed with KErrNotReady"));
-			_LOG_L2C1(_L8("WARNING! CSender: Ignoring packet!!!!"));
-			// Write operation failed!! Nif will ignore this packet.
-			iObserver.SendComplete();
-			}
-		else
-			{
-			_LOG_L2C1(_L8("ERROR! CSender: Write failed!!!!"));
-			// Nif will shut down
-			iObserver.Stop(iStatus.Int());
-			}
-		return;
-		}
-
-	else
-		{
-		// The Ip packet was sent successfuly
-		_LOG_L1C1(_L8("***** CSender: Packet Sent."));
-		iObserver.SendComplete();
-		}
-	}
-
-void CSender::DoCancel()
-/**
- *	Cancel active request
- */
-	{
-	_LOG_L1C1(_L8("CSender::DoCancel"));
-
-	(iObserver.Bca())->CancelWrite(); 
-	}
-
-void CSender::Send(RMBufChain& aPdu)
-/**
- * Copies the specified RMBufChain into a descriptor and sends it.
- *
- * @param aPdu The IP packet to be sent.
- * @return KStopSending, or KErrArgument if the packet is too large.
- */
-	{
-	_LOG_L1C1(_L8("CSender::Send"));
-
-	// Copy the IP portion of the RMBufChain to the buffer.
-	iSendBuffer.SetMax();
-	aPdu.CopyOut(iSendBuffer, aPdu.First()->Length());
-
-#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
-	iObserver.AddHeader(iSendBuffer);
-#endif // RAWIP_HEADER_APPENDED_TO_PACKETS
-
-	aPdu.Free();
-
-	SendBuffer(iSendBuffer);
-	}
-
-void CSender::SendBuffer(const TDesC8& aBuffer)
-/**
- * Sends an IP packet, contained in the specified descriptor
- *
- * @param aBuffer The IP packet to send.
- * @return Always KStopSending.
- */
-	{
-	_LOG_L1C1(_L8("CSender::SendBuffer"));
-
-	// Finally, send the packet to BCA
-	(iObserver.Bca())->Write(iStatus, aBuffer);
-	SetActive();
-	}
--- a/telephonyprotocols/rawipnif/version1/src/bttlog.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,210 +0,0 @@
-// Copyright (c) 2002-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:
-// Implements CBttLogger.
-// 
-//
-
-/**
- @file
-*/
-
-#include "bttlog.h"
-
-#ifdef __BTT_LOGGING__
-
-#ifdef __DEBUGRAWIPSERIALPORT__
-#include <e32svr.h>
-#endif
-
-//Enable this if you want time stamps for each log statements.
-//This is computation ineffective and not recommended.
-//#define __TIME_STAMP_ENABLED__
-
-CBttLogger* CBttLogger::NewL(const TDesC8& aTag, const TDesC8& aFileName, const TUint32 aInstanceId)
-/**
- * Factory method for CBttLogger.
- * 
- * @param aSubDir The subdirectory of c:\logs\gprsbtt to log to.
- * @param aFileName The filename to log to.
- * @return Ownership of a new CBttLogger.
- */
-	{
-	CBttLogger* self = new(ELeave) CBttLogger;
-	CleanupStack::PushL(self);
-	self->ConstructL(aTag, aFileName, aInstanceId);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-#ifdef __FLOG_ACTIVE
-void CBttLogger::ConstructL(const TDesC8& aTag, const TDesC8& aFileName, const TUint32 aInstanceId)
-#else
-void CBttLogger::ConstructL(const TDesC8&, const TDesC8&, const TUint32 aInstanceId)
-#endif
-/**
- * 2nd-phase construction.
- * Hurricane/Typhoon - we can log to a particular directory
- */
-	{
-	iInstanceId = aInstanceId;
-	__FLOG_OPEN(aTag, aFileName);
-	}
-
-//#endif
-
-CBttLogger::CBttLogger()
-/**
- * Constructor
- */
- 	{
-	}
-
-CBttLogger::~CBttLogger()
-/**
- * Destructor
- */
-	{
-	__FLOG_CLOSE;
-	}
-
-void CBttLogger::Write(const TDesC8& aText)
-/**
- * Write an 8-bit descriptor to the log file
- *
- * @param aText The test to write
- */	
-	{
-	TBuf8<KLogBufferSize> buf;
-	// put the instance id to identify which nif we are
-	// logging from
-	_LIT8(KInstanceFormat, "RawIp 0x%08X: ");
-	buf.Format(KInstanceFormat, iInstanceId);
-	
-#ifdef __TIME_STAMP_ENABLED__
-	// log to our own file in Hurricane/Typhoon
-	_LIT8(KTimeFormat, "%02d.%02d:%02d:%06d ");
-	
-	TTime now;
-	now.UniversalTime();
-	TDateTime dateTime;
-	dateTime = now.DateTime();
-	buf.AppendFormat(KTimeFormat, 
-		dateTime.Hour(), 
-		dateTime.Minute(), 
-		dateTime.Second(), 
-		dateTime.MicroSecond());
-#endif
-
-	buf.Append(aText);
-
-#ifdef __DEBUGRAWIPSERIALPORT__
-	TBuf<KLogBufferSize> buf2;
-	// TEMP: Do not print single % since appear as format char to RDebug::Print
-	for (TInt i = 0; i < buf.Length(); i++)
-		{
-		if (buf[i] == '%')
-			buf2.Append(_L("."));
-		else
-			buf2.Append(buf[i]);
-		}
-	RDebug::Print(buf2);
-#else
-	__FLOG(buf);
-#endif
-	}
-
-void CBttLogger::WriteFormat(TRefByValue<const TDesC8> aFmt, ...)
-/**
- * Write an 8-bit format list to the log file
- */	
-	{
-    VA_LIST list;
-    VA_START(list, aFmt);
-
-	// log to our own file in Hurricane/Typhoon
-	TBuf8<KLogBufferSize> buf;
-	buf.AppendFormatList(aFmt, list);
-	Write(buf);
-	}
-
-void CBttLogger::VerboseLeaveL(char* aFile, TInt aLine, TInt aReason)
-/**
- * Make a verbose leave - write name of file and line number to the log just 
- * before leaving.
- *
- * @param aFile The file we're leaving from.
- * @param aLine The line number we're leaving from.
- * @param aReason The leave code.
- */
-	{
-	// only leave if non-zero value
-	if ( aReason == KErrNone )
-		{
-		return;
-		}
-
-	_LIT8(KLeavePrefix, "LEAVE: " );
-
-	TPtrC8 fullFileName((const TUint8*)aFile);
-	TPtrC8 fileName(fullFileName.Ptr()+fullFileName.LocateReverse('\\')+1);
-
-	TBuf8<256> buf;
-	buf.Append(KLeavePrefix);
-	buf.AppendFormat(_L8(" aReason=%d [file %S, line %d]"), aReason, &fileName, 
-		aLine);
-	Write(buf);
-
-	__FLOG_CLOSE;
-
-	// finally
-	User::Leave(aReason);
-	}
-
-void CBttLogger::VerbosePanic(char* aFile, 
-							   TInt aLine, 
-							   TInt aPanicCode, 
-							   TText8* aPanicName,
-							   const TDesC& aPanicCategory)
-/**
- * Make a verbose panic - write name of file and line number to the
- * log just before panicking.
- *
- * @param aFile The file that's panicking.
- * @param aLine The line number that's panicking.
- * @param aReason The panic code.
- * @param aPanicName The text of the panic code.
- * @param aPanicCategory The panic category.
- */
-	{
-	_LIT8(KLeavePrefix, "PANIC: " );
-
-	TPtrC8 fullFileName((const TUint8*)aFile);
-	TPtrC8 fileName(fullFileName.Ptr()+fullFileName.LocateReverse('\\')+1);
-
-	TBuf8<256> buf;
-	buf.Append(KLeavePrefix);
-	buf.AppendFormat(_L8(" %d = %s [file %S, line %d]"), 
-		aPanicCode, 
-		aPanicName, 
-		&fileName, 
-		aLine);
-	Write(buf);
-
-	__FLOG_CLOSE;
-
-	// finally
-	User::Panic(aPanicCategory, aPanicCode);
-	}
-
-#endif // __BTT_LOGGING__
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/group/bld.inf	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-// Copyright (c) 2004-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:
-// Secondary PDP Context UMTS Driver
-// 
-//
-
-/**
- @file
-*/
-
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-
-PRJ_PLATFORMS
-
-DEFAULT
-
-PRJ_EXPORTS
-#ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
-./spud.iby                    /epoc32/rom/include/spud.iby
-#else
-..\version1\inc\spud.h        \epoc32\include\networking\spud.h
-..\version1\inc\spudmanif.h   \epoc32\include\networking\spudmanif.h
-.\spud_v1.iby                 \epoc32\rom\include\spud.iby
-#endif
-
-
-PRJ_MMPFILES
-../spudman/group/spud.mmp
-
-#endif //SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-
-PRJ_TESTEXPORTS
-
-../te_spudRSubConn/group/TE_spudRSubConn.iby                            /epoc32/rom/include/te_spudrsubconn.iby
-
-../te_spudRSubConn/scripts/TE_spudRSubConn.script              z:/testdata/scripts/te_spudrsubconn.script
-../te_spudRSubConn/configs/spudRSubConnPPP_loopback.xml        z:/testdata/configs/spudrsubconnppp_loopback.xml
-../te_spudRSubConn/configs/spudRSubConnPPP_loopback.ini        z:/testdata/configs/spudrsubconnppp_loopback.ini
-../te_spudRSubConn/configs/spudRSubConnPPP_pcktloopback.ini    z:/testdata/configs/spudrsubconnppp_pcktloopback.ini
-../te_spudRSubConn/configs/spudRSubConnPPP.ini                 z:/testdata/configs/spudrsubconnppp.ini
-../te_spudRSubConn/configs/spudRSubConnPPP_config.txt          z:/testdata/configs/spudrsubconnppp_config.txt
-../te_spudRSubConn/configs/spudRSubConnPPP_qospolicies.ini     z:/testdata/configs/spudrsubconnppp_qospolicies.ini
-
-../te_spudRSubConn/scripts/te_spud_staticip.script              z:/testdata/scripts/te_spud_staticip.script
-
-../te_spudRSubConn/configs/spud_staticip/socketserv.ini         z:/testdata/configs/spud_staticip/socketserv.ini
-../te_spudRSubConn/configs/spud_staticip/connection.ini         z:/testdata/configs/spud_staticip/connection.ini
-../te_spudRSubConn/configs/spud_staticip/subconnection.ini      z:/testdata/configs/spud_staticip/subconnection.ini
-../te_spudRSubConn/configs/spud_staticip/simtsy.ini             z:/testdata/configs/spud_staticip/simtsy.ini
-../te_spudRSubConn/configs/spud_staticip/te_spud_staticip.xml   z:/testdata/configs/spud_staticip/te_spud_staticip.xml
-../te_spudRSubConn/configs/spud_staticip/te_spud_staticip_config.txt    z:/testdata/configs/spud_staticip/te_spud_staticip_config.txt
-../te_spudRSubConn/configs/spud_staticip/te_spud_staticip_loopback.ini  z:/testdata/configs/spud_staticip/te_spud_staticip_loopback.ini
-
-
-PRJ_TESTMMPFILES
-#include "../te_spudNetworkSide/group/bld.inf"
-
-../te_spudRSubConn/group/TE_SpudRSubConn.mmp
-
-
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.history.xml	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<relnotes schema="1.0.0" name="Secondary PDP context UMTS Driver" purpose="" type="component">
-  <revision major="1" functional="0" minor="0" date="20070727">
-    <ref name="PDEF109368" type="defect"/>
-    <description>SPUDMAN was not sending IfProgress with the KDataTransferTemporarilyBlocked constant when the PDP context is suspended - this is expected to be sent to Nifman from a Nif supporting GPRS but SPUDMAN was discarding notifications from lower level NIFs so that they never reached Nifman.  This means RConnection::ProgressNotification never sent any KDataTransferTemporarilyBlocked progress updates to clients.  SPUDMAN has now been changed to produce the correct behaviour.</description>
-  </revision>
-  <purpose>
-    (Only in 9.1) A network interface adaptation component that supports both primary and secondary PDP contexts
-  </purpose>
-</relnotes>
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-component networking_spud
-source \sf\os\cellularsrv\telephonyprotocols\secondarypdpcontextumtsdriver
-binary \sf\os\cellularsrv\telephonyprotocols\secondarypdpcontextumtsdriver\group all
-exports \sf\os\cellularsrv\telephonyprotocols\secondarypdpcontextumtsdriver\group
-notes_source \component_defs\release.src
-
-
-ipr E 
-ipr T \sf\os\cellularsrv\telephonyprotocols\secondarypdpcontextumtsdriver\te_spudNetworkSide
-ipr T \sf\os\cellularsrv\telephonyprotocols\secondarypdpcontextumtsdriver\te_spudrsubconn
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/group/spud.iby	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-// Copyright (c) 2005-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 SPUD_IBY
-#define SPUD_IBY
-
-// Secondary PDP Context UMTS Driver
-                      
-file=ABI_DIR\DEBUG_DIR\spud.nif      System\libs\spud.nif
-
-#endif //SPUD_IBY
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/group/spud_v1.iby	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-// Copyright (c) 2005-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:
-// SPUD.iby
-// 
-//
-
-#ifndef SPUD_IBY
-#define SPUD_IBY
-
-// Secondary PDP Context UMTS Driver
-                      
-file=ABI_DIR\DEBUG_DIR\spud.nif      System\libs\spud.nif
-file=ABI_DIR\DEBUG_DIR\spudfsm.dll   System\libs\spudfsm.dll
-
-#endif //SPUD_IBY
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/inc/cpdpfsm.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,179 +0,0 @@
-// Copyright (c) 2005-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:
-// PDP FSM header
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#ifndef CPDPFSM_H
-#define CPDPFSM_H
-
-#include <e32base.h>
-#include <etelmm.h>
-#include <etelqos.h>
-#include <networking\UMTSNifControlIf.h>
-#include "reteldriverinput.h"
-#include "pdpfsmnmspace.h"
-
-#include "tpdpstates.h"
-
-class CPdpFsmFactory;
-class RPacketQoS;
-class TQoSR99_R4Requested;
-class TQoSR99_R4Negotiated;
-
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-class TQoSR5Requested;
-class TQoSR5Negotiated; 
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 
-
-class TFTInfo;
-class TFTOperationCode;
-
-class CPdpFsm : public CBase
-{
-	friend class TPdpState;
-	friend class TPdpStateInitialised;
-	friend class TPdpStateOpeningPhone;
-	friend class TPdpStateCreatingPrimary;
-	friend class TPdpStateActivatingPrimary;
-	friend class TPdpStateCreatingSecondary;
-	friend class TPdpStateCreatedSecondary;
-	friend class TPdpStateSettingQoS;
-	friend class TPdpStateSettingTFT;
-	friend class TPdpStateActivatingSecondary;
-	friend class TPdpStateOpen;
-	friend class TPdpStateChangingQoS;
-	friend class TPdpStateChangingTFT;
-	friend class TPdpStateModifyingActive;
-	friend class TPdpStateSuspended;
-	friend class TPdpStateClosing;
-	friend class TPdpStateStopping;
-	
-public:
-	CPdpFsm();
-	~CPdpFsm();
-	
-	TInt Input (const TInt aOperation, const TInt aParam);
-	
-	void Get(RPacketQoS::TQoSR99_R4Requested& aParam);
-	void Get(RPacketQoS::TQoSR99_R4Negotiated& aParam);
-
-	
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-	void Get(RPacketQoS::TQoSR5Requested& aParam);
-	void Get(RPacketQoS::TQoSR5Negotiated& aParam);
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 
-
-	void Get(TTFTInfo& aParam);
-	void Get(TTFTOperationCode& aParam);
-	void Get(RPacketContext::TDataChannelV2& aParam);
-	void Get(RPacketContext::TContextConfigGPRS& aParam);
-	void Get(RPacketContext::TContextStatus& aParam);
- 	
-	void Set(const RPacketQoS::TQoSR99_R4Requested& aParam);
-	void Set(const RPacketQoS::TQoSR99_R4Negotiated& aParam);
-	
-	
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-	void Set(const RPacketQoS::TQoSR5Requested& aParam);
-	void Set(const RPacketQoS::TQoSR5Negotiated& aParam);
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 
-
-	void Set(const TTFTInfo& aParam);
-	void Set(const TTFTOperationCode& aParam);
-	void Set(const RPacketContext::TDataChannelV2& aParam);
-	void Set(const RPacketContext::TContextConfigGPRS& aParam);
-
-	void Set(const RPacketContext::TContextStatus& aParam);
-   
-    void InitL (TContextId aPdpId, CPdpFsmFactory * aPdpFsmFactory, REtelDriverInput * aEtelDriverInput);
-    
-    void EtelInput (EtelDriver::TEtelInput aOperation);
-	void EtelCancel (void);
-    void SpudInput (TInt aNotification, TInt aParam);
-    void GetLastErrorCause  (TInt& aLastErrorCause);
-    
-protected:
-private:
-	void ChangeStateToInitialised(void);
-	void ChangeStateToOpeningPhone(void);
-	void ChangeStateToCreatingPrimary(void);
-	void ChangeStateToActivatingPrimary(void);
-	void ChangeStateToCreatingSecondary(void);
-	void ChangeStateToCreatedSecondary(void);
-	void ChangeStateToSettingQoS(void);
-	void ChangeStateToSettingTFT(void);
-	void ChangeStateToActivatingSecondary(void);
-	void ChangeStateToOpen(void);
-	void ChangeStateToChangingQoS(void);
-	void ChangeStateToChangingTFT(void);
-	void ChangeStateToModifingActive(void);
-	void ChangeStateToSuspended(void);
-	void ChangeStateToClosing(void);
-	void ChangeStateToStopping(void);
-
-	
-public:
-protected:
-private:
-	
-	// local data cache for this context
-	RPacketQoS::TQoSR99_R4Requested    iQoSReq;
-	RPacketQoS::TQoSR99_R4Negotiated   iQoSNeg;
-
-	
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-	RPacketQoS::TQoSR5Requested    iQoSR5Req;
-	RPacketQoS::TQoSR5Negotiated   iQoSR5Neg;
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 
-
-	RPacketContext::TDataChannelV2     iDataChannelV2;
-	RPacketContext::TContextStatus     iContextStatus;
-	TTFTInfo 						   iTFT;
-	TTFTOperationCode				   iTFTOperationCode;
-	RPacketContext::TContextConfigGPRS iGPRS;
-
-	CPdpFsmFactory   * iPdpFsmFactory; // need stuff from  factory
-	REtelDriverInput * iEtelDriverInput;
-	
-	TPdpState * iState; // current state
-	
-	TContextId  iPdpId; // our instance PDP context id - fixed when allocateed
-
-	enum TContextType
-	{
-		ENone,
-		EPrimary,
-		ESecondary
-	} iContextType;
-	
-
-};
-
-
-
-#endif // CPDPFSM_H
-
-
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/inc/cpdpfsmfactory.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-// Copyright (c) 2004-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:
-// PDP FSM factory header
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#ifndef CPDPFSMFACTORY_H
-#define CPDPFSMFACTORY_H
-
-#include <networking\UMTSNifControlIf.h>
-#include "rpdpfsminterface.h"
-#include "reteldriverinput.h"
-#include "cpdpfsm.h"
-#include "spudmanif.h"
-#include "tpdpstates.h"
-
-/** factory (and owner) of FSM objects */
-class CPdpFsmFactory : public CBase
-{
-	friend class CPdpFsm;
-	friend class TPdpState;
-	friend class TPdpStateInitialised; // Needs iEtelOpened
-	friend class TPdpStateOpeningPhone; // Needs iEtelOpened
-public:
-	static CPdpFsmFactory * NewL();
-	
-	virtual ~CPdpFsmFactory();
-	void InitL(MSpudManInterface * aSpudManInterface, TName& aTsyName, RPdpFsmInterface * aPdpFsmInterface);
-	
-	CPdpFsm * GetContext (TContextId aPdpId);
-	
-	void Close (void);
-	
-	void SpudInput (TContextId aPdpId, TInt aNotification, TInt aParam);
-	void SetContextTerminationErrorAndStop(TContextId aPdpId, TInt aErrorCode);
-
-	const TName& TsyName(void);
-
-protected:	
-private:
-	CPdpFsmFactory();
-
-public:
-protected:
-private:
-	TFixedArray<CPdpFsm, KMaxPdpContexts> iContexts;
-
-	// the states
-	TPdpStateInitialised   		 iStateInitialised;
-	TPdpStateOpeningPhone		 iStateOpeningPhone;
-	TPdpStateCreatingPrimary     iStateCreatingPrimary;
-	TPdpStateActivatingPrimary   iStateActivatingPrimary;
-	TPdpStateCreatingSecondary   iStateCreatingSecondary;
-	TPdpStateCreatedSecondary    iStateCreatedSecondary;
-	TPdpStateSettingQoS	   		 iStateSettingQoS;
-	TPdpStateSettingTFT	   		 iStateSettingTFT;
-	TPdpStateActivatingSecondary iStateActivatingSecondary;
-	TPdpStateOpen		   		 iStateOpen;
-	TPdpStateChangingQoS   		 iStateChangingQoS;
-	TPdpStateChangingTFT   		 iStateChangingTFT;
-	TPdpStateModifyingActive	 iStateModifyingActive;
-	TPdpStateSuspended	   		 iStateSuspended;
-	TPdpStateClosing	   		 iStateClosing;
-	TPdpStateStopping	   		 iStateStopping;
-	
-	MSpudManInterface * iSpudManInterface;
-	RPdpFsmInterface  * iPdpFsmInterface;
-	REtelDriverInput  * iEtelDriverInput;
-	
-	TBool iEtelOpened;
-	
-	TName iTsyName;	
-};
-
-inline void CPdpFsmFactory::SpudInput (TContextId aPdpId, TInt aNotification, TInt aParam)
-{
-	iSpudManInterface->Input (aPdpId, aNotification, aParam);
-}
-
-inline void CPdpFsmFactory::SetContextTerminationErrorAndStop(TContextId aPdpId, TInt aErrorCode)
-	{
-	iSpudManInterface->SetContextTerminationErrorAndStop(aPdpId, aErrorCode);
-	}
-
-#endif // CPDPFSMFACTORY_H
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/inc/eteldrivernmspace.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-// Copyright (c) 2005-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:
-// etel driver namespace
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#ifndef ETELDRIVERNMSPACE_H
-#define ETELDRIVERNMSPACE_H
-
-namespace EtelDriver
-{
-
-/** input operations, which are handled by etel driver input */
-enum TEtelInput
-	{
-	EOpenPhone,
-	
-	ESetQoS,
-	ESetTft,
-	EChangeTft,
-	ECreate1ryPdpContext,
-	ECreate2ryPdpContext,
-
-	EActivatePdp,
-	EModifyActive,
-	EContextDelete,
-	
-	ESentinelInput
-	};
-
-/** input operations, which are handled by etel driver input */
-enum TEtelDriverStrategy
-	{
-	EOpenPhoneStrategy = 0,
-	
-	ESetQoSStrategy,
-	ESetTftStrategy,
-	EChangeTftStrategy,
-	
-	ECreate1ryPdpContextStrategy,
-	ECreate2ryPdpContextStrategy,
-	
-	EActivatePdpStrategy,
-	EModifyActiveStrategy,
-	EContextDeleteStrategy,
-
-	ESentinelStrategy
-	};
-
-typedef TPckg<RPacketQoS::TQoSR99_R4Requested>  	TQoSR99_R4RequestedPckg;
-typedef TPckg<RPacketQoS::TQoSR99_R4Negotiated>  	TQoSR99_R4NegotiatedPckg;
-
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-typedef TPckg<RPacketQoS::TQoSR5Requested>  	TQoSR5RequestedPckg;
-typedef TPckg<RPacketQoS::TQoSR5Negotiated>  	TQoSR5NegotiatedPckg;
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 
-
-typedef TPckg<RPacketContext::TContextConfigGPRS>  	TContextConfigGPRSPckg;
-typedef TPckg<RPacketContext::TPacketFilterV2>		TPacketFilterV2Pckg;
-
-_LIT(KTxtSpudTel, "SPUDTEL");
-
-} // namespace EtelDriver
-
-	
-#endif // ETELDRIVERNMSPACE_H
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/inc/pdpfsmnmspace.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-// Copyright (c) 2004-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:
-// Common header for pdp FSM
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#ifndef PDPFSMNMSPACE_H
-#define PDPFSMNMSPACE_H
-
-namespace PdpFsm
-{
-
-/** completion and notification signals */
-enum TEtelSignal
-	{
-	EPhoneOpened,
-	EPhoneOpenedFailed,
-	
-	EQoSSet,
-	EQoSSetFailed,
-	ETftSet,
-	ETftSetFailed,
-	ETftChanged,
-	ETftChangedFailed,
-	
-	E1ryPdpContextCreated,
-	E1ryPdpContextCreatedFailed,
-	E2ryPdpContextCreated,
-	E2ryPdpContextCreatedFailed,
-	
-	EPdpContextModified,
-	EPdpContextModifiedFailed,
-	EPdpActivated,
-	EPdpActivatedFailed,
-	EContextDeleted,
-	EContextDeletedFailed,
-	// add new signals here
-	
-	// network signals
-	EQoSProfileChangeNetwork,
-	EConfigGPRSChangeNetwork,
-	EContextStatusChangeNetwork,
-	EServiceStatusChangeNetwork,
-	EPacketStatusChangeNetwork,
-	// add new signals here
-	
-	ESentinelSignal
-	};
-
-} // namespace PdpFsm
-
-	
-#endif // PDPFSMNMSPACE_H
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/inc/reteldriverinput.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-// Copyright (c) 2004-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:
-// Header for etel driver input class
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#ifndef RETELDRIVERINPUT_H
-#define RETELDRIVERINPUT_H
-
-#include <e32def.h>
-#include <e32std.h>
-#include <networking\UmtsNifControlIf.h>	// definition of TContextId
-
-#include "eteldrivernmspace.h"	// definition of EtelDriver::TEtelInput
-
-class CEtelDriverFactory;
-class RPdpFsmInterface;
-
-/** 
-	Definition of an input interface for SPUD eTel driver 
-
-@internalComponent
-*/
-class REtelDriverInput
-	{
-public:
-	REtelDriverInput();
-	virtual ~REtelDriverInput();
-
-	virtual void OpenL (RPdpFsmInterface& aPdpFsmInterface);
-	virtual void Close();
-	virtual void CreatePdpL (TContextId aPdpId);
-	virtual void DeletePdp (TContextId aPdpId);
-	virtual void Input(TContextId aPdpId, EtelDriver::TEtelInput aOperation);
-	virtual void CancelPdp (TContextId aPdpId);
-	virtual void StartPdpNotifications(TContextId aPdpId);
-	virtual void CancelPdpNotifications (TContextId aPdpId);
-	virtual void CancelAllPdps();
-	virtual void CancelAllPdpNotifications();
-	virtual void GetLastErrorCause (TContextId aPdpId, TInt& aLastErrorCause);
-
-protected:
-
-private:
-	// disable copy of an object
-	inline REtelDriverInput(REtelDriverInput&);
-	inline REtelDriverInput& operator= (REtelDriverInput& aInput);
-	
-private:
-	/** etel driver factory */
-	CEtelDriverFactory*	iDriverFactory;
-	};
-	
-
-// inlines
-/** copy c'tor
-	not supported for this class
-*/
-inline REtelDriverInput::REtelDriverInput(REtelDriverInput&)
-	{ 
-	// not supported
-	__ASSERT_ALWAYS(EFalse, User::Panic(EtelDriver::KTxtSpudTel, KErrNotSupported)); 
-	}
-	
-/** assignment operator
-	not supported for this class
-*/
-inline REtelDriverInput& REtelDriverInput::operator= (REtelDriverInput& aInput)
-	{ 
-	// not supported
-	__ASSERT_ALWAYS(EFalse, User::Panic(EtelDriver::KTxtSpudTel,KErrNotSupported));
-	return aInput; 
-	}
-
-#endif // RETELDRIVERINPUT_H
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/inc/rpdpfsminterface.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,146 +0,0 @@
-// Copyright (c) 2004-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:
-// PDP FSM interface header
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#ifndef RPDPFSMINTERFACE_H
-#define RPDPFSMINTERFACE_H
-
-#include <e32base.h>
-#include <etelmm.h>
-#include <etelqos.h>
-
-#include <networking/umtsnifcontrolif.h>
-#include <networking/mpdpfsminterface.h>
-#include <etelpckt.h>
-
-
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-class TQoSR5Requested;
-class TQoSR5Negotiated;
-
-	#ifdef _DEBUG
-		_LIT(KDescNullPdpFsm, "iFsmImpl=NULL");
-	#endif		
-
-#else
-class TQoSR99_R4Requested;
-class TQoSR99_R4Negotiated;
-
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 
-
-
-class TFTInfo;
-class TFTOperationCode;
-class CPdpFsmFactory;
-
-NONSHARABLE_CLASS(RPdpFsmInterface) : public MPdpFsmInterface
-/**
- * R-class to proxy methods calls to CPdpFsmInterface.
- *
- * @internalComponent
- */
- {
-public:
-	RPdpFsmInterface();
-	virtual ~RPdpFsmInterface();
-	
-	virtual void OpenL(MSpudManInterface * aSpudManInterface, TName& aName);
-	virtual void Close();
-
-	virtual TInt Input (TContextId aPdpId, const TInt aOperation, const TInt aParam=KErrNone);
-
-	
-	
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-
-	// This is to set the status of IM CN signalling parameter
-	virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR5Requested& aParam);
-	virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR5Negotiated& aParam);
-	virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR5Requested& aParam) const;
-	virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR5Negotiated& aParam) const;
-	virtual void SetIMCNSignalling(TBool aImCnSignalling);
-#else 
-// !SYMBIAN_NETWORKING_UMTSR5
-
-	virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Requested& aParam);
-	virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Negotiated& aParam);
-	virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Requested& aParam) const;
-	virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Negotiated& aParam) const;
-
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 
-
-	virtual TInt Set(TContextId aPdpId, const TTFTInfo& aParam);
-	virtual TInt Set(TContextId aPdpId, const TTFTOperationCode& aParam);
-	virtual TInt Set(TContextId aPdpId, const RPacketContext::TDataChannelV2& aParam);
-	virtual TInt Set(TContextId aPdpId, const RPacketContext::TContextConfigGPRS& aParam);
-	virtual TInt Set(TContextId aPdpId, const RPacketContext::TContextStatus& aParam);
-	
-	virtual TInt Get(TContextId aPdpId, TTFTInfo& aParam) const;
-	virtual TInt Get(TContextId aPdpId, TTFTOperationCode& aParam) const;
-	virtual TInt Get(TContextId aPdpId, RPacketContext::TDataChannelV2& aParam) const;
-	virtual TInt Get(TContextId aPdpId, RPacketContext::TContextConfigGPRS& aParam) const;
-	virtual TInt Get(TContextId aPdpId, RPacketContext::TContextStatus& aParam) const;
-	
-	virtual TInt GetLastErrorCause(TContextId aPdpId, TInt& aLastErrorCause) const;
-
-	virtual void Set(RPacketService::TStatus aParam); // applies to all contexts
-	virtual void Get(RPacketService::TStatus& aParam); // applies to all contexts
-
-	// additional accessors
-	virtual const TName& TsyName(void);
-	
-	void Init (const MPdpFsmInterface* aSpudMan);
-	
-	inline TBool IsInitialised ();
-
-	virtual void SetContextTerminationErrorAndStop(TContextId aPdpId, TInt aErrorCode);
-
-protected:
-private:
-	// DO NOT provide implementations to these methods: Copying this object should be disabled
-	RPdpFsmInterface(RPdpFsmInterface&);
-	RPdpFsmInterface& operator= (RPdpFsmInterface& aInput);
-	
-public:
-protected:
-private:
-	// FSM Factory - churns out FSMs
-	CPdpFsmFactory* iPdpFsmFactory;
-
-	RPacketService::TStatus iNetworkStatus;
-	MPdpFsmInterface* iFsmImpl;
-};
-
-IMPORT_C RPdpFsmInterface* NewPdpFsmInterfaceL();
-
-	   
-TBool RPdpFsmInterface::IsInitialised ()
-   {
-   return iFsmImpl != NULL;
-   }
-
-
-#endif
-// RPDPFSMINTERFACE_H
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/inc/tpdpstate.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-// Copyright (c) 2004-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:
-// Base class to the various states required in Spud FSM. Each real state is derived from
-// this base class. The bass class is never instanciated but it's base functionality is 
-// used for default handling in the most part.
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#ifndef TPDPSTATE_H
-#define TPDPSTATE_H
-
-#include <networking\UmtsNifControlIf.h>
-#include "eteldrivernmspace.h"
-#include "reteldriverinput.h"
-#include "pdpfsmnmspace.h"
-
-
-class CPdpFsm;
-//class REtelDriverInput;
-class CPdpFsmFactory;
-
-// parent class
-class TPdpState
-{
-public:
-	TPdpState();
-	
-	// used as a default error handler
-	virtual TInt Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aParam);
-
-	const TDesC * LogOperation (CPdpFsm& aFsm, TInt aOperation);	
-
-protected:
-	// access helpers for use in the derived class
-	void EtelDriverInput (CPdpFsm& aFsm, EtelDriver::TEtelInput aOperation);
-	void EtelDriverCancel (CPdpFsm& aFsm);
-	void SpudManNotify (CPdpFsm& aFsm, TInt aNotification, TInt aParam);
-	
-public:
-#ifdef _DEBUG
-	TBuf<100> iName;
-#endif		
-
-protected:
-	CPdpFsmFactory   * iPdpFsmFactory;
-
-private:
-	
-};
-
-
-#endif // TPDPSTATE_H
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/inc/tpdpstates.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-// Copyright (c) 2004-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:
-// PDP FSM states header
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#ifndef TPDPSTATES_H
-#define TPDPSTATES_H
-
-#include "tpdpstate.h"
-#include "spudfsmdebuglogger.h"
-
-class CPdpFsm;
-
-#if _DEBUG 
-#define DEFINE_TPDPSTATE_CLASS(state) _LIT(KName##state, #state); \
-NONSHARABLE_CLASS(TPdpState##state) : public TPdpState \
-{ \
-public: \
-	TPdpState##state (CPdpFsmFactory * aPdpFsmFactory) \
-	{ \
-		SPUDFSMVERBOSE_FNLOG("TPdpState" L ## #state L"::TPdpState" L ## #state L"()"); \
-		iName = KName##state; \
-		iPdpFsmFactory = aPdpFsmFactory; \
-	} \
-	TInt Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aParam); \
-private: \
-	TInt iErrorCode; \
-};	
-#else
-#define DEFINE_TPDPSTATE_CLASS(state) NONSHARABLE_CLASS(TPdpState##state) : public TPdpState \
-{ \
-public: \
-	TPdpState##state (CPdpFsmFactory * aPdpFsmFactory) \
-	{ \
-		SPUDFSMVERBOSE_FNLOG("TPdpState" L ## #state L"::TPdpState" L ## #state L"()"); \
-		iPdpFsmFactory = aPdpFsmFactory; \
-	} \
-	TInt Input (CPdpFsm& aFsm, TInt aOperation, TInt aErrorCode); \
-private: \
-	TInt iErrorCode; \
-};	
-#endif
-
-DEFINE_TPDPSTATE_CLASS(Initialised)
-DEFINE_TPDPSTATE_CLASS(OpeningPhone)
-DEFINE_TPDPSTATE_CLASS(CreatingPrimary)
-DEFINE_TPDPSTATE_CLASS(ActivatingPrimary)
-DEFINE_TPDPSTATE_CLASS(CreatingSecondary)
-DEFINE_TPDPSTATE_CLASS(CreatedSecondary)
-DEFINE_TPDPSTATE_CLASS(SettingQoS)
-DEFINE_TPDPSTATE_CLASS(SettingTFT)
-DEFINE_TPDPSTATE_CLASS(ActivatingSecondary)
-DEFINE_TPDPSTATE_CLASS(Open)
-DEFINE_TPDPSTATE_CLASS(ChangingQoS)
-DEFINE_TPDPSTATE_CLASS(ChangingTFT)
-DEFINE_TPDPSTATE_CLASS(ModifyingActive)
-DEFINE_TPDPSTATE_CLASS(Suspended)
-DEFINE_TPDPSTATE_CLASS(Closing)
-DEFINE_TPDPSTATE_CLASS(Stopping)
-
-
-#endif // TPDPSTATES_H
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/spudman/bmarm/SPUDU.DEF	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	NewInterfaceFactoryL @ 1 NONAME R3UNUSED ; (null)
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/spudman/bwins/SPUDU.DEF	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	NewInterfaceFactoryL @ 1 NONAME
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/spudman/eabi/SPUDU.DEF	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	NewInterfaceFactoryL @ 1 NONAME ; NewInterfaceFactoryL
-	
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/spudman/group/spud.mmp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-// Copyright (c) 2004-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:
-// spud.nif Secondary PDP Context UMTS Driver
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-
-TARGET			spud.nif
-TARGETTYPE		DLL
-TARGETPATH		/system/libs
-
-UID      		0x10003D3A 0x102075AE
-VENDORID 		0x70000001
-
-// Needed for GUQoS files
-MACRO		EPOC_SDK=0x08010000
-
-SOURCEPATH      ../src
-SOURCE          spudman.cpp spudfactory.cpp spudnotify.cpp bindman.cpp mux.cpp
-SOURCE          rpdpfsminterface.cpp
-
-USERINCLUDE     ../inc
-USERINCLUDE     ../../inc
-OS_LAYER_SYSTEMINCLUDE
-
-LIBRARY         esocksvr.lib mbufmgr.lib 
-LIBRARY         euser.lib esock.lib nifman.lib
-LIBRARY         etelpckt.lib
-LIBRARY			etel.lib
-LIBRARY         umtsif.lib
-LIBRARY			insock.lib 
-
-
-#include "comms-infras/commsdebugutility.mmh"
-
-CAPABILITY CommDD PowerMgmt ReadDeviceData WriteDeviceData TrustedUI ProtServ NetworkControl NetworkServices LocalServices ReadUserData WriteUserData
-
-UNPAGED
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/spudman/inc/bindman.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,172 +0,0 @@
-// Copyright (c) 2004-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:
-// SPUD binder manager
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#ifndef BINDMAN_H
-#define BINDMAN_H
-
-#include "spudman.h"
-#include <networking/mpdpfsminterface.h>
-
-class CSpudNotify;
-class CSpudMux;
-class CSpudProtocol;
-
-/**
-PDP context states from the perspective of SpudMan
-*/
-enum TSpudContextStates
-	{
-	ESpudInactive = 0,
-	/** Default QoS has been set and CNifIfLink::Start is awaited */
-	ESpudHaveQos,
-	/** FSM is creating the primary context */
-	ESpudCreatingPrimary,
-	/** Start has been called on the SPUD */
-	ESpudStartingPrimary,
-	/** CNifIfLink::Start on lower NIF called, waiting for LinkLayerUp or Down.*/
-	ESpudStartingPrimaryLowerNif,
-	/** Secondary context is in the process of being started */
-	ESpudStartingSecondary,
-	/** CNifIfLink::Start on lower NIF called, waiting for LinkLayerUp or Down.*/
-	ESpudStartingSecondaryLowerNif,
-	/* Lower NIF is up, waiting for retrieval of the negotiated QoS. */
-	ESpudGettingNegQoS,
-	/** Spud is up and ready to for data */
-	ESpudUp,
-	/** Spud is up but currently flowed off by lower NIF */
-	ESpudFlowOff,
-	/** Spud is up but currently flowed off by the network */
-	ESpudSuspended,
-	/** Spud is up but currently flowed off by the network and the lower NIF */
-	ESpudFlowOffAndSuspended,
-	/** Context is going down, but it must still be deleted */
-	ESpudLinkDown,
-	/** Lower NIF has been stopped */
-	ESpudContextDelete,
-	/** All communication with GUQoS is finished for this context. */
-	ESpudWaitLinkDown,
-	/** MNifIfNotify::LinkLayerDown called by lower NIF. Binder must be deleted */
-	ESpudWaitBinderDelete
-	};
-
-
-/**
-Binder class between lower NIF and SPUD
-*/
-NONSHARABLE_CLASS(CSpudBinderRef) : public CBase
-	{
-public:
-	CSpudBinderRef(CBindMan& aBindMan);
-	~CSpudBinderRef();
-	void ConstructL(MNifIfNotify* aNotify, TContextId aContextId);
-	void Bind(CNifIfLink* aNifLink, CNifIfBase* aNifBase);
-
-	TBool MatchBase(const CNifIfBase* aBase) const;
-	TBool IsBound() const;
-
-	// Setters
-	void SetState(TSpudContextStates aState);
-    void SetError(TInt aError);
-
-	// Getters
-	CNifIfLink* NifLink() const;
-	CNifIfBase* NifBase() const;
-	CSpudNotify* Notify() const;
-	TSpudContextStates State() const;
-    TInt Error() const;
-	
-private:
-	/** Reference to BindMan object */
-	CBindMan& iBindMan;
-
-	/* Pointer to SpudNotify object */
-	CSpudNotify* iNotify;
-
-	/* Pointer to CNifIfLink in lower NIF */
-	CNifIfLink* iNifLink;
-
-	/* Pointer to CNifIfBase in lower NIF */
-	CNifIfBase* iNifBase;
-
-	/** Current state of the PDP context associated with this lower NIF */
-	TSpudContextStates iState;
-
-    /** Context specific failure condition */
-    TInt iError;
-	};
-
-
-/**
-Binder management class
-*/
-NONSHARABLE_CLASS(CBindMan) : public CBase
-	{
-public:
-	CBindMan(CSpudMan& aSpudMan, CSpudMux* aMux, CSpudProtocol* aProto);
-	~CBindMan();
-
-	void SetProtocolBaseL(CProtocolBase* aProtocolBase) const;
-	CSpudBinderRef* GetRefL(TContextId aContextId) const;
-	TContextId FindContextIdL(const CNifIfBase* aNifBase) const;
-	CSpudBinderRef* GetAnyRefL() const;
-	TUint NumContexts() const;
-	TBool IsLastContext(TContextId aContextId)const;
-	TUint SweepBinders();
-	void LoadNifL(const TDesC& aName, CSpudBinderRef& aBinder);
-
-	void MuxClosed();
-	CSpudMux* TransferSpudMux();
-
-	// Getters
-	CSpudMux* SpudMux() const;
-	CSpudMan* SpudMan() const;
-	CSpudProtocol* SpudProtocol() const;
-	
-	CSpudBinderRef* GetNewRefForPrimaryL();
-	CSpudBinderRef* GetNewRefForSecondaryL(TContextId& aContextId);
-
-protected:
-	void ReadLowerNifName(void);	
-
-private:
-	/** Reference to CSpudMan object */
-	CSpudMan& iSpudMan;
-
-	/** Pointer to CSpudMux object */
-	CSpudMux* iMux;
-
-	/** ETrue if it is our responsibility to delete the iMux object */
-	TBool iDeleteMux;
-
-	/** Pointer to CSpudProtocol object */
-	CSpudProtocol* iSpudProtocol;
-
-	/** Array of CSpudBinderRef objects */
-	TFixedArray<CSpudBinderRef*, KMaxPdpContexts> iBinders;
-
-	/** Name of lower NIF as configured in CommDB */
-	TBuf<KConnMaxInterfaceName> iLowerNifName;
-	};
-
-#include "bindman.inl"
-
-#endif
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/spudman/inc/bindman.inl	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,182 +0,0 @@
-// 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:
-// SPUD binder manager
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#ifndef BINDMAN_INL
-#define BINDMAN_INL
-
-/**
-Returns a pointer to the SpudMux object and transfers ownership.
-
-@return Pointer to SpudMux (ownership is transferred)
-*/
-inline CSpudMux* CBindMan::TransferSpudMux()
-	{
-	ASSERT(iDeleteMux);
-	iDeleteMux = EFalse;
-	ASSERT(iMux);
-	return iMux;
-	}
-
-/**
-Returns a pointer to the SpudMux object.
-
-@return pointer to SpudMux
-*/
-inline CSpudMux* CBindMan::SpudMux() const
-	{
-	ASSERT(iMux);
-	return iMux;
-	}
-
-/**
-Returns a pointer to the SpudMan object.
-
-@return pointer to SpudMan
-*/
-inline CSpudMan* CBindMan::SpudMan() const
-	{
-	return &iSpudMan;
-	}
-
-/**
-Returns a pointer to the SpudProtocol object.
-
-@return pointer to SpudProtocol
-*/
-inline CSpudProtocol* CBindMan::SpudProtocol() const
-	{
-	return iSpudProtocol;
-	}
-
-/**
-Removes the pointer to the mux object once NIFMAN has deleted it.
-*/
-inline void CBindMan::MuxClosed()
-	{
-	iMux = NULL;
-	}
-
-/**
-Determines if this binder ref has been bound to a NIF yet.
-If not, then it can be used for a new connection.
-
-@return ETrue if object is already bound
-*/
-inline TBool CSpudBinderRef::IsBound() const
-	{
-	return iNifLink != NULL;
-	}
-
-/**
-Determines if this object is a binder for the given lower NIF.
-@return ETrue on a match
-*/
-inline TBool CSpudBinderRef::MatchBase(const CNifIfBase* aBase) const
-	{
-	return aBase == iNifBase;
-	}
-
-/**
-Returns a pointer to the CNifIfLink object.
-
-@return pointer to CNifIfLink
-*/
-inline CNifIfLink* CSpudBinderRef::NifLink() const
-	{
-	ASSERT(iNifLink);
-	return iNifLink;
-	}
-
-/**
-Returns a pointer to the CNifIfBase object.
-
-@return pointer to CNifIfBase
-*/
-inline CNifIfBase* CSpudBinderRef::NifBase() const
-	{
-	ASSERT(iNifBase);
-	return iNifBase;
-	}
-
-/**
-Returns a pointer to the CSpudNotify object.
-
-@return pointer to CSpudNotify
-*/
-inline CSpudNotify* CSpudBinderRef::Notify() const
-	{
-	ASSERT(iNotify);
-	return iNotify;
-	}
-
-/**
-Returns the state of the associated PDP context.
-
-@return state
-*/
-inline TSpudContextStates CSpudBinderRef::State() const
-	{
-	return iState;
-	}
-
-/**
-Sets the state of the associated PDP context.
-
-@param new state
-*/
-inline void CSpudBinderRef::SetState(TSpudContextStates aState)
-	{
-	// Binder must not be touched once it is designated for deletion, else we can leak it.
-	ASSERT(ESpudWaitBinderDelete != iState);
-	iState = aState;	
-	}
-
-/**
-Stores an error code detailing cause of context failure.
-
-@param error code
-*/
-inline void CSpudBinderRef::SetError(TInt aError)
-    {
-    iError = aError;
-    }
-
-/**
-Returns the context failure error
-*/
-inline TInt CSpudBinderRef::Error() const
-    {
-    return iError;
-    }
-
-/**
-Binds the binder object to the lower NIF.
-*/
-inline void CSpudBinderRef::Bind(CNifIfLink* aNifLink, CNifIfBase* aNifBase)
-	{
-	iNifBase = aNifBase;
-	iNifLink = aNifLink;
-	ASSERT(iNifBase);
-	ASSERT(iNifLink);
-	}
-
-#endif
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/spudman/inc/mux.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-// Copyright (c) 2004-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:
-// SPUD data multiplexer
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#ifndef MUX_H
-#define MUX_H
-
-#include "spudman.h"
-#include "bindman.h"
-#include <in_iface.h>
-#include <es_prot.h>
-
-/**
-Data multiplexer class.
-Dispatches packets from GUQoS to the appropriate PDP context.
-*/
-NONSHARABLE_CLASS(CSpudMux) : public CNifIfBase
-	{
-public:
-	CSpudMux(CSpudMan& aNifBase);
-	~CSpudMux();
-	void Construct(CBindMan& aBindMan);
-	
-	// setters
-	void SetProtocolBase(CProtocolBase* aProtocolBase);
-
-	// CNifIfBase
-	void Info(TNifIfInfo& aInfo) const;
-	TInt Send(RMBufChain& aPacket, TAny*);
-	TInt Notification(TAgentToNifEventType aEvent, void* /*aInfo*/);
-	void BindL(TAny* aId);
-	TInt State();
-	TInt Control(TUint aLevel, TUint aName, TDes8& aOption, TAny* aSource);
-
-
-private:
-	TInterfaceName iIfName;
-	CBindMan* iBindMan;
-	CProtocolBase* iProtocolBase;
-	};
-
-
-/**
-Data receiver class.
-Receives data from the network and sends it to the network stack.
-*/
-NONSHARABLE_CLASS(CSpudProtocol) : public CProtocolBase
-	{
-public:
-	CSpudProtocol();
-	~CSpudProtocol();
-	void Construct(CBindMan& aBindMan);
-
-	void SetProtocolBaseL(CProtocolBase* aProtocolBase);
-	void DoStartSending() const;
-
-	// CProtocolBase
-	void Identify(TServerProtocolDesc *aDesc) const;
-	void StartSending(CProtocolBase* aProtocol);
-	void Process(RMBufChain& aChain, CProtocolBase* aSourceProtocol);
-	void Process(TDes8& aPDU, TSockAddr* aFrom, TSockAddr* aTo, CProtocolBase* aSourceProtocol);
-	void Error(TInt aError, CProtocolBase* aSourceProtocol);
-
-private:
-	CBindMan* iBindMan;
-	CProtocolBase* iProtocolBase;
-	};
-
-#endif
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/spudman/inc/spudfactory.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-// Copyright (c) 2004-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:
-// SPUD Factory
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#ifndef SPUDFACTORY_H
-#define SPUDFACTORY_H
-
-#include "spudman.h"
-#include "bindman.h"
-#include "mux.h"
-#include "rpdpfsminterface.h"
-
-/**
-Factory class for SPUD
-*/
-NONSHARABLE_CLASS(CSpudFactory) : public CNifIfFactory
-	{
-public:
-	~CSpudFactory();
-	
-protected:
-	void InstallL();
-	CNifIfBase* NewInterfaceL(const TDesC& aName);
-	TInt Info(TNifIfInfo& aInfo, TInt aIndex) const;
-	CNifIfBase* NewInterfaceL(const TDesC& aName, MNifIfNotify* aNotify);
-	};
-
-#endif
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/spudman/inc/spudman.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,248 +0,0 @@
-// Copyright (c) 2004-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:
-// SPUD event manager
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#ifndef SPUDMAN_H
-#define SPUDMAN_H
-
-#include <e32base.h>
-#include <comms-infras/nifif.h>
-#include <networking/umtsnifcontrolif.h>
-#include <comms-infras/commsdebugutility.h>
-#include <networking/mspudmaninterface.h>
-
-#include "rpdpfsminterface.h"
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-#include <comms-infras/nifprvar_internal.h>
-#endif
-
-const TUint KSpudMajorVersionNumber=0;
-const TUint KSpudMinorVersionNumber=0;
-const TUint KSpudBuildVersionNumber=2;
-
-/** Longest protocol name supported */
-const TUint KMaxProtocolName = 20;
-
-#ifdef __FLOG_ACTIVE
-// Logging tags
-_LIT8(KSpudFirstTag,"spud");
-_LIT8(KSpudLog,"spudman.txt");
-#endif
-
-class CBinderSweeperNotifierCb;
-class CBindMan;
-class CSpudBinderRef;
-class RPdpFsmInterface;
-
-/**
-SPUD Event Manager.
-It is responsible for routing events throughout the SPUD and between interface points.
-*/
-NONSHARABLE_CLASS(CSpudMan) : public CNifIfLink, public MSpudManInterface
-	{
-public:
-	__FLOG_DECLARATION_MEMBER_MUTABLE;
-
-	CSpudMan(CNifIfFactory& aFactory, MNifIfNotify* aNotify);
-    ~CSpudMan();
-	void ConstructL(CBindMan* aBindMan);
-	void Panic(TInt aReason=0) const;
-
-	TBool AreQoSEventsEnabled() const;
-
-	// Getters
-	CBindMan* BindMan() const;	
-	MNifIfNotify* Notify() const;
-
-	// Events from elsewhere
-	TInt GuqosInput(TUint aName, TDes8& aOption);
-	void LinkLayerUp(TContextId aContextId);
-	void LinkLayerDown(TContextId aContextId, TInt aReason, MNifIfNotify::TAction aAction);
-	void StopSending(TContextId aContextId);
-	void StartSending(TContextId aContextId);
-
-	// from MSpudManInterface
-	void Input (TContextId aPdpId, TInt aEvent, TInt aParam);
-	void SetContextTerminationErrorAndStop(TContextId aContextId, TInt aErrorCode);
-
-	// from CNifIfLink
-    void AuthenticateComplete(TInt aResult);
-	TInt Start();
-	void Stop(TInt aReason, MNifIfNotify::TAction aAction);
-	CNifIfBase* GetBinderL(const TDesC& aName);
-	void Restart(CNifIfBase* aIf);
-
-	// from CNifIfBase
-	TInt Send(RMBufChain& aPdu, TAny* aSource=0);
-	void Info(TNifIfInfo& aInfo) const;
-	TInt Notification(TAgentToNifEventType aEvent, void * aInfo);
-
-    // SPUD methods
-    void IfProgress(TContextId aContextId, TInt aStage, TInt aError);
-    void IfProgress(TContextId aContextId, TSubConnectionUniqueId aSubConnectionUniqueId, TInt aStage, TInt aError);
-	TInt Notification(TContextId aContextId, TNifToAgentEventType aEvent, void * aInfo);
-	TInt ReadInt(TContextId aContextId, const TDesC& aField, TUint32& aValue);
-	TInt ReadDes(TContextId aContextId, const TDesC& aField, TDes8& aValue);
-	TInt ReadDes(TContextId aContextId, const TDesC& aField, TDes16& aValue);
-	
-	void DisposeOfBinder(CSpudBinderRef* aRef);
-	void SweepBindersAndNotify();
-	
-protected:
-	void ReadDefaultQoS(RPacketQoS::TQoSR99_R4Requested& aQos) const;
-
-	
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-	
-	// IM CN signalling flag, Setter and Getter methods
-	void SetIMCNSignallingFlagPcoL(RPacketContext::TProtocolConfigOptionV2& aPco);	
-	TBool GetIMCNSignallingFlagPcoL(RPacketContext::TProtocolConfigOptionV2& aPco);
-	
-	void ReadDefaultR5QoS(RPacketQoS::TQoSR5Requested& aQos) const;
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 
-
-	void ReadTsyName(TName& aTsyName) const;
-	void SetTerminateError(TInt aError);
-	void SetTerminateError(TContextId aContextId, TInt aError);
-	void RetrieveGprsConfig(RPacketContext::TContextConfigGPRS& aConfigGprs) const;
-	void RetrieveGprsCompression(TUint& aCompression) const;
-	void RetrieveGprsAnonymousAccess(RPacketContext::TAnonymousAccess& aAnonymous) const;
-
-	void FillInParameters(TContextParameters& aParams, TContextId aContextId, TInt aError=KErrNone) const;
-	void FillInContextConfig(TContextConfig& aConfig, TContextId aContextId) const;
-	void RaiseEvent(TUint aName, TDes8& aOption) const;
-	
-	virtual TInt Control(TUint aLevel,TUint aName,TDes8& aOption, TAny* aSource=0);
-
-	// GUQoS event senders
-	void SendPrimaryContextCreated(TContextId aContextId, TInt aError);
-	void SendContextBlockedEvent(TContextId aContextId);
-	void SendContextUnblockedEvent(TContextId aContextId);
-	void SendSecondaryContextCreated(TContextId aContextId, TInt aError);
-	void SendContextQoSSetEvent(TContextId aContextId, TInt aError);
-	void SendContextTFTModifiedEvent(TContextId aContextId, TTFTOperationCode aTFTOperationCode, TInt aError);
-	void HandleGetNegQoSEvent(TContextId aContextId, TInt aError);
-	void SendContextModifyActiveEvent(TContextId aContextId, TContextConfig& aContextConfig, TInt aError);
-	void SendContextDeleteEvent(TContextId aContextId);
-	void SendNetworkStatusEvent(TNetworkEventCode aEventCode, RPacketService::TStatus aStatus);
-	void SendContextActivateEvent(TContextId aContextId, TContextConfig& aContextConfig, TInt aError);
-	void SendContextParametersChangeEvent(TContextId aContextId, TContextConfig& aContextConfig, TInt aError);
-
-private:
-	void InitPdpFsmInterfaceL();
-	
-	void HandlePrimaryContextCreatedEvent(TContextId aContextId, TInt aError);
-	void HandleContextDeleteEvent(TContextId aContextId, TInt aError);
-	void HandleSecondaryContextCreatedEvent(TContextId aContextId, TInt aError);
-	void HandleContextActivateEvent(TContextId aContextId, TInt aError);
-	void HandleContextQoSSetEvent(TContextId aContextId, TInt aError);
-	void HandleContextTFTModifiedEvent(TContextId aContextId, TInt aError);
-	void HandleContextModifyActiveEvent(TContextId aContextId, TInt aError);
-	void HandleNetworkStatusEvent();
-	void HandleContextParametersChangeEvent(TContextId aContextId, TInt aError);
-	void HandleContextBlockedEvent(TContextId aContextId);
-	void HandleContextUnblockedEvent(TContextId aContextId);
-	
-	void SetupSipServerAddrRetrievalL(RPacketContext::TProtocolConfigOptionV2& aPco);
-	void SetSipServerAddrL(const RPacketContext::TProtocolConfigOptionV2& aPco);
-
-	void StopContext(TContextId aContextId, TInt aReason, MNifIfNotify::TAction aAction);
-
-private:
-	CBindMan* iBindMan;
-
-	/** GUQoS event notifier */
-	MNifEvent* iQosEventHandler;
-
-	/** Protocol name */
-	TBuf<KMaxProtocolName> iName;
-
-	/** Whether events should be sent to GUQoS or not */
-	TBool iQosEventsEnabled;
-
-	/** Interface to ETEL */
-	RPdpFsmInterface iPdpFsmInterface;
-
-	/** Temporary storage of context configuration, here to avoid stack overflow */
-    TContextConfig iTempContextConfig;
-    
-	/** Temporary storage of TFT, here to avoid stack overflow */
-    mutable TTFTInfo iTempTftInfo;
-    
-	/** Temporary storage of GPRS context configuration, here to avoid stack overflow */
-    mutable RPacketContext::TContextConfigGPRS iTempGprsContext;
-    
-	/** Temporary storage of channel configuration, here to avoid stack overflow */
-    RPacketContext::TDataChannelV2 iTempDataChannelV2;
-    
-    /** Error code which indicates the cause of the SPUD shutdown */
-    TInt iTerminateError;
-    
-    /** First Error code from ETel */
-    TInt iETelTerminateError;
-    
-    /** Asynchronous sweep of binders marked for deletion, with optional notification to Nifman */
-    CBinderSweeperNotifierCb* iBinderSweeperNotifierCb;
-	
-    /** Default QoS sent from GuQoS before this Nif was ready */
-    HBufC8* iParkedDefaultQoS;
-    
-    /** The address of the P-CSCF (Sip server) */
-    RArray<TInetAddr> iSipServerAddr;
-    
-
-	/** It may be necessary to report a context status to GUQoS, which is different to the formal
-	context status at the very moment of reporting. */
-	RPacketContext::TContextStatus iContextStatusOverride;
-	
-	/** Store the Primary ContextId that might be changed over time */
-	TContextId iPrimaryContextId;
-	
-	};
-
-
-/** Asynchronously calls into Nifman, to trigger sweeping of binders marked for deletion &
-    if necessary, Nifman notification.
-	
-	When the lower NIF signals LinkLayerDown on SPUD, SPUD has to delete it.
-	However, this deletion cannot be done from within CSpudMan::LinkLayerDown, because
-	the lower NIF's may still access its members after CSpudMan::LinkLayerDown returns.
-	That is, the lower NIF must be deleted asynchronousely. However, if this is the last 
-	lower NIF, SPUD must signal MNifIfNotify::LinkLayerDown on Nifman. This triggers asynchronous deletion
-	of SPUD itself. So, there can be a race condition between asynchronous deletion of SPUD by Nifman,
-	and deletion of the lower NIF by SPUD.	*/	
-NONSHARABLE_CLASS(CBinderSweeperNotifierCb): public CAsyncOneShot
-	{
-	public:
-		CBinderSweeperNotifierCb(CSpudMan& aSpudMan);
-		
-		// CAsyncOneShot virtuals
-		void Call();
-		void RunL();
-	
-	private:
-		/** We call into Spudman that actually performs the sweeping & notification */
-		CSpudMan& iSpudMan;		
-    };
-	
-
-#endif
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/spudman/inc/spudnotify.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-// Copyright (c) 2004-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:
-// NIFMAN notification proxy class
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#ifndef SPUDNOTIFY_H
-#define SPUDNOTIFY_H
-
-#include <e32base.h>
-#include <comms-infras/nifif.h>
-#include <networking/umtsnifcontrolif.h>
-
-class CSpudBinderRef;
-class CBindMan;
-
-/**
- * Interface from the nif and the protocol layers to Nifman
- */
-NONSHARABLE_CLASS(CSpudNotify) : public CBase, public MNifIfNotify
-    {
-public:
-    CSpudNotify(CBindMan& aBindMan, MNifIfNotify* aNotify, TContextId aContextId);
-    ~CSpudNotify();
-
-    virtual void LinkLayerDown(TInt aReason, TAction aAction);
-	virtual void LinkLayerUp();
-    virtual void NegotiationFailed(CNifIfBase* aIf, TInt aReason);
-    virtual TInt Authenticate(TDes& aUsername, TDes& aPassword);
-    virtual void CancelAuthenticate();
-	virtual TInt GetExcessData(TDes8& aBuffer);
-
-
-	virtual void IfProgress(TInt aStage, TInt aError);
-	virtual void IfProgress(TSubConnectionUniqueId aSubConnectionUniqueId, TInt aStage, TInt aError);
-	virtual void OpenRoute();
-	virtual void CloseRoute();
-	virtual TInt Notification(TNifToAgentEventType aEvent, void * aInfo = NULL);
-	virtual void BinderLayerDown(CNifIfBase* aBinderIf, TInt aReason, TAction aAction);
- 	virtual TInt PacketActivity(TDataTransferDirection aDirection, TUint aBytes, TBool aResetTimer);
-	virtual void NotifyDataSent(TSubConnectionUniqueId aSubConnectionUniqueId, TUint aUplinkVolume);
-	virtual void NotifyDataReceived(TSubConnectionUniqueId aSubConnectionUniqueId, TUint aDownlinkVolume);
-	virtual void NifEvent(TNetworkAdaptorEventType aEventType, TUint aEvent, const TDesC8& aEventData, TAny* aSource=0);
-
-
-
-protected:
-	virtual TInt DoReadInt(const TDesC& aField, TUint32& aValue,const RMessagePtr2* aMessage);
-    virtual TInt DoWriteInt(const TDesC& aField, TUint32 aValue,const RMessagePtr2* aMessage);
-    virtual TInt DoReadDes(const TDesC& aField, TDes8& aValue,const RMessagePtr2* aMessage);
-    virtual TInt DoReadDes(const TDesC& aField, TDes16& aValue,const RMessagePtr2* aMessage);
-    virtual TInt DoWriteDes(const TDesC& aField, const TDesC8& aValue,const RMessagePtr2* aMessage);
-	virtual TInt DoWriteDes(const TDesC& aField, const TDesC16& aValue,const RMessagePtr2* aMessage);
-	virtual TInt DoReadBool(const TDesC& aField, TBool& aValue,const RMessagePtr2* aMessage);
-    virtual TInt DoWriteBool(const TDesC& aField, TBool aValue,const RMessagePtr2* aMessage);
-
-
-private:
-    CBindMan& iBindMan;
-    MNifIfNotify* iNotify;
-    TContextId iContextId;
-    };
-
-
-#endif /*SPUDNOTIFY_H*/
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/spudman/src/bindman.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,435 +0,0 @@
-// Copyright (c) 2004-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:
-// SPUD binder manager
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#include "bindman.h"
-#include "spudnotify.h"
-#include "mux.h"
-#include <nifman.h>
-
-/** Default name of lower NIF */
-_LIT(KDefaultLowerNifName, "rawip");
-
-#ifdef __FLOG_ACTIVE
-#define BINDMAN_LOG(x) SpudMan()->x
-#else
-#define BINDMAN_LOG(x)
-#endif
-
-//*****************************************************************************
-// CBindMan
-//*****************************************************************************
-
-/**
-Constructs BindMan. Ownership of aMux and aProto is transferred to this object.
-
-@param aSpudMan Reference to SpudMan object
-@param aMux Pointer to SpudMux object (ownership is transferred)
-@param aProto Pointer to SpudProtocol object (ownership is transferred)
-*/
-CBindMan::CBindMan(CSpudMan& aSpudMan, CSpudMux* aMux, CSpudProtocol* aProto)
-	: iSpudMan(aSpudMan), iMux(aMux), iDeleteMux(ETrue), iSpudProtocol(aProto)
-    {
-    ReadLowerNifName();
-	}
-
-CBindMan::~CBindMan()
-    {
-    BINDMAN_LOG(__FLOG(_L("BindMan::~BindMan")));
-    
-    #ifdef __FLOG_ACTIVE // Log for diagnostic purposes
-    TInt idx;
-    for(idx = 0; idx < iBinders.Count(); ++idx)
-    	{
-    	if(iBinders[idx] && iBinders[idx]->IsBound())
-			{
-			BINDMAN_LOG(__FLOG_1(_L("~BindMan: deleting bound lower NIF binding for context[%d]"), idx));			
-   			}
-    	}
-    #endif
-
-    iBinders.DeleteAll();
-    delete iSpudProtocol;
-    if (iDeleteMux)
-    	{
-    	delete iMux;
-    	}
-	}
-
-/**
-Reads the lower NIF name from CommDb.
-
-@todo This function incorrectly returns the default value when IfParams is of the form:
- "notlowernif=UNWANTED,lowernif=IGNORED".
- This defect is also present in CPppLcp::InitL.
-*/
-void CBindMan::ReadLowerNifName(void)
-	{
-	TBuf<KCommsDbSvrMaxFieldLength> params;
-	_LIT(KInterfaceIdentifier,"lowernif=");
-	const TInt KLinkEqualsLength = 9;	// length of "lowernif="
-	ASSERT(static_cast<const TDesC&>(KInterfaceIdentifier).Length() == KLinkEqualsLength);
-
-	// Read IfParams field
-	iSpudMan.Notify()->ReadDes(TPtrC(ISP_IF_PARAMS), params);
-
-	TInt paramStartMarker = params.Find(KInterfaceIdentifier);
-
-	if (paramStartMarker == KErrNotFound)
-		{
-		// "lowernif=" not found in the string - use default lower layer
-		iLowerNifName = KDefaultLowerNifName;
-		BINDMAN_LOG(__FLOG_1(_L("Lower NIF name not configured; defaulting to %S"), &iLowerNifName));
-		}
-	else
-		{
-		// "lowernif=<nifname>" found in the string - extract the lower layer Nif name
-
-		if (paramStartMarker > 0 && params[paramStartMarker-1] != ',')
-			{
-			// "xyzlowernif=<xxx>" found rather than "lowernif=<xxx>" - use default lower layer
-			iLowerNifName = KDefaultLowerNifName;
-			BINDMAN_LOG(__FLOG_1(_L("Lower NIF name not configured; defaulting to %S"), &iLowerNifName));
-			}
-		else
-			{
-			// String of the form "[...,]lowernif=<nifname>[,...]" found - extract the Nif name
-			TPtrC postfix(params.Mid(paramStartMarker + KLinkEqualsLength));
-			TInt comma = postfix.Locate(',');
-			if (comma != KErrNotFound)
-				{
-				postfix.Set(postfix.Ptr(), comma);
-				}
-			iLowerNifName = postfix;
-			}
-		}
-	}
-
-/**
-Informs CSpudProtocol of the CProtocolBase pointer from the L3 protocol.
-*/
-void CBindMan::SetProtocolBaseL(CProtocolBase* aProtocolBase) const
-	{
-	iSpudProtocol->SetProtocolBaseL(aProtocolBase);
-	}
-
-/**
-Returns the binder for the given context ID.
-@param aContextId context ID
-@return Pointer to binder object
-@leave KErrBadHandle or KErrNotReady if context ID is invalid or not found
-*/
-CSpudBinderRef* CBindMan::GetRefL(TContextId aContextId) const
-    {
-    if (aContextId < 0 || aContextId >= iBinders.Count())
-    	{
-		BINDMAN_LOG(__FLOG_1(_L("CBindMan::GetRefL invalid context ID %d"), aContextId));
-	    User::Leave(KErrBadHandle);
-    	}
-	CSpudBinderRef* ref = iBinders[aContextId];
-	if (ref == NULL)
-		{
-		// This situation can frequently occur when looping through all binders
-	    User::Leave(KErrNotReady);
-		}
-	return ref;
-	}
-
-/**
-Returns the binder for any lower NIF that is available and bound.
-@return Pointer to binder object
-@leave KErrNotReady if no lower NIF is found
-*/
-CSpudBinderRef* CBindMan::GetAnyRefL() const
-	{
-    TInt index;
-    for (index=0; index < iBinders.Count(); ++index)
-    	{
-    	CSpudBinderRef* ref = iBinders[index];
-    	if (ref && ref->IsBound() && ref->State() != ESpudWaitBinderDelete)
-    		{
-    		return ref;
-    		}
-    	}
-	BINDMAN_LOG(__FLOG_0(_L("CBindMan::GetAnyRefL Can't find any bound NIF")));
-    User::Leave(KErrNotReady);
-    return NULL;	// never reached
-	}
-
-/**
-Returns the context ID the given lower NIF.
-@param aNifBase pointer to lower NIF
-@return context ID
-@leave KErrNotReady if lower NIF is not found
-*/
-TContextId CBindMan::FindContextIdL(const CNifIfBase* aNifBase) const
-	{
-    TContextId index;
-    for (index=0; index < iBinders.Count(); ++index)
-    	{
-    	CSpudBinderRef* ref = iBinders[index];
-    	if (ref && ref->MatchBase(aNifBase))
-    		{
-    		return index;
-    		}
-    	}
-	BINDMAN_LOG(__FLOG_1(_L("CBindMan::FindContextIdL Can't find aNifBase %x"), aNifBase));
-    User::Leave(KErrNotReady);
-    return KAllContexts;	// never reached
-	}
-
-/**
-Returns the number of bound contexts.
-@return Number of bound contexts
-*/
-TUint CBindMan::NumContexts() const
-	{
-    TInt index;
-    TUint count = 0;
-    for (index=0; index < iBinders.Count(); ++index)
-    	{
-    	CSpudBinderRef* ref = iBinders[index];
-    	if (ref && ref->IsBound())
-    		{
-    		++count;
-    		}
-    	}
-	return count;
-	}
-	
-/**
-Checks if this is is the last 'valid' context in SPUD, i.e. it is bound and not marked for deletion.
-
-@param aContextID the ID of the context to check
-@return ETrue if and only if aContextId (the subject bindre) is the only valid, bound, unmarked binder.
-*/
-TBool CBindMan::IsLastContext(TContextId aContextId)const
-	{
-	ASSERT(aContextId >= 0 && NumContexts() > 0); // we shouldn't be called unless we have at least 1 ctx
-	
-	TUint numLiveBoundBinders(0); 
-	TBool isTargetBinderFound(EFalse); // The binder for the subject context exists, is bound, and not marked for deletion.
-	
-	TInt binderIdx;
-	for(binderIdx = 0; binderIdx < iBinders.Count(); ++binderIdx) // sift through all the binders
-		{
-		if(iBinders[binderIdx] && // binder exists
-		   iBinders[binderIdx]->IsBound() &&  // is bound
-		   ESpudWaitBinderDelete != iBinders[binderIdx]->State() // not marked for deletion
-		)
-			{
-			++numLiveBoundBinders;
-			
-			if(binderIdx == aContextId)
-				{
-				isTargetBinderFound = ETrue;
-				}											
-			}
-		}
-	ASSERT(isTargetBinderFound); // sanity check: we have a referene to the subject binder,
-	                             // and it is 'valid': bound and not marked for deletion.	
-	
-	if(0 == numLiveBoundBinders) // No valid bound binders remain.
-		{
-		ASSERT(EFalse); // spudman thinks it has valid binders, when there are none.
-		
-		// In release builds, we can't say that there are more binders, because we have no
-		// references to them. 
-		return ETrue; // EFalse implies that we have at least 1 binder
-		}
-	else if(1 == numLiveBoundBinders) 
-		{
-		// In release builds: if live binder is not the subject context, we can't claim that the 
-		// subject context is the last one, or SPUD may shutdown when it has a context.
-		return isTargetBinderFound; // Is there another valid binder beside the subject?
-		}
-	else // > 1 
-		{
-		// Regardless of whether the subject context was found, we have more.
-		return EFalse;
-		}
-	}
-	
-/**
-Creates and returns a pointer to a new binder object. Ownership remains with BindMan;
-DeleteRef() must be called to delete the binder reference object.
-
-@param aContextId Holds the new context ID on return
-@return Pointer to binder object
-@leave KErrNotSupported if we are out of PDP contexts, or KErrNoMemory if out of RAM
-*/
-CSpudBinderRef* CBindMan::GetNewRefForSecondaryL(TContextId& aContextId)
-    {
-    // Reusing the slot of the primary context is not allowed.
-    static const TContextId KFirst2ndaryCtxIdx(KPrimaryContextId + 1);
-    TContextId index;
-    for (index = KFirst2ndaryCtxIdx; index < iBinders.Count(); ++index)
-    	{
-    	CSpudBinderRef*& ref = iBinders[index];
-    	if (ref == NULL)
-    		{
-    		// Create a binder in this new slot
-    		aContextId = index;
-    		// ref is a reference to a pointer that is owned by Bindman. It will be deleted in the
-    		// destructor. There is no need for CleanupStack.
-    		ref = new (ELeave) CSpudBinderRef(*iSpudMan.BindMan());
-    		ref->ConstructL(iSpudMan.Notify(), aContextId);
-    		return ref;
-    		}
-    	else if (!ref->IsBound())
-			{
-			// This binder was previously constructed but unbound
-			ASSERT(ref->Notify() == iSpudMan.Notify());
-    		aContextId = index;
-    		return ref;
-			}
-    	}
-	BINDMAN_LOG(__FLOG_0(_L("CBindMan::GetNewRefForSecondaryL No room for new binder reference")));
-    User::Leave(KErrNotSupported);
-    return NULL;	// never reached
-	}
-
-
-
-/** 
-Creates and returns a pointer to the new binder for the Primary PDP context.
-The primary is a special case, because it can be created only once, and it uses a special
-ID = 0.  If the primary fails then a secondary can be promoted to primary status 
-even in this case ID = 0 is not re-used because GetNewRefForSecondaryL prevents this.
-This means that KPrimaryContextId is only significant once at startup time!
-
-Ownership remains with BindMan;
-DeleteRef() must be called to delete the binder reference object.
-
-@return the pointer to the binder object for the primary pdp context.
-@leave if the construction of the binder leaves.
-*/
-CSpudBinderRef* CBindMan::GetNewRefForPrimaryL()
-	{
-	CSpudBinderRef*& primRef = iBinders[KPrimaryContextId];
-	if(primRef) // We must not try to create the primary more than once.
-		{
-		ASSERT(EFalse);
-		User::Leave(KErrAlreadyExists); // Release builds
-		}
-	// primRef is a reference to a pointer that is owned by Bindman. It will be deleted in the
-    // destructor. There is no need for CleanupStack.
-	primRef = new (ELeave) CSpudBinderRef(*iSpudMan.BindMan());
-	primRef->ConstructL(iSpudMan.Notify(), KPrimaryContextId);
-	return primRef;
-	}
-
-
-
-/**
-Loads a new lower NIF and bind to the binder ref
-
-@param aName Protocol name desired
-@param aBinder the binder to bind the lower NIF into.
-@see CNifAgentRef::ServiceStarted()
-*/
-void CBindMan::LoadNifL(const TDesC& aName, CSpudBinderRef& aBinder)
-	{
-	BINDMAN_LOG(__FLOG_2(_L("CBindMan::LoadNifL loading NIF %S for protocol %S"), &iLowerNifName, &aName));
-	
-	CNifIfLink* lowerNif=static_cast<CNifIfLink*>(Nif::CreateInterfaceL(iLowerNifName, aBinder.Notify()));
-
-	// Increment reference count
-	lowerNif->Open();
-
-	CleanupClosePushL(*lowerNif);
-	// Create CNifIfBase and bind it
-	// Maybe binding should be left to CSpudBinderRef
-	CNifIfBase* nifBase = lowerNif->GetBinderL(aName);
-	CleanupStack::Pop();
-	
-	// Increment reference count
-	nifBase->Open();
-	
-	// Bind the lower NIF into the SPUD
-	aBinder.Bind(lowerNif, nifBase);
-	
-	// Bind the lower NIF to SpudProtocol
-	nifBase->BindL(iSpudProtocol);
-	}
-
-
-/** Deletes the dead (marked for deletion) references to lower NIF bindings..
-
-@return the number of contexts remaining after the deletion
-*/
-TUint CBindMan::SweepBinders()
-	{
-	TUint liveContexts(0);
-	TInt binderIdx;
-	for(binderIdx = 0; binderIdx < iBinders.Count(); ++binderIdx) // Sift through all the binders
-		{
-		if(iBinders[binderIdx] && iBinders[binderIdx]->IsBound()) // Binder exists and is bound to a lower NIF 
-			{
-			if(ESpudWaitBinderDelete == iBinders[binderIdx]->State()) //Must be deleted
-				{
-				BINDMAN_LOG(__FLOG_1(_L("CBindMan::SweepBinders: deleting binder for context[%d]"), binderIdx));
-				delete iBinders[binderIdx];
-				iBinders[binderIdx] = NULL;
-				}
-			else // Binder exists and is bound, but is not eligible for deletion. 
-				{
-				BINDMAN_LOG(__FLOG_1(_L("CBindMan::SweepBinders: context[%d] is alive."), binderIdx));
-				++liveContexts;
-				}
-			}
-		// Binder is not bound. We don't care. It will be taken care of in the destructor.
-		}		 
-	return liveContexts; 
-	}
-
-//*****************************************************************************
-// CSpudBinderRef
-//*****************************************************************************
-
-
-CSpudBinderRef::CSpudBinderRef(CBindMan& aBindMan)
-	:iBindMan(aBindMan)
-	{
-	}
-
-CSpudBinderRef::~CSpudBinderRef()
-	{
-	if (IsBound())
-		{
-	   	// This call causes the NIF base to delete itself
-	   	iNifBase->Close();
-
-	   	// This call causes the NIF link to delete itself
-	   	iNifLink->Close();
-		}
-
-   	delete iNotify;
-	}
-
-/**
-Creates a SpudNotify object.
-@leave KErrNoMemory if out of RAM
-*/
-void CSpudBinderRef::ConstructL(MNifIfNotify* aNotify, TContextId aContextId)
-	{
-	iNotify = new (ELeave) CSpudNotify(iBindMan, aNotify, aContextId);
-	}
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/spudman/src/mux.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,375 +0,0 @@
-// Copyright (c) 2004-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:
-// SPUD data multiplexer
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#include "mux.h"
-#include <nifmbuf.h>
-#include <in6_if.h>
-
-// Flow control constants expected by the upper protocol stack
-const TInt KStopSending		= 0;
-const TInt KContinueSending	= 1;
-
-#ifdef __FLOG_ACTIVE
-#define SPUDMUX_LOG(x) iBindMan->SpudMan()->x
-#else
-#define SPUDMUX_LOG(x)
-#endif
-
-
-//
-// CSpudMux
-//
-
-
-CSpudMux::CSpudMux(CSpudMan& aNifBase)
-	: CNifIfBase(aNifBase)
-    {
-	}
-
-CSpudMux::~CSpudMux()
-    {
-    // Notify BindMan to delete the pointer to this object
-    if (iBindMan)
-    	{
-	    iBindMan->MuxClosed();
-    	}
-	}
-
-/**
-Constructs the mux object
-
-@param aBindMan Reference to BindMan object
-*/
-void CSpudMux::Construct(CBindMan& aBindMan)
-	{
-	iBindMan = &aBindMan;
-	
-	// Create a unique interface name
-	iIfName.Format(_L("%S[0x%08x]"), &KSpudName, this);
-	}
-
-/**
-Binds SPUD to the TCP/IP stack.
-
-@param aId Pointer to network stack object (CProtocolBase*)
-@leave KErrInUse if SPUD is already bound
-*/
-void CSpudMux::BindL(TAny* aId)
-	{
-	iBindMan->SetProtocolBaseL(static_cast<CProtocolBase*>(aId));
-	}
-
-
-/**
-Fills in the info object with NIF information.
-
-@param aInfo object to hold information on return
-*/
-void CSpudMux::Info(TNifIfInfo& aInfo) const
-	{
-	// Get the binder for the first (default) lower NIF.
-	CSpudBinderRef* ref = NULL;
-	TRAPD(err, ref = iBindMan->GetAnyRefL());
-	if (err == KErrNone)
-		{
-		// Read the protocol supported value from the lower NIF
-		ref->NifBase()->Info(aInfo);
-		ASSERT((aInfo.iFlags & (KNifIfIsBase | KNifIfUsesNotify | KNifIfCreatedByLink)) == (KNifIfIsBase | KNifIfUsesNotify | KNifIfCreatedByLink));
-		}
-	else
-		{
-		aInfo.iProtocolSupported=KProtocolUnknown;
-		}
-
-	// Overwrite these values with our own
-	aInfo.iName.Copy(iIfName);
-	aInfo.iVersion = TVersion(KSpudMajorVersionNumber, KSpudMinorVersionNumber, KSpudBuildVersionNumber);
-	aInfo.iFlags = KNifIfIsBase | KNifIfUsesNotify | KNifIfCreatedByLink;
-	}
-
-/**
-Takes packets from the IP stack and demultiplexes them by sending each on to
-the appropriate lower NIF for processing. The packets are assumed to be
-ordered correctly, as appropriate for the QoS guarantees given to each.
-This function's responsibility is to pass each packet to the appropriate
-lower NIF for processing, where each lower NIF handles a single PDP context.
-
-@param aPacket MBuf chain containing packet
-@param aSource Passed unchanged to lower NIF
-@return 1 for a successful send, 0 to tell upper layer to flow off
-*/
-TInt CSpudMux::Send(RMBufChain& aPacket, TAny* aSource)
-	{
-	// GUQoS places the context ID for the outgoing packet into the Port field
-	// in the RMBufChain info header.
-	const RMBufPktInfo* info = RMBufPacket::PeekInfoInChain(aPacket);
-	TUint contextId(info->iDstAddr.Port());
-	if (contextId >= static_cast<TUint>(KMaxPdpContexts))
-		{
-		// Context ID is illegal; use 0 instead and try to continue
-		SPUDMUX_LOG(__FLOG_1(_L("CSpudMux::Send context id %d is out of range; using 0 instead"), contextId));
-		contextId = 0;
-		}
-	const TContextId id(static_cast<TContextId>(contextId));
-
-	// Get the binder for the appropriate lower NIF.
-	CSpudBinderRef* ref = NULL;
-	TRAPD(err, ref = iBindMan->GetRefL(id));
-	if (err != KErrNone)
-		{
-		// That's odd--GUQoS is sending to an invalid context.
-		// Redirect it to the first valid context instead.
-		SPUDMUX_LOG(__FLOG_1(_L("CSpudMux::Send context id %d is invalid; searching for another"), id));
-		TRAPD(err, ref = iBindMan->GetAnyRefL());
-		if (err != KErrNone)
-			{
-			// Something is really wrong here! No contexts available at all!
-			SPUDMUX_LOG(__FLOG_0(_L("Nowhere to send data! Dropping packet")));
-			return err;
-			}
-		}
-	TInt rc = ref->NifBase()->Send(aPacket, aSource);
-
-	// See if NIF is flowing off data on this context
-	if ((rc == KStopSending) && iBindMan->SpudMan()->AreQoSEventsEnabled())
-		{
-		// Send flow off indication via GUQoS instead
-		iBindMan->SpudMan()->StopSending(id);
-		rc = KContinueSending;	// Successful send indication
-		}
-	return rc;
-	}
-
-/**
-Processes notifications from agent.
-
-@param aEvent event type
-@param aInfo data associated with event
-@return error code
-*/
-TInt CSpudMux::Notification(TAgentToNifEventType aEvent, void* aInfo)
-	{
-	SPUDMUX_LOG(__FLOG_1(_L("CSpudMux::Notification received event %d"), aEvent));
-	TInt rc = KErrNotSupported;
-	switch (aEvent)
-		{
-	case EAgentToNifEventTypeModifyInitialTimer:
-	case EAgentToNifEventTypeDisableTimers:
-	case EAgentToNifEventTypeEnableTimers:
-		// Send notification to all lower NIFs
-		rc =  KErrNotReady;
-		TContextId i;
-		for (i=0; i < KMaxPdpContexts; ++i)
-			{
-			CSpudBinderRef* ref = NULL;
-			TRAP(rc, ref = iBindMan->GetRefL(i));
-			if (rc == KErrNone)
-				{
-				rc = ref->NifBase()->Notification(aEvent, aInfo);
-				}
-			}
-		break;
-
-	case EAgentToNifEventTypeDisableConnection:
-		SPUDMUX_LOG(__FLOG_0(_L("CSpudMux::Notification received EAgentToNifEventTypeDisableConnection")));
-		// TODO: How to handle this event?  Just fall through and ignore for now.
-	default:
-		break;
-		}
-
-	return rc;
-	}
-
-/**
-Returns the current state of the interface
-
-@return TIfStatus indicating the current state of the interface
-*/
-TInt CSpudMux::State()
-	{
-	// Get the binder for the first (default) lower NIF.
-	CSpudBinderRef* ref = NULL;
-	TRAPD(err, ref = iBindMan->GetAnyRefL());
-	if (err != KErrNone)
-		{
-		return EIfDown;
-		}
-	
-	// Use the state of the first lower NIF as the state of the SPUD
-	return ref->NifBase()->State();
-	}
-
-/**
-Controls the NIF
-
-@param aLevel The intended level for this control option
-@param aName The name of the control option
-@param aOption Any data associated with this control option, contained within a TPckg(Buf)
-@param aSource If provided, an identifier for the source of the control option; by default, zero
-@return KErrNone if successful; otherwise one of the standard Symbian OS error codes
-*/
-TInt CSpudMux::Control(TUint aLevel, TUint aName, TDes8& aOption, TAny* aSource)
-	{
-	if (aLevel==KSOLInterface)
-		{
-		switch (aName)
-			{
-		// From elsewhere
-		case KSoIfInfo:
-		case KSoIfInfo6:
-		case KSoIfConfig:
-		case KSoIfCompareAddr:
-		case KSoIfGetConnectionInfo:
-		case KSoIfHardwareAddr:
-			{
-			// Get the binder for the first (default) lower NIF.
-			CSpudBinderRef* ref = NULL;
-			TRAPD(err, ref = iBindMan->GetAnyRefL());
-			if (err != KErrNone)
-				{
-				return err;
-				}
-			return ref->NifBase()->Control(aLevel, aName, aOption, aSource);
-			}
-
-		default:
-			// Unknown event
-			// Assume it's for GUQoS, so let SpudMan handle it and error out the unknown ones
-			// These include:
-			//   KSoIfControllerPlugIn
-        	//   KRegisterEventHandler
-			//   KContextSetEvents
-			//   KNifSetDefaultQoS
-			//   KContextCreate
-			//   KContextDelete
-			//   KContextActivate
-			//   KContextQoSSet
-			//   KContextTFTModify
-			//   KContextModifyActive
-			return iBindMan->SpudMan()->GuqosInput(aName, aOption);
-			}
-		}
-	return KErrNotSupported;
-	}
-
-//
-// CSpudProtocol
-//
-
-
-CSpudProtocol::CSpudProtocol()
-	{
-	}
-
-CSpudProtocol::~CSpudProtocol()
-	{
-	}
-
-/**
-Constructs the SpudProtocol object
-
-@param aBindMan reference to BindMan object
-*/
-void CSpudProtocol::Construct(CBindMan& aBindMan)
-	{
-	iBindMan = &aBindMan;
-	}
-
-void CSpudProtocol::SetProtocolBaseL(CProtocolBase* aProtocolBase)
-	{
-	if(iProtocolBase)
-		{
-		SPUDMUX_LOG(__FLOG_0(_L("CSpudProtocol::SetProtocolBaseL already bound to protocol")));
-		User::Leave(KErrInUse);
-		}
-
-	iProtocolBase = aProtocolBase;
-	ASSERT(iProtocolBase);
-	}
-
-
-void CSpudProtocol::Identify(TServerProtocolDesc *aDesc) const
-	{
-	ASSERT(iProtocolBase);
-    iProtocolBase->Identify(aDesc);
-	}
-
-/**
-Receives an indication that the lower NIF is ready to send packets.
-
-@param aProtocol CNifIfBase pointer of lower NIF
-*/
-void CSpudProtocol::StartSending(CProtocolBase* aProtocol)
-	{
-	TContextId id = KAllContexts;
-	TRAPD(rc, id = iBindMan->FindContextIdL(reinterpret_cast<CNifIfBase*>(aProtocol)));
-	__ASSERT_ALWAYS(rc == KErrNone, iBindMan->SpudMan()->Panic());
-	iBindMan->SpudMan()->StartSending(id);
-	}
-
-/**
-Receives PDU from the lower NIF and passes it to the upper protocol layer.
-
-@param aChain Datagram to process
-@param aSourceProtocol CNifIfBase pointer of lower NIF (ignored)
-*/
-void CSpudProtocol::Process(RMBufChain& aChain, CProtocolBase* /*aSourceProtocol*/)
-	{
-	ASSERT(iProtocolBase);
-    iProtocolBase->Process(aChain, reinterpret_cast<CProtocolBase*>(iBindMan->SpudMux()));
-	}
-
-/**
-Receives PDU from the lower NIF and passes it to the upper protocol layer.
-
-@param aPDU Datagram to process
-@param aFrom Source address
-@param aTo Destination address
-@param aSourceProtocol (ignored)
-*/
-void CSpudProtocol::Process(TDes8& aPDU, TSockAddr* aFrom, TSockAddr* aTo, CProtocolBase* /*aSourceProtocol*/)
-	{
-	ASSERT(iProtocolBase);
-    iProtocolBase->Process(aPDU, aFrom, aTo, reinterpret_cast<CProtocolBase*>(iBindMan->SpudMux()));
-	}
-
-/**
-Propagates error conditions up the stack, eventually to socket service providers.
-
-@param aError The error code 
-@param aSourceProtocol (ignored)
-*/
-void CSpudProtocol::Error(TInt aError, CProtocolBase* /*aSourceProtocol*/)
-	{
-	ASSERT(iProtocolBase);
-    iProtocolBase->Error(aError, reinterpret_cast<CProtocolBase*>(iBindMan->SpudMux()));
-	}
-
-/**
-Calls StartSending on the upper network protocol.
-*/
-void CSpudProtocol::DoStartSending() const
-	{
-	ASSERT(iProtocolBase);
-	iProtocolBase->StartSending(reinterpret_cast<CProtocolBase*>(iBindMan->SpudMux()));
-	}
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/spudman/src/rpdpfsminterface.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,270 +0,0 @@
-// Copyright (c) 2004-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:
-// Proxy methods for RPdpFsmInterface class
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-
-#include "rpdpfsminterface.h"
-
-
-RPdpFsmInterface::RPdpFsmInterface()
-   : iFsmImpl(NULL)
-{
-}
-
-RPdpFsmInterface::~RPdpFsmInterface()
-{
-}
-	
-void RPdpFsmInterface::OpenL(MSpudManInterface* aSpudManInterface, TName& aName)
-{
-   __ASSERT_DEBUG (iFsmImpl != NULL, User::Panic( KNullDesC, KErrNotReady ));
-   iFsmImpl->OpenL (aSpudManInterface, aName);
-}
-
-void RPdpFsmInterface::Close()
-{
-   if (iFsmImpl)
-      {
-      // Clear the member first to avoid ping-ponging Close() messages
-      // between the PdpFsmInterface and SpudManInterface
-      MPdpFsmInterface* fsmImpl = iFsmImpl;
-      iFsmImpl = NULL;
-      fsmImpl->Close ();
-      }
-}
-	
-
-TInt RPdpFsmInterface::Input (TContextId aPdpId, const TInt aOperation, const TInt aParam /* =KErrNone */)
-{
-   if (iFsmImpl)
-      {
-      return iFsmImpl->Input (aPdpId, aOperation, aParam);
-      }
-   
-   // let whoever know we can't do what they ask
-   return KErrNotReady;
-}
-
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-
-void RPdpFsmInterface::SetIMCNSignalling(TBool aImCnSignalling)
-/**
-Set the status of IM CN Signalling Flag in UmtsGprsScpr
-
-@param aImCnSignalling IMCN signalling Status
-*/
-{
-__ASSERT_DEBUG (iFsmImpl != NULL, User::Panic( KDescNullPdpFsm, KErrNotReady ));	
- iFsmImpl->SetIMCNSignalling(aImCnSignalling);	
-}
-
-TInt RPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR5Requested& aParam)
-{
-   __ASSERT_DEBUG (iFsmImpl != NULL, User::Panic( KDescNullPdpFsm, KErrNotReady ));
-   return iFsmImpl->Set (aPdpId, aParam);
-}
-
-TInt RPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR5Negotiated& aParam)
-{
-   __ASSERT_DEBUG (iFsmImpl != NULL, User::Panic( KDescNullPdpFsm, KErrNotReady ));
-   return iFsmImpl->Set (aPdpId, aParam);
-}
-
-#else
-// !SYMBIAN_NETWORKING_UMTSR5 
-
-TInt RPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Requested& aParam)
-{
-   __ASSERT_DEBUG (iFsmImpl != NULL, User::Panic( KNullDesC, KErrGeneral ));
-   return iFsmImpl->Set (aPdpId, aParam);
-}
-
-TInt RPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Negotiated& aParam)
-{
-   __ASSERT_DEBUG (iFsmImpl != NULL, User::Panic( KNullDesC, KErrGeneral ));
-   return iFsmImpl->Set (aPdpId, aParam);
-}
-
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 
-
-
-
-TInt RPdpFsmInterface::Set(TContextId aPdpId, const TTFTInfo& aParam)
-{
-   __ASSERT_DEBUG (iFsmImpl != NULL, User::Panic( KNullDesC, KErrGeneral ));
-   return iFsmImpl->Set (aPdpId, aParam);
-}
-
-TInt RPdpFsmInterface::Set(TContextId aPdpId, const TTFTOperationCode& aParam)
-{
-   __ASSERT_DEBUG (iFsmImpl != NULL, User::Panic( KNullDesC, KErrGeneral ));
-   return iFsmImpl->Set (aPdpId, aParam);
-}
-
-TInt RPdpFsmInterface::Set(TContextId aPdpId, const RPacketContext::TDataChannelV2& aParam)
-{
-   __ASSERT_DEBUG (iFsmImpl != NULL, User::Panic( KNullDesC, KErrGeneral ));
-   return iFsmImpl->Set (aPdpId, aParam);
-}
-
-TInt RPdpFsmInterface::Set(TContextId aPdpId, const RPacketContext::TContextConfigGPRS& aParam)
-{
-   __ASSERT_DEBUG (iFsmImpl != NULL, User::Panic( KNullDesC, KErrGeneral ));
-   return iFsmImpl->Set (aPdpId, aParam);
-}
-
-TInt RPdpFsmInterface::Set(TContextId aPdpId, const RPacketContext::TContextStatus& aParam)
-{
-   __ASSERT_DEBUG (iFsmImpl != NULL, User::Panic( KNullDesC, KErrGeneral ));
-   return iFsmImpl->Set (aPdpId, aParam);
-}
-
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-TInt RPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR5Requested& aParam) const
-{
-   __ASSERT_DEBUG (iFsmImpl != NULL, User::Panic( KDescNullPdpFsm, KErrNotReady ));
-   return iFsmImpl->Get (aPdpId, aParam);
-}
-
-TInt RPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR5Negotiated& aParam) const
-{
-   __ASSERT_DEBUG (iFsmImpl != NULL, User::Panic( KDescNullPdpFsm, KErrNotReady ));
-   return iFsmImpl->Get (aPdpId, aParam);
-}
-
-#else
-// !SYMBIAN_NETWORKING_UMTSR5 
-
-TInt RPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Requested& aParam) const
-{
-   __ASSERT_DEBUG (iFsmImpl != NULL, User::Panic( KNullDesC, KErrGeneral ));
-   return iFsmImpl->Get (aPdpId, aParam);
-}
-
-TInt RPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Negotiated& aParam) const
-{
-   __ASSERT_DEBUG (iFsmImpl != NULL, User::Panic( KNullDesC, KErrGeneral ));
-   return iFsmImpl->Get (aPdpId, aParam);
-}
-
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 
-
-
-TInt RPdpFsmInterface::Get(TContextId aPdpId, TTFTInfo& aParam) const
-{
-   __ASSERT_DEBUG (iFsmImpl != NULL, User::Panic( KNullDesC, KErrGeneral ));
-   return iFsmImpl->Get (aPdpId, aParam);
-}
-
-TInt RPdpFsmInterface::Get(TContextId aPdpId, TTFTOperationCode& aParam) const
-{
-   __ASSERT_DEBUG (iFsmImpl != NULL, User::Panic( KNullDesC, KErrGeneral ));
-   return iFsmImpl->Get (aPdpId, aParam);
-}
-
-TInt RPdpFsmInterface::Get(TContextId aPdpId, RPacketContext::TDataChannelV2& aParam) const
-{
-   if (iFsmImpl == NULL) 
-      {
-      // Since the RPdpFsmInterface implementation hasn't been initialised yet we need to provide
-      // a response. This is only going to happen as lower nifs are being created and before the
-      // UmtsGprsSCPR has had a chance to initialise our iFsmImpl pointer, and only if they do a
-      // ReadDes() for ModemBearer\CSYName, or ModemBearer\PortName. Luckily for us at this
-      // early stage Etel always response with an empty TDataChannelV2 structure.
-      aParam.iChannelId = KNullDesC;
-      aParam.iCsy = KNullDesC;
-      aParam.iPort = KNullDesC;
-      return KErrNone;
-      }
-   else
-      {
-      return iFsmImpl->Get (aPdpId, aParam);
-      }
-}
-
-TInt RPdpFsmInterface::Get(TContextId aPdpId, RPacketContext::TContextConfigGPRS& aParam) const
-{
-   __ASSERT_DEBUG (iFsmImpl != NULL, User::Panic( KNullDesC, KErrGeneral ));
-   return iFsmImpl->Get (aPdpId, aParam);
-}
-
-TInt RPdpFsmInterface::Get(TContextId aPdpId, RPacketContext::TContextStatus& aParam) const
-{
-   if (iFsmImpl) 
-      {
-      return iFsmImpl->Get (aPdpId, aParam);
-      }
-      
-   return KErrNotReady;
-}
-
-void RPdpFsmInterface::Set(const RPacketService::TStatus aParam)
-{
-   __ASSERT_DEBUG (iFsmImpl != NULL, User::Panic( KNullDesC, KErrGeneral ));
-   iFsmImpl->Set (aParam);
-}
-
-void RPdpFsmInterface::Get(RPacketService::TStatus& aParam)
-{
-   __ASSERT_DEBUG (iFsmImpl != NULL, User::Panic( KNullDesC, KErrGeneral ));
-   iFsmImpl->Get (aParam);
-}
-
-TInt RPdpFsmInterface::GetLastErrorCause(TContextId aPdpId, TInt& aLastErrorCause) const
-{
-   if (iFsmImpl) 
-      {
-      return iFsmImpl->GetLastErrorCause (aPdpId, aLastErrorCause);
-      }
-      
-   return KErrNone;
-}
-
-const TName& RPdpFsmInterface::TsyName(void)
-{
-   __ASSERT_DEBUG (iFsmImpl != NULL, User::Panic( KNullDesC, KErrGeneral ));
-   return iFsmImpl->TsyName ();
-}
-	
-void RPdpFsmInterface::SetContextTerminationErrorAndStop(TContextId aPdpId, TInt aErrorCode)
-{
-   if (iFsmImpl) 
-      {
-      iFsmImpl->SetContextTerminationErrorAndStop (aPdpId, aErrorCode);
-      }
-}
-
-
-void RPdpFsmInterface::Init (const MPdpFsmInterface* aSpudMan)
-{
-   // This should only be getting set the once, but so long as its the same instance we'll let it slip
-   ASSERT (iFsmImpl == NULL || aSpudMan == iFsmImpl);
-   iFsmImpl = const_cast<MPdpFsmInterface*>(aSpudMan);
-}
-
-
-
-
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/spudman/src/spudfactory.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,143 +0,0 @@
-// Copyright (c) 2004-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:
-// SPUD factory class and DLL entry point
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#include "spudfactory.h"
-#include "spudman.h"
-
-/**
-Spud destructor.
-*/
-CSpudFactory::~CSpudFactory()
-	{
-	}
-
-/**
-This function is pure virtual in CNifFactory, so we have to define it
-here. It is called by NifMan before NewInterfaceL().
-*/
-void CSpudFactory::InstallL()
-	{
-	}
-
-/**
-Factory function which creates an instance of the SPUD.
-
-@param aName The name of the NIF
-@param aNotify supplies details from "IfParams" field in CommDb
-@return A newly-instantiated SPUD NIF
-*/
-CNifIfBase* CSpudFactory::NewInterfaceL(const TDesC& aName, MNifIfNotify* aNotify)
-	{
-	__FLOG_STATIC0(KSpudFirstTag, KSpudLog, _L("CSpudFactory::NewInterfaceL"));
-   _LIT(KSpudDesc, "spud");
-	if(aName.CompareF(KSpudDesc))
-		{
-		__FLOG_STATIC2(KSpudFirstTag, KSpudLog, _L("CSpudFactory::NewInterfaceL requested %S, not %S"), &aName, &KSpudDesc);
-		User::Leave(KErrNotSupported);
-		}
-	
-	// This is a complicated construction phase as many of the objects need to
-	// contain pointers to several of the others.
-	CSpudMan* spudMan = new (ELeave) CSpudMan(*this, aNotify);
-	CleanupStack::PushL(spudMan);
-
-	CSpudMux* mux = new (ELeave) CSpudMux(*spudMan);
-	CleanupStack::PushL(mux);
-
-	CSpudProtocol* protocol = new (ELeave) CSpudProtocol();
-	CleanupStack::PushL(protocol);
-
-	CBindMan* bindMan = new (ELeave) CBindMan(*spudMan, mux, protocol);
-	// Ownership of mux and protocol have been transferred to bindMan
-	CleanupStack::Pop(2);
-
-	CleanupStack::PushL(bindMan);
-	spudMan->ConstructL(bindMan);
-	// Ownership of bindMan has been transferred to spudMan
-	CleanupStack::Pop(bindMan);
-
-	protocol->Construct(*bindMan);
-	mux->Construct(*bindMan);
-
-	CSpudBinderRef& primaryCtxBinder = *bindMan->GetNewRefForPrimaryL();
-	
-	// Read the protocol name from CommDB
-	TName protoName;
-	aNotify->ReadDes(TPtrC(SERVICE_IF_NETWORKS), protoName); // ignore error; will be caught in LoadNifL
-
-    // SPUD only handles one protocol at a time
-    ASSERT(protoName.Length() && protoName.Locate(',') == KErrNotFound);
-	
-	// Load a NIF to handle the primary context
-	bindMan->LoadNifL(protoName, primaryCtxBinder);
-	CleanupStack::Pop(spudMan);
-
-	// Ownership of spudMan is passed to the caller
-	return spudMan;
-	}
-
-/**
-Factory function which creates an instance of the SPUD.
-This version doesn't have the required notify pointer, so we unconditionally leave.
-
-@param aName The name of the NIF
-@return Never
-@leave KErrNotSupported unconditionally
-*/
-CNifIfBase* CSpudFactory::NewInterfaceL(const TDesC& /*aName*/)
-	{
-	__FLOG_STATIC0(KSpudFirstTag, KSpudLog, _L("CSpudFactory::NewInterfaceL not supported without MNifIfNotify"));
-    User::Leave(KErrNotSupported);
-	return NULL;	// never reached
-    }
-
-/**
-Return information about modules within this NIF.
-This function is pure virtual in CNifFactory, so we have to define it here.
-However, it doesn't do anything, and is never called by NifMan.
-
-@param aInfo On successful return, contains information about a module within the NIF
-@param aIndex An index into CNifIfBase/CNifIfLink-derived objects in the NIF, starting from 0.
- It is up to the NIF how it assigns indices to objects.
-@return KErrNotSupported
-*/
-TInt CSpudFactory::Info(TNifIfInfo& /*aInfo*/, TInt /*aIndex*/) const
-	{
-	__FLOG_STATIC0(KSpudFirstTag, KSpudLog, _L("CSpudFactory::Info not supported"));
-    ASSERT(EFalse);
-	return KErrNotSupported;
-	}
-
-
-// Force export of non-mangled name
-extern "C"
-	{
-
-/**
-Polymorphic DLL entry point
-*/
-EXPORT_C CNifFactory *NewInterfaceFactoryL()
-	{
-	return new (ELeave) CSpudFactory;
-	}
-
-	}
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/spudman/src/spudman.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3247 +0,0 @@
-// Copyright (c) 2004-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:
-// SPUD event manager
-// WINSCW compiler has problems disambiguating TMetaDes8 and Meta::TMetaDes8 so
-// I prevent metabuffer.h from being recursively included from other headers
-// by defining its include guard.
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-#define METABUFFER_H
-
-#include "spudman.h"
-#include "bindman.h"
-#include "mux.h"
-
-#include <comms-infras/dbaccess.h>
-#include "rpdpfsminterface.h"
-using namespace SpudMan; // Access the SpudFsm event names
-
-#include <etelpckt.h>
-#include <comms-infras/commsdebugutility.h>
-#include <in_sock.h>
-#include <networking/qos_if.h>
-#include <nifman.h>
-#include <comms-infras/es_config.h>
-
-#include <networking/umtsgprs_subconnprovfactory.h>
-#include <ss_glob.h>
-#include <ss_subconnprov.h>
-
-const TUint KQosPlugInProtocolId = 360; //< Plug-in protocol ID
-
-static const TInt KMaxInetAddrPrintSize = 50; //This should be big enough for an IPv6 printout
-
-
-#ifdef __FLOG_ACTIVE
-
-_LIT(KSpudUnknownLit, "Unknown event");
-
-_LIT(KSpudSoIfControllerPlugInLit, "KSoIfControllerPlugIn");
-_LIT(KSpudLitKRegisterEventHandler, "KRegisterEventHandler");
-_LIT(KSpudContextSetEventsLit, "KContextSetEvents");
-_LIT(KSpudNifSetDefaultQoSLit, "KNifSetDefaultQoS");
-_LIT(KSpudContextCreateLit, "KContextCreate");
-_LIT(KSpudContextDeleteLit, "KContextDelete");
-_LIT(KSpudContextActivateLit, "KContextActivate");
-_LIT(KSpudContextQoSSetLit, "KContextQoSSet");
-_LIT(KSpudContextTFTModifyLit, "KContextTFTModify");
-_LIT(KSpudGetNegQoSLit, "KGetNegQoS");
-_LIT(KSpudContextModifyActiveLit, "KContextModifyActive");
-_LIT(KInitialisePdpFsmLit, "KInitialisePdpFsm");
-
-
-static const TDesC *SpudGuQoSEventToText(TInt aEvent)
-	{
-	switch(aEvent)
-		{
-	case KSoIfControllerPlugIn:
-		return &KSpudSoIfControllerPlugInLit;
-	case KRegisterEventHandler:
-		return &KSpudLitKRegisterEventHandler;
-	case KContextSetEvents:
-		return &KSpudContextSetEventsLit;
-	case KNifSetDefaultQoS:
-		return &KSpudNifSetDefaultQoSLit;
-	case KContextCreate:
-		return &KSpudContextCreateLit;
-	case KContextDelete:
-		return &KSpudContextDeleteLit;
-	case KContextActivate:
-		return &KSpudContextActivateLit;
-	case KContextQoSSet:
-		return &KSpudContextQoSSetLit;
-	case KContextTFTModify:
-		return &KSpudContextTFTModifyLit;
-	case KGetNegQoS:
-		return &KSpudGetNegQoSLit;
-	case KContextModifyActive:
-		return &KSpudContextModifyActiveLit;
-	case KInitialisePdpFsm:
-		return &KInitialisePdpFsmLit;
-	default:
-    	return &KSpudUnknownLit;
-		}
-	}
-	
-_LIT(KSpudContextDeleteEventLit, "KContextDeleteEvent");
-_LIT(KSpudContextActivateEventLit, "KContextActivateEvent");
-_LIT(KSpudContextParametersChangeEventLit, "KContextParametersChangeEvent");
-_LIT(KSpudContextBlockedEventLit, "KContextBlockedEvent");
-_LIT(KSpudContextUnblockedEventLit, "KContextUnblockedEvent");
-_LIT(KSpudNetworkStatusEventLit, "KNetworkStatusEvent");
-_LIT(KSpudContextQoSSetEventLit, "KContextQoSSetEvent");
-_LIT(KSpudContextTFTModifiedEventLit, "KContextTFTModifiedEvent");
-_LIT(KSpudPrimaryContextCreatedLit, "KPrimaryContextCreated");
-_LIT(KSpudSecondaryContextCreatedLit, "KSecondaryContextCreated");
-_LIT(KSpudGetNegQoSEventLit,"KGetNegQoSEvent");
-_LIT(KSpudContextModifyActiveEventLit, "KContextModifyActiveEvent");
-_LIT(KPdpFsmShuttingDownLit, "KPdpFsmShuttingDown");
-
-static const TDesC *SpudFsmEventToText(TInt aEvent)
-	{
-	switch(aEvent)
-    	{
-	case KContextDeleteEvent:
-		return &KSpudContextDeleteEventLit;
-	case KContextActivateEvent:
-		return &KSpudContextActivateEventLit;
-	case KContextParametersChangeEvent:
-		return &KSpudContextParametersChangeEventLit;
-	case KContextBlockedEvent:
-		return &KSpudContextBlockedEventLit;
-	case KContextUnblockedEvent:
-		return &KSpudContextUnblockedEventLit;
-	case KNetworkStatusEvent:
-		return &KSpudNetworkStatusEventLit;
-	case KContextQoSSetEvent:
-		return &KSpudContextQoSSetEventLit;
-	case KContextTFTModifiedEvent:
-		return &KSpudContextTFTModifiedEventLit;
-	case KPrimaryContextCreated:
-		return &KSpudPrimaryContextCreatedLit;
-	case KSecondaryContextCreated:
-		return &KSpudSecondaryContextCreatedLit;
-	case KGetNegQoSEvent:
-    		return &KSpudGetNegQoSEventLit;
-    case KContextModifyActiveEvent:
-    	return &KSpudContextModifyActiveEventLit;
-   	case KPdpFsmShuttingDown:
-    	return &KPdpFsmShuttingDownLit;
-    default:
-    	return &KSpudUnknownLit;
-    	}
-	}
-
-_LIT(KSpudStateSpudInactiveLit, "ESpudInactive");
-_LIT(KSpudStateSpudHaveQosLit, "ESpudHaveQos");
-_LIT(KSpudStateSpudCreatingPrimary, "ESpudCreatingPrimary");
-_LIT(KSpudStateSpudStartingPrimaryLit, "ESpudStartingPrimary");
-_LIT(KSpudStateSpudStartingPrimaryLowerNifLit, "ESpudStartingPrimaryLowerNif");
-_LIT(KSpudStateSpudStartingSecondaryLit, "ESpudStartingSecondary");
-_LIT(KSpudStateSpudStartingSecondaryLowerNifLit, "ESpudStartingSecondaryLowerNif");
-_LIT(KSpudStateSpudGettingNegQoSLit, "ESpudGettingNegQoS");
-_LIT(KSpudStateSpudUpLit, "ESpudUp");
-_LIT(KSpudStateSpudFlowOffLit, "ESpudFlowOff");
-_LIT(KSpudStateSpudSuspendedLit, "ESpudSuspended");
-_LIT(KSpudStateSpudFlowOffAndSuspendedLit, "ESpudFlowOffAndSuspended");
-_LIT(KSpudStateSpudLinkDownLit, "ESpudLinkDown");
-_LIT(KSpudStateSpudContextDeleteLit, "ESpudContextDelete");
-_LIT(KSpudStateSpudWaitLinkDownLit, "ESpudWaitLinkDown");
-_LIT(KSpudStateSpudWaitBinderDeleteLit, "ESpudWaitBinderDelete");
-_LIT(KSpudStateUnknownLit, "Unknown spud state");
-	
-static const TDesC *SpudStateToText(TSpudContextStates aState)
-	{
-	switch(aState)
-    	{
-	case ESpudInactive:
-		return &KSpudStateSpudInactiveLit;
-	case ESpudHaveQos:
-		return &KSpudStateSpudHaveQosLit;
-	case ESpudCreatingPrimary:
-		return &KSpudStateSpudCreatingPrimary;
-	case ESpudStartingPrimary:
-		return &KSpudStateSpudStartingPrimaryLit;
-	case ESpudStartingPrimaryLowerNif:
-		return &KSpudStateSpudStartingPrimaryLowerNifLit;
-	case ESpudStartingSecondary:
-		return &KSpudStateSpudStartingSecondaryLit;
-	case ESpudStartingSecondaryLowerNif:
-		return &KSpudStateSpudStartingSecondaryLowerNifLit;
-	case ESpudGettingNegQoS:
-		return &KSpudStateSpudGettingNegQoSLit;
-	case ESpudUp:
-		return &KSpudStateSpudUpLit;
-	case ESpudFlowOff:
-		return &KSpudStateSpudFlowOffLit;
-	case ESpudSuspended:
-		return &KSpudStateSpudSuspendedLit;
-	case ESpudFlowOffAndSuspended:
-		return &KSpudStateSpudFlowOffAndSuspendedLit;
-	case ESpudLinkDown:
-		return &KSpudStateSpudLinkDownLit;
-	case ESpudContextDelete:
-		return &KSpudStateSpudContextDeleteLit;
-	case ESpudWaitLinkDown:
-		return &KSpudStateSpudWaitLinkDownLit;
-	case ESpudWaitBinderDelete:
-		return &KSpudStateSpudWaitBinderDeleteLit;
-	default:
-    	return &KSpudStateUnknownLit;
-    	}
-	}
-
-#endif
-
-CSpudMan::CSpudMan(CNifIfFactory& aFactory, MNifIfNotify* aNotify)
-	: CNifIfLink(aFactory),
-	iContextStatusOverride(RPacketContext::EStatusUnknown)
-	{
-    iNotify = aNotify;
-    ASSERT(iNotify);
-	__FLOG_OPEN(KSpudFirstTag,KSpudLog);
-    __FLOG_0(_L("CSpudMan::CSpudMan"));
-	}
-
-CSpudMan::~CSpudMan()
-   {
-   if (iBindMan)
-      {
-      // Only log if ConstructL() was called, where logger was initialized
-      __FLOG_0(_L("CSpudMan::~CSpudMan"));
-      }
-   
-   
-   if (AreQoSEventsEnabled())
-      {
-      // Spud is being destroyed by Nifman. Tell GUQoS to stop bothering SPUD.
-      // GUQoS returns the favour by turning off the NIF events within this very call.
-      // *********************************************************************************************
-      // N.B.: "DEF055691 	GUQoS crashes at shutdown": This defect results in GUQoS crash if the stack
-      // closes flows after the NIF proxy was deleted by GUQoS, as a result of KNetworkInterfaceDown event.
-      // Because of this defect, we cannot signal KNetworkInterfaceDown from anywhere but here. Once it is fixed,
-      // calls from the appropriate places will be enabled, and the line below will not be strictly necessary.
-      SendNetworkStatusEvent(KNetworkInterfaceDown, RPacketService::EStatusUnattached);
-      // For safety, we should call this from here in any case.
-      //**********************************************************************************************
-      }
-   
-   delete iParkedDefaultQoS;
-   delete iBinderSweeperNotifierCb;
-   
-   delete iBindMan;
-   iPdpFsmInterface.Close();
-   iSipServerAddr.Close();
-   __FLOG_CLOSE;
-   }
-
-/**
-Panics the current thread.
-
-@param aReason Panic reason code
-*/
-void CSpudMan::Panic(TInt aReason) const
-	{
-    __FLOG_1(_L("CSpudMan::Panic with reason %d"), aReason);
-	User::Panic(KSpudName, aReason);
-	}
-
-/**
-Construct the Link Protocol Object
-
-@param aBindMan Pointer to BindMan object (ownership is transferred)
-@leave leaves if could not allocate memory
-*/
-void CSpudMan::ConstructL(CBindMan* aBindMan)
-	{
-    __FLOG_1(_L("CSpudMan starting %x"), iNotify);
-
-
-	iBindMan = aBindMan;
-	ASSERT(iBindMan);
-	
-	// The lower NIF binder deletion & Nifman notification callback
-	iBinderSweeperNotifierCb = new (ELeave) CBinderSweeperNotifierCb(*this);
-	}
-
-
-/**
-Implements the Control method of CNifBase - used for retrieval of the P-CSCF (Sip Server) address
-*/	
-TInt CSpudMan::Control(TUint aLevel,TUint aName,TDes8& aOption, TAny*)
-	{
-	if (aLevel == KCOLConfiguration && aName == KConnGetSipServerAddr)
-		{
-		if (aOption.Length() != sizeof (SSipServerAddr))
-			{
-			__FLOG(_L("CSpudMan::Control - Invalid Descriptior - Descriptor Must contain an SSipServerAddr"));
-			Panic();
-			}
-		SSipServerAddr* sipServerAddr = reinterpret_cast<SSipServerAddr*>(const_cast<TUint8*>(aOption.Ptr()));
-		if (sipServerAddr->index < 0 || sipServerAddr->index >= iSipServerAddr.Count())
-			{
-			__FLOG_1(_L("CSpudMan::Control - Index out of range : value = %d"), sipServerAddr->index);
-			return KErrNotFound;
-			}
-		sipServerAddr->address = iSipServerAddr[sipServerAddr->index];
-#ifdef __FLOG_ACTIVE
-		TBuf<KMaxInetAddrPrintSize> buf;
-		sipServerAddr->address.Output(buf);
-		__FLOG_2(_L("CSpudMan::Control Address %S returned for index %d"), &buf, sipServerAddr->index);
-#endif
-		return KErrNone;				
-		}
-	return KErrNotSupported;	
-	}
-
-
-/**
-Retrieve any GPRS settings required from CommDB
-
-@param aConfigGprs Context configuration parameters to be filled in
-*/
-void CSpudMan::RetrieveGprsConfig(RPacketContext::TContextConfigGPRS& aConfigGprs) const
-	{
-	TUint32 pdpType(0);
-	Notify()->ReadInt(TPtrC(GPRS_PDP_TYPE), pdpType);
- 	__FLOG_1(_L8("ReadInt GPRS_PDP_TYPE [%d]"), pdpType);
-	aConfigGprs.iPdpType = STATIC_CAST(RPacketContext::TProtocolType, pdpType);
-
-	Notify()->ReadDes(TPtrC(GPRS_APN), aConfigGprs.iAccessPointName);
-  	__FLOG_1(_L8("ReadDes GPRS_APN [%S]"), &aConfigGprs.iAccessPointName);
-
-		
-	TBool fromServer;
-	aConfigGprs.iPdpAddress.SetLength(0);
-	Notify()->ReadBool(TPtrC(GPRS_IP_ADDR_FROM_SERVER), fromServer);
-	if (!fromServer)
-	    {
-    	Notify()->ReadDes(TPtrC(GPRS_IP_ADDR), aConfigGprs.iPdpAddress);
-	    }
-	
-
-    // We can only use IPv4 or IPv6 - we use the first one listed in the IfNetworks field
-    TBuf<KCommsDbSvrMaxFieldLength> networks;
-	Notify()->ReadDes(TPtrC(LAN_IF_NETWORKS), networks);
-
-	ASSERT(networks.Length() > 0); // If the IfNetworks field is empty there is a serious misconfiguration
-	
-	TInt pos = networks.Find(_L(","));
-	if (pos == KErrNotFound)
-	    {
-	    pos = networks.Length();
-	    }
-	TPtrC protocol(networks.Ptr(), pos);
-	_LIT(KIp4, "ip");
-	_LIT(KIp6, "ip6");
-	if (protocol.CompareF(KIp4) == 0)
-	    {
-	    // IPv4 settings
-    	Notify()->ReadBool(TPtrC(GPRS_IP_DNS_ADDR_FROM_SERVER), fromServer);
-    	if (!fromServer)
-    	    {
-    	    Notify()->ReadDes(TPtrC(GPRS_IP_NAME_SERVER1), aConfigGprs.iProtocolConfigOption.iDnsAddresses.iPrimaryDns);
-    	    Notify()->ReadDes(TPtrC(GPRS_IP_NAME_SERVER2), aConfigGprs.iProtocolConfigOption.iDnsAddresses.iSecondaryDns);
-    	    }
-	    }
-	else if (protocol.CompareF(KIp6) == 0)
-	    {
-	    // IPv6 settings
-    	Notify()->ReadBool(TPtrC(GPRS_IP6_DNS_ADDR_FROM_SERVER), fromServer);
-    	if (!fromServer)
-    	    {
-    	    Notify()->ReadDes(TPtrC(GPRS_IP6_NAME_SERVER1), aConfigGprs.iProtocolConfigOption.iDnsAddresses.iPrimaryDns);
-    	    Notify()->ReadDes(TPtrC(GPRS_IP6_NAME_SERVER2), aConfigGprs.iProtocolConfigOption.iDnsAddresses.iSecondaryDns);
-    	    }
-	    }
-	else
-	    {
-	    // Anything else is a serious misconfiguration
-	    ASSERT(0);
-	    }
-	
-	RetrieveGprsCompression(aConfigGprs.iPdpCompression);
-	 __FLOG_1(_L8("Read GprsCompression [%d]"), aConfigGprs.iPdpCompression);
-
-	RetrieveGprsAnonymousAccess(aConfigGprs.iAnonymousAccessReqd);
- 	__FLOG_1(_L8("Read AnonymousAccess [%d]"), aConfigGprs.iAnonymousAccessReqd);
-
-	TBuf<KCommsDbSvrMaxUserIdPassLength> readBuf;
-	Notify()->ReadDes(TPtrC(SERVICE_IF_AUTH_NAME), readBuf);
-	aConfigGprs.iProtocolConfigOption.iAuthInfo.iUsername.Copy(readBuf);
-	readBuf.Zero();
-	Notify()->ReadDes(TPtrC(SERVICE_IF_AUTH_PASS), readBuf);
-	aConfigGprs.iProtocolConfigOption.iAuthInfo.iPassword.Copy(readBuf);
- 	__FLOG_2(_L8("ReadDes SERVICE_IF_AUTH_NAME [%S] and SERVICE_IF_AUTH_PASS [%S]"), &aConfigGprs.iProtocolConfigOption.iAuthInfo.iUsername, 
-			 &aConfigGprs.iProtocolConfigOption.iAuthInfo.iPassword);
-
-	aConfigGprs.iUseEdge = EFalse;
-	}
-
-void CSpudMan::RetrieveGprsCompression(TUint& aCompression) const
-	{
-	aCompression = 0;
-	TBool isCompression = EFalse;
-	Notify()->ReadBool(TPtrC(GPRS_DATA_COMPRESSION), isCompression);
-	if (isCompression)
-		{
-		aCompression |= RPacketContext::KPdpDataCompression;
-		}
-
-	isCompression = EFalse;
-	Notify()->ReadBool(TPtrC(GPRS_HEADER_COMPRESSION), isCompression);
-	if (isCompression)
-		{
-		aCompression |= RPacketContext::KPdpHeaderCompression;
-		}
-	}
-
-void CSpudMan::RetrieveGprsAnonymousAccess(RPacketContext::TAnonymousAccess& aAnonymous) const
-	{	
-	TBool isAnonymous = EFalse;
-	Notify()->ReadBool(TPtrC(GPRS_ANONYMOUS_ACCESS),isAnonymous);
-	if (isAnonymous)
-		aAnonymous = RPacketContext::ERequired;
-	else
-		aAnonymous = RPacketContext::ENotRequired;
-	}
-
-
-
-/**
-Indicates whether QoS has been enabled or not.
-
-@return ETrue if QoS has been enabled for this NIF.
-*/
-TBool CSpudMan::AreQoSEventsEnabled() const
-	{
-	return iQosEventHandler != NULL;
-	}
-
-
-/**
-Returns pointer to BindMan.
-
-@return Pointer to BindMan object
-*/
-CBindMan* CSpudMan::BindMan() const
-	{
-	return iBindMan;
-	}
-
-/**
-Returns pointer to the MNifIfNotify object in NIFMAN.
-
-@return Pointer to MNifIfNotify object
-*/
-MNifIfNotify* CSpudMan::Notify() const
-	{
-	ASSERT(iNotify);
-	return iNotify;
-	}
-
-/**
-Set default QoS parameters from the values in CommDb.
-
-@param aQos QoS parameters filled in on exit
-*/
-void CSpudMan::ReadDefaultQoS(RPacketQoS::TQoSR99_R4Requested& aQos) const
-	{
-	TBuf<2*KCommsDbSvrMaxColumnNameLength+1> columnName;
-	_LIT(KFormatText,"%s\\%s");
-
-	columnName.Format(KFormatText,QOS_UMTS_R99_AND_ON_TABLE,GPRS_QOS_REQ_TRAFFIC_CLASS);
-	Notify()->ReadInt (columnName, reinterpret_cast<TUint32&>(aQos.iReqTrafficClass));
-
-	columnName.Format(KFormatText,QOS_UMTS_R99_AND_ON_TABLE,GPRS_QOS_MIN_TRAFFIC_CLASS);
-	Notify()->ReadInt (columnName, reinterpret_cast<TUint32&>(aQos.iMinTrafficClass));
-	
-	columnName.Format(KFormatText,QOS_UMTS_R99_AND_ON_TABLE,GPRS_QOS_REQ_DELIVERY_ORDER);
-	Notify()->ReadInt (columnName, reinterpret_cast<TUint32&>(aQos.iReqDeliveryOrderReqd));
-
-	columnName.Format(KFormatText,QOS_UMTS_R99_AND_ON_TABLE,GPRS_QOS_MIN_DELIVERY_ORDER);
-	Notify()->ReadInt (columnName, reinterpret_cast<TUint32&>(aQos.iMinDeliveryOrderReqd));
-	
-	columnName.Format(KFormatText,QOS_UMTS_R99_AND_ON_TABLE,GPRS_QOS_REQ_DELIVER_ERRONEOUS_SDU);
-	Notify()->ReadInt (columnName, reinterpret_cast<TUint32&>(aQos.iReqDeliverErroneousSDU));
-
-	columnName.Format(KFormatText,QOS_UMTS_R99_AND_ON_TABLE,GPRS_QOS_MIN_DELIVER_ERRONEOUS_SDU);
-	Notify()->ReadInt (columnName, reinterpret_cast<TUint32&>(aQos.iMinDeliverErroneousSDU));
-	
-	columnName.Format(KFormatText,QOS_UMTS_R99_AND_ON_TABLE,GPRS_QOS_REQ_MAX_SDUSIZE);
-	Notify()->ReadInt (columnName, reinterpret_cast<TUint32&>(aQos.iReqMaxSDUSize));
-
-	columnName.Format(KFormatText,QOS_UMTS_R99_AND_ON_TABLE,GPRS_QOS_MIN_ACCEPTABLE_MAX_SDU_SIZE);
-	Notify()->ReadInt (columnName, reinterpret_cast<TUint32&>(aQos.iMinAcceptableMaxSDUSize));
-	
-	columnName.Format(KFormatText,QOS_UMTS_R99_AND_ON_TABLE,GPRS_QOS_REQ_MAX_UPLINK_RATE);
-	Notify()->ReadInt (columnName, reinterpret_cast<TUint32&>(aQos.iReqMaxRate.iUplinkRate));
-
-	columnName.Format(KFormatText,QOS_UMTS_R99_AND_ON_TABLE,GPRS_QOS_REQ_MIN_UPLINK_RATE);
-	Notify()->ReadInt (columnName, reinterpret_cast<TUint32&>(aQos.iMinAcceptableMaxRate.iUplinkRate));
-	
-	columnName.Format(KFormatText,QOS_UMTS_R99_AND_ON_TABLE,GPRS_QOS_REQ_MAX_DOWNLINK_RATE);
-	Notify()->ReadInt (columnName, reinterpret_cast<TUint32&>(aQos.iReqMaxRate.iDownlinkRate));
-	
-	columnName.Format(KFormatText,QOS_UMTS_R99_AND_ON_TABLE,GPRS_QOS_REQ_MIN_DOWNLINK_RATE);
-	Notify()->ReadInt (columnName, reinterpret_cast<TUint32&>(aQos.iMinAcceptableMaxRate.iDownlinkRate));
-	
-	columnName.Format(KFormatText,QOS_UMTS_R99_AND_ON_TABLE,GPRS_QOS_REQ_BER);
-	Notify()->ReadInt (columnName, reinterpret_cast<TUint32&>(aQos.iReqBER));
-	
-	columnName.Format(KFormatText,QOS_UMTS_R99_AND_ON_TABLE,GPRS_QOS_MAX_BER);
-	Notify()->ReadInt (columnName, reinterpret_cast<TUint32&>(aQos.iMaxBER));
-	
-	columnName.Format(KFormatText,QOS_UMTS_R99_AND_ON_TABLE,GPRS_QOS_REQ_SDU_ERROR_RATIO);
-	Notify()->ReadInt (columnName, reinterpret_cast<TUint32&>(aQos.iReqSDUErrorRatio));
-	
-	columnName.Format(KFormatText,QOS_UMTS_R99_AND_ON_TABLE,GPRS_QOS_MAX_SDU_ERROR_RATIO);
-	Notify()->ReadInt (columnName, reinterpret_cast<TUint32&>(aQos.iMaxSDUErrorRatio));
-
-	columnName.Format(KFormatText,QOS_UMTS_R99_AND_ON_TABLE,GPRS_QOS_REQ_TRAFFIC_HANDLING_PRIORITY);
-	Notify()->ReadInt (columnName, reinterpret_cast<TUint32&>(aQos.iReqTrafficHandlingPriority));
-	
-	columnName.Format(KFormatText,QOS_UMTS_R99_AND_ON_TABLE,GPRS_QOS_MIN_TRAFFIC_HANDLING_PRIORITY);
-	Notify()->ReadInt (columnName, reinterpret_cast<TUint32&>(aQos.iMinTrafficHandlingPriority));
-
-	columnName.Format(KFormatText,QOS_UMTS_R99_AND_ON_TABLE,GPRS_QOS_REQ_TRANSFER_DELAY);
-	Notify()->ReadInt (columnName, reinterpret_cast<TUint32&>(aQos.iReqTransferDelay));
-	
-	columnName.Format(KFormatText,QOS_UMTS_R99_AND_ON_TABLE,GPRS_QOS_MAX_TRANSFER_DELAY);
-	Notify()->ReadInt (columnName, reinterpret_cast<TUint32&>(aQos.iMaxTransferDelay));
-
-	columnName.Format(KFormatText,QOS_UMTS_R99_AND_ON_TABLE,GPRS_QOS_REQ_GUARANTEED_UPLINK_RATE);
-	Notify()->ReadInt (columnName, reinterpret_cast<TUint32&>(aQos.iReqGuaranteedRate.iUplinkRate));
-
-	columnName.Format(KFormatText,QOS_UMTS_R99_AND_ON_TABLE,GPRS_QOS_MIN_GUARANTEED_UPLINK_RATE);
-	Notify()->ReadInt (columnName, reinterpret_cast<TUint32&>(aQos.iMinGuaranteedRate.iUplinkRate));
-
-	columnName.Format(KFormatText,QOS_UMTS_R99_AND_ON_TABLE,GPRS_QOS_REQ_GUARANTEED_DOWNLINK_RATE);
-	Notify()->ReadInt (columnName, reinterpret_cast<TUint32&>(aQos.iReqGuaranteedRate.iDownlinkRate));
-
-	columnName.Format(KFormatText,QOS_UMTS_R99_AND_ON_TABLE,GPRS_QOS_MIN_GUARANTEED_DOWNLINK_RATE);
-	Notify()->ReadInt (columnName, reinterpret_cast<TUint32&>(aQos.iMinGuaranteedRate.iDownlinkRate));
-	}
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-/**
-Set default R5 QoS parameters from the values in CommDb.
-
-@param aQos R5 QoS parameters filled in on exit
-*/
-void CSpudMan::ReadDefaultR5QoS(RPacketQoS::TQoSR5Requested& aQos) const
-	{
-	ReadDefaultQoS(aQos);
-	
-	TBuf<2*KCommsDbSvrMaxColumnNameLength+2> columnName;
-	_LIT(KFormatText,"%s\\%s");
-	columnName.Format(KFormatText,QOS_UMTS_R99_AND_ON_TABLE,GPRS_QOS_SIGNALLING_INDICATION);
-	Notify()->ReadBool (columnName, aQos.iSignallingIndication);
-	columnName.Format(KFormatText,QOS_UMTS_R99_AND_ON_TABLE,GPRS_QOS_SOURCE_STATISTICS_DESCRIPTOR);
-	Notify()->ReadInt(columnName, reinterpret_cast<TUint32&>(aQos.iSourceStatisticsDescriptor));
-	}
-#endif
-// SYMBIAN_NETWORKING_UMTSR5
-
-
-/**
-Reads TSY name from CommDb.
-
-@param aTsyName TSY name filled in on exit
-*/
-void CSpudMan::ReadTsyName(TName& aTsyName) const
-	{
-	TBuf<2*KCommsDbSvrMaxColumnNameLength+1> columnName;
-	_LIT(KFormatText,"%s\\%s");
-	columnName.Format(KFormatText,MODEM_BEARER,MODEM_TSY_NAME);
-	Notify()->ReadDes(columnName, aTsyName); // ignore error
-	}
-
-/**
-Sets the error code to use for termination, unless it is already set.
-
-@param aError Error code to use when notifying NIFMAN
-*/
-void CSpudMan::SetTerminateError(TInt aError)
-	{
-	if (iTerminateError == KErrNone)
-		{
-		iTerminateError = aError;
-		__FLOG_1(_L("Set SPUD termination error to [%d]"), aError);
-		
-		// There is no specific context associated with this termination
-		// So prevent a later overwrite of the error by the ETel error
-		if (iETelTerminateError == KErrNone)
-			{
-			iETelTerminateError = aError;
-			}
-		}
-	}
-
-/**
-Sets the error code to use for termination, unless it is already set.
-
-@param aContextId context ID
-@param aError Error code to use when notifying NIFMAN
-*/
-void CSpudMan::SetTerminateError(TContextId aContextId, TInt aError)
-	{
-	if (iTerminateError == KErrNone)
-		{
-		iTerminateError = aError;
-		
-		// Now check to see if ETel was the originator of this error
-		if (iETelTerminateError == KErrNone)
-			{
-			// ask for the last ETel error received - ignore return code
-			iPdpFsmInterface.GetLastErrorCause(aContextId, iETelTerminateError);
-			}
-
-		if (iETelTerminateError != KErrNone)
-			{
-			// Overwrite with the most likely original error code!
-			iTerminateError = iETelTerminateError;
-			}
-	
-		__FLOG_1(_L("Set SPUD termination error to [%d]"), iTerminateError);
-		}
-		
-	}
-
-//*****************************************************************************
-// Events receivers
-//*****************************************************************************
-
-/**
-Receives events from SpudFsm.
-
-@param aContextId context ID
-@param aEvent event ID
-@param aParam optional parameter to event
-*/
-void CSpudMan::Input(TContextId aContextId, TInt aEvent, TInt aParam)
-	{
-	__FLOG_4(_L("SpudMan::Input: SpudFsm event %S(%d) param[%d] context[%d]"), SpudFsmEventToText(aEvent), aEvent, aParam, aContextId);
-	ASSERT(aContextId == KAllContexts || (aContextId >=0 && aContextId < KMaxPdpContexts));
-	
-	switch (aEvent)
-		{
-	case KPrimaryContextCreated:
-		{
-		HandlePrimaryContextCreatedEvent(aContextId, aParam);
-		break;
-		}
-	
-	case KContextDeleteEvent:
-		{
-		HandleContextDeleteEvent(aContextId, aParam);
-		break;
-		}
-
-	case KSecondaryContextCreated:
-		{
-		HandleSecondaryContextCreatedEvent(aContextId, aParam);
-		break;
-		}
-
-	case KContextActivateEvent:
-		{
-		HandleContextActivateEvent(aContextId, aParam);
-		break;
-		}
-
-	case KContextQoSSetEvent:
-		{
-		HandleContextQoSSetEvent(aContextId, aParam);
-		break;
-		}
-
-	case KContextTFTModifiedEvent:
-		{
-		HandleContextTFTModifiedEvent(aContextId, aParam);
-		break;
-		}
-
-	case KGetNegQoSEvent:
-		{
-		HandleGetNegQoSEvent(aContextId, aParam);
-		break;
-		}
-
-	case KContextModifyActiveEvent:
-		{
-		HandleContextModifyActiveEvent(aContextId, aParam);
-		break;
-		}
-
-	case KNetworkStatusEvent:
-		{
-		HandleNetworkStatusEvent();
-		break;
-		}
-
-	case KContextParametersChangeEvent:
-		{
-		HandleContextParametersChangeEvent(aContextId, aParam);
-        break;
-		}
-
-	case KContextBlockedEvent:
-		{
-		HandleContextBlockedEvent(aContextId);
-		break;
-		}
-
-	case KContextUnblockedEvent:
-		{
-		HandleContextUnblockedEvent(aContextId);
-		break;
-		}
-
-
-   case KPdpFsmShuttingDown:
-      {
-      __FLOG_0(_L("UmtsGprsSCPR has shutdown the PDP Fsm Interface"));
-      iPdpFsmInterface.Close();
-      break;
-      }
-
-	default:
-		__FLOG_1(_L("Unhandled event %d"), aEvent);
-		ASSERT(EFalse);
-		break;
-		}
-	}
-	
-void CSpudMan::InitPdpFsmInterfaceL()
-	{
-	class XAssociatedNifConnectionProviderQuery : public MFactoryQuery
-	/**	Finds the connection provider associated with the specified Nif.
-	@internalTechnology
-	*/
-		{
-	public:
-		XAssociatedNifConnectionProviderQuery( const TDesC& aName, ::TMetaDes8& aNameBuffer ) : iNifName( aName ), iNifNameBuffer( aNameBuffer )
-			{
-			}
-
-		virtual TMatchResult Match( TFactoryObjectInfo& aObjectInfo )
-			{
-			TConnInterfaceName& name = *reinterpret_cast<TConnInterfaceName*>( const_cast<TUint8*>( iNifNameBuffer.iDes->Ptr() ) );
-			name.iIndex = 1;
-
-			TInt err = KErrNone;
-			TMatchResult result = EContinue;
-			
-			// Check each of the connection provider interfaces' names to see if it
-			// is associated with this NIF.
-			while( ETrue )
-				{
-		        TRAP( err, static_cast<CConnectionProviderBase*>( aObjectInfo.iInfo.iFactoryObject )->ControlL(KCOLProvider, KConnGetInterfaceName, iNifNameBuffer, NULL) );
-		        
-		        if( err == KErrNone )
-		        	{
-		        	if( name.iName == iNifName )
-			        	{
-				       	result = EMatch;
-				       	
-				       	break;
-			        	}
-			       	}
-			    else
-			    	{
-			    	break;
-			    	}
-
-				name.iIndex ++;
-				}
-	        	
-	        return result;
-			}
-			
-	private:
-		const TDesC& iNifName;
-		::TMetaDes8& iNifNameBuffer;
-		};
-
-	const TUint KShimConnectionProviderFactoryId = 0x10207104; //the same as CSubConnectionProviderFactoryShim
-
-	TSockManData* sockManData = SockManGlobals::Get();
-	ASSERT(sockManData);
-
-	CConnectionFactoryContainer* connectionFactories = sockManData->iConnectionFactories;
-	ASSERT(connectionFactories);
-
-	CConnectionProviderFactoryBase *factory = connectionFactories->FindFactory(KShimConnectionProviderFactoryId);
-	if(!factory)
-		{
-		User::Leave( KErrNotFound );
-		}
-		
-	CSpudMux* mux = iBindMan->SpudMux();
-
-	// Get the name of our SPUDMUX interface - it uniquely identifies this SPUD object assembly.
-	TNifIfInfo info;
-	mux->Info( info );
-
-	// Create a buffer to hold the name of each interface we check to see if the interface is our SPUDMUX.
-	TPckgBuf<TConnInterfaceName> name;
-	TPtrC8 desC( name );
-	::TMetaDes8* des = ::TMetaDes8::NewL( &desC );
-
-	XAssociatedNifConnectionProviderQuery connProviderQuery( info.iName, *des );
-	
-	// Find the connection provider associated with this NIF.
-	CConnectionProviderBase* connectionProvider = factory->FindProvider(connProviderQuery);
-	delete des;
-	if(!connectionProvider)
-		{
-		User::Leave( KErrNotFound );
-		}
-
-	CSubConnectionFactoryContainer* subConnectionFactories = sockManData->iSubConnectionFactories;
-	ASSERT(subConnectionFactories);
-
-	TDataClientQuery subConnProviderQuery(connectionProvider, ESubConnPlane, RSubConnection::EAttachToDefault);
-
-	// Find the default subconnection provider.
-	CSubConnectionProviderBase* subConnProvider = subConnectionFactories->FindOrCreateProviderL(connectionProvider->CanDoSubConnection(RSubConnection::EAttachToDefault), subConnProviderQuery);
-	if(!subConnProvider || subConnProvider->Factory().Id() != KUmtsGprsSubConnectionProviderFactoryId)
-		{
-		User::Leave( KErrNotFound );
-		}
-
-	// Initialise the PDP FSM interface.
-	TPckg<CNifIfBase*> nifPckg(mux);
-	User::LeaveIfError(subConnProvider->Control(KSOLInterface, KInitialisePdpFsm, nifPckg));
-	}
-
-void CSpudMan::HandlePrimaryContextCreatedEvent(TContextId aContextId, TInt aError)
-	{
-		
-	// Save the contextId for later
-	iPrimaryContextId = aContextId;
-	
-	// Primary context has been created; Start the lower NIF
-	CSpudBinderRef* ref = NULL;
-	TRAPD(rc, ref = iBindMan->GetRefL(aContextId));
-	__FLOG_2(_L("Got lower NIF binder for context[%d] with error[%d]"), aContextId, rc);
-	if (rc == KErrNone)
-		{
-		// Make sure context was created successfully
-		rc = aError;
-		ASSERT(ref->IsBound());
-		__FLOG_3(_L("context %d is in state %S(%d)"), aContextId, SpudStateToText(ref->State()), ref->State());
-		}
-
-	if (KErrNone == rc) // Context created successfully.
-		{
-			// Get the details of the P-CSCF 
-		RPacketContext::TContextConfigGPRS config;
-		
-		if (iPdpFsmInterface.Get(aContextId, config) == KErrNone)
-			{
-			TRAP(rc, SetSipServerAddrL(config.iProtocolConfigOption););
-				{
-				__FLOG_1(_L("CSpudMan::HandlePrimaryContextCreatedEvent -Error occurred extracting the sip server address: %d"),rc);
-				//rc is now non zero, therefore should fail gracefully
-				}	
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-			// Since the value or IMCN Signalling flag also comes in PCO IE buffer along with the SipAddress, we
-			// need to extract the value here and set it to Parameter Bundle of SCPR
-				TBool imcn = EFalse;		
-				TRAPD(err,imcn=GetIMCNSignallingFlagPcoL(config.iProtocolConfigOption););
-				__FLOG_1(_L("CSpudMan::GetIMCNSignallingFlagPcoL - returns eror=%d"),err);
-				if (err == KErrNone)
-					{
-					iPdpFsmInterface.SetIMCNSignalling(imcn); //imcn contains ETrue or Efalse
-#ifdef __FLOG_ACTIVE
-					if (imcn)
-						{
-						__FLOG_0(_L("CSpudMan::HandlePrimaryContextCreatedEvent - Network ACCEPTS the request for dedicated IMCN Signalling Flag "));
-						}
-					else
-						{
-						__FLOG_0(_L("CSpudMan::HandlePrimaryContextCreatedEvent - Network REJECTS the request for dedicated IMCN Signalling Flag "));				
-						}
-#endif 
-					}
-					else
-					{
-					
-#ifdef __FLOG_ACTIVE
-					__FLOG_1(_L("CSpudMan::HandlePrimaryContextCreatedEvent -Leave Error occurred  %d"),err);
-#endif
-					}			
-#endif // SYMBIAN_NETWORKING_UMTSR5
-			}
-		}
-		
-	if (KErrNone == rc) // Sip server address retrieved
-		{
-		ASSERT(ref->State() == ESpudCreatingPrimary);
-	    ref->SetState(ESpudStartingPrimary);
-	    // Start the lower NIF and wait for the LinkLayerUp call
-		rc = ref->NifLink()->Start(); 
-		if(KErrNone == rc)
-			{
-			ref->SetState(ESpudStartingPrimaryLowerNif);
-			}
-		// Lower NIF may still report failure to Start by signalling LinkLayerDown with error.
-		// E.G. PPP negotiation may fail.
-		__FLOG_2(_L("Lower NIF for Primary Context[%d] started with error[%d]."), aContextId, rc);
-		}
-
-		
-	// Catch-all error handling: Could not create context, or could not start lower NIF.	
-	if(KErrNone != rc) 
-		{			
-		SetTerminateError(rc);	
-		
-	    SendPrimaryContextCreated(aContextId, rc); // Notify GUQoS of error
-
- 		if(ESpudStartingPrimary == ref->State()) // Context created 
- 			{
- 			ref->SetState(ESpudWaitLinkDown); // We've just notified GUQoS.
- 			// Delete context via SpudFsm
-			__FLOG_2(_L("Failed to start lower NIF for Primary PDP context[%d] due to error[%d]. Deleting Primary via SpudFsm."), aContextId, rc);
-			rc = iPdpFsmInterface.Input(aContextId, EContextDelete);
-			ASSERT(rc == KErrNone);
- 			}
- 		else 	// Context was not created, else we would not be here. There is nothing to stop and delete.
- 			{
- 			__FLOG_1(_L("Failed to create Primary context[%d]. Spud will shut down."), aContextId);
-			
- 			if (AreQoSEventsEnabled())
-				{
-				// At this point we know that SPUD is about to shut down, because we are
-				// deleting the last context. We want to indicate to the upper layers early that
-				// data can no longer be sent to SPUD.
-									
-				// Tell GUQoS to stop bothering SPUD.
-				// GUQoS returns the favour by turning off the NIF events within this very call.
-				// This means we won't send KNetworkInterfaceDown, even if we try.
-		   		// *********************************************************************************************
-				// N.B.: "DEF055691 	GUQoS crashes at shutdown": This defect results in GUQoS crash if the stack
-    			// closes flows after the NIF proxy was deleted by GUQoS, as a result of KNetworkInterfaceDown event.
-    			// As a temporary workaround, this call is disabled, and KNetworkInterfaceDown event is signalled only
-    			// from the destructor. Once this defect is fixed, the following line must be uncommented: 
-    			// SendNetworkStatusEvent(KNetworkInterfaceDown, RPacketService::EStatusUnattached);
-				//**********************************************************************************************
-		   		}
-			// We are about to delete the primary context NIF: this will notify Nifman that SPUD is finished.
- 			DisposeOfBinder(ref);
- 			}
- 		}		
-	}
-
-void CSpudMan::HandleContextDeleteEvent(TContextId aContextId, TInt aError)
-	{
-	aError = aError; // suppress compiler warning
-	// Ignore error on delete--nothing we can do, anyway
-	// For the upper layers, we treat this event as KErrDisconnected, because the network has torn down an 
-	// existing context.
-	CSpudBinderRef* ref = NULL;
-	TRAPD(rc, ref = iBindMan->GetRefL(aContextId));
-	__ASSERT_ALWAYS(rc == KErrNone, Panic());
-	ASSERT(ref->IsBound());
-	__FLOG_4(_L("Network deleted context %d, in state %S(%d). Deletion error=%d"),
-		aContextId, SpudStateToText(ref->State()), ref->State(), aError);
-	
-	// Are we about to shut down after this context is deleted?
-	TBool shutdownStarted(BindMan()->IsLastContext(aContextId));
-	// We must determine this before we make any state transitions. But we can act on this
-	// only after we've done all GUQoS notifications to make sure shutdown is graceful.
-	
-	switch (ref->State()) 
-		{
-	case ESpudUp:
-	case ESpudFlowOff:
-	case ESpudSuspended:
-	case ESpudFlowOffAndSuspended:
-		ref->SetState(ESpudWaitLinkDown);
-		SendContextDeleteEvent(aContextId);
-		ref->NifLink()->Stop(KErrConnectionTerminated, MNifIfNotify::EDisconnect);
-        break;
-        
-    case ESpudStartingPrimaryLowerNif:
-    	ref->SetState(ESpudWaitLinkDown);
-    	SendPrimaryContextCreated(aContextId, KErrDisconnected);
-    	SendContextDeleteEvent(aContextId);
-    	ref->NifLink()->Stop(KErrConnectionTerminated, MNifIfNotify::EDisconnect);
-        break;
-        	        
-	case ESpudGettingNegQoS: // Context was activated. It is assumed that QoS retrieval would be cancelled by deletion.
-	case ESpudStartingSecondaryLowerNif:
-		ref->SetState(ESpudStartingSecondary);
-		FillInContextConfig(iTempContextConfig, aContextId);
-		SendContextActivateEvent(aContextId, iTempContextConfig, KErrDisconnected);
-		SendContextDeleteEvent(aContextId);
-		ref->NifLink()->Stop(KErrConnectionTerminated, MNifIfNotify::EDisconnect);
-        break;
-		
-	case ESpudStartingPrimary: 
-		// this should never happen
-		SendPrimaryContextCreated(aContextId, KErrDisconnected);
-		SendContextDeleteEvent(aContextId);
-		DisposeOfBinder(ref);
-		break;
-	
-	case ESpudStartingSecondary:
-		// This should never happen, and may cause problems if it does because there could be
-		// another outstanding request from GUQoS that never gets completed.
-		__FLOG_0(_L("Network should not have deleted context in ESpudStartingSecondary state!"));
-		// Fall through and treat the same as ESpudLinkDown
-		
-	case ESpudLinkDown:
-		SendContextDeleteEvent(aContextId);
-		DisposeOfBinder(ref);
-		break;
-	
-	case ESpudWaitLinkDown:	
-		DisposeOfBinder(ref);
-		break;
-		
-	
-	default:
-		__FLOG_2(_L("Unexpected state %S(%d)"), SpudStateToText(ref->State()), ref->State());
-		ASSERT(EFalse);
-		break;
-		}
-	
-	if(shutdownStarted) // Additional steps if we are shutting down as as result of this deletion.
-		{
-		SetTerminateError(KErrDisconnected); 
-		// We don't reuse errorForGuqos, because we may want to keep Nifman errors and GUQoS errors separate.	
-		if (AreQoSEventsEnabled())
-			{
-			// At this point we know that SPUD is about to shut down, because the last context 
-			// was just deleted. We want to indicate to the upper layers early that
-			// data can no longer be sent to SPUD.
-								
-			// Tell GUQoS to stop bothering SPUD.
-			// GUQoS returns the favour by turning off the NIF events within this very call.
-			// This means we send KNetworkInterfaceDown only once.
-			// *******************************************************************************************
-			// N.B.: "DEF055691 	GUQoS crashes at shutdown": This defect results in GUQoS crash if the stack
-    		// closes flows after the NIF proxy was deleted by GUQoS, as a result of KNetworkInterfaceDown event.
-    		// As a temporary workaround, this call is disabled, and KNetworkInterfaceDown event is signalled only
-    		// from the destructor. Once this defect is fixed, the following line must be uncommented: 
-    		// SendNetworkStatusEvent(KNetworkInterfaceDown, RPacketService::EStatusUnattached);
-			//**********************************************************************************************
-			}	
-		}	
-	}
-
-void CSpudMan::HandleSecondaryContextCreatedEvent(TContextId aContextId, TInt aError)
-	{
-	CSpudBinderRef* ref = NULL;
-	TRAPD(rc, ref = iBindMan->GetRefL(aContextId));
-	if (rc == KErrNone)
-		{
-		ASSERT(ref->IsBound());
-		__FLOG_4(_L("Network created secondary context[%d] in state %S(%d). Creation error=%d "),aContextId, SpudStateToText(ref->State()), ref->State(), aError);
-		if (ref->State() != ESpudStartingSecondary)
-			{
-			__FLOG_3(_L("KSecondaryContextCreated context %d is in unexpected state %S(%d)"),
-			         aContextId, SpudStateToText(ref->State()), ref->State());
-			}
-		ref = ref;	// Eliminate compiler warning in release builds
-		
-		// Make sure context was created successfully
-		rc = aError;
-		if(KErrNone != rc) // Creation failed: we don't have the context, only the binder. Delete it.
-			{
-			DisposeOfBinder(ref);
-			}
-		}
-	SendSecondaryContextCreated(aContextId, rc);
-	}
-
-void CSpudMan::HandleContextActivateEvent(TContextId aContextId, TInt aError)
-	{
-	CSpudBinderRef* ref = NULL;
-	TRAPD(rc, ref = iBindMan->GetRefL(aContextId));
-	if (rc == KErrNone)
-		{
-		// Make sure context was activated successfully
-		rc = aError;
-	
-		ASSERT(ref->IsBound());
-		__FLOG_3(_L("context %d is in state %S(%d)"), aContextId, SpudStateToText(ref->State()), ref->State());
-		}
-
-	if (rc == KErrNone)
-		{
-		ASSERT(ref->State() == ESpudStartingSecondary);
-		// Start the lower NIF
-		rc = ref->NifLink()->Start(); 
-		// Even if we get KErrNone here, we may still get LinkLayerDown with error later.
-		__FLOG_2(_L("KContextActivateEvent: Start on lower NIF returned for Context[%d] returned error[%d]"),aContextId, rc);
-		}
-	
-	if(KErrNone == rc) // Start OK.
-		{
-		
-		ref->SetState(ESpudStartingSecondaryLowerNif);
-		}
-	else
-		{
-		// Error activating PDP context
-		FillInContextConfig(iTempContextConfig, aContextId);
-		SendContextActivateEvent(aContextId, iTempContextConfig, rc);
-		}
-	}
-
-void CSpudMan::HandleContextQoSSetEvent(TContextId aContextId, TInt aError)
-	{
-	// Notify GUQoS of success or failure
-    SendContextQoSSetEvent(aContextId, aError);
-	}
-
-void CSpudMan::HandleContextTFTModifiedEvent(TContextId aContextId, TInt aError)
-	{
-	CSpudBinderRef* ref = NULL;
-	TRAPD(rc, ref = iBindMan->GetRefL(aContextId));
-	__ASSERT_ALWAYS(rc == KErrNone, Panic());
-	ASSERT(ref->IsBound());
-	__FLOG_3(_L("context %d is in state %S(%d)"), aContextId, SpudStateToText(ref->State()), ref->State());
-	ref = ref;	// Eliminate compiler warning in release builds
-
-	// Notify GUQoS of success or failure
-	TTFTOperationCode opCode;
-    iPdpFsmInterface.Get(aContextId, opCode);
-    SendContextTFTModifiedEvent(aContextId, opCode, aError);
-	}
-
-void CSpudMan::HandleGetNegQoSEvent(TContextId aContextId, TInt aError)
-	{
-	CSpudBinderRef* ref = NULL;
-	TRAPD(rc, ref = iBindMan->GetRefL(aContextId));
-	__ASSERT_ALWAYS(rc == KErrNone, Panic());
-	
-	ASSERT(ref->IsBound());
-	__FLOG_4(_L("CSpudMan: Retrieved Negotiated QoS, error=%d: context %d is in state %S(%d)"), aError, aContextId, SpudStateToText(ref->State()), ref->State());
-	if (ref->State() == ESpudGettingNegQoS)
-		{
-		// Negotiated QoS retrieved successfully. At this point the ctx is up both on control and data paths.
-		if(KErrNone == aError) 
-			{
-			// Context is now fully up. Notify GUQoS.
-			ref->SetState(ESpudUp);
-			// Notify GUQoS of success or failure
-			FillInContextConfig(iTempContextConfig, aContextId);
-    		SendContextActivateEvent(aContextId, iTempContextConfig, aError);
-			
-			if(ref->State() == ESpudUp) // GUQoS can delete the context from the activation notification.
-				{
-				BindMan()->SpudProtocol()->DoStartSending();
-				SendContextUnblockedEvent(aContextId);	
-				}
-			}
-		// If the QoS could not be retrieved, we remain in ESpudGettingNegQoS and wait for 
-		// the network to delete the context. The rest would be handled from the deletion event.
-		
-		// N.B. CRITICAL ASSUMPTION: 
-		// The network / TSY will delete the ctx if the negotiated QoS could not be retrieved.
-		// (The idea is that if QoS negotiation is errored out, then everything is errored out.
-		// So we either do not get to this point at all, or will be errored out soon after this handler completes.)
-		// This leaves the issue of internal ETel/TSY errors such as OOM conditions.)
-		// At this point Spud is idle (no requests outstanding), so nothing will drive us
-		// forward to clean up this failure. GUQoS does NOT time out on PDP context creation failure.
-		}
-	else
-		{
-		// If we are not getting negotiated QoS, but we receive this notification, then:
-		// - ETel has sent us a stray notification totally uncalled for, i.e. it's a bug in ETel or more likely a TSY.
-		if(KErrNone == aError)
-			{
-			__FLOG(_L("WARNING! Negotiated QoS retrieval completed successfully, but totally out of order! See the comments in the code.)"));
-			}
-		// We don't assert, because it can be a race condition outside of ETel's control:
-		// - ETel, lower NIF, GUQoS, Nifman has errored the context out (e.g. ctx deleted by network), so there was a 
-		// state transition as a result of that, and now the QoS retrieval has completed after that with KErrNone.
-		}
-	}
-
-
-void CSpudMan::HandleContextModifyActiveEvent(TContextId aContextId, TInt aError)
-	{
-	// Notify GUQoS of success or failure
-	FillInContextConfig(iTempContextConfig, aContextId);
-    SendContextModifyActiveEvent(aContextId, iTempContextConfig, aError);
-	}
-
-void CSpudMan::HandleNetworkStatusEvent()
-	{
-	// This is a network status change
-	RPacketService::TStatus status;
-	iPdpFsmInterface.Get(status);
-	
-	// Assume that anything other than EStatusUnattached means the network
-	// is still up, so just ignore this event.
-	if (status == RPacketService::EStatusUnattached)
-		{
-		// Notify GUQoS
-		SendNetworkStatusEvent(KNetworkConnectionLost, status);
-		}
-	else
-		{
-		__FLOG_1(_L("Ignoring KNetworkStatusEvent with status %d (NOT EStatusUnattached)"),
-				 status);
-		}
-	}
-
-void CSpudMan::HandleContextParametersChangeEvent(TContextId aContextId, TInt aError)
-	{
-	// This is a status change on an individual context
-	CSpudBinderRef* ref = NULL;
-	TRAPD(rc, ref = iBindMan->GetRefL(aContextId));
-	__ASSERT_ALWAYS(rc == KErrNone, Panic());
-	ASSERT(ref->IsBound());
-	__FLOG_3(_L("context %d is in state %S(%d)"), aContextId, SpudStateToText(ref->State()), ref->State());
-	if (ref->State() == ESpudGettingNegQoS || ref->State() == ESpudUp || ref->State() == ESpudFlowOff || ref->State() == ESpudSuspended || ref->State() == ESpudFlowOffAndSuspended)
-		{
-		// Only pass on context changes while the context is up
-		FillInContextConfig(iTempContextConfig, aContextId);
-		SendContextParametersChangeEvent(aContextId, iTempContextConfig, aError);
-		}
-	else
-		{
-		__FLOG_3(_L("KContextParametersChangeEvent ignored on context %d because of nonoperational state %S(%d)"),
-				 aContextId, SpudStateToText(ref->State()), ref->State());
-        SetTerminateError(aContextId, aError);
-		}
-	}
-
-void CSpudMan::HandleContextBlockedEvent(TContextId aContextId)
-	{
-	// Context is suspended (see StopSending)
-	CSpudBinderRef* ref = NULL;
-	TRAPD(rc, ref = iBindMan->GetRefL(aContextId));
-	__ASSERT_ALWAYS(rc == KErrNone, Panic());
-	ASSERT(ref->IsBound());
-	__FLOG_3(_L("context %d is in state %S(%d)"), aContextId, SpudStateToText(ref->State()), ref->State());
-	switch (ref->State())
-		{
-	case ESpudUp:
-		{
-		ref->SetState(ESpudSuspended);
-		if (AreQoSEventsEnabled())
-			{
-			SendContextBlockedEvent(aContextId);
-			}
-			
-		// Send an IfProgress to Nifman so that RConnection::ProgressNotification reports the blockage etc.
-		Notify()->IfProgress(KDataTransferTemporarilyBlocked, KErrNone);
-		break;
-		}
-
-	case ESpudFlowOff:
-		ref->SetState(ESpudFlowOffAndSuspended);
-			
-		// Send an IfProgress to Nifman so that RConnection::ProgressNotification reports the blockage etc.
-		Notify()->IfProgress(KDataTransferTemporarilyBlocked, KErrNone);
-		break;
-
-	case ESpudSuspended:
-	case ESpudFlowOffAndSuspended:
-		// Ignore this since we're already suspended
-		break;
-
-	default:
-		// Ignore this since we're still starting up or shutting down
-		__FLOG_1(_L("Can't send blocked event now on context %d"), aContextId);
-		break;
-		}
-		
-	// TODO: Probably need to send IfProgress here where aStage==KDataTransferTemporarilyBlocked
-	// or Notification with aEvent=EAgentToNifEventTypeDisableTimers
-	//
-	// NOTE: The IfProgress has now been implemented so that callers of RConnection::ProgressNotification
-	// expecting to receive KDataTransferTemporarilyBlocked actually get it if the PDP context is
-	// suspended (details of problem in INC107930).
-	}
-
-void CSpudMan::HandleContextUnblockedEvent(TContextId aContextId)
-	{
-	// Context is suspended (see StartSending)
-	CSpudBinderRef* ref = NULL;
-	TRAPD(rc, ref = iBindMan->GetRefL(aContextId));
-	__ASSERT_ALWAYS(rc == KErrNone, Panic());
-	ASSERT(ref->IsBound());
-	__FLOG_3(_L("context %d is in state %S(%d)"), aContextId, SpudStateToText(ref->State()), ref->State());
-	switch (ref->State())
-		{
-	case ESpudUp:
-	case ESpudFlowOff:
-		// Ignore this since we're already in an unsuspended state
-		break;
-
-	case ESpudSuspended:
-		{
-		ref->SetState(ESpudUp);
-
-		BindMan()->SpudProtocol()->DoStartSending();
-
-		if (AreQoSEventsEnabled())
-			{
-			SendContextUnblockedEvent(aContextId);
-			}
-		Notify()->IfProgress(KLinkLayerOpen, KErrNone);
-		break;
-		}
-
-	case ESpudFlowOffAndSuspended:
-		{
-		ref->SetState(ESpudFlowOff);
-		Notify()->IfProgress(KLinkLayerOpen, KErrNone);
-		break;
-		}
-
-	default:
-		// Ignore this since we're still starting up or shutting down
-		__FLOG_1(_L("Can't send unblocked event now on context %d; this may cause problems"), aContextId);
-		break;
-		}
-	}
-
-/**
-Receives event from GUQoS.
-
-@param aName event identification
-@param aOption optional data associated with event
-@return error code
-*/
-TInt CSpudMan::GuqosInput(TUint aName, TDes8& aOption)
-	{
-	__FLOG_2(_L("SpudMan::GuqosInput: GUQoS event %S(%d)"), SpudGuQoSEventToText(aName), aName);
-	switch (aName)
-		{
-	case KSoIfControllerPlugIn:
-        {
-        // Indicate that we want GUQoS
-        TSoIfControllerInfo& opt = *reinterpret_cast<TSoIfControllerInfo*>(const_cast<TUint8*>(aOption.Ptr()));
-        _LIT(KQosPlugInName, "guqos");
-        opt.iPlugIn = KQosPlugInName;
-        opt.iProtocolId = KQosPlugInProtocolId;
-        return KErrNone;
-        }
-
-    case KRegisterEventHandler:
-        {
-        // GUQoS has passed a pointer to its event handler
-        const TEvent *handler = reinterpret_cast<const TEvent *>(aOption.Ptr());
-        iQosEventHandler = static_cast<MNifEvent *>(handler->iEvent);
-        ASSERT(iQosEventHandler);
-        return KErrNone;
-        }
-
-	case KContextSetEvents:
-		{
-        if (!AreQoSEventsEnabled())
-        	{
-        	// Event handler must be registered first
-            return KErrGeneral;
-        	}
-        const TBool* eventsEnabledPtr = reinterpret_cast<const TBool *>(aOption.Ptr());
-        ASSERT(eventsEnabledPtr);
-        iQosEventsEnabled = *eventsEnabledPtr;
-
-        // Has a primary PDP context has already been created?
-       	CSpudBinderRef* ref = NULL;
-		TRAPD(rc, ref = BindMan()->GetAnyRefL());
-		const TBool havePrimary(rc == KErrNone && (ref->State() == ESpudUp || ref->State() == ESpudFlowOff || ref->State() == ESpudSuspended || ref->State() == ESpudFlowOffAndSuspended));
-
-        if (iQosEventsEnabled && havePrimary)
-        	{
-        	// iPrimaryContextId == KPrimaryContextId == 0 at startup
-            SendPrimaryContextCreated(iPrimaryContextId, KErrNone);
-            }
-        return KErrNone;
-		}
-
-	case KNifSetDefaultQoS:
-		{
-         ASSERT(aOption.Ptr());
-         const TContextParameters& opt = *reinterpret_cast<const TContextParameters*>(aOption.Ptr());
-
-         if (!iPdpFsmInterface.IsInitialised()) 
-            {
-            __FLOG_0(_L("CSpudMan::GuqosInput: iPdpFsmInterface not initialised, parking KNifSetDefaultQoS."));
-            
-            if (iParkedDefaultQoS == NULL)
-               {
-               TRAPD(err, iParkedDefaultQoS = HBufC8::NewL (sizeof (TContextParameters)));
-               if (err != KErrNone)
-                  {
-                  __FLOG_0(_L("CSpudMan::GuqosInput: Failed to park default QoS."));
-                  return err;
-                  }
-               }
-               
-            iParkedDefaultQoS->Des().Copy (aOption);
-
-            return KErrNone;
-            }
-         
-       	CSpudBinderRef* ref = NULL;
-       	// Lower NIF for primary context has already been loaded by factory
-		TRAPD(rc, ref = BindMan()->GetRefL(iPrimaryContextId));
-		__ASSERT_ALWAYS(rc == KErrNone, Panic());
-		ASSERT(ref->IsBound());
-		
-		ASSERT(ref->State() == ESpudInactive);
-        ref->SetState(ESpudHaveQos);
-        	
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-		// Store R5 QoS parameters
-			RPacketQoS::TQoSR5Requested qos;
-#else
-		// Store QoS parameters
-			RPacketQoS::TQoSR99_R4Requested qos;
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5
-		
-		opt.iContextConfig.GetUMTSQoSReq(qos); 
-		rc = iPdpFsmInterface.Set(iPrimaryContextId, qos);	
-
-        if (rc != KErrNone)
-			{
-			__FLOG_1(_L("Setting default QoS on primary context failed with error [%d]. SPUD will shut down."), rc);
-			SetTerminateError(iPrimaryContextId, rc); 
-			
-			SendPrimaryContextCreated(iPrimaryContextId, rc); // Notify GUQoS of error
-			
-			// At this point we know that SPUD is about to shut down, because we could not bring the 
-	 		// primary context UP.
-	
-			//**********************************************************************************************
-			// Tell GUQoS to stop bothering SPUD.
-			// GUQoS returns the favour by turning off the NIF events within this very call.
-	        // N.B.: "DEF055691 	GUQoS crashes at shutdown": This defect results in GUQoS crash if the stack
-	        // closes flows after the NIF proxy was deleted by GUQoS, as a result of KNetworkInterfaceDown event.
-	        // As a temporary workaround, this call is disabled, and KNetworkInterfaceDown event is signalled only
-	        // from the destructor. Once this defect is fixed, the following line must be uncommented: 
-	        // SendNetworkStatusEvent(KNetworkInterfaceDown, RPacketService::EStatusUnattached);
-			//**********************************************************************************************
-			
-			__FLOG_1(_L("Setting default QoS on primary context failed: mark lower NIF binder for context[%d] for async deletion."), iPrimaryContextId);
-			// We are about to delete the primary context NIF: this will notify Nifman that SPUD is finished.
-			DisposeOfBinder(ref);
-			}
-			
-        return KErrNone;
-		}
-
-	case KContextCreate:
-		{
-        ASSERT(aOption.Ptr());
-		TContextParameters& opt=*reinterpret_cast<TContextParameters*>(const_cast<TUint8*>(aOption.Ptr()));
-		ASSERT(opt.iContextType == ESecondaryContext);
-
-		TContextId id(KAllContexts);	// placeholder context ID
-		CSpudBinderRef* ref = NULL;
-		TRAPD(rc, ref = BindMan()->GetNewRefForSecondaryL(id););
-		if(KErrNone != rc)
-			{
-			__FLOG_1(_L("Error %d creating a binder for the lower NIF"), rc);
-			opt.iReasonCode = rc;  // The error code is the only argument we can pass to GUQoS, because there is no context.
-    		return KErrNone;
-    		}
-
-
-		TRAP(rc, BindMan()->LoadNifL(iName, *ref);)
-		if (rc != KErrNone)
-			{
-			__FLOG_1(_L("Error %d loading the lower NIF"), rc);
-			FillInParameters(opt, id, rc);
-			return KErrNone;
-			}
-
-		ASSERT(ref->IsBound());
-        ref->SetState(ESpudStartingSecondary);
-
-
-		// Reset the default QoS and TFT here. KContextQoSSet should arrive soon
-		// with the proper values.
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-			RPacketQoS::TQoSR5Requested qos;
-#else
-			RPacketQoS::TQoSR99_R4Requested qos;
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 
-		rc = iPdpFsmInterface.Set(id, qos);
-
-		TTFTInfo tft;
-        rc = iPdpFsmInterface.Set(id, tft);
-		
-		// Pass in the new context ID to SpudFsm to use for the new context
-
-		// Notify SpudFsm
-		__FLOG_1(_L("Sending SpudFsm event ECreateSecondaryPDPContext context %d"), id);
-		rc = iPdpFsmInterface.Input(id, ECreateSecondaryPDPContext);
-
-		// Set up the synchronous response
-		FillInParameters(opt, id, rc);
-    	return KErrNone;
-		}
-		
-	case KContextDelete:
-		{
-        ASSERT(aOption.Ptr());
-        TContextParameters& opt = *reinterpret_cast<TContextParameters*>(const_cast<TUint8*>(aOption.Ptr()));
-       	CSpudBinderRef* ref = NULL;
-		TRAPD(rc, ref = BindMan()->GetRefL(opt.iContextInfo.iContextId));
-		if (rc != KErrNone)
-			{
-			__FLOG_1(_L("Error: KContextDelete specifies context %d which does not exist"), opt.iContextInfo.iContextId);
-			opt.iReasonCode = rc;  // The error code is the only argument we can pass to GUQoS, because there is no context.
-    		return KErrNone;
-			}
-		
-		ASSERT(ref->IsBound());
-		__FLOG_3(_L("KContextDelete context[%d] in state %S(%d)"), opt.iContextInfo.iContextId, SpudStateToText(ref->State()), ref->State());
-
-		switch (ref->State())
-			{
-		// NIF is up: need to stop the NIF first, then delete the binder.	
-		case ESpudGettingNegQoS:
-		case ESpudStartingSecondaryLowerNif: 
-		// Assumption: GUQoS will never delete primary context.
-		case ESpudUp:
-		case ESpudFlowOff:
-		case ESpudSuspended:
-		case ESpudFlowOffAndSuspended:
-	        ref->SetState(ESpudContextDelete);
-	        
-	        if(BindMan()->IsLastContext(opt.iContextInfo.iContextId)) // Are we about to shutdown after this?
-	        	{
-	           	SetTerminateError(KErrCancel); // KErrCancel is normally used to indicate "graceful" 
-	        	}							   // user-initiated shutdown.
-		   
-	        // GUQoS ordered the shutdown: Network is still OK: initiate graceful shutdown of the lower NIF.
-	        ref->NifLink()->Stop(KErrCancel, MNifIfNotify::EDisconnect);
-	        break;
-	    
-	    case ESpudStartingSecondary:  // NIF not started: need to delete the context.
-			ref->SetState(ESpudWaitLinkDown); 
-
-			// Delete context via SpudFsm
-			__FLOG_1(_L("Sending SpudFsm event EContextDelete context %d"), opt.iContextInfo.iContextId);
-			rc = iPdpFsmInterface.Input(opt.iContextInfo.iContextId, EContextDelete);
-			ASSERT(rc == KErrNone);
-			break;
-
-		case ESpudWaitLinkDown:
-			// We're in the middle of deleting. Ignore this request.
-			break;
-
-		case ESpudLinkDown:
-			// We're in the middle of deleting, but we no longer need to notify
-			// GUQoS when done.
-			ref->SetState(ESpudWaitLinkDown);
-			break;
-	
-		case ESpudWaitBinderDelete: // context deleted, NIF about to be deleted: ignore.
-			break;
-			
-		default:
-			__FLOG_2(_L("Unexpected state %S(%d)"), SpudStateToText(ref->State()), ref->State());
-	    	ASSERT(EFalse);
-	    	break;
-			}
-
-		FillInParameters(opt, opt.iContextInfo.iContextId, rc);
-        return KErrNone;
-		}
-		
-	case KContextActivate:
-		{
-        ASSERT(aOption.Ptr());
-		TContextParameters& opt=*reinterpret_cast<TContextParameters*>(const_cast<TUint8*>(aOption.Ptr()));
-       	CSpudBinderRef* ref = NULL;
-		// Validate context ID
-		TRAPD(rc, ref = BindMan()->GetRefL(opt.iContextInfo.iContextId));
-		if (KErrNone != rc)
-			{
-			opt.iReasonCode = rc; // Can supply error code only, as the context does not exist.
-			__FLOG_1(_L("Error: KContextActivate specifies context %d which does not exist."), opt.iContextInfo.iContextId);
-			return KErrNone;
-			}
-		
-		if(!ref->IsBound() || ref->State() == ESpudWaitBinderDelete)
-			{
-			__FLOG_1(_L("Error: KContextActivate specifies context %d which is not bound to lower NIF."), opt.iContextInfo.iContextId);
-			rc = KErrNotReady; // that's what the GuQoS docs say
-			FillInParameters(opt, opt.iContextInfo.iContextId, rc);
-			return KErrNone;
-			}
-			
-		__FLOG_3(_L("KContextActivate context %d in state %S(%d)"), opt.iContextInfo.iContextId, SpudStateToText(ref->State()), ref->State());
-
-        ASSERT(ref->State() == ESpudStartingSecondary || ref->State() == ESpudUp);
-
-
-		// Notify SpudFsm
-		__FLOG_1(_L("Sending SpudFsm event EContextActivate context %d"), opt.iContextInfo.iContextId);
-		rc = iPdpFsmInterface.Input(opt.iContextInfo.iContextId, EContextActivate);
-		// Set up the synchronous response
-		FillInParameters(opt, opt.iContextInfo.iContextId, rc);
-        return KErrNone;
-		}
-
-	case KContextQoSSet:
-		{
-		TContextParameters& opt=*reinterpret_cast<TContextParameters*>(const_cast<TUint8*>(aOption.Ptr()));
-       	CSpudBinderRef* ref = NULL;
-		// Validate context ID
-		TRAPD(rc, ref = BindMan()->GetRefL(opt.iContextInfo.iContextId));
-		if (KErrNone != rc)
-			{
-			__FLOG_1(_L("Error: KContextQoSSet specifies context %d which does not exist"), opt.iContextInfo.iContextId);
-			opt.iReasonCode = rc; // Can only supply error code, as the context does not exist.
-			return KErrNone;
-			}		
-		
-		if(!ref->IsBound() || ref->State() == ESpudWaitBinderDelete)
-			{
-			__FLOG_1(_L("Error: KContextQoSSet specifies context %d which is not bound to the lower NIF."), opt.iContextInfo.iContextId);
-			rc = KErrNotReady; // that's what the GuQoS docs say
-			FillInParameters(opt, opt.iContextInfo.iContextId, rc);
-			return KErrNone;
-			}
-		__FLOG_3(_L("KContextQoSSet context %d in state %S(%d)"), opt.iContextInfo.iContextId, SpudStateToText(ref->State()), ref->State());
-
-		ASSERT(ref->State() == ESpudStartingSecondary
-            || ref->State() == ESpudUp
-            || ref->State() == ESpudFlowOff
-            || ref->State() == ESpudSuspended
-            || ref->State() == ESpudFlowOffAndSuspended
-            || ref->State() == ESpudLinkDown );
-		
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-        RPacketQoS::TQoSR5Requested qos;
-#else
-    RPacketQoS::TQoSR99_R4Requested qos;
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 
-
-		// Store QoS parameters
-        opt.iContextConfig.GetUMTSQoSReq(qos); 
-		rc = iPdpFsmInterface.Set(opt.iContextInfo.iContextId, qos);
-
-		// Notify SpudFsm
-		if (rc == KErrNone)
-			{
-			__FLOG_1(_L("Sending SpudFsm event EContextQoSSet context %d"), opt.iContextInfo.iContextId);
-			rc = iPdpFsmInterface.Input(opt.iContextInfo.iContextId, EContextQoSSet);
-			}
-		FillInParameters(opt, opt.iContextInfo.iContextId, rc);
-        return KErrNone;
-		}
-
-	case KContextTFTModify:
-		{
-		TContextParameters& opt=*reinterpret_cast<TContextParameters*>(const_cast<TUint8*>(aOption.Ptr()));
-       	CSpudBinderRef* ref = NULL;
-		// Validate context ID
-		TRAPD(rc, ref = BindMan()->GetRefL(opt.iContextInfo.iContextId));
-		if (KErrNone != rc)
-			{
-			__FLOG_1(_L("Error: KContextTFTModify specifies context %d which does not exist"), opt.iContextInfo.iContextId);
-			opt.iReasonCode = rc; // Can only supply error code as the context does not exist.
-			return KErrNone;
-			}
-
-		// keep local reference to Primary Context up to date
-		if (opt.iContextType == EPrimaryContext) 
-			{
-			iPrimaryContextId = opt.iContextInfo.iContextId;
-			}
-			
-		if(!ref->IsBound() || ref->State() == ESpudWaitBinderDelete)
-			{
-			__FLOG_1(_L("Error: KContextTFTModify specifies context %d which is not bound to the lower NIF."), opt.iContextInfo.iContextId);
-			rc = KErrNotReady; // that's what the GuQoS docs say
-			FillInParameters(opt, opt.iContextInfo.iContextId, rc);
-			return KErrNone;
-			}
-		__FLOG_3(_L("KContextTFTModify context %d in state %S(%d)"), opt.iContextInfo.iContextId, SpudStateToText(ref->State()), ref->State());
-
-		ASSERT(ref->State() == ESpudStartingSecondary || 
-			   ref->State() == ESpudUp ||
-		       ref->State() == ESpudWaitLinkDown  ||
-		       ref->State() == ESpudLinkDown ||
-		       ref->State() == ESpudGettingNegQoS);
-		// It is assumed that the TFT can be modified before the ctx reported activation 
-
-		// Store TFT parameters
-		TTFTInfo tft;
-        opt.iContextConfig.GetTFTInfo(tft); 
-
-        rc = iPdpFsmInterface.Set(opt.iContextInfo.iContextId, tft);
-		if (rc != KErrNone)
-			{
-			__FLOG_1(_L("Error %d setting TFT"), rc);
-			FillInParameters(opt, opt.iContextInfo.iContextId, rc);
-			return KErrNone;
-			}
-        rc = iPdpFsmInterface.Set(opt.iContextInfo.iContextId, opt.iTFTOperationCode);
-		if (rc != KErrNone)
-			{
-			__FLOG_1(_L("Error %d setting TFT operation code"), rc);
-			FillInParameters(opt, opt.iContextInfo.iContextId, rc);
-			return KErrNone;
-			}
-
-		// Notify SpudFsm
-		__FLOG_1(_L("Sending SpudFsm event EContextTFTModify context %d"), opt.iContextInfo.iContextId);
-		rc = iPdpFsmInterface.Input(opt.iContextInfo.iContextId, EContextTFTModify);
-
-		FillInParameters(opt, opt.iContextInfo.iContextId, rc);
-        return KErrNone;
-		}
-
-	case KContextModifyActive:
-		{
-		TContextParameters& opt=*reinterpret_cast<TContextParameters*>(const_cast<TUint8*>(aOption.Ptr()));
-       	CSpudBinderRef* ref = NULL;
-		// Validate context ID
-		TRAPD(rc, ref = BindMan()->GetRefL(opt.iContextInfo.iContextId));
-		if (KErrNone != rc)
-			{
-			__FLOG_1(_L("Error: KContextModifyActive specifies context %d which does not exist"), opt.iContextInfo.iContextId);
-			opt.iReasonCode = rc;
-			return KErrNone;
-			}
-			
-		if(!ref->IsBound() || ref->State() == ESpudWaitBinderDelete)
-			{
-			__FLOG_1(_L("Error: KContextModifyActive specifies context %d which is not bound to the lower NIF."), opt.iContextInfo.iContextId);
-			rc = KErrNotReady; // that's what the GuQoS docs say
-			FillInParameters(opt, opt.iContextInfo.iContextId, rc);
-			return KErrNone;
-			}
-
-		// Notify SpudFsm
-		__FLOG_1(_L("Sending SpudFsm event EContextModifyActive context %d"), opt.iContextInfo.iContextId);
-		rc = iPdpFsmInterface.Input(opt.iContextInfo.iContextId, EContextModifyActive);
-
-		FillInParameters(opt, opt.iContextInfo.iContextId, rc);
-        return KErrNone;
-		}
-		
-	case KInitialisePdpFsm:
-      {
-      MPdpFsmInterface* pdpFsm = *reinterpret_cast<MPdpFsmInterface**>(const_cast<TUint8*>(aOption.Ptr()));
-      iPdpFsmInterface.Init(pdpFsm);
-      return KErrNone;
-      }
-
-	default:
-		__FLOG_1(_L("Unhandled event %d"), aName);
-		break;
-		}
-	return KErrNotSupported;
-	}
-
-/**
-Receives link up indication from a lower NIF.
-
-@param aContextId PDP context ID of the associated lower NIF
-*/
-void CSpudMan::LinkLayerUp(TContextId aContextId)
-	{
-	CSpudBinderRef* ref = NULL;
-	TRAPD(rc, ref = iBindMan->GetRefL(aContextId));
-	__ASSERT_ALWAYS(rc == KErrNone, Panic());
-	ASSERT(ref->IsBound() && ref->State() != ESpudWaitBinderDelete);
-	
-	__FLOG_3(_L("Lower NIF LinkLayerUp on context[%d], in state %S(%d)"), aContextId, SpudStateToText(ref->State()), ref->State());
-	switch (ref->State())
-		{
-	case ESpudStartingPrimaryLowerNif:
-		{
-	    ref->SetState(ESpudUp);
-		if (AreQoSEventsEnabled())
-			{
-			SendPrimaryContextCreated(aContextId, KErrNone);
-			}
-		// If QoS is not yet enabled, SendPrimaryContextCreated() will be called when it is
-
-		Notify()->LinkLayerUp();
-
-		// If mobile IP is enabled, this progress notification should not be sent here.
-		// This will need to be addressed if MIP is ever enabled for UMTS.
-		Notify()->IfProgress(KLinkLayerOpen, KErrNone);
-		}
-		break;
-
-	case ESpudStartingSecondaryLowerNif:
-		{
-		// lower nif is up, now get the Negotiated QoS
-	    ref->SetState(ESpudGettingNegQoS);
-		
-		TInt rc = iPdpFsmInterface.Input(aContextId, EGetNegQoS);
-		ASSERT(rc == KErrNone);
-		// Now wait for retrieval of negotiated QoS.
-		// The following 2 functions will be fired from CSpudMan::HandleGetNegQoSEvent():
-		//    FillInContextConfig(iTempContextConfig, aContextId);
-		//    SendContextActivateEvent(aContextId, iTempContextConfig, KErrNone);
-		}
-		break;
-		
-	default:
-		__FLOG_3(_L("Lower NIF LinkLayerUp on context[%d], in unexpected state %S(%d)"), aContextId, SpudStateToText(ref->State()), ref->State());
-		ASSERT(EFalse);
-		}
-	}
-
-/**
-Receives link down indication from a lower NIF.
-
-@param aContextId Valid PDP context ID of the associated lower NIF
-@param aReason A Symbian OS error code indicating the reason for the link closing down
-@param aAction The action that should be taken as a result of link layer down being signalled
-*/
-void CSpudMan::LinkLayerDown(TContextId aContextId, TInt aReason, MNifIfNotify::TAction aAction)
-	{
-	__FLOG_3(_L("CSpudMan::LinkLayerDown: context %d reason %d action %d"), aContextId, aReason, aAction);
-
-	if (aAction == MNifIfNotify::ENoAction)
-		{
-		// This call indicates a renegotiation of the lower link, not that the link has
-		// actually gone down. This is of no interest to SPUD.
-		__FLOG_0(_L("Ignoring MNifIfNotify::ENoAction"));
-		return;
-		}
-
-	CSpudBinderRef* ref = NULL;
-	TRAPD(rc, ref = iBindMan->GetRefL(aContextId));
-	__ASSERT_ALWAYS(rc == KErrNone, Panic());
-	__FLOG_3(_L("context %d is in state %S(%d)"), aContextId, SpudStateToText(ref->State()), ref->State());
-
-	
-	TBool isUpperFlowOn = EFalse; // Can GUQoS attempt to send on this PDP context?
-	
-	switch (ref->State())
-		{
-	case ESpudUp:
-		isUpperFlowOn = ETrue; // ESpudUp is the only state where GUQoS is allowed to send on us.
-		// Fall through
-	case ESpudFlowOff:// NIF & context were activated succcessfully.
-	case ESpudSuspended:
-	case ESpudFlowOffAndSuspended:
-		ref->SetState(ESpudLinkDown); // Must Notify GUQoS that context is down.
-		
-		// Must inform upper layers they can no longer send on this context.
-		if (isUpperFlowOn && AreQoSEventsEnabled()) 
-			{
-			// At this point the context status does not indicate to GUQoS that the context is about to go down.
-			// Most likely, the status is EStatusActive, indicating that the context can handle requests.
-			// Since the lower NIF is down, we are about to delete the context, so logically, this context
-			// is EStatusDeactivating.(From spudman's PoV, a context is a union of lower NIF and ETel's RPacketContext)
-			// GUQoS does not know this, it may try to issue requests,  
-			// such as send packets on this context, modify TFT, modify QoS, etc.
-			// Note: this does not seem to happen, but it is feasible.
-			
-			// N.B. Ideally, we should signal context change status in not just in EStateUp, but in 
-			// EStateFlowOff etc, i.e. any state in which the context is alive. Unfortunately, GUQoS 
-			// does not allow us to do this - there is no pure "ContextStatusChange" upcall on GUQoS.
-			// Context Parameters Change upcall should not be used, because GUQoS interprets it as a
-			// QoS parameters change, and sends QoSEventAdapt to the QoS framework. This is wrong.
-			//
-			// We could send ContextBlocked in FlowOff / Suspended states, however, this is problematic,
-			// because GUQoS has already received one of these notifications. We could "trick" it and cycle
-			// the state (send Flow On / Resume, then Flow Off / Suspend again), but this hackery should be
-			// avoided unless absolutely necessary. So far, GUQoS does not seem to do anything beside sending
-			// a packet on a deactivaing context, so we only worry about it.
-			
-			// N.B. SpudFSM is asynchronous, it will not issue a an actual deletion request on ETel until this RunL
-			// returns. This means that the context status will not be updated to EStatusDeactiving in ETel 
-			// until then, so when we fill in context paramters, the status is going to be EStatusActive.
-			// We "sneak in" the correct status by overriding it. Doing it in SpudFSM would be wrong, because
-			// SpudFSM reflects the ETel side of the context, so overriding the status there is misleading,
-			// because it can be used internally by SpudFSM / SpudTel.
-			
-			__FLOG_0(_L("Upper flow on the context is On: flow Off GUQoS to prevent it from sending on a context with dead lower NIF."));
-			iContextStatusOverride = RPacketContext::EStatusDeactivating; 
-			SendContextBlockedEvent(aContextId); // resets the override
-			isUpperFlowOn = EFalse; 
-			}
-		
-		// The only way we can notify GUQoS once the context has been activated is
-		// to delete it via the SpudFsm
-		__FLOG_1(_L("Sending SpudFsm event EContextDelete context %d"), aContextId);
-		rc = iPdpFsmInterface.Input(aContextId, EContextDelete);
-		__FLOG_1(_L("SpudFsm::Input() returned status %d"), rc);
-		if (rc == KErrNotReady) //This is becuase the FSM has been shut down via UMTSGPRSSCPR
-			{
-			HandleContextDeleteEvent(aContextId, aReason); //Just pretend that the fsm returned something sensible
-			}
-		ASSERT(rc == KErrNone || rc == KErrNotReady);
-		break;
-
-	case ESpudGettingNegQoS: // CNifIfLink::Stop will handle this just as if the NIF was still being CNifIfLink::Start'ed.
-	case ESpudStartingSecondaryLowerNif: // Attempt to bring up the lower NIF was made.
-		ref->SetState(ESpudStartingSecondary); // GUQoS should delete us later. 
-		// Notify GUQoS that Activation failed. It will take the control from here, most likely deleting the context.
-		FillInContextConfig(iTempContextConfig, aContextId);
-		if(ref->Error() != KErrNone)
-			{
-			SendContextActivateEvent(aContextId, iTempContextConfig, ref->Error());
-			}
-		else
-			{
-			SendContextActivateEvent(aContextId, iTempContextConfig, aReason);
-			}
-		break;
-	
-	case ESpudContextDelete:
-		ref->SetState(ESpudWaitLinkDown); // GUQoS triggered us: don't need to notify it.
-
-		// Delete context via SpudFsm
-		__FLOG_1(_L("Sending SpudFsm event EContextDelete context %d"), aContextId);
-		rc = iPdpFsmInterface.Input(aContextId, EContextDelete);
-		__FLOG_1(_L("SpudFsm::Input() returned status %d"), rc);
-		ASSERT(rc == KErrNone);
-		break;
-		
-	case ESpudStartingSecondary:
-	case ESpudLinkDown: // Added for INC066156.
-	case ESpudWaitLinkDown:
-		// Link has finally gone down. Context is already deleted.
-    	__FLOG_1(_L("Lower NIF reported LinkLayerDown: mark the binder for context[%d] for async deletion"), aContextId);
-		DisposeOfBinder(ref);
-		break;
-	
-	case ESpudStartingPrimaryLowerNif:
-		{
-		SetTerminateError(aContextId, aReason); // SPUD is going to terminate.
-		SetTerminateError(KErrCouldNotConnect);
-		
-		// The primary context is managed by SPUD. We delete it ourselves.
-		__FLOG_1(_L("Sending SpudFsm event EContextDelete context %d"), aContextId);
-		ref->SetState(ESpudWaitLinkDown);
-		rc = iPdpFsmInterface.Input(aContextId, EContextDelete);
-		__FLOG_1(_L("SpudFsm::Input() returned status %d"), rc);
-		ASSERT(rc == KErrNone);
-		
-		// Meanwhile, notify GUQoS about the failed primary creation
-		if (AreQoSEventsEnabled())
-			{
-			SendPrimaryContextCreated(aContextId, aReason);
-			}
-		break;
-		}	
-			
-	default:
-		__FLOG_2(_L("Unexpected state %S(%d)"), SpudStateToText(ref->State()), ref->State());
-		ASSERT(EFalse);
-		break;
-		}
-	}
-
-/**
-Receives flow off indication from a lower NIF.
-
-@param aContextId Valid PDP context ID of the associated lower NIF
-*/
-void CSpudMan::StopSending(TContextId aContextId)
-	{
-	__FLOG_1(_L("CSpudMan::StopSending context %d"), aContextId);
-	CSpudBinderRef* ref = NULL;
-	TRAPD(rc, ref = iBindMan->GetRefL(aContextId));
-	__ASSERT_ALWAYS(rc == KErrNone, Panic());
-	__FLOG_3(_L("context %d is in state %S(%d)"), aContextId, SpudStateToText(ref->State()), ref->State());
-	switch (ref->State())
-		{
-	case ESpudUp:
-		ref->SetState(ESpudFlowOff);
-		if (AreQoSEventsEnabled())
-			{
-			SendContextBlockedEvent(aContextId);
-			}
-		break;
-
-	case ESpudSuspended:
-		ref->SetState(ESpudFlowOffAndSuspended);
-		break;
-
-	case ESpudContextDelete:
-	case ESpudWaitLinkDown:
-	case ESpudLinkDown: //sometimes this leaks in
-		// ignore
-		break;	
-	
-	default:
-		// error
-		__FLOG_2(_L("Unexpected state %S(%d)"), SpudStateToText(ref->State()), ref->State());
-		ASSERT(EFalse);
-		break;
-		}
-	}
-
-/**
-Receives flow on indication from a lower NIF.
-
-@param aContextId Valid PDP context ID of the associated lower NIF
-*/
-void CSpudMan::StartSending(TContextId aContextId)
-	{
-	__FLOG_1(_L("CSpudMan::StartSending context %d"), aContextId);
-	CSpudBinderRef* ref = NULL;
-	TRAPD(rc, ref = iBindMan->GetRefL(aContextId));
-	__ASSERT_ALWAYS(rc == KErrNone, Panic());
-	__FLOG_3(_L("context %d is in state %S(%d)"), aContextId, SpudStateToText(ref->State()), ref->State());
-	switch (ref->State())
-		{
-	case ESpudGettingNegQoS: // Lower NIF for the 2ndary ctx is up, waiting for negotiated QoS.
-		break; // GUQoS, TCP/IP stack will be notified when negotiated QoS is retrieved. 
-		// Notes: 
-		// 1.there is a *potential* race condition where the negotiated QoS is retrived before lower NIF signals StartSending.
-		// This does not seem to happen with PPP. If this happens somehow, the ctx will be in the "UP" state and it will be handled correctly.
-		// 2. Theoretically, the lower NIF may report LinkLayerUp (triggering retrieval of negotiated QoS), then signal 
-		// StartSending much later (e.g.  a PPP implementation singalling LinkLayerUp from LCP, but StartSending from NCP).
-		// SPUD CANNOT HANDLE THIS.
-		// Existing Raw IP and PPP NIFs signal StartSending immediately after LinkLayerUp, so this has no consequences.
-
-	case ESpudUp:
-		// This can happen for the initial StartSending after the lower NIF comes up
-		// Treat it the same as ESpudFlowOff and fall through.
-	case ESpudFlowOff:
-		ref->SetState(ESpudUp);
-
-		// This must only be done AFTER the KPrimaryContextCreated event is sent (which in this state it is)
-		// It's not clear if StartSending is needed/allowed in addition to the GUQoS event.
-	    BindMan()->SpudProtocol()->DoStartSending();
-
-		if (AreQoSEventsEnabled())
-			{
-			SendContextUnblockedEvent(aContextId);
-			}
-		break;
-
-	case ESpudFlowOffAndSuspended:
-		ref->SetState(ESpudSuspended);
-		break;
-
-	case ESpudSuspended:
-	case ESpudContextDelete:
-	case ESpudWaitLinkDown:
-		// ignore
-		__FLOG_1(_L("Ignored StartSending on context %d (this should be OK)"), aContextId);
-		break;	
-	
-	default:
-		// We have encountered a serious problem. If we get StartSending before reaching the ESpudUp
-		// state, we'll lose it and the upper networking protocol will never be notified.
-		// As long as the lower NIF calls LinkLayerUp before StartSending, we'll be fine.
-		__FLOG_1(_L("Can't send unblocked event now on context %d; this may cause problems"), aContextId);
-		ASSERT(EFalse);
-		break;
-		}
-	}
-
-
-//*****************************************************************************
-// Event senders to GUQoS
-//*****************************************************************************
-
-/**
-Sends event to GUQoS.
-
-@param aName event identifier
-@param aOption TPckg<> event data
-*/
-void CSpudMan::RaiseEvent(TUint aName, TDes8& aOption) const
-	{
-	__FLOG_2(_L("Sending event %S(%d) to GUQoS"), SpudFsmEventToText(aName), aName);
-	iQosEventHandler->Event(reinterpret_cast<CProtocolBase*>(iBindMan->SpudMux()), aName, aOption); 
-	}
-
-/**
-Fills in common event parameters for the given context.
-
-@param aParams parameter structure
-@param aContextId Valid PDP context ID
-*/
-void CSpudMan::FillInParameters(TContextParameters& aParams, TContextId aContextId, TInt aError) const
-	{
-   	CSpudBinderRef* ref = NULL;
-	TRAPD(rc, ref = BindMan()->GetRefL(aContextId));
-	ASSERT(rc == KErrNone);
-	
-	TContextType type(EContextTypeUnknown);
-	if (rc == KErrNone)
-		{
-		switch (ref->State())
-			{
-		case ESpudHaveQos:
-		case ESpudCreatingPrimary:
-		case ESpudStartingPrimary:
-			type = EPrimaryContext;
-			break;
-			
-		case ESpudStartingSecondary:
-			type = ESecondaryContext;
-			break;
-		
-		default:
-			type = (aContextId == iPrimaryContextId) ? EPrimaryContext : ESecondaryContext;;
-			break;
-			}
-		}
-    aParams.iContextType = type; // Context type
-    aParams.iReasonCode = aError;  // Error code
-    //aParams.iContextInfo.iStatus = StateToStatus(*ref);
-    iPdpFsmInterface.Get(aContextId, aParams.iContextInfo.iStatus);
-    aParams.iContextInfo.iContextId = aContextId;
-	}
-
-/**
-Fill in context configuration parameter structure using SpudFsm's parameters.
-
-@param aConfig parameter structure
-@param aContextId PDP context ID
-*/
-void CSpudMan::FillInContextConfig(TContextConfig& aConfig, TContextId aContextId) const
-	{
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-		RPacketQoS::TQoSR5Negotiated qos;
-#else
-		RPacketQoS::TQoSR99_R4Negotiated qos;
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 
-
-	iPdpFsmInterface.Get(aContextId, qos);
-	aConfig.SetUMTSQoSNeg(qos);
-
-	iPdpFsmInterface.Get(aContextId, iTempTftInfo);
-	aConfig.SetTFTInfo(iTempTftInfo);
-
-	iPdpFsmInterface.Get(aContextId, iTempGprsContext);
-	aConfig.SetContextConfig(iTempGprsContext);
-	}
-
-/**
-Sends KPrimaryContextCreated event to GUQoS.
-*/
-void CSpudMan::SendPrimaryContextCreated(TContextId aContextId, TInt aError)
-	{
-	__FLOG_2(_L("SendPrimaryContextCreated context %d error %d"), aContextId, aError);
-
-	if (!iQosEventsEnabled)
-		{
-		__FLOG_0(_L("Error: sending events is disabled - GuQoS not present ?"));
-		return;
-		}
-	// We make this assumption in various places
-	ASSERT(aContextId == 0);
-
-	TContextParameters primaryContextCreatedEvent;
-	FillInParameters(primaryContextCreatedEvent, aContextId, aError);
-	TPckg<TContextParameters> event(primaryContextCreatedEvent);
-	RaiseEvent(KPrimaryContextCreated, event);
-	}
-
-
-/**
-Sends KSecondaryContextCreated event to GUQoS.
-
-@param aContextId Context ID
-@param aError error code
-*/
-void CSpudMan::SendSecondaryContextCreated(TContextId aContextId, TInt aError)
-	{
-	__FLOG_2(_L("SendSecondaryContextCreated context %d error %d"), aContextId, aError);
-
-	if (!iQosEventsEnabled)
-		{
-		__FLOG_0(_L("Error: sending events is disabled - GuQoS not present ?"));
-		return;
-		}
-
-	// We make this assumption in various places
-	ASSERT(aContextId != 0);
-	
-	TContextParameters event;
-	FillInParameters(event, aContextId, aError);
-	TPckg<TContextParameters> eventPckg(event);
-	RaiseEvent(KSecondaryContextCreated, eventPckg);
-	}
-
-
-/**
-Sends KContextBlockedEvent event to GUQoS.
-*/
-void CSpudMan::SendContextBlockedEvent(TContextId aContextId)
-	{
-	__FLOG_2(_L("SendContextBlockedEvent context %d error %d"), aContextId, KErrNone);
-	
-	if (!iQosEventsEnabled)
-		{
-		__FLOG_0(_L("Error: sending events is disabled - GuQoS not present ?"));
-		return;
-		}
-
-	TContextParameters event;
-	FillInParameters(event, aContextId);
-	
-	/** The status we want to signal to GUQoS may be different from the context status we get from SpudFSM
-	E.g., if we are about to deactivate the context, the logical status of the context is EStatusDeactivating, rather than
-	EStatusActive, even though that's what SpudFSM will tell us */
-	if(RPacketContext::EStatusUnknown != iContextStatusOverride)
-		{
-		__FLOG_2(_L("SendContextBlockedEvent: context status overriden to %d, original: %d."), 
-			iContextStatusOverride, event.iContextInfo.iStatus);
-			
-		event.iContextInfo.iStatus = iContextStatusOverride;			
-		iContextStatusOverride = RPacketContext::EStatusUnknown; 
-		}
-	
-	TPckg<TContextParameters> eventPckg(event);
-	RaiseEvent(KContextBlockedEvent, eventPckg);
-	}
-
-/**
-Sends KContextUnblockedEvent event to GUQoS.
-*/
-void CSpudMan::SendContextUnblockedEvent(TContextId aContextId)
-	{
-	__FLOG_2(_L("SendContextUnblockedEvent context %d error %d"), aContextId, KErrNone);
-
-	if (!iQosEventsEnabled)
-		{
-		__FLOG_0(_L("Error: sending events is disabled - GuQoS not present ?"));
-		return;
-		}
-	
-	TContextParameters event;
-	FillInParameters(event, aContextId);
-	TPckg<TContextParameters> eventPckg(event);
-	RaiseEvent(KContextUnblockedEvent, eventPckg);
-	}
-
-/**
-Sends KContextQoSSetEvent event to GUQoS.
-
-@param aContextId Context ID
-@param aError error code
-*/
-void CSpudMan::SendContextQoSSetEvent(TContextId aContextId, TInt aError)
-	{
-	__FLOG_2(_L("SendContextQoSSetEvent context %d error %d"), aContextId, aError);
-
-	if (!iQosEventsEnabled)
-		{
-		__FLOG_0(_L("Error: sending events is disabled - GuQoS not present ?"));
-		return;
-		}
-	
-	TContextParameters event;
-	FillInParameters(event, aContextId, aError);
-	TPckg<TContextParameters> eventPckg(event);
-	RaiseEvent(KContextQoSSetEvent, eventPckg);
-	}
-
-/**
-Sends KContextTFTModifiedEvent event to GUQoS.
-
-@param aContextId Context ID
-#param aTFTOperationCode TFT operation code
-@param aError error code
-*/
-void CSpudMan::SendContextTFTModifiedEvent(TContextId aContextId, TTFTOperationCode aTFTOperationCode, TInt aError)
-	{
-	__FLOG_2(_L("SendContextTFTModifiedEvent context %d error %d"), aContextId, aError);
-
-	if (!iQosEventsEnabled)
-		{
-		__FLOG_0(_L("Error: sending events is disabled - GuQoS not present ?"));
-		return;
-		}
-	
-	TContextParameters event;
-	FillInParameters(event, aContextId, aError);
-	// Also need to fill in TTFTOperationCode, an undocumented requirement
-	event.iTFTOperationCode = aTFTOperationCode;
-	TPckg<TContextParameters> eventPckg(event);
-	RaiseEvent(KContextTFTModifiedEvent, eventPckg);
-	}
-
-/**
-Sends KContextModifyActiveEvent event to GUQoS.
-
-@param aContextId Context ID
-@param aContextConfig Configuration parameters for this context
-@param aError error code
-*/
-void CSpudMan::SendContextModifyActiveEvent(TContextId aContextId, TContextConfig& aContextConfig, TInt aError)
-	{
-	__FLOG_2(_L("SendContextModifyActiveEvent context %d error %d"), aContextId, aError);
-
-	if (!iQosEventsEnabled)
-		{
-		__FLOG_0(_L("Error: sending events is disabled - GuQoS not present ?"));
-		return;
-		}
-	
-	TContextParameters event;
-	FillInParameters(event, aContextId, aError);
-	event.iContextConfig = aContextConfig;
-	TPckg<TContextParameters> eventPckg(event);
-	RaiseEvent(KContextModifyActiveEvent, eventPckg);
-	}
-
-/**
-Sends KContextActivateEvent event to GUQoS.
-
-@param aContextId Context ID
-@param aContextConfig Configuration parameters for this context
-@param aError error code
-*/
-void CSpudMan::SendContextActivateEvent(TContextId aContextId, TContextConfig& aContextConfig, TInt aError)
-	{
-	__FLOG_2(_L("SendContextActivateEvent context %d error %d"), aContextId, aError);
-
-	if (!iQosEventsEnabled)
-		{
-		__FLOG_0(_L("Error: sending events is disabled - GuQoS not present ?"));
-		return;
-		}
-	
-	TContextParameters event;
-	FillInParameters(event, aContextId, aError);
-	event.iContextConfig = aContextConfig;
-	TPckg<TContextParameters> eventPckg(event);
-	RaiseEvent(KContextActivateEvent, eventPckg);
-	}
-
-/**
-Sends KContextParametersChangeEvent event to GUQoS.
-
-@param aContextId Context ID
-@param aContextConfig Configuration parameters for this context
-@param aError error code
-*/
-void CSpudMan::SendContextParametersChangeEvent(TContextId aContextId, TContextConfig& aContextConfig, TInt aError)
-	{
-	__FLOG_2(_L("SendContextParametersChangeEvent context %d error %d"), aContextId, aError);
-
-	if (!iQosEventsEnabled)
-		{
-		__FLOG_0(_L("Error: sending events is disabled - GuQoS not present ?"));
-		return;
-		}
-	
-	TContextParameters event;
-	FillInParameters(event, aContextId, aError);
-	event.iContextConfig = aContextConfig;
-	TPckg<TContextParameters> eventPckg(event);
-	RaiseEvent(KContextParametersChangeEvent, eventPckg);
-	}
-
-/**
-Sends KContextDeleteEvent event to GUQoS.
-
-@param aContextId Context ID
-*/
-void CSpudMan::SendContextDeleteEvent(TContextId aContextId)
-	{
-	__FLOG_2(_L("SendContextDeleteEvent context %d error %d"), aContextId, KErrNone);
-
-	if (!iQosEventsEnabled)
-		{
-		__FLOG_0(_L("Error: sending events is disabled - GuQoS not present ?"));
-		return;
-		}
-	
-	TContextParameters event;
-	FillInParameters(event, aContextId);
-	TPckg<TContextParameters> eventPckg(event);
-	RaiseEvent(KContextDeleteEvent, eventPckg);
-	}
-
-/**
-Sends KNetworkStatusEvent event to GUQoS.
-
-@param aEventCode Event code
-@param aStatus Network status
-*/
-void CSpudMan::SendNetworkStatusEvent(TNetworkEventCode aEventCode, RPacketService::TStatus aStatus)
-	{
-	__FLOG_2(_L("SendNetworkStatusEvent event code %d status %d"), aEventCode, aStatus);
-
-	if (!iQosEventsEnabled) // QoS events not turned on yet, or have been turned off by GUQoS
-		{
-		__FLOG_0(_L("Error: sending events is disabled - GuQoS not present ?"));
-		return;
-		}
-	
-	TNetworkParameters event;
-	event.iNetworkEventCode = aEventCode;
-	event.iNetworkStatus = aStatus;
-	TPckg<TNetworkParameters> eventPckg(event);
-	RaiseEvent(KNetworkStatusEvent, eventPckg);
-	}
-
-
-//*****************************************************************************
-// CNifIfLink methods
-//*****************************************************************************
-
-
-/**
-Return the link protocol handler object.
-
-@param aName Protocol name desired
-@return Pointer to link protocol handler (ownership is transferred)
-*/
-CNifIfBase* CSpudMan::GetBinderL(const TDesC& aName)
-	{
-    __FLOG_1(_L("CSpudMan::GetBinderL %S"), &aName);
-    iName = aName;
-	return static_cast<CNifIfBase*>(iBindMan->TransferSpudMux());
-	}
-
-/**
-Return information about the SPUD NIF.
-
-@param aInfo Receives the NIF interface info
-*/
-void CSpudMan::Info(TNifIfInfo& aInfo) const
-	{
-	CSpudBinderRef* ref = NULL;
-	// Get the binder for the first (default) lower NIF.
-	TRAPD(err, ref = iBindMan->GetAnyRefL());
-	if (err == KErrNone)
-		{
-		// Read the protocol supported value from the lower NIF
-		ref->NifLink()->Info(aInfo);
-		ASSERT(aInfo.iFlags == (KNifIfIsBase | KNifIfUsesNotify | KNifIfIsLink | KNifIfCreatedByFactory | KNifIfCreatesBinder));
-		}
-	else
-		{
-		aInfo.iProtocolSupported=KProtocolUnknown;
-		}
-	
-	aInfo.iVersion = TVersion(KSpudMajorVersionNumber, KSpudMinorVersionNumber, KSpudBuildVersionNumber);
-	aInfo.iFlags = KNifIfIsBase | 
-                   KNifIfUsesNotify | 
-                   KNifIfIsLink | 
-                   KNifIfCreatedByFactory | 
-                   KNifIfCreatesBinder;
-	aInfo.iName = KSpudName;
-	}
-
-/**
-Processes notifications from Agent
-
-@param aEvent Event type
-@param aInfo Data relating to event
-
-@return Error code
-*/
-TInt CSpudMan::Notification(TAgentToNifEventType aEvent, void * aInfo)
-	{
-	__FLOG_1(_L("CSpudMan::Notification event %d"), aEvent);
-	TInt rc = KErrNotSupported;
-	switch (aEvent)
-		{
-	case EAgentToNifEventTypeModifyInitialTimer:
-	case EAgentToNifEventTypeDisableTimers:
-	case EAgentToNifEventTypeEnableTimers:
-	case EAgentToNifEventTsyConfig:
-	case EAgentToNifEventTsyConnectionSpeed:
-		// Send notification to all lower NIFs
-		rc = KErrNotReady;
-		TContextId i;
-		for (i=0; i < KMaxPdpContexts; ++i)
-			{
-			CSpudBinderRef* ref = NULL;
-			TRAP(rc, ref = iBindMan->GetRefL(i));
-			if (rc == KErrNone)
-				{
-				rc = ref->NifLink()->Notification(aEvent, aInfo);
-				}
-			}
-		break;
-
-	case EAgentToNifEventTypeGetDataTransfer:
-		{
-		TPckg<RPacketContext::TDataVolume>* totalDataPackage = (TPckg<RPacketContext::TDataVolume>*) aInfo;
-		RPacketContext::TDataVolume& totalData = (*totalDataPackage)();
-		totalData.iBytesSent = 0;
-		totalData.iOverflowCounterSent = 0;
-		totalData.iBytesReceived = 0;
-		totalData.iOverflowCounterReceived = 0;
-
-		RPacketContext::TDataVolume data;
-		TPckg<RPacketContext::TDataVolume> dataPackage(data);
-
-		// Add up data reported by all NIFs
-		rc = KErrNotReady;
-		TContextId i;
-		for (i=0; i < KMaxPdpContexts; ++i)
-			{
-			CSpudBinderRef* ref = NULL;
-			TRAP(rc, ref = iBindMan->GetRefL(i));
-			if (rc == KErrNone)
-				{
-				rc = ref->NifLink()->Notification(aEvent, &dataPackage);
-				if (rc == KErrNone)
-					{
-					totalData.iBytesSent += data.iBytesSent;
-					totalData.iOverflowCounterSent += data.iOverflowCounterSent;
-					totalData.iBytesReceived += data.iBytesReceived;
-					totalData.iOverflowCounterReceived += data.iOverflowCounterReceived;
-					}
-				}
-			}
-		break;
-		}
-
-	case EAgentToNifEventTypeDisableConnection:
-		// TODO: what to do with this?
-	default:
-		__FLOG_1(_L("Notification event %d was ignored"), aEvent);
-		break;
-		}
-
-	return rc;
-	}
-
-
-/**
-Start the link.
-At this point only the primary PDP context is valid.
-
-@return Error code
-*/
-TInt CSpudMan::Start()
-	{
-	__FLOG_1(_L("CSpudMan::Start(0x%x)"), this);
-
-	// SpudTel needs TSY name from CommDb
-	TName tsyName;
-	ReadTsyName(tsyName);
-	
-	// Initialise SpudFsm
-	TRAPD(err, InitPdpFsmInterfaceL());
-	if (err != KErrNone)
-	  {
-	  __FLOG_1(_L("CSpudMan::Start: Failed to initialise the PDP Fsm Interface,Error = %d"),err);
-	  return err;
-     }
-
-	// Open SpudFsm
-	TRAP(err, iPdpFsmInterface.OpenL(this, tsyName));
-	if (err != KErrNone)
-	  {
-	  __FLOG_1(_L("CSpudMan::Start: Failed to open the PDP Fsm Interface,Error = %d"),err);
-	  return err;
-     }
-
-
-	// re-initialise the temporary data structure before retrieving 
-	// GPRS config parameters from CommDB
-   __FLOG_0(_L("CSpudMan::Start: Getting default GPRS settings from Commdb"));
-	RetrieveGprsConfig(iTempGprsContext);
-	
-	TRAP(err, SetupSipServerAddrRetrievalL(iTempGprsContext.iProtocolConfigOption););
-	
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-	// Add the IMCN Signalling Status flag. IM CN status flag is retrieved from the Database
-	// Request For the status of IM CN dedicated signalling context
-	TRAP(err,SetIMCNSignallingFlagPcoL(iTempGprsContext.iProtocolConfigOption));
-	
-	// Not sure what can be done after trapping the error, because its not an error condition for starting of 
-	// Primary PDP context.
-#ifdef __FLOG_ACTIVE
-	if(err != KErrNone)
-		{
-		__FLOG_1(_L("CSpudMan::Start: Failed to set IM CN signalling Flag.Error = %d"),err);
-		}
-#endif
-#endif // SYMBIAN_NETWORKING_UMTSR5
-	
-	iPdpFsmInterface.Set(iPrimaryContextId, iTempGprsContext);
-	if (err != KErrNone)
-        {
-        __FLOG_1(_L("CSpudMan::Start: Setup sip server address retrieval. Failed with %d"),err);
-        return err;
-        }
-        
-	if (iParkedDefaultQoS != NULL) 
-        {
-        __FLOG_0(_L("CSpudMan::Start: Found parked QoS settings from GuQoS"));
-        
-        TPtr8 qos(iParkedDefaultQoS->Des());
-        GuqosInput (KNifSetDefaultQoS, qos);
-        
-        delete iParkedDefaultQoS;
-        iParkedDefaultQoS = NULL;
-        }
-
-	CSpudBinderRef* ref = NULL;
-	// Get the binder for the first (default) lower NIF.
-	TRAP(err, ref = iBindMan->GetRefL(iPrimaryContextId));
-	if (err != KErrNone)
-		{
-		__FLOG_0(_L("CSpudMan::Start: Error - no context could be found"));
-		return err;
-		}
-
-    ASSERT(ref->State() == ESpudInactive || ref->State() == ESpudHaveQos);
-    ASSERT(ref->State() != ESpudWaitBinderDelete);
-    
-    if (ref->State() == ESpudWaitBinderDelete)
-    	{
-	    return KErrNotReady;
-    	}
-    
-	if (ref->State() != ESpudHaveQos)
-		{
-		__FLOG_0(_L("CSpudMan::Start: No QoS parameters have been set - is GuQoS present?"));
-	
-		// Sets default QoS parameters because either
-      //    1) they weren't supplied by GUQoS - this shouldn't happen
-      //    2) or GuQoS has been configured out
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-		// Sets default R5 QoS parameters because they weren't supplied by GUQoS.
-			RPacketQoS::TQoSR5Requested qos;
-			ReadDefaultR5QoS(qos);
-#else
-			RPacketQoS::TQoSR99_R4Requested qos;
-			ReadDefaultQoS(qos);
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 		
-			iPdpFsmInterface.Set(iPrimaryContextId, qos); // ignore any error
-		
-		}
-
-	// Set default TFT
-	TTFTInfo tft;
-    iPdpFsmInterface.Set(iPrimaryContextId, tft); // ignore any error
-    
-
-	// Have Etel create a context
-	ref->SetState(ESpudCreatingPrimary);
-	__FLOG_1(_L("CSpudMan::Start: Sending SpudFsm event ECreatePrimaryPDPContext context %d"), iPrimaryContextId);
-	TInt rc = iPdpFsmInterface.Input(iPrimaryContextId, ECreatePrimaryPDPContext);
-	// TODO: handle errors properly
-	ASSERT(rc == KErrNone);
-	rc = rc; // Eliminate compiler warning in release builds
-
-	return KErrNone;
-    }
-
-/**
-Cleanly stop the link.
-
-@param aReason The reason the link is going down
-@param aAction The action to take once the link is down
-*/
-void CSpudMan::Stop(TInt aReason, MNifIfNotify::TAction aAction)
-	{
-	__FLOG_3(_L("CSpudMan::Stop: reason %d action %d. %d contexts exist."), aReason, aAction, BindMan()->NumContexts());
-	ASSERT(BindMan()->NumContexts()); // Primary PDP context is created in the factory.
-	
-	SetTerminateError(aReason); // Store this error code for use when the SPUD goes down
-	if (AreQoSEventsEnabled())
-		{
-		// Spud was administratively stopped. It can be some time before SPUD signals LinkLayerDown.
-		// In the meanwhile, we can receive requests from GUQoS that can interfere with the shutdown.
-		// To prevent this, we tell GUQoS to stop bothering SPUD.
-		// GUQoS returns the favour by turning off the NIF events within this very call.
-		// This means we will not send KNetworkInterfaceDown again, even though we'll try.
-		// *********************************************************************************************
-		// N.B.: "DEF055691 	GUQoS crashes at shutdown": This defect results in GUQoS crash if the stack
-	    // closes flows after the NIF proxy was deleted by GUQoS, as a result of KNetworkInterfaceDown event.
-	    // As a temporary workaround, this call is disabled, and KNetworkInterfaceDown event is signalled only
-	    // from the destructor. Once this defect is fixed, the following line must be uncommented: 
-	    // SendNetworkStatusEvent(KNetworkInterfaceDown, RPacketService::EStatusUnattached);
-		//**********************************************************************************************
-		}
-		
-	
-	// Send Stop to all lower NIFs that were started but not stopped yet
-	TContextId i;
-	for (i=0; i < KMaxPdpContexts; ++i)
-		{
-		StopContext(i, aReason, aAction);
-		}		
-	// Eventually, the last lower NIF will call LinkLayerDown to trigger the final cleanup
-    }
-
-/**
-Cleanly stop a context.
-
-@param aReason The reason the link is going down
-@param aAction The action to take once the link is down
-@param aContextId context
-*/
-void CSpudMan::StopContext(TContextId aContextId, TInt aReason, MNifIfNotify::TAction aAction)
-	{
-	CSpudBinderRef* ref = NULL;
-	TRAPD(rc, ref = iBindMan->GetRefL(aContextId));
-	if (rc == KErrNone && // Binder exists
-		ref->IsBound()) // Is bound to a lower NIF.
-		{
-		
-		// Save the Context failure reason
-        if (ref->Error() == KErrNone) 
-        	{
-        	ref->SetError(aReason);
-			}
-
-		switch(ref->State()) // NIFs in some states are not eligible for Stop.
-			{
-			// Context created and NIF started.
-			case ESpudStartingPrimaryLowerNif: // Waiting for LinkLayerUp/Down
-			case ESpudStartingSecondaryLowerNif:// Waiting for LinkLayerUp/Down
-			case ESpudGettingNegQoS: // Waiting for retrieval of negotiated QoS, context activated
-			case ESpudUp: // LinkLayerUp received, NIF is up.
-			case ESpudFlowOff: // LinkLayerUp received, NIF is up.
-			case ESpudSuspended: // LinkLayerUp received, NIF is up.
-			case ESpudFlowOffAndSuspended: // LinkLayerUp received, NIF is up.
-				__FLOG_2(_L("Lower NIF binder for context[%d] is in state[%S]: Stopping lower NIF."),aContextId,SpudStateToText(ref->State()));
-				// Stop the NIF and delete the context via SpudFsm: 
-				ref->NifLink()->Stop(aReason, aAction);
-				// stay in the Up state so that that GUQoS is notified.
-				break;
-				
-			// Context is being created
-			case ESpudCreatingPrimary:
-				// SpudFsm will clean up the context and generate a context created event with an error
-				rc = iPdpFsmInterface.Input(aContextId, ECancelContextCreate);
-				break;
-				
-			// Context created, but NIF not started
-			case ESpudStartingPrimary: 
-				ref->SetState(ESpudWaitLinkDown);
-				// Any outstanding  SpudFsm request will be cancelled by this delete request.
-				rc = iPdpFsmInterface.Input(aContextId, EContextDelete);
-				aReason = (KErrNone != aReason) ? aReason : KErrCancel; // Must not be KErrNone.
-				SendPrimaryContextCreated(aContextId, aReason);
-				break;
-				
-			case ESpudStartingSecondary: 	
-				// Delete the context via SpudFsm
-				ref->SetState(ESpudLinkDown); // We'll notify GUQoS from deletion event handler.
-				__FLOG_1(_L("Context[%d] created: Sending SpudFsm event EContextDelete"), aContextId);
-					
-				// Any outstanding  SpudFsm request will be cancelled by this delete request.
-				rc = iPdpFsmInterface.Input(aContextId, EContextDelete);
-				ASSERT(rc == KErrNone);
-				break;
-				
-			// Can't call Stop: the NIF either not started, or stopped already
-			case ESpudContextDelete: // Context deleted by GUQoS, Stop was called.
-			case ESpudWaitLinkDown: // Stop was called, waiting for LinkLayerDown
-			case ESpudWaitBinderDelete: // LinkLayerDown received, queued for deletion
-			case ESpudLinkDown:	    // LinkLayerDown received, not queued for deletion.
-				__FLOG_2(_L("Lower NIF binder for context[%d] is in state[%S], and is not eligible for Stop."),aContextId,SpudStateToText(ref->State()));
-				break;
-				
-			case ESpudHaveQos:
-			default:
-				__FLOG_2(_L("Lower NIF binder for context[%d] is in unexpected state[%S]."),aContextId,SpudStateToText(ref->State()));
-				ASSERT(EFalse);
-				break;		
-			}
-		}
-	}
-
-/**
-Send a packet across the link.
-This function should not be called; the Mux is the one that should get the data.
-
-@param aPacket MBuf chain containing packet (ignored)
-@param aSource (ignored)
-
-@return Error code, or 1 if packet was queued,
-        or KErrNone to flow off sender
-*/
-TInt CSpudMan::Send(RMBufChain& /*aPacket*/, TAny* /*aSource*/)
-	{
-    _LIT(KPanicMsg, "CSpudMan");
-    User::Panic(KPanicMsg, KErrNotSupported);
-	return KErrNotSupported;	// never reached
-    }
-
-
-/**
-Receives notification from NIFMAN that the authenticate data is ready.
-*/
-void CSpudMan::AuthenticateComplete(TInt aResult)
-	{
-	// Send AuthenticateComplete to all lower NIFs
-	TContextId i;
-	for (i=0; i < KMaxPdpContexts; ++i)
-		{
-		CSpudBinderRef* ref = NULL;
-		TRAPD(rc, ref = iBindMan->GetRefL(i));
-		if (rc == KErrNone)
-			{
-			ref->NifLink()->AuthenticateComplete(aResult);
-			}
-		}
-	}
-
-void CSpudMan::Restart(CNifIfBase* /*aIf*/)
-	{
-	// TODO: Is it safe to simply ignore this?
-	__FLOG_0(_L("CSpudMan::Restart. Ignored."));
-    ASSERT(EFalse);
-	}
-
-
-//*****************************************************************************
-// SPUD methods
-//*****************************************************************************
-
-/**
-Receives progress notifications from lower NIF.
-
-@param aContextId Context ID of lower NIF
-@param aStage Progress stage
-@param aError Error code
-*/
-void CSpudMan::IfProgress(TContextId aContextId, TInt aStage, TInt aError)
-	{
-	__FLOG_3(_L("CSpudMan::IfProgress context ID %d received stage %d error %d"),
-			 aContextId, aStage, aError);
- 	// Eliminate compiler warnings in release builds
-	aContextId = aContextId;
-	aStage = aStage;
-	aError = aError;
-	
-    // Drop all progress indications from lower NIFs on the floor because they'll just confuse NIFMAN.
-    // SpudMan generates its own progress notifications.
-    }
-
-/**
-Receives progress notifications from lower NIF.
-
-@param aContextId Context ID of lower NIF
-@param aSubConnectionUniqueId Subconnection ID
-@param aStage Progress stage
-@param aError Error code
-*/
-void CSpudMan::IfProgress(TContextId aContextId, TSubConnectionUniqueId aSubConnectionUniqueId, TInt aStage, TInt aError)
-	{
-	__FLOG_4(_L("CSpudMan::IfProgress context ID %d subconnection ID %d received stage %d error %d"),
-			 aContextId, aSubConnectionUniqueId, aStage, aError);
- 	// Eliminate compiler warnings in release builds
-	aContextId = aContextId;
-	aSubConnectionUniqueId = aSubConnectionUniqueId;
-	aStage = aStage;
-	aError = aError;
-
-    // Drop all progress indications from lower NIFs on the floor because they'll just confuse NIFMAN.
-    // SpudMan generates its own progress notifications.
-    }
-
-/**
-Receives notifications from lower NIF to agent.
-
-@param aContextId Valid context ID of lower NIF
-@param aEvent Event type
-@param aInfo Additional information for event (ignored)
-@return KErrNone on success, or KErrNotSupported
-*/
-TInt CSpudMan::Notification(TContextId aContextId, TNifToAgentEventType aEvent, void* /*aInfo*/)
-	{
-	__FLOG_2(_L("CSpudMan::Notification context ID %d event ID %d"), aContextId, aEvent);
-	switch (aEvent)
-		{
-	case ENifToAgentEventTsyConfig:
-		{
-		// Return GPRS context structure to lower NIF
-		CSpudBinderRef* ref = NULL;
-		TRAPD(rc, ref = iBindMan->GetRefL(aContextId));
-		__ASSERT_ALWAYS(rc == KErrNone, Panic());
-		ASSERT(ref->IsBound());
-
-	    iPdpFsmInterface.Get(aContextId, iTempGprsContext);
-        ref->NifLink()->Notification(EAgentToNifEventTsyConfig, reinterpret_cast<void*>(&iTempGprsContext));
-	    return KErrNone;
-		}
-
-	case ENifToAgentEventTsyConnectionSpeed:
-		{
-		// Return connection speed to lower NIF
-		CSpudBinderRef* ref = NULL;
-		TRAPD(rc, ref = iBindMan->GetRefL(aContextId));
-		__ASSERT_ALWAYS(rc == KErrNone, Panic());
-		ASSERT(ref->IsBound());
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-		RPacketQoS::TQoSR5Negotiated params;
-#else
-		RPacketQoS::TQoSR99_R4Negotiated params;
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 
-
-		iPdpFsmInterface.Get(aContextId, params);
-		ref->NifLink()->Notification(EAgentToNifEventTsyConnectionSpeed,
-	    						 reinterpret_cast<void*>(static_cast<TUint>(params.iMaxRate.iUplinkRate)));
-
-	    return KErrNone;
-		}
-
-	default:
-		// Just ignore all the other notifications
-		__FLOG_0(_L("Ignoring notification"));
-		break;
-		}
-
-	return KErrNotSupported;
-	}
-
-/**
-Read a boolean field from the connection settings provider.
-Intercepts reads of CommPort and returns the correct value.
-
-@param aContextId Valid context ID of lower NIF
-@param aField The name of the field to read
-@param aValue On return, contains the value of the field read
-@return KErrNone, if successful; otherwise one of the standard Symbian OS error codes
-*/
-TInt CSpudMan::ReadInt(TContextId aContextId, const TDesC& aField, TUint32& aValue)
-	{
-	
-	//This fix is needed to ensure that multiple PPP channels can be used for different PDP contexts. 
-	//The returned value of ECommDbCdmaNaiMobileIp will cause PPP to skip external IP configuration (NCPIP).
-	if ( (TPtrC(CDMA_NAI_TYPE) == aField) && (iPrimaryContextId != aContextId) )
-		{
-		__FLOG_2(_L("CSpudMan::ReadInt context ID %d field  = CDMA_NAI_TYPE - Therefore explicitly setting Value to ECommDbCdmaNaiMobileIp"),
-			aContextId, &aField);
-		__FLOG(_L("No call to AgentRef Will be make"));
-		// Lower NIF is requesting the NAI type
-		aValue = ECommDbCdmaNaiMobileIp;
-		return KErrNone;
-		}
-	__FLOG_2(_L("CSpudMan::ReadInt context ID %d field %S"), aContextId, &aField);
-	// Read CommDB normally
-	return Notify()->ReadInt(aField, aValue);
-	}
-
-/**
-Read a 8-bit descriptor field from the connection settings provider.
-Intercepts reads of CommPort and returns the value returned from ETel.
-
-@param aContextId Valid context ID of lower NIF
-@param aField The name of the field to read
-@param aValue On return, contains the value of the field read
-@return KErrNone, if successful; otherwise one of the standard Symbian OS error codes
-*/
-TInt CSpudMan::ReadDes(TContextId aContextId, const TDesC& aField, TDes8& aValue)
-	{
-	__FLOG_2(_L("CSpudMan::ReadDes context ID %d field %S"), aContextId, &aField);
-	TBuf<2*KCommsDbSvrMaxColumnNameLength+1> columnName;
-	_LIT(KFormatText,"%s\\%s");
-
-	columnName.Format(KFormatText,MODEM_BEARER,MODEM_PORT_NAME);
-	if (columnName == aField)
-		{
-		// Lower NIF is requesting the CSY port name
-		// Use the TDes16 version of ReadDes to retrieve the data
-		TBuf16<KCommsDbSvrMaxFieldLength> data;
-		TInt rc(ReadDes(aContextId, aField, data));
-		aValue.Copy(data);
-		return rc;
-		}
-
-	columnName.Format(KFormatText,MODEM_BEARER,MODEM_CSY_NAME);
-	if (columnName == aField)
-		{
-		// Lower NIF is requesting the CSY file name
-		// Use the TDes16 version of ReadDes to retrieve the data
-		TBuf16<KCommsDbSvrMaxFieldLength> data;
-		TInt rc(ReadDes(aContextId, aField, data));
-		aValue.Copy(data);
-		return rc;
-		}
-
-	// Read CommDB normally
-	return Notify()->ReadDes(aField, aValue);
-	}
-
-/**
-Read a 16-bit descriptor field from the connection settings provider.
-Intercepts reads of CommPort and returns the value returned from ETel.
-
-@param aContextId Valid context ID of lower NIF
-@param aField The name of the field to read
-@param aValue On return, contains the value of the field read
-@return KErrNone, if successful; otherwise one of the standard Symbian OS error codes
-*/
-TInt CSpudMan::ReadDes(TContextId aContextId, const TDesC& aField, TDes16& aValue)
-    {
-	__FLOG_2(_L("CSpudMan::ReadDes context ID %d field %S"), aContextId, &aField);
-	TBuf<2*KCommsDbSvrMaxColumnNameLength+1> columnName;
-	_LIT(KFormatText,"%s\\%s");
-
-	columnName.Format(KFormatText,MODEM_BEARER,MODEM_PORT_NAME);
-	if (columnName == aField)
-		{
-		// Lower NIF is requesting the CSY port name
-	    iPdpFsmInterface.Get(aContextId, iTempDataChannelV2);
-		__FLOG_1(_L("Returning ETel port name %S"), &iTempDataChannelV2.iPort);
-		aValue.Copy(iTempDataChannelV2.iPort);
-		return KErrNone;
-		}
-
-	columnName.Format(KFormatText,MODEM_BEARER,MODEM_CSY_NAME);
-	if (columnName == aField)
-		{
-		// Lower NIF is requesting the CSY file name
-	    iPdpFsmInterface.Get(aContextId, iTempDataChannelV2);
-		__FLOG_1(_L("Returning ETel CSY name %S"), &iTempDataChannelV2.iCsy);
-		aValue.Copy(iTempDataChannelV2.iCsy);
-		return KErrNone;
-		}
-
-	return Notify()->ReadDes(aField, aValue);
-    }
-
-/**
-Marks the binder to the lower NIF for asynchronous deletion 
-
-@param aRef the binder
-@pre the binder must be bound the lower NIF.
-*/
-void CSpudMan::DisposeOfBinder(CSpudBinderRef* aRef)
-	{
-	ASSERT(aRef);
-	ASSERT(aRef->IsBound()); // We can only mark - sweep bound instances
-	ASSERT(aRef->State() != ESpudWaitBinderDelete);
-	aRef->SetState(ESpudWaitBinderDelete);
-	iBinderSweeperNotifierCb->Call(); // Queue deletion of marked binders & optional Nifman notification.
-	}
-
-/**
-Sweeps the set of lower NIF binding, deleting the marked ones. If no contexts remain after,
-notifies Nifman that SPUD has gone down.
-
-@param aContextId The ID of the context to delete
-@param aReason error code that is passed to Nifman
-*/
-void CSpudMan::SweepBindersAndNotify()
-	{
-	const TUint KNumContextsRemaining(BindMan()->SweepBinders());
-	if (0 == KNumContextsRemaining)
-		{
-		SetTerminateError(KErrAbort); // This is a last ditched effort to provide termination
-		// error code. We cannot determine in all cases what has caused SPUD to terminate.
-		// E.g. if several secondary contexts were deleted by the network, which  of them caused SPUD termination?
-		// In such case we say that SPUD is shutting down due to internal event (namely, last context deletion).
-		
-		__FLOG_3(_L("Last lower NIF has been deleted: Notifying Nifman with action EDisconnect[%d], progress KLinkLayerClosed[%d], reason[%d]"),	
-		MNifIfNotify::EDisconnect, KLinkLayerClosed, iTerminateError);
-		
-		// Once we've notified LinkLayerDown & IfProgress, we are finished. Nifman will delete us any moment after
-		// the RunL we are working from returns.
-		__FLOG(_L("SPUD is finished, and expects to be deleted by Nifman. Reason: last PDP context has gone down, possibly due to Stop on SPUD."));
-
-		// Tell Nifman clients that SPUD is finished.
-		Notify()->LinkLayerDown(iTerminateError, MNifIfNotify::EDisconnect); 
-		Notify()->IfProgress(KLinkLayerClosed, iTerminateError);
-		}
-	else
-		{
-		__FLOG_1(_L("There are [%d] contexts remaining."), KNumContextsRemaining);
-		}
-	}
-
-void CSpudMan::SetupSipServerAddrRetrievalL(RPacketContext::TProtocolConfigOptionV2& aPco)
-	{
-	__FLOG(_L("CSpudMan::SetupSipServerAddrRetrieval - Requesting the P-CSCF address from the PCO buffer"));
-	
-	TPtr8 pcoPtr(const_cast<TUint8*>(aPco.iMiscBuffer.Ptr()),aPco.iMiscBuffer.Length(),aPco.iMiscBuffer.MaxLength());
-	
-	// attach TTlv to the buffer
-	TTlvStruct<RPacketContext::TPcoId,RPacketContext::TPcoItemDataLength> tlv(pcoPtr,0);
-	tlv.AppendItemL(RPacketContext::TPcoId(RPacketContext::EEtelPcktPCSCFAddressRequest), 
-		TPtr8(static_cast<TUint8*>(NULL), 0, 0));
-	aPco.iMiscBuffer.SetLength(pcoPtr.Length());
-	}
-	
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-	
-void CSpudMan::SetIMCNSignallingFlagPcoL(RPacketContext::TProtocolConfigOptionV2& aPco)
-/**
-Put the value for IMCN Signalling flag in the pco buffer if it is set in database
-
-@param PCO IE Buffer
-*/
-	{
-	TBool imcn=EFalse;
-	TBuf<2*KCommsDbSvrMaxColumnNameLength+2> columnName;
-    _LIT(KFormatText,"%s\\%s");
-    columnName.Format(KFormatText,QOS_UMTS_R99_AND_ON_TABLE,GPRS_QOS_IM_CN_SIGNALLING_INDICATOR);
-    TRAPD(ret, Notify()->ReadBool(columnName,imcn););
-	__FLOG_1(_L("CSpudMan::SetIMCNSignallingFlagPcoL - Requesting IMCN Signalling status from Database: error = %d"),ret);
-
-	 if (imcn && ret==KErrNone )
-
-	 {
-	  TPtr8 pcoPtr(const_cast<TUint8*>(aPco.iMiscBuffer.Ptr()),aPco.iMiscBuffer.Length(),aPco.iMiscBuffer.MaxLength());
-	  TTlvStruct<RPacketContext::TPcoId,RPacketContext::TPcoItemDataLength> tlv(pcoPtr,0);
-	  tlv.AppendItemL(RPacketContext::TPcoId(RPacketContext::EEtelPcktIMCNMSSubsystemSignallingFlag ), 
-	  TPtr8(static_cast<TUint8*>(NULL), 0, 0));
-	  aPco.iMiscBuffer.SetLength(pcoPtr.Length());
-	 }
-	}
-TBool CSpudMan::GetIMCNSignallingFlagPcoL(RPacketContext::TProtocolConfigOptionV2& aPco)
-/**
-Get the value for IMCN Signalling from the network pco buffer
-
-@param PCO IE Buffer
-*/
-	{
-	
-	__FLOG(_L("CSpudMan::GetIMCNSignallingFlagPcoL - Retrieving the IMCN signalling Flag from the PCO buffer"));
-	
-	TPtr8 pcoPtr(const_cast<TUint8*>(aPco.iMiscBuffer.Ptr()),aPco.iMiscBuffer.Length(),aPco.iMiscBuffer.MaxLength());
-	TTlvStruct<RPacketContext::TPcoId,RPacketContext::TPcoItemDataLength> tlv(pcoPtr,0);
-	tlv.ResetCursorPos();
-
-	TInt err = tlv.NextItemL(RPacketContext::EEtelPcktIMCNNetworkSubsystemSignallingFlag,pcoPtr);
-	return (err == KErrNone);
-	
-	}
-
-#endif // SYMBIAN_NETWORKING_UMTSR5
-	
-	
-void CSpudMan::SetSipServerAddrL(const RPacketContext::TProtocolConfigOptionV2& aPco)
-	{
-	__FLOG(_L("CSpudMan::SetSipServerAddr - Retrieving the P-CSCF address from the PCO buffer"));
-	iSipServerAddr.Reset(); //Free all existing entries
-	TPtr8 pcoPtr(const_cast<TUint8*>(aPco.iMiscBuffer.Ptr()),aPco.iMiscBuffer.Length(),aPco.iMiscBuffer.MaxLength());
-	TTlvStruct<RPacketContext::TPcoId,RPacketContext::TPcoItemDataLength> 
-		tlv(pcoPtr,0);
-		
-	tlv.ResetCursorPos();
-	TIp6Addr addr;
-	TPtr8 addrPtr(NULL, 0);
-	TPckg<TIp6Addr> addrPckg(addr);
-		
-	while (tlv.NextItemL(RPacketContext::EEtelPcktPCSCFAddress,addrPtr) == KErrNone)
-		{
-		TInetAddr inetAddr;
-		addrPckg.Copy(addrPtr);
-		inetAddr.SetAddress(addr);
-		TBuf<KMaxInetAddrPrintSize> testbuf;
-		inetAddr.Output(testbuf);
-		__FLOG_1(_L("CSpudMan::SetSipServerAddr - P-CSCF address ---> %S"),&testbuf);
-		if (testbuf.Length()) //ie the address is invalid
-			{
-			iSipServerAddr.AppendL(inetAddr);
-			}
-		}
-	}
-	
-void CSpudMan::SetContextTerminationErrorAndStop(TContextId aContextId, TInt aErrorCode)
-	{
-	__FLOG_2(_L("SetContextTerminateError on StatusEvent: aContextId[%d], aErrorCode[%d]"),	
-		aContextId, aErrorCode);
-	
-	// If there is no error then simply return
-	if (KErrNone == aErrorCode) return;
-	
-    // If secondary context, store error code in individual contexts reference
-    // and stop the secondary context
-    if(aContextId != iPrimaryContextId)
-        {
-			StopContext(aContextId, aErrorCode, MNifIfNotify::EDisconnect);
-        }
-    else
-        {
-        // This is a problem with the Primary context so stop and disconnect
-        // Now save the termination error code if not already set
-   		if (iTerminateError == KErrNone)
-			{
-			iTerminateError = aErrorCode;
-			}
-
-		// This may be the first ETel error code so save it
-		if (iETelTerminateError == KErrNone)
-			{
-			iETelTerminateError = aErrorCode;
-			}
-
-        // Primary context has a problem so disconnect
-        Stop(aErrorCode, MNifIfNotify::EDisconnect);
-        }
-	}
-		
-//*************************************************************************
-// CLowerNifBinderDeletionCb
-// Asynchronous deletion of CSpudBinderRefs and notification to Nifman
-//*************************************************************************
-// Use Spudman's logging.
-// Because we are owned by Spudman, we don't have to worry about the logger being deleted.
-#ifdef __FLOG_ACTIVE
-#define BINDER_SWEEPER_LOG(x) iSpudMan.x
-#else
-#define BINDER_SWEEPER_LOG(x)
-#endif
-
-// Construct a High-Priority AO that calls into the SPUD
-// This will work with any priority AO, but because we are releasing memory and 
-// potentially notifying Nifman, we want to run ASAP.
-CBinderSweeperNotifierCb::CBinderSweeperNotifierCb(CSpudMan& aSpudMan)
-	:
-	CAsyncOneShot(CActive::EPriorityHigh), 
-	iSpudMan(aSpudMan)
-	{
-	}
-
-// Queues the deletion callback 
-void CBinderSweeperNotifierCb::Call()
-	{
-	if(!IsActive()) // We can be called again before we had a chance to run.
-		{
-		BINDER_SWEEPER_LOG(__FLOG(_L("CBinderSweeperNotifierCb: Queueing async deletion of dead lower NIF bindings."));)
-		CAsyncOneShot::Call();
-		return;
-		}
-	BINDER_SWEEPER_LOG(__FLOG(_L("CBinderSweeperNotifierCb: Async deletion of dead lower NIF bindings is already queued."));)
-	}
-
-
-// Called by ActiveScheduler.
-//
-// If the lower NIF deletion is attempted after Nifman deletes the SPUD 
-// (from CNifAgentRef::DisconnectionComplete), the lower NIF deletion AO is corrupted in the 
-// ActiveScheduler, causing ESock thread to crash. To prevent this, lower NIFs are deleted 
-// before signalling LinkLayerDown to Nifman. When a lower NIF signals LinkLayerDown, a callback into Spudman is queued.
-// This callback deletes the lower NIFs that are eligible for deletion, and notifies Nifman, if necessary.	*/	
-void CBinderSweeperNotifierCb::RunL()
-	{
-	iSpudMan.SweepBindersAndNotify();
-	}
-	
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/spudman/src/spudnotify.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,316 +0,0 @@
-// Copyright (c) 2004-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:
-// NIFMAN notification proxy class
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#include "spudnotify.h"
-#include "bindman.h"
-
-CSpudNotify::CSpudNotify(CBindMan& aBindMan, MNifIfNotify* aNotify, TContextId aContextId)
-    : iBindMan(aBindMan), iNotify(aNotify), iContextId(aContextId)
-    {
-    }
-
-
-CSpudNotify::~CSpudNotify()
-    {
-    }
-
-/**
- * Notification from the nif that the link layer has gone down.
- * @param aReason A Symbian OS error code indicating the reason for the link closing down
- * @param aAction The action that should be taken as a result of link layer down being signalled
- */
-void CSpudNotify::LinkLayerDown(TInt aReason, TAction aAction)
-    {
-	iBindMan.SpudMan()->LinkLayerDown(iContextId, aReason, aAction);
-    }
-
-/**
- * Notification from the nif that the link layer is up
- */
-void CSpudNotify::LinkLayerUp()
-    {
-	iBindMan.SpudMan()->LinkLayerUp(iContextId);
-    }
-
-/**
- * Indicate that link negotiation failed on this nif to allow nifman to take appropriate action
- * @param aIf The address of the CNifIfBase/Link object for which negotiation failed
- * @param aReason An error code denoting the reason for failure
- */
-void CSpudNotify::NegotiationFailed(CNifIfBase* aIf, TInt aReason)
-    {
-    iNotify->NegotiationFailed(aIf, aReason);
-    }
-
-/**
- * Request to the agent to return the data required for authentication
- * @param aUsername On return, contains the username to be used for authentication
- * @param aPassword On return, contains the password to be used for authentication
- * @note The return values in aUsername and aPassword should not be considered valid until CNifIfLink::AuthenticateComplete() has been called
- */
-TInt CSpudNotify::Authenticate(TDes& aUsername, TDes& aPassword)
-    {
-    return iNotify->Authenticate(aUsername, aPassword);
-    }
-
-/**
- * Request to the agent to cancel a pending authentication
- */
-void CSpudNotify::CancelAuthenticate()
-    {
-    iNotify->CancelAuthenticate();
-    }
-
-/**
- * Fetch any excess data from the agent that it received during connection setup
- * @param aBuffer On return, the buffer contains the excess data from the agent
- * @return KErrNone, if successful; otherwise, one of the standard Symbian OS error codes
- */
-TInt CSpudNotify::GetExcessData(TDes8& aBuffer)
-    {
-    return iNotify->GetExcessData(aBuffer);
-    }
-
-
-/**
- * Upcall from the nif indicating that a new progress state has been reached on this connection
- * @pre The stage value is within the range assigned to nifs i.e. KMinNifProgress <= aStage <= KMaxNifProgress
- * @param aStage The progress stage that has been reached
- * @param aError Any errors that have occurred
- */
-void CSpudNotify::IfProgress(TInt aStage, TInt aError)
-    {
-	iBindMan.SpudMan()->IfProgress(iContextId, aStage, aError);
-    }
-
-/**
- * Upcall from the nif indicating that a new progress state has been reached on this subconnection
- * @pre The stage value is within the range assigned to nifs i.e. KMinNifProgress <= aStage <= KMaxNifProgress
- * @param aSubConnectionUniqueId The subconnection to which this notification refers
- * @param aStage The progress stage that has been reached
- * @param aError Any errors that have occurred
- */
-void CSpudNotify::IfProgress(TSubConnectionUniqueId aSubConnectionUniqueId, TInt aStage, TInt aError)
-    {
-	iBindMan.SpudMan()->IfProgress(iContextId, aSubConnectionUniqueId, aStage, aError);
-    }
-
-/**
- * Increment the count of users of this nif
- */
-void CSpudNotify::OpenRoute()
-    {
-    // TODO: check that this reference counting is correct
-    iNotify->OpenRoute();
-    }
-
-/**
- * Decrement the count of users of this nif
- */
-void CSpudNotify::CloseRoute()
-    {
-    // TODO: check that this reference counting is correct
-    iNotify->CloseRoute();
-    }
-
-/**
- * Notification of an event from the nif
- * @param aEvent The type of event that occurred
- * @param aInfo Any data associated with the event
- * @return KErrNone if successful, otherwise one of the system-wide error codes
- */
-TInt CSpudNotify::Notification(TNifToAgentEventType aEvent, void * aInfo)
-    {
-	return iBindMan.SpudMan()->Notification(iContextId, aEvent, aInfo);
-    }
-
-/**
- * Notification from the nif that a binder layer has gone down
- * @param aBinderIf An identifier for the binder layer that went down
- * @param aReason The reason for the binder layer failure
- * @param aAction The action to be taken as a result, eg. disconnect, reconnect
- */
-void CSpudNotify::BinderLayerDown(CNifIfBase* aBinderIf, TInt aReason, TAction aAction)
-    {
-    iNotify->BinderLayerDown(aBinderIf, aReason, aAction);
-    }
-
-/**
- * Indication from network layer that a packet has been transmitted or received
- *
- * @param aDirection Whether the packet was transmitted or received
- * @param aBytes The size of the packet
- * @param aResetTimer Whether the idle timer should be reset
- * @return KErrNone if successful, otherwise one of the system-wide error codes
- */
-TInt CSpudNotify::PacketActivity(TDataTransferDirection aDirection, TUint aBytes, TBool aResetTimer)
-    {
-    return iNotify->PacketActivity(aDirection, aBytes, aResetTimer);
-    }
-
-/**
- * Indication that the sent bytes threshold for a subconnection has been met or exceeded in the nif
- *
- * @param aSubConnectionUniqueId The subconnection to which this notification refers
- * @param aUplinkVolume The total number of bytes sent by this subconnection
- */
-void CSpudNotify::NotifyDataSent(TSubConnectionUniqueId aSubConnectionUniqueId, TUint aUplinkVolume)
-    {
-    iNotify->NotifyDataSent(aSubConnectionUniqueId, aUplinkVolume);
-    }
-
-/**
- * Indication that the received bytes threshold for a subconnection has been met or exceeded in the nif
- *
- * @param aSubConnectionUniqueId The subconnection to which this notification refers
- * @param aDownlinkVolume The total number of bytes sent by this subconnection
- */
-void CSpudNotify::NotifyDataReceived(TSubConnectionUniqueId aSubConnectionUniqueId, TUint aDownlinkVolume)
-    {
-    iNotify->NotifyDataReceived(aSubConnectionUniqueId, aDownlinkVolume);
-    }
-
-/**
- * Indication that some parameter relating to a subconnection has changed in the nif eg. subconnection closed, opened, QoS changed
- *
- * @param aEventType The type of event which has occurred - used to direct the event notification to the appropriate component(s)
- * @param aEvent The event which has occurred
- * @param aEventData Any arguments or additional data to do with the event; the interpretation of this depends on the event
- * @param aSource An appropriate identifier of the source of the event - this will be used when one receiver is receiving events from many producers
- */
-void CSpudNotify::NifEvent(TNetworkAdaptorEventType aEventType, TUint aEvent, const TDesC8& aEventData, TAny* aSource)
-    {
-    iNotify->NifEvent(aEventType, aEvent, aEventData, aSource);
-    }
-
-
-
-
-/**
- * Read an integer field from the connection settings provider
- * @param aField The name of the field to read
- * @param aValue On return, contains the value of the field read
- * @param aMessage for capability checking
- * @return KErrNone, if successful; otherwise one of the standard Symbian OS error codes
- */
-TInt CSpudNotify::DoReadInt(const TDesC& aField, TUint32& aValue,const RMessagePtr2* aMessage)
-    {
-	//Spudman does eventually call iNotify->ReadInt but it does some necessary translations for some special cases therefore we
-	//need to defer to Spudman and cannot call iNotify->ReadInt ourselves
-    // The lower NIF will never have any capabilities to give us
-	__ASSERT_ALWAYS(aMessage == NULL, iBindMan.SpudMan()->Panic());
-	return iBindMan.SpudMan()->ReadInt(iContextId, aField, aValue);
-    }
-
-/**
- * Write an integer field to the connection settings provider
- * @param aField The name of the field to which to write
- * @param aValue The value to be written to the field
- * @param aMessage for capability checking
- * @return KErrNone, if successful; otherwise one of the standard Symbian OS error codes
- */
-TInt CSpudNotify::DoWriteInt(const TDesC& aField, TUint32 aValue,const RMessagePtr2* aMessage)
-    {
-    return iNotify->WriteInt(aField, aValue, aMessage);
-    }
-
-/**
- * Read a 8-bit descriptor field from the connection settings provider
- * @param aField The name of the field to read
- * @param aValue On return, contains the value of the field read
- * @param aMessage for capability checking
- * @return KErrNone, if successful; otherwise one of the standard Symbian OS error codes
- */
-TInt CSpudNotify::DoReadDes(const TDesC& aField, TDes8& aValue,const RMessagePtr2* aMessage)
-    {
-	//Spudman does eventually call iNotify->ReadDes but it does some necessary translations for some special cases therefore we
-	//need to defer to Spudman and cannot call iNotify->ReadDes ourselves
-    // The lower NIF will never have any capabilities to give us
-	__ASSERT_ALWAYS(aMessage == NULL, iBindMan.SpudMan()->Panic());
-	return iBindMan.SpudMan()->ReadDes(iContextId, aField, aValue);
-    }
-
-/**
- * Read a 16-bit descriptor field from the connection settings provider
- * @param aField The name of the field to read
- * @param aValue On return, contains the value of the field read
- * @param aMessage for capability checking
- * @return KErrNone, if successful; otherwise one of the standard Symbian OS error codes
- */
-TInt CSpudNotify::DoReadDes(const TDesC& aField, TDes16& aValue,const RMessagePtr2* aMessage)
-    {
-	//Spudman does eventually call iNotify->ReadDes but it does some necessary translations for some special cases therefore we
-	//need to defer to Spudman and cannot call iNotify->ReadDes ourselves
-    // The lower NIF will never have any capabilities to give us
-	__ASSERT_ALWAYS(aMessage == NULL, iBindMan.SpudMan()->Panic());
-	return iBindMan.SpudMan()->ReadDes(iContextId, aField, aValue);
-    }
-
-/**
- * Write an 8-bit descriptor field to the connection settings provider
- * @param aField The name of the field to which to write
- * @param aValue The value to be written to the field
- * @param aMessage for capability checking
- * @return KErrNone, if successful; otherwise one of the standard Symbian OS error codes
- */
-TInt CSpudNotify::DoWriteDes(const TDesC& aField, const TDesC8& aValue,const RMessagePtr2* aMessage)
-    {
-    return iNotify->WriteDes(aField, aValue, aMessage);
-    }
-
-/**
- * Write an 16-bit descriptor field to the connection settings provider
- * @param aField The name of the field to which to write
- * @param aValue The value to be written to the field
- * @param aMessage for capability checking
- * @return KErrNone, if successful; otherwise one of the standard Symbian OS error codes
- */
-TInt CSpudNotify::DoWriteDes(const TDesC& aField, const TDesC16& aValue,const RMessagePtr2* aMessage)
-    {
-    return iNotify->WriteDes(aField, aValue, aMessage);
-    }
-
-/**
- * Read an boolean field from the connection settings provider
- * @param aField The name of the field to read
- * @param aValue On return, contains the value of the field read
- * @param aMessage for capability checking
- * @return KErrNone, if successful; otherwise one of the standard Symbian OS error codes
- */
-TInt CSpudNotify::DoReadBool(const TDesC& aField, TBool& aValue,const RMessagePtr2* aMessage)
-    {
-    return iNotify->ReadBool(aField, aValue, aMessage);
-    }
-
-/**
- * Write an boolean field to the connection settings provider
- * @param aField The name of the field to which to write
- * @param aValue The value to be written to the field
- * @param aMessage for capability checking
- * @return KErrNone, if successful; otherwise one of the standard Symbian OS error codes
- */
-TInt CSpudNotify::DoWriteBool(const TDesC& aField, TBool aValue,const RMessagePtr2* aMessage)
-    {
-    return iNotify->WriteBool(aField, aValue, aMessage);
-    }
-
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/bmarm/TE_SPUDNETWORKSIDEU.DEF	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	NewServer__Fv @ 1 NONAME R3UNUSED ; NewServer(void)
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/bwins/TE_SPUDNETWORKSIDEU.DEF	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?NewServer@@YAHXZ @ 1 NONAME ; int NewServer(void)
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/TE_PppSize_config.txt	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-[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,,, 0, 2, 0, 0,RasUser,pass,,,,,0
-
-# 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, 1
-
-# 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
-
-#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
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3,0,0
-
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= ECUART, COMM::0, 18, 0, PRIMARY1
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/TE_PppSize_spud.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-// Parameters configuration for Tpppsize.EXE test
-
-// Comms driver to load at startup
-
-[CommsDrivers]
-WinsPDDname = ECDRV
-WinsLDDname = ECOMM
-WinsLDDFname = ECOMM
-ThumbPDDname = EUART1
-ThumbLDDname = ECOMM
-ThumbLDDFname = FCOMM
-
-
-// Ip Address of the echo server machine
-// Note: this machine must be up and running and listening on the echo port
-// This can be checked on NT4 by typing  NETSTAT -a
-
-[AddressInfo]
-TestPPPIPAddr = 192.168.30.13
-
-[MMUInfo]
-TestPPPminMMU = 1
-TestPPPmaxMMU = 1500
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/TE_PppSize_spud.xml	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,354 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-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:
- CommDB Settings File
- 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">
-
-<NetworkTable>
-    <Network operation="add">
-        <Name>NT RAS</Name>
-    </Network>
-</NetworkTable>
-
-<IAPTable>
-    <IAP operation="add">
-        <Name>Actual NT RAS</Name>
-        <IAPService>OutgoingGPRS.NT RAS</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.NT RAS</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-</IAPTable>
-
-<ModemBearerTable>
-    <ModemBearer operation="template">
-        <Name>Default Modem</Name>
-        <Agent>NULLAGT</Agent>
-        <BCAStack>C32Bca</BCAStack>
-        <TSYName>SIM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <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>AFTERDIALUNTILANSWER</SpeakerPref>
-        <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>
-        <LastSocketActivityTimeout>32</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>8</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>16</LastSocketClosedTimeout>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    
-    <ModemBearer operation="add">
-        <Name>Null Modem 115200bps</Name>
-        <BCAStack>C32Bca</BCAStack> <!-- This may be overwriten by some tests -->
-        <IfName>SPUD</IfName>        
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>4</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>
-        <MinimumSignalLevel>0</MinimumSignalLevel>
-        <LastSocketActivityTimeout>15</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>5</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
-    </ModemBearer>
-</ModemBearerTable>
-
-<LANBearerTable>
-</LANBearerTable>
-
-<DialInISPTable>
-</DialInISPTable>
-
-<DialOutISPTable>
-</DialOutISPTable>
-
-<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.Actual NT RAS</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.Office</LocationForDataAndFax>
-        <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
-        <GPRSClassCBearer>GSM</GPRSClassCBearer>
-        <DefaultNetwork>Network.NT RAS</DefaultNetwork>
-        <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
-    </GlobalSettings>
-</GlobalSettingsTable>
-
-<IncomingGPRSTable>
-</IncomingGPRSTable>
-
-<OutgoingGPRSTable>
-    <OutgoingGPRS operation="template">
-        <Name>Default Dial Out ISP</Name>
-        <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>
-        <IfAuthPass>pass</IfAuthPass>
-        <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.R99Default1</UmtsR99QoSAndOnRef>         
-    </OutgoingGPRS>
-    
-    <OutgoingGPRS operation="add">
-        <Name>NT RAS</Name>
-      	<PDPType>IPV4</PDPType>
-        <IfParams>lowernif=PPP</IfParams>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>  
-        <IfAuthPass>pass</IfAuthPass>
-    </OutgoingGPRS>
-</OutgoingGPRSTable>
-
-<DefaultGPRSTable>
-</DefaultGPRSTable>
-
-<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>
-</LocationTable>
-
-<SecureSocketTable>
-</SecureSocketTable>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-</VpnServiceTable>
-
-<UmtsR99QoSAndOnTable>
-    <UmtsR99QoSAndOn operation="add">
-        <Name>R99Default1</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> 
-    </UmtsR99QoSAndOn>
-</UmtsR99QoSAndOnTable>
-</CommDB:Config>
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/TE_SpudNetworkSideLoopbackCSY.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-# Defining a loopback between port A and B is as follows:
-# Port = <PortA>,<PortB>,<delay>,<queue size>,<element (packet) size>
-
-[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
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/TE_SpudNetworkSideLoopbackCSY_serial.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-# Loopback CSY ports are configured to be in serial mode (because of SerialLoopbackPort=0). The '=0' is needed for the config file parser to retrieve the value.
-# Defining a loopback between port A and B is as follows for serial mode loopback:
-# Port = <PortA>,<PortB>,<delay>,<buffer size>
-
-[Defaults]
-SerialLoopbackPort=0
-Port= 0,1,1,15000
-Port= 501,502,0,15000
-Port= 503,504,0,15000
-Port= 505,506,0,15000
-Port= 507,508,0,15000
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/TE_SpudNetworkSide_8x.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-[PrimaryLowerNifStartFails210]
-SimTsyTestNum = 210
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = -1
-
-[PrimaryLowerNifStartError210]
-SimTsyTestNum = 210
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = -1
-
-
-[SecondaryLowerNifStartFails310]
-SimTsyTestNum = 310
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SecondaryActivationEvent2Reason = -1
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/TE_SpudNetworkSide_9x.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-[PrimaryLowerNifStartFails210]
-SimTsyTestNum = 210
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = -46
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PrimaryLowerNifStartError210]
-SimTsyTestNum = 210
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = -1
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-
-[SecondaryLowerNifStartFails310]
-SimTsyTestNum = 310
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SecondaryActivationEvent2Reason = -46
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/TE_SpudNetworkSide_Channel_config.txt	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-############################################################################
-############################################################################
-###################              T E S T 1              ####################
-############################################################################
-############################################################################
-# 
-############################################################################
-[test1]
-# 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, 0,RasUser,,,,,,0
-
-# 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 = 2, 33, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.2, 255.255.255.255.255.255.255.255.255.255.255.255.255.255.255.255, 17, 3462, 3462, 1032, 1032, 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, 0x02, 0x02, 0x08, 0x08, 1500, 1500, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY2, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-
-#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
-
-#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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-# failure events
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-
-# EStatusInactive = 5 EStatusDeleted = 6)
-NotifyContextStatusChange = PRIMARY1, 5, 6
-NotifyContextStatusChange = PRIMARY1, 5, 5
-NotifyContextStatusChange = SECONDARY1, 5, 6
-NotifyContextStatusChange = SECONDARY1, 5, 5
-
-
-############################################################################
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/TE_SpudNetworkSide_PppLoopback.xml	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,462 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2004-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:
- 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>
-</NetworkTable>
-
-<IAPTable>
-    <IAP operation="add">
-        <Name>Loopback_GRPS_1</Name>
-        <IAPService>DialOutISP.Ppp_Bounce_1</IAPService>
-        <IAPBearer>ModemBearer.Loopback_Ppp_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>DialOutISP.Ppp_Bounce_3</IAPService>
-        <IAPBearer>ModemBearer.Loopback_Ppp_3</IAPBearer>
-        <IAPNetwork>Network.Intranet</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_Ppp_1</Name>
-        <IfName>PPP</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_Ppp_3</Name>
-        <IfName>PPP</IfName>
-        <CSYName>PKTLOOPBACK</CSYName>
-        <PortName>PKTLOOPBACK::503</PortName>
-    </ModemBearer>
-
-</ModemBearerTable>
-
-<LANBearerTable>
-</LANBearerTable>
-
-<LANServiceTable>
-</LANServiceTable>
-
-<DialInISPTable>
-</DialInISPTable>
-
-<DialOutISPTable>
-    <DialOutISP operation="template">
-        <Name>Default Dial Out ISP</Name>
-		<DialResolution>FALSE</DialResolution> 
-		<UseLoginScript>FALSE</UseLoginScript>
-		<PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-
-      	<IfAuthName>RasUser</IfAuthName>
-        <AuthRetries>1</AuthRetries>
-        <IpNetMask>255.255.255.0</IpNetMask>
-        <IfNetworks>ip</IfNetworks>
-		<IfServerMode>TRUE</IfServerMode>
-        <IpNameServer1>194.72.6.51</IpNameServer1>
-        <IpNameServer2>194.72.6.51</IpNameServer2>
-    </DialOutISP>    
-
-    <DialOutISP operation="add">
-		<Name>Ppp_Bounce_1</Name>
-		<DialResolution>FALSE</DialResolution> 
-		<UseLoginScript>FALSE</UseLoginScript>
-		<PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-
-        <IpAddr>192.168.1.1</IpAddr>
-		<IpGateway>192.168.1.2</IpGateway>
-    </DialOutISP>    
-
-    <DialOutISP operation="add">
-		<Name>Ppp_Bounce_3</Name>
-		<DialResolution>FALSE</DialResolution> 
-		<UseLoginScript>FALSE</UseLoginScript>
-		<PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-
-        <IpAddr>192.168.1.1</IpAddr>
-		<IpGateway>192.168.1.2</IpGateway>
-    </DialOutISP>    
-</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>SPUD_Echo_2</Name>
-      	<PDPType>IPV4</PDPType>
-        <IfParams>lowernif=PPP</IfParams>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>  
-    </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>
-
-<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>
-
-</UmtsR99QoSAndOnTable>
-
-
-<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>
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/qospolicies.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-# ModuleSpecs
-modulespec guqos= {
-	STRING module = guqos.prt
-	INTEGER id=368
-	INTEGER flags = 1
-	}
-
-# FlowSpecs
-flowspec override = {
-	INTEGER token_rate_uplink = 1500
-	}
-
-flowspec default_flow_spec = {
-	INTEGER max_transfer_rate_uplink = 1500
-	INTEGER token_rate_uplink = 1500
-	INTEGER token_bucket_size_uplink = 3000
-	INTEGER max_packet_size_uplink = 1500
-	INTEGER min_policed_unit_uplink = 1500
-	INTEGER priority_uplink = 1
-	INTEGER drop_mode_uplink = 8
-	INTEGER max_transfer_rate_downlink = 1500
-	INTEGER token_rate_downlink = 1500
-	INTEGER token_bucket_size_downlink = 3000
-	INTEGER max_packet_size_downlink = 1500
-	INTEGER min_policed_unit_downlink = 1500
-	INTEGER priority_downlink = 1
-	INTEGER drop_mode_downlink = 8
-	}
-
-# UMTS Specs
-
-# Default APN should always be specified!
-extension_spec default_extension_spec = {
-	INTEGER	type = 5
-	INTEGER extension_type = 5
-	INTEGER TrafficClassRequested = 4
-	INTEGER MaxBitrateUplinkRequested = 2048
-	INTEGER MaxBitrateDownlinkRequested = 2048
-	INTEGER GuaBitrateUplinkRequested = 1024
-	INTEGER GuaBitrateDownlinkRequested = 1024
-	INTEGER HeaderCompressionRequested = 1
-	}
-
-extension_spec guqos_default = {
-	INTEGER type = 5
-	INTEGER extension_type = 5
-	# Subscribed
-	INTEGER TrafficClassRequested = 1
-	# Subscribed
-	INTEGER TrafficClassMinimum = 1
-	# Subscribed
-	INTEGER DeliveryOrderRequested = 1
-	# Subscribed
-	INTEGER DeliveryOrderMinimum = 1
-	# Subscribed
-	INTEGER DeliveryOfErroneusSduRequested = 1
-	# Subscribed
-	INTEGER DeliveryOfErroneusSduMinimum = 1
-	# Subscribed
-	INTEGER MaxSduSizeRequested = 0
-	# Subscribed
-	INTEGER MaxSduSizeMinimum = 0
-	# Subscribed
-	INTEGER MaxBitrateUplinkRequested = 0
-	# Subscribed
-	INTEGER MaxBitrateDownlinkRequested = 0
-	# Subscribed
-	INTEGER MaxBitrateUplinkMinimum = 0
-	# Subscribed
-	INTEGER MaxBitrateDownlinkMinimum = 0
-	# iReqBER Subscribed
-	INTEGER ResidualBerRequested = 1
-	# iMaxBER Subscribed
-	INTEGER ResidualBerMinimum = 1
-	# ReqSDUErrorratio Subscribed
-	INTEGER ErrorRatioRequested = 1
-	# MaxSDUErrorratio Subscribed
-	INTEGER ErrorRatioMinimum =1
-	INTEGER PriorityRequested = 1
-	INTEGER PriorityMinimum = 1
-    # Subscribed
-	INTEGER TransferDelayRequested = 0
-    # Subscribed
-	INTEGER TransferDelayMinimum = 0
-    # Subscribed
-	INTEGER GuaBitrateUplinkRequested = 0
-    # Subscribed
-	INTEGER GuaBitrateUplinkMinimum = 0
-    # Subscribed
-	INTEGER GuaBitrateDownlinkRequested = 0
-    # Subscribed
-	INTEGER GuaBitrateDownlinkMinimum = 0
-}
-
-
-
-# Default APN should always be specified!
-extension_spec web = {
-	INTEGER type = 5
-	INTEGER extension_type = 5
-	INTEGER TrafficClassRequested = 3
-	INTEGER MaxBitrateUplinkRequested = 2048
-	INTEGER MaxBitrateDownlinkRequested = 2048
-	INTEGER GuaBitrateUplinkRequested = 1024
-	INTEGER GuaBitrateDownlinkRequested = 1024
-	INTEGER HeaderCompressionRequested = 1
-	}
-
-
-# Module selectors (none)
-#module_policy dst_port 0 dst_port_max 65535 priority 1 = { guqos }
-
-# Flowspec selectors
-flowspec_policy dst_port 9 priority 1 = { default_flow_spec }
-#flowspec_policy dst_port 0 dst_port_max 65535 priority 2 = { override }
-#flowspec_policy dst_port 0 priority 0 = { default }
-
-# GPRS selectors
-# extension_policy src_port 0 src_port_max 65535 priority 0  = { default_extension_spec }
-
-# guqos_default 
-extension_policy src_port 0 src_port_max 65535 priority 0 = { guqos_default }
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/te_SpudNetworkSide.xml	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,669 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2004-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:
- 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>
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/te_SpudNetworkSide_nifman.xml	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,404 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2005-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:
- CommDB Settings File for GT0233 PREQ397 SPUD 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">
-
-<NetworkTable>
-    <Network operation="add">
-        <Name>Intranet</Name>
-    </Network>
-    
-    <Network operation="add">
-        <Name>Intranet2</Name>
-    </Network>
-</NetworkTable>
-
-<IAPTable>
-    
-    <IAP operation="add">
-        <Name>GRPS_2</Name>
-        <IAPService>OutgoingGPRS.RawIP_1</IAPService>
-        <IAPBearer>ModemBearer.SPUD_2</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Mobile</LocationRef>
-    </IAP>
-    
-    <IAP operation="add">
-        <Name>SPUD_1</Name>
-        <IAPService>OutgoingGPRS.RawIP_1</IAPService>
-        <IAPBearer>ModemBearer.SPUD_1</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Mobile</LocationRef>
-    </IAP>
-    
-    <IAP operation="add">
-        <Name>CrashIAP</Name>
-        <IAPService>OutgoingGPRS.LeaveInNifCreation</IAPService>
-        <IAPBearer>ModemBearer.SPUD_1</IAPBearer>
-        <IAPNetwork>Network.Intranet</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>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    
-    <!-- Normal timeouts -->
-    <ModemBearer operation="add">
-        <Name>SPUD_1</Name>
-        <IfName>SPUD</IfName>
-        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>                
-    </ModemBearer>
-    
-    <!-- Short timeouts -->
-    <ModemBearer operation="add">
-        <Name>SPUD_2</Name>
-        <IfName>SPUD</IfName>
-        <LastSessionClosedTimeout>4</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>6</LastSocketClosedTimeout>
-        <LastSocketActivityTimeout>8</LastSocketActivityTimeout>                
-    </ModemBearer>    
-</ModemBearerTable>
-
-
-
-<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.SPUD_1</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_1</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>LeaveInNifCreation</Name>
-        <PDPType>IPV4</PDPType>
-        <IfParams>lowernif=Crash</IfParams>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>  
-        <IpAddr>192.168.1.2</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>
-
-<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>
-
-</UmtsR99QoSAndOnTable>
-
-
-<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>
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/te_SpudNetworkSide_ppp.xml	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2005-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:
- CommDB Settings File for GT0233 PREQ397 SPUD Network-side events /errors testing using PPP as lower NIF.
- 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">
-
-<NetworkTable>
-    <Network operation="add">
-        <Name>Intranet</Name>
-    </Network>
-    
-    <Network operation="add">
-        <Name>Intranet2</Name>
-    </Network>
-</NetworkTable>
-
-<IAPTable>
-    <IAP operation="add">
-        <Name>SPUD_PPP_GRPS_1</Name>
-        <IAPService>OutgoingGPRS.PPP_1</IAPService>
-        <IAPBearer>ModemBearer.SPUD_PPP_1</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Mobile</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>SPUD_PPP_GRPS_2</Name>
-        <IAPService>OutgoingGPRS.PPP_1</IAPService>
-        <IAPBearer>ModemBearer.SPUD_PPP_2</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Mobile</LocationRef>
-    </IAP>
-    
-    <IAP operation="add">
-        <Name>SPUD_PPP_GRPS_3</Name>
-        <IAPService>OutgoingGPRS.PPP_1</IAPService>
-        <IAPBearer>ModemBearer.SPUD_PPP_3</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Mobile</LocationRef>
-    </IAP>
-    
-</IAPTable>
-
-
-<ModemBearerTable>
-    <ModemBearer operation="template">
-        <Name>Default Modem</Name>
-        <Agent>NULLAGT</Agent>
-        <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>8</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>16</LastSocketClosedTimeout>
-        <LastSocketActivityTimeout>32</LastSocketActivityTimeout>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    
-    <ModemBearer operation="add">
-        <Name>SPUD_PPP_1</Name>
-        <CSYName>LOOPBACK</CSYName>
-        <BCAStack>C32Bca</BCAStack> <!-- This may be overwriten by some tests -->
-        <IfName>SPUD</IfName>        
-    </ModemBearer>
-
-    <ModemBearer operation="add">
-        <Name>SPUD_PPP_2</Name>
-        <IfName>SPUD</IfName>        
-        <BCAStack>INVALID_BCA_NAME</BCAStack>
-    </ModemBearer>
-    
-    <ModemBearer operation="add">
-        <Name>SPUD_PPP_3</Name>
-        <CSYName>PKTLOOPBACK</CSYName>
-        <BCAStack>C32Bca</BCAStack> 
-        <IfName>SPUD</IfName>        
-    </ModemBearer>
-
-</ModemBearerTable>
-
-
-<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.SPUD_PPP_GRPS_1</IAPRef>
-    </ConnectionPreferences>    
-</ConnectionPreferencesTable>
-
-<GlobalSettingsTable>
-    <GlobalSettings operation="add">
-        <Name>GlobalSettingsTable1</Name>
-        <RedialAttempts>3</RedialAttempts>
-        <SmsReceiveMode>2</SmsReceiveMode>
-        <GPRSAttachMode>1</GPRSAttachMode>
-        <AcceptIncomingGprs>1</AcceptIncomingGprs>
-        <ConnectionAttempts>1</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>PPP_1</Name>
-      	<PDPType>IPV4</PDPType>
-        <IfParams>lowernif=PPP</IfParams>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>  
-        <IpAddr>192.168.2.4</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>
-
-<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>
-
-</UmtsR99QoSAndOnTable>
-
-
-<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>
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/te_spudNetworkSide.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,412 +0,0 @@
-[ESockCheck]
-SimTsyTestNum = 0
-
-
-[PrimaryActivationOk1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[SecondaryActivationOk1]
-SimTsyTestNum = 1
-SubConnectionCount1 = 0
-SubConnectionCount2 = 3
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PrimaryDeleteOnLowerNifStart212]
-SimTsyTestNum = 212
-PrimaryIapId1 = 3
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 0
-ExpectedNifProgress = 8000
-ExpectedNifError    = -36
-MillisBeforeEvent = 10000000
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-
-[PrimaryDeleteBeforeLowerNif]
-SimTsyTestNum = 801
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = -4
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[SecondaryDeleteBeforeLowerNif]
-SimTsyTestNum = 901
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SecondaryActivationEvent2Reason = -4
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[SecondaryActivationJoin]
-SimTsyTestNum = 1
-SecondaryActivationEvent1 = EQoSEventConfirm
-OptionalQoSEvent1 = EQoSEventAdapt
-OptionalQoSEvent1Reason = 0
-ExpQoSEvent1 = EQoSEventJoin
-ExpQoSEvent1Reason = 0
-SubConnectionCount1 = 0
-SubConnectionCount2 = 3
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[SecondaryActivationChangeQoS]
-SimTsyTestNum = 1
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-ExpQoSEvent1 = EQoSEventAddPolicy
-ExpQoSEvent1Reason = 0
-OptionalQoSEvent1 = EQoSEventAdapt
-OptionalQoSEvent1Reason = 0
-ExpQoSEvent2 = EQoSEventConfirm
-SubConnectionCount1 = 0
-SubConnectionCount2 = 3
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-
-[KContextDelete]
-SimTsyTestNum = 701
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SecondaryActivationEvent2Reason = 2
-SubConnectionCount1 = 0
-SubConnectionCount2 = 3
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[ENetworkQoSChangePrimary]
-SimTsyTestNum = 1
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-QoSEventReq1 = ENetworkQoSChange
-QoSEventReq1Idx = 0
-ExpectedNifProgress = 8000
-ExpectedNifError    = -33
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[ENetworkQoSChangeSecondary]
-SimTsyTestNum = 1
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-QoSEventReq1 = ENetworkQoSChange
-QoSEventReq1Idx = 2
-ExpQoSEvent1 = EQoSEventAdapt
-ExpQoSEvent1Reason = 0
-SubConnectionCount1 = 0
-SubConnectionCount2 = 3
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-
-[PrimaryActivationFails201]
-SimTsyTestNum = 201
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = -19
-
-[SecondaryActivationFails301]
-SimTsyTestNum = 301
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 2
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PrimaryActivationFails18]
-SimTsyTestNum = 18
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = -19
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[SecondaryActivationFails19]
-SimTsyTestNum = 19
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SecondaryActivationEvent2Reason = -2
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[SecondaryActivationFails20]
-SimTsyTestNum = 20
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-SecondaryActivationEvent2Reason = -20
-
-[PrimaryDeletionFails21]
-SimTsyTestNum = 21
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[SecondaryDeletionFails22]
-SimTsyTestNum = 22
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-
-[SecondaryQosEventDelete1]
-SimTsyTestNum = 1
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 3
-OptionalQoSEvent1 = EQoSEventAdapt
-OptionalQoSEvent1Reason = 0
-ExpQoSEvent1 = EQoSEventFailure
-ExpQoSEvent1Reason = 0
-SubConnectionCount1 = 0
-SubConnectionCount2 = 3
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[SecondaryQosEventDeactivate1]
-SimTsyTestNum = 1
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 4
-ExpQoSEvent1 = EQoSEventAdapt
-ExpQoSEvent1Reason = 0
-QoSEventReq2 = EContextStatusChange
-QoSEventReq2Idx = 5
-ExpQoSEvent2 = EQoSEventAdapt
-ExpQoSEvent2Reason = 0
-SubConnectionCount1 = 0
-SubConnectionCount2 = 3
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PrimaryQoSEventDelete1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 0
-ExpectedNifProgress = 8000
-ExpectedNifError    = -36
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PrimaryQoSEventDeleteWithSecondary]
-SimTsyTestNum = 1
-IapId = 5
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-QoSEventReq1Idx = 0
-SubConnectionCount1 = 2
-SubConnectionCount2 = 3
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PrimaryQoSEventDeactivate1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 1
-ExpectedNifProgress = 8000
-ExpectedNifError    = 0
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-
-[PrimaryContextSuspendAndResume]
-SimTsyTestNum = 1
-ContextType = EPrimaryContext
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-LoopbackPort = PKTLOOPBACK::501
-CommRole = ECommRoleDCE
-QoSEventReq1Idx = 6
-QoSEventReq2Idx = 7
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-
-[SecondaryContextSuspendAndResume]
-SimTsyTestNum = 1
-ContextType = ESecondaryContext
-LoopbackPort = PKTLOOPBACK::503
-CommRole = ECommRoleDCE
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-QoSEventReq1Idx = 8
-QoSEventReq2Idx = 9
-SubConnectionCount1 = 0
-SubConnectionCount2 = 3
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PppPrimaryOk]
-SimTsyTestNum = 1
-PrimarySpudIapId = 1
-PppIapId1 = 2
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PppSecondarySend]
-SimTsyTestNum = 1
-PppIapId1 = 1
-PppIapId2 = 3
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-SubConnectionCount1 = 0
-SubConnectionCount2 = 3
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PrimarySlowInitialisePhone]
-SimTsyTestNum = 24
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = -3
-
-
-[MultiPrimaryActivationOk1]
-SimTsyTestNum = 25
-NumberOfIaps = 5
-PrimaryIapId1 = 2
-PrimaryIapId2 = 6
-PrimaryIapId3 = 7
-PrimaryIapId4 = 8
-PrimaryIapId5 = 9
-PrimaryActivationErr1 = 0
-
-[SecondaryR5ActivationOk1]
-SimTsyTestNum = 100
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-SubConnectionCount1 = 0
-SubConnectionCount2 = 3
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-PolicySelector = 1
-
-[SecondaryR5ActivationFails20]
-SimTsyTestNum = 101
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-PolicySelector = 1
-SecondaryActivationEvent2Reason = -20
-
-[ENetworkQoSR5ChangeSecondary]
-SimTsyTestNum = 100
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-QoSEventReq1 = ENetworkQoSChange
-QoSEventReq1Idx = 2
-ExpQoSEvent1 = EQoSEventAdapt
-ExpQoSEvent1Reason = 0
-SubConnectionCount1 = 0
-SubConnectionCount2 = 3
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[ENetworkQoSR5ChangeSecondary1]
-SimTsyTestNum = 102
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-QoSEventReq1 = ENetworkQoSChange
-QoSEventReq1Idx = 2
-ExpQoSEvent1 = EQoSEventAdapt
-ExpQoSEvent1Reason = 0
-SubConnectionCount1 = 0
-SubConnectionCount2 = 3
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[SecondaryActivationChangeQoSR5]
-SimTsyTestNum = 100
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-ExpQoSEvent1 = EQoSEventAddPolicy
-ExpQoSEvent1Reason = 0
-OptionalQoSEvent1 = EQoSEventAdapt
-OptionalQoSEvent1Reason = 0
-ExpQoSEvent2 = EQoSEventConfirm
-SubConnectionCount1 = 0
-SubConnectionCount2 = 3
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PrimaryQoSR5EventDeleteWithSecondary]
-SimTsyTestNum = 100
-IapId = 5
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-QoSEventReq1Idx = 0
-SubConnectionCount1 = 2
-SubConnectionCount2 = 3
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 2
-PolicySelector = 1
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/te_spudNetworkSide_config_9x.txt	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2589 +0,0 @@
-############################################################################
-############################################################################
-###################              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, 0,RasUser,,,,,,0
-
-# 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
-
-############################################################################
-############################################################################
-###################              T E S T 1              ####################
-############################################################################
-############################################################################
-# Test case for success results
-############################################################################
-[test1]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-############################################################################
-############################################################################
-###################              T E S T 7 0 1          ####################
-############################################################################
-############################################################################
-# This test messes up with QosProfileNegR99 entry to trigger KContextDelete on SPUDMAN
-############################################################################
-[test701]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 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
-
-#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
-
-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
-
-
-
-#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, 700, 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, 700, 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
-
-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
-
-#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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-# failure events
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-
-# EStatusInactive = 5 EStatusDeleted = 6)
-NotifyContextStatusChange = PRIMARY1, 5, 6
-NotifyContextStatusChange = PRIMARY1, 5, 5
-NotifyContextStatusChange = SECONDARY1, 5, 6
-NotifyContextStatusChange = SECONDARY1, 5, 5
-
-
-############################################################################
-############################################################################
-###################              T E S T 8 0 1          ####################
-############################################################################
-############################################################################
-# This test sets the R99ContextConfig's iActivateErrorCode to -4 for Primary PDP Context
-############################################################################
-[test801]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = <TName iContextName>,  <TUint iActivatePause>, <TUint iActivateErrorCode>, <TUint iDeactivatePause>, 
-# <TUint iDeactivateErrorCode>, <TUint iDeletionPause>, <TUint iDeletionErrorCode> <TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, -4, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-# failure events
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-
-# EStatusInactive = 5 EStatusDeleted = 6)
-NotifyContextStatusChange = PRIMARY1, 5, 6
-NotifyContextStatusChange = PRIMARY1, 5, 5
-NotifyContextStatusChange = SECONDARY1, 5, 6
-NotifyContextStatusChange = SECONDARY1, 5, 5
-
-
-############################################################################
-############################################################################
-###################              T E S T 9 0 1          ####################
-############################################################################
-############################################################################
-# This test sets the R99ContextConfig's iActivateErrorCode to -4 for Secondary PDP Context
-############################################################################
-[test901]
-# 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, 0,RasUser,,,,,,0
-
-# 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, -4, 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, 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
-
-#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
-
-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
-
-
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-# failure events
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-
-# EStatusInactive = 5 EStatusDeleted = 6)
-NotifyContextStatusChange = PRIMARY1, 5, 6
-NotifyContextStatusChange = PRIMARY1, 5, 5
-NotifyContextStatusChange = SECONDARY1, 5, 6
-NotifyContextStatusChange = SECONDARY1, 5, 5
-
-
-############################################################################
-############################################################################
-###################              T E S T 2 0 1          ####################
-############################################################################
-############################################################################
-# Failure to Activate Primary PDP context
-############################################################################
-[test201]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = <TName iContextName>,  <TUint iActivatePause>, <TUint iActivateErrorCode>, <TUint iDeactivatePause>, 
-# <TUint iDeactivateErrorCode>, <TUint iDeletionPause>, <TUint iDeletionErrorCode> <TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, -19, 0, 0, 0, 0, 0
-R99ContextConfig = PRIMARY1, 0, -19, 0, 0, 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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 1 0          ####################
-############################################################################
-############################################################################
-# Failure to Start the Lower Nif for the Primary Context
-############################################################################
-[test210]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-
-#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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-
-# Supply an invalid port name for primary context to SPUD
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, INVALID::1, 18, 0, PRIMARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 1 1          ####################
-############################################################################
-############################################################################
-# 
-############################################################################
-NTRAS PPP
-[test211]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 1
-
-
-#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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= ECUART, COMM::0, 18, 0, PRIMARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 1 2         ####################
-############################################################################
-############################################################################
-# 'la-la land loopback' PPP: No peer is provided, all LPC frames are discarded by the CSY.
-# This results in the LCP negotiation taking as long as we want. This gives up time to inject events.
-############################################################################
-[test212]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-
-#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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::0, 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
-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
-
-############################################################################
-############################################################################
-###################              T E S T 3 0 1          ####################
-############################################################################
-############################################################################
-# failure to activate secondary PDP context
-############################################################################
-[test301]
-# 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, 0,RasUser,,,,,,0
-
-# 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, -19, 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, 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
-
-
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-# When the value 0 is published to KPSSimtsyPacketContextStatusChange the first primary context will be deleted (status = EStatusDeleted = 6)
-NotifyContextStatusChange = SECONDARY1, 0, 6
-
-#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
-
-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
-
-#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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-
-#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
-
-QosR5NetworkNotification = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
-
-
-
-#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>
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 3 1 0          ####################
-############################################################################
-############################################################################
-# failure to Start the lower NIF for the Secondary PDP context
-############################################################################
-[test310]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-# 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, 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
-
-
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-# When the value 0 is published to KPSSimtsyPacketContextStatusChange the first primary context will be deleted (status = EStatusDeleted = 6)
-NotifyContextStatusChange = SECONDARY1, 0, 6
-
-#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
-
-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
-
-
-#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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-#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
-
-QosR5NetworkNotification = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
-
-
-#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>
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, INVALID_PORT::0, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 3 1 1          ####################
-############################################################################
-############################################################################
-# failure to Start the lower NIF for the Secondary PDP context 
-# (PPP as lower NIF)
-############################################################################
-[test311]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 1
-R99ContextConfig = SECONDARY1, 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, 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
-
-
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-# When the value 0 is published to KPSSimtsyPacketContextStatusChange the first primary context will be deleted (status = EStatusDeleted = 6)
-NotifyContextStatusChange = SECONDARY1, 0, 6
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-#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
-
-QosR5NetworkNotification = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
-
-
-
-#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>
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= ECUART, COMM::0, 18, 0, PRIMARY1
-CommSetup= ECUART, INVALID::1, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 1 8            ####################
-############################################################################
-############################################################################
-# R99ContextConfig ActivateErrorCode is modified to -19 for PRIMARY1. This 
-# way primary context activation will fail with an error code (-19)
-############################################################################
-[test18]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, -19, 0, 0, 0, 0, 0
-R99ContextConfig = SECONDARY1, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 1 9            ####################
-############################################################################
-############################################################################
-# TFT filter, srcAddr value is modified so that the secondary context 
-# creation fails due to TFT settings failure.
-############################################################################
-[test19]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = SECONDARY1, 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, 0, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.3, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-
-############################################################################
-############################################################################
-###################              T E S T 2 0            ####################
-############################################################################
-############################################################################
-# QosProfileReqR99 for SECONDARY1 reqTraffic and minTraffic values are 
-# modified so that secondary PDP context creation fails due to Requested QoS
-# parameter mismatch.
-############################################################################
-[test20]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = SECONDARY1, 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, 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
-
-#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,0x08, 0x08, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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,0x08, 0x08, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 1            ####################
-############################################################################
-############################################################################
-# R99ContextConfig DeletionErrorCode is modified to -19 for PRIMARY1. This 
-# way primary context deletion will fail with an error code (-19)
-############################################################################
-[test21]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, -19, 0
-R99ContextConfig = SECONDARY1, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-
-############################################################################
-############################################################################
-###################              T E S T 2 2            ####################
-############################################################################
-############################################################################
-# R99ContextConfig DeletionErrorCode is modified to -19 for SECONDARY1. This 
-# way primary context deletion will fail with an error code (-19)
-############################################################################
-[test22]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = SECONDARY1, 0, 0, 0, 0, 0, -19, 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, 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
-
-#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
-
-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
-
-#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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 24             ####################
-############################################################################
-############################################################################
-[test24]
-PhoneInitialiseDelay = 999
-
-############################################################################
-############################################################################
-############################################################################
-############################################################################
-
-############################################################################
-############################################################################
-###################              T E S T 25             ####################
-############################################################################
-############################################################################
-# Test case for success results
-############################################################################
-[test25]
-# 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, 0,RasUser,,,,,,0
-
-# 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 = PRIMARY2, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = PRIMARY3, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = PRIMARY4, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = PRIMARY5, 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 = PRIMARY2,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 = PRIMARY3,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 = PRIMARY4,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 = PRIMARY5,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 = PRIMARY2,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 = PRIMARY3,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 = PRIMARY4,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 = PRIMARY5,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 = PRIMARY2, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-QosProfileNegR99 = PRIMARY3, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-QosProfileNegR99 = PRIMARY4, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-QosProfileNegR99 = PRIMARY5, 0x03, 0x01, 0x03, 0x01, 1, 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, 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 = PRIMARY2, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-QosProfileNegR5 = PRIMARY3, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-QosProfileNegR5 = PRIMARY4, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-QosProfileNegR5 = PRIMARY5, 0x03, 0x01, 0x03, 0x01, 1, 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, 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 = PRIMARY3, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-QosNetworkNotification = PRIMARY4, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-QosNetworkNotification = PRIMARY5, 0x04, 0x02, 0x04, 0x02, 2, 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 = PRIMARY3, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
-QosR5NetworkNotification = PRIMARY4, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
-QosR5NetworkNotification = PRIMARY5, 0x04, 0x02, 0x04, 0x02, 2, 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::510, 18, 0, PRIMARY2
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::512, 18, 0, PRIMARY3
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::514, 18, 0, PRIMARY4
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::516, 18, 0, PRIMARY5
-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 = PRIMARY2, 0, 6
-NotifyContextStatusChange = PRIMARY3, 0, 6
-NotifyContextStatusChange = PRIMARY4, 0, 6
-NotifyContextStatusChange = PRIMARY5, 0, 6
-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 = PRIMARY2, 0, 5
-NotifyContextStatusChange = PRIMARY3, 0, 5
-NotifyContextStatusChange = PRIMARY4, 0, 5
-NotifyContextStatusChange = PRIMARY5, 0, 5
-NotifyContextStatusChange = SECONDARY1, 0, 5
-NotifyContextStatusChange = SECONDARY1, 0, 3
-
-
-############################################################################
-############################################################################
-###################              T E S T 100              ####################
-############################################################################
-############################################################################
-# Test case for success results
-############################################################################
-[test100]
-# 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, 0,RasUser,,,,,,0
-
-#SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-SetContextConfigR5= 0, SYMBIAN INTERNET PROVIDER, PROTOCOL ADDRESS, 0, 2, USER3, PASSWORD3, CHALLENGE3, RESPONSE3, PRIMARYSERVER3, SECONDARYSERVER3, 3, 2, 1, 1
-
-#AdditionalParamItem= <TPcoProtocolId>, <TBuf8 AdditionalParamData>
-AdditionalParamItem= 0x04, ADDITIONALPARAM1
-
-# 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
-
-
-# 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, 0x04, 0x01, 0x08, 0x08, -1, -1, -1, -1,0,0, 0x20, 1, 0x10 ,1 ,2 ,1 ,1 ,250 ,-1 ,-1 ,0 ,0
-#Added for test case 29
-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
-#Added for test case 30
-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 = SECONDARY1,0x04, 0x04, 0x01, 0x01, 0x08, 0x08, 768, 768, 1024, 1024, 1024, 1024, 0x0, 0x0, 0x01, 0x01, 0x01, 0x01, 0x1, 0x1, 250, 250, 1024, 1024
-
-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, 0x04, 0x01, 0x08, 0x08, -1, -1, -1, -1,0,0, 0x20, 1, 0x10 ,1 ,2 ,1 ,1 ,250 ,-1 ,-1 ,0 ,0 ,1 ,1
-#Added for test case 29
-QosProfileReqR5 = SECONDARY1,0x04, 0x04, 0x04, 0x01, 0x08, 0x08, -1, -1, -1, -1,0,0, 0x20, 1, 0x10 ,1 ,2 ,1 ,1 ,250 ,-1 ,-1 ,0 ,0 ,0 ,0
-#Added for test case 30
-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 = SECONDARY1,0x04, 0x04, 0x01, 0x01, 0x08, 0x08, 768, 768, 1024, 1024, 1024, 1024, 0x0, 0x0, 0x01, 0x01, 0x01, 0x01, 250, 250, 1024, 1024, 1024, 1024, 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 = 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, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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, 1, 1
-#for test case 29
-QosProfileNegR5 = SECONDARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-#for test case 30
-QosProfileNegR5 = SECONDARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-#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 = SECONDARY1, 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 = SECONDARY1, 0x04, 0x02, 0x04, 0x02, 1, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 1
-QosR5NetworkNotification = SECONDARY1, 0x04, 0x02, 0x04, 0x02, 1, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 1
-
-
-#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
-
-
-############################################################################
-# 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
-
-############################################################################
-############################################################################
-###################              T E S T 1 0 1           ####################
-############################################################################
-############################################################################
-# QosProfileReqR99 for SECONDARY1 reqTraffic and minTraffic values are 
-# modified so that secondary PDP context creation fails due to Requested QoS
-# parameter mismatch.
-############################################################################
-[test101]
-# 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, 0,RasUser,,,,,,0
-
-#SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-SetContextConfigR5= 0, SYMBIAN INTERNET PROVIDER, PROTOCOL ADDRESS, 0, 2, USER3, PASSWORD3, CHALLENGE3, RESPONSE3, PRIMARYSERVER3, SECONDARYSERVER3, 3, 2, 1, 1
-
-#AdditionalParamItem= <TPcoProtocolId>, <TBuf8 AdditionalParamData>
-AdditionalParamItem= 0x04, ADDITIONALPARAM1
-
-
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = SECONDARY1, 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, 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
-
-#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,0x08, 0x08, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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,0x08, 0x08, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 102              ####################
-############################################################################
-############################################################################
-# Test case for success results
-############################################################################
-[test102]
-# 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, 0,RasUser,,,,,,0
-
-#SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-SetContextConfigR5= 0, SYMBIAN INTERNET PROVIDER, PROTOCOL ADDRESS, 0, 2, USER3, PASSWORD3, CHALLENGE3, RESPONSE3, PRIMARYSERVER3, SECONDARYSERVER3, 3, 2, 1, 1
-
-#AdditionalParamItem= <TPcoProtocolId>, <TBuf8 AdditionalParamData>
-AdditionalParamItem= 0x04, ADDITIONALPARAM1
-
-# 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
-
-
-# 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, 0x04, 0x01, 0x08, 0x08, -1, -1, -1, -1,0,0, 0x20, 1, 0x10 ,1 ,2 ,1 ,1 ,250 ,-1 ,-1 ,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, 0x04, 0x01, 0x08, 0x08, -1, -1, -1, -1,0,0, 0x20, 1, 0x10 ,1 ,2 ,1 ,1 ,250 ,-1 ,-1 ,0 ,0 ,1 ,1
-
-
-#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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 1, 1
-QosProfileNegR5 = SECONDARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 1, 1
-
-
-#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 = SECONDARY1, 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 = SECONDARY1, 0x04, 0x02, 0x04, 0x02, 1, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 1, 0
-QosR5NetworkNotification = SECONDARY1, 0x04, 0x02, 0x04, 0x02, 1, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 1, 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
-
-
-############################################################################
-# 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
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/te_spudNetworkSide_config_r4_and_r5.txt	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2440 +0,0 @@
-############################################################################
-############################################################################
-###################              T E S T 1301           ####################
-############################################################################
-############################################################################
-# Test case for success results
-############################################################################
-[test1301]
-# DefaultContextparamRel99 = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>
-# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
-DefaultContextparamRel99= 3, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, USER2, PASSWORD2, NULL, NULL, PRIMARYSERVER2, SECONDARYSERVER2, 2
-
-# SetContextConfigR99 is ContextConfigGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>
-# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
-SetContextConfigR99 = 0, Test R4,,0,0,RasUser,,,,,,0
-
-# 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>		
-
-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
-
-############################################################################
-############################################################################
-###################              T E S T 1302           ####################
-############################################################################
-############################################################################
-# Test case for success results
-############################################################################
-[test1302]
-#DefaultContextParamRel5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-DefaultContextParamRel5= 0, SYMBIAN INTERNET PROVIDER, PROTOCOL ADDRESS, 0, 2, USER3, PASSWORD3, CHALLENGE3, RESPONSE3, PRIMARYSERVER3, SECONDARYSERVER3, 3, 2, 1, 1
-
-#SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-SetContextConfigR5= 0,Test R5,, 0, 0, RasUser,,,,,,0,1,1,1
-
-#AdditionalParamItem= <TPcoProtocolId>, <TBuf8 AdditionalParamData>
-AdditionalParamItem= 0x04, ADDITIONALPARAM1
-
-# 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>		
-
-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
-
-############################################################################
-############################################################################
-###################              T E S T 1304           ####################
-############################################################################
-############################################################################
-# Failure to Activate Primary PDP context
-############################################################################
-[test1304]
-# DefaultContextparamRel99 = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>
-# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
-DefaultContextparamRel99= 3, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, USER2, PASSWORD2, NULL, NULL, PRIMARYSERVER2, SECONDARYSERVER2, 2
-
-# SetContextConfigR99 is ContextConfigGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>
-# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
-SetContextConfigR99 = 0, Test R4,,0,0,RasUser,,,,,,0
-
-# TRel99ContextConfig = <TName iContextName>,  <TUint iActivatePause>, <TUint iActivateErrorCode>, <TUint iDeactivatePause>, 
-# <TUint iDeactivateErrorCode>, <TUint iDeletionPause>, <TUint iDeletionErrorCode> <TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, -19, 0, 0, 0, 0, 0
-R99ContextConfig = PRIMARY1, 0, -19, 0, 0, 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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
-
-############################################################################
-############################################################################
-###################              T E S T 1305           ####################
-############################################################################
-############################################################################
-# Failure to Activate Primary PDP context
-############################################################################
-[test1305]
-#DefaultContextParamRel5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-DefaultContextParamRel5= 0, SYMBIAN INTERNET PROVIDER, PROTOCOL ADDRESS, 0, 2, USER3, PASSWORD3, CHALLENGE3, RESPONSE3, PRIMARYSERVER3, SECONDARYSERVER3, 3, 2, 1, 1
-
-#SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-SetContextConfigR5= 0,Test R5,, 0, 0, RasUser,,,,,,0,1,1,1
-
-#AdditionalParamItem= <TPcoProtocolId>, <TBuf8 AdditionalParamData>
-AdditionalParamItem= 0x04, ADDITIONALPARAM1
-
-# TRel99ContextConfig = <TName iContextName>,  <TUint iActivatePause>, <TUint iActivateErrorCode>, <TUint iDeactivatePause>, 
-# <TUint iDeactivateErrorCode>, <TUint iDeletionPause>, <TUint iDeletionErrorCode> <TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, -19, 0, 0, 0, 0, 0
-R99ContextConfig = PRIMARY1, 0, -19, 0, 0, 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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
-
-############################################################################
-############################################################################
-###################              T E S T 1306          ####################
-############################################################################
-############################################################################
-# failure to activate secondary PDP context
-############################################################################
-[test1306]
-#DefaultContextParamRel5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-DefaultContextParamRel5= 0, SYMBIAN INTERNET PROVIDER, PROTOCOL ADDRESS, 0, 2, USER3, PASSWORD3, CHALLENGE3, RESPONSE3, PRIMARYSERVER3, SECONDARYSERVER3, 3, 2, 1, 1
-
-#SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-SetContextConfigR5= 0,Test R5,, 0, 0, RasUser,,,,,,0,1,1,1
-
-#AdditionalParamItem= <TPcoProtocolId>, <TBuf8 AdditionalParamData>
-AdditionalParamItem= 0x04, ADDITIONALPARAM1
-
-# 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, -19, 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, 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
-
-
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-# When the value 0 is published to KPSSimtsyPacketContextStatusChange the first primary context will be deleted (status = EStatusDeleted = 6)
-NotifyContextStatusChange = SECONDARY1, 0, 6
-
-#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
-
-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
-
-#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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-
-#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
-
-QosR5NetworkNotification = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
-
-
-
-#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>
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-
-############################################################################
-############################################################################
-###################              T E S T 1 3 1 5        ####################
-############################################################################
-############################################################################
-# This test sets the R99ContextConfig's iActivateErrorCode to -4 for Primary PDP Context
-############################################################################
-[test1315]
-# DefaultContextparamRel99 = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>
-# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
-DefaultContextparamRel99= 3, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, USER2, PASSWORD2, NULL, NULL, PRIMARYSERVER2, SECONDARYSERVER2, 2
-
-# SetContextConfigR99 is ContextConfigGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>
-# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
-SetContextConfigR99 = 0, Test R4,,0,0,RasUser,,,,,,0
-
-# TRel99ContextConfig = <TName iContextName>,  <TUint iActivatePause>, <TUint iActivateErrorCode>, <TUint iDeactivatePause>, 
-# <TUint iDeactivateErrorCode>, <TUint iDeletionPause>, <TUint iDeletionErrorCode> <TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, -4, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-# failure events
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-
-# EStatusInactive = 5 EStatusDeleted = 6)
-NotifyContextStatusChange = PRIMARY1, 5, 6
-NotifyContextStatusChange = PRIMARY1, 5, 5
-NotifyContextStatusChange = SECONDARY1, 5, 6
-NotifyContextStatusChange = SECONDARY1, 5, 5
-
-############################################################################
-############################################################################
-###################              T E S T 1 3 1 6        ####################
-############################################################################
-############################################################################
-# This test sets the R99ContextConfig's iActivateErrorCode to -4 for Primary PDP Context
-############################################################################
-[test1316]
-#DefaultContextParamRel5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-DefaultContextParamRel5= 0, SYMBIAN INTERNET PROVIDER, PROTOCOL ADDRESS, 0, 2, USER3, PASSWORD3, CHALLENGE3, RESPONSE3, PRIMARYSERVER3, SECONDARYSERVER3, 3, 2, 1, 1
-
-#SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-SetContextConfigR5= 0,Test R5,, 0, 0, RasUser,,,,,,0,1,1,1
-
-#AdditionalParamItem= <TPcoProtocolId>, <TBuf8 AdditionalParamData>
-AdditionalParamItem= 0x04, ADDITIONALPARAM1
-
-# TRel99ContextConfig = <TName iContextName>,  <TUint iActivatePause>, <TUint iActivateErrorCode>, <TUint iDeactivatePause>, 
-# <TUint iDeactivateErrorCode>, <TUint iDeletionPause>, <TUint iDeletionErrorCode> <TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, -4, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-# failure events
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-
-# EStatusInactive = 5 EStatusDeleted = 6)
-NotifyContextStatusChange = PRIMARY1, 5, 6
-NotifyContextStatusChange = PRIMARY1, 5, 5
-NotifyContextStatusChange = SECONDARY1, 5, 6
-NotifyContextStatusChange = SECONDARY1, 5, 5
-
-############################################################################
-############################################################################
-###################              T E S T 1317          ####################
-############################################################################
-############################################################################
-# This test sets the R99ContextConfig's iActivateErrorCode to -4 for Secondary PDP Context
-############################################################################
-[test1317]
-#DefaultContextParamRel5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-DefaultContextParamRel5= 0, SYMBIAN INTERNET PROVIDER, PROTOCOL ADDRESS, 0, 2, USER3, PASSWORD3, CHALLENGE3, RESPONSE3, PRIMARYSERVER3, SECONDARYSERVER3, 3, 2, 1, 1
-
-#SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-SetContextConfigR5= 0,Test R5,, 0, 0, RasUser,,,,,,0,1,1,1
-
-#AdditionalParamItem= <TPcoProtocolId>, <TBuf8 AdditionalParamData>
-AdditionalParamItem= 0x04, ADDITIONALPARAM1
-
-# 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, -4, 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, 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
-
-#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
-
-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
-
-
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-# failure events
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-
-# EStatusInactive = 5 EStatusDeleted = 6)
-NotifyContextStatusChange = PRIMARY1, 5, 6
-NotifyContextStatusChange = PRIMARY1, 5, 5
-NotifyContextStatusChange = SECONDARY1, 5, 6
-NotifyContextStatusChange = SECONDARY1, 5, 5
-
-############################################################################
-############################################################################
-###################              T E S T 1318           ####################
-############################################################################
-############################################################################
-# Failure to Start the Lower Nif for the Primary Context
-############################################################################
-[test1318]
-# DefaultContextparamRel99 = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>
-# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
-DefaultContextparamRel99= 3, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, USER2, PASSWORD2, NULL, NULL, PRIMARYSERVER2, SECONDARYSERVER2, 2
-
-# SetContextConfigR99 is ContextConfigGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>
-# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
-SetContextConfigR99 = 0, Test R4,,0,0,RasUser,,,,,,0
-# 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
-
-
-#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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-
-# Supply an invalid port name for primary context to SPUD
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, INVALID::1, 18, 0, PRIMARY1
-
-############################################################################
-############################################################################
-###################              T E S T 1319           ####################
-############################################################################
-############################################################################
-# Failure to Start the Lower Nif for the Primary Context
-############################################################################
-[test1319]
-#DefaultContextParamRel5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-DefaultContextParamRel5= 0, SYMBIAN INTERNET PROVIDER, PROTOCOL ADDRESS, 0, 2, USER3, PASSWORD3, CHALLENGE3, RESPONSE3, PRIMARYSERVER3, SECONDARYSERVER3, 3, 2, 1, 1
-
-#SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-SetContextConfigR5= 0,Test R5,, 0, 0, RasUser,,,,,,0,1,1,1
-
-#AdditionalParamItem= <TPcoProtocolId>, <TBuf8 AdditionalParamData>
-AdditionalParamItem= 0x04, ADDITIONALPARAM1
-
-# 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
-
-
-#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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-
-# Supply an invalid port name for primary context to SPUD
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, INVALID::1, 18, 0, PRIMARY1
-
-############################################################################
-############################################################################
-###################              T E S T 1320           ####################
-############################################################################
-############################################################################
-# failure to Start the lower NIF for the Secondary PDP context
-############################################################################
-[test1320]
-#DefaultContextParamRel5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-DefaultContextParamRel5= 0, SYMBIAN INTERNET PROVIDER, PROTOCOL ADDRESS, 0, 2, USER3, PASSWORD3, CHALLENGE3, RESPONSE3, PRIMARYSERVER3, SECONDARYSERVER3, 3, 2, 1, 1
-
-#SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-SetContextConfigR5= 0,Test R5,, 0, 0, RasUser,,,,,,0,1,1,1
-
-#AdditionalParamItem= <TPcoProtocolId>, <TBuf8 AdditionalParamData>
-AdditionalParamItem= 0x04, ADDITIONALPARAM1
-    
-# 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
-
-# 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, 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
-
-
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-# When the value 0 is published to KPSSimtsyPacketContextStatusChange the first primary context will be deleted (status = EStatusDeleted = 6)
-NotifyContextStatusChange = SECONDARY1, 0, 6
-
-#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
-
-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
-
-
-#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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-#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
-
-QosR5NetworkNotification = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
-
-
-#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>
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, INVALID_PORT::0, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 1323           ####################
-############################################################################
-############################################################################
-# R99ContextConfig ActivateErrorCode is modified to -19 for PRIMARY1. This 
-# way primary context activation will fail with an error code (-19)
-############################################################################
-[test1323]
-# DefaultContextparamRel99 = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>
-# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
-DefaultContextparamRel99= 3, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, USER2, PASSWORD2, NULL, NULL, PRIMARYSERVER2, SECONDARYSERVER2, 2
-
-# SetContextConfigR99 is ContextConfigGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>
-# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
-SetContextConfigR99 = 0, Test R4,,0,0,RasUser,,,,,,0
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, -19, 0, 0, 0, 0, 0
-R99ContextConfig = SECONDARY1, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 1324           ####################
-############################################################################
-############################################################################
-# R99ContextConfig ActivateErrorCode is modified to -19 for PRIMARY1. This 
-# way primary context activation will fail with an error code (-19)
-############################################################################
-[test1324]
-#DefaultContextParamRel5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-DefaultContextParamRel5= 0, SYMBIAN INTERNET PROVIDER, PROTOCOL ADDRESS, 0, 2, USER3, PASSWORD3, CHALLENGE3, RESPONSE3, PRIMARYSERVER3, SECONDARYSERVER3, 3, 2, 1, 1
-
-#SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-SetContextConfigR5= 0,Test R5,, 0, 0, RasUser,,,,,,0,1,1,1
-
-#AdditionalParamItem= <TPcoProtocolId>, <TBuf8 AdditionalParamData>
-AdditionalParamItem= 0x04, ADDITIONALPARAM1
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, -19, 0, 0, 0, 0, 0
-R99ContextConfig = SECONDARY1, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-    
-############################################################################
-############################################################################
-###################              T E S T 1325            ####################
-############################################################################
-############################################################################
-# TFT filter, srcAddr value is modified so that the secondary context 
-# creation fails due to TFT settings failure.
-############################################################################
-[test1325]    
-#DefaultContextParamRel5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-DefaultContextParamRel5= 0, SYMBIAN INTERNET PROVIDER, PROTOCOL ADDRESS, 0, 2, USER3, PASSWORD3, CHALLENGE3, RESPONSE3, PRIMARYSERVER3, SECONDARYSERVER3, 3, 2, 1, 1
-
-#SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-SetContextConfigR5= 0,Test R5,, 0, 0, RasUser,,,,,,0,1,1,1
-
-#AdditionalParamItem= <TPcoProtocolId>, <TBuf8 AdditionalParamData>
-AdditionalParamItem= 0x04, ADDITIONALPARAM1
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = SECONDARY1, 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, 0, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.3, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 1326            ####################
-############################################################################
-############################################################################
-# QosProfileReqR99 for SECONDARY1 reqTraffic and minTraffic values are 
-# modified so that secondary PDP context creation fails due to Requested QoS
-# parameter mismatch.
-############################################################################
-[test1326]
-#DefaultContextParamRel5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-DefaultContextParamRel5= 0, SYMBIAN INTERNET PROVIDER, PROTOCOL ADDRESS, 0, 2, USER3, PASSWORD3, CHALLENGE3, RESPONSE3, PRIMARYSERVER3, SECONDARYSERVER3, 3, 2, 1, 1
-
-#SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-SetContextConfigR5= 0,Test R5,, 0, 0, RasUser,,,,,,0,1,1,1
-
-#AdditionalParamItem= <TPcoProtocolId>, <TBuf8 AdditionalParamData>
-AdditionalParamItem= 0x04, ADDITIONALPARAM1
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = SECONDARY1, 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, 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
-
-#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,0x08, 0x08, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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,0x08, 0x08, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 1327            ####################
-############################################################################
-############################################################################
-# R99ContextConfig DeletionErrorCode is modified to -19 for PRIMARY1. This 
-# way primary context deletion will fail with an error code (-19)
-############################################################################
-[test1327]
-# DefaultContextparamRel99 = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>
-# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
-DefaultContextparamRel99= 3, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, USER2, PASSWORD2, NULL, NULL, PRIMARYSERVER2, SECONDARYSERVER2, 2
-
-# SetContextConfigR99 is ContextConfigGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>
-# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
-SetContextConfigR99 = 0, Test R4,,0,0,RasUser,,,,,,0
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, -19, 0
-R99ContextConfig = SECONDARY1, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 1328            ####################
-############################################################################
-############################################################################
-# R99ContextConfig DeletionErrorCode is modified to -19 for PRIMARY1. This 
-# way primary context deletion will fail with an error code (-19)
-############################################################################
-[test1328]
-#DefaultContextParamRel5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-DefaultContextParamRel5= 0, SYMBIAN INTERNET PROVIDER, PROTOCOL ADDRESS, 0, 2, USER3, PASSWORD3, CHALLENGE3, RESPONSE3, PRIMARYSERVER3, SECONDARYSERVER3, 3, 2, 1, 1
-
-#SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-SetContextConfigR5= 0,Test R5,, 0, 0, RasUser,,,,,,0,1,1,1
-
-#AdditionalParamItem= <TPcoProtocolId>, <TBuf8 AdditionalParamData>
-AdditionalParamItem= 0x04, ADDITIONALPARAM1
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, -19, 0
-R99ContextConfig = SECONDARY1, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-
-############################################################################
-############################################################################
-###################              T E S T 1329            ####################
-############################################################################
-############################################################################
-# R99ContextConfig DeletionErrorCode is modified to -19 for SECONDARY1. This 
-# way primary context deletion will fail with an error code (-19)
-############################################################################
-[test1329]
-#DefaultContextParamRel5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-DefaultContextParamRel5= 0, SYMBIAN INTERNET PROVIDER, PROTOCOL ADDRESS, 0, 2, USER3, PASSWORD3, CHALLENGE3, RESPONSE3, PRIMARYSERVER3, SECONDARYSERVER3, 3, 2, 1, 1
-
-#SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-SetContextConfigR5= 0,Test R5,, 0, 0, RasUser,,,,,,0,1,1,1
-
-#AdditionalParamItem= <TPcoProtocolId>, <TBuf8 AdditionalParamData>
-AdditionalParamItem= 0x04, ADDITIONALPARAM1
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = SECONDARY1, 0, 0, 0, 0, 0, -19, 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, 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
-
-#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
-
-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
-
-#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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 1331             ####################
-############################################################################
-############################################################################
-[test1331]
-PhoneInitialiseDelay = 999
-
-############################################################################
-############################################################################
-###################              T E S T 1332             ####################
-############################################################################
-############################################################################
-[test1332]
-PhoneInitialiseDelay = 999
-
-############################################################################
-############################################################################
-###################              T E S T 1333           ####################
-############################################################################
-############################################################################
-# Test case for success results
-############################################################################
-[test1333]
-# DefaultContextparamRel99 = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>
-# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
-DefaultContextparamRel99= 3, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, USER2, PASSWORD2, NULL, NULL, PRIMARYSERVER2, SECONDARYSERVER2, 2
-
-# SetContextConfigR99 is ContextConfigGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>
-# ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
-SetContextConfigR99 = 0, Test R4,,0,0,RasUser,,,,,,0
-
-# 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 = PRIMARY2, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = PRIMARY3, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = PRIMARY4, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = PRIMARY5, 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 = PRIMARY2,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 = PRIMARY3,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 = PRIMARY4,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 = PRIMARY5,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 = PRIMARY2,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 = PRIMARY3,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 = PRIMARY4,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 = PRIMARY5,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 = PRIMARY2, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-QosProfileNegR99 = PRIMARY3, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-QosProfileNegR99 = PRIMARY4, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-QosProfileNegR99 = PRIMARY5, 0x03, 0x01, 0x03, 0x01, 1, 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, 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 = PRIMARY2, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-QosProfileNegR5 = PRIMARY3, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-QosProfileNegR5 = PRIMARY4, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-QosProfileNegR5 = PRIMARY5, 0x03, 0x01, 0x03, 0x01, 1, 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, 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 = PRIMARY3, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-QosNetworkNotification = PRIMARY4, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-QosNetworkNotification = PRIMARY5, 0x04, 0x02, 0x04, 0x02, 2, 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 = PRIMARY3, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
-QosR5NetworkNotification = PRIMARY4, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
-QosR5NetworkNotification = PRIMARY5, 0x04, 0x02, 0x04, 0x02, 2, 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::510, 18, 0, PRIMARY2
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::512, 18, 0, PRIMARY3
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::514, 18, 0, PRIMARY4
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::516, 18, 0, PRIMARY5
-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 = PRIMARY2, 0, 6
-NotifyContextStatusChange = PRIMARY3, 0, 6
-NotifyContextStatusChange = PRIMARY4, 0, 6
-NotifyContextStatusChange = PRIMARY5, 0, 6
-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 = PRIMARY2, 0, 5
-NotifyContextStatusChange = PRIMARY3, 0, 5
-NotifyContextStatusChange = PRIMARY4, 0, 5
-NotifyContextStatusChange = PRIMARY5, 0, 5
-NotifyContextStatusChange = SECONDARY1, 0, 5
-NotifyContextStatusChange = SECONDARY1, 0, 3
-
-############################################################################
-############################################################################
-###################              T E S T 1334           ####################
-############################################################################
-############################################################################
-# Test case for success results
-############################################################################
-[test1334]
-#DefaultContextParamRel5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-DefaultContextParamRel5= 0, SYMBIAN INTERNET PROVIDER, PROTOCOL ADDRESS, 0, 2, USER3, PASSWORD3, CHALLENGE3, RESPONSE3, PRIMARYSERVER3, SECONDARYSERVER3, 3, 2, 1, 1
-
-#SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-SetContextConfigR5= 0,Test R5,, 0, 0, RasUser,,,,,,0,1,1,1
-
-#AdditionalParamItem= <TPcoProtocolId>, <TBuf8 AdditionalParamData>
-AdditionalParamItem= 0x04, ADDITIONALPARAM1
-
-# 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 = PRIMARY2, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = PRIMARY3, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = PRIMARY4, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = PRIMARY5, 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 = PRIMARY2,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 = PRIMARY3,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 = PRIMARY4,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 = PRIMARY5,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 = PRIMARY2,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 = PRIMARY3,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 = PRIMARY4,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 = PRIMARY5,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 = PRIMARY2, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-QosProfileNegR99 = PRIMARY3, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-QosProfileNegR99 = PRIMARY4, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-QosProfileNegR99 = PRIMARY5, 0x03, 0x01, 0x03, 0x01, 1, 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, 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 = PRIMARY2, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-QosProfileNegR5 = PRIMARY3, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-QosProfileNegR5 = PRIMARY4, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-QosProfileNegR5 = PRIMARY5, 0x03, 0x01, 0x03, 0x01, 1, 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, 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 = PRIMARY3, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-QosNetworkNotification = PRIMARY4, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-QosNetworkNotification = PRIMARY5, 0x04, 0x02, 0x04, 0x02, 2, 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 = PRIMARY3, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
-QosR5NetworkNotification = PRIMARY4, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
-QosR5NetworkNotification = PRIMARY5, 0x04, 0x02, 0x04, 0x02, 2, 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::510, 18, 0, PRIMARY2
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::512, 18, 0, PRIMARY3
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::514, 18, 0, PRIMARY4
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::516, 18, 0, PRIMARY5
-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 = PRIMARY2, 0, 6
-NotifyContextStatusChange = PRIMARY3, 0, 6
-NotifyContextStatusChange = PRIMARY4, 0, 6
-NotifyContextStatusChange = PRIMARY5, 0, 6
-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 = PRIMARY2, 0, 5
-NotifyContextStatusChange = PRIMARY3, 0, 5
-NotifyContextStatusChange = PRIMARY4, 0, 5
-NotifyContextStatusChange = PRIMARY5, 0, 5
-NotifyContextStatusChange = SECONDARY1, 0, 5
-NotifyContextStatusChange = SECONDARY1, 0, 3
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/te_spudNetworkSide_nifman.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,318 +0,0 @@
-[ESockCheck]
-SimTsyTestNum = 0
-
-
-[PrimaryOnlyNormalStop1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-MillisBeforeStop = 2000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-SubConnectionCount1 = 0
-SubConnectionCount2 = 1
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 2
-
-
-[PrimaryOnlyAuthoritativeStop1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-MillisBeforeStop = 10000000
-IfaceStopType = EStopAuthoritative
-IfaceStopErrCode = -17210
-SubConnectionCount1 = 0
-SubConnectionCount2 = 1
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 2
-
-
-[TimeoutStopPrimaryDeleting1]
-SimTsyTestNum = 11
-PrimaryLoopbackPort = 502
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-MillisBeforeStop = 0
-IfaceStopType = NifmanIdleTimeout
-IfaceStopErrCode = -33
-SubConnectionCount1 = 0
-SubConnectionCount2 = 1
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 2
-
-
-
-
-[NormalStopPrimaryDeleting1]
-SimTsyTestNum = 11
-PrimaryLoopbackPort = 502
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-MillisBeforeStop = 4000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-SubConnectionCount1 = 0
-SubConnectionCount2 = 1
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 2
-
-
-
-[NormalStopOnPrimaryDeactivating1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 2
-PrimaryStartErr1 = 0
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 4
-MillisBeforeStop = 3000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-SubConnectionCount1 = 0
-SubConnectionCount2 = 1
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 2
-
-
-[NormalStopOnPrimarySuspended1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 2
-PrimaryStartErr1 = 0
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 5
-MillisBeforeStop = 3000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-SubConnectionCount1 = 0
-SubConnectionCount2 = 1
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 2
-
-
-
-[NormalStopOnPrimaryInactive1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 2
-PrimaryStartErr1 = 0
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 1
-MillisBeforeStop = 3000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-SubConnectionCount1 = 0
-SubConnectionCount2 = 1
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 2
-
-
-[AuthStopOnPrimarySuspended1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 2
-PrimaryStartErr1 = 0
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 5
-MillisBeforeStop = 3000000
-IfaceStopType = EStopAuthoritative
-IfaceStopErrCode = -17210
-SubConnectionCount1 = 0
-SubConnectionCount2 = 1
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 2
-
-
-[AuthStopOnPrimaryDeactivating1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 2
-PrimaryStartErr1 = 0
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 4
-MillisBeforeStop = 3000000
-IfaceStopType = EStopAuthoritative
-IfaceStopErrCode = -17210
-SubConnectionCount1 = 0
-SubConnectionCount2 = 1
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 2
-
-
-[AuthStopOnPrimaryInactive1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 2
-PrimaryStartErr1 = 0
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 1
-MillisBeforeStop = 3000000
-IfaceStopType = EStopAuthoritative
-IfaceStopErrCode = -17210
-SubConnectionCount1 = 0
-SubConnectionCount2 = 1
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 2
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; STOP on secondary
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-[NormalStopSecondaryActive1]
-SimTsyTestNum = 2
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-PrimaryActivationErr1 = 0
-MillisBeforeStop = 2000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-SubConnectionCount1 = 0
-SubConnectionCount2 = 3
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 2
-
-[AuthStopSecondaryActive1]
-SimTsyTestNum = 2
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-PrimaryActivationErr1 = 0
-MillisBeforeStop = 2000000
-IfaceStopType = EStopAuthoritative
-IfaceStopErrCode = -17210
-SubConnectionCount1 = 0
-SubConnectionCount2 = 3
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 2
-
-
-[NormalStopGUQoSDeletingSecondary1]
-SimTsyTestNum = 23
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-MillisBeforeStop = 12000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-SubConnectionCount1 = 0
-SubConnectionCount2 = 3
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 2
-
-
-[NormalStopSecondaryLowerNifDown1]
-SimTsyTestNum = 23
-SecondaryLoopbackPort = 504
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-MillisBeforeStop = 12000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-SubConnectionCount1 = 0
-SubConnectionCount2 = 3
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 2
-
-
-[NormalStopSecondaryActivating1]
-SimTsyTestNum = 24
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-MillisBeforeStop = 30000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 2
-
-
-[NormalStopSecondarySettingTFT25]
-SimTsyTestNum = 25
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-MillisBeforeStop = 30000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 2
-
-
-[GUQoSDeleteOnNormalStop1]
-SimTsyTestNum = 23
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-MillisBeforeStop = 0
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-SubConnectionCount1 = 0
-SubConnectionCount2 = 3
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 2
-
-
-; #######################################
-; PPP dependent tests
-
-[NormalStopPrimaryStartingLowerNif1]
-SimTsyTestNum = 27
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-MillisBeforeStop = 15000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-SubConnectionCount1 = 0
-SubConnectionCount2 = 1
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 2
-
-
-[NormalStopSecondaryStartingLowerNif1]
-SimTsyTestNum = 26
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-MillisBeforeStop = 15000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 2
-
-[LeaveInSpudCreation]
-SimTsyTestNum = 1010101010
-PrimaryIapId1 = 3
-PrimaryActivationErr1 = -1
-SubConnectionCount1 = 0
-SubConnectionCount2 = 1
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 2
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/te_spudNetworkSide_nifman_config.txt	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,841 +0,0 @@
-############################################################################
-############################################################################
-###################              T E S T 1              ####################
-############################################################################
-############################################################################
-# Successful Start of Primary PDP context
-############################################################################
-[test1]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-
-#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
-
-#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
-
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
-
-# failure events
-NotifyContextStatusChangeType = PublishSubscribe
-NotifyContextStatusChange = PRIMARY1, 0, 1
-NotifyContextStatusChange = PRIMARY1, 0, 1
-NotifyContextStatusChange = PRIMARY1, 0, 2
-NotifyContextStatusChange = PRIMARY1, 0, 3
-NotifyContextStatusChange = PRIMARY1, 0, 4
-NotifyContextStatusChange = PRIMARY1, 0, 5
-NotifyContextStatusChange = PRIMARY1, 0, 6
-
-
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-# EStatusDeactivating = 4 EStatusInactive = 1 EStatusDeleted = 6
-# EStatusSuspended = 5 EStatusActive = 3
-
-############################################################################
-############################################################################
-###################              T E S T 1 1            ####################
-############################################################################
-############################################################################
-# Successful Start of Primary PDP context, delay on primary deletion
-############################################################################
-[test11]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = <TName iContextName>,  <TUint iActivatePause>, <TUint iActivateErrorCode>, <TUint iDeactivatePause>, 
-# <TUint iDeactivateErrorCode>, <TUint iDeletionPause>, <TUint iDeletionErrorCode> <TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 30, 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
-
-#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
-
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2              ####################
-############################################################################
-############################################################################
-# Primary and Secondary: delay on secondary deletion.
-############################################################################
-[test2]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 20, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 250, 250, -1, -1, 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 = SECONDARY2, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-
-#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
-
-#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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 2            ####################
-############################################################################
-############################################################################
-# Secondary delay on Activation
-# Primary and Secondary.
-############################################################################
-[test22]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-# 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY2, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-
-#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
-
-#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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 3            ####################
-############################################################################
-############################################################################
-# Secondary delay on Deletion
-# Primary and Secondary.
-############################################################################
-[test23]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 20, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 250, 250, -1, -1, 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 = SECONDARY2, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-
-#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
-
-#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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 4            ####################
-############################################################################
-############################################################################
-# Secondary delay on Activation
-# Primary and Secondary.
-############################################################################
-[test24]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 60, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY2, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-
-#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
-
-#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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 5            ####################
-############################################################################
-############################################################################
-# Secondary delay on Setting TFT
-# Primary and Secondary.
-############################################################################
-[test25]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-# delay creating TFT for secondary
-CreateTftConfig = PRIMARY1, 0, 0, 60
-
-# 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY2, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-
-#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
-
-#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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 6            ####################
-############################################################################
-############################################################################
-#Primary and secondary: test long secondary start on lower NIF: 
-# Valid wintunnel for Primary, loopback to nothing for secondary.
-# Secondary delay on Starting Lower NIF
-# Primary and Secondary.
-############################################################################
-[test26]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 1
-R99ContextConfig = SECONDARY1, 0, 0, 0, 0, 0, 0, 0
-
-# delay creating TFT for secondary
-CreateTftConfig = PRIMARY1, 0, 0, 60
-
-# 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY2, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-
-#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
-
-#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= ECUART, COMM::0, 18, 0, PRIMARY1
-CommSetup= LOOPBACK, LOOPBACK::0, 18, 0, SECONDARY1
-
-
-# Primary context loops back to nothing: this causes PPP LCP negotiation to take a long time.
-[test27]
-## Successful Start of Primary PDP context
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-
-#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
-
-#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
-
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= LOOPBACK, LOOPBACK::0, 18, 0, PRIMARY1
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/te_spudNetworkSide_nifman_config_9x.txt	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,944 +0,0 @@
-############################################################################
-############################################################################
-###################              T E S T 1              ####################
-############################################################################
-############################################################################
-# Successful Start of Primary PDP context
-############################################################################
-[test1]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-
-#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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
-
-# failure events
-NotifyContextStatusChangeType = PublishSubscribe
-NotifyContextStatusChange = PRIMARY1, 0, 1
-NotifyContextStatusChange = PRIMARY1, 0, 1
-NotifyContextStatusChange = PRIMARY1, 0, 2
-NotifyContextStatusChange = PRIMARY1, 0, 3
-NotifyContextStatusChange = PRIMARY1, 0, 4
-NotifyContextStatusChange = PRIMARY1, 0, 5
-NotifyContextStatusChange = PRIMARY1, 0, 6
-
-
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-# EStatusDeactivating = 4 EStatusInactive = 1 EStatusDeleted = 6
-# EStatusSuspended = 5 EStatusActive = 3
-
-############################################################################
-############################################################################
-###################              T E S T 1 1            ####################
-############################################################################
-############################################################################
-# Successful Start of Primary PDP context, delay on primary deletion
-############################################################################
-[test11]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = <TName iContextName>,  <TUint iActivatePause>, <TUint iActivateErrorCode>, <TUint iDeactivatePause>, 
-# <TUint iDeactivateErrorCode>, <TUint iDeletionPause>, <TUint iDeletionErrorCode> <TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 30, 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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2              ####################
-############################################################################
-############################################################################
-# Primary and Secondary: delay on secondary deletion.
-############################################################################
-[test2]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 20, 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, 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
-
-#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, 1024, 1024, 0x0, 0x0, 0x01, 0x01, 0x01, 0x01, 250, 250, -1, -1, 1024, 1024
-
-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, 1024, 1024, 0x0, 0x0, 0x01, 0x01, 0x01, 0x01, 250, 250, -1, -1, 1024, 1024, 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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 2            ####################
-############################################################################
-############################################################################
-# Secondary delay on Activation
-# Primary and Secondary.
-############################################################################
-[test22]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-# 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 3            ####################
-############################################################################
-############################################################################
-# Secondary delay on Deletion
-# Primary and Secondary.
-############################################################################
-[test23]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 20, 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, 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
-
-#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, 1024, 1024, 0x0, 0x0, 0x01, 0x01, 0x01, 0x01, 250, 250, -1, -1, 1024, 1024
-
-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, 1024, 1024, 0x0, 0x0, 0x01, 0x01, 0x01, 0x01, 250, 250, -1, -1, 1024, 1024, 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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 4            ####################
-############################################################################
-############################################################################
-# Secondary delay on Activation
-# Primary and Secondary.
-############################################################################
-[test24]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 60, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 5            ####################
-############################################################################
-############################################################################
-# Secondary delay on Setting TFT
-# Primary and Secondary.
-############################################################################
-[test25]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-# delay creating TFT for secondary
-CreateTftConfig = PRIMARY1, 0, 0, 60
-
-# 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 0, 0
-QosProfileReqR99 = SECONDARY1,0x04, 0x04, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 1024, 1024, 0x0, 0x0, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 1024, 1024
-
-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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 0, 0, 0, 0
-QosProfileReqR99 = SECONDARY1,0x04, 0x04, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 1024, 1024, 0x0, 0x0, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 1024, 1024, 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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 6            ####################
-############################################################################
-############################################################################
-#Primary and secondary: test long secondary start on lower NIF: 
-# Valid wintunnel for Primary, loopback to nothing for secondary.
-# Secondary delay on Starting Lower NIF
-# Primary and Secondary.
-############################################################################
-[test26]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 1
-R99ContextConfig = SECONDARY1, 0, 0, 0, 0, 0, 0, 0
-
-# delay creating TFT for secondary
-CreateTftConfig = PRIMARY1, 0, 0, 60
-
-# 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = 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 = 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= ECUART, COMM::0, 18, 0, PRIMARY1
-CommSetup= LOOPBACK, LOOPBACK::0, 18, 0, SECONDARY1
-
-
-# Primary context loops back to nothing: this causes PPP LCP negotiation to take a long time.
-[test27]
-## Successful Start of Primary PDP context
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-
-#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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= LOOPBACK, LOOPBACK::0, 18, 0, PRIMARY1
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/te_spudNetworkSide_ppp_config_9x.txt	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,934 +0,0 @@
-############################################################################
-############################################################################
-###################              T E S T 1              ####################
-############################################################################
-############################################################################
-# Successful Start of Primary PDP context
-############################################################################
-[test1]
-# 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,192.168.2.4, 0, 2, 0, 0,RasUser,,,,194.72.6.51,194.72.6.51,0
-
-# 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
-
-
-#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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
-
-# failure events
-NotifyContextStatusChangeType = PublishSubscribe
-NotifyContextStatusChange = PRIMARY1, 0, 1
-NotifyContextStatusChange = PRIMARY1, 0, 1
-NotifyContextStatusChange = PRIMARY1, 0, 2
-NotifyContextStatusChange = PRIMARY1, 0, 3
-NotifyContextStatusChange = PRIMARY1, 0, 4
-NotifyContextStatusChange = PRIMARY1, 0, 5
-NotifyContextStatusChange = PRIMARY1, 0, 6
-
-
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-# EStatusDeactivating = 4 EStatusInactive = 1 EStatusDeleted = 6
-# EStatusSuspended = 5 EStatusActive = 3
-
-############################################################################
-############################################################################
-###################              T E S T 1 1            ####################
-############################################################################
-############################################################################
-# Successful Start of Primary PDP context, delay on primary deletion
-############################################################################
-[test11]
-# 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,192.168.2.4, 0, 2, 0, 0,RasUser,,,,194.72.6.51,194.72.6.51,0
-
-# TRel99ContextConfig = <TName iContextName>,  <TUint iActivatePause>, <TUint iActivateErrorCode>, <TUint iDeactivatePause>, 
-# <TUint iDeactivateErrorCode>, <TUint iDeletionPause>, <TUint iDeletionErrorCode> <TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 30, 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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2              ####################
-############################################################################
-############################################################################
-# Primary and Secondary: delay on secondary deletion.
-############################################################################
-[test2]
-# 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,192.168.2.4, 0, 2, 0, 0,RasUser,,,,194.72.6.51,194.72.6.51,0
-
-# 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, 20, 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, 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
-
-#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
-
-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
-
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 2            ####################
-############################################################################
-############################################################################
-# Secondary delay on Activation
-# Primary and Secondary.
-############################################################################
-[test22]
-# 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,192.168.2.4, 0, 2, 0, 0,RasUser,,,,194.72.6.51,194.72.6.51,0
-
-# 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
-
-# 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 3            ####################
-############################################################################
-############################################################################
-# Secondary delay on Deletion
-# Primary and Secondary.
-############################################################################
-[test23]
-# 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,192.168.2.4, 0, 2, 0, 0,RasUser,,,,194.72.6.51,194.72.6.51,0
-
-# 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, 20, 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, 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
-
-#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
-
-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
-
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 4            ####################
-############################################################################
-############################################################################
-# Secondary delay on Activation
-# Primary and Secondary.
-############################################################################
-[test24]
-# 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,192.168.2.4, 0, 2, 0, 0,RasUser,,,,194.72.6.51,194.72.6.51,0
-
-# 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, 60, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 5            ####################
-############################################################################
-############################################################################
-# Secondary delay on Setting TFT
-# Primary and Secondary.
-############################################################################
-[test25]
-# 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,192.168.2.4, 0, 2, 0, 0,RasUser,,,,194.72.6.51,194.72.6.51,0
-
-# 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
-
-# delay creating TFT for secondary
-CreateTftConfig = PRIMARY1, 0, 0, 60
-
-# 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 6            ####################
-############################################################################
-############################################################################
-#Primary and secondary: test long secondary start on lower NIF: 
-# Valid wintunnel for Primary, loopback to nothing for secondary.
-# Secondary delay on Starting Lower NIF
-# Primary and Secondary.
-############################################################################
-[test26]
-# 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,192.168.2.4, 0, 2, 0, 0,RasUser,,,,194.72.6.51,194.72.6.51,0
-
-# 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, 1
-R99ContextConfig = SECONDARY1, 0, 0, 0, 0, 0, 0, 0
-
-# delay creating TFT for secondary
-CreateTftConfig = PRIMARY1, 0, 0, 60
-
-# 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = 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 = 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= ECUART, COMM::0, 18, 0, PRIMARY1
-CommSetup= LOOPBACK, LOOPBACK::0, 18, 0, SECONDARY1
-
-
-# Primary context loops back to nothing: this causes PPP LCP negotiation to take a long time.
-[test27]
-## Successful Start of Primary PDP context
-# 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,192.168.2.4, 0, 2, 0, 0,RasUser,,,,194.72.6.51,194.72.6.51,0
-
-# 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
-
-
-#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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= LOOPBACK, LOOPBACK::0, 18, 0, PRIMARY1
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/te_spudNetworkSide_r4_and_r5.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,289 +0,0 @@
-[ESockCheck]
-SimTsyTestNum = 0
-
-[PrimaryActivationOk1301]
-SimTsyTestNum = 1301
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PrimaryActivationOk1302]
-SimTsyTestNum = 1302
-PrimaryIapId1 = 11
-PrimaryActivationErr1 = 0
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[SecondaryActivationOk1303]
-SimTsyTestNum = 1302
-PrimaryIapId1 = 11
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PrimaryActivationFails1304]
-SimTsyTestNum = 1304
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = -19
-
-[PrimaryActivationFails1305]
-SimTsyTestNum = 1305
-PrimaryIapId1 = 11
-PrimaryActivationErr1 = -19
-
-[SecondaryActivationFails1306]
-SimTsyTestNum = 1306
-PrimaryIapId1 = 11
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SecondaryActivationEvent2Reason = -19
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 2
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PrimaryQoSEventDelete1307]
-SimTsyTestNum = 1301
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 0
-ExpectedNifProgress = 8000
-ExpectedNifError    = -36
-
-[PrimaryQoSEventDelete1308]
-SimTsyTestNum = 1302
-PrimaryIapId1 = 11
-PrimaryActivationErr1 = 0
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 0
-ExpectedNifProgress = 8000
-ExpectedNifError    = -36
-
-[ENetworkQoSChangePrimary1311]
-SimTsyTestNum = 1301
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-QoSEventReq1 = ENetworkQoSChange
-QoSEventReq1Idx = 0
-ExpectedNifProgress = 8000
-ExpectedNifError    = -33
-
-[ENetworkQoSChangePrimary1312]
-SimTsyTestNum = 1302
-PrimaryIapId1 = 11
-PrimaryActivationErr1 = 0
-QoSEventReq1 = ENetworkQoSChange
-QoSEventReq1Idx = 0
-ExpectedNifProgress = 8000
-ExpectedNifError    = -33
-
-[PrimaryDeleteBeforeLowerNif1315]
-SimTsyTestNum = 1315
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = -4
-
-[PrimaryDeleteBeforeLowerNif1316]
-SimTsyTestNum = 1316
-PrimaryIapId1 = 11
-PrimaryActivationErr1 = -4
-
-[SecondaryDeleteBeforeLowerNif1317]
-SimTsyTestNum = 1317
-PrimaryIapId1 = 11
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SecondaryActivationEvent2Reason = -4
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PrimaryLowerNifStartFails1318]
-SimTsyTestNum = 1318
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = -46
-
-[PrimaryLowerNifStartFails1319]
-SimTsyTestNum = 1319
-PrimaryIapId1 = 11
-PrimaryActivationErr1 = -46
-
-[SecondaryLowerNifStartFails1320]
-SimTsyTestNum = 1320
-PrimaryIapId1 = 11
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SecondaryActivationEvent2Reason = -46
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PrimaryContextSuspendAndResume1321]
-SimTsyTestNum = 1302
-PrimaryIapId1 = 11
-PrimaryActivationErr1 = 0
-ContextType = EPrimaryContext
-LoopbackPort = PKTLOOPBACK::501
-CommRole = ECommRoleDCE
-QoSEventReq1Idx = 6
-QoSEventReq2Idx = 7
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[SecondaryContextSuspendAndResume1322]
-SimTsyTestNum = 1302
-PrimaryIapId1 = 11
-ContextType = ESecondaryContext
-LoopbackPort = PKTLOOPBACK::503
-CommRole = ECommRoleDCE
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-QoSEventReq1Idx = 8
-QoSEventReq2Idx = 9
-SubConnectionCount1 = 0
-SubConnectionCount2 = 3
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PrimaryActivationFails1323]
-SimTsyTestNum = 1323
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = -19
-
-[PrimaryActivationFails1324]
-SimTsyTestNum = 1324
-PrimaryIapId1 = 11
-PrimaryActivationErr1 = -19
-
-[SecondaryActivationFails1325]
-SimTsyTestNum = 1325
-PrimaryIapId1 = 11
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SecondaryActivationEvent2Reason = -2
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[SecondaryActivationFails1326]
-SimTsyTestNum = 1326
-PrimaryIapId1 = 11
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SecondaryActivationEvent2Reason = -20
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PrimaryDeletionFails1327]
-SimTsyTestNum = 1327
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-
-[PrimaryDeletionFails1328]
-SimTsyTestNum = 1328
-PrimaryIapId1 = 11
-PrimaryActivationErr1 = 0
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[SecondaryDeletionFails1329]
-SimTsyTestNum = 1329
-PrimaryIapId1 = 11
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PrimaryQoSEventDeleteWithSecondary1330]
-SimTsyTestNum = 1302
-IapId = 5
-PrimaryIapId1 = 11
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-QoSEventReq1Idx = 0
-SubConnectionCount1 = 2
-SubConnectionCount2 = 3
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PppPrimaryOk]
-SimTsyTestNum = 1
-PrimarySpudIapId = 1
-PppIapId1 = 2
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PppSecondarySend]
-SimTsyTestNum = 1
-PppIapId1 = 1
-PppIapId2 = 3
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-SubConnectionCount1 = 0
-SubConnectionCount2 = 3
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PrimarySlowInitialisePhone1331]
-SimTsyTestNum = 1331
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = -3
-
-[PrimarySlowInitialisePhone1332]
-SimTsyTestNum = 1332
-PrimaryIapId1 = 11
-PrimaryActivationErr1 = -3
-
-[MultiPrimaryActivationOk1333]
-SimTsyTestNum = 1333
-NumberOfIaps = 5
-PrimaryIapId1 = 2
-PrimaryIapId2 = 6
-PrimaryIapId3 = 7
-PrimaryIapId4 = 8
-PrimaryIapId5 = 9
-PrimaryActivationErr1 = 0
-
-[MultiPrimaryActivationOk1334]
-SimTsyTestNum = 1334
-NumberOfIaps = 5
-PrimaryIapId1 = 11
-PrimaryIapId2 = 15
-PrimaryIapId3 = 16
-PrimaryIapId4 = 17
-PrimaryIapId5 = 18
-PrimaryActivationErr1 = 0
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/te_spudNetworkSide_r4_and_r5.xml	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,853 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2004-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:
- 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_R4</Name>
-        <IAPService>OutgoingGPRS.RawIP_Bounce_1_R4</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_R4</Name>
-        <IAPService>OutgoingGPRS.SPUD_Echo_2_R4</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_R4</Name>
-        <IAPService>OutgoingGPRS.RawIP_Bounce_3_R4</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_R4</Name>
-        <IAPService>OutgoingGPRS.SPUD_Echo_4_R4</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_R4</Name>
-        <IAPService>OutgoingGPRS.RawIP_Bounce_1_R4</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_R4</Name>
-        <IAPService>OutgoingGPRS.SPUD_Multi_1_R4</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_R4</Name>
-        <IAPService>OutgoingGPRS.SPUD_Multi_2_R4</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_R4</Name>
-        <IAPService>OutgoingGPRS.SPUD_Multi_3_R4</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_R4</Name>
-        <IAPService>OutgoingGPRS.SPUD_Multi_4_R4</IAPService>
-        <IAPBearer>ModemBearer.Loopback_SPUD_8</IAPBearer>
-        <IAPNetwork>Network.Intranet6</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Mobile</LocationRef>
-    </IAP>
-
-
-    <IAP operation="add">
-        <Name>Loopback_GRPS_1_R5</Name>
-        <IAPService>OutgoingGPRS.RawIP_Bounce_1_R5</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_R5</Name>
-        <IAPService>OutgoingGPRS.SPUD_Echo_2_R5</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_R5</Name>
-        <IAPService>OutgoingGPRS.RawIP_Bounce_3_R5</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_R5</Name>
-        <IAPService>OutgoingGPRS.SPUD_Echo_4_R5</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_R5</Name>
-        <IAPService>OutgoingGPRS.RawIP_Bounce_1_R5</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_R5</Name>
-        <IAPService>OutgoingGPRS.SPUD_Multi_1_R5</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_R5</Name>
-        <IAPService>OutgoingGPRS.SPUD_Multi_2_R5</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_R5</Name>
-        <IAPService>OutgoingGPRS.SPUD_Multi_3_R5</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_R5</Name>
-        <IAPService>OutgoingGPRS.SPUD_Multi_4_R5</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_R5</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 R4</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>   
-		<R5DataCompression>NoDataCompression</R5DataCompression>
-		<R5HeaderCompression>NoHeaderCompression</R5HeaderCompression>
-		<PacketFlowIdentifier>BestEffort</PacketFlowIdentifier>
-		<UmtsGprsRelease>ConfigRel99Rel4</UmtsGprsRelease>      
-    </OutgoingGPRS>
-    
-    <OutgoingGPRS operation="add">
-        <Name>RawIP_Bounce_1_R4</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_R4</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_R4</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_R4</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_R4</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_R4</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_R4</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_R4</Name>
-      	<PDPType>IPV4</PDPType>
-        <IfParams>lowernif=RAWIP</IfParams>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>  
-        <IpAddr>192.168.1.13</IpAddr>
-    </OutgoingGPRS>
-
-    <OutgoingGPRS operation="add">
-        <Name>RawIP_Bounce_1_R5</Name>
-        <APN>Test R5</APN>
-        <PDPType>IPV4</PDPType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpAddr>192.168.1.1</IpAddr>
-	<R5DataCompression>NoDataCompression</R5DataCompression>
-	<R5HeaderCompression>NoHeaderCompression</R5HeaderCompression>
-	<UmtsGprsRelease>ConfigRel5</UmtsGprsRelease>
-    </OutgoingGPRS>
-    <OutgoingGPRS operation="add">
-        <Name>SPUD_Echo_2_R5</Name>
-        <APN>Test R5</APN>
-      	<PDPType>IPV4</PDPType>
-        <IfParams>lowernif=RAWIP</IfParams>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>  
-        <IpAddr>192.168.1.2</IpAddr>
-	<R5DataCompression>ManufacturerDefaultDataCompression</R5DataCompression>
-	<R5HeaderCompression>ManufacturerDefaultHeaderCompression</R5HeaderCompression>
-	<UmtsGprsRelease>ConfigRel5</UmtsGprsRelease>
-    </OutgoingGPRS>
-    <OutgoingGPRS operation="add">
-        <Name>RawIP_Bounce_3_R5</Name>
-        <APN>Test R5</APN>
-        <PDPType>IPV4</PDPType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpAddr>192.168.2.3</IpAddr>
-	<R5DataCompression>V42</R5DataCompression>
-	<R5HeaderCompression>Rfc1144</R5HeaderCompression>
-	<UmtsGprsRelease>ConfigRel5</UmtsGprsRelease>
-    </OutgoingGPRS> 
-    <OutgoingGPRS operation="add">
-        <Name>SPUD_Echo_4_R5</Name>
-        <APN>Test R5</APN>
-      	<PDPType>IPV4</PDPType>
-        <IfParams>lowernif=RAWIP</IfParams>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>  
-        <IpAddr>192.168.2.4</IpAddr>        
-	<R5DataCompression>V44</R5DataCompression>
-	<R5HeaderCompression>Rfc2507</R5HeaderCompression>
-	<UmtsGprsRelease>ConfigRel5</UmtsGprsRelease>
-    </OutgoingGPRS>
-    <OutgoingGPRS operation="add">
-        <Name>SPUD_Multi_1_R5</Name>
-        <APN>Test R5</APN>
-      	<PDPType>IPV4</PDPType>
-        <IfParams>lowernif=RAWIP</IfParams>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>  
-        <IpAddr>192.168.1.10</IpAddr>
-	<R5DataCompression>ManufacturerDefaultDataCompression</R5DataCompression>
-	<R5HeaderCompression>ManufacturerDefaultHeaderCompression</R5HeaderCompression>
-	<UmtsGprsRelease>ConfigRel5</UmtsGprsRelease>
-    </OutgoingGPRS>
-    <OutgoingGPRS operation="add">
-        <Name>SPUD_Multi_2_R5</Name>
-        <APN>Test R5</APN>
-      	<PDPType>IPV4</PDPType>
-        <IfParams>lowernif=RAWIP</IfParams>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>  
-        <IpAddr>192.168.1.11</IpAddr>
-	<R5DataCompression>ManufacturerDefaultDataCompression</R5DataCompression>
-	<R5HeaderCompression>ManufacturerDefaultHeaderCompression</R5HeaderCompression>
-	<UmtsGprsRelease>ConfigRel5</UmtsGprsRelease>
-    </OutgoingGPRS>
-    <OutgoingGPRS operation="add">
-        <Name>SPUD_Multi_3_R5</Name>
-        <APN>Test R5</APN>
-      	<PDPType>IPV4</PDPType>
-        <IfParams>lowernif=RAWIP</IfParams>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>  
-        <IpAddr>192.168.1.12</IpAddr>
-	<R5DataCompression>ManufacturerDefaultDataCompression</R5DataCompression>
-	<R5HeaderCompression>ManufacturerDefaultHeaderCompression</R5HeaderCompression>
-	<UmtsGprsRelease>ConfigRel5</UmtsGprsRelease>
-    </OutgoingGPRS>
-    <OutgoingGPRS operation="add">
-        <Name>SPUD_Multi_4_R5</Name>
-        <APN>Test R5</APN>
-      	<PDPType>IPV4</PDPType>
-        <IfParams>lowernif=RAWIP</IfParams>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>  
-        <IpAddr>192.168.1.13</IpAddr>
-	<R5DataCompression>ManufacturerDefaultDataCompression</R5DataCompression>
-	<R5HeaderCompression>ManufacturerDefaultHeaderCompression</R5HeaderCompression>
-	<UmtsGprsRelease>ConfigRel5</UmtsGprsRelease>
-    </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>
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/te_spudnetworkside_ppp_config2_9x.txt	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2425 +0,0 @@
-############################################################################
-############################################################################
-###################              T E S T 1              ####################
-############################################################################
-############################################################################
-# Test case for success results
-############################################################################
-[test1]
-# 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, 0,RasUser,,,,194.72.6.51,194.72.6.51,0
-
-# 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
-
-############################################################################
-############################################################################
-###################              T E S T 7 0 1          ####################
-############################################################################
-############################################################################
-# This test messes up with QosProfileNegR99 entry to trigger KContextDelete on SPUDMAN
-############################################################################
-[test701]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 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
-
-#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
-
-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
-
-
-
-#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, 700, 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, 700, 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
-
-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
-
-#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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-# failure events
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-
-# EStatusInactive = 5 EStatusDeleted = 6)
-NotifyContextStatusChange = PRIMARY1, 5, 6
-NotifyContextStatusChange = PRIMARY1, 5, 5
-NotifyContextStatusChange = SECONDARY1, 5, 6
-NotifyContextStatusChange = SECONDARY1, 5, 5
-
-
-############################################################################
-############################################################################
-###################              T E S T 8 0 1          ####################
-############################################################################
-############################################################################
-# This test sets the R99ContextConfig's iActivateErrorCode to -4 for Primary PDP Context
-############################################################################
-[test801]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = <TName iContextName>,  <TUint iActivatePause>, <TUint iActivateErrorCode>, <TUint iDeactivatePause>, 
-# <TUint iDeactivateErrorCode>, <TUint iDeletionPause>, <TUint iDeletionErrorCode> <TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, -4, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-# failure events
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-
-# EStatusInactive = 5 EStatusDeleted = 6)
-NotifyContextStatusChange = PRIMARY1, 5, 6
-NotifyContextStatusChange = PRIMARY1, 5, 5
-NotifyContextStatusChange = SECONDARY1, 5, 6
-NotifyContextStatusChange = SECONDARY1, 5, 5
-
-
-############################################################################
-############################################################################
-###################              T E S T 9 0 1          ####################
-############################################################################
-############################################################################
-# This test sets the R99ContextConfig's iActivateErrorCode to -4 for Secondary PDP Context
-############################################################################
-[test901]
-# 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, 0,RasUser,,,,,,0
-
-# 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, -4, 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, 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
-
-#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
-
-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
-
-
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-# failure events
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-
-# EStatusInactive = 5 EStatusDeleted = 6)
-NotifyContextStatusChange = PRIMARY1, 5, 6
-NotifyContextStatusChange = PRIMARY1, 5, 5
-NotifyContextStatusChange = SECONDARY1, 5, 6
-NotifyContextStatusChange = SECONDARY1, 5, 5
-
-
-############################################################################
-############################################################################
-###################              T E S T 2 0 1          ####################
-############################################################################
-############################################################################
-# Failure to Activate Primary PDP context
-############################################################################
-[test201]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = <TName iContextName>,  <TUint iActivatePause>, <TUint iActivateErrorCode>, <TUint iDeactivatePause>, 
-# <TUint iDeactivateErrorCode>, <TUint iDeletionPause>, <TUint iDeletionErrorCode> <TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, -19, 0, 0, 0, 0, 0
-R99ContextConfig = PRIMARY1, 0, -19, 0, 0, 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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 1 0          ####################
-############################################################################
-############################################################################
-# Failure to Start the Lower Nif for the Primary Context
-############################################################################
-[test210]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-
-#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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-
-# Supply an invalid port name for primary context to SPUD
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, INVALID::1, 18, 0, PRIMARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 1 1          ####################
-############################################################################
-############################################################################
-# 
-############################################################################
-NTRAS PPP
-[test211]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 1
-
-
-#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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= ECUART, COMM::0, 18, 0, PRIMARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 1 2         ####################
-############################################################################
-############################################################################
-# 'la-la land loopback' PPP: No peer is provided, all LPC frames are discarded by the CSY.
-# This results in the LCP negotiation taking as long as we want. This gives up time to inject events.
-############################################################################
-[test212]
-# 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,192.168.2.4, 0, 2, 0, 0,RasUser,,,,194.72.6.51,194.72.6.51,0
-
-# 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
-
-
-#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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::0, 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
-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
-
-############################################################################
-############################################################################
-###################              T E S T 3 0 1          ####################
-############################################################################
-############################################################################
-# failure to activate secondary PDP context
-############################################################################
-[test301]
-# 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, 0,RasUser,,,,,,0
-
-# 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, -19, 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, 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
-
-
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-# When the value 0 is published to KPSSimtsyPacketContextStatusChange the first primary context will be deleted (status = EStatusDeleted = 6)
-NotifyContextStatusChange = SECONDARY1, 0, 6
-
-#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
-
-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
-
-#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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-
-#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
-
-QosR5NetworkNotification = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
-
-
-
-#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>
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 3 1 0          ####################
-############################################################################
-############################################################################
-# failure to Start the lower NIF for the Secondary PDP context
-############################################################################
-[test310]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-# 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, 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
-
-
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-# When the value 0 is published to KPSSimtsyPacketContextStatusChange the first primary context will be deleted (status = EStatusDeleted = 6)
-NotifyContextStatusChange = SECONDARY1, 0, 6
-
-#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
-
-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
-
-
-#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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-#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
-
-QosR5NetworkNotification = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
-
-
-#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>
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, INVALID_PORT::0, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 3 1 1          ####################
-############################################################################
-############################################################################
-# failure to Start the lower NIF for the Secondary PDP context 
-# (PPP as lower NIF)
-############################################################################
-[test311]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 1
-R99ContextConfig = SECONDARY1, 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, 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
-
-
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-# When the value 0 is published to KPSSimtsyPacketContextStatusChange the first primary context will be deleted (status = EStatusDeleted = 6)
-NotifyContextStatusChange = SECONDARY1, 0, 6
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-#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
-
-QosR5NetworkNotification = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
-
-
-
-#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>
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= ECUART, COMM::0, 18, 0, PRIMARY1
-CommSetup= ECUART, INVALID::1, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 1 8            ####################
-############################################################################
-############################################################################
-# R99ContextConfig ActivateErrorCode is modified to -19 for PRIMARY1. This 
-# way primary context activation will fail with an error code (-19)
-############################################################################
-[test18]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, -19, 0, 0, 0, 0, 0
-R99ContextConfig = SECONDARY1, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 1 9            ####################
-############################################################################
-############################################################################
-# TFT filter, srcAddr value is modified so that the secondary context 
-# creation fails due to TFT settings failure.
-############################################################################
-[test19]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = SECONDARY1, 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, 0, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.3, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-
-############################################################################
-############################################################################
-###################              T E S T 2 0            ####################
-############################################################################
-############################################################################
-# QosProfileReqR99 for SECONDARY1 reqTraffic and minTraffic values are 
-# modified so that secondary PDP context creation fails due to Requested QoS
-# parameter mismatch.
-############################################################################
-[test20]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = SECONDARY1, 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, 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
-
-#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,0x08, 0x08, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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,0x08, 0x08, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 1            ####################
-############################################################################
-############################################################################
-# R99ContextConfig DeletionErrorCode is modified to -19 for PRIMARY1. This 
-# way primary context deletion will fail with an error code (-19)
-############################################################################
-[test21]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, -19, 0
-R99ContextConfig = SECONDARY1, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-
-############################################################################
-############################################################################
-###################              T E S T 2 2            ####################
-############################################################################
-############################################################################
-# R99ContextConfig DeletionErrorCode is modified to -19 for SECONDARY1. This 
-# way primary context deletion will fail with an error code (-19)
-############################################################################
-[test22]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = SECONDARY1, 0, 0, 0, 0, 0, -19, 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, 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
-
-#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
-
-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
-
-#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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 24             ####################
-############################################################################
-############################################################################
-[test24]
-PhoneInitialiseDelay = 999
-
-############################################################################
-############################################################################
-############################################################################
-############################################################################
-
-############################################################################
-############################################################################
-###################              T E S T 25             ####################
-############################################################################
-############################################################################
-# Test case for success results
-############################################################################
-[test25]
-# 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, 0,RasUser,,,,,,0
-
-# 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 = PRIMARY2, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = PRIMARY3, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = PRIMARY4, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = PRIMARY5, 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 = PRIMARY2,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 = PRIMARY3,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 = PRIMARY4,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 = PRIMARY5,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 = PRIMARY2,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 = PRIMARY3,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 = PRIMARY4,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 = PRIMARY5,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 = PRIMARY2, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-QosProfileNegR99 = PRIMARY3, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-QosProfileNegR99 = PRIMARY4, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-QosProfileNegR99 = PRIMARY5, 0x03, 0x01, 0x03, 0x01, 1, 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, 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 = PRIMARY2, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-QosProfileNegR5 = PRIMARY3, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-QosProfileNegR5 = PRIMARY4, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-QosProfileNegR5 = PRIMARY5, 0x03, 0x01, 0x03, 0x01, 1, 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, 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 = PRIMARY3, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-QosNetworkNotification = PRIMARY4, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-QosNetworkNotification = PRIMARY5, 0x04, 0x02, 0x04, 0x02, 2, 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 = PRIMARY3, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
-QosR5NetworkNotification = PRIMARY4, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
-QosR5NetworkNotification = PRIMARY5, 0x04, 0x02, 0x04, 0x02, 2, 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::510, 18, 0, PRIMARY2
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::512, 18, 0, PRIMARY3
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::514, 18, 0, PRIMARY4
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::516, 18, 0, PRIMARY5
-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 = PRIMARY2, 0, 6
-NotifyContextStatusChange = PRIMARY3, 0, 6
-NotifyContextStatusChange = PRIMARY4, 0, 6
-NotifyContextStatusChange = PRIMARY5, 0, 6
-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 = PRIMARY2, 0, 5
-NotifyContextStatusChange = PRIMARY3, 0, 5
-NotifyContextStatusChange = PRIMARY4, 0, 5
-NotifyContextStatusChange = PRIMARY5, 0, 5
-NotifyContextStatusChange = SECONDARY1, 0, 5
-NotifyContextStatusChange = SECONDARY1, 0, 3
-
-
-############################################################################
-############################################################################
-###################              T E S T 100              ####################
-############################################################################
-############################################################################
-# Test case for success results
-############################################################################
-[test100]
-# 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, 0,RasUser,,,,,,0
-
-#SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-SetContextConfigR5= 0, SYMBIAN INTERNET PROVIDER, PROTOCOL ADDRESS, 0, 2, USER3, PASSWORD3, CHALLENGE3, RESPONSE3, PRIMARYSERVER3, SECONDARYSERVER3, 3, 2, 1, 1
-
-#AdditionalParamItem= <TPcoProtocolId>, <TBuf8 AdditionalParamData>
-AdditionalParamItem= 0x04, ADDITIONALPARAM1
-
-# 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
-
-
-# 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, 0x04, 0x01, 0x08, 0x08, -1, -1, -1, -1,0,0, 0x20, 1, 0x10 ,1 ,2 ,1 ,1 ,250 ,-1 ,-1 ,0 ,0
-#Added for test case 29
-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
-#Added for test case 30
-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
-
-
-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, 0x04, 0x01, 0x08, 0x08, -1, -1, -1, -1,0,0, 0x20, 1, 0x10 ,1 ,2 ,1 ,1 ,250 ,-1 ,-1 ,0 ,0 ,1 ,1
-#Added for test case 29
-QosProfileReqR5 = SECONDARY1,0x04, 0x04, 0x04, 0x01, 0x08, 0x08, -1, -1, -1, -1,0,0, 0x20, 1, 0x10 ,1 ,2 ,1 ,1 ,250 ,-1 ,-1 ,0 ,0 ,0 ,0
-#Added for test case 30
-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
-
-
-#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 = 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, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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, 1, 1
-#for test case 29
-QosProfileNegR5 = SECONDARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-#for test case 30
-QosProfileNegR5 = SECONDARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 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 = SECONDARY1, 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 = SECONDARY1, 0x04, 0x02, 0x04, 0x02, 1, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 1
-QosR5NetworkNotification = SECONDARY1, 0x04, 0x02, 0x04, 0x02, 1, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 1
-
-
-#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
-
-
-############################################################################
-# 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
-
-############################################################################
-############################################################################
-###################              T E S T 1 0 1           ####################
-############################################################################
-############################################################################
-# QosProfileReqR99 for SECONDARY1 reqTraffic and minTraffic values are 
-# modified so that secondary PDP context creation fails due to Requested QoS
-# parameter mismatch.
-############################################################################
-[test101]
-# 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, 0,RasUser,,,,,,0
-
-#SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-SetContextConfigR5= 0, SYMBIAN INTERNET PROVIDER, PROTOCOL ADDRESS, 0, 2, USER3, PASSWORD3, CHALLENGE3, RESPONSE3, PRIMARYSERVER3, SECONDARYSERVER3, 3, 2, 1, 1
-
-#AdditionalParamItem= <TPcoProtocolId>, <TBuf8 AdditionalParamData>
-AdditionalParamItem= 0x04, ADDITIONALPARAM1
-
-
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = SECONDARY1, 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, 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
-
-#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,0x08, 0x08, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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,0x08, 0x08, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 102              ####################
-############################################################################
-############################################################################
-# Test case for success results
-############################################################################
-[test102]
-# 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, 0,RasUser,,,,,,0
-
-#SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-SetContextConfigR5= 0, SYMBIAN INTERNET PROVIDER, PROTOCOL ADDRESS, 0, 2, USER3, PASSWORD3, CHALLENGE3, RESPONSE3, PRIMARYSERVER3, SECONDARYSERVER3, 3, 2, 1, 1
-
-#AdditionalParamItem= <TPcoProtocolId>, <TBuf8 AdditionalParamData>
-AdditionalParamItem= 0x04, ADDITIONALPARAM1
-
-# 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
-
-
-# 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, 0x04, 0x01, 0x08, 0x08, -1, -1, -1, -1,0,0, 0x20, 1, 0x10 ,1 ,2 ,1 ,1 ,250 ,-1 ,-1 ,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, 0x04, 0x01, 0x08, 0x08, -1, -1, -1, -1,0,0, 0x20, 1, 0x10 ,1 ,2 ,1 ,1 ,250 ,-1 ,-1 ,0 ,0 ,1 ,1
-
-
-#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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 1, 1
-QosProfileNegR5 = SECONDARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 1, 1
-
-
-#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 = SECONDARY1, 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 = SECONDARY1, 0x04, 0x02, 0x04, 0x02, 1, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 1, 0
-QosR5NetworkNotification = SECONDARY1, 0x04, 0x02, 0x04, 0x02, 1, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 1, 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
-
-
-############################################################################
-# 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
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/TE_PppSize_config.txt	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-[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,,, 0, 2, 0, 0,RasUser,pass,,,,,0
-
-# 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, 1
-
-# 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
-
-#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
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3,0,0
-
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= ECUART, COMM::0, 18, 0, PRIMARY1
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/TE_PppSize_spud.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-// Parameters configuration for Tpppsize.EXE test
-
-// Comms driver to load at startup
-
-[CommsDrivers]
-WinsPDDname = ECDRV
-WinsLDDname = ECOMM
-WinsLDDFname = ECOMM
-ThumbPDDname = EUART1
-ThumbLDDname = ECOMM
-ThumbLDDFname = FCOMM
-
-
-// Ip Address of the echo server machine
-// Note: this machine must be up and running and listening on the echo port
-// This can be checked on NT4 by typing  NETSTAT -a
-
-[AddressInfo]
-TestPPPIPAddr = 192.168.30.13
-
-[MMUInfo]
-TestPPPminMMU = 1
-TestPPPmaxMMU = 1500
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/TE_PppSize_spud.xml	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,325 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-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:
- CommDB Settings File
- 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">
-
-<NetworkTable>
-    <Network operation="add">
-        <Name>NT RAS</Name>
-    </Network>
-</NetworkTable>
-
-<IAPTable>
-    <IAP operation="add">
-        <Name>Actual NT RAS</Name>
-        <IAPService>OutgoingGPRS.NT RAS</IAPService>
-        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
-        <IAPNetwork>Network.NT RAS</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
-    </IAP>
-</IAPTable>
-
-<ModemBearerTable>
-    <ModemBearer operation="template">
-        <Name>Default Modem</Name>
-        <Agent>NULLAGT</Agent>
-        <BCAStack>C32Bca</BCAStack>
-        <TSYName>SIM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <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>AFTERDIALUNTILANSWER</SpeakerPref>
-        <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>
-        <LastSocketActivityTimeout>32</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>8</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>16</LastSocketClosedTimeout>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    
-    <ModemBearer operation="add">
-        <Name>Null Modem 115200bps</Name>
-        <BCAStack>C32Bca</BCAStack> <!-- This may be overwriten by some tests -->
-        <IfName>SPUD</IfName>        
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>4</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>
-        <MinimumSignalLevel>0</MinimumSignalLevel>
-        <LastSocketActivityTimeout>15</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>5</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
-    </ModemBearer>
-</ModemBearerTable>
-
-<LANBearerTable>
-</LANBearerTable>
-
-<DialInISPTable>
-</DialInISPTable>
-
-<DialOutISPTable>
-</DialOutISPTable>
-
-<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.Actual NT RAS</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.Office</LocationForDataAndFax>
-        <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
-        <GPRSClassCBearer>GSM</GPRSClassCBearer>
-        <DefaultNetwork>Network.NT RAS</DefaultNetwork>
-        <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
-    </GlobalSettings>
-</GlobalSettingsTable>
-
-<IncomingGPRSTable>
-</IncomingGPRSTable>
-
-<OutgoingGPRSTable>
-    <OutgoingGPRS operation="template">
-        <Name>Default Dial Out ISP</Name>
-        <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>
-        <IfAuthPass>pass</IfAuthPass>
-        <AuthRetries>1</AuthRetries>
-        <IpNameServer1>194.72.6.51</IpNameServer1>
-        <IpNameServer2>194.72.6.51</IpNameServer2>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-    </OutgoingGPRS>
-    
-    <OutgoingGPRS operation="add">
-        <Name>NT RAS</Name>
-      	<PDPType>IPV4</PDPType>
-        <IfParams>lowernif=PPP</IfParams>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>  
-        <IfAuthPass>pass</IfAuthPass>
-    </OutgoingGPRS>
-</OutgoingGPRSTable>
-
-<DefaultGPRSTable>
-</DefaultGPRSTable>
-
-<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>
-</LocationTable>
-
-<SecureSocketTable>
-</SecureSocketTable>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-</VpnServiceTable>
-
-
-</CommDB:Config>
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/TE_SpudNetworkSideLoopbackCSY.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-# Defining a loopback between port A and B is as follows:
-# Port = <PortA>,<PortB>,<delay>,<queue size>,<element (packet) size>
-
-[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
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/TE_SpudNetworkSideLoopbackCSY_serial.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-# Loopback CSY ports are configured to be in serial mode (because of SerialLoopbackPort=0). The '=0' is needed for the config file parser to retrieve the value.
-# Defining a loopback between port A and B is as follows for serial mode loopback:
-# Port = <PortA>,<PortB>,<delay>,<buffer size>
-
-[Defaults]
-SerialLoopbackPort=0
-Port= 0,1,1,15000
-Port= 501,502,0,15000
-Port= 503,504,0,15000
-Port= 505,506,0,15000
-Port= 507,508,0,15000
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/TE_SpudNetworkSide_9x.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-[PrimaryLowerNifStartFails210]
-SimTsyTestNum = 210
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = -46
-
-[PrimaryLowerNifStartError210]
-SimTsyTestNum = 210
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = -1
-
-
-[SecondaryLowerNifStartFails310]
-SimTsyTestNum = 310
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SecondaryActivationEvent2Reason = -46
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/TE_SpudNetworkSide_Channel_config.txt	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-############################################################################
-############################################################################
-###################              T E S T 1              ####################
-############################################################################
-############################################################################
-# 
-############################################################################
-[test1]
-# 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, 0,RasUser,,,,,,0
-
-# 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 = 2, 33, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.2, 255.255.255.255.255.255.255.255.255.255.255.255.255.255.255.255, 17, 3462, 3462, 1032, 1032, 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, 0x02, 0x02, 0x08, 0x08, 1500, 1500, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY2, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-
-#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
-
-#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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-# failure events
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-
-# EStatusInactive = 5 EStatusDeleted = 6)
-NotifyContextStatusChange = PRIMARY1, 5, 6
-NotifyContextStatusChange = PRIMARY1, 5, 5
-NotifyContextStatusChange = SECONDARY1, 5, 6
-NotifyContextStatusChange = SECONDARY1, 5, 5
-
-
-############################################################################
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/TE_SpudNetworkSide_PppLoopback.xml	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,398 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2004-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:
- 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>
-</NetworkTable>
-
-<IAPTable>
-    <IAP operation="add">
-        <Name>Loopback_GRPS_1</Name>
-        <IAPService>DialOutISP.Ppp_Bounce_1</IAPService>
-        <IAPBearer>ModemBearer.Loopback_Ppp_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>DialOutISP.Ppp_Bounce_3</IAPService>
-        <IAPBearer>ModemBearer.Loopback_Ppp_3</IAPBearer>
-        <IAPNetwork>Network.Intranet</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_Ppp_1</Name>
-        <IfName>PPP</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_Ppp_3</Name>
-        <IfName>PPP</IfName>
-        <CSYName>PKTLOOPBACK</CSYName>
-        <PortName>PKTLOOPBACK::503</PortName>
-    </ModemBearer>
-
-</ModemBearerTable>
-
-<LANBearerTable>
-</LANBearerTable>
-
-<LANServiceTable>
-</LANServiceTable>
-
-<DialInISPTable>
-</DialInISPTable>
-
-<DialOutISPTable>
-    <DialOutISP operation="template">
-        <Name>Default Dial Out ISP</Name>
-		<DialResolution>FALSE</DialResolution> 
-		<UseLoginScript>FALSE</UseLoginScript>
-		<PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-
-      	<IfAuthName>RasUser</IfAuthName>
-        <AuthRetries>1</AuthRetries>
-        <IpNetMask>255.255.255.0</IpNetMask>
-        <IfNetworks>ip</IfNetworks>
-		<IfServerMode>TRUE</IfServerMode>
-        <IpNameServer1>194.72.6.51</IpNameServer1>
-        <IpNameServer2>194.72.6.51</IpNameServer2>
-    </DialOutISP>    
-
-    <DialOutISP operation="add">
-		<Name>Ppp_Bounce_1</Name>
-		<DialResolution>FALSE</DialResolution> 
-		<UseLoginScript>FALSE</UseLoginScript>
-		<PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-
-        <IpAddr>192.168.1.1</IpAddr>
-		<IpGateway>192.168.1.2</IpGateway>
-    </DialOutISP>    
-
-    <DialOutISP operation="add">
-		<Name>Ppp_Bounce_3</Name>
-		<DialResolution>FALSE</DialResolution> 
-		<UseLoginScript>FALSE</UseLoginScript>
-		<PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-
-        <IpAddr>192.168.1.1</IpAddr>
-		<IpGateway>192.168.1.2</IpGateway>
-    </DialOutISP>    
-</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>
-    </OutgoingGPRS>
-    
-    <OutgoingGPRS operation="add">
-        <Name>SPUD_Echo_2</Name>
-      	<PDPType>IPV4</PDPType>
-        <IfParams>lowernif=PPP</IfParams>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>  
-    </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>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-</VpnServiceTable>
-
-
-</CommDB:Config>
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/qospolicies.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-# ModuleSpecs
-modulespec guqos= {
-	STRING module = guqos.prt
-	INTEGER id=368
-	INTEGER flags = 1
-	}
-
-# FlowSpecs
-flowspec override = {
-	INTEGER token_rate_uplink = 1500
-	}
-
-flowspec default_flow_spec = {
-	INTEGER max_transfer_rate_uplink = 1500
-	INTEGER token_rate_uplink = 1500
-	INTEGER token_bucket_size_uplink = 3000
-	INTEGER max_packet_size_uplink = 1500
-	INTEGER min_policed_unit_uplink = 1500
-	INTEGER priority_uplink = 1
-	INTEGER drop_mode_uplink = 8
-	INTEGER max_transfer_rate_downlink = 1500
-	INTEGER token_rate_downlink = 1500
-	INTEGER token_bucket_size_downlink = 3000
-	INTEGER max_packet_size_downlink = 1500
-	INTEGER min_policed_unit_downlink = 1500
-	INTEGER priority_downlink = 1
-	INTEGER drop_mode_downlink = 8
-	}
-
-# UMTS Specs
-
-# Default APN should always be specified!
-extension_spec default_extension_spec = {
-	INTEGER	type = 5
-	INTEGER extension_type = 5
-	INTEGER TrafficClassRequested = 4
-	INTEGER MaxBitrateUplinkRequested = 2048
-	INTEGER MaxBitrateDownlinkRequested = 2048
-	INTEGER GuaBitrateUplinkRequested = 1024
-	INTEGER GuaBitrateDownlinkRequested = 1024
-	INTEGER HeaderCompressionRequested = 1
-	}
-
-extension_spec guqos_default = {
-	INTEGER type = 5
-	INTEGER extension_type = 5
-	# Subscribed
-	INTEGER TrafficClassRequested = 1
-	# Subscribed
-	INTEGER TrafficClassMinimum = 1
-	# Subscribed
-	INTEGER DeliveryOrderRequested = 1
-	# Subscribed
-	INTEGER DeliveryOrderMinimum = 1
-	# Subscribed
-	INTEGER DeliveryOfErroneusSduRequested = 1
-	# Subscribed
-	INTEGER DeliveryOfErroneusSduMinimum = 1
-	# Subscribed
-	INTEGER MaxSduSizeRequested = 0
-	# Subscribed
-	INTEGER MaxSduSizeMinimum = 0
-	# Subscribed
-	INTEGER MaxBitrateUplinkRequested = 0
-	# Subscribed
-	INTEGER MaxBitrateDownlinkRequested = 0
-	# Subscribed
-	INTEGER MaxBitrateUplinkMinimum = 0
-	# Subscribed
-	INTEGER MaxBitrateDownlinkMinimum = 0
-	# iReqBER Subscribed
-	INTEGER ResidualBerRequested = 1
-	# iMaxBER Subscribed
-	INTEGER ResidualBerMinimum = 1
-	# ReqSDUErrorratio Subscribed
-	INTEGER ErrorRatioRequested = 1
-	# MaxSDUErrorratio Subscribed
-	INTEGER ErrorRatioMinimum =1
-	INTEGER PriorityRequested = 1
-	INTEGER PriorityMinimum = 1
-    # Subscribed
-	INTEGER TransferDelayRequested = 0
-    # Subscribed
-	INTEGER TransferDelayMinimum = 0
-    # Subscribed
-	INTEGER GuaBitrateUplinkRequested = 0
-    # Subscribed
-	INTEGER GuaBitrateUplinkMinimum = 0
-    # Subscribed
-	INTEGER GuaBitrateDownlinkRequested = 0
-    # Subscribed
-	INTEGER GuaBitrateDownlinkMinimum = 0
-}
-
-
-
-# Default APN should always be specified!
-extension_spec web = {
-	INTEGER type = 5
-	INTEGER extension_type = 5
-	INTEGER TrafficClassRequested = 3
-	INTEGER MaxBitrateUplinkRequested = 2048
-	INTEGER MaxBitrateDownlinkRequested = 2048
-	INTEGER GuaBitrateUplinkRequested = 1024
-	INTEGER GuaBitrateDownlinkRequested = 1024
-	INTEGER HeaderCompressionRequested = 1
-	}
-
-
-# Module selectors (none)
-#module_policy dst_port 0 dst_port_max 65535 priority 1 = { guqos }
-
-# Flowspec selectors
-flowspec_policy dst_port 9 priority 1 = { default_flow_spec }
-#flowspec_policy dst_port 0 dst_port_max 65535 priority 2 = { override }
-#flowspec_policy dst_port 0 priority 0 = { default }
-
-# GPRS selectors
-# extension_policy src_port 0 src_port_max 65535 priority 0  = { default_extension_spec }
-
-# guqos_default 
-extension_policy src_port 0 src_port_max 65535 priority 0 = { guqos_default }
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/te_SpudNetworkSide.xml	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,517 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2004-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:
- 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>
-    </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>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-</VpnServiceTable>
-
-
-</CommDB:Config>
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/te_SpudNetworkSide_nifman.xml	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,312 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2005-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:
- CommDB Settings File for GT0233 PREQ397 SPUD 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">
-
-<NetworkTable>
-    <Network operation="add">
-        <Name>Intranet</Name>
-    </Network>
-    
-    <Network operation="add">
-        <Name>Intranet2</Name>
-    </Network>
-</NetworkTable>
-
-<IAPTable>
-    <IAP operation="add">
-        <Name>SPUD_1</Name>
-        <IAPService>OutgoingGPRS.RawIP_1</IAPService>
-        <IAPBearer>ModemBearer.SPUD_1</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Mobile</LocationRef>
-    </IAP>
-    
-    <IAP operation="add">
-        <Name>GRPS_2</Name>
-        <IAPService>OutgoingGPRS.RawIP_1</IAPService>
-        <IAPBearer>ModemBearer.SPUD_2</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Mobile</LocationRef>
-    </IAP>
-    
-    <IAP operation="add">
-        <Name>CrashIAP</Name>
-        <IAPService>OutgoingGPRS.LeaveInNifCreation</IAPService>
-        <IAPBearer>ModemBearer.SPUD_1</IAPBearer>
-        <IAPNetwork>Network.Intranet</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>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    
-    <!-- Normal timeouts -->
-    <ModemBearer operation="add">
-        <Name>SPUD_1</Name>
-        <IfName>SPUD</IfName>
-        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>                
-    </ModemBearer>
-    
-    <!-- Short timeouts -->
-    <ModemBearer operation="add">
-        <Name>SPUD_2</Name>
-        <IfName>SPUD</IfName>
-        <LastSessionClosedTimeout>4</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>6</LastSocketClosedTimeout>
-        <LastSocketActivityTimeout>8</LastSocketActivityTimeout>                
-    </ModemBearer>    
-</ModemBearerTable>
-
-
-
-<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.SPUD_1</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>
-    </OutgoingGPRS>
-
-    
-    <OutgoingGPRS operation="add">
-        <Name>RawIP_1</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>LeaveInNifCreation</Name>
-        <PDPType>IPV4</PDPType>
-        <IfParams>lowernif=Crash</IfParams>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>  
-        <IpAddr>192.168.1.2</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>
-
-
-
-
-</CommDB:Config>
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/te_SpudNetworkSide_ppp.xml	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,303 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2005-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:
- CommDB Settings File for GT0233 PREQ397 SPUD Network-side events /errors testing using PPP as lower NIF.
- 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">
-
-<NetworkTable>
-    <Network operation="add">
-        <Name>Intranet</Name>
-    </Network>
-    
-    <Network operation="add">
-        <Name>Intranet2</Name>
-    </Network>
-</NetworkTable>
-
-<IAPTable>
-    <IAP operation="add">
-        <Name>SPUD_PPP_GRPS_1</Name>
-        <IAPService>OutgoingGPRS.PPP_1</IAPService>
-        <IAPBearer>ModemBearer.SPUD_PPP_1</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Mobile</LocationRef>
-    </IAP>
-    <IAP operation="add">
-        <Name>SPUD_PPP_GRPS_2</Name>
-        <IAPService>OutgoingGPRS.PPP_1</IAPService>
-        <IAPBearer>ModemBearer.SPUD_PPP_2</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Mobile</LocationRef>
-    </IAP>
-    
-    <IAP operation="add">
-        <Name>SPUD_PPP_GRPS_3</Name>
-        <IAPService>OutgoingGPRS.PPP_1</IAPService>
-        <IAPBearer>ModemBearer.SPUD_PPP_3</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Mobile</LocationRef>
-    </IAP>
-    
-</IAPTable>
-
-
-<ModemBearerTable>
-    <ModemBearer operation="template">
-        <Name>Default Modem</Name>
-        <Agent>NULLAGT</Agent>
-        <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>8</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>16</LastSocketClosedTimeout>
-        <LastSocketActivityTimeout>32</LastSocketActivityTimeout>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    
-    <ModemBearer operation="add">
-        <Name>SPUD_PPP_1</Name>
-        <CSYName>LOOPBACK</CSYName>
-        <BCAStack>C32Bca</BCAStack> <!-- This may be overwriten by some tests -->
-        <IfName>SPUD</IfName>        
-    </ModemBearer>
-
-    <ModemBearer operation="add">
-        <Name>SPUD_PPP_2</Name>
-        <IfName>SPUD</IfName>        
-        <BCAStack>INVALID_BCA_NAME</BCAStack>
-    </ModemBearer>
-    
-    <ModemBearer operation="add">
-        <Name>SPUD_PPP_3</Name>
-        <CSYName>PKTLOOPBACK</CSYName>
-        <BCAStack>C32Bca</BCAStack> 
-        <IfName>SPUD</IfName>        
-    </ModemBearer>
-
-</ModemBearerTable>
-
-
-<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.SPUD_PPP_GRPS_1</IAPRef>
-    </ConnectionPreferences>    
-</ConnectionPreferencesTable>
-
-<GlobalSettingsTable>
-    <GlobalSettings operation="add">
-        <Name>GlobalSettingsTable1</Name>
-        <RedialAttempts>3</RedialAttempts>
-        <SmsReceiveMode>2</SmsReceiveMode>
-        <GPRSAttachMode>1</GPRSAttachMode>
-        <AcceptIncomingGprs>1</AcceptIncomingGprs>
-        <ConnectionAttempts>1</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>
-    </OutgoingGPRS>
-    
-    <OutgoingGPRS operation="add">
-        <Name>PPP_1</Name>
-      	<PDPType>IPV4</PDPType>
-        <IfParams>lowernif=PPP</IfParams>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>  
-        <IpAddr>192.168.2.4</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>
-
-
-</CommDB:Config>
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/te_spudNetworkSide.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,261 +0,0 @@
-[ESockCheck]
-SimTsyTestNum = 0
-
-
-[PrimaryActivationOk1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-
-[SecondaryActivationOk1]
-SimTsyTestNum = 1
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-
-
-[PrimaryDeleteOnLowerNifStart212]
-SimTsyTestNum = 212
-PrimaryIapId1 = 3
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 0
-ExpectedNifProgress = 8000
-ExpectedNifError    = -36
-MillisBeforeEvent = 10000000
-
-
-[PrimaryDeleteBeforeLowerNif]
-SimTsyTestNum = 801
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = -4
-
-[SecondaryDeleteBeforeLowerNif]
-SimTsyTestNum = 901
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SecondaryActivationEvent2Reason = -4
-
-[SecondaryActivationJoin]
-SimTsyTestNum = 1
-SecondaryActivationEvent1 = EQoSEventConfirm
-OptionalQoSEvent1 = EQoSEventAdapt
-OptionalQoSEvent1Reason = 0
-ExpQoSEvent1 = EQoSEventJoin
-ExpQoSEvent1Reason = 0
-
-[SecondaryActivationChangeQoS]
-SimTsyTestNum = 1
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-ExpQoSEvent1 = EQoSEventAddPolicy
-ExpQoSEvent1Reason = 0
-OptionalQoSEvent1 = EQoSEventAdapt
-OptionalQoSEvent1Reason = 0
-ExpQoSEvent2 = EQoSEventConfirm
-
-
-[KContextDelete]
-SimTsyTestNum = 701
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SecondaryActivationEvent2Reason = 2
-
-[ENetworkQoSChangePrimary]
-SimTsyTestNum = 1
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-QoSEventReq1 = ENetworkQoSChange
-QoSEventReq1Idx = 0
-ExpectedNifProgress = 8000
-ExpectedNifError    = -33
-
-[ENetworkQoSChangeSecondary]
-SimTsyTestNum = 1
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-QoSEventReq1 = ENetworkQoSChange
-QoSEventReq1Idx = 2
-ExpQoSEvent1 = EQoSEventAdapt
-ExpQoSEvent1Reason = 0
-
-
-[PrimaryActivationFails201]
-SimTsyTestNum = 201
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = -19
-
-[SecondaryActivationFails301]
-SimTsyTestNum = 301
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SecondaryActivationEvent2Reason = -19
-
-[PrimaryActivationFails18]
-SimTsyTestNum = 18
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = -19
-
-[SecondaryActivationFails19]
-SimTsyTestNum = 19
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SecondaryActivationEvent2Reason = -2
-
-[SecondaryActivationFails20]
-SimTsyTestNum = 20
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SecondaryActivationEvent2Reason = -20
-
-[PrimaryDeletionFails21]
-SimTsyTestNum = 21
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-
-[SecondaryDeletionFails22]
-SimTsyTestNum = 22
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-
-
-[SecondaryQosEventDelete1]
-SimTsyTestNum = 1
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 3
-OptionalQoSEvent1 = EQoSEventAdapt
-OptionalQoSEvent1Reason = 0
-ExpQoSEvent1 = EQoSEventFailure
-ExpQoSEvent1Reason = 0
-
-[SecondaryQosEventDeactivate1]
-SimTsyTestNum = 1
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 4
-ExpQoSEvent1 = EQoSEventAdapt
-ExpQoSEvent1Reason = 0
-QoSEventReq2 = EContextStatusChange
-QoSEventReq2Idx = 5
-ExpQoSEvent2 = EQoSEventAdapt
-ExpQoSEvent2Reason = 0
-
-[PrimaryQoSEventDelete1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 0
-ExpectedNifProgress = 8000
-ExpectedNifError    = -36
-
-[PrimaryQoSEventDeleteWithSecondary]
-SimTsyTestNum = 1
-IapId = 5
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-QoSEventReq1Idx = 0
-
-[PrimaryQoSEventDeactivate1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 1
-ExpectedNifProgress = 8000
-ExpectedNifError    = 0
-
-
-[PrimaryContextSuspendAndResume]
-SimTsyTestNum = 1
-ContextType = EPrimaryContext
-LoopbackPort = PKTLOOPBACK::501
-CommRole = ECommRoleDCE
-QoSEventReq1Idx = 6
-QoSEventReq2Idx = 7
-
-
-[SecondaryContextSuspendAndResume]
-SimTsyTestNum = 1
-ContextType = ESecondaryContext
-LoopbackPort = PKTLOOPBACK::503
-CommRole = ECommRoleDCE
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-QoSEventReq1Idx = 8
-QoSEventReq2Idx = 9
-
-[PppPrimaryOk]
-SimTsyTestNum = 1
-PrimarySpudIapId = 1
-PppIapId1 = 2
-
-[PppSecondarySend]
-SimTsyTestNum = 1
-PppIapId1 = 1
-PppIapId2 = 3
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-
-[PrimarySlowInitialisePhone]
-SimTsyTestNum = 24
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = -3
-
-
-[MultiPrimaryActivationOk1]
-SimTsyTestNum = 25
-NumberOfIaps = 5
-PrimaryIapId1 = 2
-PrimaryIapId2 = 6
-PrimaryIapId3 = 7
-PrimaryIapId4 = 8
-PrimaryIapId5 = 9
-PrimaryActivationErr1 = 0
-
-[SecondaryR5ActivationOk1]
-SimTsyTestNum = 100
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-
-[SecondaryR5ActivationFails20]
-SimTsyTestNum = 101
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SecondaryActivationEvent2Reason = -20
-
-[ENetworkQoSR5ChangeSecondary]
-SimTsyTestNum = 100
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-QoSEventReq1 = ENetworkQoSChange
-QoSEventReq1Idx = 2
-ExpQoSEvent1 = EQoSEventAdapt
-ExpQoSEvent1Reason = 0
-
-[ENetworkQoSR5ChangeSecondary1]
-SimTsyTestNum = 102
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-QoSEventReq1 = ENetworkQoSChange
-QoSEventReq1Idx = 2
-ExpQoSEvent1 = EQoSEventAdapt
-ExpQoSEvent1Reason = 0
-
-[SecondaryActivationChangeQoSR5]
-SimTsyTestNum = 100
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-ExpQoSEvent1 = EQoSEventAddPolicy
-ExpQoSEvent1Reason = 0
-OptionalQoSEvent1 = EQoSEventAdapt
-OptionalQoSEvent1Reason = 0
-ExpQoSEvent2 = EQoSEventConfirm
-
-[PrimaryQoSR5EventDeleteWithSecondary]
-SimTsyTestNum = 100
-IapId = 5
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-QoSEventReq1Idx = 0
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/te_spudNetworkSide_config_9x.txt	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2425 +0,0 @@
-############################################################################
-############################################################################
-###################              T E S T 1              ####################
-############################################################################
-############################################################################
-# Test case for success results
-############################################################################
-[test1]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-############################################################################
-############################################################################
-###################              T E S T 7 0 1          ####################
-############################################################################
-############################################################################
-# This test messes up with QosProfileNegR99 entry to trigger KContextDelete on SPUDMAN
-############################################################################
-[test701]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 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
-
-#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
-
-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
-
-
-
-#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, 700, 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, 700, 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
-
-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
-
-#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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-# failure events
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-
-# EStatusInactive = 5 EStatusDeleted = 6)
-NotifyContextStatusChange = PRIMARY1, 5, 6
-NotifyContextStatusChange = PRIMARY1, 5, 5
-NotifyContextStatusChange = SECONDARY1, 5, 6
-NotifyContextStatusChange = SECONDARY1, 5, 5
-
-
-############################################################################
-############################################################################
-###################              T E S T 8 0 1          ####################
-############################################################################
-############################################################################
-# This test sets the R99ContextConfig's iActivateErrorCode to -4 for Primary PDP Context
-############################################################################
-[test801]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = <TName iContextName>,  <TUint iActivatePause>, <TUint iActivateErrorCode>, <TUint iDeactivatePause>, 
-# <TUint iDeactivateErrorCode>, <TUint iDeletionPause>, <TUint iDeletionErrorCode> <TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, -4, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-# failure events
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-
-# EStatusInactive = 5 EStatusDeleted = 6)
-NotifyContextStatusChange = PRIMARY1, 5, 6
-NotifyContextStatusChange = PRIMARY1, 5, 5
-NotifyContextStatusChange = SECONDARY1, 5, 6
-NotifyContextStatusChange = SECONDARY1, 5, 5
-
-
-############################################################################
-############################################################################
-###################              T E S T 9 0 1          ####################
-############################################################################
-############################################################################
-# This test sets the R99ContextConfig's iActivateErrorCode to -4 for Secondary PDP Context
-############################################################################
-[test901]
-# 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, 0,RasUser,,,,,,0
-
-# 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, -4, 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, 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
-
-#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
-
-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
-
-
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-# failure events
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-
-# EStatusInactive = 5 EStatusDeleted = 6)
-NotifyContextStatusChange = PRIMARY1, 5, 6
-NotifyContextStatusChange = PRIMARY1, 5, 5
-NotifyContextStatusChange = SECONDARY1, 5, 6
-NotifyContextStatusChange = SECONDARY1, 5, 5
-
-
-############################################################################
-############################################################################
-###################              T E S T 2 0 1          ####################
-############################################################################
-############################################################################
-# Failure to Activate Primary PDP context
-############################################################################
-[test201]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = <TName iContextName>,  <TUint iActivatePause>, <TUint iActivateErrorCode>, <TUint iDeactivatePause>, 
-# <TUint iDeactivateErrorCode>, <TUint iDeletionPause>, <TUint iDeletionErrorCode> <TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, -19, 0, 0, 0, 0, 0
-R99ContextConfig = PRIMARY1, 0, -19, 0, 0, 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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 1 0          ####################
-############################################################################
-############################################################################
-# Failure to Start the Lower Nif for the Primary Context
-############################################################################
-[test210]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-
-#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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-
-# Supply an invalid port name for primary context to SPUD
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, INVALID::1, 18, 0, PRIMARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 1 1          ####################
-############################################################################
-############################################################################
-# 
-############################################################################
-NTRAS PPP
-[test211]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 1
-
-
-#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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= ECUART, COMM::0, 18, 0, PRIMARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 1 2         ####################
-############################################################################
-############################################################################
-# 'la-la land loopback' PPP: No peer is provided, all LPC frames are discarded by the CSY.
-# This results in the LCP negotiation taking as long as we want. This gives up time to inject events.
-############################################################################
-[test212]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-
-#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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::0, 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
-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
-
-############################################################################
-############################################################################
-###################              T E S T 3 0 1          ####################
-############################################################################
-############################################################################
-# failure to activate secondary PDP context
-############################################################################
-[test301]
-# 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, 0,RasUser,,,,,,0
-
-# 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, -19, 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, 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
-
-
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-# When the value 0 is published to KPSSimtsyPacketContextStatusChange the first primary context will be deleted (status = EStatusDeleted = 6)
-NotifyContextStatusChange = SECONDARY1, 0, 6
-
-#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
-
-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
-
-#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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-
-#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
-
-QosR5NetworkNotification = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
-
-
-
-#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>
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 3 1 0          ####################
-############################################################################
-############################################################################
-# failure to Start the lower NIF for the Secondary PDP context
-############################################################################
-[test310]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-# 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, 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
-
-
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-# When the value 0 is published to KPSSimtsyPacketContextStatusChange the first primary context will be deleted (status = EStatusDeleted = 6)
-NotifyContextStatusChange = SECONDARY1, 0, 6
-
-#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
-
-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
-
-
-#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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-#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
-
-QosR5NetworkNotification = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
-
-
-#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>
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, INVALID_PORT::0, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 3 1 1          ####################
-############################################################################
-############################################################################
-# failure to Start the lower NIF for the Secondary PDP context 
-# (PPP as lower NIF)
-############################################################################
-[test311]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 1
-R99ContextConfig = SECONDARY1, 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, 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
-
-
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-# When the value 0 is published to KPSSimtsyPacketContextStatusChange the first primary context will be deleted (status = EStatusDeleted = 6)
-NotifyContextStatusChange = SECONDARY1, 0, 6
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-#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
-
-QosR5NetworkNotification = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
-
-
-
-#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>
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= ECUART, COMM::0, 18, 0, PRIMARY1
-CommSetup= ECUART, INVALID::1, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 1 8            ####################
-############################################################################
-############################################################################
-# R99ContextConfig ActivateErrorCode is modified to -19 for PRIMARY1. This 
-# way primary context activation will fail with an error code (-19)
-############################################################################
-[test18]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, -19, 0, 0, 0, 0, 0
-R99ContextConfig = SECONDARY1, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 1 9            ####################
-############################################################################
-############################################################################
-# TFT filter, srcAddr value is modified so that the secondary context 
-# creation fails due to TFT settings failure.
-############################################################################
-[test19]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = SECONDARY1, 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, 0, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.1.3, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-
-############################################################################
-############################################################################
-###################              T E S T 2 0            ####################
-############################################################################
-############################################################################
-# QosProfileReqR99 for SECONDARY1 reqTraffic and minTraffic values are 
-# modified so that secondary PDP context creation fails due to Requested QoS
-# parameter mismatch.
-############################################################################
-[test20]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = SECONDARY1, 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, 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
-
-#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,0x08, 0x08, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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,0x08, 0x08, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 1            ####################
-############################################################################
-############################################################################
-# R99ContextConfig DeletionErrorCode is modified to -19 for PRIMARY1. This 
-# way primary context deletion will fail with an error code (-19)
-############################################################################
-[test21]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, -19, 0
-R99ContextConfig = SECONDARY1, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-
-############################################################################
-############################################################################
-###################              T E S T 2 2            ####################
-############################################################################
-############################################################################
-# R99ContextConfig DeletionErrorCode is modified to -19 for SECONDARY1. This 
-# way primary context deletion will fail with an error code (-19)
-############################################################################
-[test22]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = SECONDARY1, 0, 0, 0, 0, 0, -19, 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, 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
-
-#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
-
-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
-
-#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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 24             ####################
-############################################################################
-############################################################################
-[test24]
-PhoneInitialiseDelay = 999
-
-############################################################################
-############################################################################
-############################################################################
-############################################################################
-
-############################################################################
-############################################################################
-###################              T E S T 25             ####################
-############################################################################
-############################################################################
-# Test case for success results
-############################################################################
-[test25]
-# 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, 0,RasUser,,,,,,0
-
-# 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 = PRIMARY2, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = PRIMARY3, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = PRIMARY4, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = PRIMARY5, 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 = PRIMARY2,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 = PRIMARY3,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 = PRIMARY4,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 = PRIMARY5,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 = PRIMARY2,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 = PRIMARY3,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 = PRIMARY4,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 = PRIMARY5,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 = PRIMARY2, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-QosProfileNegR99 = PRIMARY3, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-QosProfileNegR99 = PRIMARY4, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-QosProfileNegR99 = PRIMARY5, 0x03, 0x01, 0x03, 0x01, 1, 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, 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 = PRIMARY2, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-QosProfileNegR5 = PRIMARY3, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-QosProfileNegR5 = PRIMARY4, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-QosProfileNegR5 = PRIMARY5, 0x03, 0x01, 0x03, 0x01, 1, 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, 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 = PRIMARY3, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-QosNetworkNotification = PRIMARY4, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-QosNetworkNotification = PRIMARY5, 0x04, 0x02, 0x04, 0x02, 2, 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 = PRIMARY3, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
-QosR5NetworkNotification = PRIMARY4, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
-QosR5NetworkNotification = PRIMARY5, 0x04, 0x02, 0x04, 0x02, 2, 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::510, 18, 0, PRIMARY2
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::512, 18, 0, PRIMARY3
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::514, 18, 0, PRIMARY4
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::516, 18, 0, PRIMARY5
-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 = PRIMARY2, 0, 6
-NotifyContextStatusChange = PRIMARY3, 0, 6
-NotifyContextStatusChange = PRIMARY4, 0, 6
-NotifyContextStatusChange = PRIMARY5, 0, 6
-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 = PRIMARY2, 0, 5
-NotifyContextStatusChange = PRIMARY3, 0, 5
-NotifyContextStatusChange = PRIMARY4, 0, 5
-NotifyContextStatusChange = PRIMARY5, 0, 5
-NotifyContextStatusChange = SECONDARY1, 0, 5
-NotifyContextStatusChange = SECONDARY1, 0, 3
-
-
-############################################################################
-############################################################################
-###################              T E S T 100              ####################
-############################################################################
-############################################################################
-# Test case for success results
-############################################################################
-[test100]
-# 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, 0,RasUser,,,,,,0
-
-#SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-SetContextConfigR5= 0, SYMBIAN INTERNET PROVIDER, PROTOCOL ADDRESS, 0, 2, USER3, PASSWORD3, CHALLENGE3, RESPONSE3, PRIMARYSERVER3, SECONDARYSERVER3, 3, 2, 1, 1
-
-#AdditionalParamItem= <TPcoProtocolId>, <TBuf8 AdditionalParamData>
-AdditionalParamItem= 0x04, ADDITIONALPARAM1
-
-# 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
-
-
-# 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, 0x04, 0x01, 0x08, 0x08, -1, -1, -1, -1,0,0, 0x20, 1, 0x10 ,1 ,2 ,1 ,1 ,250 ,-1 ,-1 ,0 ,0
-#Added for test case 29
-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
-#Added for test case 30
-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
-
-
-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, 0x04, 0x01, 0x08, 0x08, -1, -1, -1, -1,0,0, 0x20, 1, 0x10 ,1 ,2 ,1 ,1 ,250 ,-1 ,-1 ,0 ,0 ,1 ,1
-#Added for test case 29
-QosProfileReqR5 = SECONDARY1,0x04, 0x04, 0x04, 0x01, 0x08, 0x08, -1, -1, -1, -1,0,0, 0x20, 1, 0x10 ,1 ,2 ,1 ,1 ,250 ,-1 ,-1 ,0 ,0 ,0 ,0
-#Added for test case 30
-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
-
-
-#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 = 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, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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, 1, 1
-#for test case 29
-QosProfileNegR5 = SECONDARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-#for test case 30
-QosProfileNegR5 = SECONDARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 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 = SECONDARY1, 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 = SECONDARY1, 0x04, 0x02, 0x04, 0x02, 1, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 1
-QosR5NetworkNotification = SECONDARY1, 0x04, 0x02, 0x04, 0x02, 1, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 1
-
-
-#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
-
-
-############################################################################
-# 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
-
-############################################################################
-############################################################################
-###################              T E S T 1 0 1           ####################
-############################################################################
-############################################################################
-# QosProfileReqR99 for SECONDARY1 reqTraffic and minTraffic values are 
-# modified so that secondary PDP context creation fails due to Requested QoS
-# parameter mismatch.
-############################################################################
-[test101]
-# 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, 0,RasUser,,,,,,0
-
-#SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-SetContextConfigR5= 0, SYMBIAN INTERNET PROVIDER, PROTOCOL ADDRESS, 0, 2, USER3, PASSWORD3, CHALLENGE3, RESPONSE3, PRIMARYSERVER3, SECONDARYSERVER3, 3, 2, 1, 1
-
-#AdditionalParamItem= <TPcoProtocolId>, <TBuf8 AdditionalParamData>
-AdditionalParamItem= 0x04, ADDITIONALPARAM1
-
-
-
-# TRel99ContextConfig = 0<TName iContextName>,  1<TUint iActivatePause>, 2<TUint iActivateErrorCode>, 3<TUint iDeactivatePause>, 
-# 4<TUint iDeactivateErrorCode>, 5<TUint iDeletionPause>, 6<TUint iDeletionErrorCode> 7<TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = SECONDARY1, 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, 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
-
-#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,0x08, 0x08, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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,0x08, 0x08, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 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
-
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 102              ####################
-############################################################################
-############################################################################
-# Test case for success results
-############################################################################
-[test102]
-# 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, 0,RasUser,,,,,,0
-
-#SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
-# <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>, <THeaderCompression>, <TDataCompression>, <No. Additional Context Config Params>
-SetContextConfigR5= 0, SYMBIAN INTERNET PROVIDER, PROTOCOL ADDRESS, 0, 2, USER3, PASSWORD3, CHALLENGE3, RESPONSE3, PRIMARYSERVER3, SECONDARYSERVER3, 3, 2, 1, 1
-
-#AdditionalParamItem= <TPcoProtocolId>, <TBuf8 AdditionalParamData>
-AdditionalParamItem= 0x04, ADDITIONALPARAM1
-
-# 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
-
-
-# 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, 0x04, 0x01, 0x08, 0x08, -1, -1, -1, -1,0,0, 0x20, 1, 0x10 ,1 ,2 ,1 ,1 ,250 ,-1 ,-1 ,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, 0x04, 0x01, 0x08, 0x08, -1, -1, -1, -1,0,0, 0x20, 1, 0x10 ,1 ,2 ,1 ,1 ,250 ,-1 ,-1 ,0 ,0 ,1 ,1
-
-
-#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 = SECONDARY1, 0x03, 0x01, 0x01, 0x01, 1501, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 1, 1
-QosProfileNegR5 = SECONDARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 1, 1
-
-
-#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 = SECONDARY1, 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 = SECONDARY1, 0x04, 0x02, 0x04, 0x02, 1, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 1, 0
-QosR5NetworkNotification = SECONDARY1, 0x04, 0x02, 0x04, 0x02, 1, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 1, 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
-
-
-############################################################################
-# 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
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/te_spudNetworkSide_nifman.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,224 +0,0 @@
-[ESockCheck]
-SimTsyTestNum = 0
-
-
-[PrimaryOnlyNormalStop1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 1
-PrimaryActivationErr1 = 0
-MillisBeforeStop = 2000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-
-
-[PrimaryOnlyAuthoritativeStop1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 1
-PrimaryActivationErr1 = 0
-MillisBeforeStop = 10000000
-IfaceStopType = EStopAuthoritative
-IfaceStopErrCode = -17210
-
-
-[TimeoutStopPrimaryDeleting1]
-SimTsyTestNum = 11
-PrimaryLoopbackPort = 502
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-MillisBeforeStop = 0
-IfaceStopType = NifmanIdleTimeout
-IfaceStopErrCode = -33
-
-
-
-
-[NormalStopPrimaryDeleting1]
-SimTsyTestNum = 11
-PrimaryLoopbackPort = 502
-PrimaryIapId1 = 1
-PrimaryActivationErr1 = 0
-MillisBeforeStop = 4000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-
-
-
-[NormalStopOnPrimaryDeactivating1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 1
-PrimaryStartErr1 = 0
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 4
-MillisBeforeStop = 3000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-
-
-[NormalStopOnPrimarySuspended1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 1
-PrimaryStartErr1 = 0
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 5
-MillisBeforeStop = 3000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-
-
-
-[NormalStopOnPrimaryInactive1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 1
-PrimaryStartErr1 = 0
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 1
-MillisBeforeStop = 3000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-
-
-[AuthStopOnPrimarySuspended1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 1
-PrimaryStartErr1 = 0
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 5
-MillisBeforeStop = 3000000
-IfaceStopType = EStopAuthoritative
-IfaceStopErrCode = -17210
-
-
-[AuthStopOnPrimaryDeactivating1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 1
-PrimaryStartErr1 = 0
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 4
-MillisBeforeStop = 3000000
-IfaceStopType = EStopAuthoritative
-IfaceStopErrCode = -17210
-
-
-[AuthStopOnPrimaryInactive1]
-SimTsyTestNum = 1
-PrimaryIapId1 = 1
-PrimaryStartErr1 = 0
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 1
-MillisBeforeStop = 3000000
-IfaceStopType = EStopAuthoritative
-IfaceStopErrCode = -17210
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; STOP on secondary
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-[NormalStopSecondaryActive1]
-SimTsyTestNum = 2
-PrimaryIapId1 = 1
-PrimaryActivationErr1 = 0
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-PrimaryActivationErr1 = 0
-MillisBeforeStop = 2000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-
-[AuthStopSecondaryActive1]
-SimTsyTestNum = 2
-PrimaryIapId1 = 1
-PrimaryActivationErr1 = 0
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-PrimaryActivationErr1 = 0
-MillisBeforeStop = 2000000
-IfaceStopType = EStopAuthoritative
-IfaceStopErrCode = -17210
-
-
-[NormalStopGUQoSDeletingSecondary1]
-SimTsyTestNum = 23
-PrimaryIapId1 = 1
-PrimaryActivationErr1 = 0
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-MillisBeforeStop = 12000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-
-
-[NormalStopSecondaryLowerNifDown1]
-SimTsyTestNum = 23
-SecondaryLoopbackPort = 504
-PrimaryIapId1 = 1
-PrimaryActivationErr1 = 0
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-MillisBeforeStop = 12000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-
-
-
-
-
-[NormalStopSecondaryActivating1]
-SimTsyTestNum = 24
-PrimaryIapId1 = 1
-PrimaryActivationErr1 = 0
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-MillisBeforeStop = 30000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-
-
-[NormalStopSecondarySettingTFT25]
-SimTsyTestNum = 25
-PrimaryIapId1 = 1
-PrimaryActivationErr1 = 0
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-MillisBeforeStop = 30000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-
-
-
-
-[GUQoSDeleteOnNormalStop1]
-SimTsyTestNum = 23
-PrimaryIapId1 = 1
-PrimaryActivationErr1 = 0
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-MillisBeforeStop = 0
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-
-
-; #######################################
-; PPP dependent tests
-
-[NormalStopPrimaryStartingLowerNif1]
-SimTsyTestNum = 27
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-MillisBeforeStop = 15000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-
-
-
-[NormalStopSecondaryStartingLowerNif1]
-SimTsyTestNum = 26
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-MillisBeforeStop = 15000000
-IfaceStopType = EStopNormal
-IfaceStopErrCode = -3
-
-[LeaveInSpudCreation]
-SimTsyTestNum = 1010101010
-PrimaryIapId1 = 3
-PrimaryActivationErr1 = -1
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/te_spudNetworkSide_nifman_config.txt	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,841 +0,0 @@
-############################################################################
-############################################################################
-###################              T E S T 1              ####################
-############################################################################
-############################################################################
-# Successful Start of Primary PDP context
-############################################################################
-[test1]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-
-#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
-
-#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
-
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
-
-# failure events
-NotifyContextStatusChangeType = PublishSubscribe
-NotifyContextStatusChange = PRIMARY1, 0, 1
-NotifyContextStatusChange = PRIMARY1, 0, 1
-NotifyContextStatusChange = PRIMARY1, 0, 2
-NotifyContextStatusChange = PRIMARY1, 0, 3
-NotifyContextStatusChange = PRIMARY1, 0, 4
-NotifyContextStatusChange = PRIMARY1, 0, 5
-NotifyContextStatusChange = PRIMARY1, 0, 6
-
-
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-# EStatusDeactivating = 4 EStatusInactive = 1 EStatusDeleted = 6
-# EStatusSuspended = 5 EStatusActive = 3
-
-############################################################################
-############################################################################
-###################              T E S T 1 1            ####################
-############################################################################
-############################################################################
-# Successful Start of Primary PDP context, delay on primary deletion
-############################################################################
-[test11]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = <TName iContextName>,  <TUint iActivatePause>, <TUint iActivateErrorCode>, <TUint iDeactivatePause>, 
-# <TUint iDeactivateErrorCode>, <TUint iDeletionPause>, <TUint iDeletionErrorCode> <TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 30, 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
-
-#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
-
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2              ####################
-############################################################################
-############################################################################
-# Primary and Secondary: delay on secondary deletion.
-############################################################################
-[test2]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 20, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 250, 250, -1, -1, 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 = SECONDARY2, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-
-#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
-
-#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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 2            ####################
-############################################################################
-############################################################################
-# Secondary delay on Activation
-# Primary and Secondary.
-############################################################################
-[test22]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-# 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY2, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-
-#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
-
-#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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 3            ####################
-############################################################################
-############################################################################
-# Secondary delay on Deletion
-# Primary and Secondary.
-############################################################################
-[test23]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 20, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 250, 250, -1, -1, 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 = SECONDARY2, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-
-#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
-
-#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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 4            ####################
-############################################################################
-############################################################################
-# Secondary delay on Activation
-# Primary and Secondary.
-############################################################################
-[test24]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 60, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY2, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-
-#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
-
-#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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 5            ####################
-############################################################################
-############################################################################
-# Secondary delay on Setting TFT
-# Primary and Secondary.
-############################################################################
-[test25]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-# delay creating TFT for secondary
-CreateTftConfig = PRIMARY1, 0, 0, 60
-
-# 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY2, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-
-#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
-
-#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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 6            ####################
-############################################################################
-############################################################################
-#Primary and secondary: test long secondary start on lower NIF: 
-# Valid wintunnel for Primary, loopback to nothing for secondary.
-# Secondary delay on Starting Lower NIF
-# Primary and Secondary.
-############################################################################
-[test26]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 1
-R99ContextConfig = SECONDARY1, 0, 0, 0, 0, 0, 0, 0
-
-# delay creating TFT for secondary
-CreateTftConfig = PRIMARY1, 0, 0, 60
-
-# 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = SECONDARY2, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-
-#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
-
-#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= ECUART, COMM::0, 18, 0, PRIMARY1
-CommSetup= LOOPBACK, LOOPBACK::0, 18, 0, SECONDARY1
-
-
-# Primary context loops back to nothing: this causes PPP LCP negotiation to take a long time.
-[test27]
-## Successful Start of Primary PDP context
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-
-#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
-
-#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
-
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= LOOPBACK, LOOPBACK::0, 18, 0, PRIMARY1
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/version1/te_spudNetworkSide_nifman_config_9x.txt	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,934 +0,0 @@
-############################################################################
-############################################################################
-###################              T E S T 1              ####################
-############################################################################
-############################################################################
-# Successful Start of Primary PDP context
-############################################################################
-[test1]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-
-#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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
-
-# failure events
-NotifyContextStatusChangeType = PublishSubscribe
-NotifyContextStatusChange = PRIMARY1, 0, 1
-NotifyContextStatusChange = PRIMARY1, 0, 1
-NotifyContextStatusChange = PRIMARY1, 0, 2
-NotifyContextStatusChange = PRIMARY1, 0, 3
-NotifyContextStatusChange = PRIMARY1, 0, 4
-NotifyContextStatusChange = PRIMARY1, 0, 5
-NotifyContextStatusChange = PRIMARY1, 0, 6
-
-
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-# EStatusDeactivating = 4 EStatusInactive = 1 EStatusDeleted = 6
-# EStatusSuspended = 5 EStatusActive = 3
-
-############################################################################
-############################################################################
-###################              T E S T 1 1            ####################
-############################################################################
-############################################################################
-# Successful Start of Primary PDP context, delay on primary deletion
-############################################################################
-[test11]
-# 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, 0,RasUser,,,,,,0
-
-# TRel99ContextConfig = <TName iContextName>,  <TUint iActivatePause>, <TUint iActivateErrorCode>, <TUint iDeactivatePause>, 
-# <TUint iDeactivateErrorCode>, <TUint iDeletionPause>, <TUint iDeletionErrorCode> <TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 30, 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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::502, 18, 0, PRIMARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2              ####################
-############################################################################
-############################################################################
-# Primary and Secondary: delay on secondary deletion.
-############################################################################
-[test2]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 20, 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, 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
-
-#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
-
-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
-
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK.CSY, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 2            ####################
-############################################################################
-############################################################################
-# Secondary delay on Activation
-# Primary and Secondary.
-############################################################################
-[test22]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-# 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 3            ####################
-############################################################################
-############################################################################
-# Secondary delay on Deletion
-# Primary and Secondary.
-############################################################################
-[test23]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 20, 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, 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
-
-#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
-
-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
-
-
-#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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 4            ####################
-############################################################################
-############################################################################
-# Secondary delay on Activation
-# Primary and Secondary.
-############################################################################
-[test24]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 60, 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 5            ####################
-############################################################################
-############################################################################
-# Secondary delay on Setting TFT
-# Primary and Secondary.
-############################################################################
-[test25]
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-# delay creating TFT for secondary
-CreateTftConfig = PRIMARY1, 0, 0, 60
-
-# 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = 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 = 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, PKTLOOPBACK::502, 18, 0, PRIMARY1
-CommSetup= PKTLOOPBACK, PKTLOOPBACK::504, 18, 0, SECONDARY1
-
-############################################################################
-############################################################################
-###################              T E S T 2 6            ####################
-############################################################################
-############################################################################
-#Primary and secondary: test long secondary start on lower NIF: 
-# Valid wintunnel for Primary, loopback to nothing for secondary.
-# Secondary delay on Starting Lower NIF
-# Primary and Secondary.
-############################################################################
-[test26]
-# 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, 0,RasUser,,,,,,0
-
-# 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, 1
-R99ContextConfig = SECONDARY1, 0, 0, 0, 0, 0, 0, 0
-
-# delay creating TFT for secondary
-CreateTftConfig = PRIMARY1, 0, 0, 60
-
-# 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, 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
-
-#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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 250, 250, -1, -1, 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 = 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 = 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= ECUART, COMM::0, 18, 0, PRIMARY1
-CommSetup= LOOPBACK, LOOPBACK::0, 18, 0, SECONDARY1
-
-
-# Primary context loops back to nothing: this causes PPP LCP negotiation to take a long time.
-[test27]
-## Successful Start of Primary PDP context
-# 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, 0,RasUser,,,,,,0
-
-# 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
-
-
-#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
-
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-
-
-# CommSetup = <CsyName> <portName> <datarate> <handshake> <contextName> 
-CommSetup= LOOPBACK, LOOPBACK::0, 18, 0, PRIMARY1
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/group/TE_SpudNetworkSide.mmp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-// Copyright (c) 2005-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:
-// Network-side events /errors SPUD testing.
-// 
-//
-
-/**
- @file
-*/
-
-TARGET      te_spudnetworkside.exe
-CAPABILITY ReadDeviceData WriteDeviceData NetworkControl NetworkServices ReadUserData WriteUserData 
-TARGETTYPE  exe
-UID             0x1000007A 0x102075B1
-VENDORID 0x70000001
-
-
-SOURCEPATH  ../src
-SOURCE		te_spudNetworkSideServer.cpp
-SOURCE		te_spudNetworkSideSteps.cpp
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-SOURCE		te_spudNetworkSideR5Steps.cpp
-#endif
-SOURCE      spudNetSideQos.cpp
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY		euser.lib  
-LIBRARY     esock.lib insock.lib
-LIBRARY     commdb.lib
-LIBRARY		testexecuteutils.lib 
-LIBRARY		testexecutelogclient.lib 
-LIBRARY 	c32root.lib
-LIBRARY     c32.lib
-
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-LIBRARY     qoslib.lib
-#ifdef SYMBIAN_NETWORKING_UMTSR5 
-LIBRARY     qosextnapi.lib
-#endif // SYMBIAN_NETWORKING_UMTSR5
-#else 
-LIBRARY 	commsdat.lib
-#endif // SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-
-
-SMPSAFE
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/group/TE_spudNetworkSide.iby	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-// Copyright (c) 2005-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 TE_SPUD_NETWORK_SIDE_IBY
-#define TE_SPUD_NETWORK_SIDE_IBY
-
-#ifdef SYMBIAN_EXCLUDE_QOS_PROTPLUGINS
-REM Feature QoS is not included in this ROM
-REM Temporary patch
-#else
-file=ABI_DIR\DEBUG_DIR\TE_SpudNetworkSide.exe		System\Libs\TE_SpudNetworkSide.exe
-#endif
-
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SpudNetworkSide.script 		testdata\scripts\TE_SpudNetworkSide.script 
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SpudNetworkSide_ppp.script 	testdata\scripts\TE_SpudNetworkSide_ppp.script 
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SpudNetworkSide_nifman.script 	testdata\scripts\TE_SpudNetworkSide_nifman.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_PppSize_spud.script 			testdata\scripts\TE_PppSize_spud.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\Te_SpudNetworkside_Channel.script 	testdata\scripts\Te_SpudNetworkside_Channel.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SpudNetworkSide_r4_and_r5.script 		testdata\scripts\TE_SpudNetworkSide_r4_and_r5.script
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_config.txt 	testdata\configs\TE_SpudNetworkSide_config.txt
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_ppp_config.txt 	testdata\configs\TE_SpudNetworkSide_ppp_config.txt
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_ppp_config2.txt 	testdata\configs\TE_SpudNetworkSide_ppp_config2.txt
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_nifman_config.txt 	testdata\configs\TE_SpudNetworkSide_nifman_config.txt
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudNetworkSide_config_r4_and_r5.txt   testdata\configs\te_spudNetworkSide_config_r4_and_r5.txt
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide.xml 			testdata\configs\TE_SpudNetworkSide.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_ppp.xml		testdata\configs\TE_SpudNetworkSide_ppp.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_PppLoopback.xml		testdata\configs\TE_SpudNetworkSide_PppLoopback.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_nifman.xml		testdata\configs\TE_SpudNetworkSide_nifman.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_r4_and_r5.xml 			testdata\configs\TE_SpudNetworkSide_r4_and_r5.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide.ini 			testdata\configs\TE_SpudNetworkSide.ini
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_nifman.ini		testdata\configs\TE_SpudNetworkSide_nifman.ini
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_platsec.ini 	testdata\configs\TE_SpudNetworkSide_platsec.ini
-data=EPOCROOT##epoc32\data\z\TestData\Configs\TE_SpudNetworkSideLoopbackCSY.ini testdata\configs\TE_SpudNetworkSideLoopbackCSY.ini
-data=EPOCROOT##epoc32\data\z\TestData\Configs\TE_SpudNetworkSideLoopbackCSY_serial.ini	testdata\configs\TE_SpudNetworkSideLoopbackCSY_serial.ini
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SpudNetworkSide_r4_and_r5.ini 			testdata\configs\TE_SpudNetworkSide_r4_and_r5.ini
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-data=EPOCROOT##epoc32\data\z\TestData\Configs\qospolicies.ini 					testdata\configs\qospolicies.ini
-#endif
-data=EPOCROOT##epoc32\data\z\TestData\Configs\TE_PPPSize_spud.ini								testdata\configs\TE_PPPSize_spud.ini
-data=EPOCROOT##epoc32\data\z\TestData\Configs\TE_PPPSize_spud.xml								testdata\configs\TE_PPPSize_spud.xml
-data=EPOCROOT##epoc32\data\z\TestData\Configs\TE_PPPSize_config.txt								testdata\configs\TE_PPPSize_config.txt
-data=EPOCROOT##epoc32\data\z\TestData\Configs\TE_SpudNetworkSide_Channel_config.txt			testdata\configs\TE_SpudNetworkSide_Channel_config.txt
-
-#endif // TE_SPUD_NETWORK_SIDE_IBY
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/group/bld.inf	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// 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
-
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-// script files 
-../scripts/version1/TE_spudNetworkSide.script				z:/testdata/scripts/te_spudnetworkside.script
-../scripts/version1/TE_spudNetworkSide_nifman.script			z:/testdata/scripts/te_spudnetworkside_nifman.script
-../scripts/version1/TE_PppSize_spud.script					z:/testdata/scripts/te_pppsize_spud.script
-../scripts/version1/TE_SpudNetworkside_Channel.script					z:/testdata/scripts/te_spudnetworkside_channel.script
-#else
-// script files
-../scripts/TE_spudNetworkSide.script				z:/testdata/scripts/te_spudnetworkside.script
-../scripts/TE_spudNetworkSide_nifman.script			z:/testdata/scripts/te_spudnetworkside_nifman.script
-../scripts/TE_PppSize_spud.script					z:/testdata/scripts/te_pppsize_spud.script
-../scripts/TE_SpudNetworkside_Channel.script					z:/testdata/scripts/te_spudnetworkside_channel.script
-../scripts/TE_spudNetworkSide_R4_and_R5.script				z:/testdata/scripts/te_spudnetworkside_r4_and_r5.script
-#endif
-
-../scripts/TE_spudNetworkSide_ppp_9x.script			z:/testdata/scripts/te_spudnetworkside_ppp.script
-../configs/te_spudNetworkSide_ppp_config_9x.txt     z:/testdata/configs/te_spudnetworkside_ppp_config.txt
-../configs/te_spudnetworkside_ppp_config2_9x.txt    z:/testdata/configs/te_spudnetworkside_ppp_config2.txt
-../configs/te_spudNetworkSide_nifman_config_9x.txt		z:/testdata/configs/te_spudnetworkside_nifman_config.txt
-../configs/te_spudNetworkSide_config_9x.txt			z:/testdata/configs/te_spudnetworkside_config.txt
-../configs/te_spudNetworkSide_config_r4_and_r5.txt		z:/testdata/configs/te_spudnetworkside_config_r4_and_r5.txt
-
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-../configs/version1/te_SpudNetworkSide.xml					z:/testdata/configs/te_spudnetworkside.xml
-../configs/version1/te_SpudNetworkSide_ppp.xml				z:/testdata/configs/te_spudnetworkside_ppp.xml
-../configs/version1/TE_SpudNetworkSide_PppLoopback.xml			z:/testdata/configs/te_spudnetworkside_ppploopback.xml
-../configs/version1/te_SpudNetworkSide_nifman.xml				z:/testdata/configs/te_spudnetworkside_nifman.xml
-../configs/version1/te_spudNetworkSide.ini					z:/testdata/configs/te_spudnetworkside.ini
-../configs/version1/TE_SpudNetworkSideLoopbackCSY.ini		z:/testdata/configs/te_spudnetworksideloopbackcsy.ini
-../configs/version1/TE_SpudNetworkSideLoopbackCSY_serial.ini	z:/testdata/configs/te_spudnetworksideloopbackcsy_serial.ini
-../configs/version1/te_spudNetworkSide_nifman.ini			z:/testdata/configs/te_spudnetworkside_nifman.ini
-
-../configs/version1/TE_PppSize_spud.ini						z:/testdata/configs/te_pppsize_spud.ini
-../configs/version1/TE_PppSize_spud.xml						z:/testdata/configs/te_pppsize_spud.xml
-../configs/version1/TE_PppSize_config.txt					z:/testdata/configs/te_pppsize_config.txt
-
-../configs/version1/TE_SpudNetworkSide_Channel_config.txt		z:/testdata/configs/te_spudnetworkside_channel_config.txt
-
-// Some error codes are platsec dependent
-../configs/version1/TE_SpudNetworkSide_9x.ini 	z:/testdata/configs/te_spudnetworkside_platsec.ini
-
-#else
-// requires 399 config values
-../configs/te_SpudNetworkSide.xml					z:/testdata/configs/te_spudnetworkside.xml
-../configs/te_SpudNetworkSide_ppp.xml				z:/testdata/configs/te_spudnetworkside_ppp.xml
-../configs/TE_SpudNetworkSide_PppLoopback.xml			z:/testdata/configs/te_spudnetworkside_ppploopback.xml
-../configs/te_SpudNetworkSide_nifman.xml				z:/testdata/configs/te_spudnetworkside_nifman.xml
-../configs/te_spudNetworkSide_r4_and_r5.xml			z:/testdata/configs/te_spudnetworkside_r4_and_r5.xml
-../configs/te_spudNetworkSide.ini					z:/testdata/configs/te_spudnetworkside.ini
-../configs/TE_SpudNetworkSideLoopbackCSY.ini		z:/testdata/configs/te_spudnetworksideloopbackcsy.ini
-../configs/TE_SpudNetworkSideLoopbackCSY_serial.ini	z:/testdata/configs/te_spudnetworksideloopbackcsy_serial.ini
-../configs/te_spudNetworkSide_nifman.ini			z:/testdata/configs/te_spudnetworkside_nifman.ini
-../configs/te_spudNetworkSide_r4_and_r5.ini			z:/testdata/configs/te_spudnetworkside_r4_and_r5.ini
-
-../configs/TE_PppSize_spud.ini						z:/testdata/configs/te_pppsize_spud.ini
-../configs/TE_PppSize_spud.xml						z:/testdata/configs/te_pppsize_spud.xml
-../configs/TE_PppSize_config.txt					z:/testdata/configs/te_pppsize_config.txt
-
-../configs/TE_SpudNetworkSide_Channel_config.txt		z:/testdata/configs/te_spudnetworkside_channel_config.txt
-
-// Some error codes are platsec dependent
-../configs/TE_SpudNetworkSide_9x.ini 	z:/testdata/configs/te_spudnetworkside_platsec.ini
-
-//Used to trigger GuQos to use Qospolicies.ini file for SetDefaultQoS
-../configs/qospolicies.ini							z:/testdata/configs/qospolicies.ini
-
-#endif // SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-
-TE_spudNetworkSide.iby	/epoc32/rom/include/te_spudnetworkside.iby 
-
-PRJ_MMPFILES
-
-PRJ_TESTMMPFILES
-
-TE_SpudNetworkSide.mmp
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/scripts/TE_PppSize_spud.script	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-//
-// Copyright (c) 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:
-//
-// backup the old commsdb
-
-RUN_UTILS  MkDir c:\simtsy\
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-
-LOAD_SUITE TE_PPPSize -SharedData
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-ced -i z:\testdata\configs\te_pppsize_spud.xml te_pppsize_spud.log
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_PPPSize_config.txt c:\simtsy\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_PPPSize_config.txt c:\config.txt
-
-START_TESTCASE          NET-Spud-NetworkSide-0701
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0701
-RUN_TEST_STEP 2000 TE_PPPSize PPPMinMaxMMU z:\testdata\configs\te_pppsize_spud.ini
-END_TESTCASE            NET-Spud-NetworkSide-0701
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/scripts/TE_SpudNetworkside_Channel.script	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-// Copyright (c) 2005-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:
-// Secondary PDP-context UMTS Driver integration tests using RQoSChannel
-// 
-//
-
-//! @file TE_SpudNetworkside_Channel.script
-
-
-RUN_UTILS  MkDir c:\simtsy\
-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_SpudNetworkSide_Channel_config.txt c:\simtsy\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_Channel_config.txt c:\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSideLoopbackCSY.ini c:\loopback.ini
-
-// Configure CommDB for the tests
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-ced -i z:\TestData\Configs\TE_SpudNetworkSide.xml
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-LOAD_SUITE TE_SpudNetworkSide
-
-START_TESTCASE          NET-Spud-NetworkSide-0901
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0901
-//! @SYMTestCaseDesc Network initiates TFT modification, GuQoS sends the KContextModifyActive to SPUD.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMTestActions Creates the primary and 2ndry Context successfully,initiates TFT modification, then GuQoS sends the KContextModifyActive to SPUD.
-//! @SYMTestExpectedResults EQoSEventConfirm and EQoSEventJoin are received bt the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondaryJoin z:\testdata\configs\te_spudNetworkSide.ini SecondaryActivationJoin
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0901
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  DeleteFile c:\loopback.ini
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/scripts/TE_spudNetworkSide.script	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,491 +0,0 @@
-// Copyright (c) 2004-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:
-// Secondary PDP-context UMTS Driver integration tests of network-initiated conditions.
-//
-
-//! @file TE_spudNetworkSide.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_SpudNetworkSide_config.txt c:\simtsy\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_config.txt c:\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSideLoopbackCSY.ini c:\loopback.ini
-
-// Configure CommDB for the tests
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-ced -i z:\TestData\Configs\te_spudnetworkside.xml
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-LOAD_SUITE TE_SpudNetworkSide
-
-
-// TestSection suffix numbers correspond to SIM TSY's test section numbers. i.e. PrimaryActivationFails201 uses SIM TSYs test201 
-
-//
-// Sanity check tests: before testing the error cases, we test the success cases to make sure the system is OK.
-//
-
-START_TESTCASE          NET-Spud-NetworkSide-0801
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0801
-//! @SYMTestCaseDesc Sanity check: successfully activate Primary context. 
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start the SPUD interface. SIM TSY, etc successfully activate the primary context.
-//! @SYMTestExpectedResults  Primary PDP context is activated, SPUD is started: RConnection::Start on SPUD returns KErrNone.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryActivationOk1
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0801
-
-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-0802
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0802
-//! @SYMTestCaseDesc Sanity check: successfully activate Secondary context. 
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions Implicitly start the SPUD interface by opening a socket bound to its secondary context. Set QoS on the socket, prompting GUQoS to activate secondary context.
-//! @SYMTestExpectedResults Both the primary & secondary contexts are activated. EQoSEventAddPolicy and EQoSEventConfirm are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide.ini SecondaryActivationOk1
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0802
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-//
-// Operation errors: Creation, TFT, QoS, Activation, Deactivation, Deletion errors.
-//
-START_TESTCASE          NET-Spud-NetworkSide-0803
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0803
-//! @SYMTestCaseDesc Activation of Primary fails. 
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start Spud. SIM TSY returns an error on activation of the primary context. 
-//! @SYMTestExpectedResults Spud cannot be started: RConnection::Start returns an error.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryActivationFails201
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0803
-
-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-0804
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0804
-//! @SYMTestCaseDesc Activation of Secondary fails.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions Implicitly start SPUD by opening a socket bound to the secondary context. Set QoS on the socket, prompting GUQoS to activate secondary context. SIM TSY errors secondary context activation request. 
-//! @SYMTestExpectedResults  EQoSEventAddPolicy and EQoSEventFailure are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide.ini SecondaryActivationFails301
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0804
-
-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-0805
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0805
-//! @SYMTestCaseDesc Network deletes Activated Primary.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Activate the primary context only by explicitly starting Spud. After a pause, SIM.TSY deletes the primary context. 
-//! @SYMTestExpectedResults Spud is started successfully - the RConnection is started with KErrNone. KLinkLayerClosed / KErrDisconnected notification is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimaryEvent z:\testdata\configs\te_spudNetworkSide.ini PrimaryQoSEventDelete1
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0805
-
-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-0806
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0806
-//! @SYMTestCaseDesc  GUQoS triggers the KContextDelete on SPUDMAN after the Seondary PDP Context is created. -  This does not happen anymore in Guqos
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Activate the primary and the secondary contexts by opening a socket & setting QoS on it, GuQoS deletes the created secondary context.
-//! @SYMTestExpectedResults EQoSEventAddPolicy, EQoSEventFailure are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-//! DUE TO BEHAVIOURAL CHANGES IN GUQOS - THIS CASE IS NO LONGER VALID AND THEREFORE NOT RUN
-//RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide.ini KContextDelete
-//DELAY 3000
-//RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0806
-
-//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-0807
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0807
-//! @SYMTestCaseDesc  The QoS parameter changes on the Primary PDP Context.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMTestActions Explicitly start the SPUD interface to activate the primary context, use sim.tsy to trigger the QoS parameter changes on the Primary PDP Context.
-//! @SYMTestExpectedResults SPUD starts successfully. SPUD receives the QoS parameter change event successfully. RConnection times out and returns the error code KErrTimedOut.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimaryEvent z:\testdata\configs\te_spudNetworkSide.ini ENetworkQoSChangePrimary
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0807
-
-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-0808
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0808
-//! @SYMTestCaseDesc Triggers the Primary PDP Context deletion before the lower NIF is up.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Explicitly start the SPUD interface to activate the primary context, it fails then deletes the Primary Context. 
-//! @SYMTestExpectedResults Spud start fails. RConnection::Start returns the error.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryDeleteBeforeLowerNif
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0808
-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-0809
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0809
-//! @SYMTestCaseDesc Triggers the Secondary PDP Context deletion before the lower NIF is up.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Activate the primary and the secondary contexts by opening a socket & setting QoS on it,fails to creat the secondary context.
-//! @SYMTestExpectedResults EQoSEventAddPolicy, EQoSEventFailure are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide.ini SecondaryDeleteBeforeLowerNif
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0809
-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-0810
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0810
-//! @SYMTestCaseDesc Failure to Start a lower NIF for primary context (LinkLayerDown from lower NIF) 
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start SPUD. Spud starts the lower NIF for the primary context. Lower NIF reports LinkLayerDown with an error. 
-//! @SYMTestExpectedResults Spud start fails. RConnection::Start returns the error.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide_platsec.ini PrimaryLowerNifStartFails210
-DELAY 3000
-RUN_TEST_STEP 30 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0810
-
-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-0811
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0811
-//! @SYMTestCaseDesc Failure to Start a lower NIF for secondary context (LinkLayerDown from lower NIF) 
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions Request activation of the secondary PDP context by opening a socket & setting QoS on it. Spud start the lower NIF for the secondary context. Lower NIF reports LinkLayerDown with error. 
-//! @SYMTestExpectedResults The primary context is activated, secondary is not. EQoSEventAddPolicy and EQoSEventFailure with the error code are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide_platsec.ini SecondaryLowerNifStartFails310
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0811
-
-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-0812
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0812
-//! @SYMTestCaseDesc Test Etel suspension of primary context
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMTestActions Create/send data on a socket with no QoS parameters (therefore a primary context), and read from the opposite loopback port. Suspend the context. Send more data and attempt to read from the opposite port. Resume the context. Send more data and attempt to read from the opposite port.
-//! @SYMTestExpectedResults The read on the loopback comm port should work before the context is suspended, and after it is resumed. It should time-out when the context is suspended.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudSuspendContext z:\testdata\configs\te_spudNetworkSide.ini PrimaryContextSuspendAndResume
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0812
-
-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-0813
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0813
-//! @SYMTestCaseDesc Test Etel suspension of secondary context
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMTestActions Create/send data on a socket with QoS parameters (therefore a secondary context), and read from the opposite loopback port. Suspend the context. Send more data and attempt to read from the opposite port. Resume the context. Send more data and attempt to read from the opposite port.
-//! @SYMTestExpectedResults The read on the loopback comm port should work before the context is suspended, and after it is resumed. It should time-out when the context is suspended.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudSuspendContext z:\testdata\configs\te_spudNetworkSide.ini SecondaryContextSuspendAndResume
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0813
-
-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-0814
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0814
-//! @SYMTestCaseDesc Primary PDP context activation fails
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Primary PDP context activation fails by modifying the TFT values
-//! @SYMTestExpectedResults The SpudMan code should respond to this event correctly without Leave and Panic.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryActivationFails18
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0814
-
-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-0815
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0815
-//! @SYMTestCaseDesc Secondary PDP context: Setting TFT fails
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions Setting TFT values on secondary PDP context fails due to using incorrect TFT values
-//! @SYMTestExpectedResults The SpudMan code should respond to this event correctly without Leave and Panic.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide.ini SecondaryActivationFails19
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0815
-
-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-0816
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0816
-//! @SYMTestCaseDesc Secondary PDP context: Setting requested QoS parameters fails
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions Setting QoS parameters on secondary PDP context fails due to using incorrect QoS parameter values
-//! @SYMTestExpectedResults The SpudMan code should respond to this event correctly without Leave and Panic.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide.ini SecondaryActivationFails20
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0816
-
-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-0817
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0817
-//! @SYMTestCaseDesc Primary PDP context deletion fails
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Primary PDP context deletion fails by modifying the TFT values
-//! @SYMTestExpectedResults The SpudMan code should respond to this event correctly without Leave and Panic.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryDeletionFails21
-DELAY 8000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0817
-
-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-0818
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0818
-//! @SYMTestCaseDesc Secondary PDP context deletion fails
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Secondary PDP context deletion fails by modifying the TFT values
-//! @SYMTestExpectedResults The SpudMan code should respond to this event correctly without Leave and Panic.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide.ini SecondaryDeletionFails22
-DELAY 8000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0818
-
-
-START_TESTCASE          NET-Spud-NetworkSide-0819
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0819
-//! @SYMTestCaseDesc  Network deletes a primary context
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions  Starts a secondary context by creating a socket with QoS, starts a rawipnif instance opposite the secondary context, deletes the primary context then sends data on the primary context's socket.
-//! @SYMTestExpectedResults   Since the primary context is down, the data is sent on the secondary context, and is received by the rawipnif instance opposite the secondary context.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 600 TE_SpudNetworkSide CSpudDeletePrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryQoSEventDeleteWithSecondary
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0819
-
-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-0820
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0820
-//! @SYMTestCaseDesc Call RConnection::Stop while SPUDFSM is initialising the phone  
-//! @SYMFssId NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions  Cause RPhone::Initialise to take a very long time to complete, and call RConnection::Stop while it is running
-//! @SYMTestExpectedResults Connection stops successfully.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudPrimayStartingStop z:\testdata\configs\te_spudNetworkSide.ini PrimarySlowInitialisePhone
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0820
-
-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-0821
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0821
-//! @SYMTestCaseDesc Sanity check: successfully activate many primary contexts. 
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start the SPUD interfaces. SIM TSY, etc successfully activate the primary contexts.
-//! @SYMTestExpectedResults  The Primary PDP contexts are activated, SPUD started: RConnection::Start on the SPUDs returns KErrNone.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 100 TE_SpudNetworkSide CSpudMultiPrimary z:\testdata\configs\te_spudNetworkSide.ini MultiPrimaryActivationOk1
-DELAY 3000
-RUN_TEST_STEP 100 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0821
-
-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-0822
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0822
-//! @SYMTestCaseDesc Set requested Qos (SSD, IM CN SI) on a Secondary PDP context.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions  Activate the primary and the secondary contexts by opening a socket & setting requested Qos (SSD = Speech, SI = True, IM CN SI = True) on secondary PDP context
-//! @SYMTestExpectedResults Both the primary & secondary contexts are activated. EQoSEventAddPolicy and EQoSEventConfirm are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudQosR5Secondary z:\testdata\configs\te_spudNetworkSide.ini SecondaryR5ActivationOk1
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0822
-
-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-0823
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0823
-//! @SYMTestCaseDesc Secondary PDP context: Setting requested QoS parameters fails
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions Setting QoS parameters on secondary PDP context fails due to using incorrect QoS parameter values
-//! @SYMTestExpectedResults The SpudMan code should respond to this event correctly without Leave and Panic.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudQosR5Secondary z:\testdata\configs\te_spudNetworkSide.ini SecondaryR5ActivationFails20
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0823
-
-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-0824
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0824
-//! @SYMTestCaseDesc  Network deletes a primary context where SI is set on Secondary PDP context.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions  Starts a secondary context by creating a socket with QoS, starts a rawipnif instance opposite the secondary context, deletes the primary context then sends data on the primary context's socket.
-//! @SYMTestExpectedResults   Since the primary context is down, the data is sent on the secondary context, and is received by the rawipnif instance opposite the secondary context.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 600 TE_SpudNetworkSide CSpudDeletePrimaryR5Qos z:\testdata\configs\te_spudNetworkSide.ini PrimaryQoSR5EventDeleteWithSecondary
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0824
-
-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-0825
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0825
-//! @SYMTestCaseDesc Sanity check: Primary context Progress Test 
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start the SPUD interface. SIM TSY, etc successfully activate the primary context. Check the Progress.
-//! @SYMTestExpectedResults  Primary PDP context is activated, SPUD is started: RConnection::Start on SPUD returns KErrNone. Check the Progress of connection.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimaryContextEventProgress z:\testdata\configs\te_spudNetworkSide.ini PrimaryActivationOk1
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0825
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-
-
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  DeleteFile c:\loopback.ini
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/scripts/TE_spudNetworkSide_R4_and_R5.script	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,563 +0,0 @@
-// Copyright (c) 2004-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:
-// Secondary PDP-context UMTS Driver integration tests of network-initiated conditions.
-//
-
-//! @file TE_spudNetworkSide.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_SpudNetworkSide_config_r4_and_r5.txt c:\simtsy\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_config_r4_and_r5.txt c:\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSideLoopbackCSY.ini c:\loopback.ini
-
-// Configure CommDB for the tests
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-ced -i z:\TestData\Configs\TE_SpudNetworkSide_r4_and_r5.xml
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-LOAD_SUITE TE_SpudNetworkSide
-
-// TestSection suffix numbers correspond to SIM TSY's test section numbers. i.e. PrimaryActivationFails201 uses SIM TSYs test201 
-
-//
-// Sanity check tests: before testing the error cases, we test the success cases to make sure the system is OK.
-//
-
-START_TESTCASE          NET-Spud-NetworkSide-1301
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1301
-//! @SYMTestCaseDesc Sanity check: successfully activate Primary R4 context.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start the SPUD interface. SIM TSY, etc successfully activate the primary context.
-//! @SYMTestExpectedResults  Primary PDP context is activated, SPUD is started: RConnection::Start on SPUD returns KErrNone.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini PrimaryActivationOk1301
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1301
-
-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-1302
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1302
-//! @SYMTestCaseDesc Sanity check: successfully activate Primary R5 context. 
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start the SPUD interface. SIM TSY, etc successfully activate the primary context.
-//! @SYMTestExpectedResults  Primary PDP context is activated, SPUD is started: RConnection::Start on SPUD returns KErrNone.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini PrimaryActivationOk1302
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1302
-
-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-1303
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1303
-//! @SYMTestCaseDesc Sanity check: successfully activate Secondary R5 context. 
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions Implicitly start the SPUD interface by opening a socket bound to its secondary context. Set QoS on the socket, prompting GUQoS to activate secondary context.
-//! @SYMTestExpectedResults Both the primary & secondary contexts are activated. EQoSEventAddPolicy and EQoSEventConfirm are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini SecondaryActivationOk1303
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1303
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-//
-// Operation errors: Creation, TFT, QoS, Activation, Deactivation, Deletion errors.
-//
-START_TESTCASE          NET-Spud-NetworkSide-1304
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1304
-//! @SYMTestCaseDesc Activation of Primary fails. 
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP R4 Context Creation
-//! @SYMTestActions Explicitly start Spud. SIM TSY returns an error on activation of the primary context. 
-//! @SYMTestExpectedResults Spud cannot be started: RConnection::Start returns an error.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini PrimaryActivationFails1304
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1304
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-//
-// Operation errors: Creation, TFT, QoS, Activation, Deactivation, Deletion errors.
-//
-START_TESTCASE          NET-Spud-NetworkSide-1305
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1305
-//! @SYMTestCaseDesc Activation of Primary fails.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP R5 Context Creation
-//! @SYMTestActions Explicitly start Spud. SIM TSY returns an error on activation of the primary context.
-//! @SYMTestExpectedResults Spud cannot be started: RConnection::Start returns an error.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini PrimaryActivationFails1305
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1305
-
-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-1306
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1306
-//! @SYMTestCaseDesc Activation of Secondary fails.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP R5 Context Creation
-//! @SYMTestActions Implicitly start SPUD by opening a socket bound to the secondary context. Set QoS on the socket, prompting GUQoS to activate secondary context. SIM TSY errors secondary context activation request.
-//! @SYMTestExpectedResults  EQoSEventAddPolicy and EQoSEventFailure are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini SecondaryActivationFails1306
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1306
-
-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-1307
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1307
-//! @SYMTestCaseDesc Network deletes Activated Primary.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP R4 Context Deactivation
-//! @SYMTestActions Activate the primary context only by explicitly starting Spud. After a pause, SIM.TSY deletes the primary context.
-//! @SYMTestExpectedResults Spud is started successfully - the RConnection is started with KErrNone. KLinkLayerClosed / KErrDisconnected notification is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimaryEvent z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini PrimaryQoSEventDelete1307
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1307
-
-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-1308
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1308
-//! @SYMTestCaseDesc Network deletes Activated Primary.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP R5 Context Deactivation
-//! @SYMTestActions Activate the primary context only by explicitly starting Spud. After a pause, SIM.TSY deletes the primary context.
-//! @SYMTestExpectedResults Spud is started successfully - the RConnection is started with KErrNone. KLinkLayerClosed / KErrDisconnected notification is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimaryEvent z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini PrimaryQoSEventDelete1308
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1308
-
-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-1311
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1311
-//! @SYMTestCaseDesc  The QoS parameter changes on the Primary PDP R5 Context.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMTestActions Explicitly start the SPUD interface to activate the primary context, use sim.tsy to trigger the QoS parameter changes on the Primary PDP Context.
-//! @SYMTestExpectedResults SPUD starts successfully. SPUD receives the QoS parameter change event successfully. RConnection times out and returns the error code KErrTimedOut.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimaryEvent z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini ENetworkQoSChangePrimary1311
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1311
-
-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-1312
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1312
-//! @SYMTestCaseDesc  The QoS parameter changes on the Primary PDP R5 Context.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMTestActions Explicitly start the SPUD interface to activate the primary context, use sim.tsy to trigger the QoS parameter changes on the Primary PDP Context.
-//! @SYMTestExpectedResults SPUD starts successfully. SPUD receives the QoS parameter change event successfully. RConnection times out and returns the error code KErrTimedOut.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimaryEvent z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini ENetworkQoSChangePrimary1312
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1312
-
-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-1315
-//! @SYMTestCaseID		NET-Spud-NetworkSide-1315
-//! @SYMTestCaseDesc Triggers the Primary PDP Context deletion before the lower NIF is up.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Explicitly start the SPUD interface to activate the primary context, it fails then deletes the Primary Context.
-//! @SYMTestExpectedResults Spud start fails. RConnection::Start returns the error.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini PrimaryDeleteBeforeLowerNif1315
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini ESockCheck
-END_TESTCASE			NET-Spud-NetworkSide-1315
-
-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-1316
-//! @SYMTestCaseID		NET-Spud-NetworkSide-1316
-//! @SYMTestCaseDesc Triggers the Primary PDP Context deletion before the lower NIF is up.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Explicitly start the SPUD interface to activate the primary context, it fails then deletes the Primary Context.
-//! @SYMTestExpectedResults Spud start fails. RConnection::Start returns the error.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini PrimaryDeleteBeforeLowerNif1316
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini ESockCheck
-END_TESTCASE			NET-Spud-NetworkSide-1316
-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-1317
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1317
-//! @SYMTestCaseDesc Triggers the Secondary PDP Context deletion before the lower NIF is up.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Activate the primary and the secondary contexts by opening a socket & setting QoS on it,fails to creat the secondary context.
-//! @SYMTestExpectedResults EQoSEventAddPolicy, EQoSEventFailure are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini SecondaryDeleteBeforeLowerNif1317
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1317
-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-1318
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1318
-//! @SYMTestCaseDesc Failure to Start a lower NIF for primary context (LinkLayerDown from lower NIF)
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start SPUD. Spud starts the lower NIF for the primary context. Lower NIF reports LinkLayerDown with an error.
-//! @SYMTestExpectedResults Spud start fails. RConnection::Start returns the error.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini PrimaryLowerNifStartFails1318
-DELAY 3000
-RUN_TEST_STEP 30 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1318
-
-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-1319
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1319
-//! @SYMTestCaseDesc Failure to Start a lower NIF for primary context (LinkLayerDown from lower NIF)
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start SPUD. Spud starts the lower NIF for the primary context. Lower NIF reports LinkLayerDown with an error.
-//! @SYMTestExpectedResults Spud start fails. RConnection::Start returns the error.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini PrimaryLowerNifStartFails1319
-DELAY 3000
-RUN_TEST_STEP 30 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1319
-
-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-1320
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1320
-//! @SYMTestCaseDesc Failure to Start a lower NIF for secondary context (LinkLayerDown from lower NIF)
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions Request activation of the secondary PDP context by opening a socket & setting QoS on it. Spud start the lower NIF for the secondary context. Lower NIF reports LinkLayerDown with error.
-//! @SYMTestExpectedResults The primary context is activated, secondary is not. EQoSEventAddPolicy and EQoSEventFailure with the error code are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini SecondaryLowerNifStartFails1320
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1320
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-// This test doesn't work here or in te_spudnetworkside, needs a fix
-START_TESTCASE          NET-Spud-NetworkSide-1321
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1321
-//! @SYMTestCaseDesc Test Etel suspension of primary context
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMTestActions Create/send data on a socket with no QoS parameters (therefore a primary context), and read from the opposite loopback port. Suspend the context. Send more data and attempt to read from the opposite port. Resume the context. Send more data and attempt to read from the opposite port.
-//! @SYMTestExpectedResults The read on the loopback comm port should work before the context is suspended, and after it is resumed. It should time-out when the context is suspended.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudSuspendContext z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini PrimaryContextSuspendAndResume1321
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini ESockCheck
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-1321
-
-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-1322
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1322
-//! @SYMTestCaseDesc Test Etel suspension of secondary context
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMTestActions Create/send data on a socket with QoS parameters (therefore a secondary context), and read from the opposite loopback port. Suspend the context. Send more data and attempt to read from the opposite port. Resume the context. Send more data and attempt to read from the opposite port.
-//! @SYMTestExpectedResults The read on the loopback comm port should work before the context is suspended, and after it is resumed. It should time-out when the context is suspended.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudSuspendContext z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini SecondaryContextSuspendAndResume1322
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini ESockCheck
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-1322
-
-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-1323
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1323
-//! @SYMTestCaseDesc Primary PDP context activation fails
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Primary PDP context activation fails by modifying the TFT values
-//! @SYMTestExpectedResults The SpudMan code should respond to this event correctly without Leave and Panic.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini PrimaryActivationFails1323
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1323
-
-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-1324
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1324
-//! @SYMTestCaseDesc Primary PDP context activation fails
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Primary PDP context activation fails by modifying the TFT values
-//! @SYMTestExpectedResults The SpudMan code should respond to this event correctly without Leave and Panic.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini PrimaryActivationFails1324
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1324
-
-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-1325
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1325
-//! @SYMTestCaseDesc Secondary PDP context: Setting TFT fails
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions Setting TFT values on secondary PDP context fails due to using incorrect TFT values
-//! @SYMTestExpectedResults The SpudMan code should respond to this event correctly without Leave and Panic.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini SecondaryActivationFails1325
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1325
-
-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-1326
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1326
-//! @SYMTestCaseDesc Secondary PDP context: Setting requested QoS parameters fails
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions Setting QoS parameters on secondary PDP context fails due to using incorrect QoS parameter values
-//! @SYMTestExpectedResults The SpudMan code should respond to this event correctly without Leave and Panic.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini SecondaryActivationFails1326
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1326
-
-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-1327
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1327
-//! @SYMTestCaseDesc Primary PDP context deletion fails
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Primary PDP context deletion fails by modifying the TFT values
-//! @SYMTestExpectedResults The SpudMan code should respond to this event correctly without Leave and Panic.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini PrimaryDeletionFails1327
-DELAY 8000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1327
-
-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-1328
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1328
-//! @SYMTestCaseDesc Primary PDP context deletion fails
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Primary PDP context deletion fails by modifying the TFT values
-//! @SYMTestExpectedResults The SpudMan code should respond to this event correctly without Leave and Panic.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini PrimaryDeletionFails1328
-DELAY 8000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1328
-
-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-1329
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1329
-//! @SYMTestCaseDesc Secondary PDP context deletion fails
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Secondary PDP context deletion fails by modifying the TFT values
-//! @SYMTestExpectedResults The SpudMan code should respond to this event correctly without Leave and Panic.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini SecondaryDeletionFails1329
-DELAY 8000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1329
-
-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-1330
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1330
-//! @SYMTestCaseDesc  Network deletes a primary context
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions  Starts a secondary context by creating a socket with QoS, starts a rawipnif instance opposite the secondary context, deletes the primary context then sends data on the primary context's socket.
-//! @SYMTestExpectedResults   Since the primary context is down, the data is sent on the secondary context, and is received by the rawipnif instance opposite the secondary context.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 600 TE_SpudNetworkSide CSpudDeletePrimary z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini PrimaryQoSEventDeleteWithSecondary1330
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1330
-
-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-1331
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1331
-//! @SYMTestCaseDesc Call RConnection::Stop while SPUDFSM is initialising the phone
-//! @SYMFssId NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions  Cause RPhone::Initialise to take a very long time to complete, and call RConnection::Stop while it is running
-//! @SYMTestExpectedResults Connection stops successfully.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudPrimayStartingStop z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini PrimarySlowInitialisePhone1331
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-1331
-
-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-1332
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1332
-//! @SYMTestCaseDesc Call RConnection::Stop while SPUDFSM is initialising the phone
-//! @SYMFssId NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions  Cause RPhone::Initialise to take a very long time to complete, and call RConnection::Stop while it is running
-//! @SYMTestExpectedResults Connection stops successfully.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudPrimayStartingStop z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini PrimarySlowInitialisePhone1332
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-1332
-
-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-1333
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1333
-//! @SYMTestCaseDesc Sanity check: successfully activate many primary contexts.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start the SPUD interfaces. SIM TSY, etc successfully activate the primary contexts.
-//! @SYMTestExpectedResults  The Primary PDP contexts are activated, SPUD started: RConnection::Start on the SPUDs returns KErrNone.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 100 TE_SpudNetworkSide CSpudMultiPrimary z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini MultiPrimaryActivationOk1333
-DELAY 3000
-RUN_TEST_STEP 100 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1333
-
-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-1334
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1334
-//! @SYMTestCaseDesc Sanity check: successfully activate many primary contexts.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start the SPUD interfaces. SIM TSY, etc successfully activate the primary contexts.
-//! @SYMTestExpectedResults  The Primary PDP contexts are activated, SPUD started: RConnection::Start on the SPUDs returns KErrNone.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 100 TE_SpudNetworkSide CSpudMultiPrimary z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini MultiPrimaryActivationOk1334
-DELAY 3000
-RUN_TEST_STEP 100 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide_R4_and_R5.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1334
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-
-
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  DeleteFile c:\loopback.ini
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/scripts/TE_spudNetworkSide_nifman.script	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,338 +0,0 @@
-// Copyright (c) 2005-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:
-// Secondary PDP-context UMTS Driver integration tests using NIFMAN
-//
-
-//! @file TE_SpudNetworkSide_nifman.script
-
-RUN_UTILS  MkDir c:\simtsy\
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_nifman_config.txt c:\simtsy\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_nifman_config.txt c:\config.txt
-
-RUN_UTILS  MakeReadWrite c:\loopback.ini
-RUN_UTILS  DeleteFile c:\loopback.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSideLoopbackCSY.ini c:\loopback.ini
-
-
-LOAD_SUITE TE_SpudNetworkSide
-
-// TestSection suffix numbers correspond to SIM TSY's test section numbers. i.e. PrimaryActivationFails201 uses SIM TSYs test201 
-
-//
-// Configure CommDB for the tests using RawIP as lower NIF.
-//
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-ced -i z:\TestData\Configs\TE_SpudNetworkSide_nifman.xml
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-
-//
-// Nifman stops SPUD when there is just the primary PDP context.
-//
-
-
-START_TESTCASE          NET-Spud-NetworkSide-1001
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1001
-//! @SYMTestCaseDesc Stop the interface when SPUD is deleting the primary context as a result of lower NIF LinkLayerDown.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Start Spud & successfully activate the primary context. Write to the primary, such that the lower NIF errors our on the read and report LinkLayerDown. Spud issues deletion request on the primary. When the request is outstanding, RConnection::Stop(EStopNormal) is called on Spud.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app on Spud.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudPrimaryDeletionInterfaceStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopPrimaryDeleting1
-DELAY 3000
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-END_TESTCASE            NET-Spud-NetworkSide-1001
-
-
-
-START_TESTCASE          NET-Spud-NetworkSide-1002
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1002
-//! @SYMTestCaseDesc Stop the interface using Idle timeout, when SPUD is deleting the primary context as a result of lower NIF LinkLayerDown.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Start Spud & successfully activate the primary context. Write to the primary, such that the lower NIF errors our on the read and report LinkLayerDown. Spud issues deletion request on the primary. When the request is outstanding, Nifman idle timeout stops the Spud with KErrTimedOut.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrTimedOut is received by the test app on Spud.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 300 TE_SpudNetworkSide CSpudPrimaryDeletionInterfaceStop z:\testdata\configs\te_spudNetworkSide_nifman.ini TimeoutStopPrimaryDeleting1
-DELAY 3000
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-END_TESTCASE            NET-Spud-NetworkSide-1002
-
-
-
-START_TESTCASE          NET-Spud-NetworkSide-1003
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1003
-//! @SYMTestCaseDesc Stop (EStopNormal) the interface when the primary context is suspended.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Start Spud & successfully activate the primary context. SIM TSY suspends the primary. RConnection::Stop(EStopNormal) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudPrimaryInterfaceEventStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopOnPrimarySuspended1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-1003
-
-START_TESTCASE          NET-Spud-NetworkSide-1004
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1004
-//! @SYMTestCaseDesc Stop (EStopNormal) the interface when the primary context is being deactivated.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Start Spud & successfully activate the primary context. SIM TSY changes the state of the primary to Deactivating. RConnection::Stop(EStopNormal) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudPrimaryInterfaceEventStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopOnPrimaryDeactivating1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-1004
-
-START_TESTCASE          NET-Spud-NetworkSide-1005
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1005
-//! @SYMTestCaseDesc Stop (EStopNormal) the interface when the primary context is inactive.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Start Spud & successfully activate the primary context. SIM TSY changes the state of the primary to Inactive. RConnection::Stop(EStopNormal) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app on Spud.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudPrimaryInterfaceEventStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopOnPrimaryInactive1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-1005
-
-START_TESTCASE          NET-Spud-NetworkSide-1006
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1006
-//! @SYMTestCaseDesc Stop (EStopAuthoritative) the interface when the primary context is suspended.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Start Spud & successfully activate the primary context. SIM TSY changes the state of the primary to Suspended. RConnection::Stop(EStopAuhoritative) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrConnectionTerminated is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudPrimaryInterfaceEventStop z:\testdata\configs\te_spudNetworkSide_nifman.ini AuthStopOnPrimarySuspended1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-1006
-
-START_TESTCASE          NET-Spud-NetworkSide-1007
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1007
-//! @SYMTestCaseDesc Stop (EStopAuthoritative) the interface when the primary context is being deactivated.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Start Spud & successfully activate the primary context. SIM TSY changes the state of the primary to Deactivating. RConnection::Stop(EStopAuthoritative) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrConnectionTerminated is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudPrimaryInterfaceEventStop z:\testdata\configs\te_spudNetworkSide_nifman.ini AuthStopOnPrimaryDeactivating1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-1007
-
-
-START_TESTCASE          NET-Spud-NetworkSide-1008
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1008
-//! @SYMTestCaseDesc Stop (EStopAuthoritative) the interface when the primary context is inactive.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Start Spud & successfully activate the primary context. SIM TSY changes the state of the primary to Inactive. RConnection::Stop(EStopAuthoritative) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrConnectionTerminated is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudPrimaryInterfaceEventStop z:\testdata\configs\te_spudNetworkSide_nifman.ini AuthStopOnPrimaryInactive1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-1008
-
-START_TESTCASE          NET-Spud-NetworkSide-1009
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1009
-//! @SYMTestCaseDesc Stop (EStopAuthoritative) the interface when the primary context is the only context, and is active.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Start Spud & successfully activate the primary context. RConnection::Stop(EStopAuthoritative) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrConnectionTerminated is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudPrimaryInterfaceStop z:\testdata\configs\te_spudNetworkSide_nifman.ini PrimaryOnlyAuthoritativeStop1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-1009
-
-START_TESTCASE          NET-Spud-NetworkSide-1010
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1010
-//! @SYMTestCaseDesc Stop (EStopNormal) the interface when the primary context is the only context, and is active.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Start Spud & successfully activate the primary context. SIM TSY changes the state of the primary to Inactive. RConnection::Stop(EStopNormal) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudPrimaryInterfaceStop z:\testdata\configs\te_spudNetworkSide_nifman.ini PrimaryOnlyNormalStop1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-1010
-
-
-
-//
-// Nifman stops SPUD where there is a primary and a secondary context.
-//
-
-
-// ****** GUQoS crashes ESock.
-START_TESTCASE          NET-Spud-NetworkSide-1011
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1011
-//! @SYMTestCaseDesc Stop the interface when SPUD is activating the secondary context.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Open a socket, set QoS and trigger 2ndary context activation. When activation request on SIM TSY is outstanding, RConnection::Stop(EStopNormal) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT 
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudSecondaryStartingStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopSecondaryActivating1
-DELAY 3000
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-END_TESTCASE            NET-Spud-NetworkSide-1011
-
-
-// ****** GUQoS crashes ESock.
-START_TESTCASE          NET-Spud-NetworkSide-1012
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1012
-//! @SYMTestCaseDesc Stop the interface when SPUD is setting TFT on the secondary context.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Open a socket, set QoS and trigger 2ndary context creation. When setting TFT request on SIM TSY is outstanding, RConnection::Stop(EStopNormal) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT 
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudSecondaryStartingStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopSecondarySettingTFT25
-DELAY 3000
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-END_TESTCASE            NET-Spud-NetworkSide-1012
-
-
-
-
-START_TESTCASE          NET-Spud-NetworkSide-1013
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1013
-//! @SYMTestCaseDesc Trigger GUQoS deletion request due to timeout, after stop was called by Nifman.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Open a socket, set QoS and sucessfully activate the 2ndary context. Close the socket and wait. RConnection::Stop(EStopNormal) is called. Spud deletes the 2ndary.  When the deletion request on SIM TSY is outstading, GUQoS deletes the secondary due to its timeout. 
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudSecondaryInterfaceEventStop z:\testdata\configs\te_spudNetworkSide_nifman.ini GUQoSDeleteOnNormalStop1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-1013
-
-
-// ****** GUQoS crashes ESock.
-START_TESTCASE          NET-Spud-NetworkSide-1014
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1014
-//! @SYMTestCaseDesc Stop the interface when SPUD is deleting the 2ndary context as a result of lower NIF LinkLayerDown.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Open a socket, set QoS and sucessfully activate the 2ndary context. Trigger 2ndary's lower NIF to signal LinkLayerDown. Spud deletes the 2ndary. When the deletion request on SIM TSY is outstading,  RConnection::Stop(EStopNormal) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudSecondaryLowerNifDownStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopSecondaryLowerNifDown1
-DELAY 3000
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-END_TESTCASE            NET-Spud-NetworkSide-1014
-
-
-START_TESTCASE          NET-Spud-NetworkSide-1015
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1015
-//! @SYMTestCaseDesc Stop the interface when SPUD is deleting the 2ndary context following a GUQoS deletion request due to timeout.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Open a socket, set QoS and sucessfully activate the 2ndary context. Close the socket. GUQoS deletes the secondary after a timeout. When the deletion request on SIM TSY is outstading,  RConnection::Stop(EStopNormal) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudSecondaryInterfaceEventStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopGUQoSDeletingSecondary1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-1015
-
-
-
-START_TESTCASE          NET-Spud-NetworkSide-1016
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1016
-//! @SYMTestCaseDesc Stop (EStopAuthoritative) the interface when the primary & 2ndary contexts are active.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Successfully activate the primary and the secondary contexts. RConnection::Stop(EStopAuthoritative) is called.
-//! @SYMTestExpectedResults EQoSEventConfirm is received. Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrConnectionTerminated is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT 
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudSecondaryInterfaceStop z:\testdata\configs\te_spudNetworkSide_nifman.ini AuthStopSecondaryActive1
-DELAY 3000
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-END_TESTCASE            NET-Spud-NetworkSide-1016
-
-START_TESTCASE          NET-Spud-NetworkSide-1017
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1017
-//! @SYMTestCaseDesc Stop (EStopNormal) the interface when the primary & 2ndary contexts are active.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Successfully activate the primary and the secondary contexts. RConnection::Stop(EStopNormal) is called.
-//! @SYMTestExpectedResults EQoSEventConfirm is received. Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT 
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudSecondaryInterfaceStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopSecondaryActive1
-DELAY 3000
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-END_TESTCASE            NET-Spud-NetworkSide-1017
-
-
-
-
-
-// We must make sure SIM TSY fails when opening RPhone. We get rid of the config file.
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-
-
-START_TESTCASE          NET-Spud-NetworkSide-1018
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1018
-//! @SYMTestCaseDesc Leave when trying to construct SPUD.  
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions  Cause RPhone::Open to fail, resulting CSpudMan construction to Leave with KErrNone.
-//! @SYMTestExpectedResults Spud start fails gracefully. No crash in ESock. KLinkLayerClosed with KErrNotFound is received by the test app. 
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide_nifman.ini LeaveInSpudCreation
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-1018
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-RUN_UTILS  DeleteFile c:\loopback.ini
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/scripts/TE_spudNetworkSide_ppp.script	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,152 +0,0 @@
-// Copyright (c) 2004-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:
-// Secondary PDP-context UMTS Driver integration tests using PPP as the NIF.
-//
-
-//! @file TE_SpudNetworkSide_ppp.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
-
-LOAD_SUITE TE_SpudNetworkSide
-
-// TestSection suffix numbers correspond to SIM TSY's test section numbers. i.e. PrimaryActivationFails201 uses SIM TSYs test201 
-
-//
-// Configure CommDB for the tests using PPP as lower NIF
-//
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-ced -i z:\TestData\Configs\TE_SpudNetworkSide_ppp.xml
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_nifman_config.txt c:\simtsy\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_nifman_config.txt c:\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSideLoopbackCSY.ini c:\loopback.ini
-
-START_TESTCASE          NET-Spud-NetworkSide-1101
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1101
-//! @SYMTestCaseDesc Stop the interface when SPUD is starting lower NIF for the primary context.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions SPUD starts the lower NIF, which "takes a long time to start", i.e. no LinkLayerUp / Down. Stop SPUD using RConnection::Stop(EStopNormal)
-//! @SYMTestExpectedResults KLinkLayerClosed / KErrCancel progress.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType IT 
-// Note: this test case uses CSpudSecondaryStartingStop by design, because the sequence of events is identical, the only difference is timing.
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudSecondaryStartingStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopPrimaryStartingLowerNif1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-1101
-
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_config.txt c:\simtsy\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_config.txt c:\config.txt
-
-
-
-START_TESTCASE          NET-Spud-NetworkSide-1102
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1102
-//! @SYMTestCaseDesc Error on Start of a lower NIF for primary context.  
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start Spud. Spud starts a lower NIF for the primary context, which returns an error.
-//! @SYMTestExpectedResults starting Spud fails. RConnection::Start returns an error.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 30 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide_platsec.ini PrimaryLowerNifStartError210
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-1102
-
-
-# Wait for Nifman Idle timeout to kill the interface
-DELAY 10000
-
-START_TESTCASE          NET-Spud-NetworkSide-1103
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1103
-//! @SYMTestCaseDesc Network Deletes primary context when lower NIF was started, and SPUD waits for LinkLayerUp.  
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start Spud. Spud starts the lower NIF for the primary, which "takes a long time to start, i.e. no LinkLayerUp/Down. SIM TSY deletes the primary context.
-//! @SYMTestExpectedResults Start on Spud fails. Nifman progress 8000 with KErrDisconnected is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 30 TE_SpudNetworkSide CSpudPrimaryEventOnLowerNifStarting z:\testdata\configs\te_spudNetworkSide.ini PrimaryDeleteOnLowerNifStart212
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-1103
-
-
-// The following tests use different CommDB entries
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-ced -i z:\TestData\Configs\TE_SpudNetworkSide_PppLoopback.xml
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-RUN_UTILS  MakeReadWrite c:\loopback.ini
-RUN_UTILS  DeleteFile c:\loopback.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSideLoopbackCSY_serial.ini c:\loopback.ini
-
-
-START_TESTCASE          NET-Spud-NetworkSide-1104
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1104
-//! @SYMTestCaseDesc Sanity check: successfully activate Primary context using PPP as a lower NIF
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start the SPUD interface using PPP. Also start a PPP server connected to the port from the SPUD. SIM TSY, etc successfully activate the primary context.
-//! @SYMTestExpectedResults  Primary PDP context is activated, SPUD is started: RConnection::Start on SPUD returns KErrNone.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPppPrimary z:\testdata\configs\te_spudNetworkSide.ini PppPrimaryOk
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1104
-
-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-1105
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1105
-//! @SYMTestCaseDesc Successfully activate a secondary context and send data using the secondary context, using PPP as the lower NIF
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions Open a socket with QoS parameters. Also start 2 PPP server instances on loopback ports opposite the primary and secondary contexts of the SPUD. Send data to and from the secondary context of SPUD.
-//! @SYMTestExpectedResults  Primary PDP context is activated, SPUD is started: RConnection::Start on SPUD returns KErrNone. Send as well as RecvFrom complete successfully.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 600 TE_SpudNetworkSide CSpudPppSecondarySend z:\testdata\configs\te_spudNetworkSide.ini PppSecondarySend
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1105
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  DeleteFile c:\loopback.ini
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/scripts/TE_spudNetworkSide_ppp_9x.script	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,170 +0,0 @@
-// Copyright (c) 2004-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:
-// Secondary PDP-context UMTS Driver integration tests using PPP as the NIF.
-//
-
-//! @file TE_SpudNetworkSide_ppp_9x.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
-
-LOAD_SUITE TE_SpudNetworkSide
-
-// TestSection suffix numbers correspond to SIM TSY's test section numbers. i.e. PrimaryActivationFails201 uses SIM TSYs test201 
-
-//
-// Configure CommDB for the tests using PPP as lower NIF
-//
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-ced -i z:\TestData\Configs\TE_SpudNetworkSide_ppp.xml
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_ppp_config.txt c:\simtsy\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_ppp_config.txt c:\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSideLoopbackCSY.ini c:\loopback.ini
-
-START_TESTCASE          NET-Spud-NetworkSide-1201
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1201
-//! @SYMTestCaseDesc Stop the interface when SPUD is starting lower NIF for the primary context.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions SPUD starts the lower NIF, which "takes a long time to start", i.e. no LinkLayerUp / Down. Stop SPUD using RConnection::Stop(EStopNormal)
-//! @SYMTestExpectedResults KLinkLayerClosed / KErrCancel progress.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType IT 
-// Note: this test case uses CSpudSecondaryStartingStop by design, because the sequence of events is identical, the only difference is timing.
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudSecondaryStartingStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopPrimaryStartingLowerNif1
-DELAY 6000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1201
-
-
-// Unload and reload ESock TWICE. Once is not enough to correct the crash of the previous test
-// case. Afeter TESTCASE 1 is fixed, this can (and should) be safely removed.
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\te_spudnetworkside_ppp_config2.txt c:\simtsy\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\te_spudnetworkside_ppp_config2.txt c:\config.txt
-
-
-
-START_TESTCASE          NET-Spud-NetworkSide-1202
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1202
-//! @SYMTestCaseDesc Error on Start of a lower NIF for primary context.  
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start Spud. Spud starts a lower NIF for the primary context, which returns an error.
-//! @SYMTestExpectedResults starting Spud fails. RConnection::Start returns an error.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 30 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide_platsec.ini PrimaryLowerNifStartError210
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1202
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-
-// Wait for Nifman Idle timeout to kill the interface
-DELAY 10000
-
-START_TESTCASE          NET-Spud-NetworkSide-1203
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1203
-//! @SYMTestCaseDesc Network Deletes primary context when lower NIF was started, and SPUD waits for LinkLayerUp.  
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start Spud. Spud starts the lower NIF for the primary, which "takes a long time to start, i.e. no LinkLayerUp/Down. SIM TSY deletes the primary context.
-//! @SYMTestExpectedResults Start on Spud fails. Nifman progress 2000 with KErrDisconnected is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 30 TE_SpudNetworkSide CSpudPrimaryEventOnLowerNifStarting z:\testdata\configs\te_spudNetworkSide.ini PrimaryDeleteOnLowerNifStart212
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1203
-
-
-// The following tests use different CommDB entries
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-ced -i z:\TestData\Configs\TE_SpudNetworkSide_PppLoopback.xml
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-RUN_UTILS  MakeReadWrite c:\loopback.ini
-RUN_UTILS  DeleteFile c:\loopback.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSideLoopbackCSY_serial.ini c:\loopback.ini
-
-
-START_TESTCASE          NET-Spud-NetworkSide-1204
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1204
-//! @SYMTestCaseDesc Sanity check: successfully activate Primary context using PPP as a lower NIF
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start the SPUD interface using PPP. Also start a PPP server connected to the port from the SPUD. SIM TSY, etc successfully activate the primary context.
-//! @SYMTestExpectedResults  Primary PDP context is activated, SPUD is started: RConnection::Start on SPUD returns KErrNone.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPppPrimary z:\testdata\configs\te_spudNetworkSide.ini PppPrimaryOk
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1204
-
-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-1205
-//! @SYMTestCaseID      NET-Spud-NetworkSide-1205
-//! @SYMTestCaseDesc Successfully activate a secondary context and send data using the secondary context, using PPP as the lower NIF
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions Open a socket with QoS parameters. Also start 2 PPP server instances on loopback ports opposite the primary and secondary contexts of the SPUD. Send data to and from the secondary context of SPUD.
-//! @SYMTestExpectedResults  Primary PDP context is activated, SPUD is started: RConnection::Start on SPUD returns KErrNone. Send as well as RecvFrom complete successfully.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 600 TE_SpudNetworkSide CSpudPppSecondarySend z:\testdata\configs\te_spudNetworkSide.ini PppSecondarySend
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-1205
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  DeleteFile c:\loopback.ini
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/scripts/version1/TE_PppSize_spud.script	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-//
-// Copyright (c) 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:
-//
-// backup the old commsdb
-
-RUN_UTILS  MkDir c:\simtsy\
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-
-LOAD_SUITE TE_PPPSize -SharedData
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-ced -i z:\testdata\configs\te_pppsize_spud.xml te_pppsize_spud.log
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_PPPSize_config.txt c:\simtsy\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_PPPSize_config.txt c:\config.txt
-
-START_TESTCASE          NET-Spud-NetworkSide-0101
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0101
-RUN_TEST_STEP 2000 TE_PPPSize PPPMinMaxMMU z:\testdata\configs\te_pppsize_spud.ini
-END_TESTCASE            NET-Spud-NetworkSide-0101
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/scripts/version1/TE_SpudNetworkside_Channel.script	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-// Copyright (c) 2005-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:
-// Secondary PDP-context UMTS Driver integration tests using RQoSChannel
-// 
-//
-
-//! @file TE_SpudNetworkside_Channel.script
-
-
-RUN_UTILS  MkDir c:\simtsy\
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  MakeReadWrite c:\loopback.ini
-RUN_UTILS  MakeReadWrite c:\qospolicies.ini
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  DeleteFile c:\loopback.ini
-RUN_UTILS  DeleteFile c:\qospolicies.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_Channel_config.txt c:\simtsy\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_Channel_config.txt c:\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSideLoopbackCSY.ini c:\loopback.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\qospolicies.ini c:\qospolicies.ini
-
-// Configure CommDB for the tests
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-ced -i z:\TestData\Configs\TE_SpudNetworkSide.xml
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-LOAD_SUITE TE_SpudNetworkSide
-
-START_TESTCASE          NET-Spud-NetworkSide-0301
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0301
-//! @SYMTestCaseDesc Network initiates TFT modification, GuQoS sends the KContextModifyActive to SPUD.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMTestActions Creates the primary and 2ndry Context successfully,initiates TFT modification, then GuQoS sends the KContextModifyActive to SPUD.
-//! @SYMTestExpectedResults EQoSEventConfirm and EQoSEventJoin are received bt the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondaryJoin z:\testdata\configs\te_spudNetworkSide.ini SecondaryActivationJoin
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0301
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  MakeReadWrite c:\qospolicies.ini
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  DeleteFile c:\loopback.ini
-RUN_UTILS  DeleteFile c:\qospolicies.ini
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/scripts/version1/TE_spudNetworkSide.script	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,613 +0,0 @@
-// Copyright (c) 2004-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:
-// Secondary PDP-context UMTS Driver integration tests of network-initiated conditions.
-//
-
-//! @file TE_spudNetworkSide.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  MakeReadWrite c:\qospolicies.ini
-RUN_UTILS  MakeReadWrite c:\private\101F7989\esock\qospolicies.ini
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  DeleteFile c:\loopback.ini
-RUN_UTILS  DeleteFile c:\qospolicies.ini
-RUN_UTILS  DeleteFile c:\private\101F7989\esock\qospolicies.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_config.txt c:\simtsy\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_config.txt c:\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSideLoopbackCSY.ini c:\loopback.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\qospolicies.ini c:\qospolicies.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\qospolicies.ini c:\private\101F7989\esock\qospolicies.ini
-
-// Configure CommDB for the tests
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-ced -i z:\TestData\Configs\TE_SpudNetworkSide.xml
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-LOAD_SUITE TE_SpudNetworkSide
-
-
-// TestSection suffix numbers correspond to SIM TSY's test section numbers. i.e. PrimaryActivationFails201 uses SIM TSYs test201 
-
-//
-// Sanity check tests: before testing the error cases, we test the success cases to make sure the system is OK.
-//
-
-START_TESTCASE          NET-Spud-NetworkSide-0201
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0201
-//! @SYMTestCaseDesc Sanity check: successfully activate Primary context. 
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start the SPUD interface. SIM TSY, etc successfully activate the primary context.
-//! @SYMTestExpectedResults  Primary PDP context is activated, SPUD is started: RConnection::Start on SPUD returns KErrNone.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryActivationOk1
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0201
-
-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-0202
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0202
-//! @SYMTestCaseDesc Sanity check: successfully activate Secondary context. 
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions Implicitly start the SPUD interface by opening a socket bound to its secondary context. Set QoS on the socket, prompting GUQoS to activate secondary context.
-//! @SYMTestExpectedResults Both the primary & secondary contexts are activated. EQoSEventAddPolicy and EQoSEventConfirm are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide.ini SecondaryActivationOk1
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0202
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-//
-// Operation errors: Creation, TFT, QoS, Activation, Deactivation, Deletion errors.
-//
-START_TESTCASE          NET-Spud-NetworkSide-0203
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0203
-//! @SYMTestCaseDesc Activation of Primary fails. 
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start Spud. SIM TSY returns an error on activation of the primary context. 
-//! @SYMTestExpectedResults Spud cannot be started: RConnection::Start returns an error.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryActivationFails201
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0203
-
-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-0204
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0204
-//! @SYMTestCaseDesc Activation of Secondary fails.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions Implicitly start SPUD by opening a socket bound to the secondary context. Set QoS on the socket, prompting GUQoS to activate secondary context. SIM TSY errors secondary context activation request. 
-//! @SYMTestExpectedResults  EQoSEventAddPolicy and EQoSEventFailure are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide.ini SecondaryActivationFails301
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0204
-
-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-0205
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0205
-//! @SYMTestCaseDesc Network deletes Activated Primary.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Activate the primary context only by explicitly starting Spud. After a pause, SIM.TSY deletes the primary context. 
-//! @SYMTestExpectedResults Spud is started successfully - the RConnection is started with KErrNone. KLinkLayerClosed / KErrDisconnected notification is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimaryEvent z:\testdata\configs\te_spudNetworkSide.ini PrimaryQoSEventDelete1
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0205
-
-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-0206
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0206
-//! @SYMTestCaseDesc Network deactivates (suspends?) Secondary
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMTestActions Activate the primary and the secondary contexts by opening a socket & setting QoS on it. After a pause, SIM TSY deactivates the active secondary context. 
-//! @SYMTestExpectedResults EQoSEventAddPolicy, EQoSEventConfirm, and  EQoSEventAdapt are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudTwoSecondaryEvents z:\testdata\configs\te_spudNetworkSide.ini SecondaryQosEventDeactivate1
-DELAY 3000 
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0206
-
-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-0207
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0207
-//! @SYMTestCaseDesc Network deletes Activated Secondary
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Activate the primary and the secondary contexts by opening a socket & setting QoS on it. After a pause, SIM TSY deletes the active secondary context.
-//! @SYMTestExpectedResults EQoSEventAddPolicy, EQoSEventConfirm, and  EQoSEventFailure are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondaryEvent z:\testdata\configs\te_spudNetworkSide.ini SecondaryQosEventDelete1
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0207
-
-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-0208
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0208
-//! @SYMTestCaseDesc  GUQoS triggers the KContextDelete on SPUDMAN after the Seondary PDP Context is created. -  This does not happen anymore in Guqos
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Activate the primary and the secondary contexts by opening a socket & setting QoS on it, GuQoS deletes the created secondary context.
-//! @SYMTestExpectedResults EQoSEventAddPolicy, EQoSEventFailure are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-//! DUE TO BEHAVIOURAL CHANGES IN GUQOS - THIS CASE IS NO LONGER VALID AND THEREFORE NOT RUN
-//RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide.ini KContextDelete
-//DELAY 3000
-//RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0208
-
-//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-0209
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0209
-//! @SYMTestCaseDesc  The QoS parameter changes on the Primary PDP Context.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMTestActions Explicitly start the SPUD interface to activate the primary context, use sim.tsy to trigger the QoS parameter changes on the Primary PDP Context.
-//! @SYMTestExpectedResults SPUD starts successfully. SPUD receives the QoS parameter change event successfully. RConnection times out and returns the error code KErrTimedOut.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimaryEvent z:\testdata\configs\te_spudNetworkSide.ini ENetworkQoSChangePrimary
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0209
-
-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-0210
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0210
-//! @SYMTestCaseDesc The QoS parameter changes on the Secondary PDP Context
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMTestActions Activate the primary and the secondary contexts by opening a socket & setting QoS on it. Change the QoS parameters on the active secondary context.
-//! @SYMTestExpectedResults EQoSEventAddPolicy, EQoSEventConfirm, and  EQoSEventAdapt are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondaryEvent z:\testdata\configs\te_spudNetworkSide.ini ENetworkQoSChangeSecondary
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0210
-
-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-0211
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0211
-//! @SYMTestCaseDesc  Sets a new set of QoS parameters for the established Secondary PDP Context.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMTestActions Activate the primary and the secondary contexts by opening a socket & setting QoS on it,sets a new set of QoS parameters for the established Secondary PDP Context.
-//! @SYMTestExpectedResults EQoSEventAddPolicy, EQoSEventConfirm, and  EQoSEventAddPolicy, EQoSEventConfirm are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondaryChangeQoS z:\testdata\configs\te_spudNetworkSide.ini SecondaryActivationChangeQoS
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0211
-
-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-0212
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0212
-//! @SYMTestCaseDesc Triggers the Primary PDP Context deletion before the lower NIF is up.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Explicitly start the SPUD interface to activate the primary context, it fails then deletes the Primary Context. 
-//! @SYMTestExpectedResults Spud start fails. RConnection::Start returns the error.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryDeleteBeforeLowerNif
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0212
-
-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-0213
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0213
-//! @SYMTestCaseDesc Triggers the Secondary PDP Context deletion before the lower NIF is up.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Activate the primary and the secondary contexts by opening a socket & setting QoS on it,fails to creat the secondary context.
-//! @SYMTestExpectedResults EQoSEventAddPolicy, EQoSEventFailure are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide.ini SecondaryDeleteBeforeLowerNif
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0213
-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-0214
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0214
-//! @SYMTestCaseDesc Failure to Start a lower NIF for primary context (LinkLayerDown from lower NIF) 
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start SPUD. Spud starts the lower NIF for the primary context. Lower NIF reports LinkLayerDown with an error. 
-//! @SYMTestExpectedResults Spud start fails. RConnection::Start returns the error.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide_platsec.ini PrimaryLowerNifStartFails210
-DELAY 3000
-RUN_TEST_STEP 30 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0214
-
-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-0215
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0215
-//! @SYMTestCaseDesc Failure to Start a lower NIF for secondary context (LinkLayerDown from lower NIF) 
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions Request activation of the secondary PDP context by opening a socket & setting QoS on it. Spud start the lower NIF for the secondary context. Lower NIF reports LinkLayerDown with error. 
-//! @SYMTestExpectedResults The primary context is activated, secondary is not. EQoSEventAddPolicy and EQoSEventFailure with the error code are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide_platsec.ini SecondaryLowerNifStartFails310
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0215
-
-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-0216
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0216
-//! @SYMTestCaseDesc Test Etel suspension of primary context
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMTestActions Create/send data on a socket with no QoS parameters (therefore a primary context), and read from the opposite loopback port. Suspend the context. Send more data and attempt to read from the opposite port. Resume the context. Send more data and attempt to read from the opposite port.
-//! @SYMTestExpectedResults The read on the loopback comm port should work before the context is suspended, and after it is resumed. It should time-out when the context is suspended.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudSuspendContext z:\testdata\configs\te_spudNetworkSide.ini PrimaryContextSuspendAndResume
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0216
-
-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-0217
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0217
-//! @SYMTestCaseDesc Test Etel suspension of secondary context
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMTestActions Create/send data on a socket with QoS parameters (therefore a secondary context), and read from the opposite loopback port. Suspend the context. Send more data and attempt to read from the opposite port. Resume the context. Send more data and attempt to read from the opposite port.
-//! @SYMTestExpectedResults The read on the loopback comm port should work before the context is suspended, and after it is resumed. It should time-out when the context is suspended.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudSuspendContext z:\testdata\configs\te_spudNetworkSide.ini SecondaryContextSuspendAndResume
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0217
-
-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-0218
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0218
-//! @SYMTestCaseDesc Primary PDP context activation fails
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Primary PDP context activation fails by modifying the TFT values
-//! @SYMTestExpectedResults The SpudMan code should respond to this event correctly without Leave and Panic.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryActivationFails18
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0218
-
-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-0219
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0219
-//! @SYMTestCaseDesc Secondary PDP context: Setting TFT fails
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions Setting TFT values on secondary PDP context fails due to using incorrect TFT values
-//! @SYMTestExpectedResults The SpudMan code should respond to this event correctly without Leave and Panic.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide.ini SecondaryActivationFails19
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0219
-
-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-0220
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0220
-//! @SYMTestCaseDesc Secondary PDP context: Setting requested QoS parameters fails
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions Setting QoS parameters on secondary PDP context fails due to using incorrect QoS parameter values
-//! @SYMTestExpectedResults The SpudMan code should respond to this event correctly without Leave and Panic.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide.ini SecondaryActivationFails20
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0220
-
-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-0221
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0221
-//! @SYMTestCaseDesc Primary PDP context deletion fails
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Primary PDP context deletion fails by modifying the TFT values
-//! @SYMTestExpectedResults The SpudMan code should respond to this event correctly without Leave and Panic.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryDeletionFails21
-DELAY 8000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0221
-
-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-0222
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0222
-//! @SYMTestCaseDesc Secondary PDP context deletion fails
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Secondary PDP context deletion fails by modifying the TFT values
-//! @SYMTestExpectedResults The SpudMan code should respond to this event correctly without Leave and Panic.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondary z:\testdata\configs\te_spudNetworkSide.ini SecondaryDeletionFails22
-DELAY 8000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0222
-
-
-START_TESTCASE          NET-Spud-NetworkSide-0223
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0223
-//! @SYMTestCaseDesc  Network deletes a primary context
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions  Starts a secondary context by creating a socket with QoS, starts a rawipnif instance opposite the secondary context, deletes the primary context then sends data on the primary context's socket.
-//! @SYMTestExpectedResults   Since the primary context is down, the data is sent on the secondary context, and is received by the rawipnif instance opposite the secondary context.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 600 TE_SpudNetworkSide CSpudDeletePrimary z:\testdata\configs\te_spudNetworkSide.ini PrimaryQoSEventDeleteWithSecondary
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0223
-
-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-0224
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0224
-//! @SYMTestCaseDesc Call RConnection::Stop while SPUDFSM is initialising the phone  
-//! @SYMFssId NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions  Cause RPhone::Initialise to take a very long time to complete, and call RConnection::Stop while it is running
-//! @SYMTestExpectedResults Connection stops successfully.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudPrimayStartingStop z:\testdata\configs\te_spudNetworkSide.ini PrimarySlowInitialisePhone
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0224
-
-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-0225
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0225
-//! @SYMTestCaseDesc Sanity check: successfully activate many primary contexts. 
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start the SPUD interfaces. SIM TSY, etc successfully activate the primary contexts.
-//! @SYMTestExpectedResults  The Primary PDP contexts are activated, SPUD started: RConnection::Start on the SPUDs returns KErrNone.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 100 TE_SpudNetworkSide CSpudMultiPrimary z:\testdata\configs\te_spudNetworkSide.ini MultiPrimaryActivationOk1
-DELAY 3000
-RUN_TEST_STEP 100 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0225
-
-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-0226
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0226
-//! @SYMTestCaseDesc Set requested Qos (SSD, IM CN SI) on a Secondary PDP context.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions  Activate the primary and the secondary contexts by opening a socket & setting requested Qos (SSD = Speech, SI = True, IM CN SI = True) on secondary PDP context
-//! @SYMTestExpectedResults Both the primary & secondary contexts are activated. EQoSEventAddPolicy and EQoSEventConfirm are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudQosR5Secondary z:\testdata\configs\te_spudNetworkSide.ini SecondaryR5ActivationOk1
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0226
-
-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-0227
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0227
-//! @SYMTestCaseDesc Secondary PDP context: Setting requested QoS parameters fails
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions Setting QoS parameters on secondary PDP context fails due to using incorrect QoS parameter values
-//! @SYMTestExpectedResults The SpudMan code should respond to this event correctly without Leave and Panic.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudQosR5Secondary z:\testdata\configs\te_spudNetworkSide.ini SecondaryR5ActivationFails20
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0227
-
-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-0228
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0228
-//! @SYMTestCaseDesc The QoS R5 parameter changes on the Secondary PDP Context.The Network turns off SI Parameter
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMTestActions Activate the primary and the secondary contexts by opening a socket & setting QoS on it. Change the QoS parameters on the active secondary context.
-//! @SYMTestExpectedResults EQoSEventAddPolicy, EQoSEventConfirm, and  EQoSEventAdapt are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondaryQosR5Event z:\testdata\configs\te_spudNetworkSide.ini ENetworkQoSR5ChangeSecondary
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0228
-
-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-0229
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0229
-//! @SYMTestCaseDesc The QoS parameter changes on the Secondary PDP Context.The Network changes the SSD to Unknown.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMTestActions Activate the primary and the secondary contexts by opening a socket & setting QoS on it. Change the QoS parameters on the active secondary context.
-//! @SYMTestExpectedResults EQoSEventAddPolicy, EQoSEventConfirm, and  EQoSEventAdapt are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondaryQosR5Event z:\testdata\configs\te_spudNetworkSide.ini ENetworkQoSR5ChangeSecondary1
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0229
-
-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-0230
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0230
-//! @SYMTestCaseDesc  Sets a new set of R5 QoS parameters for the established Secondary PDP Context.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMTestActions Activate the primary and the secondary contexts by opening a socket & setting QoS on it,sets a new set of QoS parameters for the established Secondary PDP Context.
-//! @SYMTestExpectedResults EQoSEventAddPolicy, EQoSEventConfirm, and  EQoSEventAddPolicy, EQoSEventConfirm are received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudSecondaryChangeR5QoS z:\testdata\configs\te_spudNetworkSide.ini SecondaryActivationChangeQoSR5
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0230
-
-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-0231
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0231
-//! @SYMTestCaseDesc  Network deletes a primary context where SI is set on Secondary PDP context.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions  Starts a secondary context by creating a socket with QoS, starts a rawipnif instance opposite the secondary context, deletes the primary context then sends data on the primary context's socket.
-//! @SYMTestExpectedResults   Since the primary context is down, the data is sent on the secondary context, and is received by the rawipnif instance opposite the secondary context.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 600 TE_SpudNetworkSide CSpudDeletePrimaryR5Qos z:\testdata\configs\te_spudNetworkSide.ini PrimaryQoSR5EventDeleteWithSecondary
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0231
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-
-
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  MakeReadWrite c:\qospolicies.ini
-RUN_UTILS  MakeReadWrite c:\private\101F7989\esock\qospolicies.ini
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  DeleteFile c:\loopback.ini
-RUN_UTILS  DeleteFile c:\qospolicies.ini
-RUN_UTILS  DeleteFile c:\private\101F7989\esock\qospolicies.ini
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/scripts/version1/TE_spudNetworkSide_nifman.script	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,348 +0,0 @@
-// Copyright (c) 2005-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:
-// Secondary PDP-context UMTS Driver integration tests using NIFMAN
-//
-
-//! @file TE_SpudNetworkSide_nifman.script
-
-RUN_UTILS  MkDir c:\simtsy\
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_nifman_config.txt c:\simtsy\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_nifman_config.txt c:\config.txt
-
-RUN_UTILS  MakeReadWrite c:\loopback.ini
-RUN_UTILS  DeleteFile c:\loopback.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSideLoopbackCSY.ini c:\loopback.ini
-
-RUN_UTILS  DeleteFile c:\qospolicies.ini
-RUN_UTILS  DeleteFile c:\private\101F7989\esock\qospolicies.ini
-
-RUN_UTILS  CopyFile z:\TestData\Configs\qospolicies.ini c:\qospolicies.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\qospolicies.ini c:\private\101F7989\esock\qospolicies.ini
-
-
-LOAD_SUITE TE_SpudNetworkSide
-
-// TestSection suffix numbers correspond to SIM TSY's test section numbers. i.e. PrimaryActivationFails201 uses SIM TSYs test201 
-
-//
-// Configure CommDB for the tests using RawIP as lower NIF.
-//
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-ced -i z:\TestData\Configs\TE_SpudNetworkSide_nifman.xml
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-
-//
-// Nifman stops SPUD when there is just the primary PDP context.
-//
-
-
-START_TESTCASE          NET-Spud-NetworkSide-0401
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0401
-//! @SYMTestCaseDesc Stop the interface when SPUD is deleting the primary context as a result of lower NIF LinkLayerDown.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Start Spud & successfully activate the primary context. Write to the primary, such that the lower NIF errors our on the read and report LinkLayerDown. Spud issues deletion request on the primary. When the request is outstanding, RConnection::Stop(EStopNormal) is called on Spud.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app on Spud.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudPrimaryDeletionInterfaceStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopPrimaryDeleting1
-DELAY 3000
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-END_TESTCASE            NET-Spud-NetworkSide-0401
-
-
-
-START_TESTCASE          NET-Spud-NetworkSide-0402
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0402
-//! @SYMTestCaseDesc Stop the interface using Idle timeout, when SPUD is deleting the primary context as a result of lower NIF LinkLayerDown.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Start Spud & successfully activate the primary context. Write to the primary, such that the lower NIF errors our on the read and report LinkLayerDown. Spud issues deletion request on the primary. When the request is outstanding, Nifman idle timeout stops the Spud with KErrTimedOut.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrTimedOut is received by the test app on Spud.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudPrimaryDeletionInterfaceStop z:\testdata\configs\te_spudNetworkSide_nifman.ini TimeoutStopPrimaryDeleting1
-DELAY 3000
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-END_TESTCASE            NET-Spud-NetworkSide-0402
-
-
-
-START_TESTCASE          NET-Spud-NetworkSide-0403
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0403
-//! @SYMTestCaseDesc Stop (EStopNormal) the interface when the primary context is suspended.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Start Spud & successfully activate the primary context. SIM TSY suspends the primary. RConnection::Stop(EStopNormal) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudPrimaryInterfaceEventStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopOnPrimarySuspended1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0403
-
-START_TESTCASE          NET-Spud-NetworkSide-0404
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0404
-//! @SYMTestCaseDesc Stop (EStopNormal) the interface when the primary context is being deactivated.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Start Spud & successfully activate the primary context. SIM TSY changes the state of the primary to Deactivating. RConnection::Stop(EStopNormal) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudPrimaryInterfaceEventStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopOnPrimaryDeactivating1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0404
-
-START_TESTCASE          NET-Spud-NetworkSide-0405
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0405
-//! @SYMTestCaseDesc Stop (EStopNormal) the interface when the primary context is inactive.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Start Spud & successfully activate the primary context. SIM TSY changes the state of the primary to Inactive. RConnection::Stop(EStopNormal) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app on Spud.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudPrimaryInterfaceEventStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopOnPrimaryInactive1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0405
-
-START_TESTCASE          NET-Spud-NetworkSide-0406
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0406
-//! @SYMTestCaseDesc Stop (EStopAuthoritative) the interface when the primary context is suspended.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Start Spud & successfully activate the primary context. SIM TSY changes the state of the primary to Suspended. RConnection::Stop(EStopAuhoritative) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrConnectionTerminated is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudPrimaryInterfaceEventStop z:\testdata\configs\te_spudNetworkSide_nifman.ini AuthStopOnPrimarySuspended1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0406
-
-START_TESTCASE          NET-Spud-NetworkSide-0407
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0407
-//! @SYMTestCaseDesc Stop (EStopAuthoritative) the interface when the primary context is being deactivated.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Start Spud & successfully activate the primary context. SIM TSY changes the state of the primary to Deactivating. RConnection::Stop(EStopAuthoritative) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrConnectionTerminated is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudPrimaryInterfaceEventStop z:\testdata\configs\te_spudNetworkSide_nifman.ini AuthStopOnPrimaryDeactivating1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0407
-
-
-START_TESTCASE          NET-Spud-NetworkSide-0408
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0408
-//! @SYMTestCaseDesc Stop (EStopAuthoritative) the interface when the primary context is inactive.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Start Spud & successfully activate the primary context. SIM TSY changes the state of the primary to Inactive. RConnection::Stop(EStopAuthoritative) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrConnectionTerminated is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudPrimaryInterfaceEventStop z:\testdata\configs\te_spudNetworkSide_nifman.ini AuthStopOnPrimaryInactive1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0408
-
-START_TESTCASE          NET-Spud-NetworkSide-0409
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0409
-//! @SYMTestCaseDesc Stop (EStopAuthoritative) the interface when the primary context is the only context, and is active.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Start Spud & successfully activate the primary context. RConnection::Stop(EStopAuthoritative) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrConnectionTerminated is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudPrimaryInterfaceStop z:\testdata\configs\te_spudNetworkSide_nifman.ini PrimaryOnlyAuthoritativeStop1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0409
-
-START_TESTCASE          NET-Spud-NetworkSide-0410
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0410
-//! @SYMTestCaseDesc Stop (EStopNormal) the interface when the primary context is the only context, and is active.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Start Spud & successfully activate the primary context. SIM TSY changes the state of the primary to Inactive. RConnection::Stop(EStopNormal) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudPrimaryInterfaceStop z:\testdata\configs\te_spudNetworkSide_nifman.ini PrimaryOnlyNormalStop1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0410
-
-
-
-//
-// Nifman stops SPUD where there is a primary and a secondary context.
-//
-
-
-// ****** GUQoS crashes ESock.
-START_TESTCASE          NET-Spud-NetworkSide-0411
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0411
-//! @SYMTestCaseDesc Stop the interface when SPUD is activating the secondary context.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Open a socket, set QoS and trigger 2ndary context activation. When activation request on SIM TSY is outstanding, RConnection::Stop(EStopNormal) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT 
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudSecondaryStartingStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopSecondaryActivating1
-DELAY 3000
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-END_TESTCASE            NET-Spud-NetworkSide-0411
-
-
-// ****** GUQoS crashes ESock.
-START_TESTCASE          NET-Spud-NetworkSide-0412
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0412
-//! @SYMTestCaseDesc Stop the interface when SPUD is setting TFT on the secondary context.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Open a socket, set QoS and trigger 2ndary context creation. When setting TFT request on SIM TSY is outstanding, RConnection::Stop(EStopNormal) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT 
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudSecondaryStartingStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopSecondarySettingTFT25
-DELAY 3000
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-END_TESTCASE            NET-Spud-NetworkSide-0412
-
-
-
-
-START_TESTCASE          NET-Spud-NetworkSide-0413
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0413
-//! @SYMTestCaseDesc Trigger GUQoS deletion request due to timeout, after stop was called by Nifman.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Open a socket, set QoS and sucessfully activate the 2ndary context. Close the socket and wait. RConnection::Stop(EStopNormal) is called. Spud deletes the 2ndary.  When the deletion request on SIM TSY is outstading, GUQoS deletes the secondary due to its timeout. 
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudSecondaryInterfaceEventStop z:\testdata\configs\te_spudNetworkSide_nifman.ini GUQoSDeleteOnNormalStop1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0413
-
-
-// ****** GUQoS crashes ESock.
-START_TESTCASE          NET-Spud-NetworkSide-0414
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0414
-//! @SYMTestCaseDesc Stop the interface when SPUD is deleting the 2ndary context as a result of lower NIF LinkLayerDown.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Open a socket, set QoS and sucessfully activate the 2ndary context. Trigger 2ndary's lower NIF to signal LinkLayerDown. Spud deletes the 2ndary. When the deletion request on SIM TSY is outstading,  RConnection::Stop(EStopNormal) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudSecondaryLowerNifDownStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopSecondaryLowerNifDown1
-DELAY 3000
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-END_TESTCASE            NET-Spud-NetworkSide-0414
-
-
-START_TESTCASE          NET-Spud-NetworkSide-0415
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0415
-//! @SYMTestCaseDesc Stop the interface when SPUD is deleting the 2ndary context following a GUQoS deletion request due to timeout.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Open a socket, set QoS and sucessfully activate the 2ndary context. Close the socket. GUQoS deletes the secondary after a timeout. When the deletion request on SIM TSY is outstading,  RConnection::Stop(EStopNormal) is called.
-//! @SYMTestExpectedResults Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudSecondaryInterfaceEventStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopGUQoSDeletingSecondary1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0415
-
-
-
-START_TESTCASE          NET-Spud-NetworkSide-0416
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0416
-//! @SYMTestCaseDesc Stop (EStopAuthoritative) the interface when the primary & 2ndary contexts are active.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Successfully activate the primary and the secondary contexts. RConnection::Stop(EStopAuthoritative) is called.
-//! @SYMTestExpectedResults EQoSEventConfirm is received. Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrConnectionTerminated is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT 
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudSecondaryInterfaceStop z:\testdata\configs\te_spudNetworkSide_nifman.ini AuthStopSecondaryActive1
-DELAY 3000
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-END_TESTCASE            NET-Spud-NetworkSide-0416
-
-START_TESTCASE          NET-Spud-NetworkSide-0417
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0417
-//! @SYMTestCaseDesc Stop (EStopNormal) the interface when the primary & 2ndary contexts are active.
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Successfully activate the primary and the secondary contexts. RConnection::Stop(EStopNormal) is called.
-//! @SYMTestExpectedResults EQoSEventConfirm is received. Spud shuts down gracefully, does not crash/hang, etc. KLinkLayerClosed with KErrCancel is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT 
-RUN_TEST_STEP 180 TE_SpudNetworkSide CSpudSecondaryInterfaceStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopSecondaryActive1
-DELAY 3000
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-END_TESTCASE            NET-Spud-NetworkSide-0417
-
-
-
-
-
-// We must make sure SIM TSY fails when opening RPhone. We get rid of the config file.
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-
-
-START_TESTCASE          NET-Spud-NetworkSide-0418
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0418
-//! @SYMTestCaseDesc Leave when trying to construct SPUD.  
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions  Cause RPhone::Open to fail, resulting CSpudMan construction to Leave with KErrNone.
-//! @SYMTestExpectedResults Spud start fails gracefully. No crash in ESock. KLinkLayerClosed with KErrNotFound is received by the test app. 
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide_nifman.ini LeaveInSpudCreation
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0418
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-
-RUN_UTILS  DeleteFile c:\loopback.ini
-RUN_UTILS  DeleteFile c:\qospolicies.ini
-RUN_UTILS  DeleteFile c:\private\101F7989\esock\qospolicies.ini
-
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/scripts/version1/TE_spudNetworkSide_ppp.script	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,162 +0,0 @@
-// Copyright (c) 2004-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:
-// Secondary PDP-context UMTS Driver integration tests using PPP as the NIF.
-//
-
-//! @file TE_SpudNetworkSide_ppp.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  MakeReadWrite c:\qospolicies.ini
-RUN_UTILS  MakeReadWrite c:\private\101F7989\esock\qospolicies.ini
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  DeleteFile c:\loopback.ini
-RUN_UTILS  DeleteFile c:\qospolicies.ini
-RUN_UTILS  DeleteFile c:\private\101F7989\esock\qospolicies.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\qospolicies.ini c:\qospolicies.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\qospolicies.ini c:\private\101F7989\esock\qospolicies.ini
-
-LOAD_SUITE TE_SpudNetworkSide
-
-// TestSection suffix numbers correspond to SIM TSY's test section numbers. i.e. PrimaryActivationFails201 uses SIM TSYs test201 
-
-//
-// Configure CommDB for the tests using PPP as lower NIF
-//
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-ced -i z:\TestData\Configs\TE_SpudNetworkSide_ppp.xml
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_nifman_config.txt c:\simtsy\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_nifman_config.txt c:\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSideLoopbackCSY.ini c:\loopback.ini
-
-START_TESTCASE          NET-Spud-NetworkSide-0501
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0501
-//! @SYMTestCaseDesc Stop the interface when SPUD is starting lower NIF for the primary context.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions SPUD starts the lower NIF, which "takes a long time to start", i.e. no LinkLayerUp / Down. Stop SPUD using RConnection::Stop(EStopNormal)
-//! @SYMTestExpectedResults KLinkLayerClosed / KErrCancel progress.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType IT 
-// Note: this test case uses CSpudSecondaryStartingStop by design, because the sequence of events is identical, the only difference is timing.
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudSecondaryStartingStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopPrimaryStartingLowerNif1
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0501
-
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_config.txt c:\simtsy\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_config.txt c:\config.txt
-
-
-
-START_TESTCASE          NET-Spud-NetworkSide-0502
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0502
-//! @SYMTestCaseDesc Error on Start of a lower NIF for primary context.  
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start Spud. Spud starts a lower NIF for the primary context, which returns an error.
-//! @SYMTestExpectedResults starting Spud fails. RConnection::Start returns an error.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 30 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide_platsec.ini PrimaryLowerNifStartError210
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0502
-
-
-# Wait for Nifman Idle timeout to kill the interface
-DELAY 10000
-
-START_TESTCASE          NET-Spud-NetworkSide-0503
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0503
-//! @SYMTestCaseDesc Network Deletes primary context when lower NIF was started, and SPUD waits for LinkLayerUp.  
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start Spud. Spud starts the lower NIF for the primary, which "takes a long time to start, i.e. no LinkLayerUp/Down. SIM TSY deletes the primary context.
-//! @SYMTestExpectedResults Start on Spud fails. Nifman progress 8000 with KErrDisconnected is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 30 TE_SpudNetworkSide CSpudPrimaryEventOnLowerNifStarting z:\testdata\configs\te_spudNetworkSide.ini PrimaryDeleteOnLowerNifStart212
-DELAY 3000
-END_TESTCASE            NET-Spud-NetworkSide-0503
-
-
-// The following tests use different CommDB entries
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-ced -i z:\TestData\Configs\TE_SpudNetworkSide_PppLoopback.xml
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-RUN_UTILS  MakeReadWrite c:\loopback.ini
-RUN_UTILS  DeleteFile c:\loopback.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSideLoopbackCSY_serial.ini c:\loopback.ini
-
-
-START_TESTCASE          NET-Spud-NetworkSide-0504
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0504
-//! @SYMTestCaseDesc Sanity check: successfully activate Primary context using PPP as a lower NIF
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start the SPUD interface using PPP. Also start a PPP server connected to the port from the SPUD. SIM TSY, etc successfully activate the primary context.
-//! @SYMTestExpectedResults  Primary PDP context is activated, SPUD is started: RConnection::Start on SPUD returns KErrNone.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPppPrimary z:\testdata\configs\te_spudNetworkSide.ini PppPrimaryOk
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0504
-
-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-0505
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0505
-//! @SYMTestCaseDesc Successfully activate a secondary context and send data using the secondary context, using PPP as the lower NIF
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions Open a socket with QoS parameters. Also start 2 PPP server instances on loopback ports opposite the primary and secondary contexts of the SPUD. Send data to and from the secondary context of SPUD.
-//! @SYMTestExpectedResults  Primary PDP context is activated, SPUD is started: RConnection::Start on SPUD returns KErrNone. Send as well as RecvFrom complete successfully.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 600 TE_SpudNetworkSide CSpudPppSecondarySend z:\testdata\configs\te_spudNetworkSide.ini PppSecondarySend
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0505
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  MakeReadWrite c:\qospolicies.ini
-RUN_UTILS  MakeReadWrite c:\private\101F7989\esock\qospolicies.ini
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  DeleteFile c:\loopback.ini
-RUN_UTILS  DeleteFile c:\qospolicies.ini
-RUN_UTILS  DeleteFile c:\private\101F7989\esock\qospolicies.ini
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/scripts/version1/TE_spudNetworkSide_ppp_9x.script	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,180 +0,0 @@
-// Copyright (c) 2004-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:
-// Secondary PDP-context UMTS Driver integration tests using PPP as the NIF.
-//
-
-//! @file TE_SpudNetworkSide_ppp_9x.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  MakeReadWrite c:\qospolicies.ini
-RUN_UTILS  MakeReadWrite c:\private\101F7989\esock\qospolicies.ini
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  DeleteFile c:\loopback.ini
-RUN_UTILS  DeleteFile c:\qospolicies.ini
-RUN_UTILS  DeleteFile c:\private\101F7989\esock\qospolicies.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\qospolicies.ini c:\qospolicies.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\qospolicies.ini c:\private\101F7989\esock\qospolicies.ini
-
-LOAD_SUITE TE_SpudNetworkSide
-
-// TestSection suffix numbers correspond to SIM TSY's test section numbers. i.e. PrimaryActivationFails201 uses SIM TSYs test201 
-
-//
-// Configure CommDB for the tests using PPP as lower NIF
-//
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-ced -i z:\TestData\Configs\TE_SpudNetworkSide_ppp.xml
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_nifman_config.txt c:\simtsy\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_nifman_config.txt c:\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSideLoopbackCSY.ini c:\loopback.ini
-
-START_TESTCASE          NET-Spud-NetworkSide-0601
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0601
-//! @SYMTestCaseDesc Stop the interface when SPUD is starting lower NIF for the primary context.
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions SPUD starts the lower NIF, which "takes a long time to start", i.e. no LinkLayerUp / Down. Stop SPUD using RConnection::Stop(EStopNormal)
-//! @SYMTestExpectedResults KLinkLayerClosed / KErrCancel progress.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType IT 
-// Note: this test case uses CSpudSecondaryStartingStop by design, because the sequence of events is identical, the only difference is timing.
-RUN_TEST_STEP 120 TE_SpudNetworkSide CSpudSecondaryStartingStop z:\testdata\configs\te_spudNetworkSide_nifman.ini NormalStopPrimaryStartingLowerNif1
-DELAY 6000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0601
-
-
-// Unload and reload ESock TWICE. Once is not enough to correct the crash of the previous test
-// case. Afeter TESTCASE 1 is fixed, this can (and should) be safely removed.
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_config.txt c:\simtsy\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSide_config.txt c:\config.txt
-
-
-
-START_TESTCASE          NET-Spud-NetworkSide-0602
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0602
-//! @SYMTestCaseDesc Error on Start of a lower NIF for primary context.  
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start Spud. Spud starts a lower NIF for the primary context, which returns an error.
-//! @SYMTestExpectedResults starting Spud fails. RConnection::Start returns an error.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 30 TE_SpudNetworkSide CSpudPrimary z:\testdata\configs\te_spudNetworkSide_platsec.ini PrimaryLowerNifStartError210
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0602
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-
-// Wait for Nifman Idle timeout to kill the interface
-DELAY 10000
-
-START_TESTCASE          NET-Spud-NetworkSide-0603
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0603
-//! @SYMTestCaseDesc Network Deletes primary context when lower NIF was started, and SPUD waits for LinkLayerUp.  
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start Spud. Spud starts the lower NIF for the primary, which "takes a long time to start, i.e. no LinkLayerUp/Down. SIM TSY deletes the primary context.
-//! @SYMTestExpectedResults Start on Spud fails. Nifman progress 2000 with KErrDisconnected is received by the test app.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 30 TE_SpudNetworkSide CSpudPrimaryEventOnLowerNifStarting z:\testdata\configs\te_spudNetworkSide.ini PrimaryDeleteOnLowerNifStart212
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0603
-
-
-// The following tests use different CommDB entries
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-ced -i z:\TestData\Configs\TE_SpudNetworkSide_PppLoopback.xml
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-RUN_UTILS  MakeReadWrite c:\loopback.ini
-RUN_UTILS  DeleteFile c:\loopback.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\TE_SpudNetworkSideLoopbackCSY_serial.ini c:\loopback.ini
-
-
-START_TESTCASE          NET-Spud-NetworkSide-0604
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0604
-//! @SYMTestCaseDesc Sanity check: successfully activate Primary context using PPP as a lower NIF
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Explicitly start the SPUD interface using PPP. Also start a PPP server connected to the port from the SPUD. SIM TSY, etc successfully activate the primary context.
-//! @SYMTestExpectedResults  Primary PDP context is activated, SPUD is started: RConnection::Start on SPUD returns KErrNone.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 60 TE_SpudNetworkSide CSpudPppPrimary z:\testdata\configs\te_spudNetworkSide.ini PppPrimaryOk
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0604
-
-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-0605
-//! @SYMTestCaseID      NET-Spud-NetworkSide-0605
-//! @SYMTestCaseDesc Successfully activate a secondary context and send data using the secondary context, using PPP as the lower NIF
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMTestActions Open a socket with QoS parameters. Also start 2 PPP server instances on loopback ports opposite the primary and secondary contexts of the SPUD. Send data to and from the secondary context of SPUD.
-//! @SYMTestExpectedResults  Primary PDP context is activated, SPUD is started: RConnection::Start on SPUD returns KErrNone. Send as well as RecvFrom complete successfully.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 600 TE_SpudNetworkSide CSpudPppSecondarySend z:\testdata\configs\te_spudNetworkSide.ini PppSecondarySend
-DELAY 3000
-RUN_TEST_STEP 60 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
-END_TESTCASE            NET-Spud-NetworkSide-0605
-
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  MakeReadWrite c:\qospolicies.ini
-RUN_UTILS  MakeReadWrite c:\private\101F7989\esock\qospolicies.ini
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  DeleteFile c:\loopback.ini
-RUN_UTILS  DeleteFile c:\qospolicies.ini
-RUN_UTILS  DeleteFile c:\private\101F7989\esock\qospolicies.ini
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/src/spudNetSideQos.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-// Copyright (c) 2006-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:
-// Implements QoS utilities for te_spudNetworkTest.
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-
-#include "spudNetSideQos.h"
-
-
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-//------------------------------------------------------
-//	QoSEventToText
-//------------------------------------------------------
-TPtrC QoSEventToText(TQoSEvent aEvent)
-{
-	switch(aEvent)
-    {
-		case EQoSEventFailure:
-		    return _L("EQoSEventFailure");
-		case EQoSEventConfirm:
-		    return _L("EQoSEventConfirm");
-		case EQoSEventAdapt:
-		    return _L("EQoSEventAdapt");
-		case EQoSEventChannel:
-		    return _L("EQoSEventChannel");
-		case EQoSEventJoin:
-		    return _L("EQoSEventJoin");
-		case EQoSEventLeave:
-		    return _L("EQoSEventLeave");
-		case EQoSEventAddPolicy:
-		    return _L("EQoSEventAddPolicy");
-		case EQoSEventGetPolicy:
-    	    return _L("EQoSEventGetPolicy");
-		case EQoSEventDeletePolicy:
-		    return _L("EQoSEventDeletePolicy");
-		case EQoSEventLoadPolicyFile:
-		    return _L("EQoSEventLoadPolicyFile");
-		case EQoSEventUnloadPolicyFile:
-		    return _L("EQoSEventUnloadPolicyFile");
-		default:
-			return _L("Unknown QoS event");
-	}
-}
-#endif
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/src/spudNetSideQos.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-// Copyright (c) 2005-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:
-// te_spudNetSideQos.h
-// Defines the Network-side events & error conditions tests for SPUD.
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#ifndef TE_SPUD_NETSIDE_QOS_H
-#define TE_SPUD_NETSIDE_QOS_H
-
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-#include <networking/qoslib.h>
-
-
-/** Encapsulates all Spud Network Side tests */
-TPtrC QoSEventToText(TQoSEvent aEvent);
-#endif // SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-
-#endif 
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/src/te_spudNetworkSideR5Steps.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,253 +0,0 @@
-// Copyright (c) 2005-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:
-// Implements the integration tests for R5 Qos parameters.
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-
-#include "te_spudNetworkSideR5Steps.h"
-#include <in_sock.h>
-
-using namespace te_spudNetworkSide; 
-
-/**
-Initiates the start (creation & activation) of a secondary PDP context, but does not wait/verify that the context
-was actually created / activated 
-
-Set Qos R5 parameters on secondary pdp context.
-@leave if the start cannot be initiated: a socket cannot be opened, etc
-*/
-void CSpudQosR5TestBase::InitiateSecondaryStartL()
-	{
-#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-	ReadQosParameterSettingsFromConfigL();
-
-	UpdatePolicySelector2QosParametersTableL(iPolicySelector, iQosParametersRecord);
-#endif
-
-	TestL(iSocket.Open(iEsock, KAfInet, KSockDatagram, KProtocolInetUdp), _L("RSocket::Open"));
-	TInetAddr localAddr;
-	localAddr.SetPort(KConfiguredTftFilter1DestPort);
-	TestL(iSocket.Bind(localAddr), _L("Binding the local Socket"));
-	
-	TInetAddr dstAddr;
-	dstAddr.SetPort(KConfiguredTftFilter1SrcPort);
-	dstAddr.Input(KConfiguredTftFilter1SrcAddr);
-	
-	TRequestStatus status;
-	iSocket.Connect(dstAddr, status);
-	User::WaitForRequest(status);
-	TestL(status.Int(), _L("Connecting to local socket"));
-
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-	TQoSSelector selector;
-	selector.SetAddr(iSocket);
-
-	TestL(iQoSPolicy_1.Open(selector), _L("Opening Policy"));
-	TestL(iQoSPolicy_1.NotifyEvent(*this), _L("Requesting Event notification on QosChannel"));
-
-	CQoSParameters *parameters = new(ELeave) CQoSParameters;
-	CleanupStack::PushL(parameters);
-	
-	SetQoSParameters(*parameters);
-	
-	TUmtsR5QoSParameters* umtsParameters = new(ELeave) TUmtsR5QoSParameters;
-	CleanupStack::PushL(umtsParameters);
-	    	    
-	SetQoSR5Parameters(*umtsParameters);
-	    
-	CUmtsR5QoSPolicy *umtsR5Policy = CUmtsR5QoSPolicy::NewL();
-	CleanupStack::PushL(umtsR5Policy);
-	
-    umtsR5Policy->SetQoSRequested(*umtsParameters);
-    
-    TEST(parameters->AddExtensionL(*umtsR5Policy) == KErrNone);
-	    
-	TImsParameter* imsParameters = new(ELeave) TImsParameter;
-	CleanupStack::PushL(imsParameters);
-	    
-	SetIMSParameters(*imsParameters);
-	    
-	CImsPolicy *imsPolicy = CImsPolicy::NewL();
-	CleanupStack::PushL(imsPolicy);
-	
-    imsPolicy->SetImsParameter(*imsParameters);
-    
-    TEST(parameters->AddExtensionL(*imsPolicy) == KErrNone);
-      	 	
-	TestL(iQoSPolicy_1.SetQoS(*parameters), _L("Setting R5 Qos Parameters"));
-	
-	WaitForQoSEventL(_L("SecondaryActivationEvent1"),KErrNone);
-		
-    CleanupStack::PopAndDestroy(5);
-#endif
-	}
-	
-/**
-Test operation of the secondary PDP context when there are no network-side events.
-Set R5 Qos parameters for secondary PDP context.
-@leave if the test fails.
-*/	
-enum TVerdict CSpudQosR5Secondary::RunTestStepL()
-	{
-	//start secondary pdp setting  R5 Qos parameters
-	StartSecondaryL();
-	StopSecondaryL();
-	
-	return EPass;	
-	};
-
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-/**
-Test operation of the secondary PDP context when there is a network side event
-
-@leave if the test fails.
-*/	
-enum TVerdict CSpudSecondaryQosR5Event::RunTestStepL()
-	{
-	
-	TInt idx				 = RetrieveNetSideEventValFromConfigL(_L("QoSEventReq1Idx"));
-	TEtelRequestType request = RetrieveNetSideEventRequestFromConfigL(_L("QoSEventReq1"));
-	
-	//start secondary pdp setting  R5 Qos parameters
-	StartSecondaryL();  
-	
-	EtelRequestL(request, idx);
-
-	WaitForOptionalQoSEventL(_L("ExpQoSEvent1"),_L("ExpQoSEvent1Reason"), _L("OptionalQoSEvent1"), _L("OptionalQoSEvent1Reason"));
-
-	StopSecondaryL();	
-		
-	return EPass;
-	}
-
-/**
-Test operation of the secondary PDP context when R5 QoS parameter is changed after the context was activated
-
-@leave if the test fails.
-*/		
-enum TVerdict CSpudSecondaryChangeR5QoS::RunTestStepL()
-	{
-	INFO_PRINTF1(_L("CSpudSecondaryChangeQoS R5 test start"));
-	
-	StartSecondaryL();
-	ChangeQoSL();
-	StopSecondaryL();
-	return EPass;	
-	};
-#endif
-
-//delete primary pdp context where R5 qos parameters are set on sec pdp context.	
-TVerdict CSpudDeletePrimaryR5Qos::RunTestStepL()
-{
-	 if(SpudDeletePrimaryPdpL())
-	   {
-	 	return EPass;
-	   }
-	 
-	 return EFail;
-
-}
-
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-/** 
-This method must be called after StartSecondaryL() is called.
-Change R5 Qos parameters
-*/
-void CSpudQosR5TestBase::ChangeQoSL()
-	{
-	CQoSParameters *parameters = new(ELeave) CQoSParameters;
-	CleanupStack::PushL(parameters);
-
-	SetQoSParameters1(*parameters);
-	 
-	TUmtsR5QoSParameters* umtsParameters = new(ELeave) TUmtsR5QoSParameters;
-	CleanupStack::PushL(umtsParameters);
-	    	    
-	ChangeQoSR5Parameters(*umtsParameters);
-	    
-	CUmtsR5QoSPolicy *umtsR5Policy = CUmtsR5QoSPolicy::NewL();
-    umtsR5Policy->SetQoSRequested(*umtsParameters);
-    
-    TEST(parameters->AddExtensionL(*umtsR5Policy) == KErrNone);
-    	
-	TestL(iQoSPolicy_1.SetQoS(*parameters), _L("Setting Qos Parameters"));
-
-	WaitForOptionalQoSEventL(_L("ExpQoSEvent1"), _L("ExpQoSEvent1Reason"), _L("OptionalQoSEvent1"), _L("OptionalQoSEvent1Reason"));
-	
-	WaitForQoSEventL(_L("ExpQoSEvent2"),_L("ExpQoSEvent2Reason"));
-
-	CleanupStack::PopAndDestroy(umtsParameters);
-	CleanupStack::PopAndDestroy(parameters);
-	}
-
-/**
-Set the IMS SI parameters to ETrue
-*/
-void CSpudQosR5TestBase::SetIMSParameters(TImsParameter& imsParameters)
-{
-    imsParameters.SetIMSSigallingIndicator(ETrue); 
-}
-/**
-Set the QoS R5 parameters
-*/
-void CSpudQosR5TestBase::SetQoSR5Parameters(TUmtsR5QoSParameters& umtsParameters)
-{
-     
-    umtsParameters.SetTrafficClass(ETrafficClassStreaming);
-    umtsParameters.SetDeliveryOrder(EDeliveryOrderNotRequired);
-    umtsParameters.SetDeliveryOfErroneusSdu(EErroneousSDUDeliveryNotRequired);
-    umtsParameters.SetResidualBer(EBEROnePerThousand);
-    umtsParameters.SetErrorRatio(ESDUErrorRatioOnePerThousand);
-    umtsParameters.SetPriority(ETrafficPriority1);
-    umtsParameters.SetTransferDelay(1);
-    umtsParameters.SetMaxSduSize(0);
-    umtsParameters.SetMaxBitrateUplink(2048);
-    umtsParameters.SetMaxBitrateDownlink(2048);
-    umtsParameters.SetGuaranteedBitrateUplink(128);
-    umtsParameters.SetGuaranteedBitrateDownlink(128);
-    
-    umtsParameters.SetSignallingIndicator(ETrue);
-    umtsParameters.SetSourceStatisticsDescriptor(ESourceStatisticsDescriptorSpeech);
-      
-}
-/**
-Resets Qos R5 parameters.
-*/
-void CSpudQosR5TestBase::ChangeQoSR5Parameters(TUmtsR5QoSParameters& umtsParameters)
-{
-         
-    umtsParameters.SetTrafficClass(ETrafficClassStreaming);
-    umtsParameters.SetDeliveryOrder(EDeliveryOrderNotRequired);
-    umtsParameters.SetDeliveryOfErroneusSdu(EErroneousSDUDeliveryNotRequired);
-    umtsParameters.SetResidualBer(EBEROnePerThousand);
-    umtsParameters.SetErrorRatio(ESDUErrorRatioOnePerThousand);
-    umtsParameters.SetPriority(ETrafficPriority1);
-    umtsParameters.SetTransferDelay(1);
-    umtsParameters.SetMaxSduSize(0);
-    umtsParameters.SetMaxBitrateUplink(2048);
-    umtsParameters.SetMaxBitrateDownlink(2048);
-    umtsParameters.SetGuaranteedBitrateUplink(128);
-    umtsParameters.SetGuaranteedBitrateDownlink(128);
-        
-    umtsParameters.SetSignallingIndicator(EFalse);
-    umtsParameters.SetSourceStatisticsDescriptor(ESourceStatisticsDescriptorUnknown);
-     
-}
-#endif
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/src/te_spudNetworkSideR5Steps.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-// Copyright (c) 2005-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:
-// Defines the Spud tests related to R5 Qos parameters
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#ifndef TE_SPUD_NETWORK_SIDE_R5STEPS_H
-#define TE_SPUD_NETWORK_SIDE_R5STEPS_H
-
-#include "te_spudNetworkSideSteps.h"
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-#include <networking/umtsextn.h>
-#include <networking/imsextn.h>
-#endif
-
-using namespace te_spudNetworkSide;
-	
-	class CSpudQosR5TestBase : public CSpudNetSideTestBase
-		{
-		
-	protected:
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-		void SetIMSParameters(TImsParameter& aParameters);
-		void SetQoSR5Parameters(TUmtsR5QoSParameters& aParameters);
-		void ChangeQoSR5Parameters(TUmtsR5QoSParameters& aParameters);
-		virtual void ChangeQoSL();
-#endif
-		
-		virtual void InitiateSecondaryStartL();
-		};
-		
-	/** Define a basic declaration for testClass as a subclass of CSpudNetSideTestBase 
-	and define a literal from testClass */
-	#define SYMBIAN_SPUD_TEST_CLASSR5(testClass) SYMBIAN_TEST_CLASS(testClass) : public CSpudQosR5TestBase \
-				{ \
-			public: \
-				inline testClass() {SetTestStepName(K##testClass);}; \
-				virtual TVerdict RunTestStepL(); \
-				}; 
-				
-			
-	//R5 Qos parameters testing
-	SYMBIAN_SPUD_TEST_CLASSR5(CSpudQosR5Secondary)
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-	SYMBIAN_SPUD_TEST_CLASSR5(CSpudSecondaryQosR5Event)
-	SYMBIAN_SPUD_TEST_CLASSR5(CSpudSecondaryChangeR5QoS)
-#endif
-	SYMBIAN_SPUD_TEST_CLASSR5(CSpudDeletePrimaryR5Qos)	
-	
-#endif 
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/src/te_spudNetworkSideServer.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,256 +0,0 @@
-// Copyright (c) 2005-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:
-// SpudNetworkSideServer.cpp
-// for (WINS && !EKA2) versions will be xxxServer.Dll and require a thread to
-// be started in the process of the client. The client initialises the server
-// by calling the one and only ordinal.
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#include "te_spudNetworkSideServer.h"
-#include "te_spudNetworkSideSteps.h"
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-#include "te_spudNetworkSideR5Steps.h"
-#endif
-
-using namespace te_spudNetworkSide;
-_LIT(KServerName,"TE_SpudNetworkSide");
-
-
-
-
-// EKA2 much simpler
-// just an E32Main and a MainL()
-
-/**
- * Much simpler, uses the new Rendezvous() call to sync with the client.
- *
- * @internalComponent
- *
- * @leave When new(ELeave) leaves 
- */
-LOCAL_C void MainL()
-	{
-	// leave the hooks in for platform security
-#if (defined __DATA_CAGING__)
-	RProcess().DataCaging(RProcess::EDataCagingOn);
-	RProcess().SecureApi(RProcess::ESecureApiOn);
-#endif
-	CActiveScheduler* sched = NULL;
-	sched = new(ELeave) CActiveScheduler;
-	CActiveScheduler::Install(sched);
-
-	CSpudNetworkSideTestServer* server = NULL;
-	// create the CTestServer derived server
-	TRAPD(err,server = CSpudNetworkSideTestServer::NewL());
-	if (!err)
-		{
-		// Sync with the client and enter the active scheduler
-		RProcess::Rendezvous(KErrNone);
-		sched->Start();
-		}
-	delete server;
-	delete sched;
-	}
-
-// only a DLL on emulator for typhoon and earlier
-
-/**
- * Main entry point.
- *
- * @internalComponent
- *
- * @return Standard Epoc error codes.
- */
-GLDEF_C TInt E32Main()
-	{
-	CTrapCleanup* cleanup = CTrapCleanup::New();
-	if (cleanup == NULL)
-		{
-		return KErrNoMemory;
-		}
-	TRAP_IGNORE(MainL());
-	delete cleanup;
-	return KErrNone;
-    }
-
-// Create a thread in the calling process
-// Emulator typhoon and earlier
-
-/**
- * Called inside the MainL() function to create and start the CTestServer derived server.
- *
- * @internalComponent
- *
- * @return Instance of the test server.
- */
-CSpudNetworkSideTestServer* CSpudNetworkSideTestServer::NewL()
-	{
-	CSpudNetworkSideTestServer * server = new (ELeave) CSpudNetworkSideTestServer();
-	CleanupStack::PushL(server);
-	
-	// CServer base class call
-	server->StartL(KServerName);
-	CleanupStack::Pop(server);
-	return server;
-	}
-	
-
-
-
-
-CTestStep* CSpudNetworkSideTestServer::CreateTestStep(const TDesC& aStepName)
-/**
- * @return - A CTestStep derived instance
- * Implementation of CTestServer pure virtual
- */
-	{
-	CTestStep* step = NULL;
-	
-		if(aStepName == KCESockCheck)
-			{
-			step = new CESockCheck;
-			}
-		else if(aStepName == KCSpudPrimary)
-			{
-			step = new CSpudPrimary;
-			}
-		else if(aStepName == KCSpudPrimaryEvent)
-			{
-			step = new CSpudPrimaryEvent;
-			}
-        else if(aStepName == KCSpudPrimaryContextEventProgress)
-            {
-            step = new CSpudPrimaryContextEventProgress;
-            }
-		else if(aStepName == KCSpudDeletePrimary)
-			{
-			step = new CSpudDeletePrimary;
-			}
-		else if(aStepName == KCSpudSecondary)
-			{
-			step = new CSpudSecondary;
-			}
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-		else if(aStepName == KCSpudSecondaryEvent)
-			{
-			step = new CSpudSecondaryEvent;
-			}
-		else if(aStepName == KCSpudTwoSecondaryEvents)
-			{
-			step = new CSpudTwoSecondaryEvents;
-			}
-		else if(aStepName == KCSpudSecondaryEvent2)
-			{
-			step = new CSpudSecondaryEvent2;
-			}		
-		else if(aStepName == KCSpudSecondaryChangeQoS)
-			{
-			step = new CSpudSecondaryChangeQoS;
-			}
-#endif
-		else if(aStepName == KCSpudSuspendContext)
-			{
-			step = new CSpudSuspendContext;
-			}
-		else if(aStepName == KCESockCheck)
-			{
-			step = new CESockCheck;
-			}
-		else if(aStepName == KCSpudPrimaryInterfaceStop)
-			{
-			step = new CSpudPrimaryInterfaceStop;
-			}
-		else if(aStepName == KCSpudPrimaryInterfaceEventStop)
-			{
-			step = new CSpudPrimaryInterfaceEventStop;
-			}
-		else if(aStepName == KCSpudSecondaryInterfaceStop)
-			{
-			step = new CSpudSecondaryInterfaceStop;
-			}
-		else if(aStepName == KCSpudSecondaryInterfaceEventStop)
-			{
-			step = new CSpudSecondaryInterfaceEventStop;
-			}
-		else if(aStepName == KCSpudPrimaryDeletionInterfaceStop)
-			{
-			step = new CSpudPrimaryDeletionInterfaceStop;
-			}
-		else if(aStepName == KCSpudPrimayStartingStop)
-			{
-			step = new CSpudPrimayStartingStop;
-			}
-		else if(aStepName == KCSpudSecondaryStartingStop)
-			{
-			step = new CSpudSecondaryStartingStop;
-			}
-		else if(aStepName == KCSpudSecondaryLowerNifDownStop)
-			{
-			step = new CSpudSecondaryLowerNifDownStop;
-			}
-		else if(aStepName == KCSpudPrimaryEventOnLowerNifStarting)
-			{
-			step = new CSpudPrimaryEventOnLowerNifStarting;
-			}
-		else if(aStepName == KCSpudPppPrimary)
-			{
-			step = new CSpudPppPrimary;
-			}
-		else if(aStepName == KCSpudPppSecondarySend)
-			{
-			step = new CSpudPppSecondarySend;
-			}
-		else if(aStepName == KCSpudMultiPrimary)
-			{
-			step = new CSpudMultiPrimary;
-			}
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-		else if(aStepName == KCSpudQosR5Secondary)
-			{
-			step = new CSpudQosR5Secondary;
-			}
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-		else if(aStepName == KCSpudSecondaryQosR5Event)
-			{
-			step = new CSpudSecondaryQosR5Event;
-			}
-		else if(aStepName == KCSpudSecondaryChangeR5QoS)
-			{
-			step = new CSpudSecondaryChangeR5QoS;
-			}
-#endif
-		else if(aStepName == KCSpudDeletePrimaryR5Qos)
-			{
-			step = new CSpudDeletePrimaryR5Qos;
-			}	
-#endif
-	return step;	
-	}
-
-
-
-
-
-
-
-
-
-
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/src/te_spudNetworkSideServer.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-// Copyright (c) 2006-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:
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#ifndef TE_SPUD_NETWORKSIDE_SERVER_H
-#define TE_SPUD_NETWORKSIDE_SERVER_H
-
-#include <test/testexecuteserverbase.h>
-
-class CSpudNetworkSideTestServer : public CTestServer
-	{
-public:
-	static CSpudNetworkSideTestServer* NewL();
-	virtual CTestStep* CreateTestStep(const TDesC& aStepName);
-	};
-
-
-#endif // SPUD_NETWORK_SIDE_TEST_SERVER_H
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/src/te_spudNetworkSideSteps.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2240 +0,0 @@
-// Copyright (c) 2005-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:
-// Implements the integration tests for the SPUD using RawIpNif
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-
-#include "te_spudNetworkSideSteps.h"
-#include <c32comm.h> // uniquely for the call to StartC32WithCMISuppressions
-#include "spudNetSideQos.h"
-#include <simtsy.h>
-#include <commdbconnpref.h>
-#include <nifvar.h> // Nifman Progress notifications
-#include <in_sock.h>
-#include <es_enum.h> 
-
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-#include <networking/qoslib.h>
-#else
-#include <commsdat.h>
-#include <commsdattypesv1_1.h>
-#include <commsdattypeinfov1_1_internal.h>
-#endif
-
-#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-using namespace CommsDat;
-#define PDPIAP 2
-#endif
-
-using namespace te_spudNetworkSide; 
-
-_LIT(KCsyName,"PKTLOOPBACK");
-_LIT8(KCommWriteData, "Data to send");
-_LIT8(KCommWriteData2, "Second data to send");
-// length of a buffer long enough to read KCommWriteData
-const TUint KCommReadBufSize = 64;
-
-// These aren't defined in a common header file.
-static const RProperty::TType KUidPSCsyWriteResultCategoryKeyType = RProperty::EInt;
-static const TUid KUidPSCsyWriteResultCategory = {0x10206869}; //KUidLoopbackCSYMin + 5
-	
-const TTimeIntervalMicroSeconds32 KReadDelay(10000000);
-const TUint KTimeToStartSecondary(1000000*5); // give it 5 seconds in case logging is on
-
-/**
- Implements the pure virtual doTestStepPreambleL defined in CTestStep. 
- Used to disable the phone book synchronizer
- which may cause the tests to fail.
- 
- 
- @return EPass if successful.
- @leave If Phonebook synchronizer disabling fails. 
- */
-TVerdict CSpudNetSideTestBase::doTestStepPreambleL()
-	{	
-	_LIT(KPhbkSyncCMI, "phbsync.cmi");
-	TInt err = StartC32WithCMISuppressions(KPhbkSyncCMI);
-	TESTL(KErrNone == err || KErrAlreadyExists == err);
-	INFO_PRINTF1(_L("Test Step Preamble: disabled Phonebook Synchronizer."));	
-	return EPass;
-	}
-
-#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-TVerdict CSpudNetSideTestBase::doTestStepPostambleL()
-	{	
-	ClearPolicySelector2QosParametersTableL();
-	return TestStepResult();
-	}
-#endif
-
-void CSpudNetSideTestBase::FailNextPktLoopbackCsyWriteL(TInt aPortNum, TInt aErrorCode)
-	{
-	TInt dummy(0);
-	TInt ret = RProperty::Get(KUidPSCsyWriteResultCategory, aPortNum, dummy);
-	if(ret == KErrNotFound)
-		{
-		RProperty::Define(KUidPSCsyWriteResultCategory, aPortNum, KUidPSCsyWriteResultCategoryKeyType);
-		}
-	TestL(RProperty::Set(KUidPSCsyWriteResultCategory, aPortNum, aErrorCode), _L("Set PSCsy write result"));
-  	INFO_PRINTF3(_L("Next write on [PKTLOOPBACK::%d] is going to fail with [%d]"), aPortNum, aErrorCode);
-  	}
-	
-/**
-Blocks until Nifman progress notification is received.
-
-
-@param aReqStatus Request status to wait on for the notification
-@param aProgress Nifman progress notification code, for sanity check. This is the progress that was subscribed for.
-@param aErrCode expected progress error code.
-@leave if the error code received is not equal to the expected.
-*/
-void CSpudNetSideTestBase::WaitForProgressNotificationL(TRequestStatus& aReqStatus, TInt aProgress, TInt aErrCode)
-	{
-	INFO_PRINTF3(_L("Waiting for Nifman Progress: stage[%d] with error[%d]"), aProgress, aErrCode);
-	User::WaitForRequest(aReqStatus);
-	if(KErrNone != aReqStatus.Int())
-		{
-		INFO_PRINTF2(_L("Unexpected error on progress notification: [%d]"), aReqStatus.Int());
-		User::Leave(aReqStatus.Int());
-		}
-	
-	INFO_PRINTF3(_L("Received Progress [%d], error[%d]"), iProgressBuf().iStage, iProgressBuf().iError);
-		
-	if(aErrCode != iProgressBuf().iError)
-		{
-		User::Leave(KErrArgument);
-		}
-	
-	ASSERT(aProgress == iProgressBuf().iStage); // Error in Nifman Progress Notification mechanism
-	}
-	
-/**
-Retrieves the PDP context type (EPrimaryContext or ESecondaryContext) from the configuration file
-
-@param aContextTypeName the name of the context to retrieve the type for
-@return the type of fhe context
-@leave if this setting is not in the configuration file, or if the type is unrecognized 
-*/	
-TContextType CSpudNetSideTestBase::RetrieveContextTypeFromConfigL(const TDesC& aContextTypeName)
-	{
-	TPtrC eventStr;
-	if(!GetStringFromConfig(ConfigSection(), aContextTypeName, eventStr))
-		{
-		INFO_PRINTF2(_L("Context config type[%S] not in config. Leaving with KErrNotFound"), &aContextTypeName);
-		User::Leave(KErrNotFound);
-		}
-	
-	INFO_PRINTF3(_L("Context type is [%S] for request [%S]"), &eventStr, &aContextTypeName);	
-		
-	// convert the enum
-	TContextType contextType(EPrimaryContext);
-	if(eventStr.Compare(TPtrC(_L("EPrimaryContext"))) == 0)
-		{
-		contextType =  EPrimaryContext;
-		}
-	else if(eventStr.Compare(TPtrC(_L("ESecondaryContext"))) == 0)
-		{
-		contextType =  ESecondaryContext;
-		}
-	else
-		{
-		INFO_PRINTF2(_L("Context type [%S] does not match 'EPrimaryContext' or 'ESecondaryContext'"), &eventStr);
-		User::Leave(KErrCorrupt);
-		}
-
-	return contextType;
-	}
-	
-/**
-Retrieves the COMM role (DTE / DCE) from config
-
-@param aCommRoleName the name of the parameter to retrieve the role for
-@return the comm role
-@leave the setting is not found or if the role is unrecognized 
-*/	
-TCommRole CSpudNetSideTestBase::RetrieveCommRoleFromConfigL(const TDesC& aCommRoleName)
-	{
-	TPtrC roleStr;
-	if(!GetStringFromConfig(ConfigSection(), aCommRoleName, roleStr))
-		{
-		INFO_PRINTF2(_L("Comm role[%S] not in config. Leaving with KErrNotFound"), &aCommRoleName);
-		User::Leave(KErrNotFound);
-		}
-	
-	INFO_PRINTF3(_L("Comm role is [%S] for request [%S]"), &roleStr, &aCommRoleName);
-		
-	// convert the enum
-	TCommRole commRole(ECommRoleDTE);
-	if(roleStr.Compare(TPtrC(_L("ECommRoleDTE"))) == 0)
-		{
-		commRole =  ECommRoleDTE;
-		}
-	else if(roleStr.Compare(TPtrC(_L("ECommRoleDCE"))) == 0)
-		{
-		commRole =  ECommRoleDCE;
-		}
-	else
-		{
-		INFO_PRINTF2(_L("Comm role [%S] does not match 'ECommRoleDTE' or 'ECommRoleDCE'"), &roleStr);
-		User::Leave(KErrCorrupt);
-		}
-
-	return commRole;
-	}
-
-/**
-Retrieves the value of the network side event from the configuration file
-
-@param the name of the even parameter
-@return the network side event value (actually an index in publish-subscribe section in the SIM.TSY config.txt)	
-@leave if the setting cannot be found 
-*/
-TInt CSpudNetSideTestBase::RetrieveNetSideEventValFromConfigL(const TDesC& aEventValName)
-	{
-	TInt val(0);
-	if(!GetIntFromConfig(ConfigSection(), aEventValName, val))
-		{
-		User::Leave(KErrNotFound);
-		}
-	return val;
-	}
-	
-/**
-Retrieves the type of the network side event (QoS Change, ContextStatus change, etc)
-
-@param aEventName event parameter name
-@return the event type
-@leave if parameter cannot be found, or if the value is unrecognized 
-*/		
-TEtelRequestType CSpudNetSideTestBase::RetrieveNetSideEventRequestFromConfigL(const TDesC& aEventName)
-	{
-	TPtrC eventStr;
-	if(!GetStringFromConfig(ConfigSection(), aEventName, eventStr))
-		{
-		INFO_PRINTF2(_L("NetSide event [%S] not in config. Leaving with KErrNotFound"), &aEventName);	
-		User::Leave(KErrNotFound);
-		}
-	
-	INFO_PRINTF3(_L("NetSide event is [%S] for request [%S]"), &eventStr, &aEventName);	
-		
-	// convert the enum
-	TEtelRequestType request(EInvalidRequest);
-	if(eventStr.Compare(TPtrC(_L("ENetworkQoSChange"))) == 0)
-		{
-		request =  ENetworkQoSChange;
-		}
-	else if(eventStr.Compare(TPtrC(_L("ENetworkChangeRegStatus"))) == 0)
-		{
-		request =  ENetworkChangeRegStatus;
-		}
-	else if(eventStr.Compare(TPtrC(_L("EContextStatusChange"))) == 0)
-		{
-		request =  EContextStatusChange;
-		}
-	else
-		{
-		ERR_PRINTF2(_L("Unknown event [%S] requested. Leaving with KErrArgument"), &eventStr);
-		User::Leave(KErrArgument);
-		}
-	return request;
-	}
-
-/**
- Sets the section for the simtsy to use in its config.txt file.
- The section that will be used is testX, where X is the parameter aTestNumber
- */
-void CSpudNetSideTestBase::SetSimTsyTestNumberL(TInt aTestNumber)
-  	{
-	TestL(RProperty::Set(KUidPSSimTsyCategory, KPSSimTsyTestNumber, aTestNumber), _L("Set Sim TSY test number"));
-  	}
-
-/**
-Gets the mandatory settings from the test configuration
-
-@leave if not found 
-*/
-void CSpudNetSideTestBase::RetrieveMandatorySettingsFromConfigL()
-	{
-	if(!GetIntFromConfig(ConfigSection(), _L("SimTsyTestNum"), iSimTsyTestNum))
-		{
-		ERR_PRINTF1(_L("Failed to read mandatory settings (SimTsyTestNum, etc) from the config file."));
-		User::Leave(KErrNotFound);
-		}
-	}
-
-#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-/**
-Read Qos Parameter Settings from config
-
-@leave if not found 
-*/
-void CSpudNetSideTestBase::ReadQosParameterSettingsFromConfigL()
-	{
-	_LIT(KPolicySelector, "PolicySelector");
-	_LIT(KParametersType, "ParametersType");
-	_LIT(KGenericQosRecord, "GenericQosRecord");
-	_LIT(KUmtsR99QoSAndOnTableRecord, "UmtsR99QoSAndOnTableRecord");
-	_LIT(KParametersRecordId, "ParametersRecordId");
-	
-	TPtrC parameterType;
-	TInt record;
-	
-	if(!GetStringFromConfig(ConfigSection(), KParametersType, parameterType))
-		{
-		ERR_PRINTF1(_L("Failed to read mandatory settings (ParametersType, etc) from the config file."));
-		User::Leave(KErrNotFound);
-		}
-
-	if(!GetIntFromConfig(ConfigSection(), KParametersRecordId, record))
-		{
-		ERR_PRINTF1(_L("Failed to read mandatory settings (ParametersRecord, etc) from the config file."));
-		User::Leave(KErrNotFound);
-		}
-
-	if(!GetIntFromConfig(ConfigSection(), KPolicySelector, iPolicySelector))
-		{
-		ERR_PRINTF1(_L("Failed to read mandatory settings (PolicySelector, etc) from the config file."));
-		User::Leave(KErrNotFound);
-		}
-
-	if (parameterType.Compare(KGenericQosRecord()) == 0)
-		{
-		iQosParametersRecord = KCDTIdGenericQosRecord | record;
-		}
-	else if (parameterType.Compare(KUmtsR99QoSAndOnTableRecord()) == 0)
-		{
-		iQosParametersRecord = KCDTIdUmtsR99QoSAndOnTableRecord | record;
-		}
-	else
-		{
-		ERR_PRINTF2(_L("Invalid value for ParametersType. %S"), &parameterType);
-		User::Leave(KErrArgument);
-		}
-	}
-#endif
-
-
-/**
- Implements the pure virtual doTestStepL defined in CTestStep. 
- Allows the base class to execute before any of the derived 
- tests is called.
- 
- @leave If any of the called methods leaves.
- */
-TVerdict CSpudNetSideTestBase::doTestStepL()
-	{
-	// Initialize the mandatory objects, without which there is not point in running the tests.
-	RetrieveMandatorySettingsFromConfigL();	
-		
-	TRAPD(esockConnErr, TestL(iEsock.Connect(), _L("RSockeServ::Connect")));
-	if(KErrNone != esockConnErr)
-		{
-		INFO_PRINTF1(_L("ESock thread is dead. Most likely, it was crashed by the previous test case. Check the Root Server logs."));
-		SetTestStepResult(EInconclusive);
-		return TestStepResult();
-		}
-	
-	// Sim.Tsy test section to use with the test
-	INFO_PRINTF2(_L("Sim TSY test number: [%d]"), iSimTsyTestNum);
-	SetSimTsyTestNumberL(iSimTsyTestNum);
-	
-	ASSERT(!CActiveScheduler::Current()); // We should not have an AS at this point.
-	CActiveScheduler* testSched = new(ELeave) CActiveScheduler;
-	CleanupStack::PushL(testSched);
-	CActiveScheduler::Install(testSched);
-	
-	
-	// Test sequence itself:
-	TVerdict testResult = EFail;		
-	TRAPD(err, testResult = RunTestStepL());
-	if(KErrNone == err)
-		{
-		INFO_PRINTF1(_L("Test Step Completion."));
-		SetTestStepResult(testResult);
-		}
-	else
-		{
-		ERR_PRINTF2(_L("Test Step Failure: the step left with [%d]"), err);
-		SetTestStepResult(EFail);
-		}
-		
-
-	// It's OK to close these more than once.
-	iLoopbackPort.Close();
-	iCommServer.Close();
-
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-	iQoSPolicy_1.Close();
-#endif
-	iSocketJoin.Close();
-
-	iSocket.Close();
-	iInterface.Close();
-	
-	iEsock.Close();
-	
-	CActiveScheduler::Install(NULL); // uninstall the test scheduler
-	CleanupStack::PopAndDestroy(testSched);
-	
-	return TestStepResult();	
-	}
-
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-/**
-Blocks until a QoS event is received
-
-@param aQosEventString the name of config parameter holding the expected event
-@param aReasonCodeString the name of the config parameter holding the expected reason
-@leave if the received event is not what was expected 
-*/
-void CSpudNetSideTestBase::WaitForQoSEventL(const TDesC& aQosEventString, const TDesC& aReasonCodeString)
-	{
-
-	TQoSEvent expQosEvent = RetrieveQosEventFromConfigL(aQosEventString);
-	if(expQosEvent == EQoSEventFailure || expQosEvent == EQoSEventAdapt || expQosEvent == EQoSEventJoin)
-		{
-		TInt reason = RetrieveNetSideEventValFromConfigL(aReasonCodeString);
-		WaitForQoSEventL(expQosEvent,reason);
-		}
-	else
-		{
-		WaitForQoSEventL(expQosEvent,KErrNone);
-		}
-	}
-
-/**
-Blocks until a QoS event is received
-
-@param aQosEventString the name of config parameter holding the expecting event
-@param aReasonCode the expected reason
-@leave if the received event is not what was expected 
-*/
-void CSpudNetSideTestBase::WaitForQoSEventL(const TDesC& aQosEventString, TInt aReasonCode)
-	{
-
-	TQoSEvent expQosEvent = RetrieveQosEventFromConfigL(aQosEventString);
-	WaitForQoSEventL(expQosEvent,aReasonCode);
-	}
-
-/**
-Blocks until a QoS event is received
-
-@param aQosEventString the expected event
-@param aReasonCode the expected reason
-@leave if the received event is not what was expected 
-*/
-void CSpudNetSideTestBase::WaitForQoSEventL(TQoSEvent aQosEvent, TInt aReasonCode)
-	{
-	INFO_PRINTF1(_L("Waiting for QoS Event: starting ActiveScheduler"));
-	CActiveScheduler::Start();
-	// We have received QoS event at this point. 
-	TPtrC expectedEvent(QoSEventToText(aQosEvent));
-	TPtrC receivedEvent(QoSEventToText(iReceivedQosEvent));
-	if(aQosEvent == EQoSEventFailure || aQosEvent == EQoSEventAdapt || aQosEvent == EQoSEventJoin)
-		{
-		INFO_PRINTF5(_L("Qos Event [%S] and Reason [%d] expected, [%S] and Reason [%d] received"), &expectedEvent,aReasonCode, &receivedEvent,iQosReason );
-		if(aQosEvent == iReceivedQosEvent && iQosReason == aReasonCode)	
-			{
-			INFO_PRINTF1(_L("OK. correct event and reason received."));
-			}
-		else
-			{
-			INFO_PRINTF1(_L("Failure: unexpected event or reason"));
-			User::Leave(KErrCorrupt);
-			}
-		}
-	else
-		{
-		INFO_PRINTF3(_L("Qos Event [%S] expected, [%S] received"), &expectedEvent, &receivedEvent);
-		if(aQosEvent == iReceivedQosEvent)	
-			{
-			INFO_PRINTF1(_L("OK. correct event received."));
-			}
-		else
-			{
-			INFO_PRINTF1(_L("Failure: unexpected event"));
-			User::Leave(KErrCorrupt);
-			}
-		}
-	}
-
-/**
- Wrapper for WaitForOptionalQoSEventL(TQoSEvent aQosEvent, TInt aReasonCode, TQoSEvent aOptionalQosEvent, TInt aOptionalReasonCode)
-*/
-void CSpudNetSideTestBase::WaitForOptionalQoSEventL(const TDesC& aQosEventString, const TDesC& aReasonCodeString, const TDesC& aOptionalQosEventString, const TDesC& aOptionalReasonCodeString)
-	{
-	TQoSEvent optionalEvent = (TQoSEvent)0;
-	TRAPD(err, optionalEvent = RetrieveQosEventFromConfigL(aOptionalQosEventString));
-	if (KErrArgument == err)
-		{
-		// Could not find any optional events
-		WaitForQoSEventL(aQosEventString,aReasonCodeString);
-		}
-	else
-		{
-		// found an optional event
-		WaitForOptionalQoSEventL(aQosEventString,aReasonCodeString,optionalEvent,aOptionalReasonCodeString);
-		}
-	}
-	
-/**
- Wrapper for WaitForOptionalQoSEventL(TQoSEvent aQosEvent, TInt aReasonCode, TQoSEvent aOptionalQosEvent, TInt aOptionalReasonCode)
-*/
-void CSpudNetSideTestBase::WaitForOptionalQoSEventL(const TDesC& aQosEventString, const TDesC& aReasonCodeString, TQoSEvent aOptionalQosEvent, const TDesC& aOptionalReasonCodeString)
-	{
-	TQoSEvent expQosEvent = RetrieveQosEventFromConfigL(aQosEventString);
-	TInt expQosReason = KErrNone;
-	TInt optionalExpQosReason = KErrNone;
-	if(expQosEvent == EQoSEventFailure || expQosEvent == EQoSEventAdapt || expQosEvent == EQoSEventJoin)
-		{
-		expQosReason = RetrieveNetSideEventValFromConfigL(aReasonCodeString);
-		}
-	if(aOptionalQosEvent == EQoSEventFailure || aOptionalQosEvent == EQoSEventAdapt || aOptionalQosEvent == EQoSEventJoin)
-		{
-		optionalExpQosReason = RetrieveNetSideEventValFromConfigL(aOptionalReasonCodeString);
-		}
-	WaitForOptionalQoSEventL(expQosEvent, expQosReason, aOptionalQosEvent, optionalExpQosReason);
-	}
-	
-/**
-Blocks until a QoS event is received
-
-@param aQosEventString the expected event
-@param aReasonCode the expected reason
-@leave if the received event is not what was expected 
-*/
-void CSpudNetSideTestBase::WaitForOptionalQoSEventL(TQoSEvent aQosEvent, TInt aReasonCode, TQoSEvent aOptionalQosEvent, TInt aOptionalReasonCode)
-	{
-	INFO_PRINTF1(_L("Waiting for optional QoS Event: starting ActiveScheduler"));
-	CActiveScheduler::Start();
-	// We have received QoS event at this point. 
-	TPtrC expectedEvent(QoSEventToText(aQosEvent));
-	TPtrC receivedEvent(QoSEventToText(iReceivedQosEvent));
-	if(iReceivedQosEvent == EQoSEventFailure || iReceivedQosEvent == EQoSEventAdapt || iReceivedQosEvent == EQoSEventJoin)
-		{
-		INFO_PRINTF5(_L("Qos Event [%S] and Reason [%d] expected, [%S] and Reason [%d] received"), &expectedEvent,aReasonCode, &receivedEvent,iQosReason );
-		if(aQosEvent == iReceivedQosEvent && iQosReason == aReasonCode)
-			{
-			INFO_PRINTF1(_L("OK. correct event and reason received."));
-			return;
-			}
-		else if (aOptionalQosEvent != iReceivedQosEvent || iQosReason != aOptionalReasonCode)
-			{
-			INFO_PRINTF1(_L("Failure: unexpected event or reason"));
-			User::Leave(KErrCorrupt);
-			}
-		INFO_PRINTF1(_L("OK. optional event and reason received."));
-		// fall through and wait for non-optional event
-		}
-	else
-		{
-		INFO_PRINTF3(_L("Qos Event [%S] expected, [%S] received"), &expectedEvent, &receivedEvent);
-		if(aQosEvent == iReceivedQosEvent)	
-			{
-			INFO_PRINTF1(_L("OK. correct event received."));
-			return;
-			}
-		else if (aOptionalQosEvent != iReceivedQosEvent)
-			{
-			INFO_PRINTF1(_L("Failure: unexpected event"));
-			User::Leave(KErrCorrupt);
-			}
-		// fall through and wait for non-optional event
-		}
-
-	INFO_PRINTF1(_L("Waiting for second QoS Event: starting ActiveScheduler"));
-	CActiveScheduler::Start();
-	// We have received QoS event at this point. 
-	if(aQosEvent == EQoSEventFailure || aQosEvent == EQoSEventAdapt || aQosEvent == EQoSEventJoin)
-		{
-		INFO_PRINTF5(_L("Qos Event [%S] and Reason [%d] expected, [%S] and Reason [%d] received"), &expectedEvent,aReasonCode, &receivedEvent,iQosReason );
-		if(aQosEvent == iReceivedQosEvent && iQosReason == aReasonCode)	
-			{
-			INFO_PRINTF1(_L("OK. correct event and reason received."));
-			}
-		else
-			{
-			INFO_PRINTF1(_L("Failure: unexpected event or reason"));
-			User::Leave(KErrCorrupt);
-			}
-		}
-	else
-		{
-		INFO_PRINTF3(_L("Qos Event [%S] expected, [%S] received"), &expectedEvent, &receivedEvent);
-		if(aQosEvent == iReceivedQosEvent)	
-			{
-			INFO_PRINTF1(_L("OK. correct event received."));
-			}
-		else
-			{
-			INFO_PRINTF1(_L("Failure: unexpected event"));
-			User::Leave(KErrCorrupt);
-			}
-		}
-	}
-
-/**
-Upcall from the QoS framework on reception of a QoS event
-*/
-void CSpudNetSideTestBase::Event(const CQoSEventBase& aEvent)
-	{
-	CActiveScheduler::Stop();
-	
-	INFO_PRINTF1(_L("QoS Event received: stopping ActiveScheduler"));
-	iReceivedQosEvent = (TQoSEvent)aEvent.EventType();
-	switch(aEvent.EventType())
-		{
-			case EQoSEventFailure:
-			{
-		        iQosReason = (static_cast<const CQoSFailureEvent*>(&aEvent))->Reason();
-		 
-		        INFO_PRINTF2(_L("Receive CQoSFailureEvent reason: %d"),iQosReason );
-				break;
-			}
-			
-			case EQoSEventAdapt:
-			{
-		        iQosReason = (static_cast<const CQoSAdaptEvent*>(&aEvent))->Reason();
-		 
-		        INFO_PRINTF2(_L("Receive CQoSAdaptEvent reason: %d"),iQosReason );
-				break;
-			}
-			
-			case EQoSEventJoin:
-			{
-		        iQosReason = (static_cast<const CQoSJoinEvent*>(&aEvent))->Reason();
-		 
-		        INFO_PRINTF2(_L("Receive CQoSJoinEvent reason: %d"),iQosReason );
-				break;
-			}
-			
-			default:
-				break;	 	 
-		}
-	}
-#endif // SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-
-/**
-Logs a message and leaves on error 
-
-@param aErrCode error code to check
-@param aMsg message to log 
-@leave if aError is other than KErrNone
-*/
-void CSpudNetSideTestBase::TestL(TInt aErrCode, const TDesC& aMsg)
-	{	
-	TestL(aErrCode, KErrNone, aMsg);
-	}
-
-/**
-Used to verify that an error code is what expected, and log the associated comment
-
-@param aErrCode the error code to check
-@param aExpErrCode the expected error code
-@param aMsg the message to log before testing
-@leave if aErrCode != aExpErrCode
-*/	
-void CSpudNetSideTestBase::TestL(TInt aErrCode, TInt aExpErrCode, const TDesC& aMsg)
-	{	
-	if(aExpErrCode == aErrCode)
-		{
-		INFO_PRINTF3(_L("[%S]. err[%d], as expected. OK."), &aMsg, aErrCode);
-		}
-	else
-		{
-		ERR_PRINTF5(_L("Failed: [%S]. err[%d], expected [%d]. Leaving with [%d])."), &aMsg, aErrCode, aExpErrCode, aErrCode);
-		User::Leave(aErrCode);
-		}
-	}
-
-/**
-Used to verify that a boolean is as expected, and log the associated comment
-
-@param aBool the boolean to check
-@param aMsg the message to log before testing
-@leave if aBool == EFalse
-*/	
-void CSpudNetSideTestBase::TestBooleanTrueL(TBool aBool, const TDesC& aMsg)
-	{
-	if(aBool)
-		{
-		INFO_PRINTF2(_L("[%S]. Value is true, as expected. OK."), &aMsg);
-		}
-	else
-		{
-		ERR_PRINTF2(_L("Failed: [%S]. Value is false. Leaving with KErrGeneral)."), &aMsg);
-		User::Leave(KErrGeneral);
-		}
-	}
-	
-/**
-Starts only the primary PDP context by explicitly starting a network interface.
-
-@leave if the interface start error is not what is expected. 
-*/
-void CSpudNetSideTestBase::StartPrimaryOnlyL()
-	{
-	TInt primaryCreationErr(KErrNone);
-	TInt primaryIapId(0);
-	if(!GetIntFromConfig(ConfigSection(), _L("PrimaryIapId1"), primaryIapId) ||
-	   !GetIntFromConfig(ConfigSection(), _L("PrimaryActivationErr1"), primaryCreationErr))
-		{
-		User::Leave(KErrNotFound);
-		}
-	
-	TCommDbConnPref iap1prefs;
-    iap1prefs.SetIapId(primaryIapId);	
-	TestL(iInterface.Open(iEsock), _L("RConnection::Open on interface"));
-	TestL(iInterface.Start(iap1prefs),primaryCreationErr, _L("RConnection::Start on interface"));
-	}
-
-/**
-Opens a socket, binds it, connects it to the destination.
-N.B. This socket is NOT explicitly bound to the primary PDP context
-
-@leave if the socket cannot be opened.
-*/
-void CSpudNetSideTestBase::OpenPrimarySocketL()
-	{
-	TestL(iSocket.Open(iEsock, KAfInet, KSockDatagram, KProtocolInetUdp), _L("RSocket::Open"));
-	TInetAddr localAddr;
-	localAddr.SetPort(KConfiguredTftFilter1DestPort);
-	TestL(iSocket.Bind(localAddr), _L("Binding the local Socket"));
-	
-	
-	TInetAddr dstAddr;
-	dstAddr.SetPort(KConfiguredTftFilter1SrcPort);
-	dstAddr.Input(KConfiguredTftFilter1SrcAddr);
-	
-	TRequestStatus status;
-	iSocket.Connect(dstAddr, status);
-	User::WaitForRequest(status);
-	TestL(status.Int(), _L("RSocket::Connect status opening primary socket"));
-	}
-
-/**
-Causes GUQoS to activate a secondary PDP context
-
-@leave if the secondary cannot be activated 
-*/
-void CSpudNetSideTestBase::StartSecondaryL()
-	{
-#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-	// get IAP no. from config, added for R4 and R5 tests,
-	// If there isn't an IAP number in the .ini file, default to PDPIAP
-	TInt iap;
-	if(!GetIntFromConfig(ConfigSection(), _L("PrimaryIapId1"), iap))
-			{
-			iap = PDPIAP;
-			}
-
-	VerifySubconnectionCountL(_L("SubConnectionCount1"), iap);
-
-	ReadQosParameterSettingsFromConfigL();
-#endif
-	
-	InitiateSecondaryStartL();
-
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-	WaitForQoSEventL(_L("SecondaryActivationEvent2"),_L("SecondaryActivationEvent2Reason"));
-#else
-	User::After(KTimeToStartSecondary);
-	VerifySubconnectionCountL(_L("SubConnectionCount2"), iap);
-#endif
-	}
-
-#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-void CSpudNetSideTestBase::VerifySubconnectionCountL(const TDesC& aSubConnDesc, TUint aIap)
-	{
-	TInt count;
-	if(!GetIntFromConfig(ConfigSection(), aSubConnDesc, count))
-		{
-		ERR_PRINTF2(_L("Failed to subconnection count (%S) from the config file."), &aSubConnDesc);
-		User::Leave(KErrNotFound);
-		}
-	VerifySubconnectionCountL(count, aIap);
-	}
-
-void CSpudNetSideTestBase::VerifySubconnectionCountL(TUint aSubConnectionCount, TUint aIap)
-	{
-	TUint count;
-
-	RConnection conn;
-
-	User::LeaveIfError(conn.Open(iEsock));
-	CleanupClosePushL(conn);
-	
-	User::LeaveIfError(conn.EnumerateConnections(count));
-	if (count)
-	    {
-	    TConnectionInfo tconninfo;
-	    TPckg<TConnectionInfo> conninfo(tconninfo);
-	    
-        while(count>0)
-            {            
-    	    User::LeaveIfError(conn.GetConnectionInfo(count, conninfo));
-    	    if (tconninfo.iIapId == aIap)
-        	    {
-        	    break;   
-        	    }
-        	    
-        	count--;
-            }
-            
-        if (count)
-            {
-    	    User::LeaveIfError(conn.Attach(conninfo, RConnection::EAttachTypeMonitor));
-    	    User::After(5000);
-    	    User::LeaveIfError(conn.EnumerateSubConnections(count));
-            }
-	    }
-	CleanupStack::PopAndDestroy(&conn);
-	
-	// if count is 0, then there are 0 connection and therefore 0 subconnections
-	INFO_PRINTF3(_L("Expected Subconnection count [%d]  Actual Subconnection count [%d]"), aSubConnectionCount, count);
-	TestL(count == aSubConnectionCount, ETrue, _L("Comparing subconnection count."));
-	}
-
-void CSpudNetSideTestBase::ClearPolicySelector2QosParametersTableL()
-	{
-	CommsDat::CMDBSession* dbSession;
-#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-	dbSession = CMDBSession::NewL(KCDVersion1_2);
-#else
-	dbSession = CMDBSession::NewL(KCDVersion1_1);
-#endif
-	CleanupStack::PushL(dbSession);
-
-	/* delete all records for this policy selector */
-	CMDBRecordSet<CCDPolicySelector2ParamsRecord>* records =
-		new(ELeave) CMDBRecordSet<CCDPolicySelector2ParamsRecord>(KCDTIdPolicySelector2ParamsRecord);
-	CleanupStack::PushL(records);
-	
-	TRAPD(err, records->LoadL(*dbSession));
-	if (err == KErrNone)
-		records->DeleteL(*dbSession);
-	CleanupStack::PopAndDestroy(records);
-	
-	CleanupStack::PopAndDestroy(dbSession);
-	}
-
-void CSpudNetSideTestBase::UpdatePolicySelector2QosParametersTableL(TUint aPolicySelector, TUint aQosParameter)
-	{
-	ClearPolicySelector2QosParametersTableL();
-		
-	CommsDat::CMDBSession* dbSession;
-#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-	dbSession = CMDBSession::NewL(KCDVersion1_2);
-#else
-	dbSession = CMDBSession::NewL(KCDVersion1_1);
-#endif
-
-	CleanupStack::PushL(dbSession);
-	
-	CCDPolicySelector2ParamsRecord* newrec =
-		static_cast<CCDPolicySelector2ParamsRecord*>(CCDRecordBase::RecordFactoryL(KCDTIdPolicySelector2ParamsRecord));
-	CleanupStack::PushL(newrec);
-	newrec->SetRecordId(KCDNewRecordRequest);
-	newrec->iPolicySelectorId = aPolicySelector;
-	newrec->iParamsId = aQosParameter;
-
-	newrec->StoreL(*dbSession);
-	CleanupStack::PopAndDestroy(newrec);
-
-	CleanupStack::PopAndDestroy(dbSession);
-	}
-#endif
-
-/**
-Initiates the start (creation & activation) of a secondary PDP context, but does not wait/verify that the context
-was actually created / activated 
-
-@leave if the start cannot be initiated: a socket cannot be opened, etc
-*/
-void CSpudNetSideTestBase::InitiateSecondaryStartL()
-	{
-#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-	ReadQosParameterSettingsFromConfigL();
-
-	UpdatePolicySelector2QosParametersTableL(iPolicySelector, iQosParametersRecord);
-#endif
-	
-	TestL(iSocket.Open(iEsock, KAfInet, KSockDatagram, KProtocolInetUdp), _L("RSocket::Open"));
-	TInetAddr localAddr;
-	localAddr.SetPort(KConfiguredTftFilter1DestPort);
-	TestL(iSocket.Bind(localAddr), _L("Binding the local Socket"));
-	
-	TInetAddr dstAddr;
-	dstAddr.SetPort(KConfiguredTftFilter1SrcPort);
-	dstAddr.Input(KConfiguredTftFilter1SrcAddr);
-
-	TRequestStatus status;
-	iSocket.Connect(dstAddr, status);
-	User::WaitForRequest(status);
-	TestL(status.Int(), _L("Connecting to local socket"));
-
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-	TQoSSelector selector;
-	selector.SetAddr(iSocket);
-	TestL(iQoSPolicy_1.Open(selector), _L("Opening Policy"));
-	TestL(iQoSPolicy_1.NotifyEvent(*this), _L("Requesting Event notification on QosChannel"));
-	
-	CQoSParameters *parameters = new(ELeave) CQoSParameters;
-	CleanupStack::PushL(parameters);
-	
-	SetQoSParameters(*parameters);
-	
-	TestL(iQoSPolicy_1.SetQoS(*parameters), _L("Setting Qos Parameters"));
-	
-	WaitForQoSEventL(_L("SecondaryActivationEvent1"),KErrNone);
-
-	CleanupStack::PopAndDestroy(parameters);
-#endif
-	}
-	
-	
-
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-//This method must be called after StartSecondaryL() is called.
-void CSpudNetSideTestBase::ChangeQoSL()
-	{
-
-	CQoSParameters *parameters = new(ELeave) CQoSParameters;
-	CleanupStack::PushL(parameters);
-	 
-	SetQoSParameters1(*parameters);
-		
-	TestL(iQoSPolicy_1.SetQoS(*parameters), _L("Setting Qos Parameters"));
-
-	WaitForOptionalQoSEventL(_L("ExpQoSEvent1"), _L("ExpQoSEvent1Reason"), _L("OptionalQoSEvent1"), _L("OptionalQoSEvent1Reason"));
-	
-	WaitForQoSEventL(_L("ExpQoSEvent2"),_L("ExpQoSEvent2Reason"));
-	
-	CleanupStack::PopAndDestroy(parameters);
-	}
-#endif	
-
-	
-/**
-Initialize a port on a loopback CSY (of some sort)
-
-@leave if the port cannot be opened
-*/	
-void CSpudNetSideTestBase::InitLoopbackL(const TDesC& aLoopbackPortName)
-	{
-	TestL(iCommServer.Connect(), _L("Connecting to Comm server"));
-	TestL(iCommServer.LoadCommModule(KCsyName), _L("Loading CSY"));
-
-	TCommRole commRole = RetrieveCommRoleFromConfigL(_L("CommRole"));
-	TestL(iLoopbackPort.Open(iCommServer, aLoopbackPortName, ECommExclusive, commRole), _L("Opening loopback port"));
-	}
-	
-void CSpudNetSideTestBase::SendUntilTimeoutL()
-	{
-	TBuf8<KCommReadBufSize> commReadBuf;
-	ASSERT(iLoopbackPort.SubSessionHandle());
-
-	TRequestStatus sendStatus, readStatus;
-	TInt maxIterations = 10;
-	// we try sending a packet a number of times, because the first packet may be sent
-	// before Etel has notified the SPUD of a change in context status
-	do
-		{
-		// small delay to allow Etel to notify SPUD of change in status
-		User::After(100000);
-		iSocket.Send(KCommWriteData, 0, sendStatus);
-		User::WaitForRequest(sendStatus);
-		TestL(sendStatus.Int(), _L("Socket send status"));
-
-		// ensure the packet was sent by reading from the loopback COMM port
-		// opposite the current context's COMM port
-		iLoopbackPort.Read(readStatus, KReadDelay, commReadBuf);
-		User::WaitForRequest(readStatus);
-		maxIterations--;
-		} while ( (readStatus == KErrNone) && (maxIterations > 0) );
-	
-	TestL(readStatus.Int(), KErrCancel, _L("Send timed-out"));
-	}
-	
-void CSpudNetSideTestBase::SendSinglePacketL()
-	{
-	TBuf8<KCommReadBufSize> commReadBuf;
-	ASSERT(iLoopbackPort.SubSessionHandle());
-
-	TRequestStatus sendStatus, readStatus;
-	iSocket.Send(KCommWriteData, 0, sendStatus);
-	User::WaitForRequest(sendStatus);
-	TestL(sendStatus.Int(), _L("Primary socket send status"));
-	
-	// ensure the packet was sent by reading from the loopback COMM port
-	// opposite the current context's COMM port
-	iLoopbackPort.Read(readStatus, KReadDelay, commReadBuf);
-	User::WaitForRequest(readStatus);
-
-	TestL(readStatus.Int(), _L("Send status"));
-	// make sure the received length is greater than the sent length
-	TInt sentLength = ((TDesC8)KCommWriteData).Length();
-	TestL((commReadBuf.Length() >= sentLength) ? KErrNone : KErrCorrupt, _L("Received length is greater than sent length"));
-	}
-	
-void CSpudNetSideTestBase::StopPrimary()
-	{
-	iLoopbackPort.Close();
-	iCommServer.Close();
-	iSocket.Close();
-	}
-
-/**
-Stops the secondary PDP context. 
-After this method returns, GUQoS has initiated its timeout before actually deleting the context. 
-That is, when this method returns, the context itself is still active 
-
-@leave if the procedure cannot be completed successfully.
-*/
-void CSpudNetSideTestBase::StopSecondaryL()
-	{
-	iLoopbackPort.Close();
-	iCommServer.Close();
-
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-	TestL(iQoSPolicy_1.CancelNotifyEvent(*this), _L("Cancelling QoS Notify"));
-	TestL(iQoSPolicy_1.Close(), _L("Closing QoS Channel"));
-#endif
-	iSocket.Close();
-	}
-	
-
-/**
-Retrieves a QoS event from the config file, based on the parameter name
-
-@param aQosEventReq the name of the parameter
-@leave if the event cannot be retrieved, or is unrecognized.
-*/
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-enum TQoSEvent CSpudNetSideTestBase::RetrieveQosEventFromConfigL(const TDesC& aQosEventReq)
-	{
-	TPtrC qosEventName;
-	if(!GetStringFromConfig(ConfigSection(), aQosEventReq, qosEventName))
-		{
-		ERR_PRINTF2(_L("Failed to read [%S] from the config file."), &aQosEventReq);
-		User::Leave(KErrNotFound);
-		}
-		
-	if(qosEventName.Compare(TPtrC(_L("EQoSEventFailure"))) == 0)
-		{
-		return EQoSEventFailure;
-		}
-	else if(qosEventName.Compare(TPtrC(_L("EQoSEventConfirm"))) == 0)
-		{
-		return EQoSEventConfirm;
-		}
-	else if(qosEventName.Compare(TPtrC(_L("EQoSEventAdapt"))) == 0)
-		{
-		return EQoSEventAdapt;
-		}
-	else if(qosEventName.Compare(TPtrC(_L("EQoSEventJoin"))) == 0)
-		{
-		return EQoSEventJoin;
-		}
-	else if(qosEventName.Compare(TPtrC(_L("EQoSEventAddPolicy"))) == 0)
-		{
-		return EQoSEventAddPolicy;
-		}
-	else
-		{
-		ERR_PRINTF2(_L("Unrecognized event[%S] requested. Leaving with KErrArgument."), &qosEventName);
-		User::Leave(KErrArgument);
-		}
-	return EQoSEventConfirm;
-	};
-#endif
-
-/**
- Must be called after simtsy has been initialized.
- Instructs the simtsy to complete a given request/notification. The supported commands are given in TEtelRequestType.
- The parameter supplied in aNewValue instructs the simtsy what data from the config.txt to use in the completion of the request.
- The aNewValue is the index to the entry to be used to complete the request for the current test step section, ie if aNewValue
- is 0, iTestNumber is 3, and aEtelCommand is ENetworkQoSChange, the entry will complete any NotifyNetworkQoSChange calls
- with data from the first QosProfileReqR99 entry of section [test3] in the config.txt file
-*/
-void CSpudNetSideTestBase::EtelRequestL(TEtelRequestType aEtelCommand, TInt aNewValue)
-	{
-	INFO_PRINTF3(_L("EtelRequest: aEtelCommand = %d, aNewValue = %d"), aEtelCommand, aNewValue);
-
-	TUint key(0);
-	
-	switch (aEtelCommand)
-		{
-	case ENetworkQoSChange:
-		key = KPSSimTsyNetworkQoSChange;
-		break;
-	case ENetworkChangeRegStatus:
-		key = KPSSimtsyPacketServiceNtwkRegStatusChange;
-		break;
-	case EContextStatusChange:
-		key = KPSSimtsyPacketContextStatusChange;
-		break;
-	default:
-		ASSERT(EFalse);		
-		}
-
-  	// simtsy will listen for any changes to the property, and complete the corresponding request
-	TestL(RProperty::Set(KUidPSSimTsyCategory, key, aNewValue), _L("Request to trigger SimTsy event issued."));
-	}
-
-/**
-Dummy test step: Used to make sure that ESock server did not crash 
-
-@leave does not leave
-*/
-enum TVerdict CESockCheck::RunTestStepL()
-	{
-	INFO_PRINTF1(_L("SUCCESS: Could not detect Esock crash as a result of the previous test."));
-	return EPass;
-	}
-
-/**
-Tests creation of the primary PDP context by explicitly starting the interface 
-
-@leave if the test fails.
-*/
-enum TVerdict CSpudPrimary::RunTestStepL()
-	{
-	StartPrimaryOnlyL();	
-	iInterface.Stop();
-	iInterface.Close();	
-	
-	return EPass;
-	}
-
-/**
-Test operation of the primary PDP context when there is a network side event
-
-@leave if the test fails.
-*/	
-enum TVerdict CSpudPrimaryEvent::RunTestStepL()
-	{
-	TInt idx				 = RetrieveNetSideEventValFromConfigL(_L("QoSEventReq1Idx"));
-	TEtelRequestType request = RetrieveNetSideEventRequestFromConfigL(_L("QoSEventReq1"));
-	
-	TInt expProgress(0);
-	TInt expErrorCode(0);
-	if(!GetIntFromConfig(ConfigSection(), _L("ExpectedNifProgress"), expProgress) ||
-	   !GetIntFromConfig(ConfigSection(), _L("ExpectedNifError"), expErrorCode))
-		{
-		User::Leave(KErrNotFound);
-		}
-	
-	StartPrimaryOnlyL();	
-	
-
-	TRequestStatus progressReqSt;	
-	iInterface.ProgressNotification(iProgressBuf, progressReqSt, static_cast<TUint>(expProgress));
-	
-	EtelRequestL(request, idx); // Will fire after we register for notifications	
-	WaitForProgressNotificationL(progressReqSt, expProgress, expErrorCode); // We can wait here forever. Set timeout on test step.
-	if(KLinkLayerClosed == expProgress) // The Nif is expected to shutdown, so if we are here, then the NIF is down.
-		{
-		// N.B.
-		// At this point the NIF is down, and all the associated data structures in ESock server / Nifman are in 
-		// the process of being deleted, or have been deleted already.
-		// Calling *anything* on the NIF itself is no longer possible, because there is no NIF.
-		// Typically, ESock will react with KErrNotReady(-18) to these attempts.
-		// Because of timing issues (ESock thread vs. TestExecute thread), especially on hardware,
-		// ESock client-side objects may not be yet aware of that, and return KErrNone.  This makes testing for the 
-		// return error codes problematic.
-		// In any case, calling Stop() on the NIF is inappropriate. Close() closes the client-side handle,
-		// which is OK.
-		iInterface.Close();
-		}
-	else // The interface was not stopped. We should stop it now and verity that is was OK.
-		{
-		TestL(iInterface.Stop(), _L("Shutting down the interface using RConnection::Stop()"));
-		}
-	
-	return EPass;
-	}
-
-/**
-Test of the primary PDP context progress. 
-
-@leave if the test fails.
-*/
-enum TVerdict CSpudPrimaryContextEventProgress::RunTestStepL()
-    {    
-    StartPrimaryOnlyL();
-    /*
-     * After opening & starting the connection, the connection goes through various states:
-     * Those are KStartingSelection->KFinishedSelection->KPsdStartingConfiguration->KPsdFinishedConfiguration
-     * ->KStartingConnection->KConnectionOpen->KLinkLayerOpen.
-     * But if DHCP is enabled, then after KConnectionOpen the connection goes through these states.
-     * KConfigDaemonLoading->KConfigDaemonLoaded->KConfigDaemonStartingRegistration
-     * ->KConfigDaemonFinishedRegistration->KLinkLayerOpen.
-    */
-    TRequestStatus progressReqSt;   
-    iInterface.ProgressNotification(iProgressBuf, progressReqSt);
-    
-    User::WaitForRequest(progressReqSt);
-    TestL(iProgressBuf().iStage, KStartingSelection,  _L("RConnection Stage KStartingSelection"));
-    
-    iInterface.ProgressNotification(iProgressBuf, progressReqSt);
-    User::WaitForRequest(progressReqSt);
-    TestL(iProgressBuf().iStage, KFinishedSelection,  _L("RConnection Stage KFinishedSelection"));
-    
-    iInterface.ProgressNotification(iProgressBuf, progressReqSt);
-    User::WaitForRequest(progressReqSt);
-    TestL(iProgressBuf().iStage, KPsdStartingConfiguration,  _L("RConnection Stage KPsdStartingConfiguration"));
-    
-    iInterface.ProgressNotification(iProgressBuf, progressReqSt);
-    User::WaitForRequest(progressReqSt);
-    TestL(iProgressBuf().iStage, KPsdFinishedConfiguration,  _L("RConnection Stage KPsdFinishedConfiguration"));
-    
-    iInterface.ProgressNotification(iProgressBuf, progressReqSt);
-    User::WaitForRequest(progressReqSt);
-    TestL(iProgressBuf().iStage, KPsdStartingActivation,  _L("RConnection Stage KPsdStartingActivation"));
-    
-    iInterface.ProgressNotification(iProgressBuf, progressReqSt);
-    User::WaitForRequest(progressReqSt);
-    TestL(iProgressBuf().iStage, KPsdFinishedActivation,  _L("RConnection Stage KPsdFinishedActivation"));
-    
-    iInterface.ProgressNotification(iProgressBuf, progressReqSt);
-    User::WaitForRequest(progressReqSt);
-    TestL(iProgressBuf().iStage, KLinkLayerOpen,  _L("RConnection Stage KLinkLayerOpen"));
-
-    iInterface.Stop();
-
-    iInterface.ProgressNotification(iProgressBuf, progressReqSt);
-    User::WaitForRequest(progressReqSt);
-    TestL(iProgressBuf().iStage, KPsdStartingDeactivation,  _L("RConnection Stage KPsdStartingDeactivation"));
-
-    iInterface.ProgressNotification(iProgressBuf, progressReqSt);
-    User::WaitForRequest(progressReqSt);
-    TestL(iProgressBuf().iStage, KPsdFinishedDeactivation,  _L("RConnection Stage KPsdFinishedDeactivation"));
-
-    iInterface.ProgressNotification(iProgressBuf, progressReqSt);
-    User::WaitForRequest(progressReqSt);
-    TestL(iProgressBuf().iStage, KLinkLayerClosed,  _L("RConnection Stage KLinkLayerClosed"));
-
-    iInterface.Close(); 
-
-    return EPass;
-    }
-
-/**
-Test suspension of a PDP context.
-
-@leave if the test fails.
-*/	
-enum TVerdict CSpudSuspendContext::RunTestStepL()
-	{
-	TInt idx1 = RetrieveNetSideEventValFromConfigL(_L("QoSEventReq1Idx"));
-
-	// retrieve whether we are testing a primary or secondary context
-	TContextType contextType = RetrieveContextTypeFromConfigL(_L("ContextType"));
-
-	// retrieve the port opposite the context being tested from the loopback configuration file
-	TPtrC loopbackPortName;
-	if(!GetStringFromConfig(ConfigSection(), _L("LoopbackPort"), loopbackPortName))
-		{
-		INFO_PRINTF1(_L("NetSide event [LoopbackPort] not in config. Leaving with KErrNotFound"));
-		User::Leave(KErrNotFound);
-		}
-		
-	TRequestStatus status;
-
-	if (EPrimaryContext == contextType)
-		{
-		// Open a primary context specifying the RConnection explicitly so we can also test
-		// RConnection::ProgressNotification to ensure KDataTransferTemporarilyBlocked is sent
-		// when the primary PDP context is suspended.
-		StartPrimaryOnlyL();
-
-		TestL(iSocket.Open(iEsock, KAfInet, KSockDatagram, KProtocolInetUdp, iInterface), _L("RSocket::Open"));
-		TInetAddr localAddr;
-		localAddr.SetPort(KConfiguredTftFilter1DestPort);
-		TestL(iSocket.Bind(localAddr), _L("Binding the local Socket"));
-		
-		TInetAddr dstAddr;
-		dstAddr.SetPort(KConfiguredTftFilter1SrcPort);
-		dstAddr.Input(KConfiguredTftFilter1SrcAddr);
-		
-		iSocket.Connect(dstAddr, status);
-		User::WaitForRequest(status);
-		TestL(status.Int(), _L("RSocket::Connect status opening primary socket"));
-		}
-	else if (ESecondaryContext == contextType)
-		{
-		StartSecondaryL();
-		}
-	else
-		{
-		User::Leave(KErrGeneral);
-		}
-	
-	// start loopback port that packets for the current context will be sent to
-	InitLoopbackL(loopbackPortName);
-	
-	// the SPUD may not have created the first context until the first packet is sent
-	SendSinglePacketL();
-	
-	TNifProgressBuf progress;
-
-	// Request a progress notification for a primary context - we should be notified if the PDP context is suspended.
-	if (EPrimaryContext == contextType)
-		{
-		iInterface.ProgressNotification(progress, status);
-		}
-	
-	// trigger suspending the context
-	EtelRequestL(EContextStatusChange, idx1);
-	
-	// ensure that the context does not send packets
-	SendUntilTimeoutL();
-
-	// Keep waiting until a KDataTransferTemporarilyBlocked progress notification from a
-	// primary context is received or the test step is timed out indicating failure.
-	if (EPrimaryContext == contextType)
-		{
-		User::WaitForRequest( status );
-		while( progress().iStage != KDataTransferTemporarilyBlocked )
-			{
-			iInterface.ProgressNotification(progress, status);
-			User::WaitForRequest( status );
-			}
-		}
-	
-	TInt idx2 = RetrieveNetSideEventValFromConfigL(_L("QoSEventReq2Idx"));
-	
-	// trigger resuming the context
-	EtelRequestL(EContextStatusChange, idx2);
-	
-	// ensure we can again send packets
-	SendSinglePacketL();
-	
-	if (EPrimaryContext == contextType)
-		{
-		iInterface.Stop();
-		iInterface.Close();	
-
-		StopPrimary();
-		}
-	else if (ESecondaryContext == contextType)
-		{
-		StopSecondaryL();
-		}
-	
-	return EPass;
-	}
-
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-/**
-Test operation of the secondary PDP context when there is a network side event
-
-@leave if the test fails.
-*/	
-enum TVerdict CSpudSecondaryEvent::RunTestStepL()
-	{
-	
-	TInt idx				 = RetrieveNetSideEventValFromConfigL(_L("QoSEventReq1Idx"));
-	TEtelRequestType request = RetrieveNetSideEventRequestFromConfigL(_L("QoSEventReq1"));
-	
-	StartSecondaryL();  
-	
-	EtelRequestL(request, idx);
-
-	WaitForOptionalQoSEventL(_L("ExpQoSEvent1"),_L("ExpQoSEvent1Reason"), _L("OptionalQoSEvent1"), _L("OptionalQoSEvent1Reason"));
-
-	StopSecondaryL();	
-		
-	return EPass;
-	}
-#endif
-
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-/**
-Test operation of the secondary PDP context when there are 2 network side events.
-
-@leave if the test fails.
-*/	
-enum TVerdict CSpudTwoSecondaryEvents::RunTestStepL()
-	{
-	TInt idx1				  = RetrieveNetSideEventValFromConfigL(_L("QoSEventReq1Idx"));
-	TEtelRequestType request1 = RetrieveNetSideEventRequestFromConfigL(_L("QoSEventReq1"));
-	
-	StartSecondaryL();
-	EtelRequestL(request1, idx1);
-
-	WaitForQoSEventL(_L("ExpQoSEvent1"),_L("ExpQoSEvent1Reason"));
-	
-	TInt idx2				  = RetrieveNetSideEventValFromConfigL(_L("QoSEventReq2Idx"));
-	TEtelRequestType request2 = RetrieveNetSideEventRequestFromConfigL(_L("QoSEventReq2"));
-	
-	EtelRequestL(request2, idx2);
-
-	StopSecondaryL();
-	
-	return EPass;
-	};
-#endif
-
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-/**
-Test operation of the secondary PDP context when there is a network side event, but after
-the context was stopped (i.e. it is being deactivated / deleted / etc)
-
-@leave if the test fails.
-*/
-enum TVerdict CSpudSecondaryEvent2::RunTestStepL()
-	{
-	TInt idx1				  = RetrieveNetSideEventValFromConfigL(_L("QoSEventReq1Idx"));
-	TEtelRequestType request1 = RetrieveNetSideEventRequestFromConfigL(_L("QoSEventReq1"));
-	
-	StartSecondaryL();
-	EtelRequestL(request1, idx1);
-
-	WaitForQoSEventL(_L("ExpQoSEvent1"),_L("ExpQoSEvent1Reason"));
-
-	StopSecondaryL();
-	
-	TInt idx2				  = RetrieveNetSideEventValFromConfigL(_L("QoSEventReq2Idx"));
-	TEtelRequestType request2 = RetrieveNetSideEventRequestFromConfigL(_L("QoSEventReq2"));
-	
-	StartSecondaryL(); // reopen the context on the same SPUD
-	EtelRequestL(request2, idx2);
-
-	WaitForQoSEventL(_L("ExpQoSEvent2"),_L("ExpQoSEvent2Reason"));
-
-	StopSecondaryL();
-	
-	return EPass;
-	};
-#endif
-
-/**
-Test operation of the secondary PDP context when there are no network-side events.
-
-@leave if the test fails.
-*/	
-enum TVerdict CSpudSecondary::RunTestStepL()
-	{
-	StartSecondaryL();
-	StopSecondaryL();
-	
-	return EPass;	
-	};
-	
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-/**
-Test operation of the secondary PDP context when QoS is changed after the context was activated
-
-@leave if the test fails.
-*/
-enum TVerdict CSpudSecondaryChangeQoS::RunTestStepL()
-	{
-	INFO_PRINTF1(_L("CSpudSecondaryChangeQoS test start"));
-	
-	StartSecondaryL();
-	ChangeQoSL();
-	StopSecondaryL();
-	return EPass;	
-	};
-#endif // SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-
-/**
-Test the operation of the primary PDP context when there is an event when the lower NIF for the primary is being started
-
-@leave if the test fails.
-*/
-enum TVerdict CSpudPrimaryEventOnLowerNifStarting::RunTestStepL()
-	{
-	TInt idx				 = RetrieveNetSideEventValFromConfigL(_L("QoSEventReq1Idx"));
-	TEtelRequestType request = RetrieveNetSideEventRequestFromConfigL(_L("QoSEventReq1"));
-	
-	TInt expProgress(0);
-	TInt expErrorCode(0);
-	TInt primaryIapId(0);
-	TInt millisBeforeEvent(0);
-	if(!GetIntFromConfig(ConfigSection(), _L("PrimaryIapId1"), primaryIapId) ||
-	   !GetIntFromConfig(ConfigSection(), _L("MillisBeforeEvent"), millisBeforeEvent) ||
-	   !GetIntFromConfig(ConfigSection(), _L("ExpectedNifProgress"), expProgress) ||
-	   !GetIntFromConfig(ConfigSection(), _L("ExpectedNifError"), expErrorCode)) 
-		{
-		User::Leave(KErrNotFound);
-		}
-	
-	TRequestStatus startReq;
-	TCommDbConnPref iap1prefs;
-    iap1prefs.SetIapId(primaryIapId);	
-	TestL(iInterface.Open(iEsock), _L("RConnection::Open on interface"));
-	iInterface.Start(iap1prefs, startReq);
-	
-	
-	//register for progress notification
-	TRequestStatus progressReqSt;	
-	iInterface.ProgressNotification(iProgressBuf, progressReqSt, KFinishedSelection);
-	WaitForProgressNotificationL(progressReqSt, KFinishedSelection, KErrNone);
-		
-	iInterface.ProgressNotification(iProgressBuf, progressReqSt, expProgress);
-		
-	User::After(millisBeforeEvent);		
-	EtelRequestL(request, idx);
-	WaitForProgressNotificationL(progressReqSt, static_cast<TUint>(expProgress), expErrorCode);
-	
-	iInterface.Close(); 
-	return EPass;
-	};
-
-
-/**
-Test RConnection::Stop on Spud, when Spud is processing network-side event, and potentially there are
-requests outstanding on Etel
-
-@leave if the test fails.
-*/
-enum TVerdict CSpudPrimaryInterfaceEventStop::RunTestStepL()
-	{
-	TInt idx				 = RetrieveNetSideEventValFromConfigL(_L("QoSEventReq1Idx"));
-	TEtelRequestType request = RetrieveNetSideEventRequestFromConfigL(_L("QoSEventReq1"));
-	
-	TInt primaryIapId(0);
-	if(!GetIntFromConfig(ConfigSection(), _L("PrimaryIapId1"), primaryIapId)) 
-		{
-		User::Leave(KErrNotFound);
-		}
-	
-	TRequestStatus startReq;
-	TCommDbConnPref iap1prefs;
-    iap1prefs.SetIapId(primaryIapId);	
-	TestL(iInterface.Open(iEsock), _L("RConnection::Open on interface"));
-	iInterface.Start(iap1prefs, startReq);
-	
-	TInt primStartErr(KErrNone);
-	if(GetIntFromConfig(ConfigSection(), _L("PrimaryStartErr1"), primStartErr))
-		{
-		User::WaitForRequest(startReq);
-		TestL(startReq.Int(), primStartErr, _L("Interface started."));
-		}
-		
-	EtelRequestL(request, idx);
-	
-	StopInterfaceL(); // Stop the interface when SPUD is processing the Etel event. 
-	return EPass;
-	};
-
-/**
-Test RConnection:Stop on Spud, when the primary PDP context is being started.
-
-@leave if the test fails.
-*/
-enum TVerdict CSpudPrimayStartingStop::RunTestStepL()
-	{
-	TInt primaryCreationErr(KErrNone);
-	TInt primaryIapId(0);
-	if(!GetIntFromConfig(ConfigSection(), _L("PrimaryIapId1"), primaryIapId) ||
-	   !GetIntFromConfig(ConfigSection(), _L("PrimaryActivationErr1"), primaryCreationErr))
-		{
-		User::Leave(KErrNotFound);
-		}
-	TCommDbConnPref iap1prefs;
-    iap1prefs.SetIapId(primaryIapId);	
-	TestL(iInterface.Open(iEsock), _L("RConnection::Open on interface"));
-	
-	// start then stop the interface
-	TRequestStatus startStatus;
-	iInterface.Start(iap1prefs, startStatus);
-	// wait for enough time to be initialising the phone
-	User::After(5000000);
-	iInterface.Stop();
-	User::WaitForRequest(startStatus);
-	TestL(startStatus.Int(), primaryCreationErr, _L("RConnection::Start on interface"));
-
-	iInterface.Close();	
-	
-	return EPass;	
-	}
-
-/**
-Test RConnection:Stop on Spud, when the secondary PDP context is being started.
-
-@leave if the test fails.
-*/
-enum TVerdict CSpudSecondaryStartingStop::RunTestStepL()
-	{
-
-	InitiateSecondaryStartL();
-	User::After(KTimeToStartSecondary);
-	// We don't know for sure when the secondary is being activated (as opposed to TFT set, etc).
-	// So, we must set the stop wait + activation wait to be large enough to mask the timing 
-	// differences on different platforms, especially, hw vs emulator.
-	StopInterfaceL();  // QoSConfirm never comes, we stop the interface before it.
-	
-	// Don't leave QoS lingering.
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-	TestL(iQoSPolicy_1.CancelNotifyEvent(*this), _L("Cancelling QoS Notify"));
-	TestL(iQoSPolicy_1.Close(), _L("Closing QoS Channel"));
-#endif
-	
-	iSocket.Close();
-	
-	return EPass;	
-	}
-
-
-/**
-Test RConnection:Stop on Spud, when the lower NIF for secondary PDP context has reported LinkLayerDown, and Spud
-has requests outstading to handle it.
-
-@leave if the test fails.
-*/
-enum TVerdict CSpudSecondaryLowerNifDownStop::RunTestStepL()
-	{
-	StartSecondaryL();
-	
-	TInt loopbackPort;
-	if(!GetIntFromConfig(ConfigSection(), _L("SecondaryLoopbackPort"), loopbackPort))
-		{
-		User::Leave(KErrNotFound);
-		}
-	FailNextPktLoopbackCsyWriteL(loopbackPort, KErrCompletion);
-	TRequestStatus sendStatus;
-	iSocket.Send(KCommWriteData, 0, sendStatus);
-	User::WaitForRequest(sendStatus);
-	TestL(sendStatus.Int(), _L("Sent data on socket to cause Lower NIF LinkLayerDown"));
-	
-	// LinkLayerDown was called, secondary context deletion is outstanding. 
-	// We sneak in and stop the entire interface.
-	// We don't bother listening for QoS failure in this particular test.
-	StopInterfaceL();
-	
-	StopSecondaryL();
-	
-	return EPass;
-	}
-
-/**
-Test RConnection:Stop on Spud, when the secondary PDP context is being deleted by GUQoS due to idle timeout.
-
-@leave if the test fails.
-*/
-enum TVerdict CSpudSecondaryInterfaceEventStop::RunTestStepL()
-	{
-	StartSecondaryL();
-	
-	// Cleanup
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-	TestL(iQoSPolicy_1.CancelNotifyEvent(*this), _L("Cancelling QoS Notify"));
-	TestL(iQoSPolicy_1.Close(), _L("Closing QoS Channel"));
-#endif
-	iSocket.Close();
-	
-	StopInterfaceL(); // Stop the entire interface.
-	
-	return EPass;
-	}
-
-/**
-Test the effects of expiry of GUQoS timeout & deletion of the secondary interface, once RConnection:Stop on Spud
-was called already.
-
-@leave if the test fails.
-*/
-enum TVerdict CSpudSecondaryInterfaceStop::RunTestStepL()
-	{
-	StartSecondaryL();
-	StopInterfaceL(); // Stop the entire interface.
-	
-	// Cleanup
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-	TestL(iQoSPolicy_1.CancelNotifyEvent(*this), _L("Cancelling QoS Notify"));
-	TestL(iQoSPolicy_1.Close(), _L("Closing QoS Channel"));
-#endif
-	iSocket.Close();
-	
-	return EPass;
-	};
-
-
-/**
-Test RConnection:Stop on Spud, when the primary PDP context is being deleted as a result of LinkLayerDown from the 
-lower NIF.
-
-@leave if the test fails.
-*/
-enum TVerdict CSpudPrimaryDeletionInterfaceStop::RunTestStepL()
-	{
-	StartPrimaryOnlyL(); // bring the primary up.
-	TestL(iSocket.Open(iEsock, KAfInet, KSockDatagram, KProtocolInetUdp, iInterface), _L("RSocket::Open"));
-	
-	TInetAddr dstAddr;
-	dstAddr.SetPort(KConfiguredTftFilter1SrcPort);
-	dstAddr.Input(KConfiguredTftFilter1SrcAddr);
-	
-	TRequestStatus status;
-	iSocket.Connect(dstAddr, status);
-	User::WaitForRequest(status);
-	TestL(status.Int(), _L("Socket connected to destination."));
-	
-	TInt loopbackPort;
-	if(!GetIntFromConfig(ConfigSection(), _L("PrimaryLoopbackPort"), loopbackPort))
-		{
-		User::Leave(KErrNotFound);
-		}
-	FailNextPktLoopbackCsyWriteL(loopbackPort, KErrCompletion);
-		
-	TRequestStatus sendStatus;
-	iSocket.Send(KCommWriteData, 0, sendStatus);
-	User::WaitForRequest(sendStatus);
-	TestL(sendStatus.Int(), 0, _L("Socket send status")); // cause the lower NIF send to fail.
-	// Keep Nifman in Long idle timeout. This is more realistic scenario.
-	// Now the lower NIF has fired LinkLayerDown, and the primary context is being deleted.
-	// Sim TSY delays the completion of the deletion request. 
-	// In the meanwhile, we sneak in and stop the interface.
-	
-	StopInterfaceL();
-	return EPass;	
-	};
-
-/**
-Test RConnection:Stop on Spud, when only the primary PDP context exists and is active (i.e. no secondaries)
-
-@leave if the test fails.
-*/	
-enum TVerdict CSpudPrimaryInterfaceStop::RunTestStepL()
-	{
-	StartPrimaryOnlyL();
-	StopInterfaceL();
-	return EPass;
-	}
-
-/**
-Stops the interface using the specified method:
-RConnection:Stop with EStopAuthoritative / EStopNormal, or Nifman idle timeout.
-The type of stop is read from the config file.
-The method connects to the interface to issue the Stop if necessary.
-The method listens for KLinkLayerClosed progress notification with the specified error.
-
-@leave if KLinkLayerClosed is not received correctly, or received with unexpected error code.
-*/
-void CSpudNetSideTestBase::StopInterfaceL()
-	{
-	TInt millisBeforeStop(0);
-	TInt ifaceStopErrCode(KErrNone);
-	TPtrC ifaceStopTypeStr;
-	if(!GetIntFromConfig(ConfigSection(), _L("MillisBeforeStop"), millisBeforeStop) ||
-	   !GetIntFromConfig(ConfigSection(), _L("IfaceStopErrCode"), ifaceStopErrCode) ||
-	   !GetStringFromConfig(ConfigSection(), _L("IfaceStopType"), ifaceStopTypeStr) )
-		{
-		User::Leave(KErrNotFound);
-		}
-	INFO_PRINTF4(_L("RConnection::Stop: pause[%d], Type[%S], Error Code[%d]"), 
-	millisBeforeStop, &ifaceStopTypeStr, ifaceStopErrCode);	
-	
-	// Attach monitor
-	RConnection ifaceMonitor;
-	TestL(ifaceMonitor.Open(iEsock), _L("Opening RConnection for monitoring"));
-	CleanupClosePushL(ifaceMonitor);
-	
-	TUint ifaceCount = 0;
-	TestL(ifaceMonitor.EnumerateConnections(ifaceCount), _L("Enumerating interfaces"));
-	ASSERT(1 == ifaceCount); // We have only 1 spud instance
-	
-	TConnectionInfo info;
-	TPckg<TConnectionInfo> ifaceInfo(info);
-	static const TInt KIfaceIdx(1); // we have one and only iface.
-	TestL(ifaceMonitor.GetConnectionInfo(KIfaceIdx, ifaceInfo), _L("Getting connection info"));
-	
-	RConnection controlConn;
-	TestL(controlConn.Open(iEsock), _L("Opening Normal Connection"));
-	CleanupClosePushL(controlConn);
-	
-	TestL(controlConn.Attach(ifaceInfo, RConnection::EAttachTypeNormal), _L("Attaching Normally"));
-	TestL(ifaceMonitor.Attach(ifaceInfo, RConnection::EAttachTypeMonitor), _L("Attaching as Monitor"));
-	
-	
-	//register for progress notification
-	TRequestStatus progressReqSt;	
-	ifaceMonitor.ProgressNotification(iProgressBuf, progressReqSt, static_cast<TUint>(KLinkLayerClosed));
-	
-	
-	User::After(millisBeforeStop);
-	INFO_PRINTF1(_L("About to stop interface."));	
-	// Shutdown the interface and get the resulting progress
-	if(ifaceStopTypeStr.Compare(TPtrC(_L("EStopNormal"))) == 0)
-		{
-		TestL(controlConn.Stop(RConnection::EStopNormal), _L("Normal Stop on the Interface"));
-		}
-	else if(ifaceStopTypeStr.Compare(TPtrC(_L("EStopAuthoritative"))) == 0)
-		{
-		TestL(controlConn.Stop(RConnection::EStopAuthoritative),_L("Authoritative Stop on the Interface"));
-		}
-	else if(ifaceStopTypeStr.Compare(TPtrC(_L("NifmanIdleTimeout")))== 0)
-		{
-		controlConn.Close();	// Let Nifman short idle timeout take the interface down for us.
-		// The monitor connection does not affect the timeout.
-		}
-	else 
-		{
-		User::Leave(KErrArgument);
-		}
-	
-		
-	WaitForProgressNotificationL(progressReqSt, KLinkLayerClosed, ifaceStopErrCode);
-	CleanupStack::PopAndDestroy(&controlConn);
-	CleanupStack::PopAndDestroy(&ifaceMonitor);
-	}
-	
-	
-//------------------------------------------------------
-// TODO?: read Qos Parameters from config file.
-// not really necessary, because it is easier to use a different section in config.txt
-// Must correspond to Sim.tsy config.txt file. These parameters are
-// negotiated by GuQoS and then the negotiated 
-// parameters are used for comparison by Sim.tsy
-//------------------------------------------------------
-
-/**
-Set the QoS parameters to value set 0
-*/
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-void CSpudNetSideTestBase::SetQoSParameters(CQoSParameters& aParameters)
-{
-	aParameters.SetUpLinkMaximumBurstSize(1024);
-	aParameters.SetUpLinkMaximumPacketSize(768);
-	aParameters.SetUplinkBandwidth(1024);
-	aParameters.SetUpLinkAveragePacketSize(768);
-	aParameters.SetUpLinkPriority(3);	
-	aParameters.SetUpLinkDelay(250);  
-
-	aParameters.SetDownLinkMaximumBurstSize(1024);		
-	aParameters.SetDownLinkMaximumPacketSize(512);
-	aParameters.SetDownlinkBandwidth(1024);
-	aParameters.SetDownLinkAveragePacketSize(512);
-	aParameters.SetDownLinkPriority(KQoSLowestPriority);
-	aParameters.SetDownLinkDelay(250);
-}
-
-/**
-Set the QoS parameters to value set 1
-*/
-void CSpudNetSideTestBase::SetQoSParameters1(CQoSParameters& aParameters)
-{
-	aParameters.SetUplinkBandwidth(1020);
-	aParameters.SetUpLinkMaximumBurstSize(896);
-	aParameters.SetUpLinkMaximumPacketSize(768);
-	aParameters.SetUpLinkDelay(250);
-	aParameters.SetUpLinkPriority(3);
-
-    aParameters.SetUpLinkAveragePacketSize(400);
-
-	aParameters.SetDownlinkBandwidth(1020);
-	aParameters.SetDownLinkMaximumBurstSize(768);
-	aParameters.SetDownLinkMaximumPacketSize(512);
-	aParameters.SetDownLinkDelay(250);
-	aParameters.SetDownLinkPriority(KQoSLowestPriority);
-
-    aParameters.SetDownLinkAveragePacketSize(400);
-}
-#endif
-
-
-/**
- Starts a primary context by starting and interface, and starts PPP instances opposite the primary context
- @leave If any of the above steps fail
-*/
-TVerdict CSpudPppPrimary::RunTestStepL()
-	{
-	TInt primarySpudIapId, firstPppIapId;
-	
-	TestBooleanTrueL(GetIntFromConfig(ConfigSection(), _L("PrimarySpudIapId"), primarySpudIapId), _L("Get Iap ID for first Ppp instance"));
-	TestBooleanTrueL(GetIntFromConfig(ConfigSection(), _L("PppIapId1"), firstPppIapId), _L("Get Iap ID for second Ppp instance"));
-
-	TCommDbConnPref primarySpudPrefs, firstPppPrefs;
-	primarySpudPrefs.SetIapId(primarySpudIapId);	
-	firstPppPrefs.SetIapId(firstPppIapId);	
-	RConnection pppInterface;
-	TestL(iInterface.Open(iEsock), _L("RConnection::Open on SPUD interface"));
-	TestL(pppInterface.Open(iEsock), _L("RConnection::Open on PPP interface"));
-	
-	TRequestStatus spudStatus, pppStatus;
-	iInterface.Start(primarySpudPrefs, spudStatus);
-	pppInterface.Start(firstPppPrefs, pppStatus);
-	User::WaitForRequest(spudStatus);
-	User::WaitForRequest(pppStatus);
-	TestL(spudStatus.Int(), KErrNone, _L("RConnection::Start on SPUD interface"));
-	TestL(pppStatus.Int(), KErrNone, _L("RConnection::Start on PPP interface"));
-	
-	return EPass;
-	}
-	
-/** Class that sets up and starts an RConnection, then receives its request completion event as an active object */
-class CConnectionStart : public CActive
-	{
-	public:
-	~CConnectionStart();
-	static CConnectionStart* NewLC(RSocketServ& aEsock, CSpudNetSideTestBase& aTestStep, TInt aIapId);
-	void RunL();
-	void DoCancel()
-		{}
-	RConnection iInterface;
-	
-	private:
-	CConnectionStart(CSpudNetSideTestBase& aTestStep);
-	void ConstructL(RSocketServ& aEsock, TInt aIapId);
-	CSpudNetSideTestBase& iTestStep;
-	TCommDbConnPref iPrefs;
-	};
-
-CConnectionStart::CConnectionStart(CSpudNetSideTestBase& aTestStep)
-	: CActive(EPriorityStandard), iTestStep(aTestStep)
-	{}
-		
-CConnectionStart::~CConnectionStart() 
-	{
-	iInterface.Close();
-
-	Cancel();
-	}
-		
-/**
- Starts a secondary context by creating a socket with QoS, starts a rawipnif instance opposite
- the secondary context, deletes the primary context then sends data on the primary context's socket
- Since the primary context is down, the data should get routed onto the secondary context
- @leave If any of the above steps fail
-*/
-
-TBool CSpudNetSideTestBase::SpudDeletePrimaryPdpL()
-{
-	RTimer GuardTimer;
-	GuardTimer.CreateLocal();			// for this thread
-	TRequestStatus TimerStatus;			// status to monitor timer
-	const TUint KWaitTimeout = 5000000;
-
-	TRequestStatus recvStatus, sendStatus;
-
-	TInetAddr spudPrimaryPort, spudSecondaryPort, secondPppPort;
-	spudSecondaryPort.SetPort(KConfiguredTftFilter1DestPort);
-	spudPrimaryPort.SetPort(KConfiguredTftFilter2DestPort);
-	secondPppPort.SetPort(KConfiguredTftFilter1SrcPort);
-	
-	RSocket primarySocket; // the secondary socket
-	TestL(primarySocket.Open(iEsock, KAfInet, KSockDatagram, KProtocolInetUdp), _L("RSocket::Open for primary context's socket"));
-	CleanupClosePushL<RSocket>(primarySocket);
-	TestL(primarySocket.Bind(spudPrimaryPort), _L("Binding the local Socket for the primary context"));
-
-	// set the dest addr to the address of the IAP corresponding to IapId entry from the config file
-	TInetAddr dstAddr;
-	dstAddr.SetPort(KConfiguredTftFilter1SrcPort);
-	dstAddr.Input(KConfiguredTftFilter1SrcAddr);
-	TRequestStatus status;
-	primarySocket.Connect(dstAddr, status);
-	User::WaitForRequest(status);
-	TestL(status.Int(), _L("Connecting to local socket for the primary context"));
-
-	// start a secondary context with QoS parameters connected to the same address as above
-	// it will use the iSocket member variable to connect to the address
-	
-#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-	User::After(10*KTimeToStartSecondary);
-	VerifySubconnectionCountL(_L("SubConnectionCount1"), PDPIAP);
-#endif
-	InitiateSecondaryStartL();
-	
-	TInt oppositeSecondaryIapId;
-	TestBooleanTrueL(GetIntFromConfig(ConfigSection(), _L("IapId"), oppositeSecondaryIapId), _L("Get Iap ID for the rawipnif instance opposite the secondary context"));
-
-	// start rawipnif instance opposite the SPUD's secondary context, and open a socket on it
-	CConnectionStart *secondaryIfStart = CConnectionStart::NewLC(iEsock, *this, oppositeSecondaryIapId);
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-	WaitForQoSEventL(_L("SecondaryActivationEvent2"), _L("SecondaryActivationEvent2Reason"));
-#else
-	User::After(KTimeToStartSecondary);
-	VerifySubconnectionCountL(_L("SubConnectionCount2"), PDPIAP);
-#endif
-	
-	RSocket oppositeSecondarySocket;
-	TestL(oppositeSecondarySocket.Open(iEsock, KAfInet, KSockDatagram, KProtocolInetUdp, secondaryIfStart->iInterface), _L("Opening socket opposite secondary context"));
-	CleanupClosePushL<RSocket>(oppositeSecondarySocket);
-	User::LeaveIfError(oppositeSecondarySocket.Bind(secondPppPort));
-		
-	// send data through the SPUD's secondary context to the rawipnif instance
-	TBuf8<KCommReadBufSize> commReadBuf;
-	oppositeSecondarySocket.RecvFrom(commReadBuf, spudSecondaryPort, 0, recvStatus);
-
-	iSocket.Send(KCommWriteData, 0, sendStatus);
-	User::WaitForRequest(sendStatus);
-
-	TestL(sendStatus.Int(), _L("Send status on secondary context"));
-
-	GuardTimer.After(TimerStatus,KWaitTimeout); 
-	//User::WaitForRequest(recvStatus);
-	User::WaitForRequest(recvStatus, TimerStatus);
-
-	GuardTimer.Cancel();
-	User::WaitForAnyRequest();
-
-	TestL(recvStatus.Int(), _L("Receive status from secondary context"));
-	TestL(commReadBuf.Compare(KCommWriteData), _L("Sent data matches received data on secondary context"));
-
-	// cause a network event, deleting the primary context
-	TInt idx = RetrieveNetSideEventValFromConfigL(_L("QoSEventReq1Idx"));
-	EtelRequestL(EContextStatusChange, idx);
-	
-	// pause to allow notification of the deletion to get through
-	User::After(1000000);
-
-	// send data through the SPUD's primary context
-	// with the primary context deleted, the remaining secondary context should become the default context
-	// and this data should get sent through the secondary context
-	primarySocket.Send(KCommWriteData, 0, sendStatus);
-	User::WaitForRequest(sendStatus);
-	TestL(sendStatus.Int(), _L("Send status on primary context"));
-	// GuQoS will drop the previous packet, and be triggered to modify the secondary context to become the default context
-	// pause to allow GuQos to do this
-	User::After(1000000);
-	// this packet should make it through
-	oppositeSecondarySocket.RecvFrom(commReadBuf, spudPrimaryPort, 0, recvStatus);
-	primarySocket.Send(KCommWriteData, 0, sendStatus);
-	User::WaitForRequest(sendStatus);
-	TestL(sendStatus.Int(), _L("Send status on primary context"));
-	User::WaitForRequest(recvStatus);
-	TestL(recvStatus.Int(), _L("Receive status from primary context"));
-	TestL(commReadBuf.Compare(KCommWriteData), _L("Sent data matches received data from primary context"));
-	
-	// make sure sending on the secondary still works
-	oppositeSecondarySocket.RecvFrom(commReadBuf, spudSecondaryPort, 0, recvStatus);
-	iSocket.Send(KCommWriteData, 0, sendStatus);
-	User::WaitForRequest(sendStatus);
-	TestL(sendStatus.Int(), _L("Send status from secondary context"));
-	User::WaitForRequest(recvStatus);
-	TestL(recvStatus.Int(), _L("Receive status from secondary context"));
-	TestL(commReadBuf.Compare(KCommWriteData), _L("Sent data matches received data from secondary context"));
-
-	// cleanup
-	CleanupStack::PopAndDestroy(&oppositeSecondarySocket);
-
-	if (secondaryIfStart->IsActive())
-		{
-		secondaryIfStart->Deque();
-		}
-	CleanupStack::PopAndDestroy(secondaryIfStart);
-	CleanupStack::PopAndDestroy(&primarySocket);
-
-	return ETrue;
-}
-
-TVerdict CSpudDeletePrimary::RunTestStepL()
-{
-	if(SpudDeletePrimaryPdpL())
-	  {
-	  return EPass;
-	  }
-	 
-	 return EFail;
-}
-
-
-/**
- Opens and starts a connection, using aIapId as the preferred IAP
- @param aEsock The socket server to open the connection on
- @param aTestStep The test steps logging is used
- @param aIapId The IAP to use for the connection
- @leave Any error returned from RConnection::Open, or KErrNoMemory if new(ELeave) fails
-*/
-CConnectionStart* CConnectionStart::NewLC(RSocketServ& aEsock, CSpudNetSideTestBase& aTestStep, TInt aIapId)
-	{
-	CConnectionStart *me = new(ELeave) CConnectionStart(aTestStep);
-	CleanupStack::PushL(me);
-	me->ConstructL(aEsock, aIapId);
-	return me;
-	}
-	
-void CConnectionStart::ConstructL(RSocketServ& aEsock, TInt aIapId)
-	{
-	CActiveScheduler::Add(this);
-	SetActive();
-    iPrefs.SetIapId(aIapId);
-	iTestStep.TestL(iInterface.Open(aEsock), _L("RConnection::Open on interface"));
-	iInterface.Start(iPrefs, iStatus);	
-	}
-
-/**
- Tests that the RConnection::Start succeeded
- @leave Leaves with the status of the RConnection::Start if the status is not KErrNone
-*/
-void CConnectionStart::RunL() 
-	{
-	iTestStep.TestL(iStatus.Int(), _L("RConnection::Start status"));
-	}
-
-/**
- Starts a secondary context by creating a socket with QoS, starts PPP instances opposite the PPP instances
- from the primary and secondary contexts, then sends data between them
- @leave If any of the above steps fail
-*/
-TVerdict CSpudPppSecondarySend::RunTestStepL()
-	{
-	TRequestStatus connectStatus, recvStatus, sendStatus;
-
-	TInetAddr spudSecondaryPort, spudSecondaryAddr, secondPppPort;
-	spudSecondaryPort.SetPort(KConfiguredTftFilter1DestPort);
-	spudSecondaryAddr.SetPort(KConfiguredTftFilter1DestPort);
-	spudSecondaryAddr.Input(KConfiguredTftFilter2DestAddr);
-	secondPppPort.SetPort(KConfiguredTftFilter1SrcPort);
-
-#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-	VerifySubconnectionCountL(_L("SubConnectionCount1"), PDPIAP);
-#endif
-	// start a secondary context
-	InitiateSecondaryStartL();
-
-	TInt primaryIapId, secondaryIapId;
-	TestBooleanTrueL(GetIntFromConfig(ConfigSection(), _L("PppIapId1"), primaryIapId), _L("Get Iap ID for first Ppp instance"));
-	TestBooleanTrueL(GetIntFromConfig(ConfigSection(), _L("PppIapId2"), secondaryIapId), _L("Get Iap ID for second Ppp instance"));
-
-	// start 2 more PPP instances opposite the SPUD's primary and secondary context PPP instances
-	CConnectionStart *primaryIfStart = CConnectionStart::NewLC(iEsock, *this, primaryIapId);
-	CConnectionStart *secondaryIfStart = CConnectionStart::NewLC(iEsock, *this, secondaryIapId);
-
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-	WaitForQoSEventL(_L("SecondaryActivationEvent2"), _L("SecondaryActivationEvent2Reason"));
-#else
-	User::After(2*KTimeToStartSecondary);
-	VerifySubconnectionCountL(_L("SubConnectionCount2"), PDPIAP);
-#endif
-
-	// set up a socket from the second PPP instance (that connects to the SPUD's secondary context)
-	RSocket secondPppSocket;
-	User::LeaveIfError(secondPppSocket.Open(iEsock, KAfInet, KSockDatagram, KProtocolInetUdp, secondaryIfStart->iInterface));
-	CleanupClosePushL<RSocket>(secondPppSocket);
-	User::LeaveIfError(secondPppSocket.Bind(secondPppPort));
-	secondPppSocket.Connect(spudSecondaryAddr, connectStatus);
-	User::WaitForRequest(connectStatus);
-	TestL(connectStatus.Int(), _L("Connecting to local socket"));
-		
-	// send data through the SPUD's secondary context to the second PPP instance
-	TBuf8<KCommReadBufSize> commReadBuf;
-	secondPppSocket.RecvFrom(commReadBuf, spudSecondaryPort, 0, recvStatus);
-	iSocket.Send(KCommWriteData, 0, sendStatus);
-	User::WaitForRequest(sendStatus);
-	User::WaitForRequest(recvStatus);
-	TestL(commReadBuf.Compare(KCommWriteData), _L("Sent data matches received data"));
-	
-	// send data in the opposite direction
-	iSocket.RecvFrom(commReadBuf, secondPppPort, 0, recvStatus);
-	secondPppSocket.Send(KCommWriteData2, 0, sendStatus);
-	User::WaitForRequest(sendStatus);
-	User::WaitForRequest(recvStatus);
-	TestL(commReadBuf.Compare(KCommWriteData2), _L("Sent data matches received data"));
-	
-
-	// cleanup
-	CleanupStack::PopAndDestroy(&secondPppSocket);
-	if (primaryIfStart->IsActive())
-		{
-		primaryIfStart->Deque();
-		}
-	if (secondaryIfStart->IsActive())
-		{
-		secondaryIfStart->Deque();
-		}
-
-	CleanupStack::PopAndDestroy(secondaryIfStart);
-	CleanupStack::PopAndDestroy(primaryIfStart);
-
-	return EPass;
-	}
-/**
-Tests creation of multiple primary PDP contexts by explicitly starting the interfaces
-
-@leave if the test fails.
-*/
-enum TVerdict CSpudMultiPrimary::RunTestStepL()
-	{
-	TInt primaryCreationErr(KErrNone);
-	TInt primaryIapId(0);
-	TInt maximumConnections = 0;
-	
-
-	if (!GetIntFromConfig(ConfigSection(), _L("PrimaryActivationErr1"), primaryCreationErr))
-		{
-		User::Leave(KErrNotFound);
-		}
-		
-    _LIT(KNumberOfIapsLit, "NumberOfIaps");
-	if (!GetIntFromConfig(ConfigSection(), KNumberOfIapsLit, maximumConnections))
-		{
-		User::Leave(KErrNotFound);
-		}
-
-
-	// Opening multiple connections, we're not reusing the 'iInterface' member.
-	//
-	RPointerArray<RConnection> interfaces;
-
-    _LIT(KPrimaryIapFormatLit, "PrimaryIapId%d");
-	for (TInt i = 0; i < maximumConnections; i++)
-	    {
-
-        TBuf<32> primaryIap;
-        primaryIap.Format(KPrimaryIapFormatLit, i + 1);
-    	if (!GetIntFromConfig(ConfigSection(), primaryIap, primaryIapId))
-    		{
-    		User::Leave(KErrNotFound);
-    		}
-    		
-
-    	INFO_PRINTF2(_L("Creating RConnection object %d"), primaryIapId);	
-
-        RConnection* p = new (ELeave) RConnection();	
-
-
-	    interfaces.Append(p);
-        CleanupStack::PushL(p);
-        
-	    
-    	TCommDbConnPref iap1prefs;
-        iap1prefs.SetIapId(primaryIapId);	
-        
-    	INFO_PRINTF2(_L("Test starting Interface IAP ID == %d"), primaryIapId);	
-    	
-    	TestL(p->Open(iEsock), _L("RConnection::Open the interface"));
-    	TestL(p->Start(iap1prefs),primaryCreationErr, _L("RConnection::Start the interface"));
-	    }
-
-	
-	for (TInt i = (interfaces.Count() - 1); i >= 0; i--)
-	    {
-	    RConnection* p = interfaces[i];
-	    interfaces.Remove(i);
-	    
-    	p->Stop();
-    	p->Close();	
-    	
-        // empty destructor for 'RConnection' 	    
-        //
-        CleanupStack::PopAndDestroy(p);
-    	}
-	
-	interfaces.Reset();
-
-	return EPass;
-	}
-
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/src/te_spudNetworkSideSteps.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,245 +0,0 @@
-// Copyright (c) 2005-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:
-// Defines the Network-side events & error conditions tests for SPUD.
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#ifndef TE_SPUD_NETWORK_SIDE_STEPS_H
-#define TE_SPUD_NETWORK_SIDE_STEPS_H
-
-
-#include <test/testexecutestepbase.h>
-#include <c32comm.h>
-#include <es_sock.h>
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-#include <qoslib.h>
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-#include <networking/qoslib_internal.h>
-#endif
-#endif
-
-/** Encapsulates all Spud Network Side tests */
-namespace te_spudNetworkSide
-	{
-	
-	const TUint KConfiguredTftFilter1DestPort	= 1031;
-	const TUint KConfiguredTftFilter1SrcPort 	= 3461;
-	const TUint KConfiguredTftFilter2DestPort	= 1032;	
-	
-	_LIT(KConfiguredTftFilter2DestAddr, "192.168.1.2");
-	_LIT(KConfiguredTftFilter1SrcAddr, "192.168.1.1");
-
-		
-	/** Identifiers for each of the simtsy parameters that can be changed using publish and subscribe */
-	enum TEtelRequestType
-		{
-		/** Change QoS parameters */
-		ENetworkQoSChange,
-		/** Change network status */
-		ENetworkChangeRegStatus,
-		/** Change context status */
-		EContextStatusChange,
-		/** Change context config parameters */
-		EContextConfigChange,
-		/**Invalid Request */
-		EInvalidRequest,
-		};
-
-	enum TContextType
-		{
-		EPrimaryContext,
-		ESecondaryContext
-		};
-		
-	/**
-	 Base class for all Spud Network Side Tests.
-	 
-	 @internalComponent
-	 */
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-	class CSpudNetSideTestBase : public CTestStep, public MQoSObserver
-#else
-    class CSpudNetSideTestBase : public CTestStep
-#endif
-		{
-	public:
-	
-		TVerdict doTestStepPreambleL();
-#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-		TVerdict doTestStepPostambleL();
-#endif
-		
-		enum TVerdict doTestStepL();
-
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-		// MQoSObserver	
-		void Event(const CQoSEventBase& aEvent);
-#endif
-		
-		// Utility
-		void TestBooleanTrueL(TBool aBool, const TDesC& aMsg);
-		void TestL(TInt aErrCode, const TDesC& aMsg);
-		void TestL(TInt aErrCode, TInt aExpErrCode, const TDesC& aMsg);
-		
-		
-	
-	protected:
-				
-		/**
-		Executes the Test Step 
-		 
-		@return Verdict of the test step: EPass / EFail;
-        		EAborted if the test case could not be executed properly;
-        		EInconclusive if it could not be determined with certainty that the test case has succeeded.
-		@leave if the test fails		 
-		*/
-		virtual TVerdict RunTestStepL() = 0;
-
-		// utility
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-		void WaitForQoSEventL(TQoSEvent aQosEvent, TInt aReasonCode);
-		void WaitForOptionalQoSEventL(TQoSEvent aQosEvent, TInt aReasonCode, TQoSEvent aOptionalQosEvent, TInt aOptionalReasonCode);
-		void WaitForOptionalQoSEventL(const TDesC& aQosEventString, const TDesC& aReasonCodeString, TQoSEvent aOptionalQosEvent, const TDesC& aOptionalReasonCodeString);
-
-		void WaitForQoSEventL(const TDesC& aQosEventString, TInt aReasonCode);
-		void WaitForQoSEventL(const TDesC& aQosEventString, const TDesC& aReasonCodeString);
-		void WaitForOptionalQoSEventL(const TDesC& aQosEventString, const TDesC& aReasonCodeString, const TDesC& aOptionalQosEventString, const TDesC& aOptionalReasonCodeString);
-
-		void SetQoSParameters(CQoSParameters& aParameters);
-		void SetQoSParameters1(CQoSParameters& aParameters);
-#endif
-		void SetSimTsyTestNumberL(TInt aTestNumber);
-				
-		void StartPrimaryOnlyL();
-		void OpenPrimarySocketL();
-		void SendUntilTimeoutL();
-		void SendSinglePacketL();
-		void StopPrimary();
-		
-		TBool SpudDeletePrimaryPdpL();
-		
-		void StartSecondaryL();
-		void StopSecondaryL();
-		void RetrieveMandatorySettingsFromConfigL();
-#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-		void ReadQosParameterSettingsFromConfigL();
-
-		void VerifySubconnectionCountL(const TDesC& aSubConnDesc, TUint aIap);
-		void VerifySubconnectionCountL(TUint aSubConnectionCount, TUint aIap);
-		void UpdatePolicySelector2QosParametersTableL(TUint aPolicySelector, TUint aQosParameter);
-		void ClearPolicySelector2QosParametersTableL();
-#endif
-		
-		void FailNextPktLoopbackCsyWriteL(TInt aPortNum, TInt aErrorCode);
-		TEtelRequestType RetrieveNetSideEventRequestFromConfigL(const TDesC& aEventName);
-		void EtelRequestL(TEtelRequestType aEtelCommand, TInt aNewValue);
-		TInt RetrieveNetSideEventValFromConfigL(const TDesC& aEventValName);
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-		enum TQoSEvent RetrieveQosEventFromConfigL(const TDesC& aQosEventName);
-#endif
-		TContextType RetrieveContextTypeFromConfigL(const TDesC& aContextTypeName);
-		TCommRole RetrieveCommRoleFromConfigL(const TDesC& aCommRoleName);
-		void WaitForProgressNotificationL(TRequestStatus& aStatus, TInt aProgress, TInt aErrCode);
-		void StopInterfaceL();
-		
-		void InitLoopbackL(const TDesC& aLoopbackPortName);
-				
-		virtual void InitiateSecondaryStartL();
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-		virtual void ChangeQoSL();
-#endif
-		
-		// Data
-		TInt iSimTsyTestNum;
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-		TQoSEvent iReceivedQosEvent;
-#else
-		TInt iPolicySelector;
-		TUint iQosParametersRecord;
-#endif
-    	TInt iQosReason;
-    	
-		RSocketServ iEsock;
-		RSocket iSocket;
-		/** Socket used in RQoSChannel Join*/
-		RSocket iSocketJoin;
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-		RQoSPolicy iQoSPolicy_1;
-#endif
-		TNifProgressBuf iProgressBuf;
-		TRequestStatus iQosEventReq;
-		
-		RConnection iInterface;
-		
-		RCommServ iCommServer;
-		RComm iLoopbackPort;
-		
-		};
-	
-		
-	/** Used to define a literal variable. */
-	#define SYMBIAN_TEST_LIT(name) _LIT(K##name, #name)
-
-	/** Define a literal from a classname and can be as the keyword class. */
-	#define SYMBIAN_TEST_CLASS(className) SYMBIAN_TEST_LIT(className); class className 
-
-	/** Define a basic declaration for testClass as a subclass of CSpudNetSideTestBase 
-	and define a literal from testClass */
-	#define SYMBIAN_SPUD_TEST_CLASS(testClass) SYMBIAN_TEST_CLASS(testClass) : public CSpudNetSideTestBase \
-				{ \
-			public: \
-				inline testClass() {SetTestStepName(K##testClass);}; \
-				virtual TVerdict RunTestStepL(); \
-				}; 
-					
-
-	// Test Steps
-	SYMBIAN_SPUD_TEST_CLASS(CESockCheck)
-	SYMBIAN_SPUD_TEST_CLASS(CSpudPrimary)
-	SYMBIAN_SPUD_TEST_CLASS(CSpudPrimaryEvent)
-	SYMBIAN_SPUD_TEST_CLASS(CSpudPrimaryContextEventProgress)
-	SYMBIAN_SPUD_TEST_CLASS(CSpudDeletePrimary)
-	SYMBIAN_SPUD_TEST_CLASS(CSpudPrimaryEventOnLowerNifStarting)
-	SYMBIAN_SPUD_TEST_CLASS(CSpudSecondary)
-	SYMBIAN_SPUD_TEST_CLASS(CSpudSuspendContext)
-		
-#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-	SYMBIAN_SPUD_TEST_CLASS(CSpudSecondaryChangeQoS)
-	SYMBIAN_SPUD_TEST_CLASS(CSpudSecondaryEvent)
-	SYMBIAN_SPUD_TEST_CLASS(CSpudTwoSecondaryEvents)
-	SYMBIAN_SPUD_TEST_CLASS(CSpudSecondaryEvent2)		
-#endif
-	
-	// Nifman side testing
-	SYMBIAN_SPUD_TEST_CLASS(CSpudPrimaryInterfaceStop)
-	SYMBIAN_SPUD_TEST_CLASS(CSpudPrimaryInterfaceEventStop)
-	SYMBIAN_SPUD_TEST_CLASS(CSpudPrimaryDeletionInterfaceStop)
-		
-	SYMBIAN_SPUD_TEST_CLASS(CSpudSecondaryInterfaceStop)
-	SYMBIAN_SPUD_TEST_CLASS(CSpudSecondaryInterfaceEventStop)
-	SYMBIAN_SPUD_TEST_CLASS(CSpudPrimayStartingStop)
-	SYMBIAN_SPUD_TEST_CLASS(CSpudSecondaryStartingStop)
-	SYMBIAN_SPUD_TEST_CLASS(CSpudSecondaryLowerNifDownStop)	
-	SYMBIAN_SPUD_TEST_CLASS(CSpudPppPrimary)
-	SYMBIAN_SPUD_TEST_CLASS(CSpudPppSecondarySend)
-	SYMBIAN_SPUD_TEST_CLASS(CSpudMultiPrimary)
-
-	} 
-	
-#endif 
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/bmarm/TE_SPUDRSUBCONNU.DEF	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	NewServer__Fv @ 1 NONAME R3UNUSED ; NewServer(void)
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/bwins/TE_SPUDRSUBCONNU.DEF	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?NewServer@@YAHXZ @ 1 NONAME ; int NewServer(void)
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/configs/spudRSubConnPPP.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-[UdpEcho1]
-SimTsyTestNum= 1
-QoSParamSet= 2
-PrimRemoteIpAddr= 192.168.20.13
-PrimRemotePort= 7
-SecLocalPort= 1031
-SecRemoteIpAddr= 192.168.20.11
-SecRemotePort= 9
-
-
-[UdpEcho2]
-SimTsyTestNum= 2
-QoSParamSet= 2
-PrimRemoteIpAddr= 192.168.20.13
-PrimRemotePort= 7
-SecLocalPort= 1031
-SecRemoteIpAddr= 192.168.20.11
-SecRemotePort= 9
-
-[UpperFlowLowerNifDown1]
-SimTsyTestNum= 3
-QoSParamSet= 0
-PrimRemoteIpAddr= 192.168.20.13
-PrimRemotePort= 7
-SecLocalPort= 1031
-SecRemoteIpAddr= 192.168.20.11
-SecRemotePort= 9
-
-
-[SpudRestartAfterNormalStop]
-SimTsyTestNum= 1
-QoSParamSet= 0
-PrimRemoteIpAddr= 192.168.20.13
-PrimRemotePort= 7
-SecLocalPort= 1031
-SecRemoteIpAddr= 192.168.20.11
-SecRemotePort= 9
-StopType= 0
-
-
-[SpudRestartAfterAuthStop]
-SimTsyTestNum= 1
-QoSParamSet= 0
-PrimRemoteIpAddr= 192.168.20.13
-PrimRemotePort= 7
-SecLocalPort= 1031
-SecRemoteIpAddr= 192.168.20.11
-SecRemotePort= 9
-StopType= 1
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/configs/spudRSubConnPPP_config.txt	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,410 +0,0 @@
-############################################################################
-############################################################################
-###################              T E S T 1              ####################
-############################################################################
-############################################################################
-# Default QoS Parameters on primary & secondary
-############################################################################
-[test1]
-# 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,192.168.1.2,0, 2, 0, 0,RasUser,,,,194.72.6.51,194.72.6.51,0
-
-# 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, 0, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.20.11, 255.255.255.255.255.255.255.255.255.255.255.255.255.255.255.255, 17, 9, 9, 1031, 1031, 0, 0, 0
-TFTfilter = 1, 1, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.20.11, 255.255.255.255.255.255.255.255.255.255.255.255.255.255.255.255, 17, 9, 9, 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, -1, -1, 0, 0
-#QosProfileReqR99 = SECONDARY1, 16, 16, 0x01, 0x01, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, -1, -1, 0, 0
-# dino                      0     1     2     3     4      5     6     7    8   9  10  11  12    13    14    15    16    17    18    19    20   21   22 23 24   
-QosProfileReqR99 = SECONDARY1, 0x10, 0x10, 0x04, 0x04,  0x08, 0x08, 1000, 200, 10, 50, 10, 20, 0x10, 0x02, 0x10, 0x02, 0x01, 0x01, 3000, 4000 , 10 , 20, 8, 20
-QosProfileReqR99 = SECONDARY2, -1, -1, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 1524, 1524, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, -1, -1, 0, 0
-
-# Settings supporting R5 support
-QosProfileReqR5 = PRIMARY1,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, -1, -1, 0, 0, 0, 0
-#QosProfileReqR5 = SECONDARY1, 16, 16, 0x01, 0x01, 0x08, 0x08, -1, -1, -1, -1, 0, 0, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, -1, -1, 0, 0, 0, 0
-QosProfileReqR5 = SECONDARY1, 0x10, 0x10, 0x04, 0x04,  0x08, 0x08, 1000, 200, 10, 50, 10, 20, 0x10, 0x02, 0x10, 0x02, 0x01, 0x01, 3000, 4000 , 10 , 20, 8, 20, 0, 0
-QosProfileReqR5 = SECONDARY2, 16, 16, 0x01, 0x01, 0x08, 0x08, -1, -1, -1, -1, 1524, 1524, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, -1, -1, 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 = SECONDARY1, 0x03, 0x08, 0x02, 0x08, 1584, 0x03, 0x01, 0x01, 1, 1, 3, 1, 3
-QosProfileNegR99 = SECONDARY2, 0x04, 0x02, 0x02, 0x02, 1584, 0x04, 0x02, 0x08, 1, 2, 4, 2, 4
-
-# Settings supporting R5 support
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-QosProfileNegR5 = SECONDARY1, 0x03, 0x08, 0x02, 0x08, 1584, 0x03, 0x01, 0x01, 1, 1, 3, 1, 3, 0, 0
-QosProfileNegR5 = SECONDARY2, 0x04, 0x02, 0x02, 0x02, 1584, 0x04, 0x02, 0x08, 1, 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, 0x08, 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, 0x08, 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
-
-
-
-
-############################################################################
-############################################################################
-###################              T E S T 2              ####################
-############################################################################
-############################################################################
-# Verifies that GUQoS / Subconnection do not clobber user-defined QoS parameters.
-############################################################################
-[test2]
-# 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,192.168.1.2,0, 2, 0, 0,RasUser,,,,194.72.6.51,194.72.6.51,0
-
-# 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, 0, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.20.11, 255.255.255.255.255.255.255.255.255.255.255.255.255.255.255.255, 17, 9, 9, 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, 16, 16, 0x04, 0x04, 0x08, 0x08, 1000, 200, 10, 50, 1524, 1524, 16, 2, 16, 2, 0x01, 0x01, 3000, 4000, -1, -1, 8, 20
-QosProfileReqR99 = SECONDARY2, -1, -1, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 1524, 1524, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, -1, -1, 0, 0
-
-
-# Settings supporting R5 support
-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, 16, 16, 0x04, 0x04, 0x08, 0x08, 1000, 200, 10, 50, 1524, 1524, 16, 2, 16, 2, 0x01, 0x01, 3000, 4000, -1, -1, 8, 20, 0, 0
-QosProfileReqR5 = SECONDARY2, -1, -1, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 1524, 1524, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0, 0, -1, -1, 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 = SECONDARY1, 16, 4, 0x08, 0x08, 1000, 16, 0x08, 0x08, 3000, 8, 20, 10, 20
-QosProfileNegR99 = SECONDARY2, 0x04, 0x02, 0x02, 0x02, 1584, 0x04, 0x02, 0x08, 1, 2, 4, 2, 4
-
-# Settings supporting R5 support
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-QosProfileNegR5 = SECONDARY1, 16, 4, 0x08, 0x08, 1000, 16, 0x08, 0x08, 3000, 8, 20, 10, 20, 0, 0
-QosProfileNegR5 = SECONDARY2, 0x04, 0x02, 0x02, 0x02, 1584, 0x04, 0x02, 0x08, 1, 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, 0x08, 0x04, 2, 2, 4, 2, 4
-
-# Settings supporting R5 support
-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, 0x08, 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
-
-
-
-
-############################################################################
-############################################################################
-###################              T E S T 3              ####################
-############################################################################
-############################################################################
-# Delay on deletion of the primary PDP context.
-# Supports testing of sends on SPUD when lower NIF reported LinkLayerDown
-############################################################################
-[test3]
-# 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,192.168.1.2,0, 2, 0, 0,RasUser,,,,194.72.6.51,194.72.6.51,0
-
-# TRel99ContextConfig = <TName iContextName>,  <TUint iActivatePause>, <TUint iActivateErrorCode>, <TUint iDeactivatePause>, 
-# <TUint iDeactivateErrorCode>, <TUint iDeletionPause>, <TUint iDeletionErrorCode> <TBool iConnectToNtRas>
-R99ContextConfig = PRIMARY1, 0, 0, 20, 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, 0, 0.0.0.0.0.0.0.0.0.0.255.255.192.168.20.11, 255.255.255.255.255.255.255.255.255.255.255.255.255.255.255.255, 17, 9, 9, 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, 16, 16, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 1524, 1524, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 0, 0, -1, -1, 0, 0
-QosProfileReqR99 = SECONDARY2, -1, -1, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 1524, 1524, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 0, 0, -1, -1, 0, 0
-
-
-# Settings supporting R5 support
-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, 16, 16, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 1524, 1524, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 0, 0, -1, -1, 0, 0, 0, 0
-QosProfileReqR5 = SECONDARY2, -1, -1, 0x02, 0x02, 0x08, 0x08, -1, -1, -1, -1, 1524, 1524, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 0, 0, -1, -1, 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 = SECONDARY1, 0x03, 0x08, 0x02, 0x08, 1584, 0x03, 0x01, 0x01, 1, 1, 3, 1, 3
-QosProfileNegR99 = SECONDARY2, 0x04, 0x02, 0x02, 0x02, 1584, 0x04, 0x02, 0x08, 1, 2, 4, 2, 4
-
-# Settings supporting R5 support
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-QosProfileNegR5 = SECONDARY1, 0x03, 0x08, 0x02, 0x08, 1584, 0x03, 0x01, 0x01, 1, 1, 3, 1, 3, 0, 0
-QosProfileNegR5 = SECONDARY2, 0x04, 0x02, 0x02, 0x02, 1584, 0x04, 0x02, 0x08, 1, 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, 0x08, 0x04, 2, 2, 4, 2, 4
-
-# Settings supporting R5 support
-QosR5NetworkNotification = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-QosR5NetworkNotification = PRIMARY2, 0x04, 0x02, 0x04, 0x02, 1, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4
-QosR5NetworkNotification = SECONDARY1, 0x04, 0x02, 0x04, 0x02, 1, 0x04, 0x08, 0x04, 2, 2, 4, 2, 4
-
-#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
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/configs/spudRSubConnPPP_loopback.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-[LoopbackPppUdp1]
-SimTsyTestNum= 1
-IapId= 1
-UdpEchoPort= 7
-Iterations= 3
-
-[LoopbackPppUdp3]
-SimTsyTestNum= 1
-IapId= 3
-UdpEchoPort= 9
-Iterations= 3
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/configs/spudRSubConnPPP_loopback.xml	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,447 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2004-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:
- 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>
-</NetworkTable>
-
-<IAPTable>
-    <IAP operation="add">
-        <Name>Loopback_GPRS_1</Name>
-        <IAPService>OutgoingGPRS.PPP_Bounce_1</IAPService>
-        <IAPBearer>ModemBearer.Loopback_PPP_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.PPP_Bounce_3</IAPService>
-        <IAPBearer>ModemBearer.Loopback_PPP_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.PPP_Bounce_1</IAPService>
-        <IAPBearer>ModemBearer.Loopback_PPP_1</IAPBearer>
-        <IAPNetwork>Network.Intranet2</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>30</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    
-    <ModemBearer operation="add">
-        <Name>Loopback_PPP_1</Name>
-        <IfName>PPP</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_PPP_3</Name>
-        <IfName>PPP</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>
-
-</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>
-        <IpGateway>192.168.20.11</IpGateway>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-	<UmtsR99QoSAndOnRef>UmtsR99QoSAndOn.R99Default1</UmtsR99QoSAndOnRef>
-    </OutgoingGPRS>
-    
-    <OutgoingGPRS operation="add">
-        <Name>PPP_Bounce_1</Name>
-        <PDPType>IPV4</PDPType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpAddr>192.168.20.13</IpAddr>
-    	<IpGateway>192.168.1.2</IpGateway>
-    </OutgoingGPRS>
-    
-    <OutgoingGPRS operation="add">
-        <Name>SPUD_Echo_2</Name>
-      	<PDPType>IPV4</PDPType>
-        <IfParams>lowernif=PPP</IfParams>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>  
-        <IpAddr>192.168.1.2</IpAddr>
-    	<IpGateway>192.168.20.11</IpGateway>
-    </OutgoingGPRS>
-    
-    <OutgoingGPRS operation="add">
-        <Name>PPP_Bounce_3</Name>
-        <PDPType>IPV4</PDPType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpAddr>192.168.20.11</IpAddr>
-    	<IpGateway>192.168.1.2</IpGateway>
-    </OutgoingGPRS>
-    
-    <OutgoingGPRS operation="add">
-        <Name>SPUD_Echo_4</Name>
-      	<PDPType>IPV4</PDPType>
-        <IfParams>lowernif=PPP</IfParams>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>  
-        <IpAddr>192.168.2.4</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>
-
-<UmtsR99QoSAndOnTable>
-	<UmtsR99QoSAndOn operation="add">
-		<Name>R99Default1</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> 
-	</UmtsR99QoSAndOn>
-</UmtsR99QoSAndOnTable>
-
-<SecureSocketTable>
-</SecureSocketTable>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-</VpnServiceTable>
-
-
-</CommDB:Config>
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/configs/spudRSubConnPPP_pcktloopback.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-# Defining a loopback between port A and B is as follows:
-# Port = <PortA>,<PortB>,<delay>,<queue size>,<element (packet) size>
-
-[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
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/configs/spudRSubConnPPP_qospolicies.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-# ModuleSpecs
-modulespec guqos= {
-	STRING module = guqos.prt
-	INTEGER id=368
-	INTEGER flags = 1
-	}
-
-# FlowSpecs
-flowspec override = {
-	INTEGER token_rate_uplink = 1500
-	}
-
-flowspec default_flow_spec = {
-	INTEGER max_transfer_rate_uplink = 1500
-	INTEGER token_rate_uplink = 1500
-	INTEGER token_bucket_size_uplink = 3000
-	INTEGER max_packet_size_uplink = 1500
-	INTEGER min_policed_unit_uplink = 1500
-	INTEGER priority_uplink = 1
-	INTEGER drop_mode_uplink = 8
-	INTEGER max_transfer_rate_downlink = 1500
-	INTEGER token_rate_downlink = 1500
-	INTEGER token_bucket_size_downlink = 3000
-	INTEGER max_packet_size_downlink = 1500
-	INTEGER min_policed_unit_downlink = 1500
-	INTEGER priority_downlink = 1
-	INTEGER drop_mode_downlink = 8
-	}
-
-# UMTS Specs
-
-# Default APN should always be specified!
-extension_spec default_extension_spec = {
-	INTEGER	type = 5
-	INTEGER extension_type = 5
-	INTEGER TrafficClassRequested = 4
-	INTEGER MaxBitrateUplinkRequested = 2048
-	INTEGER MaxBitrateDownlinkRequested = 2048
-	INTEGER GuaBitrateUplinkRequested = 1024
-	INTEGER GuaBitrateDownlinkRequested = 1024
-	INTEGER HeaderCompressionRequested = 1
-	}
-
-extension_spec guqos_default = {
-	INTEGER type = 5
-	INTEGER extension_type = 5
-	# Subscribed
-	INTEGER TrafficClassRequested = 1
-	# Subscribed
-	INTEGER TrafficClassMinimum = 1
-	# Subscribed
-	INTEGER DeliveryOrderRequested = 1
-	# Subscribed
-	INTEGER DeliveryOrderMinimum = 1
-	# Subscribed
-	INTEGER DeliveryOfErroneusSduRequested = 1
-	# Subscribed
-	INTEGER DeliveryOfErroneusSduMinimum = 1
-	# Subscribed
-	INTEGER MaxSduSizeRequested = 0
-	# Subscribed
-	INTEGER MaxSduSizeMinimum = 0
-	# Subscribed
-	INTEGER MaxBitrateUplinkRequested = 0
-	# Subscribed
-	INTEGER MaxBitrateDownlinkRequested = 0
-	# Subscribed
-	INTEGER MaxBitrateUplinkMinimum = 0
-	# Subscribed
-	INTEGER MaxBitrateDownlinkMinimum = 0
-	# iReqBER Subscribed
-	INTEGER ResidualBerRequested = 1
-	# iMaxBER Subscribed
-	INTEGER ResidualBerMinimum = 1
-	# ReqSDUErrorratio Subscribed
-	INTEGER ErrorRatioRequested = 1
-	# MaxSDUErrorratio Subscribed
-	INTEGER ErrorRatioMinimum =1
-	INTEGER PriorityRequested = 1
-	INTEGER PriorityMinimum = 1
-    # Subscribed
-	INTEGER TransferDelayRequested = 0
-    # Subscribed
-	INTEGER TransferDelayMinimum = 0
-    # Subscribed
-	INTEGER GuaBitrateUplinkRequested = 0
-    # Subscribed
-	INTEGER GuaBitrateUplinkMinimum = 0
-    # Subscribed
-	INTEGER GuaBitrateDownlinkRequested = 0
-    # Subscribed
-	INTEGER GuaBitrateDownlinkMinimum = 0
-}
-
-
-
-# Default APN should always be specified!
-extension_spec web = {
-	INTEGER type = 5
-	INTEGER extension_type = 5
-	INTEGER TrafficClassRequested = 3
-	INTEGER MaxBitrateUplinkRequested = 2048
-	INTEGER MaxBitrateDownlinkRequested = 2048
-	INTEGER GuaBitrateUplinkRequested = 1024
-	INTEGER GuaBitrateDownlinkRequested = 1024
-	INTEGER HeaderCompressionRequested = 1
-	}
-
-
-# Module selectors (none)
-#module_policy dst_port 0 dst_port_max 65535 priority 1 = { guqos }
-
-# Flowspec selectors
-#flowspec_policy dst_port 9 priority 1 = { default_flow_spec }
-#flowspec_policy dst_port 0 dst_port_max 65535 priority 2 = { override }
-#flowspec_policy dst_port 0 priority 0 = { default }
-
-# GPRS selectors
-# extension_policy src_port 0 src_port_max 65535 priority 0  = { default_extension_spec }
-
-# guqos_default 
-extension_policy src_port 0 src_port_max 65535 priority 0 = { guqos_default }
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/configs/spud_staticip/connection.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-
-#####Opening RSubconnection in Eattachtodefault mode####
-
-
-
-[Connection0]
-ConnName=Conn0
-SocketServName=SockSvr0
-ExpectedError=0
-
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/configs/spud_staticip/simtsy.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-[Simtsy]
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/configs/spud_staticip/socketserv.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-
-
-#####Opening RSubconnection in Eattachtodefault mode####
-
-[SocketServ0]
-SocketServName=SockSvr0
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/configs/spud_staticip/subconnection.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-
-
-#####Opening RSubconnection in Eattachtodefault mode####
-
-
-[SubConnection0]
-SubConnName=SubConn0
-ConnName=Conn0
-SocketServName=SockSvr0
-SubConnParamsName=QoSParams0
-SubConnType=EAttachToDefault
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/configs/spud_staticip/te_spud_staticip.xml	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,336 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2005-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:
- CommDB Settings File for GT0233 PREQ397 SPUD 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">
-
-<NetworkTable>
-    <Network operation="add">
-        <Name>Intranet</Name>
-    </Network>
-    
-    <Network operation="add">
-        <Name>Intranet2</Name>
-    </Network>
-</NetworkTable>
-
-<IAPTable>
-    <IAP operation="add">
-        <Name>SPUD_1</Name>
-        <IAPService>OutgoingGPRS.RawIP_StaticIP</IAPService>
-        <IAPBearer>ModemBearer.SPUD_1</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Mobile</LocationRef>
-    </IAP>
-    
-    <IAP operation="add">
-        <Name>GRPS_2</Name>
-        <IAPService>OutgoingGPRS.RawIP_StaticIP</IAPService>
-        <IAPBearer>ModemBearer.SPUD_2</IAPBearer>
-        <IAPNetwork>Network.Intranet</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>
-        <CommRole>0</CommRole>
-    </ModemBearer>
-    
-    <!-- Normal timeouts -->
-    <ModemBearer operation="add">
-        <Name>SPUD_1</Name>
-        <IfName>SPUD</IfName>
-        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
-        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>                
-    </ModemBearer>
-    
-    <!-- Short timeouts -->
-    <ModemBearer operation="add">
-        <Name>SPUD_2</Name>
-        <IfName>SPUD</IfName>
-        <LastSessionClosedTimeout>4</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>6</LastSocketClosedTimeout>
-        <LastSocketActivityTimeout>8</LastSocketActivityTimeout>                
-    </ModemBearer>    
-</ModemBearerTable>
-
-
-
-<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.SPUD_1</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>
-        <IpGateway>192.168.20.11</IpGateway>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-	<UmtsR99QoSAndOnRef>UmtsR99QoSAndOn.R99Default1</UmtsR99QoSAndOnRef>
-    </OutgoingGPRS>
-
-    
-    <OutgoingGPRS operation="add">
-        <Name>RawIP_StaticIP</Name>
-        <PDPType>IPV4</PDPType>
-        <IfParams>lowernif=RAWIP</IfParams>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpAddr>192.168.1.10</IpAddr>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>  
-        <IpNameServer1>192.168.100.1</IpNameServer1>
-        <IpNameServer2>192.168.200.2</IpNameServer2>
-    </OutgoingGPRS>
-
-    <OutgoingGPRS operation="add">
-        <Name>LeaveInNifCreation</Name>
-        <PDPType>IPV4</PDPType>
-        <IfParams>lowernif=Crash</IfParams>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>  
-        <IpAddr>192.168.1.2</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>
-
-<UmtsR99QoSAndOnTable>
-	<UmtsR99QoSAndOn operation="add">
-		<Name>R99Default1</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> 
-	</UmtsR99QoSAndOn>
-</UmtsR99QoSAndOnTable>
-
-
-
-</CommDB:Config>
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/configs/spud_staticip/te_spud_staticip_config.txt	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,213 +0,0 @@
-
-############################################################################
-############################################################################
-###################              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,192.168.1.10,0, 2, 0, 0,RasUser,,,,192.168.100.1,192.168.200.2,0
-
-# 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.10, 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.10, 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.10, 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>
-
-# 0) Same as qospolicies.ini defaults
-####################### 0     1     2      3    4     5     6    7  8  9  10 11 12  13    14    15    16    17    18   19 20 21 22 23 24
-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
-
-#R5 Qos Settings
-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
-
-
-# 1) same as ExtensionQosIPLink99Set.ini
-QosProfileReqR99 = PRIMARY1,0x04, 0x04, 0x04, 0x04, 0x08, 0x08, 0, 0, 128, 128, 128, 128, 0x20, 0x20, 0x10, 0x10, 0x04, 0x04, 128, 128, 128, 128, 128, 128
-
-#R5 Qos Settings
-QosProfileReqR5 = PRIMARY1,0x04, 0x04, 0x04, 0x04, 0x08, 0x08, 0, 0, 128, 128, 128, 128, 0x20, 0x20, 0x10, 0x10, 0x04, 0x04, 128, 128, 128, 128, 128, 128, 0, 0
-
-
-# 2) same as ExtensionQosIPLink99Set.ini Config1Case6
-QosProfileReqR99 = PRIMARY1,0x04, 0x04, 0x04, 0x04, 0x08, 0x08, 0, 0, 2048, 2048, 2048, 2048, 0x20, 0x20, 0x10, 0x10, 0x04, 0x04, 128, 128, 128, 128, 128, 128
-
-#R5 Qos Settings
-QosProfileReqR5 = PRIMARY1,0x04, 0x04, 0x04, 0x04, 0x08, 0x08, 0, 0, 2048, 2048, 2048, 2048, 0x20, 0x20, 0x10, 0x10, 0x04, 0x04, 128, 128, 128, 128, 128, 128, 0, 0
-
-
-# 3) same as commdb defaults
-QosProfileReqR99 = PRIMARY1,0x02, 0x02, 0x02, 0x02, 0x04, 0x04, 1500, 1500, 512, 512, 512, 512, 0x01, 0x01, 0x01, 0x01, 0x04, 0x04, 4, 4, 512, 512, 512, 512
-
-#R5 Qos Settings
-QosProfileReqR5 = PRIMARY1,0x02, 0x02, 0x02, 0x02, 0x04, 0x04, 1500, 1500, 512, 512, 512, 512, 0x01, 0x01, 0x01, 0x01, 0x04, 0x04, 4, 4, 512, 512, 512, 512, 0, 0
-
-
-#TProfileNegR99 =
-#0 <contextName>
-#1 <duration>
-#2 <negTraffic>
-#3 <negDeliveryOrder>
-#4 <negErroneousSDUDelivery>
-#5 <negMaxSDUSize>
-#
-#6 <negBitErrorRatio>
-#7 <negSDUErrorRatio>
-#8 <negTrafficHandlingPriority>
-#9 <negTransferDelay>
-#
-#10 <negGuaranteedUpLinkBitRate>
-#11 <negGuaranteedDownLinkBitRate>
-#12 <negMaxUpLinkRate>
-#13 <negMaxDownLinkRate>
-
-# 0) Negotiated qos to return for QosProfileReqR99 #0
-#                     0       1    2      3     4   5   6     7     8    9  10 11 12 13
-QosProfileNegR99 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3
-
-#R5 Qos Settings
-QosProfileNegR5 = PRIMARY1, 0x03, 0x01, 0x03, 0x01, 1, 0x03, 0x01, 0x03, 1, 1, 3, 1, 3, 0, 0
-
-# 1) Negotiated qos to return for QosProfileReqR99 #1
-QosProfileNegR99 = PRIMARY1, 0x01, 0x04, 0x04, 0x08, 0, 0x20, 0x10, 0x04, 128, 128, 128, 128, 128
-
-#R5 Qos Settings
-QosProfileNegR5 = PRIMARY1, 0x01, 0x04, 0x04, 0x08, 0, 0x20, 0x10, 0x04, 128, 128, 128, 128, 128, 0, 0
-
-# 2) Negotiated qos to return for QosProfileReqR99 #2
-
-QosProfileNegR99 = PRIMARY1, 0x01, 0x04, 0x04, 0x08, 0, 0x20, 0x10, 0x04, 128, 128, 128, 2048, 2048
-
-#R5 Qos Settings
-QosProfileNegR5 = PRIMARY1, 0x01, 0x04, 0x04, 0x08, 0, 0x20, 0x10, 0x04, 128, 128, 128, 2048, 2048, 0, 0
-
-# 3) Negotiated qos to return for QosProfileReqR99 #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
-
-#R5 Qos Settings
-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
-
-#R5 Qos Settings
-QosR5NetworkNotification = PRIMARY1, 0x04, 0x02, 0x04, 0x02, 2, 0x04, 0x02, 0x04, 2, 2, 4, 2, 4, 0, 0
-
-#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
-
-#SetProfileFail= <contextName> <numberOfTimes> <errorCode> <setProfileDigit>
-SetProfileFail = NEG_99, 0x04, 0x02
-
-setqosdelay = 1,1
-
-
-#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
-
-
-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>
-
-#Current status is unknown. 
-#   EStatusUnknown =0
-#Context is not activated. 
-#   EStatusInactive =1
-#Context is currently being activated. 
-#   EStatusActivating=2
-#Context is active. 
-#   EStatusActive=3
-#Context is currently being deactivated. 
-#   EStatusDeactivating=4        
-#Context is suspended. 
-#   EStatusSuspended=5
-#Context has been deleted. 
-#   EStatusDeleted=6
-
-NotifyContextStatusChange = PRIMARY1, 0, 5
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/configs/spud_staticip/te_spud_staticip_loopback.ini	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-# Defining a loopback between port A and B is as follows:
-# Port = <PortA>,<PortB>,<delay>,<queue size>,<element (packet) size>
-
-[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
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/group/TE_SpudRSubConn.mmp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-// Copyright (c) 2005-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:
-// Network-side events /errors SPUD testing.
-// 
-//
-
-/**
- @file
-*/
-
-TARGET      te_spudrsubconnsvr.exe
-CAPABILITY ReadDeviceData WriteDeviceData NetworkControl NetworkServices ReadUserData WriteUserData 
-TARGETTYPE  exe
-UID             0x1000007A 0x102075B1
-VENDORID 0x70000001
-
-
-SOURCEPATH  ../src
-SOURCE		te_spudRSubConnSvr.cpp
-SOURCE		te_spudRSubConnSteps.cpp
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY		euser.lib  
-LIBRARY     esock.lib 
-LIBRARY     insock.lib
-LIBRARY     qoslib.lib
-LIBRARY     commdb.lib
-LIBRARY		testexecuteutils.lib 
-LIBRARY		testexecutelogclient.lib 
-LIBRARY 	c32root.lib
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/group/TE_spudRSubConn.iby	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-// Copyright (c) 2005-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 TE_SPUD_RSUBCONN_IBY
-#define TE_SPUD_RSUBCONN_IBY
-
-file=ABI_DIR\DEBUG_DIR\TE_SpudRSubConnSvr.exe		System\Libs\TE_SpudRSubConnSvr.exe
-
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SpudRSubConn.script 			testdata\scripts\TE_SpudRSubConn.script
- 
-data=EPOCROOT##epoc32\data\z\testdata\configs\spudRSubConnPPP_loopback.xml 		testdata\configs\spudRSubConnPPP_loopback.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\spudRSubConnPPP_pcktloopback.ini  testdata\configs\spudRSubConnPPP_pcktloopback.ini
-data=EPOCROOT##epoc32\data\z\testdata\configs\spudRSubConnPPP_loopback.ini      testdata\configs\spudRSubConnPPP_loopback.ini 
-data=EPOCROOT##epoc32\data\z\testdata\configs\spudRSubConnPPP.ini 				testdata\configs\spudRSubConnPPP.ini
-data=EPOCROOT##epoc32\data\z\testdata\configs\spudRSubConnPPP_config.txt 		testdata\configs\spudRSubConnPPP_config.txt
-data=EPOCROOT##epoc32\data\z\testdata\configs\spudRSubConnPPP_qospolicies.ini	testdata\configs\spudRSubConnPPP_qospolicies.ini
-
-
-
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_spud_staticip.script           testdata\scripts\te_spud_staticip.script
-
-data=EPOCROOT##epoc32\data\z\testdata\configs\spud_staticip\socketserv.ini         testdata\configs\spud_staticip\socketserv.ini
-data=EPOCROOT##epoc32\data\z\testdata\configs\spud_staticip\connection.ini         testdata\configs\spud_staticip\connection.ini
-data=EPOCROOT##epoc32\data\z\testdata\configs\spud_staticip\subconnection.ini      testdata\configs\spud_staticip\subconnection.ini
-data=EPOCROOT##epoc32\data\z\testdata\configs\spud_staticip\simtsy.ini             testdata\configs\spud_staticip\simtsy.ini
-data=EPOCROOT##epoc32\data\z\testdata\configs\spud_staticip\te_spud_staticip.xml   testdata\configs\spud_staticip\te_spud_staticip.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\spud_staticip\te_spud_staticip_config.txt    testdata\configs\spud_staticip\te_spud_staticip_config.txt
-data=EPOCROOT##epoc32\data\z\testdata\configs\spud_staticip\te_spud_staticip_loopback.ini  testdata\configs\spud_staticip\te_spud_staticip_loopback.ini
-
-#endif
-// TE_SPUD_RSUBCONN_IBY
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/group/bld.inf	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-// Copyright (c) 2005-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:
-// SPUD- RSubConnection integration testing.
-// 
-//
-
-/**
- @file
-*/
-
-PRJ_TESTEXPORTS
-../scripts/TE_SpudRSubConn.script              z:/testdata/scripts/TE_SpudRSubConn.script
-
-../configs/spudRSubConnPPP_loopback.xml        z:/testdata/configs/spudRSubConnPPP_loopback.xml
-../configs/spudRSUbConnPPP_loopback.ini        z:/testdata/configs/spudRSubConnPPP_loopback.ini
-../configs/spudRSUbConnPPP_pcktloopback.ini    z:/testdata/configs/spudRSubConnPPP_pcktloopback.ini
-../configs/spudRSUbConnPPP.ini                 z:/testdata/configs/spudRSubConnPPP.ini
-../configs/spudRSubConnPPP_config.txt          z:/testdata/configs/spudRSubConnPPP_config.txt
-../configs/spudRSubConnPPP_qospolicies.ini     z:/testdata/configs/spudRSubConnPPP_qospolicies.ini
-
-../scripts/te_spud_staticip.script              z:/testdata/scripts/te_spud_staticip.script
-
-../configs/spud_staticip/socketserv.ini         z:/testdata/configs/spud_staticip/socketserv.ini
-../configs/spud_staticip/connection.ini         z:/testdata/configs/spud_staticip/connection.ini
-../configs/spud_staticip/subconnection.ini      z:/testdata/configs/spud_staticip/subconnection.ini
-../configs/spud_staticip/simtsy.ini             z:/testdata/configs/spud_staticip/simtsy.ini
-../configs/spud_staticip/te_spud_staticip.xml   z:/testdata/configs/spud_staticip/te_spud_staticip.xml
-../configs/spud_staticip/te_spud_staticip_config.txt    z:/testdata/configs/spud_staticip/te_spud_staticip_config.txt
-../configs/spud_staticip/te_spud_staticip_loopback.ini  z:/testdata/configs/spud_staticip/te_spud_staticip_loopback.ini
-
-TE_SpudRSubConn.iby                            /epoc32/rom/include/TE_SpudRSubConn.iby
-
-PRJ_TESTMMPFILES
-TE_SpudRSubConn.mmp
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/scripts/TE_spudRSubConn.script	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,185 +0,0 @@
-// Copyright (c) 2004-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:
-// Secondary PDP-context UMTS Driver integration tests with RSubConnection
-//
-
-//! @file
-
-// Configure CommDB for the tests
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-ced -i z:\TestData\Configs\spudRSubConnPpp_loopback.xml
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-LOAD_SUITE TE_SpudRSubConnSvr
-
-
-
-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  MakeReadWrite c:\qospolicies.ini
-RUN_UTILS  MakeReadWrite c:\private\101F7989\esock\qospolicies.ini
-
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  DeleteFile c:\loopback.ini
-RUN_UTILS  DeleteFile c:\qospolicies.ini
-RUN_UTILS  DeleteFile c:\private\101F7989\esock\qospolicies.ini
-
-RUN_UTILS  CopyFile z:\TestData\Configs\spudRSubConnPPP_config.txt c:\simtsy\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\spudRSubConnPPP_config.txt c:\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\spudRSubConnPPP_pcktloopback.ini c:\loopback.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\spudRSubConnPPP_qospolicies.ini c:\qospolicies.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\spudRSubConnPPP_qospolicies.ini c:\private\101F7989\esock\qospolicies.ini
-
-
-
-START_TESTCASE          NET-Spud-RSubConn-0101
-//! @SYMTestCaseID      NET-Spud-RSubConn-0101
-//! @SYMTestCaseDesc Send Use RSubConnection API to send UDP packets over the primary and the secondary PDP contexts. 
-//! @SYMFssID 
-//! @SYMTestActions Explicity start SPUD. Open RSubConnection to activate a secondary ctx. Send data over primary & secondary.
-//! @SYMTestActions Connected socket is added to secondary ctx.
-//! @SYMTestExpectedResults  All operations succeed with KErrNone.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-CONCURRENT
-RUN_TEST_STEP 69 TE_SpudRSubConnSvr CLoopbackPpp1 z:\testdata\configs\spudRSubConnPPP_loopback.ini LoopbackPppUdp1
-RUN_TEST_STEP 69 TE_SpudRSubConnSvr CLoopbackPpp1 z:\testdata\configs\spudRSubConnPPP_loopback.ini LoopbackPppUdp3
-RUN_TEST_STEP 60 TE_SpudRSubConnSvr CUdp1 z:\testdata\configs\spudRSubConnPPP.ini UdpEcho1
-END_TESTCASE            NET-Spud-RSubConn-0101
-
-RUN_SCRIPT Z:\TestData\Scripts\te_esock_test_stopallinterfaces.script
-RUN_SCRIPT Z:\TestData\scripts\te_esock_test_unloadesockForced.script
-
-
-RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
-
-START_TESTCASE          NET-Spud-RSubConn-0102
-//! @SYMTestCaseID      NET-Spud-RSubConn-0102
-//! @SYMTestCaseDesc Same as TE_SpudRSubConn_01, but QoS Parameters are set explicitly on the secondary pdp context. 
-//! 				 QoS parameters are passed via the QoS framework, GUQoS and SPUD to SIM TSY unchanged.
-//! @SYMFssID 
-//! @SYMTestActions same as TE_SpudRSubConn_01, but set QoS parameters explicitly.
-//!                 SIM TSY verifies the QoS parameters requested are correct (i.e. not modified in transit)
-//! @SYMTestExpectedResults  All operations succeed with KErrNone.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-CONCURRENT
-RUN_TEST_STEP 69 TE_SpudRSubConnSvr CLoopbackPpp1 z:\testdata\configs\spudRSubConnPPP_loopback.ini LoopbackPppUdp1
-RUN_TEST_STEP 69 TE_SpudRSubConnSvr CLoopbackPpp1 z:\testdata\configs\spudRSubConnPPP_loopback.ini LoopbackPppUdp3
-RUN_TEST_STEP 60 TE_SpudRSubConnSvr CUdp1 z:\testdata\configs\spudRSubConnPPP.ini UdpEcho2
-END_TESTCASE            NET-Spud-RSubConn-0102
-
-RUN_SCRIPT Z:\TestData\Scripts\te_esock_test_stopallinterfaces.script
-RUN_SCRIPT Z:\TestData\scripts\te_esock_test_unloadesockForced.script
-RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-START_TESTCASE          NET-Spud-RSubConn-0103
-//! @SYMTestCaseID      NET-Spud-RSubConn-0103
-//! @SYMTestCaseDesc Verify that SPUD correctly handles a scenario where GUQoS attempts to send on a context when 
-//! 				 the Context's lower NIF is Down.
-//! @SYMFssID 
-//! @SYMTestActions 1. Create Primary PDP Context, and bring up the lower NIF. 2. Make the lower NIF for the context to 
-//!                 report LinkLayerDown (by causing the peer PPP to send TerminateRequest). SIM TSY is configured to pause
-//!                 on deletion long enough to allow GUQoS sufficient time to attempt a send before the context is deleted.
-//!                 3. Send a packet on the context. Verify the packet was sent OK. 
-//! @SYMTestExpectedResults  All operations succeed with KErrNone. There is no panics (Spudman panics when GUQoS sends on down lower NIF)
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-RUN_TEST_STEP 90 TE_SpudRSubConnSvr CUpperFlowOnLowerNifDown z:\testdata\configs\spudRSubConnPPP.ini UpperFlowLowerNifDown1
-END_TESTCASE            NET-Spud-RSubConn-0103
-
-RUN_SCRIPT Z:\TestData\Scripts\te_esock_test_stopallinterfaces.script
-RUN_SCRIPT Z:\TestData\scripts\te_esock_test_unloadesockForced.script
-
-
-RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-START_TESTCASE          NET-Spud-RSubConn-0104
-//! @SYMTestCaseID      NET-Spud-RSubConn-0104
-//! @SYMTestCaseDesc Verify that SPUD with PPP lower NIF correctly RConnection::Stop with EStopNormal, and can be restarted. 
-//! @SYMFssID 
-//! @SYMTestActions 1. Create Primary PDP Context, and bring up the lower NIF.  Stop Spud with EStopNormal. Restart Spud.
-//! @SYMTestExpectedResults  All operations succeed with KErrNone. There is no panics. Spud can be re-started.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-CONSECUTIVE
-RUN_TEST_STEP 90 TE_SpudRSubConnSvr CSpudPppPrimaryStop z:\testdata\configs\spudRSubConnPPP.ini SpudRestartAfterNormalStop
-DELAY 4000
-RUN_TEST_STEP 90 TE_SpudRSubConnSvr CSpudPppPrimaryStop z:\testdata\configs\spudRSubConnPPP.ini SpudRestartAfterNormalStop
-DELAY 4000
-RUN_TEST_STEP 90 TE_SpudRSubConnSvr CSpudPppPrimaryStop z:\testdata\configs\spudRSubConnPPP.ini SpudRestartAfterNormalStop
-DELAY 4000
-END_TESTCASE            NET-Spud-RSubConn-0104
-
-
-RUN_SCRIPT Z:\TestData\Scripts\te_esock_test_stopallinterfaces.script
-
-
-START_TESTCASE          NET-Spud-RSubConn-0105
-//! @SYMTestCaseID      NET-Spud-RSubConn-0105
-//! @SYMTestCaseDesc Verify that SPUD with PPP lower NIF correctly RConnection::Stop with EStopAuthoritative, and can be restarted. 
-//! @SYMFssID 
-//! @SYMTestActions 1. Create Primary PDP Context, and bring up the lower NIF.  Stop Spud with EStopAuthoritative. Restart Spud.
-//! @SYMTestExpectedResults  All operations succeed with KErrNone. There is no panics. Spud can be re-started.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-CONSECUTIVE
-DELAY 24000
-RUN_TEST_STEP 90 TE_SpudRSubConnSvr CSpudPppPrimaryStop z:\testdata\configs\spudRSubConnPPP.ini SpudRestartAfterAuthStop
-DELAY 4000
-RUN_TEST_STEP 90 TE_SpudRSubConnSvr CSpudPppPrimaryStop z:\testdata\configs\spudRSubConnPPP.ini SpudRestartAfterAuthStop
-DELAY 4000
-RUN_TEST_STEP 90 TE_SpudRSubConnSvr CSpudPppPrimaryStop z:\testdata\configs\spudRSubConnPPP.ini SpudRestartAfterAuthStop
-DELAY 4000
-END_TESTCASE            NET-Spud-RSubConn-0105
-
-
-
-RUN_SCRIPT Z:\TestData\Scripts\te_esock_test_stopallinterfaces.script
-RUN_SCRIPT Z:\TestData\scripts\te_esock_test_unloadesockForced.script
-RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
-
-
-START_TESTCASE 			NET-Spud-RSubConn-0106
-//! @SYMTestCaseID		NET-Spud-RSubConn-0106
-//! @SYMTestCaseDesc Send Use RSubConnection API to send UDP packets over the primary and the secondary PDP contexts. 
-//! @SYMFssID 
-//! @SYMTestActions Explicity start SPUD. Open RSubConnection to activate a secondary ctx. Send data over primary & secondary.
-//! @SYMTestActions Socket is open explicitly on secondary ctx.
-//! @SYMTestExpectedResults  All operations succeed with KErrNone.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType CIT
-CONCURRENT
-RUN_TEST_STEP 69 TE_SpudRSubConnSvr CLoopbackPpp1 z:\testdata\configs\spudRSubConnPPP_loopback.ini LoopbackPppUdp1
-RUN_TEST_STEP 69 TE_SpudRSubConnSvr CLoopbackPpp1 z:\testdata\configs\spudRSubConnPPP_loopback.ini LoopbackPppUdp3
-RUN_TEST_STEP 60 TE_SpudRSubConnSvr CUdp2 z:\testdata\configs\spudRSubConnPPP.ini UdpEcho1
-END_TESTCASE			NET-Spud-RSubConn-0106
-
-RUN_SCRIPT Z:\TestData\Scripts\te_esock_test_stopallinterfaces.script
-RUN_SCRIPT Z:\TestData\scripts\te_esock_test_unloadesockForced.script
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/scripts/te_spud_staticip.script	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-// 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:
-// Spud Test for DEF113516 - Static Ip and Dns is not handled correctly in SPUD
-//
-
-//! @file 
-
-PRINT te_spud_staticip - DEF113516 - Static Ip and Dns is not handled correctly in SPUD
-
-// Ensure that the default config is present if no cleverer one has been put there already
-RUN_SCRIPT z:\testdata\scripts\exec_esock_default_to_config_1.script
-RUN_SCRIPT Z:\TestData\scripts\te_esock_test_unloadesockForced.script
-
-CED -i z:\testdata\configs\spud_staticip\te_spud_staticip.xml ced.log
-
-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  MakeReadWrite c:\qospolicies.ini
-RUN_UTILS  MakeReadWrite c:\private\101F7989\esock\qospolicies.ini
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  DeleteFile c:\loopback.ini
-RUN_UTILS  DeleteFile c:\qospolicies.ini
-RUN_UTILS  DeleteFile c:\private\101F7989\esock\qospolicies.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\spud_staticip\te_spud_staticip_config.txt c:\simtsy\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\spud_staticip\te_spud_staticip_config.txt c:\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\spud_staticip\te_spud_staticip_loopback.ini c:\loopback.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\qospolicies.ini c:\qospolicies.ini
-RUN_UTILS  CopyFile z:\TestData\Configs\qospolicies.ini c:\private\101F7989\esock\qospolicies.ini
-
-LOAD_SUITE te_esockteststepsSuite -SharedData
-RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
-
-START_TESTCASE NET_SPUD_DEF113516
-
-RUN_TEST_STEP 100 te_esockteststepsSuite startsimtsyStep z:\testdata\configs\spud_staticip\simtsy.ini
-RUN_TEST_STEP 100 te_esockteststepsSuite creatersocketservStep z:\testdata\configs\spud_staticip\socketserv.ini
-RUN_TEST_STEP 100 te_esockteststepsSuite createrconnectionStep z:\testdata\configs\spud_staticip\connection.ini
-RUN_TEST_STEP 100 te_esockteststepsSuite creatersubconnectionStep z:\testdata\configs\spud_staticip\subconnection.ini
-
-RUN_TEST_STEP 100 te_esockteststepsSuite connectrsocketservStep z:\testdata\configs\spud_staticip\socketserv.ini
-RUN_TEST_STEP 100 te_esockteststepsSuite openrconnectionStep z:\testdata\configs\spud_staticip\connection.ini
-RUN_TEST_STEP 100 te_esockteststepsSuite startrconnectionStep z:\testdata\configs\spud_staticip\connection.ini
-
-RUN_TEST_STEP 100 te_esockteststepsSuite openrsubconnectionStep z:\testdata\configs\spud_staticip\subconnection.ini
-
-RUN_TEST_STEP 100 te_esockteststepsSuite closersubconnectionStep z:\testdata\configs\spud_staticip\subconnection.ini
-RUN_TEST_STEP 100 te_esockteststepsSuite closerconnectionStep z:\testdata\configs\spud_staticip\connection.ini
-RUN_TEST_STEP 100 te_esockteststepsSuite closersocketservStep z:\testdata\configs\spud_staticip\socketserv.ini
-
-RUN_TEST_STEP 100 te_esockteststepsSuite stopsimtsyStep z:\testdata\configs\spud_staticip\simtsy.ini
-RUN_TEST_STEP 100 te_esockteststepsSuite cleanallStep
-END_TESTCASE NET_SPUD_DEF113516
-
-RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
-
-PRINT Complete te_spud_staticip - DEF113516 - Static Ip and Dns is not handled correctly in SPUD
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/src/te_spudRSubConnSteps.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,758 +0,0 @@
-// Copyright (c) 2005-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:
-// te_spudNetworkSideSteps.cpp
-// Implements the integration tests for the SPUD using RawIpNif
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-
-#include "te_spudRSubConnSteps.h"
-#include <simtsy.h>
-#include <commdbconnpref.h>
-#include <nifvar.h> // Nifman Progress notifications
-#include <es_enum.h> 
-#include <c32comm.h> // uniquely for the call to StartC32WithCMISuppressions
-#include <e32property.h>
-#include <ip_subconparams.h>
-
-namespace
-	{
-	const TInt KMaxMsgLen = 128;
-	}
-/**
- Implements the pure virtual doTestStepPreambleL defined in CTestStep. 
- Used to disable the phone book synchronizer
- which may cause the tests to fail.
- 
- 
- @return EPass if successful.
- @leave If Phonebook synchronizer disabling fails. 
- */
-TVerdict CSpudRSubConnTestStepBase::doTestStepPreambleL()
-	{	
-	_LIT(KPhbkSyncCMI, "phbsync.cmi");
-	TInt err = StartC32WithCMISuppressions(KPhbkSyncCMI);
-	TESTL(KErrNone == err || KErrAlreadyExists == err);
-	INFO_PRINTF1(_L("Test Step Preamble: disabled Phonebook Synchronizer."));	
-	return EPass;
-	}
-	
-
-/**
- Implements the pure virtual doTestStepL defined in CTestStep. 
- Allows the base class to execute before any of the derived 
- tests is called.
- 
- @leave If any of the called methods leaves.
- */
-TVerdict CSpudRSubConnTestStepBase::doTestStepL()
-	{
-	// Tell SIM.TSY which test it should load. 
-	// If this is removed, SIM TSY will load test 0.
-	
-	TInt simTsyTestNum = -1;
-	ASSERT(GetIntFromConfig(ConfigSection(), _L("SimTsyTestNum"), simTsyTestNum));
-	ASSERT(simTsyTestNum >= 0);
-	
-	TInt ret0 =  RProperty::Set(KUidPSSimTsyCategory,KPSSimTsyTestNumber,simTsyTestNum);
-    if (ret0 != KErrNone)
-    	{
-    	ret0 =  RProperty::Set(KUidPSSimTsyCategory,KPSSimTsyTestNumber,simTsyTestNum);
-    	}
-
-		
-	TRAPD(esockConnErr, TestL(iESock.Connect(), _L("RSockeServ::Connect")));
-	if(KErrNone != esockConnErr)
-		{
-		INFO_PRINTF1(_L("ESock thread is dead. Most likely, it was crashed by the previous test case. Check the Root Server logs."));
-		SetTestStepResult(EInconclusive);
-		return TestStepResult();
-		}
-	
-	
-	ASSERT(!CActiveScheduler::Current()); // We should not have an AS at this point.
-	CActiveScheduler* testSched = new(ELeave) CActiveScheduler;
-	CleanupStack::PushL(testSched);
-	CActiveScheduler::Install(testSched);
-	
-	
-	// Test sequence itself:
-	TVerdict testResult = EFail;		
-	TRAPD(err, testResult = RunTestStepL());
-	if(KErrNone == err)
-		{
-		INFO_PRINTF1(_L("Test Step Completion."));
-		SetTestStepResult(testResult);
-		}
-	else
-		{
-		ERR_PRINTF2(_L("Test Step Failure: the step left with [%d]"), err);
-		SetTestStepResult(EFail);
-		}
-	
-	// It's ok to close everything more than once, or if not opened...
-	iPrimCtxSock1.Close();
-	iScndCtxSock1.Close();
-	iSpudScndCtx1.Close();
-	iSpud.Close(); // SPUD will linger, we don't care.
-	iESock.Close();
-	
-	CActiveScheduler::Install(NULL); // uninstall the test scheduler
-	CleanupStack::PopAndDestroy(testSched);
-	
-	return TestStepResult();	
-	}
-
-
-
-
-	
-
-
-
-
-/**
-Logs a message and leaves on error 
-
-@param aErrCode error code to check
-@param aMsg message to log 
-@leave if aError is other than KErrNone
-*/
-void CSpudRSubConnTestStepBase::TestL(TInt aErrCode, const TDesC& aMsg)
-	{	
-	TestL(aErrCode, KErrNone, aMsg);
-	}
-
-/**
-Used to verify that an error code is what expected, and log the associated comment
-
-@param aErrCode the error code to check
-@param aExpErrCode the expected error code
-@param aMsg the message to log before testing
-@leave if aErrCode != aExpErrCode
-*/	
-void CSpudRSubConnTestStepBase::TestL(TInt aErrCode, TInt aExpErrCode, const TDesC& aMsg)
-	{	
-	if(aExpErrCode == aErrCode)
-		{
-		INFO_PRINTF3(_L("%S: err[%d], as expected. OK."), &aMsg, aErrCode);
-		}
-	else
-		{
-		ERR_PRINTF5(_L("%S FAILED: err[%d], expected [%d]. Leaving with [%d])."), &aMsg, aErrCode, aExpErrCode, aErrCode);
-		User::Leave(aErrCode);
-		}
-	}
-
-/**
-Used to verify that a boolean is as expected, and log the associated comment
-
-@param aBool the boolean to check
-@param aMsg the message to log before testing
-@leave if aBool == EFalse
-*/	
-void CSpudRSubConnTestStepBase::TestBooleanTrueL(TBool aBool, const TDesC& aMsg)
-	{
-	if(aBool)
-		{
-		INFO_PRINTF2(_L("%S: Value is true, as expected. OK."), &aMsg);
-		}
-	else
-		{
-		ERR_PRINTF2(_L("Failed, %S: Value is false. Leaving with KErrGeneral)."), &aMsg);
-		User::Leave(KErrGeneral);
-		}
-	}
-	
-	
-
-/**
-Open and Start an interface */
-void CSpudRSubConnTestStepBase::OpenAndStartInterfaceL(RConnection& aConn, TCommDbConnPref& aPref, TRequestStatus& aSt, const TDesC& aLogMsg)
-	{
-	INFO_PRINTF3(_L("%S: Opening and Starting RConnection on IAP=%d."), &aLogMsg, aPref.IapId());
-	TInt openErr = aConn.Open(iESock, KAfInet);
-	TestL(openErr, KErrNone, _L("Opening RConnection"));
-	aConn.Start(aPref, aSt);	
-	}
-	
-void CSpudRSubConnTestStepBase::WaitForCompletionL(TRequestStatus& aSt, TInt aExpErrCode, const TDesC& aLogMsg)
-	{
-	INFO_PRINTF3(_L("%S: Waiting for completion with %d"), &aLogMsg, aExpErrCode);
-	User::WaitForRequest(aSt);
-	INFO_PRINTF3(_L("%S completed with status= %d"), &aLogMsg, aSt.Int());
-	TestL(aSt.Int(), aExpErrCode, aLogMsg);
-	}
-
-void CSpudRSubConnTestStepBase::ReceiveOnSocketL(RSocket& aSocket, const TDesC& aLogMsg)
-	{
-	INFO_PRINTF2(_L("%S: Waiting to receive."), &aLogMsg);
-	TRequestStatus recvSt;
-	TBuf8<256> recvBuf;
-	TInetAddr srcAddr;
-	aSocket.RecvFrom(recvBuf, srcAddr, 0x0, recvSt);
-	WaitForCompletionL(recvSt, KErrNone, _L("Received on Socket"));	
-	}
-	
-
-void CSpudRSubConnTestStepBase::VerifyBuffersEqualL(const TDesC8& aBuf1, const TDesC8& aBuf2)
-	{
-	if(0 != aBuf1.Compare(aBuf2))
-		{
-		INFO_PRINTF1(_L("Buffer 1 is not equal to Buffer 2. FAILURE."));
-		User::Leave(KErrCorrupt);		
-		}
-	}
-
-void CSpudRSubConnTestStepBase::WriteReadOnSocketL(RSocket& aSocket, const TDesC& aLogMsg)
-	{
-	INFO_PRINTF2(_L("%S: WriteReadOnSocketL"), &aLogMsg);
-	
-	TRequestStatus wSt1;
-   	TBuf8<KMaxMsgLen> writeBuf(_L8("WRITE READ"));
-   	
-   	aSocket.Write(writeBuf, wSt1);
-    WaitForCompletionL(wSt1, KErrNone, _L("Write on Socket"));
-    
-    TBuf8<KMaxMsgLen> readBuf;
-	TRequestStatus rSt;
-	aSocket.Read(readBuf, rSt);
-	WaitForCompletionL(rSt, KErrNone, _L("Read on Socket")); 
-	
-	VerifyBuffersEqualL(writeBuf, readBuf);
-	}
-
-
-void CSpudRSubConnTestStepBase::SendRecvOnSocketL(RSocket& aSocket, TInetAddr& aDstAddr, const TDesC& aLogMsg)
-	{
-	INFO_PRINTF2(_L("%S: SendRecvOnSocketL"), &aLogMsg);
-		
-	TBuf8<KMaxMsgLen> sendBuf(_L8("SEND RECEIVE"));
-	TRequestStatus sendSt;
-    aSocket.SendTo(sendBuf, aDstAddr, 0x0, sendSt);
-	WaitForCompletionL(sendSt, KErrNone, _L("Send on Socket"));
-			
-	TBuf8<KMaxMsgLen> recvBuf;		
-	TRequestStatus recvSt;
-	aSocket.RecvFrom(recvBuf, aDstAddr, 0x0, recvSt);
-	WaitForCompletionL(recvSt, KErrNone, _L("Receive on Socket"));
-	
-	VerifyBuffersEqualL(recvBuf, sendBuf);
-	}
-	
-void CSpudRSubConnTestStepBase::RecvSendOnSocketL(RSocket& aSocket, const TDesC& aLogMsg)
-	{
-	INFO_PRINTF2(_L("%S: **Bounce: RecvSendOnSocket"), &aLogMsg);
-	
-	
-	TRequestStatus st;
-	TBuf8<KMaxMsgLen> recvBuf;
-	TInetAddr srcAddr;
-	aSocket.RecvFrom(recvBuf, srcAddr, 0x0, st);
-	WaitForCompletionL(st, KErrNone, _L("**Bounce: Receive on Socket"));	
-		
-	aSocket.SendTo(recvBuf, srcAddr, 0x0, st);
-	WaitForCompletionL(st, KErrNone, _L("**Bounce: Send on Socket"));	
-	}
-
-
-void CSpudRSubConnTestStepBase::OpenAndBindSocketL(RSocket& aSock, RConnection& aIface, TUint aLocalPort, const TDesC& aLogMsg)
-	{
-	INFO_PRINTF3(_L("%S: Opening and Binding to port= %d"), &aLogMsg, aLocalPort);
-	TInt ret = aSock.Open(iESock, 
-    	KAfInet, 
-        KSockDatagram, 
-        KProtocolInetUdp,
-        aIface);
-        
-    TestL(ret, KErrNone, _L("Open UDP Socket"));
-	
-	TInetAddr localAddr;
-	localAddr.SetPort(aLocalPort);
-	TestL(aSock.Bind(localAddr), KErrNone, _L("Bind Socket"));
-	}
-//
-
-
-/**
-Used in lieu of proper network-based server 
-Open an interface, opens a socket on this interface, receives-sends udp (bounces) */
-TVerdict CLoopbackPpp1::RunTestStepL()
-	{
-	// Figure out our name, so that the logging makes sense:
-	TBuf<64> ourName(_L("BOUNCE"));
-	ourName.AppendFormat(_L("[%x]"), this);
-	
-	TInt iapId = -1;
-	ASSERT(GetIntFromConfig(ConfigSection(), _L("IapId"), iapId));
-	ASSERT(iapId > 0);
-		
-	TCommDbConnPref pref;
-    pref.SetIapId(iapId);
-	
-	RConnection iface;
-	ASSERT(KErrNone == iface.Open(iESock, KAfInet));
-    TRequestStatus startSt;
-    iface.Start(pref, startSt);
-    User::WaitForRequest(startSt);
-	INFO_PRINTF4(_L("%S: Interface on Iap ID =%d started with error=%d."), &ourName, iapId, startSt.Int());	
-	User::LeaveIfError(startSt.Int());	
-	
-	TInt localPort = 0x0;
-	ASSERT(GetIntFromConfig(ConfigSection(), _L("UdpEchoPort"), localPort));
-    ASSERT(localPort > 0x0); 
-    
-    RSocket bounceSock;
-    OpenAndBindSocketL(bounceSock, iface, static_cast<TUint>(localPort), ourName);
-    
-    TInt iterations = 0;
-    ASSERT(GetIntFromConfig(ConfigSection(), _L("Iterations"), iterations));
-    ASSERT(iterations > 0);
-    
-    for(TInt iter = 0; iter < iterations; ++iter)
-	    {
-	    RecvSendOnSocketL(bounceSock, ourName);
-	    }
-    
-   	bounceSock.Close();
-	iface.Close(); // Leave interface lingering, it will be nuked when the peer PPP terminates.
-	return EPass;		
-	}
-
-
-TBool CSpudRSubConnTestStepBase::ApplyQoSParametersL(RSubConnection& aPdpContext)
-	{
-	TInt qosParamSet = 0;
-	ASSERT(GetIntFromConfig(ConfigSection(), _L("QoSParamSet"), qosParamSet));
-	ASSERT(qosParamSet >= 0);
-
-	switch(qosParamSet)
-		{
-		case 0:
-			return EFalse; // no qos parameters specified
-		case 2:
-			ApplyQoSParametersSet2L(aPdpContext);
-			return ETrue;
-		default:
-			ASSERT(EFalse);
-			return EFalse;
-		}
-	}
-
-void CSpudRSubConnTestStepBase::ApplyQoSParametersSet2L(RSubConnection& aPdpContext)
-	{
-	RSubConParameterBundle qosParams;
-	CleanupClosePushL(qosParams);
-
-	// Create a container for QoS sub connection parameters (Param bundle takes ownership)
-	CSubConParameterFamily* qosFamily = CSubConParameterFamily::NewL(qosParams, KSubConQoSFamily);
-		
-	// set class parameter
-	CSubConQosIPLinkR99ParamSet* ipParamsReq = CSubConQosIPLinkR99ParamSet::NewL(*qosFamily, CSubConParameterFamily::ERequested);
-	//The requested QoS parameters.
-	ipParamsReq->SetTrafficClass(RPacketQoS::ETrafficClassBackground);
-	ipParamsReq->SetMaxBitrateUplink(10);
-	ipParamsReq->SetMaxBitrateDownlink(50);
-	ipParamsReq->SetGuaBitrateDownlink(20); 
-	ipParamsReq->SetGuaBitrateUplink(10);	
-	ipParamsReq->SetMaxSduSize(1000);		
-	ipParamsReq->SetResidualBitErrorRatio(RPacketQoS::EBERFourPerThousand);
-	ipParamsReq->SetSDUErrorRatio(RPacketQoS::ESDUErrorRatioOnePerThousand);
-	ipParamsReq->SetErroneousSDUDelivery(RPacketQoS::EErroneousSDUDeliveryNotRequired);				
-	ipParamsReq->SetTrafficHandlingPriority(RPacketQoS::ETrafficPriorityUnspecified);		
-	ipParamsReq->SetTransferDelay(3000); 
-	ipParamsReq->SetDeliveryOrder(RPacketQoS::EDeliveryOrderNotRequired);
-
-	//The minimum Requested params
-	CSubConQosIPLinkR99ParamSet* ipParamsMinReq = CSubConQosIPLinkR99ParamSet::NewL(*qosFamily, CSubConParameterFamily::EAcceptable);
-	
-	ipParamsMinReq->SetTrafficClass(RPacketQoS::ETrafficClassBackground);
-	ipParamsMinReq->SetGuaBitrateDownlink(20);
-	ipParamsMinReq->SetGuaBitrateUplink(8);
-	ipParamsMinReq->SetMaxBitrateDownlink(20);
-	ipParamsMinReq->SetMaxBitrateUplink(10); 
-	ipParamsMinReq->SetMaxSduSize(200);		
-	ipParamsMinReq->SetResidualBitErrorRatio(RPacketQoS::EBERFivePerHundred);
-	ipParamsMinReq->SetSDUErrorRatio(RPacketQoS::ESDUErrorRatioOnePerTen);
-	ipParamsMinReq->SetErroneousSDUDelivery(RPacketQoS::EErroneousSDUDeliveryNotRequired);		
-	ipParamsMinReq->SetTrafficHandlingPriority(RPacketQoS::ETrafficPriorityUnspecified);
-	ipParamsMinReq->SetTransferDelay(4000); 
-	ipParamsMinReq->SetDeliveryOrder(RPacketQoS::EDeliveryOrderNotRequired);		
-	
-	TInt err = aPdpContext.SetParameters(qosParams);
-	TestL(err, KErrNone, _L("Applied QoS Parameters"));
-	CleanupStack::PopAndDestroy(&qosParams);
-	}
-
-
-
-/**
-The test sequence:
-Create the primary & secondary PDP contexts.
-Send - Receive UDP over both of them.
-Close everything 
-
-@leave if a test fails or there is an unexpected error */ 
-TVerdict CUdp1::RunTestStepL()
-	{
-	TRequestStatus spudStartReq;
-	TCommDbConnPref spudPref;
-	spudPref.SetIapId(2);
-	OpenAndStartInterfaceL(iSpud, spudPref, spudStartReq, _L(">>>>>Starting SPUD NIF"));
-	WaitForCompletionL(spudStartReq, KErrNone, _L(">>>>>Starting SPUD NIF"));
-	
-	TInt ret = iScndCtxSock1.Open(iESock, 
-                 KAfInet, 
-                 KSockDatagram, 
-                 KProtocolInetUdp,
-                 iSpud);
-    TestL(ret, KErrNone, _L(">>>>>>>>Open UDP Socket, primary PDP context"));
-     
-   	// KSoUdpSynchronousSend option causes the UDP send operation to block when dynamic 
-	// interface setup is in progress or when local flow control within the stack would otherwise 
-	// cause the packet to be dropped. This is not strictly necessary since we've waited for KLinkLayerOpen,
-	// but who knows what's the timing between TCP/IP stack, Nifman, ESock is like...
-	TestL(iScndCtxSock1.SetOpt(KSoUdpSynchronousSend, KSolInetUdp, 1), KErrNone, _L("SetOpt Sync Send"));
-	
-	// We must bind to a local address, and connect to a remote address,
-	// so that TFT is always generated with the same destination - source ports.
-	// Otherwise, SIM.TSY will reject TFT proposed.
-	
-	TInt scndCtxSockLocalPort = 0;
-	ASSERT(GetIntFromConfig(ConfigSection(), _L("SecLocalPort"), scndCtxSockLocalPort));
-	ASSERT(scndCtxSockLocalPort > 0);
-	
-	TInetAddr localAddr;
-	localAddr.SetPort(scndCtxSockLocalPort);
-	TestL(iScndCtxSock1.Bind(localAddr), KErrNone, _L(">>>>>Bind the Secondary PDP ctx socket"));
-	
-	
-	TInt scndCtxSockRemotePort = 0;
-	ASSERT(GetIntFromConfig(ConfigSection(), _L("SecRemotePort"),scndCtxSockRemotePort));
-	ASSERT(scndCtxSockRemotePort > 0);
-	
-	TPtrC scndCtxSockRemoteAddr;
-	ASSERT(GetStringFromConfig(ConfigSection(), _L("SecRemoteIpAddr"), scndCtxSockRemoteAddr));
-		
-	
-	TInetAddr dstAddr1;
-	dstAddr1.SetPort(scndCtxSockRemotePort);
-    dstAddr1.Input(scndCtxSockRemoteAddr);
-    
-    TRequestStatus connStatus;
-    iScndCtxSock1.Connect(dstAddr1, connStatus);
-	WaitForCompletionL(connStatus, KErrNone, _L(">>>>>>>Connect the Secondary PDP ctx socket"));
-    
-   
-    TInt sockErr = iPrimCtxSock1.Open(iESock, 
-                 KAfInet, 
-                 KSockDatagram, 
-                 KProtocolInetUdp,
-                 iSpud);
-    TestL(sockErr, KErrNone, _L(">>>>>>Open Primary PDP ctx socket"));
-    
-   
-   
-   	TInt openErr = iSpudScndCtx1.Open(iESock, 
-    	RSubConnection::ECreateNew, 
-        iSpud);
-    TestL(openErr, KErrNone, _L(">>>>>>>Open RSubConnection on SPUD"));
-    
-    TRequestStatus subconNotifyStat;
-    TNotificationEventBuf eventBuf;
-    iSpudScndCtx1.EventNotification(eventBuf, ETrue,  subconNotifyStat);              
-	
-	TBool waitForQos = ApplyQoSParametersL(iSpudScndCtx1);
-	
-	TRequestStatus subconAddStat;
-	iSpudScndCtx1.Add(iScndCtxSock1, subconAddStat);
-    WaitForCompletionL(subconAddStat, KErrNone, _L(">>>>>>Transfer the Socket to 2ndary context"));
-    
-   
-   	if(waitForQos)
-		{
-		WaitForCompletionL(subconNotifyStat, KErrNone, _L(">>>>>QoS Negotiation Completion on 2ndary context"));
-   		} 
-   	else
-	   	{
-		iSpudScndCtx1.CancelEventNotification();	   		
-	   	} 
-    //*************************************************************************************************
-    User::After(3 * 1000000); // Give the loopback sockets a chance to bind & open,
-    // else we can end up with ICMP Destination (port) Unreachable.
-    // When used over WinTunnel, this is completely unnecessary.
-    //*************************************************************************************************
-    
-    WriteReadOnSocketL(iScndCtxSock1, _L(">>>>>>>Secondary PDP Context, 1"));
-    
-    // Must address UDP on primary explicitly.
-    TInt primCtxSockRemotePort = 0;
-	ASSERT(GetIntFromConfig(ConfigSection(), _L("PrimRemotePort"),primCtxSockRemotePort));
-	ASSERT(primCtxSockRemotePort > 0);
-	
-	TPtrC primCtxSockRemoteAddr;
-	ASSERT(GetStringFromConfig(ConfigSection(), _L("PrimRemoteIpAddr"), primCtxSockRemoteAddr));
-	    
-    TInetAddr primDstAddr1;
-    primDstAddr1.SetPort(primCtxSockRemotePort);
-    primDstAddr1.Input(primCtxSockRemoteAddr);
-    
-    SendRecvOnSocketL(iPrimCtxSock1, primDstAddr1, _L(">>>>>>>Send - Receive on Primary PDP Context, 1"));
-   
-   	
-   	WriteReadOnSocketL(iScndCtxSock1, _L(">>>>>>>Secondary PDP Context, 2"));
-   	SendRecvOnSocketL(iPrimCtxSock1, primDstAddr1, _L(">>>>>>>Primary PDP Context, 2"));
-    
-   	SendRecvOnSocketL(iPrimCtxSock1, primDstAddr1, _L(">>>>>>>Primary PDP Context, 3"));
-   	WriteReadOnSocketL(iScndCtxSock1, _L(">>>>>>>Secondary PDP Context, 3"));
-   	
-   	iSpud.Stop(); // nukes both contexts
-   	// Everything will be cleaned up later.
-  	return EPass;
-  	}
-
-/**
-The test sequence:
-Create the primary context
-Init secondary SubConnection
-Set up QoS params on secondary SubConnection
-Create the secondary PDP contexts on secondary SubConnection.
-Send - Receive UDP over both of them.
-Close everything 
-
-@leave if a test fails or there is an unexpected error */ 
-TVerdict CUdp2::RunTestStepL()
-	{
-	TRequestStatus spudStartReq;
-	TCommDbConnPref spudPref;
-	spudPref.SetIapId(2);
-	OpenAndStartInterfaceL(iSpud, spudPref, spudStartReq, _L(">>>>>Starting SPUD NIF"));
-	WaitForCompletionL(spudStartReq, KErrNone, _L(">>>>>Starting SPUD NIF"));
-	
-   	TInt openErr = iSpudScndCtx1.Open(iESock, 
-    	RSubConnection::ECreateNew, 
-        iSpud);
-    TestL(openErr, KErrNone, _L(">>>>>>>Open RSubConnection on SPUD"));
-    
-    TRequestStatus subconNotifyStat;
-    TNotificationEventBuf eventBuf;
-    iSpudScndCtx1.EventNotification(eventBuf, ETrue,  subconNotifyStat);              
-	
-	TBool waitForQos = ApplyQoSParametersL(iSpudScndCtx1);
-	
-	// Socket Open on Secondary SubConnection
-	TInt ret = iScndCtxSock1.Open(iESock, 
-                 KAfInet, 
-                 KSockDatagram, 
-                 KProtocolInetUdp,
-                 iSpudScndCtx1);
-    
-    TestL(ret, KErrNone, _L(">>>>>>>>Open UDP Socket, primary PDP context"));
-     
-   	// KSoUdpSynchronousSend option causes the UDP send operation to block when dynamic 
-	// interface setup is in progress or when local flow control within the stack would otherwise 
-	// cause the packet to be dropped. This is not strictly necessary since we've waited for KLinkLayerOpen,
-	// but who knows what's the timing between TCP/IP stack, Nifman, ESock is like...
-	TestL(iScndCtxSock1.SetOpt(KSoUdpSynchronousSend, KSolInetUdp, 1), KErrNone, _L("SetOpt Sync Send"));
-	
-	// We must bind to a local address, and connect to a remote address,
-	// so that TFT is always generated with the same destination - source ports.
-	// Otherwise, SIM.TSY will reject TFT proposed by GUQoS.
-	
-	TInt scndCtxSockLocalPort = 0;
-	ASSERT(GetIntFromConfig(ConfigSection(), _L("SecLocalPort"), scndCtxSockLocalPort));
-	ASSERT(scndCtxSockLocalPort > 0);
-	
-	TInetAddr localAddr;
-	localAddr.SetPort(scndCtxSockLocalPort);
-	TestL(iScndCtxSock1.Bind(localAddr), KErrNone, _L(">>>>>Bind the Secondary PDP ctx socket"));
-	
-	
-	TInt scndCtxSockRemotePort = 0;
-	ASSERT(GetIntFromConfig(ConfigSection(), _L("SecRemotePort"),scndCtxSockRemotePort));
-	ASSERT(scndCtxSockRemotePort > 0);
-	
-	TPtrC scndCtxSockRemoteAddr;
-	ASSERT(GetStringFromConfig(ConfigSection(), _L("SecRemoteIpAddr"), scndCtxSockRemoteAddr));
-		
-	
-	TInetAddr dstAddr1;
-	dstAddr1.SetPort(scndCtxSockRemotePort);
-    dstAddr1.Input(scndCtxSockRemoteAddr);
-    
-    TRequestStatus connStatus;
-    iScndCtxSock1.Connect(dstAddr1, connStatus);
-	WaitForCompletionL(connStatus, KErrNone, _L(">>>>>>>Connect the Secondary PDP ctx socket"));
-    
-   	if(waitForQos)
-		{
-		WaitForCompletionL(subconNotifyStat, KErrNone, _L(">>>>>QoS Negotiation Completion on 2ndary context"));
-   		} 
-   	else
-	   	{
-		iSpudScndCtx1.CancelEventNotification();	   		
-	   	} 
-
-    TInt sockErr = iPrimCtxSock1.Open(iESock, 
-                 KAfInet, 
-                 KSockDatagram, 
-                 KProtocolInetUdp,
-                 iSpud);
-    TestL(sockErr, KErrNone, _L(">>>>>>Open Primary PDP ctx socket"));
-    
-   
-    //*************************************************************************************************
-    User::After(3 * 1000000); // Give the loopback sockets a chance to bind & open,
-    // else we can end up with ICMP Destination (port) Unreachable.
-    // When used over WinTunnel, this is completely unnecessary.
-    //*************************************************************************************************
-    
-    WriteReadOnSocketL(iScndCtxSock1, _L(">>>>>>>Secondary PDP Context, 1"));
-    
-    // Must address UDP on primary explicitly.
-    TInt primCtxSockRemotePort = 0;
-	ASSERT(GetIntFromConfig(ConfigSection(), _L("PrimRemotePort"),primCtxSockRemotePort));
-	ASSERT(primCtxSockRemotePort > 0);
-	
-	TPtrC primCtxSockRemoteAddr;
-	ASSERT(GetStringFromConfig(ConfigSection(), _L("PrimRemoteIpAddr"), primCtxSockRemoteAddr));
-	    
-    TInetAddr primDstAddr1;
-    primDstAddr1.SetPort(primCtxSockRemotePort);
-    primDstAddr1.Input(primCtxSockRemoteAddr);
-    
-    SendRecvOnSocketL(iPrimCtxSock1, primDstAddr1, _L(">>>>>>>Send - Receive on Primary PDP Context, 1"));
-   
-   	
-   	WriteReadOnSocketL(iScndCtxSock1, _L(">>>>>>>Secondary PDP Context, 2"));
-   	SendRecvOnSocketL(iPrimCtxSock1, primDstAddr1, _L(">>>>>>>Primary PDP Context, 2"));
-    
-   	SendRecvOnSocketL(iPrimCtxSock1, primDstAddr1, _L(">>>>>>>Primary PDP Context, 3"));
-   	WriteReadOnSocketL(iScndCtxSock1, _L(">>>>>>>Secondary PDP Context, 3"));
-   	
-   	iSpud.Stop(); // nukes both contexts
-   	// Everything will be cleaned up later.
-  	return EPass;
-  	}
-	
-	
-
-TVerdict CUpperFlowOnLowerNifDown::RunTestStepL()
-	{
-	// Start the primary
-	TRequestStatus spudStartReq;
-	TCommDbConnPref spudPref;
-	spudPref.SetIapId(2);
-	OpenAndStartInterfaceL(iSpud, spudPref, spudStartReq, _L(">>>>>Starting SPUD NIF"));
-	
-	// Start PPP peer for the primary
-	RConnection primCtxPppPeer;
-	TRequestStatus peerStartReq;
-	TCommDbConnPref peerPref;
-	peerPref.SetIapId(1);
-	OpenAndStartInterfaceL(primCtxPppPeer, peerPref, peerStartReq, _L(">>>>Starting PPP Peer for the primary context"));
-	
-	WaitForCompletionL(spudStartReq, KErrNone, _L(">>>>>Starting SPUD NIF"));
-	WaitForCompletionL(peerStartReq, KErrNone, _L(">>>>>Starting PPP Peer for SPUD primary context"));
-	// Open socket on primary
-	TInt sockErr = iPrimCtxSock1.Open(iESock, 
-                 KAfInet, 
-                 KSockDatagram, 
-                 KProtocolInetUdp,
-                 iSpud);
-    
-    TestL(sockErr, KErrNone, _L(">>>>>>>>Open UDP Socket, primary PDP context"));
-    
-    User::After(2 * 10000); // Let everything settle down.  
-	// Stop PPP peer, triggerting LinkLayerDown on the primary
-	TInt stopErr = primCtxPppPeer.Stop();
-	ASSERT(KErrNone == stopErr); // If there is an error, the test was not setup correctly.
-	
-	// At this point contxt deletion request is outstanding: SIM TSY will not complete it for a while.
-	// Send on primary socket: no way to verify where it blocked. Must inspect the logs.
-	
-	User::After(5 * 1000000); 	
-	
-	TInetAddr primDstAddr1;
-    primDstAddr1.SetPort(1060);
-    primDstAddr1.Input(_L("192.168.3.1"));
-   	
-   	TBuf8<KMaxMsgLen> sendBuf(_L8("A packet to the La-La Land."));
-	TRequestStatus sendSt;
-    
-    iPrimCtxSock1.SendTo(sendBuf, primDstAddr1, 0x0, sendSt);
-	WaitForCompletionL(sendSt, KErrNone, _L("Send on Socket")); // ESock completed the send, the packet 
-	// still needs to percolate through the tcp/ip stack - GUQoS - SPUD.
-	User::After(30 * 1000000);			
-	// SPUD panics if the upper layer tries to send on a flowed-off context.
-			
-	return EPass; // If there was a failure, we'd leave or panic
-	// Cleanup everything later
-	}
-   
- 
-   
-/**
-Brings up SPUD & PPP peer from the primary context, then stops Spud.
-This test step is intended to be used in a combination with other steps, (including itself),
-to verify how RConnection::Stop affects the behaviour of the system. */	
-TVerdict CSpudPppPrimaryStop::RunTestStepL()
-	{
-	TRequestStatus spudStartReq;
-	TCommDbConnPref spudPref;
-	spudPref.SetIapId(2);
-	OpenAndStartInterfaceL(iSpud, spudPref, spudStartReq, _L(">>>>>Starting SPUD NIF"));
-			
-	
-	RConnection primCtxPppPeer;
-	TRequestStatus peerStartReq;
-	TCommDbConnPref peerPref;
-	peerPref.SetIapId(1);
-	OpenAndStartInterfaceL(primCtxPppPeer, peerPref, peerStartReq, _L(">>>>Starting PPP Peer for the primary context"));
-	
-	
-	WaitForCompletionL(spudStartReq, KErrNone, _L(">>>>>Starting SPUD NIF"));
-	WaitForCompletionL(peerStartReq, KErrNone, _L(">>>>>Starting PPP Peer for SPUD primary context"));
-
-	TInt stopTypeInt = -1;  
-	ASSERT(GetIntFromConfig(ConfigSection(), _L("StopType"), stopTypeInt));
-	RConnection::TConnStopType stopType = static_cast<RConnection::TConnStopType>(stopTypeInt);
-	INFO_PRINTF2(_L("Stopping Spud with stop type= %d (0 = EStopNormal, 1 = EStopAuthoritative)"), stopType);
-	ASSERT(RConnection::EStopNormal == stopType || RConnection::EStopAuthoritative == stopType);
-	TInt stopErr = iSpud.Stop(stopType);
-	INFO_PRINTF2(_L("Stopped Spud with error = %d"), stopErr);
-	ASSERT(KErrNone == stopErr); // If we have an errror, test was not set up / executed correctly.
-
-	// if stop was authoritative ppp wont do the leaving handshake, so peer also needs to be stopped
-	if (stopType == RConnection::EStopAuthoritative)
-		{
-		TInt stopErr = primCtxPppPeer.Stop(stopType);
-		INFO_PRINTF2(_L("Stopped peer with error = %d"), stopErr);
-		ASSERT(KErrNone == stopErr); // If we have an errror, test was not set up / executed correctly.
-		}
-	else
-		{
-		primCtxPppPeer.Close(); // No need to stop, peer should be shutting down as a result of Stop on Spud.
-		}
-	return EPass;
-	}
-	
-	
-	
-	
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/src/te_spudRSubConnSteps.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-// Copyright (c) 2005-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:
-// te_spudNetworkSideSteps.h
-// Defines the Network-side events & error conditions tests for SPUD.
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#ifndef TE_SPUD_RSUBCON_STEPS
-#define TE_SPUD_RSUBCON_STEPS
-
-
-#include <test/testexecutestepbase.h>
-
-#include <es_sock.h>
-#include <in_sock.h>
-#include <commdbconnpref.h>
-
-/**
-A driver for running an arbitrary interface (over the loopback), 
-to be used when connected tests cannot be run; i.e. in lieu of WinTunnel */
-
-
-/**
-Base class for all Spud - RSubConnection Tests. */
-class CSpudRSubConnTestStepBase : 
-	public CTestStep
-	{
-public:
-	TVerdict doTestStepPreambleL();
-	enum TVerdict doTestStepL();
-		
-	// Utility
-	void TestBooleanTrueL(TBool aBool, const TDesC& aMsg);
-	void TestL(TInt aErrCode, const TDesC& aMsg);
-	void TestL(TInt aErrCode, TInt aExpErrCode, const TDesC& aMsg);
-		
-		
-	
-protected:
-	/**
-	Executes the Test Step 
-		 
-	@return Verdict of the test step: EPass / EFail;
-       		EAborted if the test case could not be executed properly;
-       		EInconclusive if it could not be determined with certainty that the test case has succeeded.
-	@leave if the test fails		 
-	*/
-	virtual TVerdict RunTestStepL() = 0;
-
-	
-	void OpenAndStartInterfaceL(RConnection& aConn, TCommDbConnPref& aPref, TRequestStatus& aSt, const TDesC& aLogMsg);
-	void WaitForCompletionL(TRequestStatus& aSt, TInt aExpErr, const TDesC& aLogMsg);
-
-	void ReceiveOnSocketL(RSocket& aSocket, const TDesC& aLogMsg);
-	void RecvSendOnSocketL(RSocket& aSocket, const TDesC& aLogMsg);
-	void OpenAndBindSocketL(RSocket& aSock, RConnection& aIface, TUint aLocalPort, const TDesC& aLogMsg);
-
-	TBool ApplyQoSParametersL(RSubConnection& aPdpContext);
-	void ApplyQoSParametersSet2L(RSubConnection& aPdpContext);
-
-	void WriteReadOnSocketL(RSocket& aSocket, const TDesC& aLogMsg);
-	void SendRecvOnSocketL(RSocket& aSocket, TInetAddr& aDstAddr, const TDesC& aLogMsg);
-
-	void VerifyBuffersEqualL(const TDesC8& aBuf1, const TDesC8& aBuf2);
-
-	/** Our connection to ESock */
-	RSocketServ iESock;
-	
-	/**
-	The SPUD interface with 1 primary & 1 secondary pdp contexts */
-	RConnection iSpud;
-	
-	/**
-	Secondary PDP context */
-	RSubConnection iSpudScndCtx1;
-		
-	/** SPUD primary PDP context SAP */
-	RSocket iPrimCtxSock1;
-		
-	/** SPUD secondary PDP context SAP */
-	RSocket iScndCtxSock1;
-	};
-		
-		
-
-	/** Used to define a literal variable. */
-	#define SYMBIAN_TEST_LIT(name) _LIT(K##name, #name)
-
-	/** Define a literal from a classname and can be as the keyword class. */
-	#define SYMBIAN_TEST_CLASS(className) SYMBIAN_TEST_LIT(className); class className 
-
-	/** Define a basic declaration for testClass as a subclass of CSpudNetSideTestBase 
-	and define a literal from testClass */
-	#define SYMBIAN_SPUD_TEST_CLASS(testClass) SYMBIAN_TEST_CLASS(testClass) : public CSpudRSubConnTestStepBase \
-				{ \
-			public: \
-				inline testClass() {SetTestStepName(K##testClass);}; \
-				virtual TVerdict RunTestStepL(); \
-				}; 
-	
-	
-// Test Steps
-SYMBIAN_SPUD_TEST_CLASS(CUdp1)
-SYMBIAN_SPUD_TEST_CLASS(CUdp2)
-SYMBIAN_SPUD_TEST_CLASS(CLoopbackPpp1)
-SYMBIAN_SPUD_TEST_CLASS(CUpperFlowOnLowerNifDown)
-SYMBIAN_SPUD_TEST_CLASS(CSpudPppPrimaryStop)
-#endif 
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/src/te_spudRSubConnSvr.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-// Copyright (c) 2005-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:
-// te_spudRSubConSvr.cpp
-// for (WINS && !EKA2) versions will be xxxServer.Dll and require a thread to
-// be started in the process of the client. The client initialises the server
-// by calling the one and only ordinal.
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#include "te_spudRSubConnSvr.h"
-#include "te_spudRSubConnSteps.h"
-
-_LIT(KServerName,"TE_SpudRSubConnSvr");
-
-
-
-
-// EKA2 much simpler
-// just an E32Main and a MainL()
-
-/**
- * Much simpler, uses the new Rendezvous() call to sync with the client.
- *
- * @internalComponent
- *
- * @leave When new(ELeave) leaves 
- */
-LOCAL_C void MainL()
-	{
-	// leave the hooks in for platform security
-#if (defined __DATA_CAGING__)
-	RProcess().DataCaging(RProcess::EDataCagingOn);
-	RProcess().SecureApi(RProcess::ESecureApiOn);
-#endif
-	CActiveScheduler* sched = NULL;
-	sched = new(ELeave) CActiveScheduler;
-	CActiveScheduler::Install(sched);
-
-	CSpudRSubConTestServer* server = NULL;
-	// create the CTestServer derived server
-	TRAPD(err,server = CSpudRSubConTestServer::NewL());
-	if (!err)
-		{
-		// Sync with the client and enter the active scheduler
-		RProcess::Rendezvous(KErrNone);
-		sched->Start();
-		}
-	delete server;
-	delete sched;
-	}
-
-// only a DLL on emulator for typhoon and earlier
-
-/**
- * Main entry point.
- *
- * @internalComponent
- *
- * @return Standard Epoc error codes.
- */
-GLDEF_C TInt E32Main()
-	{
-	CTrapCleanup* cleanup = CTrapCleanup::New();
-	if (cleanup == NULL)
-		{
-		return KErrNoMemory;
-		}
-	TRAP_IGNORE(MainL());
-	delete cleanup;
-	return KErrNone;
-    }
-
-// Create a thread in the calling process
-// Emulator typhoon and earlier
-
-/**
- * Called inside the MainL() function to create and start the CTestServer derived server.
- *
- * @internalComponent
- *
- * @return Instance of the test server.
- */
-CSpudRSubConTestServer* CSpudRSubConTestServer::NewL()
-	{
-	CSpudRSubConTestServer * server = new (ELeave) CSpudRSubConTestServer();
-	CleanupStack::PushL(server);
-	
-	// CServer base class call
-	server->StartL(KServerName);
-	CleanupStack::Pop(server);
-	return server;
-	}
-	
-
-
-
-/**
- * @return - A CTestStep derived instance
- * Implementation of CTestServer pure virtual
- */
-CTestStep* CSpudRSubConTestServer::CreateTestStep(const TDesC& aStepName)
-	{
-	CTestStep* step = NULL;
-	
-	// removed ELeave as harness will test ptr. This is more efficient
-	// than using TRAP_IGNORE
-	if(aStepName == KCUdp1)
-		{
-		step = new CUdp1;			
-		}
-	else if(aStepName == KCUdp2)
-		{
-		step = new CUdp2;
-		}
-	else if(aStepName == KCLoopbackPpp1)
-		{
-		step = new CLoopbackPpp1;			
-		}
-	else if(aStepName == KCUpperFlowOnLowerNifDown)
-		{
-		step = new CUpperFlowOnLowerNifDown;			
-		}
-	else if(aStepName == KCSpudPppPrimaryStop)
-		{
-		step = new CSpudPppPrimaryStop;
-		}
-	return step;
-	}
-
-
-
-
-
-
-
-
-
-
-
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/src/te_spudRSubConnSvr.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-// Copyright (c) 2005-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:
-// te_spudRubConSvr.h
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#ifndef TE_SPUD_RSUBCON_H
-#define TE_SPUD_RSUBCON_H
-
-#include <test/testexecuteserverbase.h>
-
-class CSpudRSubConTestServer : public CTestServer
-	{
-public:
-	static CSpudRSubConTestServer* NewL();
-	virtual CTestStep* CreateTestStep(const TDesC& aStepName);
-	};
-
-
-#endif //TE_SPUD_RSUBCON_H
--- a/telephonyprotocols/umtsgprsscpr/Test/te_spud/BWINS/TE_SPUDUNITU.DEF	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-EXPORTS
-	?NewServer@@YAHXZ @ 1 NONAME ; int NewServer(void)
-	?NewPdpFsmInterfaceL@@YAPAVRPdpFsmInterface@@XZ @ 2 NONAME ; class RPdpFsmInterface * NewPdpFsmInterfaceL(void)
-
--- a/telephonyprotocols/umtsgprsscpr/Test/te_spud/group/TE_SpudUnit.iby	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-/*
-* Copyright (c) 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 __TE_SPUD_UNIT_IBY__
-#define __TE_SPUD_UNIT_IBY__
-
-file=ABI_DIR\DEBUG_DIR\TE_SpudUnit.exe		System\Libs\TE_SpudUnit.exe
-
-data=EPOCROOT##epoc32\data\z\testdata\configs\Spud_config.txt 		TestData\configs\Spud_config.txt
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SpudUnitTest.script 	TestData\scripts\TE_SpudUnitTest.script
-
-#endif // __TE_SPUD_UNIT_IBY__
--- a/telephonyprotocols/umtsgprsscpr/Test/te_spud/group/TE_SpudUnit.mmp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-// Copyright (c) 2004-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:
-// SpudTel and SpudFsm unit tests
-// 
-//
-
-/**
- @file
-*/
-
-TARGET      te_spudunit.exe
-CAPABILITY ReadDeviceData WriteDeviceData NetworkControl NetworkServices ReadUserData WriteUserData 
-TARGETTYPE  exe
-UID             0x1000007A 0x102075B1
-VENDORID 0x70000001
-
-MACRO		_INFO_LOG
-MACRO		_ERROR_LOG
-
-SOURCEPATH              ../src
-SOURCE		            SpudUnitTestServer.cpp
-SOURCE		            SpudUnitTestStepBase.cpp
-SOURCE		            SpudFsmUnitTestStep.cpp
-SOURCE		            SpudTelUnitTestStep.cpp
-SOURCE		            InputRequestListener.cpp
-SOURCE		            ActiveSchedulerThread.cpp
-SOURCE		            CompareContextParameters.cpp
-SOURCE		            DefaultContextParameters.cpp
-SOURCE		            PdpFsmInterfaceTest.cpp
-SOURCE		            SpudManInterfaceTest.cpp
-SOURCE                      CPdpFsmInterface.cpp
-
-
-// UmtsGprsSCPR files
-SOURCEPATH              ../../../src
-SOURCE                  RSpudManInterface.cpp
-
-// SpudFsm source files
-SOURCEPATH              ../../../spudfsm/src
-SOURCE                  cpdpfsm.cpp
-SOURCE                  cpdpfsmfactory.cpp
-SOURCE                  tpdpstate.cpp
-SOURCE                  tpdpstatesuspended.cpp
-SOURCE                  tpdpstatechangingqos.cpp
-SOURCE                  tpdpstatechangingtft.cpp
-SOURCE                  tpdpstateopen.cpp
-SOURCE                  tpdpstatesettingqos.cpp
-SOURCE                  tpdpstateinitialised.cpp
-SOURCE                  tpdpstatecreatingprimary.cpp
-SOURCE                  tpdpstateopeningphone.cpp
-SOURCE                  tpdpstatecreatingSecondary.cpp
-SOURCE                  tpdpstateactivatingsecondary.cpp
-SOURCE                  tpdpstatecreatedSecondary.cpp
-SOURCE                  tpdpstateactivatingprimary.cpp	
-SOURCE                  tpdpstateclosing.cpp	
-SOURCE                  tpdpstatesettingtft.cpp	
-SOURCE                  tpdpstategettingnegqos.cpp
-SOURCE                  tpdpstatemodifingactive.cpp
-SOURCE                  tpdpstatestopping.cpp
-
-// SpudTel source files
-SOURCEPATH              ../../../spudtel/src
-SOURCE                  ceteldrivercontext.cpp
-SOURCE                  ceteldriverfactory.cpp
-SOURCE                  cservicechangenotifier.cpp
-SOURCE                  reteldriverinput.cpp
-SOURCE                  eteldriverstrategies.cpp
-SOURCE                  cspudcontextelem.cpp
-SOURCE                  ceteldrivernotifier.cpp
-SOURCE                  cpdpstatuschangenotifier.cpp
-SOURCE                  cqoschangenotifier.cpp
-SOURCE                  cpdpconfigchangenotifier.cpp
-
-
-USERINCLUDE   	../inc
-USERINCLUDE   	../../../inc
-USERINCLUDE   	../../../spudtel/inc
-USERINCLUDE   	../../../spudfsm/inc
-USERINCLUDE   	../../../spudfsm/src
-
-SYSTEMINCLUDE 	/epoc32/include
-SYSTEMINCLUDE 	/epoc32/include/test
-
-LIBRARY		euser.lib
-LIBRARY		testexecuteutils.lib 
-LIBRARY		testexecutelogclient.lib 
-LIBRARY		umtsif.lib
-LIBRARY		etelpckt.lib
-LIBRARY		etel.lib
-LIBRARY		c32root.lib
-
-DEBUGLIBRARY      comsdbgutil.lib
--- a/telephonyprotocols/umtsgprsscpr/Test/te_spud/group/bld.inf	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-// Copyright (c) 2004-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:
-// Test SPUD
-// 
-//
-
-/**
- @file
-*/
-
-PRJ_EXPORTS
-
-PRJ_TESTEXPORTS
-
-// script files required to run tests
-..\scripts\TE_SpudUnitTest.script	z:\testdata\scripts\TE_SpudUnitTest.script
-..\testdata\Spud_config.txt			z:\TestData\Configs\Spud_config.txt
-
-..\group\TE_SpudUnit.iby	\epoc32\rom\include\TE_SpudUnit.iby 
-
-PRJ_MMPFILES
-
-PRJ_TESTMMPFILES
-
-..\group\TE_SpudUnit.mmp
--- a/telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/CPdpFsmInterface.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-// Copyright (c) 2005-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:
-//
-
-/**
- @file
- @internalComponent
-*/
-
-// NOTE: This guard define is used to prevent the real PDPFSM.h from being included.
-//       This file MUST be included first in test code
-#ifndef PDPFSM_H
-#define PDPFSM_H
-
-
-#include <networking/mpdpfsminterface.h>
-#include "RSpudManInterface.h"
-#include <etelpckt.h>
-
-class CPdpFsmFactory;
-
-/**
-Dummy implementation of the MPdpFsmInterface that is seperated from the UmtsGprsSCPR
-*/
-class CPdpFsmInterface : public MPdpFsmInterface
-   {
-public:
-	//-=========================================================
-	// custom methods
-	//-=========================================================	
-    CPdpFsmInterface();
-    ~CPdpFsmInterface();
-
-    // We need this 'factory' method since the test harness has to have a means (albeit indirect) of
-    // creating the CPdpFsm objects, but within the Active Scheduler Thread (terminology from the test's
-    // design document). and not within the test harness (which is what happens if they get created via
-    // 'MPdpFsmInterface' Set() or Get() methods in this test harness). Because the 'CEtelDriverContext'
-    // objects that are indirectly created are added to the test thread's ActiveScheduler
-    //
-    TInt NewFsmContext(TContextId aPdpId);
-
-    void SpudInput (TContextId aPdpId, TInt aNotification, TInt aParam);
-	
-	//-=========================================================
-	// MPdpFsmInterface methods
-	//-=========================================================	
-	virtual void OpenL(MSpudManInterface * aSpudManInterface, TName& aName);
-	virtual void Close();
-	
-	virtual TInt Input (TContextId aPdpId, const TInt aOperation, const TInt aParam=KErrNone);
-
-	
-	
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-    virtual void SetIMCNSignalling(TBool aImCnSignalling);
-	virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR5Requested& aParam);
-	virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR5Negotiated& aParam);
-	virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR5Requested& aParam) const;
-	virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR5Negotiated& aParam) const;
-
-#else
-// !SYMBIAN_NETWORKING_UMTSR5 
-
-	virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Requested& aParam);
-	virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Negotiated& aParam);
-	virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Requested& aParam) const;
-	virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Negotiated& aParam) const;
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 
-
-
-	virtual TInt Set(TContextId aPdpId, const TTFTInfo& aParam);
-	virtual TInt Set(TContextId aPdpId, const TTFTOperationCode& aParam);
-	virtual TInt Set(TContextId aPdpId, const RPacketContext::TDataChannelV2& aParam);
-	virtual TInt Set(TContextId aPdpId, const RPacketContext::TContextConfigGPRS& aParam);
-	virtual TInt Set(TContextId aPdpId, const RPacketContext::TContextStatus& aParam);
-
-	virtual TInt GetLastErrorCause(TContextId aPdpId, TInt& aLastErrorCause) const;
-
-	virtual TInt Get(TContextId aPdpId, TTFTInfo& aParam) const;
-	virtual TInt Get(TContextId aPdpId, TTFTOperationCode& aParam) const;
-	virtual TInt Get(TContextId aPdpId, RPacketContext::TDataChannelV2& aParam) const;
-	virtual TInt Get(TContextId aPdpId, RPacketContext::TContextConfigGPRS& aParam) const;
-	virtual TInt Get(TContextId aPdpId, RPacketContext::TContextStatus& aParam) const;
-
-	virtual void Set(const RPacketService::TStatus aParam); // applies to all contexts
-	virtual void Get(RPacketService::TStatus& aParam);// applies to all contexts
-
-	virtual const TName& TsyName(void);
-
-	virtual void SetContextTerminationErrorAndStop(TContextId aPdpId, TInt aErrorCode);
-
-protected:
-private:
-	// DO NOT provide implementations to these methods: Copying this object should be disabled
-	CPdpFsmInterface(CPdpFsmInterface&);
-	CPdpFsmInterface& operator= (CPdpFsmInterface& aInput);
-	
-public:
-protected:
-private:
-	// FSM Factory - churns out FSMs
-	CPdpFsmFactory * iPdpFsmFactory;
-
-	RPacketService::TStatus iNetworkStatus;	
-	
-	RSpudManInterface iSpudManInterface;
-
-	TBool iSpudMainInterfaceSet;
-};
-
-#endif
-// PDPFSM_H
--- a/telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/CompareContextParameters.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-// Copyright (c) 2004-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:
-// Declarations for methods that compare various packet context related structures
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#ifndef COMPARE_CONTEXT_PARAMETERS
-#define COMPARE_CONTEXT_PARAMETERS
-
-#include <networking/umtsnifcontrolif.h>
-#include <etelpckt.h>
-
-TBool CompareContextConfigGPRS(const RPacketContext::TContextConfigGPRS &aFirst, const RPacketContext::TContextConfigGPRS &aSecond);
-TBool CompareContextParameters(const TContextParameters& aFirst, const TContextParameters& aSecond);
-
-TBool ComparePacketFilterV2(const RPacketContext::TPacketFilterV2 &aFirst, const RPacketContext::TPacketFilterV2 &aSecond);
-TBool CompareDataChannel(const RPacketContext::TDataChannelV2& aFirst, const RPacketContext::TDataChannelV2& aSecond);
-TBool CompareTFTInfo(TTFTInfo& aTFTInfo, RPacketContext& aPacketContext);
-TBool CompareContextInfo(const RPacketService& aPacketService, const TDesC& aContextName, RPacketContext::TContextStatus aContextStatus);
-
-TBool CompareUMTSQoSNeg(const RPacketQoS::TQoSR99_R4Negotiated &aFirst, const RPacketQoS::TQoSR99_R4Negotiated &aSecond);
-TBool CompareUMTSQoSNeg(const RPacketQoS::TQoSR99_R4Requested &aFirst, const RPacketQoS::TQoSR99_R4Requested &aSecond);
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-TBool CompareUMTSQoSReq(const RPacketQoS::TQoSR5Requested &aFirst, const RPacketQoS::TQoSR5Requested &aSecond);
-#endif
-
-#endif
-// COMPARE_CONTEXT_PARAMETERS
--- a/telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/DefaultContextParameters.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-// Copyright (c) 2004-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:
-// Declarations for methods that create default various packet context related structures
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#ifndef DEFAULT_CONTEXT_PARAMETERS
-#define DEFAULT_CONTEXT_PARAMETERS
-
-#include <networking/umtsnifcontrolif.h>
-#include <etelpckt.h>
-
-TName& SimTsyName();
-
-void DefaultContextConfigGPRS(RPacketContext::TContextConfigGPRS& aParam);
-
-void DefaultQoSR99_R4Requested(RPacketQoS::TQoSR99_R4Requested& aQosRequested);
-void SecondQoSR99_R4Requested(RPacketQoS::TQoSR99_R4Requested& aQosRequested);
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-void DefaultQoSR5Requested(RPacketQoS::TQoSR5Requested& aQosRequested);
-void SecondQoSR5Requested(RPacketQoS::TQoSR5Requested& aQosRequested);
-#endif
-
-void DefaultQoSR99_R4Negotiated(RPacketQoS::TQoSR99_R4Negotiated& aQosNegotiated);
-void SecondQoSR99_R4Negotiated(RPacketQoS::TQoSR99_R4Negotiated& aQosNegotiated);
-
-void DefaultTftInfo(TTFTInfo& aTTFTInfo);
-void SecondDefaultTftInfo(TTFTInfo& aTTFTInfo);
-void CombinedDefaultTftInfo(TTFTInfo& aTTFTInfo);
-void DefaultContextStatus(RPacketContext::TContextStatus& aStatus);
-void DefaultServiceStatus(RPacketService::TStatus& aStatus);
-void DefaultDataChannel(RPacketContext::TDataChannelV2& aDataChannel);
-
-#endif
-// DEFAULT_CONTEXT_PARAMETERS
--- a/telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/InputRequestListener.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,239 +0,0 @@
-// Copyright (c) 2004-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:
-// Declaration for CInputRequestListener
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#ifndef INPUT_REQUEST_LISTENER_H
-#define INPUT_REQUEST_LISTENER_H
-
-#include <e32def.h>
-#include <networking/umtsnifcontrolif.h>
-
-#include "CompareContextParameters.h"
-#include "reteldriverinput.h"
-#include "meteldriverstrategy.h"
-#include "PdpFsmInterfaceTest.h"
-#include "SpudManInterfaceTest.h"
-#include "cpdpfsmfactory.h"
-
-/**
- Storage for parameters that are passed to REtelDriverInput::Input
- */
-class TEtelDriverInputRequestData
-	{
-	public:
-	TContextId iPdpId;
-	EtelDriver::TEtelInput iOperation;
-	};
-
-/**
- Storage for parameters that are passed to RPdpFsmInterfaceTest::Input by SpudTel
- */
-class TEtelDriverInputResponseData
-	{
-	public:
-	TContextId iPdpId;
-	TInt iSignal;
-	};
-	
-/**
- Storage for parameters that are passed during Etel driver notifications
- */
-class TNotifyContextConfigData
-	{
-	public:
-	TContextId iPdpId;
-	RPacketContext::TContextConfigGPRS iContextConfigGPRS;
-	};
-	
-class TNotifyPacketQosData
-	{
-	public:
-	TContextId iPdpId;
-	TNegotiatedProfileBuffer iNegotiated;
-	};
-
-class TNotifyContextStatusData
-	{
-	public:
-	TContextId iPdpId;
-	RPacketContext::TContextStatus iContextStatus;
-	};
-
-class TNotifyContextDataChannelData
-	{
-	public:
-	TContextId iPdpId;
-	RPacketContext::TDataChannelV2 iDataChannelV2;
-	};
-
-/**
- Storage for parameters that are passed to RPdpFsmInterface::Input by Spud man
- */
-class TFsmInputRequestData
-	{
-	public:
-	TContextId iPdpId;
-	TInt iOperation;
-	TInt iParam;
-	};
-	
-/**
- Storage for parameters that are passed to RPdpFsmInterface::Input by Etel driver
- */
-class TFsmInputResponseData
-	{
-	public:
-	TContextId iPdpId;
-	TInt iEvent;
-	TInt iParam;
-	};
-	
-/**
- Storage for parameters used for a context change notification by the FSM
- */
-class TNotifyContextParametersChangeData
-	{
-	public:
-	TContextId iPdpId;
-	TNegotiatedProfileBuffer iNegotiated;
-	RPacketContext::TContextConfigGPRS iContextConfig;
-	};
-	
-class CInputRequestListener : public CActive
-	{
-public:
-	/**
-	 Enum of the types of requests supported by CInputRequestListener. When the iStatus is completed with
-	 these results, the associated method is called with the corresponding parameters.
-	 */
-	enum TRequestType
-		{
-		EEtelDriverInputRequest,
-		EEtelDriverCancelPdpRequest,
-		EFsmInputRequest,
-		ECleanup,
-		EFsmObjectCreate
-		};
-
-public:
-	static CInputRequestListener* NewL(TBool aUseTestPdpFsmInterface);
-	virtual ~CInputRequestListener();
-	void Activate();
-	void RunL();
-	void DoCancel();
-	
-	void CreateUnitUnderTestL();
-	void DeleteUnitUnderTest();
-
-private:
-	CInputRequestListener(TBool aUseTestPdpFsmInterface);
-	void ConstructL();
-
-	void CreateEtelDriverL();
-	void CreatePdpFsmL();
-
-public:
-	/** Set to true when testing Etel driver, and as such the test FSM interface it used to interact with Etel driver
-		and set to false when the real FSM is used */
-	TBool iUseTestPdpFsmInterface;
-	/** Contains the Etel driver under test */
-	REtelDriverInput* iEtelDriver;
-	/** Contains the RPdpFsmInterface used for Etel driver tests */
-	CPdpFsmInterfaceTest *iPdpFsmInterfaceTest;
-
-	/** Contains the RPdpFsmInterface under test */
-	CPdpFsmInterface *iPdpFsmInterface;
-	/** Contains the RSpudManInterface used for FSM tests */
-	TSpudManInterfaceTest *iSpudManInterface;
-
-	/** The thread that test execute is running in */
-	RThread iParentThread;
-	/** This active scheduler will run the SPUD TEL, SPUD FSM and this CActive object */
-	CActiveScheduler* iScheduler;
-
-	// contains the data that is passed to REtelDriverInput interface
-	TEtelDriverInputRequestData iEtelDriverInputRequestData;
-	TEtelDriverInputResponseData iEtelDriverInputResponseData;
-	TContextId iEtelDriverCancelRequestPdpId;
-		
-	// contains the data that is passed to RPdpFsmInterface::Set
-	TNotifyContextConfigData iNotifyContextConfigData;
-	TNotifyContextStatusData iNotifyContextStatusData;
-	TNotifyPacketQosData iNotifyQosNegotiatedData;
-	TNotifyContextDataChannelData iNotifyContextDataChannelData;
-	RPacketService::TStatus iPacketServiceStatus;
-
-	// Data stored for FSM input requests
-	TFsmInputRequestData iFsmInputRequestData;
-	TFsmInputResponseData iFsmInputResponseData;
-	TNotifyContextParametersChangeData iContextParametersEventData;
-	TContextId iContextBlockedEventPdpId;
-	TContextId iContextUnblockedEventPdpId;
-
-	/** Completed when the Active Scheduler thread is initialized and ready to handle requests */
-	TRequestStatus iThreadInitialized;
-	/** Completed when the Active Scheduler thread has cleaned up any resources and can be destroyed */
-	TRequestStatus iThreadDestructed;
-
-	/** Must be pending before any Input requests are completed */
-	TRequestStatus iReadyForInputRequest;
-	
-	/** Completed when RPdpFsmInterfaceTest::Input is called (with a non-notification aOperation parameter) */
-	TRequestStatus iEtelDriverInputResponseStatus;
-	/** Completed when RPdpFsmInterfaceTest::Input is called with a QoS notification as the aOperation parameter */
-	TRequestStatus iEtelDriverQosNotificationStatus;
-	/** Completed when RPdpFsmInterfaceTest::Input is called with a GPRS config notification as the aOperation parameter */
-	TRequestStatus iEtelDriverConfigGPRSNotificationStatus;
-	/** Completed when RPdpFsmInterfaceTest::Input is called with a context status change notification as the aOperation parameter */
-	TRequestStatus iEtelDriverContextStatusNotificationStatus;
-	/** Completed when RPdpFsmInterfaceTest::Input is called with a service status change as the aOperation parameter */
-	TRequestStatus iEtelDriverServiceNotificationStatus;
-
-	/** Completed when RSpudManInterfaceTest::Input is called (with a non-notification aOperation parameter) */
-	TRequestStatus iFsmInputResponseStatus;
-	/** Completed when RSpudManInterfaceTest::Input is called with a service status change as the aOperation parameter */
-	TRequestStatus iFsmNetworkStatusStatus;
-	/** Completed when RSpudManInterfaceTest::Input is called with a context status change as the aOperation parameter */
-	TRequestStatus iFsmContextParameterChangeStatus;
-	/** Completed when RSpudManInterfaceTest::Input is called with a context blocked event as the aOperation parameter */
-	TRequestStatus iFsmContextSuspendedStatus;
-	/** Completed when RSpudManInterfaceTest::Input is called with a context unblocked event as the aOperation parameter */
-	TRequestStatus iFsmContextResumedStatus;
-	
-	/** Completed by RunL() */
-    TRequestStatus iFsmObjectCreateResponse;	
-	
-	};
-	
-/** Contains the data passed from the test execute thread to the active object thread */
-class TActiveSchedulerThreadParams
-	{
-	public:
-	CInputRequestListener* iListener;
-	TThreadId iThreadId;
-	};
-
-/** The start-up method for the thread running the active objects */
-TInt ActiveSchedulerThread(TAny* aActiveSchedulerParams);
-
-#endif
-// INPUT_REQUEST_LISTENER_H
-
--- a/telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/PdpFsmInterfaceTest.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-// Copyright (c) 2004-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:
-// Declaration of the RPdpFsmInterface for SPUD TEL unit tests
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#ifndef PDPFSMINTERFACETEST_H
-#define PDPFSMINTERFACETEST_H
-
-#include "CPdpFsmInterface.h"
-
-// forward declarations
-class CInputRequestListener;
-
-/** Implementation of CPdpFsmInterface used to test the Etel driver */
-class CPdpFsmInterfaceTest : public CPdpFsmInterface
-	{
-public:
-	CPdpFsmInterfaceTest(CInputRequestListener& aListener);
-	
-	virtual TInt Input(TContextId aPdpId, const TInt aOperation, const TInt aParam);
-
-	
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-	virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR5Requested& aParam);
-	virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR5Negotiated& aParam);
-	virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR5Requested& aParam) const;
-	virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR5Negotiated& aParam) const;
-
-#else
-// !SYMBIAN_NETWORKING_UMTSR5 
-
-	virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Requested& aParam);
-	virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Negotiated& aParam);
-	virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Requested& aParam) const;
-	virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Negotiated& aParam) const;
-
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 
-
-	virtual TInt Set(TContextId aPdpId, const TTFTInfo& aParam);
-	virtual TInt Set(TContextId aPdpId, const TTFTOperationCode& aParam);
-	virtual TInt Set(TContextId aPdpId, const RPacketContext::TDataChannelV2& aParam);
-	virtual TInt Set(TContextId aPdpId, const RPacketContext::TContextConfigGPRS& aParam);
-	virtual TInt Set(TContextId aPdpId, const RPacketContext::TContextStatus& aParam);
-
-	
-	virtual TInt Get(TContextId aPdpId, TTFTInfo& aParam) const;
-	virtual TInt Get(TContextId aPdpId, TTFTOperationCode& aParam) const;
-	virtual TInt Get(TContextId aPdpId, RPacketContext::TDataChannelV2& aParam) const;
-	virtual TInt Get(TContextId aPdpId, RPacketContext::TContextConfigGPRS& aParam) const;
-	virtual TInt Get(TContextId aPdpId, RPacketContext::TContextStatus& aParam) const;
-
-	virtual TInt GetLastErrorCause(TContextId aPdpId, TInt& aLastErrorCause) const;
-
-	virtual void Set(const RPacketService::TStatus aParam); // applies to all contexts
-	virtual void Get(RPacketService::TStatus& aParam); // applies to all contexts
-
-	const TName& TsyName();
-	
-	virtual void SetContextTerminationErrorAndStop(TContextId aPdpId, TInt aErrorCode);
-
-private:
-	/** Used as the interface between the thread running the active objects and the test execute thread.
-		Contains the data passed to/from Input requests */
-	CInputRequestListener& iListener;
-	/** Holds the next TFT operation code and data to be used for TFT operations */
-	TTFTOperationCode iTftOperationCode;
-	TTFTInfo iTftInfo;
-
-	};
-	
-#endif
-// PDPFSMINTERFACETEST_H
-
--- a/telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/SpudManInterfaceTest.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-// Copyright (c) 2004-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:
-// Declaration of the SpudManInterface for SPUD FSM unit tests
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#ifndef SPUDMANINTERFACETEST_H
-#define SPUDMANINTERFACETEST_H
-
-#include <networking/mspudmaninterface.h>
-
-// forward declarations
-class CTestRequestListener;
-
-/** Implementation of MSpudManInterface used to test the FSM */
-class TSpudManInterfaceTest : public MSpudManInterface
-	{
-	public:
-	TSpudManInterfaceTest(CInputRequestListener& aListener);
-	
-	void Input(TContextId aPdpId, TInt aEvent, TInt aParam);
-
-	void SetContextTerminationErrorAndStop(TContextId aContextId, TInt aErrorCode);
-
-private:
-	/** Used as the interface between the thread running the active objects and the test execute thread.
-		Contains the data passed to/from Input requests */
-	CInputRequestListener& iListener;
-	};
-	
-#endif
-// SPUDMANINTERFACETEST_H
-
--- a/telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/SpudUnitTestServer.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-// Copyright (c) 2004-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:
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#ifndef SPUD_UNIT_TEST_SERVER_H
-#define SPUD_UNIT_TEST_SERVER_H
-
-#include <testexecuteserverbase.h>
-#include "reteldriverinput.h"
-
-class CSpudUnitTestServer : public CTestServer
-	{
-public:
-	static CSpudUnitTestServer* NewL();
-	virtual CTestStep* CreateTestStep(const TDesC& aStepName);
-private:
-	};
-
-REtelDriverInput* NewEtelDriverInputL();
-
-#endif
-// SPUD_UNIT_TEST_SERVER_H
-
--- a/telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/SpudUnitTestStep.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,208 +0,0 @@
-// Copyright (c) 2004-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:
-// Declaration of test classes for SPUD TEL and SPUD FSM unit tests
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#ifndef SPUD_UNIT_TEST_STEP_H
-#define SPUD_UNIT_TEST_STEP_H
-
-#include <c32comm.h>
-#include <networking/umtsnifcontrolif.h>
-#include <testexecutestepbase.h>
-
-#include "CompareContextParameters.h"
-#include "meteldriverstrategy.h"
-#include "eteldrivernmspace.h"
-#include "pdpfsmnmspace.h"
-#include "InputRequestListener.h"
-
-#define TEST_SETRESULT(cond,result) if (!(cond)) SetTestStepResult((result))
-
-/** Identifiers for each of the simtsy parameters that can be changed using publish and subscribe */
-enum TEtelRequestType
-	{
-	/** Change QoS parameters */
-	ENetworkQoSChange,
-	/** Change network status */
-	ENetworkChangeRegStatus,
-	/** Change context status */
-	EContextStatusChange,
-	/** Change context config parameters */
-	EContextConfigChange
-	};
-	
-/** Contains methods common to both SPUD FSM and SPUD TEL tests */
-class CSpudUnitTestStepBase : public CTestStep
-	{
-public:
-	CSpudUnitTestStepBase(TInt aTestNumber, TBool aUseTestPdpFsmInterface);
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-	static void SetSimTsyTestNumberL(TInt aTestNumber);
-
-protected:
-	void InitPhoneAndPacketServiceL();
-	void DestroyPhoneAndPacketService();
-	void EtelRequest(TEtelRequestType aCommand, TInt aNewValue);
-	TInt iTestNumber;
-
-	/** Used as the interface between the thread running the active objects and the test execute thread.
-		Contains the data passed to/from Input requests */
-	CInputRequestListener *iListener;
-	/** Set to true when testing Etel driver, and as such the test FSM interface it used to interact with Etel driver
-		and set to false when the real FSM is used */
-	TBool iUseTestPdpFsmInterface;
-	/** The thread used to run the SPUD FSM and SPUD TEL active objects */
-	RThread iActiveSchedulerThread;
-	
-	/** Etel parameters that can be used in test steps */
-	RTelServer iTelServer;
-	RPhone iPhone;
-	RPacketService iPacketService;
-	RPacketContext iPrimaryPacketContext, iSecondaryPacketContext;
-	};
-
-/** Contains methods for SPUD TEL tests */
-class CSpudTelUnitTestStepBase : public CSpudUnitTestStepBase
-	{
-public:
-	CSpudTelUnitTestStepBase(TInt aTestNumber);
-
-protected:
-	void EtelDriverInputRequest(TContextId aPdpId, EtelDriver::TEtelInput aOperation);
-	void CancelPdpRequest(TContextId aPdpId);
-	void WaitForEtelDriverInputResponse(TContextId aPdpId, PdpFsm::TEtelSignal aSignal, TInt aError=KErrNone);
-	
-	void WaitForNextContextConfigNotification(TContextId aPdpId, const RPacketContext::TContextConfigGPRS& aContextConfigGPRS);
-	void WaitForGivenEtelContextStatusNotification(TContextId aPdpId, RPacketContext::TContextStatus aContextStatus);
-
-	void WaitForNextQosNotification(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Negotiated& aQoSR99_R4Negotiated);
-
-	void WaitForNextServiceNotificationStatus(RPacketService::TStatus aServiceStatus);
-	void WaitForEtelDriverSetDataChannel(TContextId aPdpId, RPacketContext::TDataChannelV2 aDataChannelV2);
-	};
-
-/** Contains methods for SPUD FSM tests */
-class CSpudFsmUnitTestStepBase : public CSpudUnitTestStepBase
-	{
-public:
-	CSpudFsmUnitTestStepBase(TInt aTestNumber);
-
-protected:
-	void FsmInputRequest(TContextId aPdpId, TInt aOperation, TInt aParam);
-	void WaitForFsmInputResponse(TInt aPdpId, TInt aEvent, TInt aParam);
-	
-    void FsmObjectCreate(TContextId aPdpId);
-    void WaitForFsmObjectCreateResponse(TInt aPdpId);
-
-	void WaitForFsmSuspendedNotification(TContextId aPdpId);
-	void WaitForFsmResumedNotification(TContextId aPdpId);
-	void WaitForFsmServiceNotificationStatus();
-	void WaitForFsmContextConfigNotification(TContextId aPdpId, const RPacketContext::TContextConfigGPRS& aContextConfig);
-
-	void WaitForFsmQosChangeNotification(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Negotiated& aQosParams);
-
-	void WaitForGivenContextStatus(RPacketContext& aPacketContext, RPacketContext::TContextStatus aStatus);
-	};
-
-/*
- Declarations for SPUD TEL unit tests - they all implement constructors, destructors and override doTestStep()
- */
-
-#define DEFINE_SPUD_TEL_UNIT_TEST_CLASS(state) class CSpudTelUnit##state : public CSpudTelUnitTestStepBase \
-	{ \
-public: \
-	CSpudTelUnit##state(); \
-	~CSpudTelUnit##state(); \
-	virtual TVerdict doTestStepL(); \
-	};
- 
-DEFINE_SPUD_TEL_UNIT_TEST_CLASS(NormalOperation)
-DEFINE_SPUD_TEL_UNIT_TEST_CLASS(Notifications)
-DEFINE_SPUD_TEL_UNIT_TEST_CLASS(CreatePrimaryError)
-DEFINE_SPUD_TEL_UNIT_TEST_CLASS(SetQosError)
-DEFINE_SPUD_TEL_UNIT_TEST_CLASS(SetTftError)
-DEFINE_SPUD_TEL_UNIT_TEST_CLASS(ActivateError1)
-DEFINE_SPUD_TEL_UNIT_TEST_CLASS(ActivateError2)
-DEFINE_SPUD_TEL_UNIT_TEST_CLASS(DeleteError1)
-DEFINE_SPUD_TEL_UNIT_TEST_CLASS(DeleteError2)
-DEFINE_SPUD_TEL_UNIT_TEST_CLASS(MultipleContexts)
-DEFINE_SPUD_TEL_UNIT_TEST_CLASS(Cancel)
-
-/*
- Declarations for SPUD FSM unit tests - they all implement constructors, destructors and override doTestStep()
- */
- 
-#define DEFINE_SPUD_FSM_UNIT_TEST_CLASS(state) class CSpudFsmUnit##state : public CSpudFsmUnitTestStepBase \
-{ \
-public: \
-	CSpudFsmUnit##state(); \
-	~CSpudFsmUnit##state(); \
-	virtual TVerdict doTestStepL(); \
-};	
-
-DEFINE_SPUD_FSM_UNIT_TEST_CLASS(NormalOperation)
-DEFINE_SPUD_FSM_UNIT_TEST_CLASS(CreatePrimaryError1)
-DEFINE_SPUD_FSM_UNIT_TEST_CLASS(CreatePrimaryError2)
-DEFINE_SPUD_FSM_UNIT_TEST_CLASS(CreatePrimaryError3)
-DEFINE_SPUD_FSM_UNIT_TEST_CLASS(SetQosAndTftError)
-DEFINE_SPUD_FSM_UNIT_TEST_CLASS(ChangeQosAndTftError)
-DEFINE_SPUD_FSM_UNIT_TEST_CLASS(Notifications)
-DEFINE_SPUD_FSM_UNIT_TEST_CLASS(NetworkDelete)
-
-/*
- Declarations for test names used by test execute script
- */ 
-_LIT(KSpudTelUnitNormalOperation,"SpudTelUnitNormalOperation");
-_LIT(KSpudTelUnitNotifications,"SpudTelUnitNotifications");
-_LIT(KSpudTelUnitCreatePrimaryError,"SpudTelUnitCreatePrimaryError");
-_LIT(KSpudTelUnitSetQosError,"SpudTelUnitSetQosError");
-_LIT(KSpudTelUnitSetTftError,"SpudTelUnitSetTftError");
-_LIT(KSpudTelUnitActivateError1,"SpudTelUnitActivateError1");
-_LIT(KSpudTelUnitActivateError2,"SpudTelUnitActivateError2");
-_LIT(KSpudTelUnitDeleteError1,"SpudTelUnitDeleteError1");
-_LIT(KSpudTelUnitDeleteError2,"SpudTelUnitDeleteError2");
-_LIT(KSpudTelUnitMultipleContexts,"SpudTelUnitMultipleContexts");
-_LIT(KSpudTelUnitCancel,"SpudTelUnitCancel");
-_LIT(KSpudFsmUnitNormalOperation,"SpudFsmUnitNormalOperation");
-_LIT(KSpudFsmCreatePrimaryError1,"SpudFsmCreatePrimaryError1");
-_LIT(KSpudFsmCreatePrimaryError2,"SpudFsmCreatePrimaryError2");
-_LIT(KSpudFsmCreatePrimaryError3,"SpudFsmCreatePrimaryError3");
-_LIT(KSpudFsmSetQosAndTftError,"SpudFsmSetQosAndTftError");
-_LIT(KSpudFsmChangeQosAndTftError,"SpudFsmChangeQosAndTftError");
-_LIT(KSpudFsmTestNotifications,"SpudFsmTestNotifications");
-_LIT(KSpudFsmNetworkDelete,"SpudFsmNetworkDelete");
-
-/*
- Declarations for names generated by SIMTSY for different contexts
- */ 
-_LIT(KFirstPrimaryContextName, "PRIMARY1");
-_LIT(KSecondPrimaryContextName, "PRIMARY2");
-_LIT(KThirdPrimaryContextName, "PRIMARY3");
-_LIT(KFirstSecondaryContextName, "SECONDARY1");
-_LIT(KSecondSecondaryContextName, "SECONDARY2");
-_LIT(KFirstQosName, "PACKET_QOS1");
-
-const TInt KContextId0 = 0;
-const TInt KContextId1 = 1;
-const TInt KContextId2 = 2;
-const TInt KContextId3 = 3;
-
-#endif // SPUD_UNIT_TEST_STEP_H
--- a/telephonyprotocols/umtsgprsscpr/Test/te_spud/scripts/TE_SpudUnitTest.script	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,282 +0,0 @@
-// Copyright (c) 2004-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:
-// Secondary PDP-context UMTS Driver unit tests for SpudTel and SpudFsm.
-//
-
-
-RUN_UTILS  MkDir c:\simtsy\
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\Spud_config.txt c:\simtsy\config.txt
-RUN_UTILS  CopyFile z:\TestData\Configs\Spud_config.txt c:\config.txt
-
-LOAD_SUITE TE_SpudUnit
-
-
-START_TESTCASE			NET-UMTS-V1-Spud-0101
-//! @SYMTestCaseID		NET-UMTS-V1-Spud-0101
-//! @SYMTestCaseDesc Test all operations on Etel driver under non-failure conditions
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMFssID NETWORKING/Spud/Control Plane/MS initiated PDP Context Modification
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Create primary and secondary contexts, set their QoS and TFTs, test activating them, and test deleting them
-//! @SYMTestExpectedResults Primary context and secondary context are created, with their QoS and TFTs set, and their status is activated. When they are deleted the contexts become deleted.
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType UT
-RUN_TEST_STEP 100 TE_SpudUnit SpudTelUnitNormalOperation
-END_TESTCASE			NET-UMTS-V1-Spud-0101
-
-START_TESTCASE			NET-UMTS-V1-Spud-0102
-//! @SYMTestCaseID		NET-UMTS-V1-Spud-0102
-//! @SYMTestCaseDesc Test Etel driver notifications
-//! @SYMFssID NETWORKING/Spud/Control Plane/MS initiated PDP Context Modification
-//! @SYMTestActions Create a context and change its context configuration and QoS parameters
-//! @SYMTestExpectedResults When the context is activated there is a service status change notification, when the context configuration is changed there is a context config change notification, and when the QoS is changed, there is a QoS change notification 
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType UT
-RUN_TEST_STEP 100 TE_SpudUnit SpudTelUnitNotifications
-END_TESTCASE			NET-UMTS-V1-Spud-0102
-
-START_TESTCASE			NET-UMTS-V1-Spud-0103
-//! @SYMTestCaseID		NET-UMTS-V1-Spud-0103
-//! @SYMTestCaseDesc Test creating a primary context with a SetConfig error
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Instruct Etel driver to create a primary context
-//! @SYMTestExpectedResults The request completes with an error
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType UT
-RUN_TEST_STEP 100 TE_SpudUnit SpudTelUnitCreatePrimaryError
-END_TESTCASE			NET-UMTS-V1-Spud-0103
-
-START_TESTCASE			NET-UMTS-V1-Spud-0104
-//! @SYMTestCaseID		NET-UMTS-V1-Spud-0104
-//! @SYMTestCaseDesc Test an error setting QoS
-//! @SYMFssID NETWORKING/Spud/Control Plane/MS initiated PDP Context Modification
-//! @SYMTestActions Instruct Etel driver to create a primary context and set its QoS
-//! @SYMTestExpectedResults The set QoS request completes with an error
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType UT
-RUN_TEST_STEP 100 TE_SpudUnit SpudTelUnitSetQosError
-END_TESTCASE			NET-UMTS-V1-Spud-0104
-
-START_TESTCASE			NET-UMTS-V1-Spud-0105
-//! @SYMTestCaseID		NET-UMTS-V1-Spud-0105
-//! @SYMTestCaseDesc Test an error setting TFT
-//! @SYMFssID NETWORKING/Spud/Control Plane/MS initiated PDP Context Modification
-//! @SYMTestActions Instruct Etel driver to create a primary context and set its TFT
-//! @SYMTestExpectedResults The set TFT request completes with an error
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType UT
-RUN_TEST_STEP 100 TE_SpudUnit SpudTelUnitSetTftError
-END_TESTCASE			NET-UMTS-V1-Spud-0105
-
-START_TESTCASE			NET-UMTS-V1-Spud-0106
-//! @SYMTestCaseID		NET-UMTS-V1-Spud-0106
-//! @SYMTestCaseDesc Test an error activating a context
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Instruct Etel driver to create then activate a primary context
-//! @SYMTestExpectedResults The activation completes with an error
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType UT
-RUN_TEST_STEP 100 TE_SpudUnit SpudTelUnitActivateError1
-END_TESTCASE			NET-UMTS-V1-Spud-0106
-
-START_TESTCASE			NET-UMTS-V1-Spud-0107
-//! @SYMTestCaseID		NET-UMTS-V1-Spud-0107
-//! @SYMTestCaseDesc Test an error activating a context
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Instruct Etel driver to create then activate a primary context
-//! @SYMTestExpectedResults The activation completes with an error
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType UT
-RUN_TEST_STEP 100 TE_SpudUnit SpudTelUnitActivateError2
-END_TESTCASE			NET-UMTS-V1-Spud-0107
-
-START_TESTCASE			NET-UMTS-V1-Spud-0108
-//! @SYMTestCaseID		NET-UMTS-V1-Spud-0108
-//! @SYMTestCaseDesc Test deleting a context with a deactivate error
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Instruct Etel driver to create then activate then delete a primary context
-//! @SYMTestExpectedResults The delete completes with an error, and all resources are still closed
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType UT
-RUN_TEST_STEP 100 TE_SpudUnit SpudTelUnitDeleteError1
-END_TESTCASE			NET-UMTS-V1-Spud-0108
-
-START_TESTCASE			NET-UMTS-V1-Spud-0109
-//! @SYMTestCaseID		NET-UMTS-V1-Spud-0109
-//! @SYMTestCaseDesc Test deleting a context with a context delete error
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Instruct Etel driver to create then activate then delete a primary context
-//! @SYMTestExpectedResults The delete completes with an error, and all resources are still closed
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType UT
-RUN_TEST_STEP 100 TE_SpudUnit SpudTelUnitDeleteError2
-END_TESTCASE			NET-UMTS-V1-Spud-0109
-
-START_TESTCASE			NET-UMTS-V1-Spud-0110
-//! @SYMTestCaseID		NET-UMTS-V1-Spud-0110
-//! @SYMTestCaseDesc Test creating multiple primary contexts
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMFssID NETWORKING/Spud/Control Plane/MS initiated PDP Context Modification
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Create 2 primary contexts, create secondary contexts on each of them, set all the contexts' QoS and TFTs, activate the contexts and delete them
-//! @SYMTestExpectedResults All requests are completed successfully
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType UT
-RUN_TEST_STEP 100 TE_SpudUnit SpudTelUnitMultipleContexts
-END_TESTCASE			NET-UMTS-V1-Spud-0110
-
-START_TESTCASE			NET-UMTS-V1-Spud-0111
-//! @SYMTestCaseID		NET-UMTS-V1-Spud-0111
-//! @SYMTestCaseDesc Test cancelling all Etel driver actions
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMFssID NETWORKING/Spud/Control Plane/MS initiated PDP Context Modification
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Instruct Etel driver to create a context and cancel the operation. Wait over a second and make sure the request never completed. Do the same for creating secondary context, setting TFT, setting QoS, activating PDP, and deleting PDP
-//! @SYMTestExpectedResults The request never completes
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType UT
-RUN_TEST_STEP 100 TE_SpudUnit SpudTelUnitCancel
-END_TESTCASE			NET-UMTS-V1-Spud-0111
-
-//
-// SPUD FSM Unit tests
-//
-
-START_TESTCASE			NET-UMTS-V1-Spud-0112
-//! @SYMTestCaseID		NET-UMTS-V1-Spud-0112
-//! @SYMTestCaseDesc Test all state transitions in the SPUD FSM
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMFssID NETWORKING/Spud/Control Plane/MS initiated PDP Context Modification
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Test creating a primay context before and after the phone is already opened, Test creating secondary context, Test setting QOS on secondary, Test setting TFT on secondary, Test activating secondary, Test network suspending/resuming context, Test SpudMan suspending/resuming context, Test changing TFT, Test changing QOS, Test deleting contexts, Test that we can still use a context that has been deleted
-//! @SYMTestExpectedResults All operations complete successfully
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType UT
-RUN_TEST_STEP 100 TE_SpudUnit SpudFsmUnitNormalOperation
-END_TESTCASE			NET-UMTS-V1-Spud-0112
-
-START_TESTCASE			NET-UMTS-V1-Spud-0113
-//! @SYMTestCaseID		NET-UMTS-V1-Spud-0113
-//! @SYMTestCaseDesc Test creating a primary context with an error initialising the context
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Instruct FSM to create a primary context
-//! @SYMTestExpectedResults The create primary completes with an error
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType UT
-RUN_TEST_STEP 100 TE_SpudUnit SpudFsmCreatePrimaryError1
-END_TESTCASE			NET-UMTS-V1-Spud-0113
-
-START_TESTCASE			NET-UMTS-V1-Spud-0114
-//! @SYMTestCaseID		NET-UMTS-V1-Spud-0114
-//! @SYMTestCaseDesc Test creating a primary context with setting QoS
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Instruct FSM to create a primary context
-//! @SYMTestExpectedResults The create primary completes with an error
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType UT
-RUN_TEST_STEP 100 TE_SpudUnit SpudFsmCreatePrimaryError2
-END_TESTCASE			NET-UMTS-V1-Spud-0114
-
-START_TESTCASE			NET-UMTS-V1-Spud-0115
-//! @SYMTestCaseID		NET-UMTS-V1-Spud-0115
-//! @SYMTestCaseDesc Test creating a primary context with an error activating
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Instruct FSM to create a primary context
-//! @SYMTestExpectedResults The create primary completes with an error
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType UT
-RUN_TEST_STEP 100 TE_SpudUnit SpudFsmCreatePrimaryError3
-END_TESTCASE			NET-UMTS-V1-Spud-0115
-
-START_TESTCASE			NET-UMTS-V1-Spud-0116
-//! @SYMTestCaseID		NET-UMTS-V1-Spud-0116
-//! @SYMTestCaseDesc Test error setting QoS, TFT and activating secondary context
-//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation
-//! @SYMTestActions Instruct FSM to create a primary then secondary context. Instruct FSM to set the secondary context's QoS then TFT, then instruct FSM to activate the secondary context.
-//! @SYMTestExpectedResults The contexts are created successfully. The set QoS, set TFT and activate fail with an error
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType UT
-RUN_TEST_STEP 100 TE_SpudUnit SpudFsmSetQosAndTftError
-END_TESTCASE			NET-UMTS-V1-Spud-0116
-
-START_TESTCASE			NET-UMTS-V1-Spud-0117
-//! @SYMTestCaseID		NET-UMTS-V1-Spud-0117
-//! @SYMTestCaseDesc Test error changing QoS and TFT
-//! @SYMFssID NETWORKING/Spud/Control Plane/MS initiated PDP Context Modification
-//! @SYMTestActions Instruct FSM to create a primary then secondary context, then to activate the secondary. Instruct FSM to change the secondary context's QoS then TFT
-//! @SYMTestExpectedResults The contexts are created/activated successfully. The change QoS, and change TFT fail with an error
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType UT
-RUN_TEST_STEP 100 TE_SpudUnit SpudFsmChangeQosAndTftError
-END_TESTCASE			NET-UMTS-V1-Spud-0117
-
-START_TESTCASE			NET-UMTS-V1-Spud-0118
-//! @SYMTestCaseID		NET-UMTS-V1-Spud-0118
-//! @SYMTestCaseDesc Test FSM notifications
-//! @SYMFssID NETWORKING/Spud/Control Plane/MS initiated PDP Context Modification
-//! @SYMTestActions Instruct FSM to create a primary context. Call SetConfig on the RPacketContext and SetProfileParameters on its RPacketQoS
-//! @SYMTestExpectedResults Creating the context generates a packet service status change notification. SetConfig generates a context config change notification. SetProfileParameters generates a QoS change notification
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType UT
-RUN_TEST_STEP 100 TE_SpudUnit SpudFsmTestNotifications
-END_TESTCASE			NET-UMTS-V1-Spud-0118
-
-START_TESTCASE			NET-UMTS-V1-Spud-0119
-//! @SYMTestCaseID		NET-UMTS-V1-Spud-0119
-//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification
-//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation
-//! @SYMTestActions Instruct FSM to create a primary context. Trigger a deletion of the context from Etel while the context is activating. Instruct FSM to create another primary context. Trigger a deletion of the context from Etel when the context is open.
-//! @SYMTestExpectedResults Context delete events are generated, and resources associated with the contexts are cleaned up
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-//! @SYMTestType UT
-RUN_TEST_STEP 100 TE_SpudUnit SpudFsmNetworkDelete
-END_TESTCASE			NET-UMTS-V1-Spud-0119
-
-
-RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS  DeleteFile c:\simtsy\config.txt
-RUN_UTILS  DeleteFile c:\config.txt
-
--- a/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/ActiveSchedulerThread.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-// Copyright (c) 2004-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:
-// Thread entry point functions for the test framework's thread used to run the active scheduler
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#include "InputRequestListener.h"
-#include <in_iface.h>
-#include "reteldriverinput.h"
-#include "ceteldriverfactory.h"
-#include "cpdpfsmfactory.h"
-
-/**
- Creates and starts the active scheduler, and initializes the units under test
- */
-void ActiveSchedulerMainL(CInputRequestListener* aListener, TThreadId aParentThreadId)
-	{
-	CActiveScheduler *sched = new(ELeave) CActiveScheduler;
-	CleanupStack::PushL(sched);
-	CActiveScheduler::Install(sched);
-	
-	aListener->iParentThread.Open(aParentThreadId);
-	
-	__UHEAP_MARK;
-
-	CActiveScheduler::Add(aListener);
-	
-	aListener->CreateUnitUnderTestL();
-
-	// listen for requests from the main test thread
-	aListener->Activate();
-	
-	// notify the test execute thread that we are initialized and ready to handle FSM or Etel driver Input requests
-	TRequestStatus *readyStatus = &aListener->iReadyForInputRequest;
- 	aListener->iParentThread.RequestComplete(readyStatus, KErrNone);
-	TRequestStatus *initStatus = &aListener->iThreadInitialized;
- 	aListener->iParentThread.RequestComplete(initStatus, KErrNone);
-
-	CActiveScheduler::Start();
-	
-	// this could be done in the destructor, but we do it here so that the UHEAP macros work out for this thread
-	// (otherwise they would be deleted in the main test thread)
-	aListener->DeleteUnitUnderTest();
-	
-	__UHEAP_MARKEND;
-
-	CleanupStack::PopAndDestroy(sched);	
-
-	// inform the main test thread that this thread is finished and that there are no memory leaks
-	TRequestStatus *destuctedStatus = &aListener->iThreadDestructed;
-	aListener->iParentThread.RequestComplete(destuctedStatus, KErrNone);
-	aListener->iParentThread.Close();
-	}
-	
-/**
- Create the trap cleanup and calls the main thread f'n
- */
-TInt ActiveSchedulerThread(TAny* aActiveSchedulerParams)
-	{
-	CTrapCleanup* cleanup = CTrapCleanup::New();
-	if(!cleanup)
-		{
-		return KErrNoMemory;
-		}
-	
-	TActiveSchedulerThreadParams *params = (TActiveSchedulerThreadParams*)aActiveSchedulerParams;
-	TRAPD(err, ActiveSchedulerMainL(params->iListener, params->iThreadId));
-	
-	delete cleanup;
-	
-	return err;
-	}
--- a/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/CPdpFsmInterface.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,754 +0,0 @@
-// Copyright (c) 2005-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:
-// Implementation file for the PDP Context Finite State Machine - Equivalent to CPDPFSM.CPP in SpudFsm
-// 
-//
-
-/**
- @file
-*/
-
-
-
-
-#include "CPdpFsmInterface.h"
-#include "cpdpfsmfactory.h"
-#include "spudfsmdebuglogger.h"
-
-//-=========================================================
-// Custom methods
-//-=========================================================
-CPdpFsmInterface::CPdpFsmInterface()
-:iPdpFsmFactory(NULL), 
- iNetworkStatus(RPacketService::EStatusUnattached),
- iSpudMainInterfaceSet(EFalse)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::()");
-    }
-
-CPdpFsmInterface::~CPdpFsmInterface()
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::()");
-	
-	CPdpFsmInterface::Close();
-	delete iPdpFsmFactory;
-    }
-
-
-void CPdpFsmInterface::SpudInput (TContextId aPdpId, TInt aNotification, TInt aParam)
-    {
-   if (iSpudMainInterfaceSet)
-      {
-      iSpudManInterface.Input(aPdpId, aNotification, aParam);
-      }
-      else
-      {
-      SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::SpudInput(): No SpudMan Interface");
-      SPUDFSMVERBOSE_LOG3(_L("CPdpFsmInterface::SpudInput(): [aPdpId=%d] [aNotification=%d] [aParam=%d]"),
-         aPdpId, aNotification, aParam);
-      }
-    }
-
-
-
-
-//-=========================================================
-// MPdpFsmInterface methods
-//-=========================================================
-/** request to open the FSM
-
-@param aSpudManInterface reference to SpudMan interface
-*/
-void CPdpFsmInterface::OpenL(MSpudManInterface * aSpudManInterface, TName& aTsyName)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::OpenL()");
-
-	if (aSpudManInterface == NULL)
-	   {
-      SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface - Opened with NULL SpudMan Interface");
-      }
-      else
-      {
-   	iSpudManInterface.Init(aSpudManInterface);
-   	iSpudMainInterfaceSet = ETrue; 
-      }
-	
-
-	iPdpFsmFactory = CPdpFsmFactory::NewL();
-	iPdpFsmFactory->InitL(aTsyName, this);
-    }
-
-/** closes the FSM and frees underlying resources
-*/
-void CPdpFsmInterface::Close()
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Close()");
-	
-    iSpudManInterface.Close ();
-
-	if (iPdpFsmFactory)
-	    {
-		iPdpFsmFactory->Close();
-	    }
-    }
-
-
-TInt CPdpFsmInterface::NewFsmContext(TContextId aPdpId)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::NewFsmContext()");
-
-	ASSERT(iPdpFsmFactory);
-	
-	return iPdpFsmFactory->NewFsmContext(aPdpId);
-    }
-
-
-/** 
- Performs and input action/notification for context ID aPdpId
- If aPdpId is KAllContexts, the notification is sent to every context, unless it is of type EServiceStatusChangeNetwork
-
-@param aPdpId the PDP context ID, 0 to KMaxPdpContexts
-@param aOperation the operation id to perform
-@param aParam extra id for ETelDriver errors
-@return error code for the synchronus patrt of the operation
-*/
-TInt CPdpFsmInterface::Input(TContextId aPdpId, const TInt aOperation, const TInt aParam)
-    {
-	TInt ret = KErrNone;
-
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Input(aParam)");
-
-	ASSERT(iPdpFsmFactory);
-
-
-    // Control structure is in order of the most frequent operation first (hopefully)
-    //
-	if (iPdpFsmFactory->ContextIsValid(aPdpId))
-	    {
-	    // We have a valid PDP FSM Context, so go ahead with the operation...
-	    //
-	    ret = (iPdpFsmFactory->GetFsmContext(aPdpId))->Input(aOperation, aParam);
-
-        // Recovering memory by deleting the Fsm Context
-        //
-        // Tricky, definitely don't try with 'SpudMan::EContextDelete' it's far too early.
-        // You can get a bit further deleting on 'PdpFsm::EContextDeleted' (and 'PdpFsm::EContextDeletedFailed')
-        // from TContextDeleteStrategy::NotifyFsm(), but you then find that GuQoS is calling into Spud in order to
-        // transfer data from the deleted context to another...
-        //
-        // Additionally, the spud unit test is expecting to be able to "reuse" deleted contexts...
-	    }
-	else if (aPdpId == KAllContexts)
-	    {
-		TInt err = KErrNone;
-	
-		// this has to be here to avoid sending it from every context
-		//
-		if (aOperation == PdpFsm::EServiceStatusChangeNetwork)
-		    {	
-			iPdpFsmFactory->SpudInput(KAllContexts, KNetworkStatusEvent, KErrNone);
-		    }
-		else
-		    {
-			for (TContextId i = 0; (i < KMaxPdpContexts) && iPdpFsmFactory->HaveFsmContext(i); i++)
-			    {
-		        // Process any current PDP contexts.
-		        
-		        err = (iPdpFsmFactory->GetFsmContext(i))->Input(aOperation, aParam);
-
-                // See above about trials and tribulations of trying to recover the memory taken by these 
-                // CPdpFsm objects.
-
-				if (err != KErrNone)
-				    {
-				    // We return the last error found, ignoring any earlier ones
-				    //
-					ret = err;
-				    }
-			    }
-		    }		
-        }
-	else
-	    {
-		ret = KErrBadHandle;
-	    }
-	
-	return ret;
-    }
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-/** Set context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts - 1
-@param aParam - RPacketQoS::TQoSR5Requested data to set
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR5Requested& aParam)
-{
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR5Requested)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-	TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
- 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	return KErrNone;
-}
-
-/** Set context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketQoS::TQoSR5Negotiated data to set
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR5Negotiated& aParam)
-{
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR5Negotiated)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-	TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	return KErrNone;
-}
-
-#else
-// !SYMBIAN_NETWORKING_UMTSR5
-
-/**
-Set context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketQoS::TQoSR99_R4Requested data to set
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Requested& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Requested)");
-
-	ASSERT(iPdpFsmFactory);
-    ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-    TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-
-    iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	return KErrNone;
-    }
-
-/** Set context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketQoS::TQoSR99_R4Negotiated data to set
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Negotiated& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-    TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-
-	return KErrNone;
-    }
-
-
-
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 
-
-
-
-
-
-/** Set context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - TFTInfo data to set
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Set(TContextId aPdpId, const TTFTInfo& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(TFTInfo)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-    TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	return KErrNone;
-    }
-
-/** Set context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - TFTOperationCode to set to go with the data
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Set(TContextId aPdpId, const TTFTOperationCode& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(TTFTOperationCode)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-    TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	return KErrNone;
-    }
-
-/** Set context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketContext::TDataChannelV2 data to set
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketContext::TDataChannelV2& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TDataChannelV2)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-    TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	return KErrNone;
-    }
-
-
-/** Set context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketContext::TContextStatus data to set
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketContext::TContextStatus& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TContextStatus)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-    TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	return KErrNone;
-    }
-
-/** Set context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketContext::TContextConfigGPRS& data to set
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketContext::TContextConfigGPRS& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TContextConfigGPRS)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-    TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	return KErrNone;
-    }
-
-/** Set network status
-
-@param aParam - RPacketService::TStatus data to set
-*/
-void CPdpFsmInterface::Set(const RPacketService::TStatus aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketService::TStatus)");
-
-	ASSERT(iPdpFsmFactory);
-
-	iNetworkStatus = aParam;
-    }
-
-/** Set ETel termination error and stop context
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aErrorCode - the Etel error code detected on this context
-*/
-void CPdpFsmInterface::SetContextTerminationErrorAndStop(TContextId aPdpId, TInt aErrorCode)
-{
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::SetContextTerminationErrorAndStop(TContextId aPdpId, TInt aErrorCode)");
-
-	iSpudManInterface.SetContextTerminationErrorAndStop(aPdpId, aErrorCode);
-
-
-}
-
-
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-/** Get context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketQoS::TQoSR5Requested data to get
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR5Requested& aParam) const
-{
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQos::TQoSR5Requested)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-	TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	return KErrNone;
-}
-
-/** Get context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts - 1
-@param aParam - RPacketQoS::TQoSR5Negotiated data to get
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR5Negotiated& aParam) const
-{
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQoS::TQoSR5Negotiated)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-	TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	return KErrNone;
-}
-
-#else
-// !SYMBIAN_NETWORKING_UMTSR5 
-
-/** Get context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketQoS::TQoSR99_R4Requested data to get
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Requested& aParam) const
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQos::TQoSRequestedR99_R4)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-    TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	return KErrNone;
-    }
-
-/** Get context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts - 1
-@param aParam - RPacketQoS::TQoSR99_R4Negotiated data to get
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Negotiated& aParam) const
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQoS::TQoSR99_R4Negotiated)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-    TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	return KErrNone;
-    }
-
-
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 
-
-
-
-
-/** Get context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - TTFTInfo data to get
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Get(TContextId aPdpId, TTFTInfo& aParam) const
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(TFTInfo)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-    TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	return KErrNone;
-    }
-
-/** Get context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - TTFTOperationCode for the TFT data
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Get(TContextId aPdpId, TTFTOperationCode& aParam) const
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(TFTInfo)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-    TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	return KErrNone;
-    }
-
-
-/** Get context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketContext::TDataChannelV2 data to set
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketContext::TDataChannelV2& aParam) const
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TDataChannelV2)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-    TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	return KErrNone;
-    }
-
-/** Get context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketContext::TContextConfigGPRS data to set
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketContext::TContextConfigGPRS& aParam) const
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TContextConfigGPRS)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-    TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	return KErrNone;
-    }
-
-/** Get context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketContext::TContextStatus data to get
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketContext::TContextStatus& aParam) const
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TContextStatus)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-    TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	return KErrNone;
-    }
-
-/** Get context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketContext::TContextConfigGPRS data to set
-@return - KErrBadHandle or KErrNone
-*/
-void CPdpFsmInterface::Get(RPacketService::TStatus& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketService::TStatus)");
-
-	ASSERT(iPdpFsmFactory);
-
-	aParam = iNetworkStatus;
-    }
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-void CPdpFsmInterface::SetIMCNSignalling(TBool/* aImCnSignalling*/)
-  {
-	
-  }
-#endif //SYMBIAN_NETWORKING_UMTSR5
-
-TInt CPdpFsmInterface::GetLastErrorCause(TContextId aPdpId, TInt& aLastErrorCause) const
-	{
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::GetLastErrorCause(RPacketContext::GetLastErrorCause)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-	TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-        
-	iPdpFsmFactory->GetFsmContext(aPdpId)->GetLastErrorCause(aLastErrorCause);
-	
-	return KErrNone;
-	}
-
-/** Get the TsyName
-
-@return - TsyName in a TName
-*/
-const TName& CPdpFsmInterface::TsyName(void)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::TsyName");
-
-	ASSERT(iPdpFsmFactory);
-	
-	return iPdpFsmFactory->TsyName();
-    }
-
--- a/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/CompareContextParameters.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,727 +0,0 @@
-// Copyright (c) 2004-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:
-// Compares various packet context related structures
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#include "CompareContextParameters.h"
-
-/**
- @return ETrue if the TContextInfo parameters match, EFalse if they don't
- */
-TBool CompareContextInfo(const TContextInfo& aFirst, const TContextInfo& aSecond)
-	{
-	if (aFirst.iContextId != aSecond.iContextId)
-		{
-		return EFalse;
-		}
-	if (aFirst.iStatus != aSecond.iStatus)
-		{
-		return EFalse;
-		}
-	return ETrue;
-	}
-	
-/**
- @return ETrue if the RPacketQoS::TBitRate parameters match, EFalse if they don't
- */
-TBool CompareBitRate(const RPacketQoS::TBitRate &aFirst, const RPacketQoS::TBitRate &aSecond)
-	{
-	if (aFirst.iDownlinkRate != aSecond.iDownlinkRate)
-		{
-		return EFalse;
-		}
-	if (aFirst.iUplinkRate != aSecond.iUplinkRate)
-		{
-		return EFalse;
-		}
-	return ETrue;
-	}
-	
-/**
- @return ETrue if the RPacketQoS::TQoSR99_R4Requested parameters match, EFalse if they don't
- */
-TBool CompareUMTSQoSReq(const RPacketQoS::TQoSR99_R4Requested &aFirst, const RPacketQoS::TQoSR99_R4Requested &aSecond)
-	{
-	if (aFirst.iReqTrafficClass != aSecond.iReqTrafficClass)
-		{
-		return EFalse;
-		}
-	if (aFirst.iMinTrafficClass != aSecond.iMinTrafficClass)			
-		{
-		return EFalse;
-		}
-	if (aFirst.iReqDeliveryOrderReqd != aSecond.iReqDeliveryOrderReqd)		
-		{
-		return EFalse;
-		}
-	if (aFirst.iMinDeliveryOrderReqd != aSecond.iMinDeliveryOrderReqd)		
-		{
-		return EFalse;
-		}
-	if (aFirst.iReqDeliverErroneousSDU != aSecond.iReqDeliverErroneousSDU)	
-		{
-		return EFalse;
-		}
-	if (aFirst.iMinDeliverErroneousSDU != aSecond.iMinDeliverErroneousSDU)	
-		{
-		return EFalse;
-		}
-	if (aFirst.iReqMaxSDUSize != aSecond.iReqMaxSDUSize)				
-		{
-		return EFalse;
-		}
-	if (aFirst.iMinAcceptableMaxSDUSize != aSecond.iMinAcceptableMaxSDUSize)	
-		{
-		return EFalse;
-		}
-	if (!CompareBitRate(aFirst.iReqMaxRate, aSecond.iReqMaxRate))
-		{
-		return EFalse;
-		}
-	if (!CompareBitRate(aFirst.iMinAcceptableMaxRate, aSecond.iMinAcceptableMaxRate))
-		{
-		return EFalse;
-		}
-	if (aFirst.iReqBER != aSecond.iReqBER)					
-		{
-		return EFalse;
-		}
-	if (aFirst.iMaxBER != aSecond.iMaxBER)					
-		{
-		return EFalse;
-		}
-	if (aFirst.iReqSDUErrorRatio != aSecond.iReqSDUErrorRatio)			
-		{
-		return EFalse;
-		}
-	if (aFirst.iMaxSDUErrorRatio != aSecond.iMaxSDUErrorRatio)			
-		{
-		return EFalse;
-		}
-	if (aFirst.iReqTrafficHandlingPriority != aSecond.iReqTrafficHandlingPriority)
-		{
-		return EFalse;
-		}
-	if (aFirst.iMinTrafficHandlingPriority != aSecond.iMinTrafficHandlingPriority)
-		{
-		return EFalse;
-		}
-	if (aFirst.iReqTransferDelay != aSecond.iReqTransferDelay)			
-		{
-		return EFalse;
-		}
-	if (aFirst.iMaxTransferDelay != aSecond.iMaxTransferDelay)			
-		{
-		return EFalse;
-		}
-	if (aFirst.iReqGuaranteedRate.iDownlinkRate != aSecond.iReqGuaranteedRate.iDownlinkRate)
-		{
-		return EFalse;
-		}
-	if (aFirst.iReqGuaranteedRate.iUplinkRate != aSecond.iReqGuaranteedRate.iUplinkRate)
-		{
-		return EFalse;
-		}
-	if (aFirst.iMinGuaranteedRate.iDownlinkRate != aSecond.iMinGuaranteedRate.iDownlinkRate)
-		{
-		return EFalse;
-		}
-	if (aFirst.iMinGuaranteedRate.iUplinkRate != aSecond.iMinGuaranteedRate.iUplinkRate)
-		{
-		return EFalse;
-		}
-	return ETrue;
-	}
-
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-TBool CompareUMTSQoSReq(const RPacketQoS::TQoSR5Requested &aFirst, const RPacketQoS::TQoSR5Requested &aSecond)
-    {
-    TBool result = CompareUMTSQoSReq(static_cast<const RPacketQoS::TQoSR99_R4Requested&>(aFirst),
-        static_cast<const RPacketQoS::TQoSR99_R4Requested&>(aSecond));
-    
-    if (!result) 
-        {
-        return EFalse;
-        }
-        
-	if (aFirst.iSignallingIndication != aSecond.iSignallingIndication)
-		{
-		return EFalse;
-		}
-
-	if (aFirst.iSourceStatisticsDescriptor != aSecond.iSourceStatisticsDescriptor)
-		{
-		return EFalse;
-		}
-
-    return ETrue;    
-    }
-#endif
-
-
-/**
- @return ETrue if the TContextConfig parameters match, EFalse if they don't
- */
-TBool CompareUMTSQoSReq(const TContextConfig& aFirst, const TContextConfig& aSecond)
-	{
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-	RPacketQoS::TQoSR5Requested firstUMTSQoSRequest, secondUMTSQoSRequest;
-	aFirst.GetUMTSQoSReq(firstUMTSQoSRequest);
-	aSecond.GetUMTSQoSReq(secondUMTSQoSRequest);
-
-#else
-	RPacketQoS::TQoSR99_R4Requested firstUMTSQoSRequest, secondUMTSQoSRequest;
-	aFirst.GetUMTSQoSReq(firstUMTSQoSRequest);
-	aSecond.GetUMTSQoSReq(secondUMTSQoSRequest);
-#endif
-	
-	return CompareUMTSQoSReq(firstUMTSQoSRequest, secondUMTSQoSRequest);
-	}
-
-
-
-
-/**
- @return ETrue if the IP address parameters match, EFalse if they don't
- */
-TBool CompareIPAddress(const TUint8* aFirst, const TUint8* aSecond)
-	{
-	for (TUint i = 0; i < RPacketContext::KIPAddressSize; i++)
-		{
-		if (aFirst[i] != aSecond[i])
-			{
-			return EFalse;
-			}
-		}
-	return ETrue;
-	}
-
-/**
- @return ETrue if the RPacketContext::TPacketFilterV2 parameters match, EFalse if they don't
- */
-TBool ComparePacketFilterV2(const RPacketContext::TPacketFilterV2 &aFirst, const RPacketContext::TPacketFilterV2 &aSecond)
-	{
-	if (aFirst.iId != aSecond.iId)
-		{
-		return EFalse;
-		}
-	if (aFirst.iEvaluationPrecedenceIndex != aSecond.iEvaluationPrecedenceIndex)
-		{
-		return EFalse;
-		}
-	if (!CompareIPAddress((TUint8*)aFirst.iSrcAddr, (TUint8*)aSecond.iSrcAddr))
-		{
-		return EFalse;
-		}
-	if (!CompareIPAddress((TUint8*)aFirst.iSrcAddrSubnetMask, (TUint8*)aSecond.iSrcAddrSubnetMask))
-		{
-		return EFalse;
-		}
-	if (aFirst.iProtocolNumberOrNextHeader != aSecond.iProtocolNumberOrNextHeader)
-		{
-		return EFalse;
-		}
-	if (aFirst.iSrcPortMin != aSecond.iSrcPortMin)
-		{
-		return EFalse;
-		}
-	if (aFirst.iSrcPortMax != aSecond.iSrcPortMax)
-		{
-		return EFalse;
-		}
-	if (aFirst.iDestPortMin != aSecond.iDestPortMin)
-		{
-		return EFalse;
-		}
-	if (aFirst.iDestPortMax != aSecond.iDestPortMax)
-		{
-		return EFalse;
-		}
-	if (aFirst.iIPSecSPI != aSecond.iIPSecSPI)
-		{
-		return EFalse;
-		}
-	if (aFirst.iTOSorTrafficClass != aSecond.iTOSorTrafficClass)
-		{
-		return EFalse;
-		}
-	if (aFirst.iFlowLabel != aSecond.iFlowLabel)
-		{
-		return EFalse;
-		}
-	return ETrue;
-	}
-	
-/**
- @return ETrue if the TTFTInfo parameters match, EFalse if they don't
- */
-TBool CompareTFTInfo(TTFTInfo &aFirst, TTFTInfo &aSecond)
-	{
-	if (aFirst.FilterCount() != aSecond.FilterCount())
-		{
-		return EFalse;
-		}
-	
-	for (TUint8 i = 0; i < aFirst.FilterCount(); i++)
-		{
-		RPacketContext::TPacketFilterV2 firstPacketFilter, secondPacketFilter;
-		aFirst.GetPacketFilter(firstPacketFilter);
-		aSecond.GetPacketFilter(secondPacketFilter);
-		if (!ComparePacketFilterV2(firstPacketFilter, secondPacketFilter))
-			{
-			return EFalse;
-			}
-		}
-	return ETrue;
-	}
-
-/**
- @return ETrue if the TContextConfig parameters match, EFalse if they don't
- */
-TBool CompareTFTInfo(const TContextConfig& aFirst, const TContextConfig& aSecond)
-	{
-	TTFTInfo firstTFTInfo, secondTFTInfo;
-	aFirst.GetTFTInfo(firstTFTInfo);
-	aSecond.GetTFTInfo(secondTFTInfo);
-	return CompareTFTInfo(firstTFTInfo, secondTFTInfo);
-	}
-
-
-/**
- @return ETrue if the RPacketQoS::TQoSR99_R4Negotiated parameters match, EFalse if they don't
- */
-TBool CompareUMTSQoSNeg(const RPacketQoS::TQoSR99_R4Negotiated &aFirst, const RPacketQoS::TQoSR99_R4Negotiated &aSecond)
-	{
-	if (aFirst.iTrafficClass != aSecond.iTrafficClass)
-		{
-		return EFalse;
-		}
-	if (aFirst.iDeliveryOrderReqd != aSecond.iDeliveryOrderReqd)
-		{
-		return EFalse;
-		}
-	if (aFirst.iDeliverErroneousSDU != aSecond.iDeliverErroneousSDU)
-		{
-		return EFalse;
-		}
-	if (aFirst.iMaxSDUSize != aSecond.iMaxSDUSize)
-		{
-		return EFalse;
-		}
-	if (!CompareBitRate(aFirst.iMaxRate, aSecond.iMaxRate))
-		{
-		return EFalse;
-		}
-	if (aFirst.iBER != aSecond.iBER)
-		{
-		return EFalse;
-		}
-	if (aFirst.iSDUErrorRatio != aSecond.iSDUErrorRatio)
-		{
-		return EFalse;
-		}
-	if (aFirst.iTrafficHandlingPriority != aSecond.iTrafficHandlingPriority)
-		{
-		return EFalse;
-		}
-	if (aFirst.iTransferDelay != aSecond.iTransferDelay)
-		{
-		return EFalse;
-		}
-	if (!CompareBitRate(aFirst.iGuaranteedRate, aSecond.iGuaranteedRate))
-		{
-		return EFalse;
-		}
-	return ETrue;
-	}
-
-/**
- @return ETrue if the RPacketQoS::TBitRate parameters match, EFalse if they don't
- */
-TBool CompareUMTSQoSNeg(const TContextConfig& aFirst, const TContextConfig& aSecond)
-	{
-	RPacketQoS::TQoSR99_R4Negotiated firstUMTSQoS, secondUMTSQoS;
-	aFirst.GetUMTSQoSNeg(firstUMTSQoS);
-	aSecond.GetUMTSQoSNeg(secondUMTSQoS);
-	return CompareUMTSQoSNeg(firstUMTSQoS, secondUMTSQoS);
-	}
-
-
-
-
-
-/**
- @return ETrue if the RPacketContext::TAuthInfo parameters match, EFalse if they don't
- */
-TBool CompareAuthInfo(const RPacketContext::TAuthInfo &aFirst, const RPacketContext::TAuthInfo &aSecond)
-	{
-	if (aFirst.iProtocol != aSecond.iProtocol)
-		{
-		return EFalse;
-		}
-    if (aFirst.iUsername != aSecond.iUsername)
-		{
-		return EFalse;
-		}
-    if (aFirst.iPassword != aSecond.iPassword)
-		{
-		return EFalse;
-		}
-	return ETrue;
-	}
-
-/**
- @return ETrue if the RPacketContext::TDnsInfoV2 parameters match, EFalse if they don't
- */
-TBool CompareDnsInfoV2(const RPacketContext::TDnsInfoV2 &aFirst, const RPacketContext::TDnsInfoV2 &aSecond)
-	{
-	if (aFirst.iPrimaryDns != aSecond.iPrimaryDns)
-		{
-		return EFalse;
-		}
-	if (aFirst.iSecondaryDns != aSecond.iSecondaryDns)
-		{
-		return EFalse;
-		}
-	return ETrue;
-	}
-	
-/**
- @return ETrue if the RPacketContext::TProtocolConfigOptionV2 parameters match, EFalse if they don't
- */
-TBool CompareProtocolConfigOptionV2(const RPacketContext::TProtocolConfigOptionV2 &aFirst, const RPacketContext::TProtocolConfigOptionV2 &aSecond)
-	{
-	if (!CompareAuthInfo(aFirst.iAuthInfo, aSecond.iAuthInfo))
-		{
-		return EFalse;
-		}
-	if (aFirst.iChallenge != aSecond.iChallenge)
-		{
-		return EFalse;
-		}
-	if (aFirst.iResponse != aSecond.iResponse)
-		{
-		return EFalse;
-		}
-	if (aFirst.iId != aSecond.iId)
-		{
-		return EFalse;
-		}
-	if (!CompareDnsInfoV2(aFirst.iDnsAddresses, aSecond.iDnsAddresses))
-		{
-		return EFalse;
-		}
-	if (aFirst.iMiscBuffer != aSecond.iMiscBuffer)
-		{
-		return EFalse;
-		}
-	return ETrue;
-	}
-	
-/**
- @return ETrue if the RPacketContext::TContextConfigGPRS parameters match, EFalse if they don't
- */
-TBool CompareContextConfigGPRS(const RPacketContext::TContextConfigGPRS &aFirst, const RPacketContext::TContextConfigGPRS &aSecond)
-	{
-	if (aFirst.iPdpType != aSecond.iPdpType)
-		{
-		return EFalse;
-		}
-	if (aFirst.iAccessPointName != aSecond.iAccessPointName)
-		{
-		return EFalse;
-		}
-	if (aFirst.iPdpAddress != aSecond.iPdpAddress)
-		{
-		return EFalse;
-		}
-	if (aFirst.iPdpCompression != aSecond.iPdpCompression)
-		{
-		return EFalse;
-		}
-	if (aFirst.iAnonymousAccessReqd != aSecond.iAnonymousAccessReqd)
-		{
-		return EFalse;
-		}
-	if (aFirst.iUseEdge != aSecond.iUseEdge)
-		{
-		return EFalse;
-		}
-	if (!CompareProtocolConfigOptionV2(aFirst.iProtocolConfigOption, aSecond.iProtocolConfigOption))
-		{
-		return EFalse;
-		}
-	if (aFirst.iNWIContext != aSecond.iNWIContext)
-		{
-		return EFalse;
-		}
-	return ETrue;
-	}
-
-/**
- @return ETrue if the TContextConfig parameters match, EFalse if they don't
- */
-TBool CompareContextConfigGPRS(const TContextConfig& aFirst, const TContextConfig& aSecond)
-	{
-	RPacketContext::TContextConfigGPRS firstUMTSConfig, secondUMTSConfig;
-	aFirst.GetContextConfig(firstUMTSConfig);
-	aSecond.GetContextConfig(secondUMTSConfig);
-	return CompareContextConfigGPRS(firstUMTSConfig, secondUMTSConfig);
-	}
-
-/**
- @return ETrue if the RPacketQoS::TBitRate parameters match, EFalse if they don't
- */
-TBool CompareAccessPointName(const RPacketContext::TGSNAddress &aFirst, const RPacketContext::TGSNAddress &aSecond)
-	{
-	if (aFirst.Compare(aSecond) == 0)
-		{
-		return ETrue;
-		}
-	else
-		{
-		return EFalse;
-		}
-	}
-
-/**
- @return ETrue if the TContextConfig parameters match, EFalse if they don't
- */
-TBool CompareAccessPointName(const TContextConfig& aFirst, const TContextConfig& aSecond)
-	{
-	RPacketContext::TGSNAddress firstAccessPointName, secondAccessPointName;
-	aFirst.GetAccessPointName(firstAccessPointName);
-	aSecond.GetAccessPointName(secondAccessPointName);
-	return CompareAccessPointName(firstAccessPointName, secondAccessPointName);
-	}	
-
-/**
- @return ETrue if the RPacketContext::TProtocolAddress parameters match, EFalse if they don't
- */
-TBool ComparePdpAddress(const RPacketContext::TProtocolAddress &aFirst, const RPacketContext::TProtocolAddress &aSecond)
-	{
-	if (aFirst.Compare(aSecond) == 0)
-		{
-		return ETrue;
-		}
-	else
-		{
-		return EFalse;
-		}
-	}
-
-/**
- @return ETrue if the TContextConfig parameters match, EFalse if they don't
- */
-TBool ComparePdpAddress(const TContextConfig& aFirst, const TContextConfig& aSecond)
-	{
-	RPacketContext::TProtocolAddress firstPdpAddress, secondPdpAddress;
-	aFirst.GetPdpAddress(firstPdpAddress);
-	aSecond.GetPdpAddress(secondPdpAddress);
-	return ComparePdpAddress(firstPdpAddress, secondPdpAddress);
-	}
-
-/**
- @return ETrue if the TContextConfig parameters match, EFalse if they don't
- */
-TBool CompareContextConfig(const TContextConfig& aFirst, const TContextConfig& aSecond)
-	{
-	if (!CompareUMTSQoSReq(aFirst, aSecond))
-		{
-		return EFalse;
-		}
-
-	if (!CompareTFTInfo(aFirst, aSecond))
-		{
-		return EFalse;
-		}
-	if (!CompareUMTSQoSNeg(aFirst, aSecond))
-		{
-		return EFalse;
-		}
-	if (!CompareContextConfigGPRS(aFirst, aSecond))
-		{
-		return EFalse;
-		}
-	
-	TUint firstPdpCompression, secondPdpCompression;
-	aFirst.GetPdpCompression(firstPdpCompression);
-	aSecond.GetPdpCompression(secondPdpCompression);
-	if (firstPdpCompression != secondPdpCompression)
-		{
-		return EFalse;
-		}
-	
-	RPacketContext::TProtocolType firstPdpType, secondPdpType;
-	aFirst.GetPdpType(firstPdpType);
-	aSecond.GetPdpType(secondPdpType);
-	if (firstPdpType != secondPdpType)
-		{
-		return EFalse;
-		}
-	
-	if (!CompareAccessPointName(aFirst, aSecond))
-		{
-		return EFalse;
-		}
-	
-	if (!ComparePdpAddress(aFirst, aSecond))
-		{
-		return EFalse;
-		}
-	
-	return ETrue;
-	}
-	
-/**
- @return ETrue if the TContextParameters parameters match, EFalse if they don't
- */
-TBool CompareContextParameters(const TContextParameters& aFirst, const TContextParameters& aSecond)
-	{
-	if (aFirst.iContextType != aSecond.iContextType)
-		{
-		return EFalse;
-		}
-	
-	if (!CompareContextInfo(aFirst.iContextInfo, aSecond.iContextInfo))
-		{
-		return EFalse;
-		}
-	
-	if (!CompareContextConfig(aFirst.iContextConfig, aSecond.iContextConfig))
-		{
-		return EFalse;
-		}
-	
-	if (aFirst.iReasonCode != aSecond.iReasonCode)
-		{
-		return EFalse;
-		}
-	
-	if (aFirst.iTFTOperationCode != aSecond.iTFTOperationCode)
-		{
-		return EFalse;
-		}
-	
-	return ETrue;
-	}
-
-/**
- @return ETrue if the RPacketContext::TDataChannelV2 parameters match, EFalse if they don't
- */
-TBool CompareDataChannel(const RPacketContext::TDataChannelV2& aFirst, const RPacketContext::TDataChannelV2& aSecond)
-	{
-	if (aFirst.iCsy.Compare(aSecond.iCsy) != 0)
-		{
-		return EFalse;
-		}
-	if (aFirst.iPort.Compare(aSecond.iPort) != 0)
-		{
-		return EFalse;
-		}
-	if (aFirst.iChannelId.Compare(aSecond.iChannelId) != 0)
-		{
-		return EFalse;
-		}
-	return ETrue;
-	}
-
-/**
- @return ETrue if the TTFTInfo parameter matches the TFTs of the packet context aPacketContext, EFalse if they don't
- */
-TBool CompareTFTInfo(TTFTInfo& aTFTInfo, RPacketContext& aPacketContext)
-	{
-	RPacketContext::TPacketFilterV2 packetFilter;
-	RPacketContext::TPacketFilterV2Pckg packetFilterPckg(packetFilter);
-	RPacketContext::TPacketFilterV2 expectedTftInfo;
-	TRequestStatus status;
-	TInt count;
-
-	// make sure the count matches up
-	aPacketContext.EnumeratePacketFilters(status, count);
-	User::WaitForRequest(status);
-	if (status != KErrNone)
-		{
-		return EFalse;
-		}
-	if (count != aTFTInfo.FilterCount())
-		{
-		return EFalse;
-		}
-		
-	// The filters indexed by the second parameter of RPacketContext::GetPacketFilterInfo may not be contiguous,
-	// so we go through each filter assigned to context aPacketContext and try to find a match in aTFTInfo
-	TInt matchingCount = 0;
-	for (TUint packetContextIndex = 0; packetContextIndex < KMaxNumberOfPacketFilters; packetContextIndex++)
-		{
-		TBool foundMatch = EFalse;
-		aPacketContext.GetPacketFilterInfo(status, packetContextIndex, packetFilterPckg);
-		User::WaitForRequest(status);
-		aTFTInfo.SetToFirst();
-		for (TInt tftInfoIndex = 0; tftInfoIndex < aTFTInfo.FilterCount() && !foundMatch; tftInfoIndex++)
-			{
-			aTFTInfo.NextPacketFilter(expectedTftInfo);
-			if (ComparePacketFilterV2(packetFilter, expectedTftInfo))
-				{
-				matchingCount++;
-				if (matchingCount == aTFTInfo.FilterCount())
-					{
-					return ETrue;
-					}
-				else
-					{
-					foundMatch = ETrue;
-					}
-				}
-			}
-		}
-	return EFalse;
-	}
-
-/**
- @return ETrue if the context status of context aContext names matches that of aContextStatus, EFalse if they don't
- */
-TBool CompareContextInfo(const RPacketService& aPacketService, const TDesC& aContextName, RPacketContext::TContextStatus aContextStatus)
-	{
-	TRequestStatus status;
-	RPacketService::TContextInfo contextInfo;
-	TInt numContexts, dummy;
-	aPacketService.EnumerateContexts(status, numContexts, dummy);
-	User::WaitForRequest(status);
-	for (TInt i = 0; i < numContexts; i++)
-		{
-		aPacketService.GetContextInfo(status, i, contextInfo);
-		User::WaitForRequest(status);
-		if (aContextName.Compare(contextInfo.iName) == 0)
-			{
-			if (status != KErrNone)
-				{
-				return EFalse;
-				}
-			if (contextInfo.iStatus != aContextStatus)
-				{
-				return EFalse;
-				}
-			return ETrue;
-			}
-		}
-	return EFalse;
-	}
--- a/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/DefaultContextParameters.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,281 +0,0 @@
-// Copyright (c) 2004-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:
-// Assigns default values to various packet context related structures
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#include "DefaultContextParameters.h"
-
-_LIT(KTxtSimTsy,"SIM");
-TName KSimTsyName(KTxtSimTsy);
-TName& SimTsyName()
-	{
-	return KSimTsyName;
-	}
-
-_LIT(apn, "ACME INTERNET PROVIDERS LTD");
-_LIT(protocolAddress, "i-MODE GATEWAY");
-_LIT(username, "USER1");
-_LIT(password, "PASSWORD1");
-_LIT(challenge, "CHALLENGE1");
-_LIT(response, "RESPONSE1");
-_LIT(primaryDNS, "PRIMARYSERVER1");
-_LIT(secondaryDNS, "SECONDARYSERVER1");
-
-void DefaultContextConfigGPRS(RPacketContext::TContextConfigGPRS& aParam)
-	{
-	aParam.iPdpType = static_cast<RPacketContext::TProtocolType>(1);
-	aParam.iAccessPointName.Copy(apn);
-	aParam.iPdpAddress.Copy(protocolAddress);
-	aParam.iPdpCompression = 1;
-	aParam.iAnonymousAccessReqd = static_cast<RPacketContext::TAnonymousAccess>(1);
-	aParam.iUseEdge = ETrue;
-	aParam.iProtocolConfigOption.iAuthInfo.iProtocol = static_cast<RPacketContext::TAuthProtocol>(1);
-	aParam.iProtocolConfigOption.iAuthInfo.iUsername.Copy(username);
-	aParam.iProtocolConfigOption.iAuthInfo.iPassword.Copy(password);
-	aParam.iProtocolConfigOption.iChallenge.Copy(challenge);
-	aParam.iProtocolConfigOption.iResponse.Copy(response);
-	aParam.iProtocolConfigOption.iDnsAddresses.iPrimaryDns.Copy(primaryDNS);
-	aParam.iProtocolConfigOption.iDnsAddresses.iSecondaryDns.Copy(secondaryDNS);
-	aParam.iProtocolConfigOption.iId = 1;
-	}
-
-void DefaultQoSR99_R4Requested(RPacketQoS::TQoSR99_R4Requested& aQosRequested)
-	{
-	aQosRequested.iReqTrafficClass = static_cast<RPacketQoS::TTrafficClass>(2);
-	aQosRequested.iMinTrafficClass = static_cast<RPacketQoS::TTrafficClass>(2);
-	aQosRequested.iReqDeliveryOrderReqd = static_cast<RPacketQoS::TDeliveryOrder>(2);
-	aQosRequested.iMinDeliveryOrderReqd = static_cast<RPacketQoS::TDeliveryOrder>(2);
-	aQosRequested.iReqDeliverErroneousSDU = static_cast<RPacketQoS::TErroneousSDUDelivery>(2);
-	aQosRequested.iMinDeliverErroneousSDU = static_cast<RPacketQoS::TErroneousSDUDelivery>(2);
-	aQosRequested.iReqMaxSDUSize = 2;
-	aQosRequested.iMinAcceptableMaxSDUSize = 2;
-	aQosRequested.iReqMaxRate.iUplinkRate = 2;
-	aQosRequested.iReqMaxRate.iDownlinkRate = 2;
-	aQosRequested.iMinGuaranteedRate.iUplinkRate = 2;
-	aQosRequested.iMinGuaranteedRate.iDownlinkRate = 2;
-	aQosRequested.iReqBER = static_cast<RPacketQoS::TBitErrorRatio>(2);
-	aQosRequested.iMaxBER = static_cast<RPacketQoS::TBitErrorRatio>(2);
-	aQosRequested.iReqSDUErrorRatio = static_cast<RPacketQoS::TSDUErrorRatio>(2);
-	aQosRequested.iMaxSDUErrorRatio = static_cast<RPacketQoS::TSDUErrorRatio>(2);
-	aQosRequested.iReqTrafficHandlingPriority = static_cast<RPacketQoS::TTrafficHandlingPriority>(2);
-	aQosRequested.iMinTrafficHandlingPriority = static_cast<RPacketQoS::TTrafficHandlingPriority>(2);
-	aQosRequested.iReqTransferDelay = 2;
-	aQosRequested.iMaxTransferDelay = 2;
-	aQosRequested.iReqGuaranteedRate.iUplinkRate = 2;
-	aQosRequested.iReqGuaranteedRate.iDownlinkRate = 2;
-	aQosRequested.iMinGuaranteedRate.iUplinkRate = 2;
-	aQosRequested.iMinGuaranteedRate.iDownlinkRate = 2;
-	}
-	
-void SecondQoSR99_R4Requested(RPacketQoS::TQoSR99_R4Requested& aQosRequested)
-	{
-	aQosRequested.iReqTrafficClass = static_cast<RPacketQoS::TTrafficClass>(1);
-	aQosRequested.iMinTrafficClass = static_cast<RPacketQoS::TTrafficClass>(1);
-	aQosRequested.iReqDeliveryOrderReqd = static_cast<RPacketQoS::TDeliveryOrder>(1);
-	aQosRequested.iMinDeliveryOrderReqd = static_cast<RPacketQoS::TDeliveryOrder>(1);
-	aQosRequested.iReqDeliverErroneousSDU = static_cast<RPacketQoS::TErroneousSDUDelivery>(1);
-	aQosRequested.iMinDeliverErroneousSDU = static_cast<RPacketQoS::TErroneousSDUDelivery>(1);
-	aQosRequested.iReqMaxSDUSize = 1;
-	aQosRequested.iMinAcceptableMaxSDUSize = 1;
-	aQosRequested.iReqMaxRate.iUplinkRate = 1;
-	aQosRequested.iReqMaxRate.iDownlinkRate = 1;
-	aQosRequested.iMinGuaranteedRate.iUplinkRate = 1;
-	aQosRequested.iMinGuaranteedRate.iDownlinkRate = 1;
-	aQosRequested.iReqBER = static_cast<RPacketQoS::TBitErrorRatio>(1);
-	aQosRequested.iMaxBER = static_cast<RPacketQoS::TBitErrorRatio>(1);
-	aQosRequested.iReqSDUErrorRatio = static_cast<RPacketQoS::TSDUErrorRatio>(1);
-	aQosRequested.iMaxSDUErrorRatio = static_cast<RPacketQoS::TSDUErrorRatio>(1);
-	aQosRequested.iReqTrafficHandlingPriority = static_cast<RPacketQoS::TTrafficHandlingPriority>(1);
-	aQosRequested.iMinTrafficHandlingPriority = static_cast<RPacketQoS::TTrafficHandlingPriority>(1);
-	aQosRequested.iReqTransferDelay = 1;
-	aQosRequested.iMaxTransferDelay = 1;
-	aQosRequested.iReqGuaranteedRate.iUplinkRate = 1;
-	aQosRequested.iReqGuaranteedRate.iDownlinkRate = 1;
-	aQosRequested.iMinGuaranteedRate.iUplinkRate = 1;
-	aQosRequested.iMinGuaranteedRate.iDownlinkRate = 1;
-	}
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-void DefaultQoSR5Requested(RPacketQoS::TQoSR5Requested& aQosRequested)
-    {
-    DefaultQoSR99_R4Requested (aQosRequested);
-    aQosRequested.iSignallingIndication = EFalse;
-    aQosRequested.iSignallingIndication = RPacketQoS::ESourceStatisticsDescriptorUnknown;
-    }
-    
-void SecondQoSR5Requested(RPacketQoS::TQoSR5Requested& aQosRequested)
-    {
-    SecondQoSR99_R4Requested (aQosRequested);
-    aQosRequested.iSignallingIndication = EFalse;
-    aQosRequested.iSignallingIndication = RPacketQoS::ESourceStatisticsDescriptorUnknown;
-    }
-
-#endif
-	
-void DefaultQoSR99_R4Negotiated(RPacketQoS::TQoSR99_R4Negotiated& aQosNegotiated)
-	{
-	aQosNegotiated.iTrafficClass = static_cast<RPacketQoS::TTrafficClass>(1);
-	aQosNegotiated.iDeliveryOrderReqd = static_cast<RPacketQoS::TDeliveryOrder>(1);
-	aQosNegotiated.iDeliverErroneousSDU = static_cast<RPacketQoS::TErroneousSDUDelivery>(1);
-	aQosNegotiated.iMaxSDUSize = 1;
-	aQosNegotiated.iBER = static_cast<RPacketQoS::TBitErrorRatio>(1);
-	aQosNegotiated.iSDUErrorRatio = static_cast<RPacketQoS::TSDUErrorRatio>(1);
-	aQosNegotiated.iTrafficHandlingPriority = static_cast<RPacketQoS::TTrafficHandlingPriority>(1);
-	aQosNegotiated.iTransferDelay = 1;
-	aQosNegotiated.iGuaranteedRate.iUplinkRate = 1;
-	aQosNegotiated.iGuaranteedRate.iDownlinkRate = 1;
-	aQosNegotiated.iMaxRate.iUplinkRate = 1;
-	aQosNegotiated.iMaxRate.iDownlinkRate = 1;
-	}
-	
-void SecondQoSR99_R4Negotiated(RPacketQoS::TQoSR99_R4Negotiated& aQosNegotiated)
-	{
-	aQosNegotiated.iTrafficClass = static_cast<RPacketQoS::TTrafficClass>(2);
-	aQosNegotiated.iDeliveryOrderReqd = static_cast<RPacketQoS::TDeliveryOrder>(2);
-	aQosNegotiated.iDeliverErroneousSDU = static_cast<RPacketQoS::TErroneousSDUDelivery>(2);
-	aQosNegotiated.iMaxSDUSize = 2;
-	aQosNegotiated.iBER = static_cast<RPacketQoS::TBitErrorRatio>(2);
-	aQosNegotiated.iSDUErrorRatio = static_cast<RPacketQoS::TSDUErrorRatio>(2);
-	aQosNegotiated.iTrafficHandlingPriority = static_cast<RPacketQoS::TTrafficHandlingPriority>(2);
-	aQosNegotiated.iTransferDelay = 2;
-	aQosNegotiated.iGuaranteedRate.iUplinkRate = 2;
-	aQosNegotiated.iGuaranteedRate.iDownlinkRate = 2;
-	aQosNegotiated.iMaxRate.iUplinkRate = 2;
-	aQosNegotiated.iMaxRate.iDownlinkRate = 2;
-	}
-
-
-
-
-
-TUint8 defaultSrcAddr[RPacketContext::KIPAddressSize] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 1, 1, 1, 1};
-TUint8 defaultSrcAddrSubnetMask[RPacketContext::KIPAddressSize] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255};
-
-static void DefaultPacketFilter1(RPacketContext::TPacketFilterV2& entry)
-	{
-	entry.iId = 0;
-	entry.iEvaluationPrecedenceIndex = 1;
-	
-	for (TUint i = 0; i < RPacketContext::KIPAddressSize; i++)
-		{
-		entry.iSrcAddr[i] = defaultSrcAddr[i];
-		entry.iSrcAddrSubnetMask[i] = defaultSrcAddrSubnetMask[i];
-		}
-	entry.iProtocolNumberOrNextHeader = 1;
-	entry.iSrcPortMin = 1;
-	entry.iSrcPortMax = 1;
-	entry.iDestPortMin = 1;
-	entry.iDestPortMax = 1;
-	entry.iIPSecSPI = 1;
-	entry.iTOSorTrafficClass = 1;
-	entry.iFlowLabel = 1;
-	}
-	
-static void DefaultPacketFilter2(RPacketContext::TPacketFilterV2& entry)
-	{
-	entry.iId = 1;
-	entry.iEvaluationPrecedenceIndex = 2;
-	
-	for (TUint i = 0; i < RPacketContext::KIPAddressSize; i++)
-		{
-		entry.iSrcAddr[i] = defaultSrcAddr[i];
-		entry.iSrcAddrSubnetMask[i] = defaultSrcAddrSubnetMask[i];
-		}
-	entry.iProtocolNumberOrNextHeader = 2;
-	entry.iSrcPortMin = 2;
-	entry.iSrcPortMax = 2;
-	entry.iDestPortMin = 2;
-	entry.iDestPortMax = 2;
-	entry.iIPSecSPI = 2;
-	entry.iTOSorTrafficClass = 2;
-	entry.iFlowLabel = 2;
-	}
-
-static void DefaultPacketFilter3(RPacketContext::TPacketFilterV2& entry)
-	{
-	entry.iId = 2;
-	entry.iEvaluationPrecedenceIndex = 3;
-	
-	for (TUint i = 0; i < RPacketContext::KIPAddressSize; i++)
-		{
-		entry.iSrcAddr[i] = defaultSrcAddr[i];
-		entry.iSrcAddrSubnetMask[i] = defaultSrcAddrSubnetMask[i];
-		}
-	entry.iProtocolNumberOrNextHeader = 3;
-	entry.iSrcPortMin = 3;
-	entry.iSrcPortMax = 3;
-	entry.iDestPortMin = 3;
-	entry.iDestPortMax = 3;
-	entry.iIPSecSPI = 3;
-	entry.iTOSorTrafficClass = 3;
-	entry.iFlowLabel = 3;
-	}
-
-void DefaultTftInfo(TTFTInfo& aTTFTInfo)
-	{
-	RPacketContext::TPacketFilterV2 entry1, entry2;
-
-	DefaultPacketFilter1(entry1);
-	DefaultPacketFilter2(entry2);
-
-	aTTFTInfo.AddPacketFilter(entry1);
-	aTTFTInfo.AddPacketFilter(entry2);
-	}
-	
-void SecondDefaultTftInfo(TTFTInfo& aTTFTInfo)
-	{
-	RPacketContext::TPacketFilterV2 entry;
-
-	DefaultPacketFilter3(entry);
-
-	aTTFTInfo.AddPacketFilter(entry);
-	}
-	
-void CombinedDefaultTftInfo(TTFTInfo& aTTFTInfo)
-	{
-	RPacketContext::TPacketFilterV2 entry1, entry2, entry3;
-
-	DefaultPacketFilter1(entry1);
-	DefaultPacketFilter2(entry2);
-	DefaultPacketFilter3(entry3);
-
-	aTTFTInfo.AddPacketFilter(entry1);
-	aTTFTInfo.AddPacketFilter(entry2);
-	aTTFTInfo.AddPacketFilter(entry3);
-	}
-
-void DefaultContextStatus(RPacketContext::TContextStatus& aStatus)
-	{
-	aStatus = RPacketContext::EStatusInactive;
-	}
-	
-void DefaultServiceStatus(RPacketService::TStatus& aStatus)
-	{
-	aStatus = RPacketService::EStatusAttached;
-	}
-	
-_LIT(csy, "SIMTSYLOOPBACK.CSY");
-_LIT(port, "SIMTSYLOOPBACK::0");
-void DefaultDataChannel(RPacketContext::TDataChannelV2& aDataChannel)
-	{
-	aDataChannel.iCsy = csy;
-	aDataChannel.iPort = port;		
-	aDataChannel.iChannelId = port;
-	}
--- a/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/InputRequestListener.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,239 +0,0 @@
-// Copyright (c) 2004-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:
-// Implementation of CInputRequestListener
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-
-#include "CPdpFsmInterface.h"
-
-#include "SpudUnitTestServer.h"
-#include "InputRequestListener.h"
-#include <in_iface.h>
-#include "reteldriverinput.h"
-#include "ceteldriverfactory.h"
-#include "cpdpfsmfactory.h"
-#include "DefaultContextParameters.h"
-
-CInputRequestListener* CInputRequestListener::NewL(TBool aUseTestPdpInterface)
-	{
-	CInputRequestListener *me = new(ELeave) CInputRequestListener(aUseTestPdpInterface);
-	CleanupStack::PushL(me);
-	me->ConstructL();
-	CleanupStack::Pop(me);
-	return me;
-	}
-
-CInputRequestListener::CInputRequestListener(TBool aUseTestPdpFsmInterface) : CActive(EPriorityStandard), iUseTestPdpFsmInterface(aUseTestPdpFsmInterface)
-	{
-	iReadyForInputRequest = KRequestPending;
-	iThreadDestructed     = KRequestPending;
-	iThreadInitialized    = KRequestPending;
-
-	iEtelDriverInputResponseStatus             = KRequestPending;
-	iEtelDriverConfigGPRSNotificationStatus    = KRequestPending;
-	iEtelDriverContextStatusNotificationStatus = KRequestPending;
-	iEtelDriverQosNotificationStatus           = KRequestPending;
-	iEtelDriverServiceNotificationStatus       = KRequestPending;
-	
-	iFsmInputResponseStatus          = KRequestPending;
-	iFsmNetworkStatusStatus          = KRequestPending;
-	iFsmContextParameterChangeStatus = KRequestPending;
-	iFsmContextSuspendedStatus       = KRequestPending;
-	iFsmContextResumedStatus         = KRequestPending;	
-    iFsmObjectCreateResponse         = KRequestPending;	
-	}
-	
-void CInputRequestListener::ConstructL()
-	{
-	iSpudManInterface = new(ELeave) TSpudManInterfaceTest(*this);
-	}
-
-CInputRequestListener::~CInputRequestListener()
-	{
-	Cancel();
-	if (iEtelDriver)
-		{
-		iEtelDriver->Close();
-		delete iEtelDriver;
-		iEtelDriver = NULL;
-		}
-	
-	if (iPdpFsmInterfaceTest)
-		{
-		iPdpFsmInterfaceTest->Close();
-		delete iPdpFsmInterfaceTest;
-		iPdpFsmInterfaceTest = NULL;
-		}
-
-	if (iPdpFsmInterface)
-		{
-		iPdpFsmInterface->Close();
-		delete iPdpFsmInterface;
-		iPdpFsmInterface = NULL;
-		}
-	}
-	
-void CInputRequestListener::DoCancel()
-	{
-	iStatus = KErrCancel;
-	}
-	
-/**
- Wrapper for private method CActive::SetActive()
- */
-void CInputRequestListener::Activate()
-	{
-	iStatus = KRequestPending;
-	SetActive();
-	}
-
-/**
- If iStatus was completed with EEtelDriverInputRequest, REtelDriverInput::Input is called with the parameters supplied in iInputData
- If iStatus was completed with EEtelDriverCancelPdpRequest, REtelDriverInput::Cancel is called with the parameters supplied in iEtelDriverCancelRequestData
- If iStatus was completed with EFsmInputRequest, RPdpFsmInterface::Input is called with the parameters supplied in iFsmInputRequestData
- If iStatus was completed with ECleanup, or anything else, the active scheduler is stopped
- */
-void CInputRequestListener::RunL()
-	{
-	TRequestStatus status = iStatus;
-	iStatus = KRequestPending;
-	
-	if (status == EEtelDriverInputRequest     || 
-	    status == EEtelDriverCancelPdpRequest ||
-	    status == EFsmInputRequest            || 
-	    status == EFsmObjectCreate)
-		{
-		switch (status.Int())
-		    {
-		    case EEtelDriverInputRequest:
-		        {
-    			// the main test thread requested a call to REtelDriverInput::Input
-    			iEtelDriver->Input(iEtelDriverInputRequestData.iPdpId, iEtelDriverInputRequestData.iOperation); // error
-    			break;
-    			}
-		    case EEtelDriverCancelPdpRequest:
-		        {
-    			iEtelDriver->CancelPdp(iEtelDriverCancelRequestPdpId);
-    			break;
-    			}
-		    case EFsmInputRequest:
-		        {
-    			iPdpFsmInterface->Input(iFsmInputRequestData.iPdpId, iFsmInputRequestData.iOperation);
-    			break;
-    			}
-		    case EFsmObjectCreate:
-    			{
-    			TInt err = iPdpFsmInterface->NewFsmContext(iFsmInputRequestData.iPdpId);
-
-                // Reproduce completion  as per 'SpudManInterfaceTest::Input()' 
-                // - since we're not being called asynchronously from EtelPkt
-                
-        		iFsmInputResponseData.iPdpId = iFsmInputRequestData.iPdpId;
-
-        		TRequestStatus *readyStatus = &iFsmObjectCreateResponse;
-        	 	iParentThread.RequestComplete(readyStatus, err);
-        	 	break;
-    			}
-    		default:
-    		    ASSERT(EFalse);
-    		}
-
-		// we are finished with the iInputData or iControlData parameters, so this signals to the main test thread
-		// that this data can be updated with new parameters
-		TRequestStatus *readyStatus = &iReadyForInputRequest;
-	 	iParentThread.RequestComplete(readyStatus, KErrNone);
-	 	
-		SetActive(); 	
-		}
-	else
-		{
-		// the status was ECleanup, or we don't recognize the status, so abort the active scheduler, and the thread will be exited
-		CActiveScheduler::Stop();
-		}
-	}
-	
-/**
- Creates the unit under test - the FSM if iUseTestPdpFsmInterface is false, and the EtelDriver otherwise
- */
-void CInputRequestListener::CreateUnitUnderTestL()
-	{
-	if (iUseTestPdpFsmInterface)
-		{
-		CreateEtelDriverL();
-		}
-	else
-		{
-		CreatePdpFsmL();
-		}
-	}
-
-/**
- Create and initialize the SPUDTEL
- */
-void CInputRequestListener::CreateEtelDriverL()
-	{
-	iEtelDriver = NewEtelDriverInputL();
-	
-	iPdpFsmInterfaceTest = new(ELeave)CPdpFsmInterfaceTest(*this);
-
-	iEtelDriver->OpenL(*iPdpFsmInterfaceTest);
-	iPdpFsmInterfaceTest->OpenL(NULL, SimTsyName());
-	
-	for (TContextId i = 0; i < KMaxPdpContexts; i++)
-		{
-		iEtelDriver->CreatePdpL(i);
-		}
-	}
-
-/**
- Create and initialize the SPUD FSM
- */
-void CInputRequestListener::CreatePdpFsmL()
-	{
-	iPdpFsmInterface = new(ELeave)CPdpFsmInterface();
-	iPdpFsmInterface->OpenL(iSpudManInterface, SimTsyName());
-	}
-
-/**
- Delete and cleanup and resources associated with SPUDTEL and SPUDFSM
- */
-void CInputRequestListener::DeleteUnitUnderTest()
-	{
-	if (iEtelDriver)
-		{
-		iEtelDriver->Close();
-		delete iEtelDriver;
-		iEtelDriver = NULL;
-		}
-		
-	if (iPdpFsmInterfaceTest)
-		{
-		iPdpFsmInterfaceTest->Close();
-		delete iPdpFsmInterfaceTest;
-		iPdpFsmInterfaceTest = NULL;
-		}
-
-	if (iPdpFsmInterface)
-		{
-		iPdpFsmInterface->Close();
-		delete iPdpFsmInterface;
-		iPdpFsmInterface = NULL;
-		}
-	}
--- a/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/PdpFsmInterfaceTest.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,262 +0,0 @@
-// Copyright (c) 2004-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:
-// The implementation of the RPdpFsmInterface for SPUD TEL unit tests
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#include "PdpFsmInterfaceTest.h"
-#include "InputRequestListener.h"
-#include "DefaultContextParameters.h"
-#include <etelpckt.h>
-
-
-CPdpFsmInterfaceTest::CPdpFsmInterfaceTest(CInputRequestListener& aListener) : iListener(aListener), iTftOperationCode(KAddFilters)
-	{
-	DefaultTftInfo(iTftInfo);
-	}
-
-const TName& CPdpFsmInterfaceTest::TsyName()
-	{
-	return SimTsyName();
-	}
-
-/**
- Signals to the test execute thread that RPdpFsmInterface::Input has been called
- */
-TInt CPdpFsmInterfaceTest::Input(TContextId aPdpId, const TInt aOperation, const TInt aParam)
-	{
-	// The aOperation parameters are broken up into those that are notifications and those that aren't
-	// Since notifications can happen anytime, separate request status members need to be kept for each one
-	// Other input requests happen serially, so only one request can be pending at any time
-	TRequestStatus *status = NULL;
-	switch (aOperation)
-		{
-	case PdpFsm::EQoSProfileChangeNetwork:		
-		status = &iListener.iEtelDriverQosNotificationStatus;
-		break;
-	case PdpFsm::EConfigGPRSChangeNetwork:
-		status = &iListener.iEtelDriverConfigGPRSNotificationStatus;
-		break;
-	case PdpFsm::EContextStatusChangeNetwork:
-		status = &iListener.iEtelDriverContextStatusNotificationStatus;
-		break;
-	case PdpFsm::EServiceStatusChangeNetwork:
-		status = &iListener.iEtelDriverServiceNotificationStatus;
-		break;
-	default:
-		iListener.iEtelDriverInputResponseData.iPdpId = aPdpId;
-		iListener.iEtelDriverInputResponseData.iSignal = aOperation;
-		status = &iListener.iEtelDriverInputResponseStatus;
-		break;
-		}
-	iListener.iParentThread.RequestComplete(status, aParam);
-	
-	return KErrNone;
-	}
-
-
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-// Gets just return default values
-TInt CPdpFsmInterfaceTest::Get(TContextId /*aPdpId*/, RPacketQoS::TQoSR5Negotiated& /*aParam*/) const
-	{
-	ASSERT(EFalse);
-	return KErrNone;
-	}
-
-TInt CPdpFsmInterfaceTest::Get(TContextId /*aPdpId*/, RPacketQoS::TQoSR5Requested& aQoSR5Requested) const
-	{
-	DefaultQoSR99_R4Requested(aQoSR5Requested);
-	aQoSR5Requested.iSignallingIndication = EFalse;
-	aQoSR5Requested.iSourceStatisticsDescriptor = RPacketQoS::ESourceStatisticsDescriptorUnknown;
-	return KErrNone;
-	}
-	
-#else
-// !SYMBIAN_NETWORKING_UMTSR5
-
-// Gets just return default values
-TInt CPdpFsmInterfaceTest::Get(TContextId /*aPdpId*/, RPacketQoS::TQoSR99_R4Negotiated& /*aParam*/) const
-	{
-	ASSERT(EFalse);
-	return KErrNone;
-	}
-
-TInt CPdpFsmInterfaceTest::Get(TContextId /*aPdpId*/, RPacketQoS::TQoSR99_R4Requested& aQoSR99_R4Requested) const
-	{
-	DefaultQoSR99_R4Requested(aQoSR99_R4Requested);
-	return KErrNone;
-	}
-
-
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 
-
-
-
-TInt CPdpFsmInterfaceTest::Get(TContextId /*aPdpId*/, RPacketContext::TContextConfigGPRS& aParam) const
-	{
-	DefaultContextConfigGPRS(aParam);
-	return KErrNone;
-	}
-	
-TInt CPdpFsmInterfaceTest::Get(TContextId /*aPdpId*/, TTFTOperationCode& aParam) const
-	{
-	aParam = iTftOperationCode;
-	return KErrNone;
-	}
-
-TInt CPdpFsmInterfaceTest::Get(TContextId /*aPdpId*/, TTFTInfo& aTFTInfo) const
-	{
-	aTFTInfo = iTftInfo;
-	return KErrNone;
-	}
-
-TInt CPdpFsmInterfaceTest::Get(TContextId /*aPdpId*/, RPacketContext::TDataChannelV2& aDataChannelV2) const
-	{
-	DefaultDataChannel(aDataChannelV2);
-	return KErrNone;
-	}
-	
-TInt CPdpFsmInterfaceTest::Get(TContextId /*aPdpId*/, RPacketContext::TContextStatus& aParam) const
-	{
-	aParam = RPacketContext::EStatusUnknown;
-	return KErrNone;
-	}
-
-void CPdpFsmInterfaceTest::Get(RPacketService::TStatus& aParam)
-	{
-	aParam = RPacketService::EStatusActive;
-	}
-
-TInt CPdpFsmInterfaceTest::GetLastErrorCause(TContextId /*aPdpId*/, TInt& /*aLastErrorCause*/) const
-	{
-	/*Placeholder for unused function*/
-	return KErrNone;
-	}
-
-/**
- Store the parameters passed to Set to be compared by the test execute thread
- */
-TInt CPdpFsmInterfaceTest::Set(TContextId aPdpId, const RPacketContext::TContextConfigGPRS& aContextConfigGPRS)
-	{
-	iListener.iNotifyContextConfigData.iPdpId = aPdpId;
-	iListener.iNotifyContextConfigData.iContextConfigGPRS = aContextConfigGPRS;
-	return KErrNone;
-	}
-
-/**
- Store the parameters passed to Set to be compared by the test execute thread
- */
-TInt CPdpFsmInterfaceTest::Set(TContextId aPdpId, const RPacketContext::TContextStatus& aParam)
-	{
-	iListener.iNotifyContextStatusData.iPdpId = aPdpId;
-	iListener.iNotifyContextStatusData.iContextStatus = aParam;
-	return KErrNone;
-	}
-
-/**
- Store the parameters passed to Set to be compared by the test execute thread
- */
-void CPdpFsmInterfaceTest::Set(const RPacketService::TStatus aServiceStatus)
-	{
-	iListener.iPacketServiceStatus = aServiceStatus;
-	}
-
-/**
- Store the parameters passed to Set to be compared by the test execute thread
- */
-TInt CPdpFsmInterfaceTest::Set(TContextId aPdpId, const RPacketContext::TDataChannelV2& aDataChannelV2)
-	{
-	iListener.iNotifyContextDataChannelData.iPdpId = aPdpId;
-	iListener.iNotifyContextDataChannelData.iDataChannelV2 = aDataChannelV2;
-	return KErrNone;
-	}
-
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-/**
- Store the parameters passed to Set to be compared by the test execute thread
- */
-TInt CPdpFsmInterfaceTest::Set(TContextId /*aPdpId*/, const RPacketQoS::TQoSR5Requested& /*aParam*/)
-	{
-	ASSERT(EFalse);
-	return KErrNone;
-	}
-
-/**
- Store the parameters passed to Set to be compared by the test execute thread
- */
-TInt CPdpFsmInterfaceTest::Set(const TContextId aPdpId, const RPacketQoS::TQoSR5Negotiated& aQoSR5Negotiated)
-	{
-	iListener.iNotifyQosNegotiatedData.iPdpId = aPdpId;
-	iListener.iNotifyQosNegotiatedData.iNegotiated = aQoSR5Negotiated;
-	return KErrNone;
-	}
-
-#else
-// !SYMBIAN_NETWORKING_UMTSR5 
-
-/**
- Store the parameters passed to Set to be compared by the test execute thread
- */
-TInt CPdpFsmInterfaceTest::Set(TContextId /*aPdpId*/, const RPacketQoS::TQoSR99_R4Requested& /*aParam*/)
-	{
-	ASSERT(EFalse);
-	return KErrNone;
-	}
-
-/**
- Store the parameters passed to Set to be compared by the test execute thread
- */
-TInt CPdpFsmInterfaceTest::Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Negotiated& aQoSR99_R4Negotiated)
-	{
-	iListener.iNotifyQosNegotiatedData.iPdpId = aPdpId;
-	iListener.iNotifyQosNegotiatedData.iNegotiated = aQoSR99_R4Negotiated;
-	return KErrNone;
-	}
-
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 
-
-
-
-
-/**
- Store the parameters passed to Set to be compared by the test execute thread
- */
-TInt CPdpFsmInterfaceTest::Set(TContextId /*aPdpId*/, const TTFTOperationCode& aParam)
-	{
-	iTftOperationCode = aParam;
-	return KErrNone;
-	}
-
-/**
- Store the parameters passed to Set to be compared by the test execute thread
- */
-TInt CPdpFsmInterfaceTest::Set(TContextId /*aPdpId*/, const TTFTInfo& aParam)
-	{
-	iTftInfo = aParam;
-	return KErrNone;
-	}
-	
-void CPdpFsmInterfaceTest::SetContextTerminationErrorAndStop(TContextId /*aPdpId*/, TInt /*aErrorCode*/)
-	{/*Placeholder for unused function*/}
-
-
--- a/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/SpudFsmUnitTestStep.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,818 +0,0 @@
-// Copyright (c) 2004-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:
-// Unit tests for SPUD FSM
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#include <e32def.h>
-#include <testexecutelog.h>
-
-#include "SpudUnitTestStep.h"
-#include "meteldriverstrategy.h"
-#include "ceteldrivercontext.h"
-#include "CompareContextParameters.h"
-#include "DefaultContextParameters.h"
-
-using namespace EtelDriver;
-
-CSpudFsmUnitNormalOperation::~CSpudFsmUnitNormalOperation()
-	{
-	}
-
-// configure to use test step 1 from simtsy config file
-CSpudFsmUnitNormalOperation::CSpudFsmUnitNormalOperation() : CSpudFsmUnitTestStepBase(1)
-	{
-	// Call base class method to set up the human readable name for logging
-	SetTestStepName(KSpudFsmUnitNormalOperation);
-	}
-	
-TVerdict CSpudFsmUnitNormalOperation::doTestStepL()
-/**
- Test normal operation
- This test step goes through all of the states in the SPUD FSM
- */
-	{
-	INFO_PRINTF1(_L("Starting Spud Driver Test normal operation"));
-	
-	TRequestStatus status;
-	RPacketService::TContextInfo contextInfo;
-
-	RPacketQoS::TQoSR99_R4Negotiated qos;
-	TQoSR99_R4NegotiatedPckg qosPckg(qos);
-	RPacketQoS::TQoSR99_R4Negotiated expectedTestQoSR99_R4Negotiated;
-
-	InitPhoneAndPacketServiceL();
-	
-	// Start by creating all the Spud FSM objects.
-	// They have to be created in the test's Active Scheduler Thread
-	// (terminology from the test's design document).
-	//
-	FsmObjectCreate(KContextId0);
-	WaitForFsmObjectCreateResponse(KContextId0);
-	FsmObjectCreate(KContextId1);
-	WaitForFsmObjectCreateResponse(KContextId1);
-	FsmObjectCreate(KContextId2);
-	WaitForFsmObjectCreateResponse(KContextId2);
-
-	
-	// Set up context config and QoS parameters
-
-	RPacketContext::TContextConfigGPRS contextConfigGPRS;
-	DefaultContextConfigGPRS(contextConfigGPRS);
-	iListener->iPdpFsmInterface->Set(KContextId0, contextConfigGPRS);
-	iListener->iPdpFsmInterface->Set(KContextId1, contextConfigGPRS);
-	iListener->iPdpFsmInterface->Set(KContextId2, contextConfigGPRS);
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-	RPacketQoS::TQoSR5Requested qosRequested;
-	DefaultQoSR5Requested(qosRequested);
-#else
-	RPacketQoS::TQoSR99_R4Requested qosRequested;
-	DefaultQoSR99_R4Requested(qosRequested);
-#endif
-
-	iListener->iPdpFsmInterface->Set(KContextId0, qosRequested);
-	iListener->iPdpFsmInterface->Set(KContextId1, qosRequested);
-	iListener->iPdpFsmInterface->Set(KContextId2, qosRequested);
-
-	
-	//
-	// Test creating first primary context
-	// This tests state transitions:
-	// Initialised -> OpeningPhone -> CreatingPrimary -> SettingQoSPrimary -> ActivatingPrimary -> Open
-	//
-	INFO_PRINTF1(_L("Test creating first primary context"));
-	FsmInputRequest(KContextId0, SpudMan::ECreatePrimaryPDPContext, 0);
-	WaitForFsmInputResponse(KContextId0, KPrimaryContextCreated, 0);
-	// Check that the context was created
-	TEST(iPrimaryPacketContext.OpenExistingContext(iPacketService, KFirstPrimaryContextName) == KErrNone);
-	// Check that the QoS was created for the primary context
-	RPacketQoS primaryPacketQos;
-	TEST(primaryPacketQos.OpenExistingQoS(iPrimaryPacketContext, KFirstQosName) == KErrNone);
-
-	// Check that the QoS parameters were set
-	primaryPacketQos.GetProfileParameters(status, qosPckg);
-	User::WaitForRequest(status);
-	SecondQoSR99_R4Negotiated(expectedTestQoSR99_R4Negotiated);
-	TEST(CompareUMTSQoSNeg(expectedTestQoSR99_R4Negotiated, qos));
-
-	//
-	// Test creating second primary context - since the phone is already open, there is no transition to OpeningPhone state
-	// This tests state transitions:
-	// Initialised -> CreatingPrimary -> SettingQoSPrimary -> ActivatingPrimary -> Open
-	//
-	INFO_PRINTF1(_L("Test creating second primary context"));	
-	FsmInputRequest(KContextId1, SpudMan::ECreatePrimaryPDPContext, 0);
-	WaitForFsmInputResponse(KContextId1, KPrimaryContextCreated, 0);
-	RPacketContext secondPrimaryContext;
-	// Test that the context was created
-	TEST(secondPrimaryContext.OpenExistingContext(iPacketService, KSecondPrimaryContextName) == KErrNone);
-
-	
-	//
-	// Test creating secondary context
-	// This tests state transitions:
-	// Initialised -> CreatingSecondary -> CreatedSecondary
-	//
-	INFO_PRINTF1(_L("Test creating secondary contexts"));
-	FsmInputRequest(KContextId2, SpudMan::ECreateSecondaryPDPContext, 0);
-	WaitForFsmInputResponse(KContextId2, KSecondaryContextCreated, 0);
-	// Test that the context was created
-	TEST(iSecondaryPacketContext.OpenExistingContext(iPacketService, KFirstSecondaryContextName) == KErrNone);
-
-	
-	//
-	// Test setting QOS on secondary
-	// This tests state transitions:
-	// CreatedSecondary -> SettingQoS -> CreatedSecondary
-	// 
-	INFO_PRINTF1(_L("Test setting QoS on secondary context"));
-	FsmInputRequest(KContextId2, SpudMan::EContextQoSSet, 0);
-	WaitForFsmInputResponse(KContextId2, KContextQoSSetEvent, 0);
-	// Check that the QoS was created for the secondary
-	RPacketQoS secondaryPacketQos;
-	TEST(secondaryPacketQos.OpenExistingQoS(iSecondaryPacketContext, KFirstQosName) == KErrNone);
-
-	// Check that the QoS parameters were set
-	secondaryPacketQos.GetProfileParameters(status, qosPckg);
-	User::WaitForRequest(status);
-	SecondQoSR99_R4Negotiated(expectedTestQoSR99_R4Negotiated);
-	TEST(CompareUMTSQoSNeg(expectedTestQoSR99_R4Negotiated, qos));
-
-	// 
-	// Test setting TFT on secondary
-	// This tests state transitions:
-	// CreatedSecondary -> SettingTFT -> CreatedSecondary
-	// 
-	INFO_PRINTF1(_L("Test setting TFT on secondary context"));
-	TTFTOperationCode tftOperationCode = KAddFilters;
-	iListener->iPdpFsmInterface->Set(KContextId2, tftOperationCode);
-	TTFTInfo tftInfo;
-	DefaultTftInfo(tftInfo);
-	iListener->iPdpFsmInterface->Set(KContextId2, tftInfo);
-	FsmInputRequest(KContextId2, SpudMan::EContextTFTModify, 0);
-	WaitForFsmInputResponse(KContextId2, KContextTFTModifiedEvent, 0);
-	// check that TFT was set correctly
-	TEST(CompareTFTInfo(tftInfo, iSecondaryPacketContext));
-	
-	
-	// 
-	// Test activating secondary
-	// This tests state transitions:
-	// CreatedSecondary -> ActivatingSecondary -> Open
-	// 
-	INFO_PRINTF1(_L("Test activating secondary context"));
-	FsmInputRequest(KContextId2, SpudMan::EContextActivate, 0);
-	WaitForFsmInputResponse(KContextId2, KContextActivateEvent, 0);
-	// Check that the context is active
-	iPacketService.GetContextInfo(status, KContextId2, contextInfo);
-	User::WaitForRequest(status);
-	TEST(status == KErrNone && contextInfo.iStatus == RPacketContext::EStatusActive);
-	
-	
-	INFO_PRINTF1(_L("Test Retrieving Negotiated QoSt"));
-	FsmInputRequest(KContextId2, SpudMan::EGetNegQoS, 0);
-	WaitForFsmInputResponse(KContextId2, KGetNegQoSEvent, 0);
-	
-	
-	// 
-	// Test network suspending/resuming context
-	// This tests state transitions:
-	// Open -> Suspend -> Open
-	// 
-	INFO_PRINTF1(_L("Test network suspend/resume context"));
-	EtelRequest(EContextStatusChange, 0);
-	WaitForFsmSuspendedNotification(KContextId0);
-
-	EtelRequest(EContextStatusChange, 1);
-	WaitForFsmResumedNotification(KContextId0);
-
-	
-	// 
-	// Test SpudMan suspending/resuming context
-	// This tests state transitions:
-	// Open -> Suspend -> Open
-	// 
-	INFO_PRINTF1(_L("Test SpudMan suspend/resume context"));
-	FsmInputRequest(KContextId0, SpudMan::ESuspend, 0);
-	WaitForFsmSuspendedNotification(KContextId0);
-
-	FsmInputRequest(KContextId0, SpudMan::EResume, 0);
-	WaitForFsmResumedNotification(KContextId0);
-
-	
-	// 
-	// Test changing TFT
-	// This tests state transitions:
-	// Open -> ChangingTFT -> Open
-	// 
-	INFO_PRINTF1(_L("Test changing TFT"));
-	TTFTInfo secondTftInfo;
-	SecondDefaultTftInfo(secondTftInfo);
-	iListener->iPdpFsmInterface->Set(KContextId2, KAddFilters);
-	iListener->iPdpFsmInterface->Set(KContextId2, secondTftInfo);
-	// The second TFT should be added to the existing TFT
-	FsmInputRequest(KContextId2, SpudMan::EContextTFTModify, 0);
-	WaitForFsmInputResponse(KContextId2, KContextTFTModifiedEvent, 0);
-	// check that TFT was changed
-	TTFTInfo combinedTftInfo;
-	CombinedDefaultTftInfo(combinedTftInfo);
-	TEST(CompareTFTInfo(combinedTftInfo, iSecondaryPacketContext));
-
-	
-	// 
-	// Test changing QOS
-	// This tests state transitions:
-	// Open -> ChangingQoS -> Open
-	// 
-	INFO_PRINTF1(_L("Test changing QoS"));
-
-	SecondQoSR99_R4Requested(qosRequested);
-
-	iListener->iPdpFsmInterface->Set(KContextId0, qosRequested);
-	FsmInputRequest(KContextId0, SpudMan::EContextQoSSet, 0);
-	WaitForFsmInputResponse(KContextId0, KContextQoSSetEvent, 0);
-
-	// check that QOS was changed
-	DefaultQoSR99_R4Negotiated(expectedTestQoSR99_R4Negotiated);
-	primaryPacketQos.GetProfileParameters(status, qosPckg);
-	User::WaitForRequest(status);
-	TEST(CompareUMTSQoSNeg(expectedTestQoSR99_R4Negotiated, qos));
-
-	// 
-	// Test modifying active
-	// This tests state transitions:
-	// Open -> ModifyingActive -> Open
-	// 
-	INFO_PRINTF1(_L("Test modifying active context"));
-	FsmInputRequest(KContextId0, SpudMan::EContextModifyActive, 0);
-	WaitForFsmInputResponse(KContextId0, KContextModifyActiveEvent, 0);
-
-	
-	secondaryPacketQos.Close();
-	primaryPacketQos.Close();
-	iSecondaryPacketContext.Close();
-	secondPrimaryContext.Close();
-	iPrimaryPacketContext.Close();
-	
-	
-	// 
-	// Test deleting contexts
-	// This tests state transitions:
-	// Open -> Closing -> Initialised
-	// 
-	INFO_PRINTF1(_L("Test deleting contexts"));
-	for (TContextId deleteIndex = 0; deleteIndex < 3; deleteIndex++)
-		{
-		FsmInputRequest(deleteIndex, SpudMan::EContextDelete, 0);
-		WaitForFsmInputResponse(deleteIndex, KContextDeleteEvent, 0);
-		}
-	// Check that the contexts were deleted
-	for (TInt contextInfoIndex = 0; contextInfoIndex < 3; contextInfoIndex++)
-		{
-		iPacketService.GetContextInfo(status, contextInfoIndex, contextInfo);
-		User::WaitForRequest(status);
-		TEST(status == KErrNone && contextInfo.iStatus == RPacketContext::EStatusDeleted);
-		}
-	
-	
-	// 
-	// Test that we can still use a context that has been deleted
-	// 
-	INFO_PRINTF1(_L("Test re-using deleted contexts"));
-	FsmInputRequest(KContextId0, SpudMan::ECreatePrimaryPDPContext, 0);
-	WaitForFsmInputResponse(KContextId0, KPrimaryContextCreated, 0);
-	// Test that the context was created
-	TEST(iPrimaryPacketContext.OpenExistingContext(iPacketService, KThirdPrimaryContextName) == KErrNone);
-
-	// Clean-up
-	iPrimaryPacketContext.Close();
-	FsmInputRequest(KContextId0, SpudMan::EContextDelete, 0);
-	WaitForFsmInputResponse(KContextId0, KContextDeleteEvent, 0);
-	
-	DestroyPhoneAndPacketService();
-
-	return TestStepResult();
-	}
-
-CSpudFsmUnitCreatePrimaryError1::~CSpudFsmUnitCreatePrimaryError1()
-	{}
-
-// configure to use test step 102 from simtsy config file
-CSpudFsmUnitCreatePrimaryError1::CSpudFsmUnitCreatePrimaryError1() : CSpudFsmUnitTestStepBase(102)
-	{
-	// Call base class method to set up the human readable name for logging
-	SetTestStepName(KSpudFsmCreatePrimaryError1);
-	}
-	
-TVerdict CSpudFsmUnitCreatePrimaryError1::doTestStepL()
-/**
- Test errors creating primary context
- */
-	{
-	INFO_PRINTF1(_L("Starting Spud Driver Unit test error creating primary context 1"));
-	
-	// Start by creating all the Spud FSM objects.
-	// They have to be created in the test's Active Scheduler Thread
-	// (terminology from the test's design document).
-	//
-	FsmObjectCreate(KContextId0);
-	WaitForFsmObjectCreateResponse(KContextId0);
-
-	// Set up context config and QoS parameters
-	RPacketContext::TContextConfigGPRS contextConfigGPRS;
-	DefaultContextConfigGPRS(contextConfigGPRS);
-	iListener->iPdpFsmInterface->Set(KContextId0, contextConfigGPRS);
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-	RPacketQoS::TQoSR5Requested qosRequested;
-	DefaultQoSR5Requested(qosRequested);
-#else
-	RPacketQoS::TQoSR99_R4Requested qosRequested;
-	DefaultQoSR99_R4Requested(qosRequested);
-#endif
-
-	iListener->iPdpFsmInterface->Set(KContextId0, qosRequested);
-
-	// RPacketContext::SetConfig is configured to fail with error KErrGeneral
-	FsmInputRequest(KContextId0, SpudMan::ECreatePrimaryPDPContext, 0);
-	WaitForFsmInputResponse(KContextId0, KPrimaryContextCreated, KErrGeneral);
-	
-	InitPhoneAndPacketServiceL();
-
-	// The primary context should have been cleaned up after the failure
-	TEST(iPrimaryPacketContext.OpenExistingContext(iPacketService, KFirstPrimaryContextName) == KErrNone);
-	WaitForGivenContextStatus(iPrimaryPacketContext, RPacketContext::EStatusDeleted);
-	iPrimaryPacketContext.Close();
-	
-	DestroyPhoneAndPacketService();
-	
-	return TestStepResult();
-	}
-
-CSpudFsmUnitCreatePrimaryError2::~CSpudFsmUnitCreatePrimaryError2()
-	{}
-
-// configure to use test step 103 from simtsy config file
-CSpudFsmUnitCreatePrimaryError2::CSpudFsmUnitCreatePrimaryError2() : CSpudFsmUnitTestStepBase(103)
-	{
-	// Call base class method to set up the human readable name for logging
-	SetTestStepName(KSpudFsmCreatePrimaryError2);
-	}
-	
-TVerdict CSpudFsmUnitCreatePrimaryError2::doTestStepL()
-/**
- Test errors setting QOS on primary context
- */
-	{
-	INFO_PRINTF1(_L("Starting Spud Driver Unit test error creating primary context 2"));
-	
-	// Start by creating all the Spud FSM objects.
-	// They have to be created in the test's Active Scheduler Thread
-	// (terminology from the test's design document).
-	//
-	FsmObjectCreate(KContextId0);
-	WaitForFsmObjectCreateResponse(KContextId0);
-
-	// Set up context config and QoS parameters
-	RPacketContext::TContextConfigGPRS contextConfigGPRS;
-	DefaultContextConfigGPRS(contextConfigGPRS);
-	iListener->iPdpFsmInterface->Set(KContextId0, contextConfigGPRS);
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-	RPacketQoS::TQoSR5Requested qosRequested;
-	DefaultQoSR5Requested(qosRequested);
-#else
-	RPacketQoS::TQoSR99_R4Requested qosRequested;
-	DefaultQoSR99_R4Requested(qosRequested);
-#endif
-
-	iListener->iPdpFsmInterface->Set(KContextId0, qosRequested);
-
-	// RPacketQoS::SetProfileParameters is configured to fail
-	FsmInputRequest(KContextId0, SpudMan::ECreatePrimaryPDPContext, 0);
-	WaitForFsmInputResponse(KContextId0, KPrimaryContextCreated, KErrGeneral);
-	
-	InitPhoneAndPacketServiceL();
-
-	// The primary context should be cleaned up after the failure
-	TEST(iPrimaryPacketContext.OpenExistingContext(iPacketService, KFirstPrimaryContextName) == KErrNone);
-	WaitForGivenContextStatus(iPrimaryPacketContext, RPacketContext::EStatusDeleted);
-	iPrimaryPacketContext.Close();
-
-	DestroyPhoneAndPacketService();
-
-	return TestStepResult();
-	}
-
-CSpudFsmUnitCreatePrimaryError3::~CSpudFsmUnitCreatePrimaryError3()
-	{}
-
-// configure to use test step 104 from simtsy config file
-CSpudFsmUnitCreatePrimaryError3::CSpudFsmUnitCreatePrimaryError3() : CSpudFsmUnitTestStepBase(104)
-	{
-	// Call base class method to set up the human readable name for logging
-	SetTestStepName(KSpudFsmCreatePrimaryError3);
-	}
-	
-TVerdict CSpudFsmUnitCreatePrimaryError3::doTestStepL()
-/**
- Test errors activating primary context
- */
-	{
-	INFO_PRINTF1(_L("Starting Spud Driver Unit test error creating primary context 3"));
-	
-	// Start by creating all the Spud FSM objects.
-	// They have to be created in the test's Active Scheduler Thread
-	// (terminology from the test's design document).
-	//
-	FsmObjectCreate(KContextId0);
-	WaitForFsmObjectCreateResponse(KContextId0);
-
-	// Set up context config and QoS parameters
-	RPacketContext::TContextConfigGPRS contextConfigGPRS;
-	DefaultContextConfigGPRS(contextConfigGPRS);
-	iListener->iPdpFsmInterface->Set(KContextId0, contextConfigGPRS);
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-	RPacketQoS::TQoSR5Requested qosRequested;
-	DefaultQoSR5Requested(qosRequested);
-#else
-	RPacketQoS::TQoSR99_R4Requested qosRequested;
-	DefaultQoSR99_R4Requested(qosRequested);
-#endif
-
-	iListener->iPdpFsmInterface->Set(KContextId0, qosRequested);
-
-	// Activiating the context is configured to fail with KErrGeneral
-	FsmInputRequest(KContextId0, SpudMan::ECreatePrimaryPDPContext, 0);
-	WaitForFsmInputResponse(KContextId0, KPrimaryContextCreated, KErrGeneral);
-	
-	InitPhoneAndPacketServiceL();
-
-	// The primary context should have been cleaned up after the failure
-	TEST(iPrimaryPacketContext.OpenExistingContext(iPacketService, KFirstPrimaryContextName) == KErrNone);
-	WaitForGivenContextStatus(iPrimaryPacketContext, RPacketContext::EStatusDeleted);
-	iPrimaryPacketContext.Close();
-
-	DestroyPhoneAndPacketService();
-
-	return TestStepResult();
-	}
-
-CSpudFsmUnitSetQosAndTftError::~CSpudFsmUnitSetQosAndTftError()
-	{}
-
-// configure to use test step 106 from simtsy config file
-CSpudFsmUnitSetQosAndTftError::CSpudFsmUnitSetQosAndTftError() : CSpudFsmUnitTestStepBase(106)
-	{
-	// Call base class method to set up the human readable name for logging
-	SetTestStepName(KSpudFsmSetQosAndTftError);
-	}
-	
-TVerdict CSpudFsmUnitSetQosAndTftError::doTestStepL()
-/**
- Test errors setting QoS and setting TFT and activating secondary
- */
- 	{
-	INFO_PRINTF1(_L("Starting Spud Driver Unit test error creating QOS, setting TFT and activating"));
-	
-	// Start by creating all the Spud FSM objects.
-	// They have to be created in the test's Active Scheduler Thread
-	// (terminology from the test's design document).
-	//
-	FsmObjectCreate(KContextId0);
-	WaitForFsmObjectCreateResponse(KContextId0);
-	FsmObjectCreate(KContextId1);
-	WaitForFsmObjectCreateResponse(KContextId1);
-
-	// Set up context config and QoS parameters
-	RPacketContext::TContextConfigGPRS contextConfigGPRS;
-	DefaultContextConfigGPRS(contextConfigGPRS);
-	iListener->iPdpFsmInterface->Set(KContextId0, contextConfigGPRS);
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-	RPacketQoS::TQoSR5Requested qosRequested;
-	DefaultQoSR5Requested(qosRequested);
-#else
-	RPacketQoS::TQoSR99_R4Requested qosRequested;
-	DefaultQoSR99_R4Requested(qosRequested);
-#endif
-
-	iListener->iPdpFsmInterface->Set(KContextId0, qosRequested);
-
-	// Test creating primary
-	FsmInputRequest(KContextId0, SpudMan::ECreatePrimaryPDPContext, 0);
-	WaitForFsmInputResponse(KContextId0, KPrimaryContextCreated, KErrNone);
-
-	// Test creating secondary
-	FsmInputRequest(KContextId1, SpudMan::ECreateSecondaryPDPContext, 0);
-	WaitForFsmInputResponse(KContextId1, KSecondaryContextCreated, KErrNone);
-
-	// RPacketQoS::SetProfileParameters is configured to fail for the secondary context
-	iListener->iPdpFsmInterface->Set(KContextId1, qosRequested);
-	FsmInputRequest(KContextId1, SpudMan::EContextQoSSet, 0);
-	WaitForFsmInputResponse(KContextId1, KContextQoSSetEvent, KErrGeneral);
-	
-	// RPacketQoS::CreateNewTFT is configured to fail with KErrGeneral for the secondary context
-	TTFTOperationCode tftOperationCode = KAddFilters;
-	iListener->iPdpFsmInterface->Set(KContextId1, tftOperationCode);
-	TTFTInfo tftInfo;
-	DefaultTftInfo(tftInfo);
-	iListener->iPdpFsmInterface->Set(KContextId1, tftInfo);
-	FsmInputRequest(KContextId1, SpudMan::EContextTFTModify, 0);
-	WaitForFsmInputResponse(KContextId1, KContextTFTModifiedEvent, KErrGeneral);
-	
-	// Activating the secondary context is configured to fail with KErrGeneral
-	FsmInputRequest(KContextId1, SpudMan::EContextActivate, 0);
-	WaitForFsmInputResponse(KContextId1, KContextActivateEvent, KErrGeneral);
-	
-	// Clean-up
-	FsmInputRequest(KContextId0, SpudMan::EContextDelete, 0);
-	WaitForFsmInputResponse(0, KContextDeleteEvent, 0);
-
-	FsmInputRequest(KContextId1, SpudMan::EContextDelete, 0);
-	WaitForFsmInputResponse(KContextId1, KContextDeleteEvent, 0);
-
-	return TestStepResult();
-	}
-
-CSpudFsmUnitChangeQosAndTftError::~CSpudFsmUnitChangeQosAndTftError()
-	{}
-
-// configure to use test step 107 from simtsy config file
-CSpudFsmUnitChangeQosAndTftError::CSpudFsmUnitChangeQosAndTftError() : CSpudFsmUnitTestStepBase(107)
-	{
-	// Call base class method to set up the human readable name for logging
-	SetTestStepName(KSpudFsmChangeQosAndTftError);
-	}
-	
-TVerdict CSpudFsmUnitChangeQosAndTftError::doTestStepL()
-/**
- Test errors changing QoS and changing TFT for secondary
- */
- 	{
-	INFO_PRINTF1(_L("Starting Spud Driver Unit test error changing QOS and TFT"));
-	
-	// Start by creating all the Spud FSM objects.
-	// They have to be created in the test's Active Scheduler Thread
-	// (terminology from the test's design document).
-	//
-	FsmObjectCreate(KContextId0);
-	WaitForFsmObjectCreateResponse(KContextId0);
-	FsmObjectCreate(KContextId1);
-	WaitForFsmObjectCreateResponse(KContextId1);
-
-	// Set up context config and QoS parameters
-	RPacketContext::TContextConfigGPRS contextConfigGPRS;
-	DefaultContextConfigGPRS(contextConfigGPRS);
-	iListener->iPdpFsmInterface->Set(KContextId0, contextConfigGPRS);
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-	RPacketQoS::TQoSR5Requested qosRequested;
-	DefaultQoSR5Requested(qosRequested);
-#else
-	RPacketQoS::TQoSR99_R4Requested qosRequested;
-	DefaultQoSR99_R4Requested(qosRequested);
-#endif
-
-	iListener->iPdpFsmInterface->Set(KContextId0, qosRequested);
-
-	// Test creating primary
-	FsmInputRequest(KContextId0, SpudMan::ECreatePrimaryPDPContext, 0);
-	WaitForFsmInputResponse(KContextId0, KPrimaryContextCreated, KErrNone);
-	
-	// Test creating and activating secondary
-	FsmInputRequest(KContextId1, SpudMan::ECreateSecondaryPDPContext, 0);
-	WaitForFsmInputResponse(KContextId1, KSecondaryContextCreated, KErrNone);
-	FsmInputRequest(KContextId1, SpudMan::EContextActivate, 0);
-	WaitForFsmInputResponse(KContextId1, KContextActivateEvent, KErrNone);
-	
-	FsmInputRequest(KContextId1, SpudMan::EGetNegQoS, 0);
-	WaitForFsmInputResponse(KContextId1, KGetNegQoSEvent, KErrNone);
-	
-	
-	
-	// RPacketQoS::SetProfileParameters is configured to fail for the secondary context
-	FsmInputRequest(KContextId1, SpudMan::EContextQoSSet, 0);
-	WaitForFsmInputResponse(KContextId1, KContextQoSSetEvent, KErrGeneral);
-	
-	// RPacketQoS::CreateNewTFT is configured to fail with KErrGeneral for the secondary context
-	TTFTOperationCode tftOperationCode = KAddFilters;
-	iListener->iPdpFsmInterface->Set(KContextId1, tftOperationCode);
-	TTFTInfo tftInfo;
-	DefaultTftInfo(tftInfo);
-	iListener->iPdpFsmInterface->Set(KContextId1, tftInfo);
-	FsmInputRequest(KContextId1, SpudMan::EContextTFTModify, 0);
-	WaitForFsmInputResponse(KContextId1, KContextTFTModifiedEvent, KErrGeneral);
-	
-	// Because the TFT and QoS have not changed, RPacketContext::ModifyActiveContext will fail
-	FsmInputRequest(KContextId1, SpudMan::EContextModifyActive, 0);
-	WaitForFsmInputResponse(KContextId1, KContextModifyActiveEvent, KErrNotReady);
-
-	// Clean-up
-	FsmInputRequest(KContextId0, SpudMan::EContextDelete, 0);
-	WaitForFsmInputResponse(KContextId0, KContextDeleteEvent, 0);
-
-	FsmInputRequest(KContextId1, SpudMan::EContextDelete, 0);
-	WaitForFsmInputResponse(KContextId1, KContextDeleteEvent, 0);
-
-	return TestStepResult();
-	}
-
-CSpudFsmUnitNotifications::~CSpudFsmUnitNotifications()
-	{}
-
-// configure to use test step 1 from simtsy config file
-CSpudFsmUnitNotifications::CSpudFsmUnitNotifications() : CSpudFsmUnitTestStepBase(1)
-	{
-	// Call base class method to set up the human readable name for logging
-	SetTestStepName(KSpudFsmTestNotifications);
-	}
-	
-TVerdict CSpudFsmUnitNotifications::doTestStepL()
-/**
- Test that notifications are passed from etel driver
- */
- 	{
-	INFO_PRINTF1(_L("Starting Spud Driver Unit test notifications"));
-	
-	// Start by creating all the Spud FSM objects.
-	// They have to be created in the test's Active Scheduler Thread
-	// (terminology from the test's design document).
-	//
-	FsmObjectCreate(KContextId0);
-	WaitForFsmObjectCreateResponse(KContextId0);
-
-	TRequestStatus status;
-	
-	// Set up context config and QoS parameters
-	RPacketContext::TContextConfigGPRS contextConfigGPRS;
-	DefaultContextConfigGPRS(contextConfigGPRS);
-	iListener->iPdpFsmInterface->Set(KContextId0, contextConfigGPRS);
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-	RPacketQoS::TQoSR5Requested qosRequested;
-	DefaultQoSR5Requested(qosRequested);
-#else
-	RPacketQoS::TQoSR99_R4Requested qosRequested;
-	DefaultQoSR99_R4Requested(qosRequested);
-#endif
-
-	iListener->iPdpFsmInterface->Set(KContextId0, qosRequested);
-
-	// Test creating primary
-	INFO_PRINTF1(_L("Create primary context"));
-	FsmInputRequest(KContextId0, SpudMan::ECreatePrimaryPDPContext, 0);
-	WaitForFsmInputResponse(KContextId0, KPrimaryContextCreated, KErrNone);
-
-	RPacketQoS::TQoSR99_R4Negotiated qosNegotiated;
-
-	//
-	// Test service status notification
-	//
-	// Creating/activating a primary context should change the network status
-	INFO_PRINTF1(_L("Wait for service status change notification"));
-	WaitForFsmServiceNotificationStatus();
-
-
-	InitPhoneAndPacketServiceL();
-	TEST(iPrimaryPacketContext.OpenExistingContext(iPacketService, KFirstPrimaryContextName) == KErrNone);
-
-
-	//
-	// Test context config notifications
-	//
-	// Calling SetConfig to change the context config and trigger a context config notification
-	INFO_PRINTF1(_L("Trigger context config change notification"));
-	RPacketContext::TContextConfigGPRS contextConfig;
-	DefaultContextConfigGPRS(contextConfig);
-	TContextConfigGPRSPckg contextConfigPckg(contextConfig);
-	iPrimaryPacketContext.SetConfig(status, contextConfigPckg);
-	User::WaitForRequest(status);
-	// Wait for the notification
-	INFO_PRINTF1(_L("Wait for context config change notification"));
-	WaitForFsmContextConfigNotification(KContextId0, contextConfig);
-
-
-	//
-	// Test QoS notifications
-	//
-	// Calling SetProfileParameters to change the QoS and trigger a QoS change notification
-	INFO_PRINTF1(_L("Trigger QoS change notification"));
-	RPacketQoS primaryPacketQos;
-	TEST(primaryPacketQos.OpenExistingQoS(iPrimaryPacketContext, KFirstQosName) == KErrNone);
-
-	RPacketQoS::TQoSR99_R4Requested qosChangeRequested;
-	SecondQoSR99_R4Requested(qosChangeRequested);
-	TQoSR99_R4RequestedPckg qosChangeRequestedPckg(qosChangeRequested);
-	primaryPacketQos.SetProfileParameters(status, qosChangeRequestedPckg);
-	User::WaitForRequest(status);
-	// Wait for the notification
-	INFO_PRINTF1(_L("Wait for QoS change notification"));
-	DefaultQoSR99_R4Negotiated(qosNegotiated);
-	WaitForFsmQosChangeNotification(KContextId0, qosNegotiated);
-
-	//
-	// Clean-up
-	//
-	primaryPacketQos.Close();
-	iPrimaryPacketContext.Close();
-
-	FsmInputRequest(KContextId0, SpudMan::EContextDelete, 0);
-	WaitForFsmInputResponse(KContextId0, KContextDeleteEvent, 0);
-
-	DestroyPhoneAndPacketService();
-
-	return TestStepResult();
-	}
-
-CSpudFsmUnitNetworkDelete::~CSpudFsmUnitNetworkDelete()
-	{}
-
-// configure to use test step 108 from simtsy config file
-CSpudFsmUnitNetworkDelete::CSpudFsmUnitNetworkDelete() : CSpudFsmUnitTestStepBase(108)
-	{
-	// Call base class method to set up the human readable name for logging
-	SetTestStepName(KSpudFsmNetworkDelete);
-	}
-	
-TVerdict CSpudFsmUnitNetworkDelete::doTestStepL()
-/**
- Test context delete from network
- */
- 	{
-	INFO_PRINTF1(_L("Starting Spud Driver Unit test delete context from network"));
-	
-	// Start by creating all the Spud FSM objects.
-	// They have to be created in the test's Active Scheduler Thread
-	// (terminology from the test's design document).
-	//
-	FsmObjectCreate(KContextId0);
-	WaitForFsmObjectCreateResponse(KContextId0);
-	FsmObjectCreate(KContextId1);
-	WaitForFsmObjectCreateResponse(KContextId1);
-
-	// Set up context config and QoS parameters
-	RPacketContext::TContextConfigGPRS contextConfigGPRS;
-	DefaultContextConfigGPRS(contextConfigGPRS);
-	iListener->iPdpFsmInterface->Set(KContextId0, contextConfigGPRS);
-	iListener->iPdpFsmInterface->Set(KContextId1, contextConfigGPRS);
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-	RPacketQoS::TQoSR5Requested qosRequested;
-	DefaultQoSR5Requested(qosRequested);
-#else
-	RPacketQoS::TQoSR99_R4Requested qosRequested;
-	DefaultQoSR99_R4Requested(qosRequested);
-#endif
-
-	iListener->iPdpFsmInterface->Set(KContextId0, qosRequested);
-	iListener->iPdpFsmInterface->Set(KContextId1, qosRequested);
-
-	// 
-	// Test context delete while an operation is pending
-	// 
-	INFO_PRINTF1(_L("Test network delete context with pending operation"));
-	// Activating the primary context is configured to take a very long time
-	FsmInputRequest(KContextId0, SpudMan::ECreatePrimaryPDPContext, 0);
-	// The packet service status will become attached almost immediately, but the create
-	// primary context won't finish until it is active (which will take a long time)
-	WaitForFsmServiceNotificationStatus();
-	
-	// This delete from the network will occur while the create primary is activating
-	EtelRequest(EContextStatusChange, 0);
-	WaitForFsmInputResponse(KContextId0, KContextDeleteEvent, KErrNotReady);	
-
-
-	// 
-	// Test context delete while an operation is not pending
-	// 
-	INFO_PRINTF1(_L("Test network delete context from open state"));
-	// Activating this context is configured to take a short period of time
-	FsmInputRequest(KContextId1, SpudMan::ECreatePrimaryPDPContext, 0);
-	WaitForFsmInputResponse(KContextId1, KPrimaryContextCreated, KErrNone);
-	
-	EtelRequest(EContextStatusChange, 1);
-	WaitForFsmInputResponse(KContextId1, KContextDeleteEvent, KErrNotReady);	
-
-	// context should be deleted (and resources freed), so no need to delete here
-
-	return TestStepResult();
-	}
--- a/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/SpudManInterfaceTest.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-// Copyright (c) 2004-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:
-// The implementation of the SpudManInterface for SPUD FSM unit tests
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#include "InputRequestListener.h"
-#include <etelpckt.h>
-
-
-TSpudManInterfaceTest::TSpudManInterfaceTest(CInputRequestListener& aListener) : iListener(aListener)
-	{}
-
-/**
- Signals to the test execute thread that MSpudManInterface::Input has been called
- */
-void TSpudManInterfaceTest::Input(TContextId aPdpId, TInt aEvent, TInt aParam)
-	{
-	if (aEvent == KPdpFsmShuttingDown)
-	   {
-	   // This event requires no notification - In the real SpudMan it would cause SpudMan
-	   // to close down (NULL) the pointer to the PdpFsmInterface provided by the UmtsGprsSCPR.
-	   return;
-	   }
-	
-	// The aOperation parameters are broken up into those that are notifications and those that aren't
-	// Since notifications can happen anytime, separate request status members need to be kept for each one
-	// Other input requests happen serially, so only one request can be pending at any time
-	TRequestStatus *status = NULL;
-	
-    // Here, rather than in the case statement due to rvct compiler warning
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-    RPacketQoS::TQoSR5Negotiated neg;
-#else
-    RPacketQoS::TQoSR99_R4Negotiated neg;
-#endif
-// SYMBIAN_NETWORKING_UMTSR5
-
-	switch (aEvent)
-		{
-	case KContextParametersChangeEvent:
-		iListener.iContextParametersEventData.iPdpId = aPdpId;
-		iListener.iPdpFsmInterface->Get(aPdpId, neg);
-		iListener.iContextParametersEventData.iNegotiated = neg;
-
-		iListener.iPdpFsmInterface->Get(aPdpId, iListener.iContextParametersEventData.iContextConfig);
-		status = &iListener.iFsmContextParameterChangeStatus;
-		break;
-	case KNetworkStatusEvent:
-		status = &iListener.iFsmNetworkStatusStatus;
-		break;
-	case KContextBlockedEvent:
-		iListener.iContextBlockedEventPdpId = aPdpId;
-		status = &iListener.iFsmContextSuspendedStatus;
-		break;
-	case KContextUnblockedEvent:
-		iListener.iContextUnblockedEventPdpId = aPdpId;
-		status = &iListener.iFsmContextResumedStatus;
-		break;
-	default:
-		iListener.iFsmInputResponseData.iPdpId = aPdpId;
-		iListener.iFsmInputResponseData.iEvent = aEvent;
-		iListener.iFsmInputResponseData.iParam = aParam;
-		status = &iListener.iFsmInputResponseStatus;
-		break;
-		}
-	iListener.iParentThread.RequestComplete(status, KErrNone);	
-	}
-
-void TSpudManInterfaceTest::SetContextTerminationErrorAndStop(TContextId /*aContextId*/, TInt /*aErrorCode*/)
-   {/*Placeholder for unused function*/}
--- a/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/SpudTelUnitTestStep.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,881 +0,0 @@
-// Copyright (c) 2004-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:
-// Unit tests for SPUD TEL
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#include <e32def.h>
-#include <testexecutelog.h>
-
-#include "SpudUnitTestStep.h"
-#include "meteldriverstrategy.h"
-#include "ceteldrivercontext.h"
-#include "CompareContextParameters.h"
-#include "DefaultContextParameters.h"
-
-using namespace EtelDriver;
-
-CSpudTelUnitNormalOperation::~CSpudTelUnitNormalOperation()
-	{}
-
-// configure to use test step 1 from simtsy config file
-CSpudTelUnitNormalOperation::CSpudTelUnitNormalOperation() : CSpudTelUnitTestStepBase(1)
-	{
-	// Call base class method to set up the human readable name for logging
-	SetTestStepName(KSpudTelUnitNormalOperation);
-	}
-	
-TVerdict CSpudTelUnitNormalOperation::doTestStepL()
-/**
- Test normal operation - test normal setqos (before and after context created)
- 					   - test normal settft (before and after context created)
- 					   - test normal create primary context
- 					   - test normal create secondary context
- */
-	{
-	INFO_PRINTF1(_L("Starting Spud Tel Test Normal Operation"));
-	
-	TRequestStatus status;
-	RPacketService::TContextInfo contextInfo;
-
-	InitPhoneAndPacketServiceL();
-
-	//
-	// Test creating primary context
-	//
-	INFO_PRINTF1(_L("Test creating primary context"));
-	EtelDriverInputRequest(			KContextId0, 	EOpenPhone);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::EPhoneOpened);
-	
-	EtelDriverInputRequest(			KContextId0, 	ECreate1ryPdpContext);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::E1ryPdpContextCreated);
-	
-	// check that context was created - the simtsy creates the first primary context with name 'PRIMARY1'
-	TEST(iPrimaryPacketContext.OpenExistingContext(iPacketService, KFirstPrimaryContextName) == KErrNone);
-
-	// check that context config for GPRS was set correctly
-	RPacketContext::TContextConfigGPRS *contextConfig = new(ELeave) RPacketContext::TContextConfigGPRS;
-	CleanupStack::PushL(contextConfig);
-	TContextConfigGPRSPckg contextConfigPckg(*contextConfig);
-	iPrimaryPacketContext.GetConfig(status, contextConfigPckg);
-	User::WaitForRequest(status);
-	RPacketContext::TContextConfigGPRS *defaultContextConfigGPRS = new(ELeave) RPacketContext::TContextConfigGPRS;
-	CleanupStack::PushL(defaultContextConfigGPRS);
-	DefaultContextConfigGPRS(*defaultContextConfigGPRS);
-	TEST(CompareContextConfigGPRS(*defaultContextConfigGPRS, *contextConfig));
-	CleanupStack::PopAndDestroy(defaultContextConfigGPRS);
-	CleanupStack::PopAndDestroy(contextConfig);
-
-
-	//
-	// Test creating secondary context
-	//
-	INFO_PRINTF1(_L("Test creating secondary context"));
-	EtelDriverInputRequest(			KContextId1, 	ECreate2ryPdpContext);
-	WaitForEtelDriverInputResponse(	KContextId1, 	PdpFsm::E2ryPdpContextCreated);
-	
-	// check that context was created - the simtsy creates the first secondary context with name 'SECONDARY1'
-	TEST(iSecondaryPacketContext.OpenExistingContext(iPacketService, KFirstSecondaryContextName) == KErrNone);
-	
-
-	//
-	// Test setting and changing TFT
-	//
-	INFO_PRINTF1(_L("Test setting and changing TFT"));
-	TTFTInfo *firstTftInfo = new(ELeave) TTFTInfo;
-	CleanupStack::PushL(firstTftInfo);
-	TTFTInfo *secondTftInfo = new(ELeave) TTFTInfo;
-	CleanupStack::PushL(secondTftInfo);
-	TTFTInfo *combinedTftInfo = new(ELeave) TTFTInfo;
-	CleanupStack::PushL(combinedTftInfo);
-	DefaultTftInfo(*firstTftInfo);
-	SecondDefaultTftInfo(*secondTftInfo);
-	CombinedDefaultTftInfo(*combinedTftInfo);
-
-	// Test setting TFT
-	iListener->iPdpFsmInterfaceTest->Set(KContextId0, KAddFilters);
-	iListener->iPdpFsmInterfaceTest->Set(KContextId0, *firstTftInfo);
-	EtelDriverInputRequest(KContextId0, ESetTft);
-	WaitForEtelDriverInputResponse(KContextId0, PdpFsm::ETftSet);
-	// check that TFT was set
-	TTFTInfo expectedTftInfo;
-	TEST(CompareTFTInfo(*firstTftInfo, iPrimaryPacketContext));
-	
-	// Test re-setting TFT
-	iListener->iPdpFsmInterfaceTest->Set(KContextId0, KAddFilters);
-	iListener->iPdpFsmInterfaceTest->Set(KContextId0, *secondTftInfo);
-	EtelDriverInputRequest(KContextId0, ESetTft);
-	WaitForEtelDriverInputResponse(KContextId0, PdpFsm::ETftSet);
-	// check that TFT was set
-	TEST(CompareTFTInfo(*secondTftInfo, iPrimaryPacketContext));
-	
-	// Test changing TFT (using KAddFilters)
-	iListener->iPdpFsmInterfaceTest->Set(KContextId0, KAddFilters);
-	iListener->iPdpFsmInterfaceTest->Set(KContextId0, *firstTftInfo);	
-	EtelDriverInputRequest(KContextId0, EChangeTft);
-	WaitForEtelDriverInputResponse(KContextId0, PdpFsm::ETftChanged);
-	// check that TFT was set
-	TEST(CompareTFTInfo(*combinedTftInfo, iPrimaryPacketContext));
-	
-	// Test setting TFT (using KRemoveFilters)
-	iListener->iPdpFsmInterfaceTest->Set(KContextId0, KRemoveFilters);
-	iListener->iPdpFsmInterfaceTest->Set(KContextId0, *firstTftInfo);
-	EtelDriverInputRequest(KContextId0, EChangeTft);
-	WaitForEtelDriverInputResponse(KContextId0, PdpFsm::ETftChanged);
-	// check that TFT was set
-	TEST(CompareTFTInfo(*secondTftInfo, iPrimaryPacketContext));
-
-	// Test setting TFT (using KDeleteTFT)
-	iListener->iPdpFsmInterfaceTest->Set(KContextId0, KDeleteTFT);
-	EtelDriverInputRequest(KContextId0, EChangeTft);
-	WaitForEtelDriverInputResponse(KContextId0, PdpFsm::ETftChanged);
-	// check that TFT was set
-	TInt count;
-	iPrimaryPacketContext.EnumeratePacketFilters(status, count);
-	User::WaitForRequest(status);
-	TEST(status == KErrNone);
-	TEST(count == 0);
-	CleanupStack::PopAndDestroy(combinedTftInfo);
-	CleanupStack::PopAndDestroy(secondTftInfo);
-	CleanupStack::PopAndDestroy(firstTftInfo);
-
-
-	//
-	// Test setting QOS
-	//
-	INFO_PRINTF1(_L("Test setting QOS"));
-	EtelDriverInputRequest(		KContextId1, 	ESetQoS);
-	RPacketQoS::TQoSR99_R4Negotiated *defaultQoSR99_R4Negotiated = new(ELeave) RPacketQoS::TQoSR99_R4Negotiated;
-	CleanupStack::PushL(defaultQoSR99_R4Negotiated);
-	SecondQoSR99_R4Negotiated(*defaultQoSR99_R4Negotiated);
-	WaitForEtelDriverInputResponse(	KContextId1, 	PdpFsm::EQoSSet);
-	RPacketQoS packetQos;
-	// check that QOS was created - the simtsy creates the first QOS with name KFirstQosName
-	TEST(packetQos.OpenExistingQoS(iSecondaryPacketContext, KFirstQosName) == KErrNone);
-	// qos was created ok
-	RPacketQoS::TQoSR99_R4Negotiated *qos = new(ELeave) RPacketQoS::TQoSR99_R4Negotiated;
-	CleanupStack::PushL(qos);
-	TQoSR99_R4NegotiatedPckg qosPckg(*qos);
-	packetQos.GetProfileParameters(status, qosPckg);
-	User::WaitForRequest(status);
-	TEST(CompareUMTSQoSNeg(*defaultQoSR99_R4Negotiated, *qos));
-	CleanupStack::PopAndDestroy(qos);
-	CleanupStack::PopAndDestroy(defaultQoSR99_R4Negotiated);
-	packetQos.Close();
-	iSecondaryPacketContext.Close();
-	iPrimaryPacketContext.Close();
-
-	
-	//
-	// Test activating context
-	//
-	INFO_PRINTF1(_L("Test activating context"));
-	EtelDriverInputRequest(			KContextId1, 	EActivatePdp);
-	WaitForEtelDriverInputResponse(	KContextId1, 	PdpFsm::EPdpActivated);
-	
-	// test that context is set to activated
-	TEST(CompareContextInfo(iPacketService, KFirstSecondaryContextName, RPacketContext::EStatusActive));
-	// make sure the data channel was set as well
-	RPacketContext::TDataChannelV2 dataChannel;
-	DefaultDataChannel(dataChannel);
-	TEST(CompareDataChannel(iListener->iNotifyContextDataChannelData.iDataChannelV2, dataChannel));
-	
-	
-	//
-	// Test modifying active context
-	//
-	INFO_PRINTF1(_L("Test modifying activate context"));
-	EtelDriverInputRequest(KContextId1, EChangeTft);
-	WaitForEtelDriverInputResponse(KContextId1, PdpFsm::ETftChanged);
-	EtelDriverInputRequest(			KContextId1, 	EModifyActive);
-	WaitForEtelDriverInputResponse(	KContextId1, 	PdpFsm::EPdpContextModified);
-	
-	
-	//
-	// Test deleting secondary context
-	//
-	INFO_PRINTF1(_L("Test deleting secondary context"));
-	EtelDriverInputRequest(			KContextId1, 	EContextDelete);
-	WaitForEtelDriverInputResponse(	KContextId1, 	PdpFsm::EContextDeleted);
-
-	// make sure it is marked as deleted
-	iPacketService.GetContextInfo(status, KContextId1, contextInfo);
-	User::WaitForRequest(status);
-	TEST(status == KErrNone && contextInfo.iStatus == RPacketContext::EStatusDeleted);
-	
-
-	//
-	// Test deleting primary context
-	//
-	INFO_PRINTF1(_L("Test deleting primary context"));
-	EtelDriverInputRequest(			KContextId0, 	EContextDelete);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::EContextDeleted);
-	
-	// make sure it is marked as deleted
-	iPacketService.GetContextInfo(status, KContextId0, contextInfo);
-	User::WaitForRequest(status);
-	TEST(status == KErrNone && contextInfo.iStatus == RPacketContext::EStatusDeleted);
-	
-	DestroyPhoneAndPacketService();
-
-	return TestStepResult();
-	}
-
-CSpudTelUnitNotifications::~CSpudTelUnitNotifications()
-	{}
-
-// configure to use test step 1 from simtsy config file
-CSpudTelUnitNotifications::CSpudTelUnitNotifications() : CSpudTelUnitTestStepBase(1)
-	{
-	// Call base class method to set up the human readable name for logging
-	SetTestStepName(KSpudTelUnitNotifications);
-	}
-	
-TVerdict CSpudTelUnitNotifications::doTestStepL()
-/**
- Test notifications
- */
-	{
-	INFO_PRINTF1(_L("Starting Spud Test Notifications"));
-	
-	TRequestStatus status;
-	RPacketQoS packetQos;
-
-	InitPhoneAndPacketServiceL();
-
-	//
-	// setup test - create primary context and start notifications
-	//
-	INFO_PRINTF1(_L("setup test - create primary context and start notifications"));
-	EtelDriverInputRequest(			KContextId0, 	ECreate1ryPdpContext);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::E1ryPdpContextCreated);
-	
-	EtelDriverInputRequest(			KContextId0, 	EActivatePdp);	
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::EPdpActivated);
-	
-	// check that context was created - the simtsy creates the first primary context with name 'PRIMARY1'
-	TEST(iPrimaryPacketContext.OpenExistingContext(iPacketService, KFirstPrimaryContextName) == KErrNone);
-	
-	//
-	// Test service status notification
-	//
-	// the timing here may or may not allow us to recieve an 'activating' request
-	WaitForGivenEtelContextStatusNotification(KContextId0, RPacketContext::EStatusActive);
-	WaitForNextServiceNotificationStatus(	RPacketService::EStatusActive);
-
-
-	//
-	// Test context config notification
-	//
-	INFO_PRINTF1(_L("Test context config notification"));
-	RPacketContext::TContextConfigGPRS contextConfig;
-	DefaultContextConfigGPRS(contextConfig);
-	TContextConfigGPRSPckg contextConfigPckg(contextConfig);
-	iPrimaryPacketContext.SetConfig(status, contextConfigPckg);
-	User::WaitForRequest(status);
-
-	WaitForNextContextConfigNotification(KContextId0, contextConfig);
-	
-	// check that QOS was created - the simtsy creates the first QOS with name KFirstQosName
-	TEST(packetQos.OpenExistingQoS(iPrimaryPacketContext, KFirstQosName) == KErrNone);
-
-
-	//
-	// Test QOS notification
-	//
-
-	INFO_PRINTF1(_L("Test QOS notification"));
-	RPacketQoS::TQoSR99_R4Requested qosRequested;
-	DefaultQoSR99_R4Requested(qosRequested);
-	RPacketQoS::TQoSR99_R4Negotiated qosNegotiated;
-	SecondQoSR99_R4Negotiated(qosNegotiated);
-	TQoSR99_R4RequestedPckg qosRequestedPckg(qosRequested);
-	packetQos.SetProfileParameters(status, qosRequestedPckg);
-	User::WaitForRequest(status);
-	WaitForNextQosNotification(KContextId0, qosNegotiated);
-
-	// clean up
-	packetQos.Close();
-	iPrimaryPacketContext.Close();
-	
-	EtelDriverInputRequest(			KContextId0, 	EContextDelete);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::EContextDeleted);
-	WaitForNextServiceNotificationStatus(RPacketService::EStatusAttached);
-
-	DestroyPhoneAndPacketService();
-	
-	return TestStepResult();
-	}
-
-CSpudTelUnitCreatePrimaryError::~CSpudTelUnitCreatePrimaryError()
-	{
-	}
-
-// configure to use test step 3 from simtsy config file
-CSpudTelUnitCreatePrimaryError::CSpudTelUnitCreatePrimaryError() : CSpudTelUnitTestStepBase(3)
-	{
-	// Call base class method to set up the human readable name for logging
-	SetTestStepName(KSpudTelUnitCreatePrimaryError);
-	}
-	
-TVerdict CSpudTelUnitCreatePrimaryError::doTestStepL()
-/**
- Errors with creating primary
- */
-	{
-	INFO_PRINTF1(_L("Starting Spud Test Create Primary Context Error with SetConfig"));
-	
-	InitPhoneAndPacketServiceL();
-
-	EtelDriverInputRequest(			KContextId0, 	EOpenPhone);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::EPhoneOpened);
-
-	// simtsy is configured to fail second RPacketContext::SetConfig
-	EtelDriverInputRequest(			KContextId0, 	ECreate1ryPdpContext);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::E1ryPdpContextCreatedFailed, KErrGeneral);
-	
-	// clean up
-	EtelDriverInputRequest(			KContextId0, 	EContextDelete);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::EContextDeleted);	
-	
-	DestroyPhoneAndPacketService();
-
-	return TestStepResult();
-	}
-
-CSpudTelUnitSetQosError::~CSpudTelUnitSetQosError()
-	{}
-
-// configure to use test step 6 from simtsy config file
-CSpudTelUnitSetQosError::CSpudTelUnitSetQosError() : CSpudTelUnitTestStepBase(6)
-	{
-	// Call base class method to set up the human readable name for logging
-	SetTestStepName(KSpudTelUnitSetQosError);
-	}
-	
-TVerdict CSpudTelUnitSetQosError::doTestStepL()
-/**
- Errors with setting QoS
- */
-	{
-	INFO_PRINTF1(_L("Starting Spud Test Set QOS Error"));
-	
-	InitPhoneAndPacketServiceL();
-
-	// set test up
-	EtelDriverInputRequest(			KContextId0, 	EOpenPhone);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::EPhoneOpened);
-
-	EtelDriverInputRequest(			KContextId0, 	ECreate1ryPdpContext);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::E1ryPdpContextCreatedFailed, KErrGeneral);
-
-	EtelDriverInputRequest(			KContextId0, 	EContextDelete);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::EContextDeleted);	
-
-	DestroyPhoneAndPacketService();
-
-	return TestStepResult();
-	}
-
-CSpudTelUnitSetTftError::~CSpudTelUnitSetTftError()
-	{
-	}
-
-// configure to use test step 7 from simtsy config file
-CSpudTelUnitSetTftError::CSpudTelUnitSetTftError() : CSpudTelUnitTestStepBase(7)
-	{
-	// Call base class method to set up the human readable name for logging
-	SetTestStepName(KSpudTelUnitSetTftError);
-	}
-	
-TVerdict CSpudTelUnitSetTftError::doTestStepL()
-/**
- Errors with setting TFT
- */
-	{
-	INFO_PRINTF1(_L("Starting Spud Test Set TFT Error"));
-	
-	InitPhoneAndPacketServiceL();
-
-	// set test up
-	EtelDriverInputRequest(			KContextId0, 	EOpenPhone);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::EPhoneOpened);
-
-	EtelDriverInputRequest(			KContextId0, 	ECreate1ryPdpContext);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::E1ryPdpContextCreated);
-
-	// test error in RPacketQoS::CreateNewTFT
-	EtelDriverInputRequest(			KContextId0, 	ESetTft);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::ETftSetFailed, KErrGeneral);
-
-	// test error in RPacketQoS::AddPacketFilter
-	EtelDriverInputRequest(			KContextId0, 	ESetTft);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::ETftSetFailed, KErrGeneral);
-
-	EtelDriverInputRequest(			KContextId0, 	EContextDelete);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::EContextDeleted);	
-
-	DestroyPhoneAndPacketService();
-
-	return TestStepResult();
-	}
-
-CSpudTelUnitActivateError1::~CSpudTelUnitActivateError1()
-	{
-	}
-
-// configure to use test step 8 from simtsy config file
-CSpudTelUnitActivateError1::CSpudTelUnitActivateError1() : CSpudTelUnitTestStepBase(8)
-	{
-	// Call base class method to set up the human readable name for logging
-	SetTestStepName(KSpudTelUnitActivateError1);
-	}
-	
-TVerdict CSpudTelUnitActivateError1::doTestStepL()
-/**
- *	Errors with activating
- */
-	{
-	INFO_PRINTF1(_L("Starting Spud Test Activate Error 1"));
-	
-	InitPhoneAndPacketServiceL();
-
-	// set test up
-	EtelDriverInputRequest(			KContextId0, 	EOpenPhone);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::EPhoneOpened);
-
-	EtelDriverInputRequest(			KContextId0, 	ECreate1ryPdpContext);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::E1ryPdpContextCreated);
-
-	// test error in RPacketContext::Activate
-	EtelDriverInputRequest(			KContextId0, 	EActivatePdp);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::EPdpActivatedFailed, KErrGeneral);
-
-	EtelDriverInputRequest(			KContextId0, 	EContextDelete);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::EContextDeleted);	
-
-	DestroyPhoneAndPacketService();
-
-	return TestStepResult();
-	}
-
-CSpudTelUnitActivateError2::~CSpudTelUnitActivateError2()
-	{
-	}
-
-// configure to use test step 8 from simtsy config file
-CSpudTelUnitActivateError2::CSpudTelUnitActivateError2() : CSpudTelUnitTestStepBase(14)
-	{
-	// Call base class method to set up the human readable name for logging
-	SetTestStepName(KSpudTelUnitActivateError2);
-	}
-	
-TVerdict CSpudTelUnitActivateError2::doTestStepL()
-/**
- *	Errors with activating
- */
-	{
-	INFO_PRINTF1(_L("Starting Spud Test Activate Error 2"));
-	
-	InitPhoneAndPacketServiceL();
-
-	// set test up
-	EtelDriverInputRequest(			KContextId0, 	EOpenPhone);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::EPhoneOpened);
-
-	EtelDriverInputRequest(			KContextId0, 	ECreate1ryPdpContext);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::E1ryPdpContextCreated);
-
-	// test error in RPacketContext::InitialiseContext
-	EtelDriverInputRequest(			KContextId0, 	EActivatePdp);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::EPdpActivatedFailed, KErrGeneral);
-
-	EtelDriverInputRequest(			KContextId0, 	EContextDelete);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::EContextDeleted);	
-
-	DestroyPhoneAndPacketService();
-
-	return TestStepResult();
-	}
-
-CSpudTelUnitDeleteError1::~CSpudTelUnitDeleteError1()
-	{
-	}
-
-// configure to use test step 9 from simtsy config file
-CSpudTelUnitDeleteError1::CSpudTelUnitDeleteError1() : CSpudTelUnitTestStepBase(9)
-	{
-	// Call base class method to set up the human readable name for logging
-	SetTestStepName(KSpudTelUnitDeleteError1);
-	}
-	
-TVerdict CSpudTelUnitDeleteError1::doTestStepL()
-/**
- Errors with deleting
- */
-	{
-	INFO_PRINTF1(_L("Starting Spud Test Delete Error"));
-	
-	InitPhoneAndPacketServiceL();
-
-	// set test up phone, primary context, it's QoS parameters, and activate the context
-	EtelDriverInputRequest(			KContextId0, 	EOpenPhone);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::EPhoneOpened);
-	EtelDriverInputRequest(			KContextId0, 	ECreate1ryPdpContext);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::E1ryPdpContextCreated);
-	EtelDriverInputRequest(			KContextId0, 	ESetQoS);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::EQoSSet);
-	EtelDriverInputRequest(			KContextId0, 	EActivatePdp);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::EPdpActivated);
-
-	// test error in RPacketContext::Deactivate
-	EtelDriverInputRequest(			KContextId0, 	EContextDelete);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::EContextDeletedFailed, KErrGeneral);
-
-	DestroyPhoneAndPacketService();
-
-	return TestStepResult();
-	}
-
-CSpudTelUnitDeleteError2::~CSpudTelUnitDeleteError2()
-	{
-	}
-
-// configure to use test step 13 from simtsy config file
-CSpudTelUnitDeleteError2::CSpudTelUnitDeleteError2() : CSpudTelUnitTestStepBase(10)
-	{
-	// Call base class method to set up the human readable name for logging
-	SetTestStepName(KSpudTelUnitDeleteError2);
-	}
-	
-TVerdict CSpudTelUnitDeleteError2::doTestStepL()
-/**
- Errors with deleting
- */
-	{
-	INFO_PRINTF1(_L("Starting Spud Test Delete Error 2"));
-	
-	InitPhoneAndPacketServiceL();
-
-	// set test up
-	EtelDriverInputRequest(			KContextId0, 	EOpenPhone);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::EPhoneOpened);
-
-	EtelDriverInputRequest(			KContextId0, 	ECreate1ryPdpContext);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::E1ryPdpContextCreated);
-	EtelDriverInputRequest(			KContextId0, 	EActivatePdp);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::EPdpActivated);
-
-	// test error in RPacketContext::Delete
-	EtelDriverInputRequest(			KContextId0, 	EContextDelete);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::EContextDeletedFailed, KErrGeneral);
-
-	DestroyPhoneAndPacketService();
-
-	return TestStepResult();
-	}
-
-CSpudTelUnitMultipleContexts::~CSpudTelUnitMultipleContexts()
-	{
-	}
-
-// configure to use test step 10 from simtsy config file
-CSpudTelUnitMultipleContexts::CSpudTelUnitMultipleContexts() : CSpudTelUnitTestStepBase(11)
-	{
-	// Call base class method to set up the human readable name for logging
-	SetTestStepName(KSpudTelUnitMultipleContexts);
-	}
-	
-TVerdict CSpudTelUnitMultipleContexts::doTestStepL()
-/**
- Test multiple primary contexts with multiple secondary contexts
- */
-	{
-	INFO_PRINTF1(_L("Starting Spud Test Multiple Contexts"));
-	
-	TRequestStatus status;
-
-	InitPhoneAndPacketServiceL();
-	RPacketContext primaryPacketContext2, secondaryPacketContext2;
-
-	EtelDriverInputRequest(			KContextId0, 	EOpenPhone);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::EPhoneOpened);
-
-	//
-	// Test creating multiple primary contexts
-	//
-	INFO_PRINTF1(_L("Test create first primary context"));
-	EtelDriverInputRequest(			KContextId0, 	ECreate1ryPdpContext);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::E1ryPdpContextCreated);
-	
-	// check that context was created - the simtsy creates the first primary context with name 'PRIMARY1'
-	TEST(iPrimaryPacketContext.OpenExistingContext(iPacketService, KFirstPrimaryContextName) == KErrNone);
-
-	// check that context config for GPRS was set correctly
-	RPacketContext::TContextConfigGPRS *contextConfig = new(ELeave) RPacketContext::TContextConfigGPRS;
-	CleanupStack::PushL(contextConfig);
-	TContextConfigGPRSPckg contextConfigPckg(*contextConfig);
-	iPrimaryPacketContext.GetConfig(status, contextConfigPckg);
-	User::WaitForRequest(status);
-	RPacketContext::TContextConfigGPRS *defaultTestContextConfigGPRS = new(ELeave) RPacketContext::TContextConfigGPRS;
-	CleanupStack::PushL(defaultTestContextConfigGPRS);
-	DefaultContextConfigGPRS(*defaultTestContextConfigGPRS);
-	TEST(CompareContextConfigGPRS(*defaultTestContextConfigGPRS, *contextConfig));
-
-	INFO_PRINTF1(_L("Test create second primary context"));
-	EtelDriverInputRequest(			KContextId1, 	ECreate1ryPdpContext);
-	WaitForEtelDriverInputResponse(	KContextId1, 	PdpFsm::E1ryPdpContextCreated);
-	
-	// check that context was created - the simtsy creates the first primary context with name 'PRIMARY2'
-	TEST(primaryPacketContext2.OpenExistingContext(iPacketService, KSecondPrimaryContextName) == KErrNone);
-
-	// check that context config for GPRS was set correctly
-	primaryPacketContext2.GetConfig(status, contextConfigPckg);
-	User::WaitForRequest(status);
-	TEST(CompareContextConfigGPRS(*defaultTestContextConfigGPRS, *contextConfig));
-	CleanupStack::PopAndDestroy(defaultTestContextConfigGPRS);
-	CleanupStack::PopAndDestroy(contextConfig);
-
-	
-	//
-	// Test creating secondary contexts on each primary context
-	//
-	INFO_PRINTF1(_L("Test create first secondary context"));
-	EtelDriverInputRequest(			KContextId2, 	ECreate2ryPdpContext);
-	WaitForEtelDriverInputResponse(	KContextId2, 	PdpFsm::E2ryPdpContextCreated);
-	
-	// check that context was created - the simtsy creates the first secondary context with name 'SECONDARY1'
-	TEST(iSecondaryPacketContext.OpenExistingContext(iPacketService, KFirstSecondaryContextName) == KErrNone);
-	
-	INFO_PRINTF1(_L("Test create second secondary context"));
-	EtelDriverInputRequest(			KContextId3, 	ECreate2ryPdpContext);
-	WaitForEtelDriverInputResponse(	KContextId3, 	PdpFsm::E2ryPdpContextCreated);
-	
-	// check that context was created - the simtsy creates the first secondary context with name 'SECONDARY2'
-	TEST(secondaryPacketContext2.OpenExistingContext(iPacketService, KSecondSecondaryContextName) == KErrNone);
-	
-
-	//
-	// Test setting TFT (this time on secondary context)
-	//
-	INFO_PRINTF1(_L("Test setting TFT"));
-	EtelDriverInputRequest(		KContextId3, 		ESetTft);
-	WaitForEtelDriverInputResponse(	KContextId3, 	PdpFsm::ETftSet);
-	
-	// check that TFT was set
-	TTFTInfo *expectedTftInfo = new(ELeave) TTFTInfo;
-	CleanupStack::PushL(expectedTftInfo);
-	DefaultTftInfo(*expectedTftInfo);
-	TEST(CompareTFTInfo(*expectedTftInfo, secondaryPacketContext2));
-	CleanupStack::PopAndDestroy(expectedTftInfo);
-	
-
-	//
-	// Test setting QOS (this time on primary context)
-	//
-	INFO_PRINTF1(_L("Test setting QOS"));
-	EtelDriverInputRequest(		KContextId1, 		ESetQoS);
-	WaitForEtelDriverInputResponse(	KContextId1, 	PdpFsm::EQoSSet);
-	RPacketQoS packetQos;
-	// check that QOS was created - the simtsy creates the first QOS with name KFirstQosName
-	TEST(packetQos.OpenExistingQoS(primaryPacketContext2, KFirstQosName) == KErrNone);
-	// qos was created ok
-	RPacketQoS::TQoSR99_R4Negotiated *qos = new(ELeave) RPacketQoS::TQoSR99_R4Negotiated;
-	CleanupStack::PushL(qos);
-	TQoSR99_R4NegotiatedPckg qosPckg(*qos);
-	packetQos.GetProfileParameters(status, qosPckg);
-	User::WaitForRequest(status);
-	RPacketQoS::TQoSR99_R4Negotiated *defaultTestTQoSR99_R4Negotiated = new(ELeave) RPacketQoS::TQoSR99_R4Negotiated;
-	CleanupStack::PushL(defaultTestTQoSR99_R4Negotiated);
-	SecondQoSR99_R4Negotiated(*defaultTestTQoSR99_R4Negotiated);
-	TEST(CompareUMTSQoSNeg(*defaultTestTQoSR99_R4Negotiated, *qos));
-	packetQos.Close();
-	CleanupStack::PopAndDestroy(defaultTestTQoSR99_R4Negotiated);
-	CleanupStack::PopAndDestroy(qos);
-	primaryPacketContext2.Close();
-	secondaryPacketContext2.Close();
-	iPrimaryPacketContext.Close();
-	iSecondaryPacketContext.Close();
-
-	
-	//
-	// Test activating contexts
-	//
-	INFO_PRINTF1(_L("Test activating contexts"));
-	EtelDriverInputRequest(			KContextId1, 	EActivatePdp);
-	// The service is now attached
-	WaitForEtelDriverInputResponse(	KContextId1, 	PdpFsm::EPdpActivated);
-	
-	// test that context is set to activated
-	TEST(CompareContextInfo(iPacketService, KSecondPrimaryContextName, RPacketContext::EStatusActive));
-	RPacketContext::TDataChannelV2 dataChannel;
-	DefaultDataChannel(dataChannel);
-	TEST(CompareDataChannel(iListener->iNotifyContextDataChannelData.iDataChannelV2, dataChannel));
-	
-	EtelDriverInputRequest(			KContextId2, 	EActivatePdp);
-	WaitForEtelDriverInputResponse(	KContextId2, 	PdpFsm::EPdpActivated);
-	
-	// test that context is set to activated
-	TEST(CompareContextInfo(iPacketService, KFirstSecondaryContextName, RPacketContext::EStatusActive));
-
-	
-	//
-	// Test deleting primary context before secondary contexts
-	//
-	INFO_PRINTF1(_L("Test deleting primary contexts before secondary contexts"));
-	EtelDriverInputRequest(			KContextId0, 	EContextDelete);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::EContextDeleted);
-
-	// make sure it is marked as deleted
-	TEST(CompareContextInfo(iPacketService, KFirstPrimaryContextName, RPacketContext::EStatusDeleted));
-	
-	EtelDriverInputRequest(			KContextId1, 	EContextDelete);
-	WaitForEtelDriverInputResponse(	KContextId1, 	PdpFsm::EContextDeleted);
-
-	// make sure it is marked as deleted
-	TEST(CompareContextInfo(iPacketService, KSecondPrimaryContextName, RPacketContext::EStatusDeleted));
-	
-
-	//
-	// Test deleting secondary contexts
-	//
-	INFO_PRINTF1(_L("Test deleting secondary contexts"));
-	EtelDriverInputRequest(			KContextId2, 	EContextDelete);
-	WaitForEtelDriverInputResponse(	KContextId2, 	PdpFsm::EContextDeleted);
-	
-	// make sure it is marked as deleted
-	TEST(CompareContextInfo(iPacketService, KFirstSecondaryContextName, RPacketContext::EStatusDeleted));
-	
-	EtelDriverInputRequest(			KContextId3, 	EContextDelete);
-	WaitForEtelDriverInputResponse(	KContextId3, 	PdpFsm::EContextDeleted);
-	
-	// make sure it is marked as deleted
-	TEST(CompareContextInfo(iPacketService, KSecondSecondaryContextName, RPacketContext::EStatusDeleted));
-
-	DestroyPhoneAndPacketService();
-
-	return TestStepResult();
-	}
-
-CSpudTelUnitCancel::~CSpudTelUnitCancel()
-	{
-	}
-
-// configure to use test step 12 from simtsy config file
-CSpudTelUnitCancel::CSpudTelUnitCancel() : CSpudTelUnitTestStepBase(12)
-	{
-	// Call base class method to set up the human readable name for logging
-	SetTestStepName(KSpudTelUnitCancel);
-	}
-	
-TVerdict CSpudTelUnitCancel::doTestStepL()
-/**
- Test cancelling operations
- */
-	{
-	INFO_PRINTF1(_L("Starting Spud Test Cancel on Input Operations"));
-	
-	TRequestStatus timerStatus;
-	RTimer timer;
-	timer.CreateLocal();
-
-	InitPhoneAndPacketServiceL();
-
-	//
-	// Test cancelling create primary request
-	//
-	INFO_PRINTF1(_L("Test cancelling create primary request"));
-	EtelDriverInputRequest(			KContextId0, 	ECreate1ryPdpContext);
-	CancelPdpRequest(KContextId0);
-	timer.After(timerStatus, 1500000);
-	User::WaitForRequest(iListener->iEtelDriverInputResponseStatus, timerStatus);
-	TEST(timerStatus == KErrNone && iListener->iEtelDriverInputResponseStatus == KRequestPending);
-	
-
-	//
-	// Set up primary for upcoming tests
-	//
-	// 
-	INFO_PRINTF1(_L("Create primary"));
-	EtelDriverInputRequest(			KContextId1, 	ECreate1ryPdpContext);
-	WaitForEtelDriverInputResponse(	KContextId1, 	PdpFsm::E1ryPdpContextCreated);
-
-	// since creating secondary contains no asyncronous requests, the request cannot be cancelled
-	//EtelDriverInputRequest(			KContextId2, 	ECreate2ryPdpContext);
-	//CancelPdpRequest(KContextId2);
-	//timer.After(timerStatus, 1500000);
-	//User::WaitForRequest(iListener->iEtelDriverInputResponseStatus, timerStatus);
-	//TEST(iListener->iEtelDriverInputResponseStatus == KErrNone);
-
-
-	//
-	// Test cancelling set TFT
-	//
-	INFO_PRINTF1(_L("Test cancelling set TFT"));
-	EtelDriverInputRequest(	KContextId1, 	ESetTft);
-	CancelPdpRequest(KContextId1);
-	timer.After(timerStatus, 1500000);
-	User::WaitForRequest(iListener->iEtelDriverInputResponseStatus, timerStatus);
-	TEST(timerStatus == KErrNone && iListener->iEtelDriverInputResponseStatus == KRequestPending);
-	
-
-	//
-	// Test cancelling set QOS
-	//
-	//INFO_PRINTF1(_L("Test cancelling set QOS"));
-	//EtelDriverInputRequest(	KContextId1, 	ESetQoS);
-	//CancelPdpRequest(KContextId1);
-	//timer.After(timerStatus, 1500000);
-	//User::WaitForRequest(iListener->iEtelDriverInputResponseStatus, timerStatus);
-	//TEST(timerStatus == KErrNone && iListener->iEtelDriverInputResponseStatus == KRequestPending);
-	
-
-	//
-	// Test cancelling activate PDP
-	//
-	INFO_PRINTF1(_L("Test cancelling create secondary request"));
-	EtelDriverInputRequest(	KContextId1, 	EActivatePdp);
-	CancelPdpRequest(KContextId1);
-	timer.After(timerStatus, 1500000);
-	User::WaitForRequest(iListener->iEtelDriverInputResponseStatus, timerStatus);
-	TEST(timerStatus == KErrNone && iListener->iEtelDriverInputResponseStatus == KRequestPending);
-
-
-	//
-	// Test cancelling context delete
-	//
-	INFO_PRINTF1(_L("Test cancelling context delete"));
-	EtelDriverInputRequest(	KContextId1, 	EContextDelete);
-	CancelPdpRequest(KContextId1);
-	timer.After(timerStatus, 1500000);
-	User::WaitForRequest(iListener->iEtelDriverInputResponseStatus, timerStatus);
-	TEST(timerStatus == KErrNone && iListener->iEtelDriverInputResponseStatus == KRequestPending);
-
-	// clean up
-	EtelDriverInputRequest(			KContextId0, 	EContextDelete);
-	WaitForEtelDriverInputResponse(	KContextId0, 	PdpFsm::EContextDeleted);	
-	EtelDriverInputRequest(			KContextId1, 	EContextDelete);
-	WaitForEtelDriverInputResponse(	KContextId1, 	PdpFsm::EContextDeleted);	
-
-	DestroyPhoneAndPacketService();
-
-	timer.Close();
-	
-	return TestStepResult();
-	}
--- a/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/SpudUnitTestServer.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,203 +0,0 @@
-// Copyright (c) 2004-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:
-// for (WINS && !EKA2) versions will be xxxServer.Dll and require a thread to
-// be started in the process of the client. The client initialises the server
-// by calling the one and only ordinal.
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#include "SpudUnitTestServer.h"
-#include "SpudUnitTestStep.h"
-
-_LIT(KServerName,"TE_SpudUnit");
-
-CSpudUnitTestServer* CSpudUnitTestServer::NewL()
-/**
- * @return - Instance of the test server
- * Called inside the MainL() function to create and start the
- * CTestServer derived server.
- */
-	{
-	// Instantiate server class here
-	CSpudUnitTestServer * server = new (ELeave) CSpudUnitTestServer();
-	CleanupStack::PushL(server);
-	// CServer base class call
-	server->StartL(KServerName);
-	CleanupStack::Pop(server);
-	return server;
-	}
-
-// EKA2 much simpler
-// Just an E32Main and a MainL()
-LOCAL_C void MainL()
-/**
- * Much simpler, uses the new Rendezvous() call to sync with the client
- */
-	{
-	_LIT(KPhbkSyncCMI, "phbsync.cmi");
-	TInt err = StartC32WithCMISuppressions(KPhbkSyncCMI);
-	if (err != KErrNone && err != KErrAlreadyExists)
-		{
-		User::Leave(err);
-		}
-
-	CActiveScheduler* sched=NULL;
-	sched=new(ELeave) CActiveScheduler;
-	CActiveScheduler::Install(sched);
-
-	CSpudUnitTestServer* server = NULL;
-	// Create the CTestServer derived server
-	TRAP(err,server = CSpudUnitTestServer::NewL());
-	if(!err)
-		{
-		// Sync with the client and enter the active scheduler
-		RProcess::Rendezvous(KErrNone);
-		sched->Start();
-		}
-	delete server;
-	delete sched;
-	}
-
-
-GLDEF_C TInt E32Main()
-/**
- * @return - Standard Epoc error code on exit
- */
-	{
-	CTrapCleanup* cleanup = CTrapCleanup::New();
-	if(cleanup == NULL)
-		{
-		return KErrNoMemory;
-		}
-	TRAPD(err,MainL());
-	delete cleanup;
-	return err;
-	}
-
-/** export function */
-REtelDriverInput* NewEtelDriverInputL()
-	{	
-	return new(ELeave) REtelDriverInput();
-	}
-
-
-// Create a thread in the calling process
-// Emulator typhoon and earlier
-
-CTestStep* CSpudUnitTestServer::CreateTestStep(const TDesC& aStepName)
-/**
- * @return - A CTestStep derived instance
- * Implementation of CTestServer pure virtual
- */
-	{
-	CTestStep* testStep = NULL;
-	
-	TRAPD
-		(err,
-		
-		// SPUD TEL unit tests
-		if(aStepName == KSpudTelUnitNormalOperation)
-			{
-			testStep = new(ELeave) CSpudTelUnitNormalOperation();
-			}
-		if(aStepName == KSpudTelUnitNotifications)
-			{
-			testStep = new(ELeave) CSpudTelUnitNotifications();
-			}
-		if(aStepName == KSpudTelUnitCreatePrimaryError)
-			{
-			testStep = new(ELeave) CSpudTelUnitCreatePrimaryError();
-			}
-		if(aStepName == KSpudTelUnitSetQosError)
-			{
-			testStep = new(ELeave) CSpudTelUnitSetQosError();
-			}
-		if(aStepName == KSpudTelUnitSetTftError)
-			{
-			testStep = new(ELeave) CSpudTelUnitSetTftError();
-			}
-		if(aStepName == KSpudTelUnitActivateError1)
-			{
-			testStep = new(ELeave) CSpudTelUnitActivateError1();	
-			}
-		if(aStepName == KSpudTelUnitActivateError2)
-			{
-			testStep = new(ELeave) CSpudTelUnitActivateError2();	
-			}
-		if(aStepName == KSpudTelUnitDeleteError1)
-			{
-			testStep = new(ELeave) CSpudTelUnitDeleteError1();
-			}
-		if(aStepName == KSpudTelUnitDeleteError2)
-			{
-			testStep = new(ELeave) CSpudTelUnitDeleteError2();
-			}
-		if(aStepName == KSpudTelUnitMultipleContexts)
-			{
-			testStep = new(ELeave) CSpudTelUnitMultipleContexts();	
-			}
-		if(aStepName == KSpudTelUnitCancel)
-			{
-			testStep = new(ELeave) CSpudTelUnitCancel();	
-			}
-		
-		// SPUD FSM unit tests
-		if(aStepName == KSpudFsmUnitNormalOperation)
-			{
-			testStep = new(ELeave) CSpudFsmUnitNormalOperation();
-			}
-		if(aStepName == KSpudFsmCreatePrimaryError1)
-			{
-			testStep = new(ELeave) CSpudFsmUnitCreatePrimaryError1();
-			}
-		if(aStepName == KSpudFsmCreatePrimaryError2)
-			{
-			testStep = new(ELeave) CSpudFsmUnitCreatePrimaryError2();
-			}
-		if(aStepName == KSpudFsmCreatePrimaryError3)
-			{
-			testStep = new(ELeave) CSpudFsmUnitCreatePrimaryError3();
-			}
-		if(aStepName == KSpudFsmSetQosAndTftError)
-			{
-			testStep = new(ELeave) CSpudFsmUnitSetQosAndTftError();
-			}
-		if(aStepName == KSpudFsmChangeQosAndTftError)
-			{
-			testStep = new(ELeave) CSpudFsmUnitChangeQosAndTftError();
-			}
-		if(aStepName == KSpudFsmTestNotifications)
-			{
-			testStep = new(ELeave) CSpudFsmUnitNotifications();
-			}
-		if(aStepName == KSpudFsmNetworkDelete)
-			{
-			testStep = new(ELeave) CSpudFsmUnitNetworkDelete();
-			}
-		
-		);
-	
-	if (err != KErrNone)
-		{
-		return NULL;
-		}
-		
-	return testStep;
-	}
-
--- a/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/SpudUnitTestStepBase.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,496 +0,0 @@
-// Copyright (c) 2004-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:
-// Test framework for SPUD TEL and SPUD FSM unit tests
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#include <e32property.h>
-#include <c32comm.h>
-#include <e32def.h>
-#include <e32std.h>
-
-#include <in_iface.h>
-#include <simtsy.h>
-
-#include "SpudUnitTestStep.h"
-#include "InputRequestListener.h"
-
-using namespace EtelDriver;
-
-CSpudUnitTestStepBase::CSpudUnitTestStepBase(TInt aTestNumber, TBool aUseTestPdpFsmInterface) : iTestNumber(aTestNumber), iUseTestPdpFsmInterface(aUseTestPdpFsmInterface)
-	{}
-
-/**
-Sets the section for the simtsy to use in its c:\config.txt file.
-The section that will be used is testX, where X is the parameter
-aTestNumber.
-
-@param aTestNumber Simtsy configuration section number, which will be
-                   set to ensure simtsy loads the correct parameters on
-                   when it is loaded.
-@leave The function leaves if the Sim.TSY test number property is not
-       defined; e.g. make sure StartC32 has been called.
-*/
-void CSpudUnitTestStepBase::SetSimTsyTestNumberL(TInt aTestNumber)
-  	{
-	User::LeaveIfError(RProperty::Set(KUidPSSimTsyCategory, KPSSimTsyTestNumber, aTestNumber));
-  	}
-
-/**
- Initializes the test framework, including creating the thread that will run the active 
- scheduler containing the components under test (SPUD or SPUDTEL)
- */
-TVerdict CSpudUnitTestStepBase::doTestStepPreambleL()
-	{
-	SetSimTsyTestNumberL(iTestNumber);
-
-	// create CTestRequestListener, to be used to contain parameters to be passed
-	// between the two threads
-	iListener = CInputRequestListener::NewL(iUseTestPdpFsmInterface);
-
-	// creating and start the thread that will run the active scheduler containing SPUD or SPUDTEL
-	TActiveSchedulerThreadParams params;
-	params.iListener = iListener;
-	params.iThreadId = RThread().Id();
-	_LIT(activeSchedulerThreadName, "ActiveSchedulerThread_");
-	TBuf<255> buf(activeSchedulerThreadName);
-	buf.AppendNum(iTestNumber);
-	TInt ret = iActiveSchedulerThread.Create(buf, ActiveSchedulerThread, KDefaultStackSize, NULL, &params);
-	TESTEL(ret == KErrNone, ret);
-	iActiveSchedulerThread.Resume();
-	
-	// wait for the thread to initialize before sending it any requests
-	User::WaitForRequest(iListener->iThreadInitialized);
-
-	return TestStepResult();
-	}
-	
-/**
- Cleans up anything allocated in the preamble
- */
-TVerdict CSpudUnitTestStepBase::doTestStepPostambleL()
-	{
-	// if we complete the listener's status with an error, the RunL will stop the 
-	// active scheduler and the thread will clean up any resources and exit
-	TRequestStatus *status = &iListener->iStatus;
-	iActiveSchedulerThread.RequestComplete(status, KErrCancel);
-
-	// wait until the thread has cleaned up then kill it
-	// if the iThreadDestructed is never completed, this is probably the result of the UHEAP_MARKEND macro failing
-	User::WaitForRequest(iListener->iThreadDestructed);
-	iActiveSchedulerThread.Kill(KErrNone);
-	iActiveSchedulerThread.Close();
-	
-	delete iListener;
-	iListener = NULL;
-
-	return EPass;
-	}
-	
-/**
- Initializes the packet service to query current parameters
-*/
-void CSpudUnitTestStepBase::InitPhoneAndPacketServiceL()
-	{
-	TESTL(iTelServer.Connect() == KErrNone);
-	TESTL(iTelServer.LoadPhoneModule( _L("SIM") ) == KErrNone);
-	TESTL(iPhone.Open ( iTelServer, _L("SimulatorPhone") ) == KErrNone);
-	TESTL(iPacketService.Open(iPhone) == KErrNone);
-	}
-	
-void CSpudUnitTestStepBase::DestroyPhoneAndPacketService()
-	{
-	iPacketService.Close();
-	iPhone.Close();
-	iTelServer.Close();
-	}
-
-// Set up to not use Test PdpFsmInterface (and use the spud fsm's RPdpFsmInterface)
-CSpudFsmUnitTestStepBase::CSpudFsmUnitTestStepBase(TInt aTestNumber) : CSpudUnitTestStepBase(aTestNumber, EFalse)
-	{}
-	
-// Set up to use Test PdpFsmInterface
-CSpudTelUnitTestStepBase::CSpudTelUnitTestStepBase(TInt aTestNumber) : CSpudUnitTestStepBase(aTestNumber, ETrue)
-	{}
-
-/**
- Must be called after simtsy has been initialized.
- Instructs the simtsy to complete a given request/notification. The supported commands are given in TEtelRequestType.
- The parameter supplied in aNewValue instructs the simtsy what data from the config.txt to use in the completion of the request.
- The aNewValue is the index to the entry to be used to complete the request for the current test step section, ie if aNewValue
- is 0, iTestNumber is 3, and aEtelCommand is ENetworkQoSChange, the entry will complete any NotifyNetworkQoSChange calls
- with data from the first QosProfileReqR99 entry of section [test3] in the config.txt file
-*/
-void CSpudUnitTestStepBase::EtelRequest(TEtelRequestType aEtelCommand, TInt aNewValue)
-	{
-	INFO_PRINTF3(_L("CSpudUnitTestStepBase::EtelRequest: aEtelCommand = %d, aNewValue = %d"), aEtelCommand, aNewValue);
-
-	TUint key(0);
-	
-	switch (aEtelCommand)
-		{
-	case ENetworkQoSChange:
-		key = KPSSimTsyNetworkQoSChange;
-		break;
-	case ENetworkChangeRegStatus:
-		key = KPSSimtsyPacketServiceNtwkRegStatusChange;
-		break;
-	case EContextStatusChange:
-		key = KPSSimtsyPacketContextStatusChange;
-		break;
-	default:
-		// log error
-		return;
-		}
-
-  	// simtsy will listen for any changes to the property, and complete the corresponding request
-	TInt ret = RProperty::Set(KUidPSSimTsyCategory, key, aNewValue);
-	TEST(ret == KErrNone);
-	}
-
-/**
- Calling this will instruct the CTestRequestListener to call REtelDriverInput::CancelPdpNotifications on SPUDTEL
-*/
-void CSpudTelUnitTestStepBase::CancelPdpRequest(TContextId aPdpId)
-	{
-	INFO_PRINTF2(_L("CSpudUnitTestStepBase::EtelDriverCancelPdpRequest: aPdpId = %d"), aPdpId);
-	// wait until iListener to finish with the iControlData member so that 2 requests
-	// immediately after one another will still work
-	User::WaitForRequest(iListener->iReadyForInputRequest);
-	iListener->iReadyForInputRequest = KRequestPending;
-
-	// set the parameters to pass to REtelDriverInput::Input
-	iListener->iEtelDriverCancelRequestPdpId = aPdpId;
-
-	// complete iListener's status, causing its RunL to call CancelPdp on SPUDTEL
-	TRequestStatus *status = &iListener->iStatus;
-	iActiveSchedulerThread.RequestComplete(status, CInputRequestListener::EEtelDriverCancelPdpRequest);
-	}
-
-/**
- Calling this will instruct the CTestRequestListener to call REtelDriverInput::Input on SPUDTEL
-*/
-void CSpudTelUnitTestStepBase::EtelDriverInputRequest(TContextId aPdpId, TEtelInput aOperation)
-	{
-	INFO_PRINTF3(_L("CSpudUnitTestStepBase::EtelDriverInputRequest: aPdpId = %d, aOperation = %d"), aPdpId, aOperation);
-	// wait until iListener to finish with the iControlData member so that 2 requests
-	// immediately after one another will still work
-	User::WaitForRequest(iListener->iReadyForInputRequest);
-	iListener->iReadyForInputRequest = KRequestPending;
-
-	// set the parameters to pass to REtelDriverInput::Input
-	iListener->iEtelDriverInputRequestData.iPdpId = aPdpId;
-	iListener->iEtelDriverInputRequestData.iOperation = aOperation;
-
-	// complete iListener's status, causing its RunL to call Input on SPUDTEL
-	TRequestStatus *status = &iListener->iStatus;
-	iActiveSchedulerThread.RequestComplete(status, CInputRequestListener::EEtelDriverInputRequest);
-	}
-
-/**
- Wait for RPdpFsmInterface::Input to be called with a non-notification event
-*/
-void CSpudTelUnitTestStepBase::WaitForEtelDriverInputResponse(TContextId aPdpId, PdpFsm::TEtelSignal aSignal, TInt aError)
-	{
-	INFO_PRINTF3(_L("CSpudUnitTestStepBase::WaitForEtelDriverInputResponse: aPdpId = %d, aSignal = %d"), aPdpId, aSignal);
-	
-	// the implementation of RPdpFsmInterface::Input that is called by the Etel driver will complete the iEtelDriverInputResponseStatus request
-	User::WaitForRequest(iListener->iEtelDriverInputResponseStatus);
-	
-	// make sure the parameters are as expected
-	TEST(iListener->iEtelDriverInputResponseStatus == aError);
-	TEST(iListener->iEtelDriverInputResponseData.iPdpId == aPdpId);
-	TEST(iListener->iEtelDriverInputResponseData.iSignal == aSignal);
-	
-	iListener->iEtelDriverInputResponseStatus = KRequestPending;
-	}
-	
-/**
- Wait for RPdpFsmInterface::Input to be called with aOperation EConfigGPRSChangeNetwork
-*/
-void CSpudTelUnitTestStepBase::WaitForNextContextConfigNotification(TContextId aPdpId, const RPacketContext::TContextConfigGPRS& aContextConfigGPRS)
-	{
-	INFO_PRINTF2(_L("CSpudUnitTestStepBase::WaitForNextContextConfigNotification: aPdpId = %d"), aPdpId);
-	
-	// the implementation of RPdpFsmInterface::Input that is called by the Etel driver will complete the iEtelDriverConfigGPRSNotificationStatus request
-	User::WaitForRequest(iListener->iEtelDriverConfigGPRSNotificationStatus);
-	
-	INFO_PRINTF2(_L("CSpudUnitTestStepBase::WaitForNextContextConfigNotification: iListener->iNotifyContextConfigData.iPdpId = %d"), iListener->iNotifyContextConfigData.iPdpId);
-	// make sure the parameters are as expected
-	TEST(iListener->iEtelDriverConfigGPRSNotificationStatus == KErrNone);
-	TEST(iListener->iNotifyContextConfigData.iPdpId == aPdpId);
-	TEST(CompareContextConfigGPRS(iListener->iNotifyContextConfigData.iContextConfigGPRS, aContextConfigGPRS));
-	
-	iListener->iEtelDriverConfigGPRSNotificationStatus = KRequestPending;
-	}
-
-/**
- Wait for RPdpFsmInterface::Input to be called with aOperation EContextStatusChangeNetwork
-*/
-void CSpudTelUnitTestStepBase::WaitForGivenEtelContextStatusNotification(TContextId aPdpId, RPacketContext::TContextStatus aContextStatus)
-	{
-	INFO_PRINTF3(_L("CSpudUnitTestStepBase::WaitForGivenContextStatusNotification: aPdpId = %d, aContextStatus = %d"), aPdpId, aContextStatus);
-	
-	do
-		{
-	// the implementation of RPdpFsmInterface::Input that is called by the Etel driver will complete the iEtelDriverContextStatusNotificationStatus request
-		User::WaitForRequest(iListener->iEtelDriverContextStatusNotificationStatus);
-		
-		INFO_PRINTF3(_L("CSpudUnitTestStepBase::WaitForGivenContextStatusNotification: iPdpId = %d, iContextStatus = %d"), iListener->iNotifyContextConfigData.iPdpId, iListener->iNotifyContextStatusData.iContextStatus);
-		} while (iListener->iNotifyContextStatusData.iPdpId != aPdpId || iListener->iNotifyContextStatusData.iContextStatus != aContextStatus);
-	
-	// make sure the parameters are as expected
-	TEST(iListener->iEtelDriverContextStatusNotificationStatus == KErrNone);
-	TEST(iListener->iNotifyContextStatusData.iPdpId == aPdpId);
-	TEST(iListener->iNotifyContextStatusData.iContextStatus == aContextStatus);
-	
-	iListener->iEtelDriverContextStatusNotificationStatus = KRequestPending;
-	}
-
-/**
- Wait for RPdpFsmInterface::Input to be called with aOperation EQoSProfileChangeNetwork
-*/
-void CSpudTelUnitTestStepBase::WaitForNextQosNotification(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Negotiated& aQoSR99_R4Negotiated)
-	{
-	INFO_PRINTF2(_L("CSpudUnitTestStepBase::WaitForNextQosNotification: aPdpId = %d"), aPdpId);
-	
-	// the implementation of RPdpFsmInterface::Input that is called by the Etel driver will complete the iEtelDriverQosNotificationStatus request
-	User::WaitForRequest(iListener->iEtelDriverQosNotificationStatus);
-	
-	// make sure the parameters are as expected
-	TEST(iListener->iEtelDriverQosNotificationStatus == KErrNone);
-	TEST(iListener->iNotifyQosNegotiatedData.iPdpId == aPdpId);
-	TEST(CompareUMTSQoSNeg(iListener->iNotifyQosNegotiatedData.iNegotiated.NegotiatedQoSR99_R4(), aQoSR99_R4Negotiated));
-	iListener->iEtelDriverQosNotificationStatus = KRequestPending;
-	}
-
-
-/**
- Wait for RPdpFsmInterface::Input to be called with aOperation EServiceStatusChangeNetwork
-*/
-void CSpudTelUnitTestStepBase::WaitForNextServiceNotificationStatus(RPacketService::TStatus aServiceStatus)
-	{
-	INFO_PRINTF2(_L("CSpudUnitTestStepBase::WaitForNextServiceNotificationStatus: aServiceStatus = %d"), aServiceStatus);
-	
-	// the implementation of RPdpFsmInterface::Input that is called by the Etel driver will complete the iEtelDriverServiceNotificationStatus request
-	User::WaitForRequest(iListener->iEtelDriverServiceNotificationStatus);
-	
-	INFO_PRINTF2(_L("CSpudUnitTestStepBase::WaitForNextServiceNotificationStatus: aServiceStatus = %d"), aServiceStatus);
-	// make sure the parameters are as expected
-	TEST(iListener->iEtelDriverServiceNotificationStatus == KErrNone);
-	TEST(iListener->iPacketServiceStatus == aServiceStatus);
-	
-	iListener->iEtelDriverServiceNotificationStatus = KRequestPending;
-	}
-
-/**
- Calling this will instruct the CTestRequestListener to call REtelDriverInput::Input on SPUDTEL
-*/
-void CSpudFsmUnitTestStepBase::FsmInputRequest(TContextId aPdpId, TInt aOperation, TInt aParam)
-	{
-	INFO_PRINTF4(_L("CSpudUnitTestStepBase::FsmInputRequest: aPdpId = %d, aOperation = %d, aParam = %d"), aPdpId, aOperation, aParam);
-
-	// wait until iListener to finish with the iControlData member so that 2 requests
-	// immediately after one another will still work
-	User::WaitForRequest(iListener->iReadyForInputRequest);
-	iListener->iReadyForInputRequest = KRequestPending;
-
-	// set the parameters to pass to REtelDriverInput::Input
-	iListener->iFsmInputRequestData.iPdpId = aPdpId;
-	iListener->iFsmInputRequestData.iOperation = aOperation;
-	iListener->iFsmInputRequestData.iParam = aParam;
-
-	// complete iListener's status, causing its RunL to call Input on SPUDTEL
-	TRequestStatus *status = &iListener->iStatus;
-	iActiveSchedulerThread.RequestComplete(status, CInputRequestListener::EFsmInputRequest);
-	}
-
-/**
- Wait for MSpudManInterface::Input to be called with a non-notification event
-*/
-void CSpudFsmUnitTestStepBase::WaitForFsmInputResponse(TInt aPdpId, TInt aEvent, TInt aParam)
-	{
-	INFO_PRINTF4(_L("CSpudUnitTestStepBase::WaitForFsmInputResponse: aPdpId = %d, aOperation = %d, aParam = %d"), aPdpId, aEvent, aParam);
-	
-	// the implementation of MSpudManInterface::Input that is called by the Etel driver will complete the iFsmInputResponseStatus request
-	User::WaitForRequest(iListener->iFsmInputResponseStatus);
-	
-	// make sure the parameters are as expected
-	TEST(iListener->iFsmInputResponseStatus == KErrNone);
-	TEST(iListener->iFsmInputResponseData.iPdpId == aPdpId);
-	TEST(iListener->iFsmInputResponseData.iEvent == aEvent);
-	TEST(iListener->iFsmInputResponseData.iParam == aParam);
-	
-	iListener->iFsmInputResponseStatus = KRequestPending;
-	}
-
-
-void CSpudFsmUnitTestStepBase::FsmObjectCreate(TContextId aPdpId)
-    {
-	INFO_PRINTF2(_L("CSpudUnitTestStepBase::FsmObjectCreate(aPdpId = %d)"), aPdpId);
-
-	// wait until iListener to finish with the iControlData member so that 2 requests
-	// immediately after one another will still work
-	//
-	User::WaitForRequest(iListener->iReadyForInputRequest);
-	iListener->iReadyForInputRequest = KRequestPending;
-
-	// Set the parameters to pass to CPdpFsmFactory
-	//
-	iListener->iFsmInputRequestData.iPdpId = aPdpId;
-
-	// complete iListener's status, causing its RunL to call Input on SPUDTEL
-	TRequestStatus *status = &iListener->iStatus;
-	iActiveSchedulerThread.RequestComplete(status, CInputRequestListener::EFsmObjectCreate);
-    }
-    
-    
-void CSpudFsmUnitTestStepBase::WaitForFsmObjectCreateResponse(TInt aPdpId)
-    {
-	INFO_PRINTF2(_L("CSpudUnitTestStepBase::WaitForEFsmObjectCreateRespons(aPdpId = %d)"), aPdpId);
-	
-	// The Test listener will complete the iFsmObjectCreateResponse request.
-	//
-	User::WaitForRequest(iListener->iFsmObjectCreateResponse);
-	
-
-	// Make sure the parameters are as expected
-	
-	TEST(iListener->iFsmObjectCreateResponse == KErrNone);
-
-
-	TEST(iListener->iFsmInputResponseData.iPdpId == aPdpId);
-
-	iListener->iFsmObjectCreateResponse = KRequestPending;
-	
-    }
-
-
-/**
- Wait for MSpudManInterface::Input to be called with aOperation KContextBlockedEvent
-*/
-void CSpudFsmUnitTestStepBase::WaitForFsmSuspendedNotification(TContextId aPdpId)
-	{
-	INFO_PRINTF2(_L("CSpudUnitTestStepBase::WaitForFsmSuspendedNotification: aPdpId = %d"), aPdpId);
-	
-	// the implementation of MSpudManInterface::Input that is called by the Etel driver will complete the iFsmContextSuspendedStatus request
-	User::WaitForRequest(iListener->iFsmContextSuspendedStatus);
-	
-	// make sure the parameters are as expected
-	TEST(iListener->iFsmContextSuspendedStatus == KErrNone);
-	TEST(iListener->iContextBlockedEventPdpId == aPdpId);
-	
-	iListener->iFsmContextSuspendedStatus = KRequestPending;
-	}
-
-/**
- Wait for MSpudManInterface::Input to be called with aOperation KContextUnblockedEvent
-*/
-void CSpudFsmUnitTestStepBase::WaitForFsmResumedNotification(TContextId aPdpId)
-	{
-	INFO_PRINTF2(_L("CSpudUnitTestStepBase::WaitForEtelDriverInputResponse: aPdpId = %d"), aPdpId);
-	
-	// the implementation of MSpudManInterface::Input that is called by the Etel driver will complete the iFsmContextResumedStatus request
-	User::WaitForRequest(iListener->iFsmContextResumedStatus);
-	
-	// make sure the parameters are as expected
-	TEST(iListener->iFsmContextResumedStatus == KErrNone);
-	TEST(iListener->iContextUnblockedEventPdpId == aPdpId);
-	
-	iListener->iFsmContextResumedStatus = KRequestPending;
-	}
-	
-/**
- Wait for MSpudManInterface::Input to be called with aOperation KNetworkStatusEvent
-*/
-void CSpudFsmUnitTestStepBase::WaitForFsmServiceNotificationStatus()
-	{
-	INFO_PRINTF1(_L("CSpudUnitTestStepBase::WaitForGivenFsmServiceNotificationStatus"));
-	
-	// the implementation of MSpudManInterface::Input that is called by the Etel driver will complete the iFsmNetworkStatusStatus request
-	User::WaitForRequest(iListener->iFsmNetworkStatusStatus);
-	
-	// make sure the parameters are as expected
-	TEST(iListener->iFsmNetworkStatusStatus == KErrNone);
-	// already checked iPdpId and iStatus from exiting condition of do while loop
-	
-	iListener->iFsmNetworkStatusStatus = KRequestPending;
-	}
-
-/**
- Wait for MSpudManInterface::Input to be called with aOperation KContextParametersChangeEvent
-*/
-void CSpudFsmUnitTestStepBase::WaitForFsmContextConfigNotification(TContextId aPdpId, const RPacketContext::TContextConfigGPRS& aContextConfig)
-	{
-	INFO_PRINTF2(_L("CSpudUnitTestStepBase::WaitForFsmContextConfigNotification: aPdpId = %d"), aPdpId);
-	
-	// the implementation of MSpudManInterface::Input that is called by the Etel driver will complete the iFsmContextParameterChangeStatus request
-	User::WaitForRequest(iListener->iFsmContextParameterChangeStatus);
-	
-	// make sure the parameters are as expected
-	TEST(iListener->iFsmContextParameterChangeStatus == KErrNone);
-	TEST(iListener->iContextParametersEventData.iPdpId == aPdpId);
-	TEST(CompareContextConfigGPRS(aContextConfig, iListener->iContextParametersEventData.iContextConfig));
-	
-	iListener->iFsmContextParameterChangeStatus = KRequestPending;
-	}
-	
-/**
- Wait for MSpudManInterface::Input to be called with aOperation KContextParametersChangeEvent
-*/
-void CSpudFsmUnitTestStepBase::WaitForFsmQosChangeNotification(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Negotiated& aQosParams)
-	{
-	INFO_PRINTF2(_L("CSpudUnitTestStepBase::WaitForFsmQosChangeNotification: aPdpId = %d"), aPdpId);
-	
-	// the implementation of MSpudManInterface::Input that is called by the Etel driver will complete the iFsmContextParameterChangeStatus request
-	User::WaitForRequest(iListener->iFsmContextParameterChangeStatus);
-	
-	// make sure the parameters are as expected
-	TEST(iListener->iFsmContextParameterChangeStatus == KErrNone);
-	TEST(iListener->iContextParametersEventData.iPdpId == aPdpId);
-	TEST(CompareUMTSQoSNeg(aQosParams, iListener->iContextParametersEventData.iNegotiated.NegotiatedQoSR99_R4()));
-	
-	iListener->iFsmContextParameterChangeStatus = KRequestPending;
-	}
-
-
-/**
- Wait for context aPacketContext to have the given status
-*/
-void CSpudFsmUnitTestStepBase::WaitForGivenContextStatus(RPacketContext& aPacketContext, RPacketContext::TContextStatus aStatus)
-	{
-	INFO_PRINTF2(_L("CSpudUnitTestStepBase::WaitForGivenContextStatus: aStatus = %d"), aStatus);
-	
- 	TRequestStatus status;
-	RPacketContext::TContextStatus contextStatus = RPacketContext::EStatusUnknown;
-	RPacketContext::TContextStatus contextStatus1 = RPacketContext::EStatusUnknown;
-
-	aPacketContext.NotifyStatusChange(status, contextStatus);
-	aPacketContext.GetStatus(contextStatus1);
-	INFO_PRINTF2(_L("CSpudUnitTestStepBase::WaitForGivenContextStatus: contextStatus1 = %d"), contextStatus1);
-	if (contextStatus1 != RPacketContext::EStatusDeleted)
-		{
-		while (contextStatus != aStatus)
-			{
-			User::WaitForRequest(status);
-			INFO_PRINTF2(_L("CSpudUnitTestStepBase::WaitForGivenContextStatus: contextStatus = %d"), contextStatus);
-			TEST(status == KErrNone);
-			}
-		}
-	}
--- a/telephonyprotocols/umtsgprsscpr/Test/te_spud/testdata/Spud_config.txt	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,559 +0,0 @@
-[test1]
-# 
-# The RPacketContext::TContextConfigGPRS parameters for this test step
-# The parameters are identical to those assigned in the method DefaultTestContextConfigGPRS
-SetContextConfigGPRS= 1, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, 1, 1, USER1, PASSWORD1, CHALLENGE1, RESPONSE1, PRIMARYSERVER1, SECONDARYSERVER1, 1
-
-# 
-# The context configuration items for this test step
-# All of the contexts are set-up to have no pauses or errors when activating, deactivating or deleting
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = PRIMARY2, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = PRIMARY3, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = SECONDARY1, 0, 0, 0, 0, 0, 0, 0
-
-# 
-# The TTFTInfo TFT filters for this test step
-# The following entry corresponds to values assigned by the method DefaultPacketFilter1
-TFTfilter = 	0, 1, 0.0.0.0.0.0.0.0.0.0.255.255.1.1.1.1, 0.0.0.0.0.0.0.0.0.0.255.255.255.255.255.255, 1, 1, 1, 1, 1, 1, 1, 1
-# The following entry corresponds to values assigned by the method DefaultPacketFilter2
-TFTfilter = 	1, 2, 0.0.0.0.0.0.0.0.0.0.255.255.1.1.1.1, 0.0.0.0.0.0.0.0.0.0.255.255.255.255.255.255, 2, 2, 2, 2, 2, 2, 2, 2
-# The following entry corresponds to values assigned by the method DefaultPacketFilter3
-TFTfilter = 	2, 3, 0.0.0.0.0.0.0.0.0.0.255.255.1.1.1.1, 0.0.0.0.0.0.0.0.0.0.255.255.255.255.255.255, 3, 3, 3, 3, 3, 3, 3, 3
-
-# 
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-# When the value 0 is published to KPSSimtsyPacketContextStatusChange the context will be suspended (status = EStatusSuspended = 5)
-NotifyContextStatusChange = PRIMARY1, 0, 5
-# When the value 1 is published to KPSSimtsyPacketContextStatusChange the context will be resumed (status = EStatusActive = 3)
-NotifyContextStatusChange = PRIMARY1, 0, 3
-
-# 
-# QoS profiles for this test step
-# The following entries are the requested profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Requested for all 3 contexts
-QosProfileReqR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2
-QosProfileReqR99 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2
-QosProfileReqR99 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2
-
-QosProfileReqR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00
-QosProfileReqR5 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00
-QosProfileReqR5 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00
-
-# The following entries correspond to the values assigned by the method SecondQoSR99_R4Requested
-QosProfileReqR99 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1
-QosProfileReqR99 = PRIMARY2, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1
-QosProfileReqR99 = PRIMARY3, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1
-QosProfileReqR99 = SECONDARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1
-
-QosProfileReqR5 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x00, 0x00
-QosProfileReqR5 = PRIMARY2, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x00, 0x00
-QosProfileReqR5 = PRIMARY3, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x00, 0x00
-QosProfileReqR5 = SECONDARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x00, 0x00
-
-# The following entries are the negotiated profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Negotiated for all 3 contexts
-QosProfileNegR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2
-QosProfileNegR99 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2
-QosProfileNegR99 = PRIMARY3, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2
-QosProfileNegR99 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2
-
-QosProfileNegR5= PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00
-QosProfileNegR5 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00
-QosProfileNegR5 = PRIMARY3, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00
-QosProfileNegR5 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00
-# The following entries correspond to the values assigned by the method SecondQoSR99_R4Negotiated for all 3 contexts
-QosProfileNegR99 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1
-QosProfileNegR99 = PRIMARY2, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1
-QosProfileNegR99 = SECONDARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1
-
-QosProfileNegR5 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 0x00, 0x00
-QosProfileNegR5 = PRIMARY2, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 0x00, 0x00
-QosProfileNegR5 = SECONDARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 0x00, 0x00
-
-
-# 
-# The InitialiseContext parameters for this test step
-# The following entries correspond to the values assigned by the method DefaultTestDataChannel
-CommSetup= SIMTSYLOOPBACK.CSY, SIMTSYLOOPBACK::0, 18, 0
-
-[test3]
-# 
-# Set-up calls to SetConfig to fail for the first primary context
-# The -1 sets up SetConfig to fail every time, and the -2 causes SetConfig to fail with error KErrGeneral (-2)
-SetConfigFail = PRIMARY1, -1, -2
-
-[test6]
-# 
-# The RPacketContext::TContextConfigGPRS parameters for this test step
-# The parameters are identical to those assigned in the method DefaultTestContextConfigGPRS
-SetContextConfigGPRS= 1, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, 1, 1, USER1, PASSWORD1, CHALLENGE1, RESPONSE1, PRIMARYSERVER1, SECONDARYSERVER1, 1
-
-# 
-# There are no QosProfileReqR99 entries. This will make a call to SetProfileParameters to fail.
-
-[test7]
-# 
-# The RPacketContext::TContextConfigGPRS parameters for this test step
-# The parameters are identical to those assigned in the method DefaultTestContextConfigGPRS
-SetContextConfigGPRS= 1, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, 1, 1, USER1, PASSWORD1, CHALLENGE1, RESPONSE1, PRIMARYSERVER1, SECONDARYSERVER1, 1
-
-# 
-# QoS profiles for this test step
-# The following entries are the requested profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Requested
-QosProfileReqR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2
-
-QosProfileReqR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00
-# The following entries are the negotiated profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Negotiated
-QosProfileNegR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2
-
-QosProfileNegR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00
-
-# 
-# Set-up calls to modify the TFT to fail for the first primary context
-# The first call to DeleteTFT will fail with error code KErrGeneral (-2) (and subsequent calls will pass)
-DeleteTftFail = PRIMARY1, 1, -2
-# The first call to CreateNewTFT will fail with error code KErrGeneral (-2) (and subsequent calls will pass)
-CreateTftConfig = PRIMARY1, 1, -2
-# The first call to AddPacketFilter will fail with error code KErrGeneral (-2) (and subsequent calls will pass)
-AddPacketFilter = PRIMARY1, 1, -2
-
-[test8]
-# 
-# The context configuration items for this test step
-# Set-up the first primary context to fail activating with error code KErrGeneral (-2)
-R99ContextConfig = PRIMARY1, 0, -2, 0, 0, 0, 0, 0
-
-# 
-# The RPacketContext::TContextConfigGPRS parameters for this test step
-# The parameters are identical to those assigned in the method DefaultTestContextConfigGPRS
-SetContextConfigGPRS= 1, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, 1, 1, USER1, PASSWORD1, CHALLENGE1, RESPONSE1, PRIMARYSERVER1, SECONDARYSERVER1, 1
-
-# 
-# QoS profiles for this test step
-# The following entries are the requested profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Requested
-QosProfileReqR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2
-
-QosProfileReqR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00
-
-
-# The following entries are the negotiated profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Negotiated
-QosProfileNegR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2
-
-QosProfileNegR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00
-
-[test14]
-# 
-# The context configuration items for this test step
-# Set-up the first primary context to fail activating with error code KErrGeneral (-2)
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0
-
-# 
-# The RPacketContext::TContextConfigGPRS parameters for this test step
-# The parameters are identical to those assigned in the method DefaultTestContextConfigGPRS
-SetContextConfigGPRS= 1, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, 1, 1, USER1, PASSWORD1, CHALLENGE1, RESPONSE1, PRIMARYSERVER1, SECONDARYSERVER1, 1
-
-# 
-# QoS profiles for this test step
-# The following entries are the requested profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Requested
-QosProfileReqR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2
-
-QosProfileReqR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00
-
-# The following entries are the negotiated profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Negotiated
-QosProfileNegR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2
-
-QosProfileNegR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00
-
-# 
-# The InitialiseContext parameters for this test step
-# The first 4 elements correspond to the values assigned by the method DefaultTestDataChannel
-# The last two set up the first call to InitialiseContext for the first primary context to fail with error code KErrGeneral (-2)
-CommSetup= SIMTSYLOOPBACK.CSY, SIMTSYLOOPBACK::0, 18, 0, PRIMARY1, 0, 1, -2
-
-[test9]
-# 
-# The context configuration items for this test step
-# Set-up the first primary context to fail de-activating with error code KErrGeneral (-2)
-R99ContextConfig = PRIMARY1, 0, 0, 0, -2, 0, 0, 0
-
-# 
-# The RPacketContext::TContextConfigGPRS parameters for this test step
-# The parameters are identical to those assigned in the method DefaultTestContextConfigGPRS
-SetContextConfigGPRS= 1, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, 1, 1, USER1, PASSWORD1, CHALLENGE1, RESPONSE1, PRIMARYSERVER1, SECONDARYSERVER1, 1
-
-# The following entry is the requested profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Requested
-QosProfileReqR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2
-
-QosProfileReqR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00
-# The following entry is the negotiated profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Negotiated
-QosProfileNegR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2
-QosProfileNegR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00
-[test10]
-# 
-# The context configuration items for this test step
-# Set-up the first primary context to fail deleting with error code KErrGeneral (-2)
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, -2, 0
-
-# 
-# The RPacketContext::TContextConfigGPRS parameters for this test step
-# The parameters are identical to those assigned in the method DefaultTestContextConfigGPRS
-SetContextConfigGPRS= 1, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, 1, 1, USER1, PASSWORD1, CHALLENGE1, RESPONSE1, PRIMARYSERVER1, SECONDARYSERVER1, 1
-
-# The following entry is the requested profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Requested
-QosProfileReqR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2
-
-QosProfileReqR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00
-# The following entry is the negotiated profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Negotiated
-QosProfileNegR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2
-QosProfileNegR5  = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00
-[test11]
-# 
-# The context configuration items for this test step
-# All of the contexts are set-up to have no pauses or errors when activating, deactivating or deleting
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = PRIMARY2, 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
-
-# 
-# The TTFTInfo TFT filters for this test step
-# The following entry corresponds to values assigned by the method DefaultPacketFilter1
-TFTfilter = 0, 1, 0.0.0.0.0.0.0.0.0.0.255.255.1.1.1.1, 0.0.0.0.0.0.0.0.0.0.255.255.255.255.255.255, 1, 1, 1, 1, 1, 1, 1, 1
-# The following entry corresponds to values assigned by the method DefaultPacketFilter2
-TFTfilter = 1, 2, 0.0.0.0.0.0.0.0.0.0.255.255.1.1.1.1, 0.0.0.0.0.0.0.0.0.0.255.255.255.255.255.255, 2, 2, 2, 2, 2, 2, 2, 2
-
-# 
-# QoS profiles for this test step
-# The following entries are the requested profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Requested for all 3 contexts
-QosProfileReqR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2
-QosProfileReqR99 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2
-QosProfileReqR99 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2
-QosProfileReqR99 = SECONDARY2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2
-
-QosProfileReqR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00
-QosProfileReqR5 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00
-QosProfileReqR5 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00
-QosProfileReqR5 = SECONDARY2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00
-# The following entries correspond to the values assigned by the method SecondQoSR99_R4Requested
-QosProfileReqR99 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1
-QosProfileReqR99 = SECONDARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1
-QosProfileReqR99 = PRIMARY2, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1
-QosProfileReqR99 = SECONDARY2, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1
-
-
-QosProfileReqR5 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x00, 0x00
-QosProfileReqR5= SECONDARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x00, 0x00
-QosProfileReqR5 = PRIMARY2, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x00, 0x00
-QosProfileReqR5 = SECONDARY2, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x00, 0x00
-
-# The following entries are the negotiated profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Negotiated for all 3 contexts
-QosProfileNegR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2
-QosProfileNegR99 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2
-QosProfileNegR99 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2
-QosProfileNegR99 = SECONDARY2, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2
-
-
-QosProfileNegR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00
-QosProfileNegR5 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00
-QosProfileNegR5 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00
-QosProfileNegR5 = SECONDARY2, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00
-
-# The following entries correspond to the values assigned by the method SecondQoSR99_R4Negotiated for all 3 contexts
-QosProfileNegR99 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1
-QosProfileNegR99 = SECONDARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1
-QosProfileNegR99 = PRIMARY2, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1
-QosProfileNegR99 = SECONDARY2, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1
-
-QosProfileNegR5 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 0x00, 0x00
-QosProfileNegR5 = SECONDARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 0x00, 0x00
-QosProfileNegR5 = PRIMARY2, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 0x00, 0x00
-QosProfileNegR5 = SECONDARY2, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 0x00, 0x00
-
-# 
-# The InitialiseContext parameters for this test step
-# The following entries correspond to the values assigned by the method DefaultTestDataChannel
-CommSetup= SIMTSYLOOPBACK.CSY, SIMTSYLOOPBACK::0, 18, 0
-
-# 
-# The RPacketContext::TContextConfigGPRS parameters for this test step
-# The parameters are identical to those assigned in the method DefaultTestContextConfigGPRS
-SetContextConfigGPRS= 1, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, 1, 1, USER1, PASSWORD1, CHALLENGE1, RESPONSE1, PRIMARYSERVER1, SECONDARYSERVER1, 1
-
-[test12]
-
-#
-# Set up the second primary to pause during activate and delete so there is a chance to cancel the request. Also, do not connect to NT Ras.
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = PRIMARY2, 10, 0, 0, 0, 10, 0, 0
-R99ContextConfig = SECONDARY1, 0, 0, 0, 0, 0, 0, 0
-
-#
-# SetConfig delay is set to 1 so there is a chance to cancel setting QOS
-SetConfigDelay=1
-
-# 
-# The RPacketContext::TContextConfigGPRS parameters for this test step
-# The parameters are identical to those assigned in the method DefaultTestContextConfigGPRS
-SetContextConfigGPRS= 1, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, 1, 1, USER1, PASSWORD1, CHALLENGE1, RESPONSE1, PRIMARYSERVER1, SECONDARYSERVER1, 1
-
-# 
-# QoS profiles for this test step
-# The following entries are the requested profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Requested
-QosProfileReqR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2
-QosProfileReqR99 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2
-
-
-QosProfileReqR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00
-QosProfileReqR5 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00
-
-# The following entries are the negotiated profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Negotiated
-QosProfileNegR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2
-QosProfileNegR99 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2
-
-
-QosProfileNegR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00
-QosProfileNegR5 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00
-
-# 
-# The TTFTInfo TFT filters for this test step
-# The following entry corresponds to values assigned by the method DefaultPacketFilter1
-TFTfilter = 0, 1, 0.0.0.0.0.0.0.0.0.0.255.255.1.1.1.1, 0.0.0.0.0.0.0.0.0.0.255.255.255.255.255.255, 1, 1, 1, 1, 1, 1, 1, 1
-# The following entry corresponds to values assigned by the method DefaultPacketFilter2
-TFTfilter = 1, 2, 0.0.0.0.0.0.0.0.0.0.255.255.1.1.1.1, 0.0.0.0.0.0.0.0.0.0.255.255.255.255.255.255, 2, 2, 2, 2, 2, 2, 2, 2
-
-# 
-# The InitialiseContext parameters for this test step
-# The first 4 elements (on all 3 entries) correspond to the values assigned by the method DefaultTestDataChannel
-CommSetup= SIMTSYLOOPBACK.CSY, SIMTSYLOOPBACK::0, 18, 0, PRIMARY1
-# The last element of the next 2 entries mean any calls to InitialiseContext will have a delay of 1 second so there is a chance to cancel creating contexts
-CommSetup= SIMTSYLOOPBACK.CSY, SIMTSYLOOPBACK::0, 18, 0, PRIMARY2, 0, 0, 0, 1
-CommSetup= SIMTSYLOOPBACK.CSY, SIMTSYLOOPBACK::0, 18, 0, SECONDARY1, 0, 0, 0, 1
-
-# 
-# The CreateNewTFT entries for this test step
-# The last entry causes a call to CreateNewTFT to have a delay of 1 second so there is a chance to cancel setting TFT
-CreateTftConfig = PRIMARY1, 0, 0, 1
-
-[test102]
-# 
-# Set-up calls to SetConfig to fail for the first primary context
-# The -1 sets up SetConfig to fail every time, and the -2 causes SetConfig to fail with error KErrGeneral (-2)
-SetConfigFail = PRIMARY1, -1, -2
-
-[test103]
-# 
-# The RPacketContext::TContextConfigGPRS parameters for this test step
-# The parameters are identical to those assigned in the method DefaultTestContextConfigGPRS
-SetContextConfigGPRS= 1, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, 1, 1, USER1, PASSWORD1, CHALLENGE1, RESPONSE1, PRIMARYSERVER1, SECONDARYSERVER1, 1
-
-# 
-# There are no QosProfileReqR99 entries. This will make a call to SetProfileParameters to fail.
-
-[test104]
-# 
-# The context configuration items for this test step
-# Set-up the first primary context to fail activating with error code KErrGeneral (-2)
-R99ContextConfig = PRIMARY1, 0, -2, 0, 0, 0, 0, 0
-
-# 
-# The RPacketContext::TContextConfigGPRS parameters for this test step
-# The parameters are identical to those assigned in the method DefaultTestContextConfigGPRS
-SetContextConfigGPRS= 1, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, 1, 1, USER1, PASSWORD1, CHALLENGE1, RESPONSE1, PRIMARYSERVER1, SECONDARYSERVER1, 1
-
-[test105]
-# 
-# QoS profiles for this test step
-# The following entries are the requested profiles - they correspond to the values assigned by the method DefaultQoSR99_R4Requested
-QosProfileReqR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2
-QosProfileReqR99 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1
-
-QosProfileReqR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00
-QosProfileReqR5 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x00, 0x00
-
-
-# The following entries correspond to the values assigned by the method SecondQoSR99_R4Requested
-QosProfileNegR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2
-QosProfileNegR99 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1
-
-QosProfileNegR5= PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00
-QosProfileNegR5 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 0x00, 0x00
-
-# 
-# The context configuration items for this test step
-# All of the contexts are set-up to have no pauses or errors when activating, deactivating or deleting
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0
-
-# 
-# The RPacketContext::TContextConfigGPRS parameters for this test step
-# The parameters are identical to those assigned in the method DefaultTestContextConfigGPRS
-SetContextConfigGPRS= 1, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, 1, 1, USER1, PASSWORD1, CHALLENGE1, RESPONSE1, PRIMARYSERVER1, SECONDARYSERVER1, 1
-
-# 
-# The InitialiseContext parameters for this test step
-# The first 4 elements (on both entries) correspond to the values assigned by the method DefaultTestDataChannel
-CommSetup= SIMTSYLOOPBACK.CSY, SIMTSYLOOPBACK::0, 18, 0, PRIMARY1
-# The last two elements set up the first call to InitialiseContext on the first secondary context to fail with error code KErrGeneral (-2)
-CommSetup= SIMTSYLOOPBACK.CSY, SIMTSYLOOPBACK::0, 18, 0, SECONDARY1, 0, 1, -2
-
-[test106]
-SetProfileFail = SECONDARY1, -1, -2
-
-# 
-# Set-up calls to modify the TFT to fail for the first primary context
-# The first call to DeleteTFT will fail with error code KErrGeneral (-2) (and subsequent calls will pass)
-DeleteTftFail = SECONDARY1, 1, -2
-# The first call to CreateNewTFT will fail with error code KErrGeneral (-2) (and subsequent calls will pass)
-CreateTftFail = SECONDARY1, 1, -2
-# The first call to AddPacketFilter will fail with error code KErrGeneral (-2) (and subsequent calls will pass)
-AddPacketFilter = SECONDARY1, 1, -2
-
-# 
-# The context configuration items for this test step
-# Set-up the first primary context to proceed normally
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0
-# Set-up the first secondary context to fail activating with error code KErrGeneral (-2)
-R99ContextConfig = SECONDARY1, 0, -2, 0, 0, 0, 0, 0
-
-# 
-# QoS profiles for this test step
-# The following entries are the requested profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Requested for both contexts
-QosProfileReqR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2
-QosProfileReqR99 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2
-
-QosProfileReqR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00
-QosProfileReqR5 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00
-
-# The following entries correspond to the values assigned by the method SecondQoSR99_R4Requested
-QosProfileReqR99 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1
-QosProfileReqR99 = SECONDARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1
-
-QosProfileReqR5 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x00, 0x00
-QosProfileReqR5 = SECONDARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x00, 0x00
-
-# The following entries are the negotiated profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Negotiated for both contexts
-QosProfileNegR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2
-QosProfileNegR99 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2
-
-QosProfileNegR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00
-QosProfileNegR5 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00
-
-# The following entries correspond to the values assigned by the method SecondQoSR99_R4Negotiated for all 3 contexts
-QosProfileNegR99 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1
-QosProfileNegR99 = SECONDARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1
-
-QosProfileNegR5 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 0x00, 0x00
-QosProfileNegR5 = SECONDARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 0x00, 0x00
-
-
-
-# 
-# The RPacketContext::TContextConfigGPRS parameters for this test step
-# The parameters are identical to those assigned in the method DefaultTestContextConfigGPRS
-SetContextConfigGPRS= 1, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, 1, 1, USER1, PASSWORD1, CHALLENGE1, RESPONSE1, PRIMARYSERVER1, SECONDARYSERVER1, 1
-
-[test107]
-SetProfileFail = SECONDARY1, -1, -2
-
-DeleteTftFail = SECONDARY1, 1, -2
-CreateTftFail = SECONDARY1, 1, -2
-AddPacketFilter = SECONDARY1, 1, -2
-
-# 
-# The context configuration items for this test step
-# All of the contexts are set-up to have no pauses or errors when activating, deactivating or deleting
-R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0
-R99ContextConfig = SECONDARY1, 0, 0, 0, 0, 0, 0, 0
-
-# 
-# The InitialiseContext parameters for this test step
-# The following entries correspond to the values assigned by the method DefaultTestDataChannel
-CommSetup= SIMTSYLOOPBACK.CSY, SIMTSYLOOPBACK::0, 18, 0
-
-# 
-# QoS profiles for this test step
-# The following entries are the requested profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Requested for both contexts
-QosProfileReqR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2
-QosProfileReqR99 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2
-
-QosProfileReqR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00
-QosProfileReqR5 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00
-
-# The following entries correspond to the values assigned by the method SecondQoSR99_R4Requested
-QosProfileReqR99 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1
-QosProfileReqR99 = SECONDARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1
-
-
-QosProfileReqR5 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x00, 0x00
-QosProfileReqR5 = SECONDARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x00, 0x00
-
-# The following entries are the negotiated profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Negotiated for both contexts
-QosProfileNegR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2
-QosProfileNegR99 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2
-
-QosProfileNegR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00
-QosProfileNegR5 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00
-
-# The following entries correspond to the values assigned by the method SecondQoSR99_R4Negotiated for all 3 contexts
-QosProfileNegR99 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1
-QosProfileNegR99 = SECONDARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1
-
-QosProfileNegR5 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 0x00, 0x00
-QosProfileNegR5 = SECONDARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 0x00, 0x00
-
-# 
-# The RPacketContext::TContextConfigGPRS parameters for this test step
-# The parameters are identical to those assigned in the method DefaultTestContextConfigGPRS
-SetContextConfigGPRS= 1, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, 1, 1, USER1, PASSWORD1, CHALLENGE1, RESPONSE1, PRIMARYSERVER1, SECONDARYSERVER1, 1
-
-[test108]
-# 
-# Configure the context's status to be changed using publish and subscribe
-NotifyContextStatusChangeType = PublishSubscribe
-# NotifyContextStatusChange <iContextName>, <iDuration>, <iStatus>
-# When the value 0 is published to KPSSimtsyPacketContextStatusChange the first primary context will be deleted (status = EStatusDeleted = 6)
-NotifyContextStatusChange = PRIMARY1, 0, 6
-# When the value 1 is published to KPSSimtsyPacketContextStatusChange the second primary context will be deleted (status = EStatusDeleted = 6)
-NotifyContextStatusChange = PRIMARY2, 0, 6
-
-# 
-# The RPacketContext::TContextConfigGPRS parameters for this test step
-# The parameters are identical to those assigned in the method DefaultTestContextConfigGPRS
-SetContextConfigGPRS= 1, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, 1, 1, USER1, PASSWORD1, CHALLENGE1, RESPONSE1, PRIMARYSERVER1, SECONDARYSERVER1, 1
-
-# 
-# The context configuration items for this test step
-# Set-up the first primary context to pause for a long period when activating, so that there is a pause where the simtsy can delete the context
-R99ContextConfig = PRIMARY1, 999, 0, 0, 0, 0, 0, 0
-# Set-up the second primary context to have no pauses or errors when activating, deactivating or deleting
-R99ContextConfig = PRIMARY2, 0, 0, 0, 0, 0, 0, 0
-
-# 
-# QoS profiles for this test step
-# The following entries are the requested profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Requested for all 3 contexts
-QosProfileReqR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2
-QosProfileReqR99 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2
-
-QosProfileReqR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00
-QosProfileReqR5 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00
-
-# The following entries correspond to the values assigned by the method SecondQoSR99_R4Requested
-QosProfileReqR99 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1
-QosProfileReqR99 = PRIMARY2, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1
-
-QosProfileReqR5 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x00, 0x00
-QosProfileReqR5 = PRIMARY2, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x00, 0x00
-
-# The following entries are the negotiated profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Negotiated for all 3 contexts
-QosProfileNegR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2
-QosProfileNegR99 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2
-
-QosProfileNegR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00
-QosProfileNegR5 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00
-
-# The following entries correspond to the values assigned by the method SecondQoSR99_R4Negotiated for all 3 contexts
-QosProfileNegR99 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1
-QosProfileNegR99 = PRIMARY2, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1
-
-QosProfileNegR5= PRIMARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 0x00, 0x00
-QosProfileNegR5 = PRIMARY2, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 0x00, 0x00
--- a/telephonyprotocols/umtsgprsscpr/group/UmtsGprsSCPR.iby	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 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 __UMTSGPRSSCPR_IBY__
-#define __UMTSGPRSSCPR_IBY__
-
-REM Umts/Gprs Subconnection Provider
-
-#ifdef _DEBUG
-ECOM_PLUGIN_UDEB(UmtsGprsSCPR.dll,1020D45E.rss)
-#else
-ECOM_PLUGIN(UmtsGprsSCPR.dll,1020D45E.rss)
-#endif
-
-#endif 
--- a/telephonyprotocols/umtsgprsscpr/group/UmtsGprsSCPR.mmp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-// Copyright (c) 2004-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:
-// UmtsGprsSCPR.MMP Umts/Gprs Subconnection Provider ECOM plugin
-// 
-//
-
-/**
- @file
-*/
-
-
-TARGET          umtsgprsscpr.dll
-TARGETTYPE      PLUGIN
-
-UID             0x10009D8D 0x1020D45E
-VENDORID 	    0x70000001
-
-MACRO           _INFO_LOG
-
-
-SOURCEPATH      ../src
-SOURCE          UmtsGprs_defaultSubconnProv.cpp
-SOURCE          UmtsGprs_subconnProv.cpp 
-SOURCE          UmtsGprs_subconnProvFactory.cpp
-SOURCE          PdpFsmRequest.cpp
-SOURCE          RSpudManInterface.cpp
-
-START RESOURCE 1020D45E.rss
-TARGET umtsgprsscpr.rsc
-END
-
-SOURCEPATH      ../spudfsm/src
-SOURCE          PDPFSM.cpp
-SOURCE          cpdpfsm.cpp
-SOURCE          cpdpfsmfactory.cpp
-SOURCE          tpdpstate.cpp
-SOURCE          tpdpstatesuspended.cpp
-SOURCE          tpdpstatechangingqos.cpp
-SOURCE          tpdpstatechangingtft.cpp
-SOURCE          tpdpstateopen.cpp
-SOURCE          tpdpstatesettingqos.cpp
-SOURCE          tpdpstateinitialised.cpp
-SOURCE          tpdpstatecreatingprimary.cpp
-SOURCE          tpdpstateopeningphone.cpp
-SOURCE          tpdpstatecreatingSecondary.cpp
-SOURCE          tpdpstateactivatingsecondary.cpp
-SOURCE          tpdpstatecreatedSecondary.cpp
-SOURCE          tpdpstateactivatingprimary.cpp	
-SOURCE          tpdpstateclosing.cpp	
-SOURCE          tpdpstatesettingtft.cpp	
-SOURCE          tpdpstategettingnegqos.cpp
-SOURCE          tpdpstatemodifingactive.cpp
-SOURCE          tpdpstatestopping.cpp
-
-
-SOURCEPATH      ../spudtel/src
-SOURCE          ceteldrivercontext.cpp
-SOURCE          ceteldriverfactory.cpp
-SOURCE          cservicechangenotifier.cpp
-SOURCE          reteldriverinput.cpp
-SOURCE          eteldriverstrategies.cpp
-SOURCE          cspudcontextelem.cpp
-SOURCE          ceteldrivernotifier.cpp
-SOURCE          cpdpstatuschangenotifier.cpp
-SOURCE          cqoschangenotifier.cpp
-SOURCE          cpdpconfigchangenotifier.cpp
-
-USERINCLUDE     ../inc
-USERINCLUDE		../spudfsm/inc
-USERINCLUDE		../spudtel/inc
-
-SYSTEMINCLUDE   /epoc32/include
-SYSTEMINCLUDE   /epoc32/include/ecom
-SYSTEMINCLUDE   /epoc32/include/comms-infras
-SYSTEMINCLUDE   /epoc32/include/networking
-
-LIBRARY         euser.lib esock.lib esocksvr.lib eintsock.lib insock.lib
-LIBRARY         netmeta.lib etelpckt.lib etel.lib umtsif.lib
-#include	"comms-infras/commsdebugutility.mmh"
-
-CAPABILITY CommDD PowerMgmt ReadDeviceData WriteDeviceData TrustedUI ProtServ NetworkControl NetworkServices LocalServices ReadUserData WriteUserData
-
-
-UNPAGED
--- a/telephonyprotocols/umtsgprsscpr/group/bld.inf	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,144 +0,0 @@
-// Copyright (c) 2005-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 SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-
-PRJ_EXPORTS
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../inc/MSpudManInterface.h              /epoc32/include/networking/mspudmaninterface.h 
-#endif
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../inc/MPdpFsmInterface.h               /epoc32/include/networking/mpdpfsminterface.h
-#endif
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../inc/UmtsGprs_subconnProvFactory.h    /epoc32/include/networking/umtsgprs_subconnprovfactory.h
-#endif
-../group/UmtsGprsSCPR.iby               /epoc32/rom/include/umtsgprsscpr.iby
-
-
-PRJ_TESTEXPORTS
-
-
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/te_UmtsGprsScpr_CapTest.xml			z:/testdata/configs/te_umtsgprsscpr_captest.xml
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/te_UmtsGprsScpr_NoDefaults.xml		z:/testdata/configs/te_umtsgprsscpr_nodefaults.xml
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/TE_UmtsGprsScprLoopbackCSY.ini		z:/testdata/configs/te_umtsgprsscprloopbackcsy.ini
-
-
-// configuration 1 commdb settings //
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/te_UmtsGprsScpr.xml					z:/testdata/configs/te_umtsgprsscpr.xml
-
-
-// configuration 2 commdb settings //
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/te_UmtsGprsScpr_InvalidDefaults.xml	z:/testdata/configs/te_umtsgprsscpr_invaliddefaults.xml
-
-
-// configuration 3 commdb settings //
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/te_UmtsGprsScprNoSpud.xml			z:/testdata/configs/te_umtsgprsscprnospud.xml
-
-
-// main test scripts //
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig1.script            z:/testdata/scripts/te_umtsgprsscprconfig1.script
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig2.script            z:/testdata/scripts/te_umtsgprsscprconfig2.script
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig3.script            z:/testdata/scripts/te_umtsgprsscprconfig3.script
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig2QoSRemoved.script  z:/testdata/scripts/te_umtsgprsscprconfig2qosremoved.script
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig3QoSRemoved.script  z:/testdata/scripts/te_umtsgprsscprconfig3qosremoved.script
-
-
-// main captest script //
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_Cap_UmtsGprsScpr.script           	z:/testdata/scripts/te_cap_umtsgprsscpr.script
-
-
-// simtsy configs //
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/te_simtsy.ini							z:/testdata/configs/te_simtsy.ini
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/te_umtsgprsscpr_config.txt				z:/testdata/configs/te_umtsgprsscpr_config.txt
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/te_umtsgprsscpr_Config2.txt				z:/testdata/configs/te_umtsgprsscpr_config2.txt
-
-
-// Test case scripts and configs
-//------------------------------
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig1Case1.script z:/testdata/scripts/te_umtsgprsscprconfig1case1.script
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Config1Case1.ini z:/testdata/configs/umtsgprsscpr/config1case1.ini
-
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsSCPRconfig1case2.script z:/testdata/scripts/te_umtsgprsscprconfig1case2.script
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Config1Case2.ini z:/testdata/configs/umtsgprsscpr/config1case2.ini
-
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprconfig1case3.script z:/testdata/scripts/te_umtsgprsscprconfig1case3.script
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Config1Case3.ini z:/testdata/configs/umtsgprsscpr/config1case3.ini
-
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig1Case4.script z:/testdata/scripts/te_umtsgprsscprconfig1case4.script
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Config1Case4.ini z:/testdata/configs/umtsgprsscpr/config1case4.ini
-
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig1Case5.script z:/testdata/scripts/te_umtsgprsscprconfig1case5.script
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Config1Case5.ini z:/testdata/configs/umtsgprsscpr/config1case5.ini
-
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprconfig1case6.script z:/testdata/scripts/te_umtsgprsscprconfig1case6.script
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Config1Case6.ini z:/testdata/configs/umtsgprsscpr/config1case6.ini
-
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprconfig1case7.script z:/testdata/scripts/te_umtsgprsscprconfig1case7.script
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Config1Case7.ini z:/testdata/configs/umtsgprsscpr/config1case7.ini
-
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig1Case8.script z:/testdata/scripts/te_umtsgprsscprconfig1case8.script
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Config1Case8.ini z:/testdata/configs/umtsgprsscpr/config1case8.ini
-
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig1Case9.script z:/testdata/scripts/te_umtsgprsscprconfig1case9.script
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Config1Case9.ini z:/testdata/configs/umtsgprsscpr/config1case9.ini
-
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig1Case10.script z:/testdata/scripts/te_umtsgprsscprconfig1case10.script
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Config1Case10.ini z:/testdata/configs/umtsgprsscpr/config1case10.ini
-
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig2Case1.script z:/testdata/scripts/te_umtsgprsscprconfig2case1.script
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Config2Case1.ini z:/testdata/configs/umtsgprsscpr/config2case1.ini
-
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig2Case9.script z:/testdata/scripts/te_umtsgprsscprconfig2case9.script
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Config2Case9.ini z:/testdata/configs/umtsgprsscpr/config2case9.ini
-
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig2Case10.script z:/testdata/scripts/te_umtsgprsscprconfig2case10.script
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Config2Case10.ini z:/testdata/configs/umtsgprsscpr/config2case10.ini
-
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprconfig3case1.script z:/testdata/scripts/te_umtsgprsscprconfig3case1.script
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Config3Case1.ini z:/testdata/configs/umtsgprsscpr/config3case1.ini
-
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_Cap_UmtsGprsScprConfig1Case1.script z:/testdata/scripts/te_cap_umtsgprsscprconfig1case1.script
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Cap1Case1.ini z:/testdata/configs/umtsgprsscpr/cap1case1.ini
-
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_Cap_UmtsGprsScprConfig1case2.script z:/testdata/scripts/te_cap_umtsgprsscprconfig1case2.script
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Cap1Case2.ini z:/testdata/configs/umtsgprsscpr/cap1case2.ini
-
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_Cap_UmtsGprsScprConfig1Case4.script z:/testdata/scripts/te_cap_umtsgprsscprconfig1case4.script
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Cap1Case4.ini z:/testdata/configs/umtsgprsscpr/cap1case4.ini
-
-// IBY file
-../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/group/te_UmtsGprsScpr.iby /epoc32/rom/include/te_umtsgprsscpr.iby
-
-
-
-// Spud Unit Tests //
-../Test/te_spud/scripts/TE_SpudUnitTest.script                       z:/testdata/scripts/te_spudunittest.script
-../Test/te_spud/testdata/Spud_config.txt                             z:/testdata/configs/spud_config.txt
-
-../Test/te_spud/group/TE_SpudUnit.iby                                /epoc32/rom/include/te_spudunit.iby 
-
-
-PRJ_MMPFILES
-UmtsGprsSCPR.mmp
-
-
-PRJ_TESTMMPFILES
-../Test/te_spud/group/TE_SpudUnit.mmp
-
-
-PRJ_TESTMMPFILES
-
-#endif // SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
--- a/telephonyprotocols/umtsgprsscpr/group/networking_UmtsGprsSCPR.mrp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-component       networking_umtsgprsscpr
-source	        \sf\os\cellularsrv\telephonyprotocols\umtsgprsscpr
-binary	        \sf\os\cellularsrv\telephonyprotocols\umtsgprsscpr\group all
-exports	        \sf\os\cellularsrv\telephonyprotocols\umtsgprsscpr\group
-notes_source	\component_defs\release.src
-
-
-ipr E
-ipr T \sf\os\cellularsrv\telephonyprotocols\umtsgprsscpr\Test
-
--- a/telephonyprotocols/umtsgprsscpr/group/networking_umtsgprsscpr.history.xml	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<relnotes name="Connection Provider Plugin">
-  <purpose>
-  </purpose>
-</relnotes>
--- a/telephonyprotocols/umtsgprsscpr/inc/MPdpFsmInterface.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,163 +0,0 @@
-// Copyright (c) 2004-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:
-// The interface to the PDP Context Finite State Machine.
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-
-#ifndef MPDPFSMINTERFACE_H
-#define MPDPFSMINTERFACE_H
-
-
-#include <etelmm.h>
-#include <etelqos.h>
-#include <etelpckt.h>
-
-#include <networking/umtsnifcontrolif.h>
-#include <networking/mspudmaninterface.h>
-
-/** Maximum number of PDP contexts supported by SPUD 
- This is derived from the number of bits available for NSAPIs
- Each PDP context corresponds with a NSAPI (and each NSAPI at most maps to one primary or secondary PDP Context)
- There are 4 bits allocated for NSAPIs with values 0 - 4 being reserved, leaving 11 values for PDP contexts
- @see GSM24.008
-*/
-const TContextId KMaxPdpContexts = 11; 
-
-/** Internal pseudo-context ID meaning all contexts */
-const TContextId KAllContexts = -1;
-
-/** ID of the primary PDP context 
-Primary context is the first context created, and it can be
-created only once during Spud lifetime. 
-There is a subltly here. There is always a default context.
-This just happens to be the primary until it is deleted, at
-which point one of the secondries will become the default.
-This can happen in a network handover situation.
-This is documented in the design spec. */
-const TContextId KPrimaryContextId = 0; 
-
-
-namespace SpudMan
-{
-	enum SpudManGuQoSSignal
-	{
-		EContextStart = 0x80,
-		EContextCreate,
-		EContextDelete,
-		EContextActivate,
-		ERegisterEventHandler,
-		EContextSetEvents,
-		EContextQoSSet,
-		EContextModifyActive,
-		EContextTFTModify,
-		ENifSetDefaultQoS,
-		EStartupPrimaryContextCreation,
-		
-		// sentinal
-		ESpudManGuQoSSignalSentinal
-	};
-
-	enum SpudManSignal
-	{
-		ESetDefaultQoS = ESpudManGuQoSSignalSentinal,
-		ECreatePrimaryPDPContext,
-		ECreateSecondaryPDPContext,
-		ESuspend,
-		EResume,
-		E1ryPdpActivate,
-		ECancelContextCreate,
-		
-		EGetNegQoS,
-
-		// sentinal
-		ESpudManSignalSentinal
-	};
-
-}
-
-class MPdpFsmInterface
-/**
- * Definition of PDP Context Finite State Machine interface.
- * UmtsGprsSCPR comes with an implementation of this interface. 
- * The interface is to be used by SpudMan.
- *
- * @internalComponent
- */
- {
-public:
-	virtual void OpenL(MSpudManInterface* aSpudManInterface, TName& aName) = 0;
-	virtual void Close() = 0;
-	
-	virtual TInt Input (TContextId aPdpId, const TInt aOperation, const TInt aParam=KErrNone) = 0;
-
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-	// This is to set the status of IM CN signalling parameter
-		
-	virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR5Requested& aParam) = 0;
-	virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR5Negotiated& aParam) = 0;
-	virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR5Requested& aParam) const = 0 ;
-	virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR5Negotiated& aParam) const = 0;
-
-#else
-// !SYMBIAN_NETWORKING_UMTSR5 
-
-	virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Requested& aParam) = 0;
-	virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Negotiated& aParam) = 0;
-	virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Requested& aParam) const = 0;
-	virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Negotiated& aParam) const = 0;
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 
-
-
-
-	virtual TInt Set(TContextId aPdpId, const TTFTInfo& aParam) = 0;
-	virtual TInt Set(TContextId aPdpId, const TTFTOperationCode& aParam) = 0;
-	virtual TInt Set(TContextId aPdpId, const RPacketContext::TDataChannelV2& aParam) = 0;
-	virtual TInt Set(TContextId aPdpId, const RPacketContext::TContextConfigGPRS& aParam) = 0;
-	virtual TInt Set(TContextId aPdpId, const RPacketContext::TContextStatus& aParam) = 0;
-
-	virtual TInt Get(TContextId aPdpId, TTFTInfo& aParam) const = 0;
-	virtual TInt Get(TContextId aPdpId, TTFTOperationCode& aParam) const = 0;
-	virtual TInt Get(TContextId aPdpId, RPacketContext::TDataChannelV2& aParam) const = 0;
-	virtual TInt Get(TContextId aPdpId, RPacketContext::TContextConfigGPRS& aParam) const = 0;
-	virtual TInt Get(TContextId aPdpId, RPacketContext::TContextStatus& aParam) const = 0;
-
-	virtual TInt GetLastErrorCause(TContextId aPdpId, TInt& aLastErrorCause) const = 0;
-
-	virtual void Set(const RPacketService::TStatus aParam) = 0; // applies to all contexts
-	virtual void Get(RPacketService::TStatus& aParam) = 0; // applies to all contexts
-
-	// additional accessors
-	virtual const TName& TsyName(void) = 0;
-
-	virtual void SetContextTerminationErrorAndStop(TContextId aPdpId, TInt aErrorCode) = 0;
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-   virtual void SetIMCNSignalling(TBool aImCnSignalling) = 0;
-#endif //SYMBIAN_NETWORKING_UMTSR5
-protected:
-private:
-	
-};
-
-
-#endif
-// MPDPFSMINTERFACE_H
--- a/telephonyprotocols/umtsgprsscpr/inc/MSpudManInterface.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-// Copyright (c) 2005-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:
-// The call-back interface of MPdpFsmInterface used by UmtsGprsSCPR to flag
-// operation results to SpudMan.
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#ifndef MSPUDMANINTERFACE_H
-#define MSPUDMANINTERFACE_H
-
-#include <networking/umtsnifcontrolif.h>
-#include <in_iface.h>
-
-/**
-Identifier used in a Control call for initialising the RPdpFsmInterface (in SpudMan) with a
-pointer to the real C-class (in the UmtsGprsSCPR).
-*/
-const TInt KInitialisePdpFsm = 0x80;
-
-/**
-Identifier used in a SpudInput call to signal the SpudMan that the UmtsGprsSCPR is shutting
-down and that the real CPdpFsmInterface object will be deleted.
-*/
-const TUint KPdpFsmShuttingDown = 0xff; 
-
-/** Name of SPUD */
-_LIT(KSpudName, "spud");
-
-/**
-Interface class for SpudMan, to be used by SpudFsm.
-*/
-class MSpudManInterface
-{
-public:
-	virtual void Input(TContextId aContextId, TInt aEvent, TInt aParam) = 0;
-
-	virtual void SetContextTerminationErrorAndStop(TContextId aContextId, TInt aErrorCode) = 0;
-
-};
-
-#endif
-// MSPUDMANINTERFACE_H
-
--- a/telephonyprotocols/umtsgprsscpr/inc/PdpFsmRequest.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-// Copyright (c) 2005-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:
-// PDP Context control requests.
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#ifndef CPDPFSMREQUEST_H
-#define CPDPFSMREQUEST_H
-
-#include "UmtsGprs_subconnProv.h"
-
-/** The class commits previous modifications to an active PDP context.
-
-@internalTechnology
-@released Since 9.3
-*/
-class CModifyActivePDPCtx : public CPdpFsmRequestBase
-{
-public:
-    virtual TInt Start();
-    virtual TBool PdpFsmEvent(TContextId aContextId, TInt aEvent, TInt aParam);
-
-    CModifyActivePDPCtx(CUmtsGprsSubConnProvd& aProvider, MPdpFsmRequestOwner& aOwner);
-    virtual ~CModifyActivePDPCtx();
-};
-
-
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-/** The class modifies R5 QoS on an active PDP context.
-
-@internalTechnology
-@released Since 9.3
-*/
-class CModifyR5QoS : public CPdpFsmRequestBase, public MPdpFsmRequestOwner
-{
-public:
-	virtual void Done( TInt aResult, CPdpFsmRequestBase& aThis );
-	virtual TInt Start();
-	virtual TBool PdpFsmEvent(TContextId aContextId, TInt aEvent, TInt aParam);
-	virtual ~CModifyR5QoS();
-	static CModifyR5QoS* NewL(CUmtsGprsSubConnProvd& aProvider, MPdpFsmRequestOwner& aOwner, RPacketQoS::TQoSR5Requested& aParams);
-
-protected:
-	CModifyR5QoS(CUmtsGprsSubConnProvd& aProvider, MPdpFsmRequestOwner& aOwner, RPacketQoS::TQoSR5Requested& aParams);    
-	
-	void ConstructL();
-	
-private:
-    void GrantedSetupL();
-    void RejectedSetupL(TInt aResult);
-private:
-    CModifyActivePDPCtx* iModifyActive;
-	RPacketQoS::TQoSR5Requested i5;
-};
-
-
-#else
-// !SYMBIAN_NETWORKING_UMTSR5
-
-/**
-The class modifies R99/R4 QoS on an active PDP context.
-
-@internalTechnology
-@released Since 9.3
-*/
-class CModifyR4QoS : public CPdpFsmRequestBase, public MPdpFsmRequestOwner
-{
-public:
-    virtual void Done( TInt aResult, CPdpFsmRequestBase& aThis );
-    virtual TInt Start();
-    virtual TBool PdpFsmEvent(TContextId aContextId, TInt aEvent, TInt aParam);
-    virtual ~CModifyR4QoS();
-    
-
-    static CModifyR4QoS* NewL(CUmtsGprsSubConnProvd& aProvider, MPdpFsmRequestOwner& aOwner, RPacketQoS::TQoSR99_R4Requested aParams);
-
-protected:
-    CModifyR4QoS(CUmtsGprsSubConnProvd& aProvider, MPdpFsmRequestOwner& aOwner, RPacketQoS::TQoSR99_R4Requested aParams); 
-	
-	void ConstructL();
-    
-private:
-    void GrantedSetupL();
-    void RejectedSetupL(TInt aResult);
-private:
-    CModifyActivePDPCtx* iModifyActive;
-    RPacketQoS::TQoSR99_R4Requested i99;
-
-};
-
-
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5
-
-#endif
-// CPDPFSMREQUEST_H
--- a/telephonyprotocols/umtsgprsscpr/inc/RSpudManInterface.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-// Copyright (c) 2005-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:
-// The MSpudManInterface handle class definition.
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
- 
-
-
-#ifndef RSPUDMANINTERFACE_H
-#define RSPUDMANINTERFACE_H
-
-#include <networking/mspudmaninterface.h>
-#include <comms-infras/commsdebugutility.h>
-
-
-/**
-Client side implementation of MSpudManInterface. 
-This is a very simplistic implementation that just holds a refernce to
-the server side and forwards all the calls to it. This implementation
-can be changed in the future to facilitate for IPC.
-*/
-class RSpudManInterface : public MSpudManInterface
-{
-public:
-   RSpudManInterface();
-   void Init(MSpudManInterface* aSpudManImpl);
-   void Close ();
-   virtual void Input(TContextId aContextId, TInt aEvent, TInt aParam);
-
-   virtual void SetContextTerminationErrorAndStop(TContextId aContextId, TInt aErrorCode);
-
-   inline ~RSpudManInterface ()
-      {
-   	__FLOG_CLOSE;
-      }
-   
-
-private:
-   MSpudManInterface* iSpudManImpl;
-
-public:
-	__FLOG_DECLARATION_MEMBER;
-};
-
-#endif
-// RSPUDMANINTERFACE_H
--- a/telephonyprotocols/umtsgprsscpr/inc/UmtsGprs_defaultSubconnProv.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-// Copyright (c) 2005-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:
-// UmtsGprs_subconnProv.h
-// Umts/Gprs Default SubConnection Provider class definition.
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-
-#ifndef UMTSGPRS_DEFAULTSUBCONNPROV_H
-#define UMTSGPRS_DEFAULTSUBCONNPROV_H
-
-
-#include "UmtsGprs_subconnProv.h"
-
-
-/** 
-Specialised subconnection provider for handling default UMTS contexts.
-
-@internalTechnology
-@released Since 9.3
-*/
-class CUmtsGprsDefaultSubConnProvd : public CUmtsGprsSubConnProvd
-	{
-    friend class CUmtsGprsSubConnProvdFactory; //for the protected constructor.
-public:
-
-	/** Modifies iContextId of 'this' to aContextId. This method should be called
-	* in the handover scenario, where the current default is dropped and a new
-	* one is elected.
-	* @param aContextId the id of the new default PDP context.
-	*/
-	void NewDefaultElected(TContextId aContextId);
-	
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-	
-	/** This parameter adds the IMCN information to the Default 
-	* SubConnection Parameter Bundle
-	*/
-	TInt AddIMCNInformationToParameterBundleL(TBool aImCnInfo);
-	
-#endif //SYMBIAN_NETWORKING_UMTSR5
-
-    virtual TBool ShouldIDeleteNow();
-
-
-protected:
-
-	//-=========================================================
-	// CSubConnectionProviderBase methods
-	//-=========================================================
-	virtual void DoParametersAboutToBeSetL(CSubConParameterBundle& aParameterBundle);
-   virtual TInt DoControl(TUint aOptionLevel, TUint aOptionName, TDes8& aOption);
-
-	//-=========================================================
-	// C'tor & D'tor methods
-	//-=========================================================
-	CUmtsGprsDefaultSubConnProvd(CSubConnectionProviderFactoryBase& aFactory, 
-	                             CConnectionProviderBase& aConnProvider);
-	                           
-	static CUmtsGprsDefaultSubConnProvd* NewL(CSubConnectionProviderFactoryBase& aFactory, 
-	                             CConnectionProviderBase& aConnProvider);
-	                             
-	void ConstructL();
-	
-	// Don't allow clients to invoke the destructor.
-	// (Only the CCommsFactoryBase should do this)
-	virtual ~CUmtsGprsDefaultSubConnProvd();
-	
-	
-	
-	//-=========================================================
-	// Custom methods
-	//-=========================================================
-	/** 
-	  @return the default CUmtsGprsSubConnProvd for 'this'
-	*/
-	virtual CUmtsGprsSubConnProvd& GetDefaultSubConnection();
-	
-	
-	/**
-	Returns the PdpFsmInterface instance, which can be used to talk to SpudFsm
-   
-   @return the local instance (pertaining to this connection) of CPdpFsmInterface.
-	*/
-	virtual CPdpFsmInterface& GetPdpFsmInterface();
-	
-	/**
-	Reads default QoS parameters from the database.
-	
-   @param aParams - The QoS parameter structure to be filled in by this method.
-	*/
-	void GetQoSDefaultsL(RPacketQoS::TQoSR99_R4Requested* aParams);
-	
-	//-=========================================================
-	// Members
-	//-=========================================================
-	CPdpFsmInterface* iPdpFsm;
-
-	};
-
-
-#include "UmtsGprs_defaultSubconnProv.inl"
-#endif
-// UMTSGPRS_DEFAULTSUBCONNPROV_H
--- a/telephonyprotocols/umtsgprsscpr/inc/UmtsGprs_defaultSubconnProv.inl	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-// Copyright (c) 2005-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:
-// Inline methods for Umts/Gprs Default SubConnection Provider.
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-    
-    
-inline void CUmtsGprsDefaultSubConnProvd::NewDefaultElected(TContextId aContextId)
-    {
-    iContextId = aContextId;
-    }
-    
--- a/telephonyprotocols/umtsgprsscpr/inc/UmtsGprs_subconnProv.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,361 +0,0 @@
-// Copyright (c) 2005-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:
-// Umts/Gprs SubConnection Provider class definition.
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-
-#ifndef UMTSGPRS_SUBCONNPROV_H
-#define UMTSGPRS_SUBCONNPROV_H
-
-
-#include <ss_subconnprov.h>
-#include <comms-infras/commsdebugutility.h>
-
-#include <cs_subconparams.h>
-#include <cs_subconevents.h>
-
-#include "PDPFSM.h"
-#include <networking/qos3gpp_subconparams.h>
-
-
-#ifdef __FLOG_ACTIVE
-// Logging tags
-_LIT8(KUmtsGprsLogTag1,"SubConn");
-_LIT8(KUmtsGprsLogTag2,"UmtsGprs");
-#endif
-
-class CPdpFsmRequestBase;
-
-void SubconEventCleanupFunction(TAny* aEvent);
-void SubconParamSetCleanupFunction(TAny* aEvent);
-
-
-/** The class represents an onwer/issuer of a CPdpFsmRequestBase
-
-@internalTechnology
-@released Since 9.3
-*/
-class MPdpFsmRequestOwner
-{
-    public:
-	/** Called by the owned CPdpFsmRequestBase to flag the completion of the
-	* request back to 'this'
-	*
-	  @param aResult - the request result indication.
-	  @param aParam  - the request completed (in case 'this' owns more requests).
-	*/
-    virtual void Done( TInt aResult, CPdpFsmRequestBase& aThis ) = 0;
-};
-
-
-
-
-
-class CUmtsGprsSubConnProvd : public CSubConnectionProviderBase, public MConnectionDataClient, public MPdpFsmRequestOwner
-/** The class represents UMTS/GPRS-proprietary subconnection provider.
-    It is designed to operate in the near proximity to Etel and
-    convert downcalls to Etel's language. This class represents both 
-    TSubConnTypes: { EAttachToDefault, ECreateNew }
-
-@internalTechnology
-@released Since 9.3
-*/
-	{
-protected:
-    enum TQosParameterRelease
-        {
-        KParameterRelInvalid = 0,
-        KParameterRelGeneric = 1,
-        KParameterRel4Rel99 = 4,
-        KParameterRel5 = 5,
-        };
-
-
-public:
-	//-=========================================================
-	// Custom methods
-	//-=========================================================	
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-
-	/**
-	Scans given parameter bundle for supported parameter sets
-	The first one found gets converted to RPacketQoS::TQoSR5Requested. 
-    The supported parameter sets are (in order of priority):
-    1) KSubConQosR5ParamsType
-    2) KSubConQosR99ParamsType
-    3) Generic QoS 
-	
-	@param aIn CSubConParameterBundle to be converted.
-	@param aOut RPacketQoS::TQoSR5Requested to be populated from aIn
-	@exception KErrNotSupported - if CUmtsGprsSubConnProvd does not support conversion from what's
-	in the supplied parameter bundle.
-	*/
-	void MapQosParamBundleToEtelL(const CSubConParameterBundle& aIn,
-	    RPacketQoS::TQoSR5Requested* aOut);
-
-#else
-// !SYMBIAN_NETWORKING_UMTSR5
-	
-	/** Scans given parameter bundle for supported parameter sets
-	The first one found gets converted to RPacketQoS::TQoSR99_R4Requested. 
-    The supported parameter sets are (in order of priority):
-    1) KSubConQosR99ParamsType
-    2) Generic QoS 
-	
-	@param aIn CSubConParameterBundle to be converted.
-	@param aOut RPacketQoS::TQoSR99_R4Requested to be populated from aIn
-	@exception KErrNotSupported - if CUmtsGprsSubConnProvd does not support conversion from what's
-	in the supplied parameter bundle.
-	*/
-	void MapQosParamBundleToEtelL(const CSubConParameterBundle& aIn,
-	    RPacketQoS::TQoSR99_R4Requested* aOut);
-
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 
-	
-	/**
-   Maps QoS parameters received from the network via Etel into a CSubConGenEventParamsGranted class
-   for client event notification.
-
-   @param aNetworkQoS  - A pointer to an Etel TPacketDataConfigBase class containing the
-   QoS to be mapped into the event.
-   @param aGranted - A reference to the CSubConGenEventParamsGranted object that should receive the mapped
-   QoS parameters.
-	*/
-   void MapQosEtelToGrantedParamsL (TPacketDataConfigBase* aNetworkQoS,
-      CSubConGenEventParamsGranted& aGranted);
-   
-   /** Returns the default CUmtsGprsSubConnProvd for 'this'
-	* IMPORTANT: This method is left pure virtual because its implementation, 
-	  although trivial, is not needed until CUmtsGprsSubConnProvd fully spports PDP 
-	  context management.
-	  
-	  @return the default CUmtsGprsSubConnProvd for 'this'
-	*/
-	virtual CUmtsGprsSubConnProvd& GetDefaultSubConnection() = 0;
-	
-	/** Called by SpudFsm to inform about events and responses regarding
-	* the PDP context 'this' represents. The event format complies to UmtsIf interface.
-	* CUmtsGprsSubConnProvd forwards the event to the active/pending request 
-	* (iCurrentPdpFsmReq) or ignores the event if no request exists.
-	*
-	  @param aEvent the event type
-	  @param aParam additional data
-	*/
-    virtual TBool PdpFsmEvent(TContextId aContextId, TInt aEvent, TInt aParam);	
-	
-	/** Returns the PdpFsmInterface instance, which can be used to talk to SpudFsm
-	 * 
-	  @return the local instance (pertaining to this connection) of CPdpFsmInterface.
-	*/
-	virtual CPdpFsmInterface& GetPdpFsmInterface();
-	
-	
-	/** Returns context id of the PDP context 'this' represents.
-	 * 
-	  @return context id of the PDP context 'this' represents.
-	*/
-	TContextId GetContextId() const;
-	
-	/** Sends request to the control clients. This method is the overload of
-	 * the CSubConnectionProviderBase protected counterpart. It's to be used
-	 * by CPdpFsmRequestBase objects.
-	 * 
-	  @param aEvent - the notification to be sent. 
-	*/
-    TInt NotifyClientEvent(const CSubConNotificationEvent& aEvent);	
-	
-
-	//-=========================================================
-	// MPdpFsmRequestOwner methods
-	//-=========================================================	
-	void Done(TInt aResult, CPdpFsmRequestBase& aThis);
-    
-	//-=========================================================
-	// MConnectionDataClient methods
-	//-=========================================================	
-	virtual void Notify(TNotify aNotifyType,  CConnectionProviderBase* aConnProvider, TInt aError, const CConNotificationEvent* aConNotificationEvent);
-  	virtual void AttachToNext(CSubConnectionProviderBase* aSubConnProvider);
-	virtual void ConnectionGoingDown(CConnectionProviderBase& aConnProvider);
-	virtual void ConnectionError(TInt aStage, TInt aError);
-
-	//-=========================================================
-	// CSubConnectionProviderBase methods
-	//-=========================================================
-	virtual void DoDataClientJoiningL(MSubConnectionDataClient& aDataClient);
-	virtual void DoDataClientLeaving(MSubConnectionDataClient& aDataClient);
-	virtual void DoControlClientJoiningL(MSubConnectionControlClient& aControlClient);
-	virtual void DoControlClientLeaving(MSubConnectionControlClient& aControlClient);
-	virtual void DoSourceAddressUpdate(MSubConnectionDataClient& aDataClient, const TSockAddr& aSource);
-	virtual void DoDestinationAddressUpdate(MSubConnectionDataClient& aDataClient, const TSockAddr& aDestination);
-	virtual void DoDataClientRouted(MSubConnectionDataClient& aDataClient, const TSockAddr& aSource, const TSockAddr& aDestination, const TDesC8& aConnectionInfo);
-	virtual void DoParametersAboutToBeSetL(CSubConParameterBundle& aParameterBundle);
-	virtual TInt DoControl(TUint aOptionLevel, TUint aOptionName, TDes8& aOption);
-	virtual CConnDataTransfer& DoDataTransferL();
-	virtual MConnectionDataClient* DoSelfConnectionDataClient();
-   virtual void DoStartL();
-	virtual void DoStop();
-	virtual CSubConnectionProviderBase* DoNextLayer();
-
-protected:
-	
-	//-=========================================================
-	// Custom methods
-	//-=========================================================	
-    CUmtsGprsSubConnProvd(CSubConnectionProviderFactoryBase& aFactory, 
-        CConnectionProviderBase& aConnProvider);
-
-    // Don't allow clients to invoke the destructor.
-    // (Only the CCommsFactoryBase should do this)
-    virtual ~CUmtsGprsSubConnProvd();
-
-    static void MapQosR99ExtensionSetToEtel(const CSubConQosR99ParamSet& aInRequested,
-        const CSubConQosR99ParamSet* aInAcceptable,
-        RPacketQoS::TQoSR99_R4Requested* aOut);
-
-    static void MapQosGenericSetToEtel(const CSubConQosGenericParamSet& aInRequested, 
-        const CSubConQosGenericParamSet* aInAcceptable,
-        RPacketQoS::TQoSR99_R4Requested* aOut);
-                               
-
-    static void MapQosEtelToGenericSetL (RPacketQoS::TQoSR99_R4Negotiated* aNetworkQoS,
-        CSubConGenEventParamsGranted& aGranted);
-
-    static void MapQosEtelToR99SetL (RPacketQoS::TQoSR99_R4Negotiated* aNetworkQoS,
-        CSubConGenEventParamsGranted& aGranted);
-
-	void NotifySubConDownL(TInt aError);
-    void NotifyParamsChangedL(TInt aError);
-
-    inline void ResetQosRelease();
-    inline TQosParameterRelease RequestedQosRelease();
-
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-    static void MapQosR5ExtensionSetToEtel(const CSubConQosR5ParamSet& aInRequested,
-        const CSubConQosR5ParamSet* aInAcceptable,
-        RPacketQoS::TQoSR5Requested* aOut);
-
-    static void MapQosR99ExtensionSetToEtel(const CSubConQosR99ParamSet& aInRequested,
-        const CSubConQosR99ParamSet* aInAcceptable, RPacketQoS::TQoSR5Requested* aOut);
-
-    static void MapQosEtelToR5SetL (RPacketQoS::TQoSR5Negotiated* aNetworkQoS,
-        CSubConGenEventParamsGranted& aGranted);
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 
-
-	/** 
-	Given a set of generic parameters, the method derives the R99 value for the traffic class.
-
-	@param aIn requested CSubConQosGenericParamSet to be converted
-	@return the value of RPacketQoS::TTrafficClass
-	*/	
-	static RPacketQoS::TTrafficClass DeriveTrafficClass(const CSubConQosGenericParamSet& aIn );
-	
-	/** 
-	Given a set of generic parameters, the method derives the R99 value for the traffic priority.
-
-	@param aIn requested CSubConQosGenericParamSet to be converted
-	@return the value of RPacketQoS::TTrafficHandlingPriority
-	*/		
-	static RPacketQoS::TTrafficHandlingPriority DeriveTrafficPriority(const CSubConQosGenericParamSet& aIn );
-	
-	/*
-	The PDP context id 'this' represents. This is semantically equal to the SpudFSM PDP
-	Context identification scheme.
-	*/
-	TContextId iContextId;
-
-	/*
-	Holds the current request towards PDPFSM
-	*/
-	CPdpFsmRequestBase* iCurrentPdpFsmReq;
-
-
-private:
-	TQosParameterRelease iParameterRelease;
-
-
-public:
-	__FLOG_DECLARATION_MEMBER;
-	};
-	
-	
-	
-	
-	
-/**
-The base class for a PDP Context control asynchronous requests. 
-
-@internalTechnology
-@released Since 9.3
-*/
-class CPdpFsmRequestBase
-{
-public:
-    
-	/** 
-	C'tor
-
-	@param aProvider - the sub connection provider 'this' is directly or indirectly owned by.
-	*                  Also represents a specific PDP context.
-	@param aOwner    - the immediate owner of 'this' (could be same as aProvider or could be
-	*                  request (when nested). 
-	*/		
-    CPdpFsmRequestBase( CUmtsGprsSubConnProvd& aProvider, MPdpFsmRequestOwner& aOwner);
-
-    virtual ~CPdpFsmRequestBase();
-    
-	/** 
-	The method should issue the request
-
-	@return the immediate request result.
-	*/		
-    virtual TInt Start() = 0;
-    
-    
-	/** 
-	The callback method called by the direct owner of 'this' to forward events/results
-	caused by issuing 'this'. 'This' can interpret the events and decide whether to
-	flag the completion back to its owner.
-
-	@param aContextId The context Id that the event occured on
-	@param aEvent The identifier of the event that occured
-	@param aParam Data relavent to the event. Usually a system-wide error code
-	@return ETrue if the event was of interested and handled, EFalse if wasn't
-	handled and should be passed on to SpudMan
-	*/	
-	virtual TBool PdpFsmEvent(TContextId aContextId, TInt aEvent, TInt aParam) = 0;
-    
-protected:
-    CUmtsGprsSubConnProvd& iProvider;
-    MPdpFsmRequestOwner& iOwner;
-    TContextId iContextId;
-
-public:
-	__FLOG_DECLARATION_MEMBER;
-};
-
-
-
-#include "UmtsGprs_subconnProv.inl"
-#endif
-// UMTSGPRS_SUBCONNPROV_H
--- a/telephonyprotocols/umtsgprsscpr/inc/UmtsGprs_subconnProv.inl	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-// Copyright (c) 2005-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:
-// Inline methods of the Umts/Gprs SubConnection Provider
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-
-
-inline CUmtsGprsSubConnProvd::CUmtsGprsSubConnProvd(
-                              CSubConnectionProviderFactoryBase& aFactory, 
-	                          CConnectionProviderBase& aConnProvider)
-:CSubConnectionProviderBase(aFactory, aConnProvider),
- iContextId(KAllContexts), /*Initialising to an illegal value*/
- iCurrentPdpFsmReq(NULL)			
-/** 
-Constructs a UMTS SubConnection Provider
-
-@param aFactory CSubConnectionProviderFactoryBase that should own the reference to 'this'
-@param aConnProvider a connection that 'this' subconnection belongs to
-*/
-	{
-	__FLOG_OPEN(KUmtsGprsLogTag1, KUmtsGprsLogTag2);
-	__FLOG_2(_L("CUmtsGprsSubConnProvd [this=%08x]:\tCUmtsGprsSubConnProvd() [MConnectionDataClient=%08x]"),this,(MConnectionDataClient*)this);
-	}
-
-inline void CUmtsGprsSubConnProvd::Done(TInt /*aResult*/, CPdpFsmRequestBase& aThis)
-    {
-    ASSERT(&aThis == iCurrentPdpFsmReq);
-    (void)aThis;
-    delete iCurrentPdpFsmReq;
-    iCurrentPdpFsmReq = NULL;
-    }
-    
-inline TContextId CUmtsGprsSubConnProvd::GetContextId() const
-    {
-    return iContextId;
-    }
-
-inline TInt CUmtsGprsSubConnProvd::NotifyClientEvent(const CSubConNotificationEvent& aEvent)
-    {
-    return CSubConnectionProviderBase::NotifyClientEvent(aEvent);
-    }
-
-
-inline CUmtsGprsSubConnProvd::TQosParameterRelease CUmtsGprsSubConnProvd::RequestedQosRelease()
-    {
-    return iParameterRelease;
-    }
-
-inline void CUmtsGprsSubConnProvd::ResetQosRelease ()
-    {
-    iParameterRelease = CUmtsGprsSubConnProvd::KParameterRelInvalid;
-    }
-
-
-inline CPdpFsmRequestBase::~CPdpFsmRequestBase ()
-   {
-	__FLOG_CLOSE;
-   }
--- a/telephonyprotocols/umtsgprsscpr/inc/UmtsGprs_subconnProvFactory.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-// Copyright (c) 2005-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:
-// Umts/Gprs SubConnection Provider Facory header file
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-
-#ifndef UMTSGPRS_SUBCONNPROVFACTORY_H
-#define UMTSGPRS_SUBCONNPROVFACTORY_H
-
-#include <ss_subconnprov.h>
-#include <comms-infras/nifif.h>
-#include <networking/mspudmaninterface.h>
-
-// The ECOM DLL Uid and Factory Uid for the UmtsGprsSCPR
-
-const TUint KUmtsGprsSubConnectionProviderFactoryId = 0x1020D45F;
-
-class CUmtsGprsSubConnProvdFactory : public CSubConnectionProviderFactoryBase
-/** 
-
-@internalTechnology
-@released Since 9.3
-*/
-	{
-public:
-	static CUmtsGprsSubConnProvdFactory* NewL(TAny* aConstructionParameters);	
-	
-protected:
-	CUmtsGprsSubConnProvdFactory(TUint aFactoryId, CSubConnectionFactoryContainer& aParentContainer);
-	virtual ~CUmtsGprsSubConnProvdFactory();
-	
-	// methods to be overriden for CSubConnectionProviderFactory
-	virtual CSubConnectionProviderBase* DoCreateProviderL(CConnectionProviderBase& aConnProvider, RSubConnection::TSubConnType aType);
-
-	};
-
-
-#endif
-// UMTSGPRS_SUBCONNPROVFACTORY_H
--- a/telephonyprotocols/umtsgprsscpr/spudfsm/inc/PDPFSM.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-// Copyright (c) 2004-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:
-// Interface to the PDP Context Finite State Machine
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#ifndef PDPFSM_H
-#define PDPFSM_H
-
-
-#include <networking/mpdpfsminterface.h>
-#include "RSpudManInterface.h"
-
-class CPdpFsmFactory;
-class CUmtsGprsDefaultSubConnProvd;
-
-
-class CPdpFsmInterface : public MPdpFsmInterface
-/**
- * UmtsGprsSCPR implemenation for the MPdpFsmInterface
- *
- * @internalComponent
- */
- {
- public:
-	//-=========================================================
-	// custom methods
-	//-=========================================================	
-    CPdpFsmInterface(CUmtsGprsDefaultSubConnProvd& aOwner);
-	virtual ~CPdpFsmInterface();
-
-    void SpudInput (TContextId aPdpId, TInt aNotification, TInt aParam);
-	
-	//-=========================================================
-	// MPdpFsmInterface methods
-	//-=========================================================	
-	virtual void OpenL(MSpudManInterface * aSpudManInterface, TName& aName);
-	virtual void Close();
-
-	virtual TInt Input (TContextId aPdpId, const TInt aOperation, const TInt aParam=KErrNone);
-
-	virtual TInt Set(TContextId aPdpId, const TTFTInfo& aParam);
-	virtual TInt Set(TContextId aPdpId, const TTFTOperationCode& aParam);
-	virtual TInt Set(TContextId aPdpId, const RPacketContext::TDataChannelV2& aParam);
-	virtual TInt Set(TContextId aPdpId, const RPacketContext::TContextConfigGPRS& aParam);
-	virtual TInt Set(TContextId aPdpId, const RPacketContext::TContextStatus& aParam);
-
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-	
-	// This is to set the status of IM CN signalling parameter
-	virtual void SetIMCNSignalling(TBool aImCnSignalling);
-	
-	virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR5Requested& aParam);
-	virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR5Negotiated& aParam);
-	virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR5Requested& aParam) const;
-	virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR5Negotiated& aParam) const;
-
-#else
-// !SYMBIAN_NETWORKING_UMTSR5 
-
-	virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Requested& aParam) const;
-	virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Negotiated& aParam) const;
-	virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Requested& aParam);
-	virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Negotiated& aParam);
-
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 
-
-
-	virtual TInt Get(TContextId aPdpId, TTFTInfo& aParam) const;
-	virtual TInt Get(TContextId aPdpId, TTFTOperationCode& aParam) const;
-	virtual TInt Get(TContextId aPdpId, RPacketContext::TDataChannelV2& aParam) const;
-	virtual TInt Get(TContextId aPdpId, RPacketContext::TContextConfigGPRS& aParam) const;
-	virtual TInt Get(TContextId aPdpId, RPacketContext::TContextStatus& aParam) const;
-
-	virtual TInt GetLastErrorCause(TContextId aPdpId, TInt& aLastErrorCause) const;
-
-	virtual void Set(const RPacketService::TStatus  aParam); // applies to all contexts
-	virtual void Get(RPacketService::TStatus& aParam);// applies to all contexts
-
-	virtual const TName& TsyName(void);
-
-	void SetContextTerminationErrorAndStop(TContextId aPdpId, TInt aErrorCode);
-
- protected:
- private:
-	// DO NOT provide implementations to these methods: Copying this object should be disabled
-	CPdpFsmInterface(CPdpFsmInterface&);
-	CPdpFsmInterface& operator= (CPdpFsmInterface& aInput);
-	
- public:
- protected:
- private:
-	// FSM Factory - churns out FSMs
-	CPdpFsmFactory*               iPdpFsmFactory;
-
-	RPacketService::TStatus       iNetworkStatus;	
-	
-	CUmtsGprsDefaultSubConnProvd& iDefaultSubConnProvd;
-	RSpudManInterface             iSpudManInterface;
-
-};
-
-#endif
-// PDPFSM_H
--- a/telephonyprotocols/umtsgprsscpr/spudfsm/inc/pdpfsmnmspace.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,309 +0,0 @@
-// Copyright (c) 2004-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:
-// Common header for pdp FSM
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#ifndef PDPFSMNMSPACE_H
-#define PDPFSMNMSPACE_H
-
-#include <etelqos.h>
-
-namespace PdpFsm
-{
-
-/** completion and notification signals */
-enum TEtelSignal
-	{
-	EPhoneOpened,
-	EPhoneOpenedFailed,
-	
-	EQoSSet,
-	EQoSSetFailed,
-	ETftSet,
-	ETftSetFailed,
-	ETftChanged,
-	ETftChangedFailed,
-	
-	E1ryPdpContextCreated,
-	E1ryPdpContextCreatedFailed,
-	E2ryPdpContextCreated,
-	E2ryPdpContextCreatedFailed,
-	
-	EPdpNegQoSRetrieved,
-	EPdpNegQoSRetrievedFailed,
-	EPdpContextModified,
-	EPdpContextModifiedFailed,
-	EPdpActivated,
-	EPdpActivatedFailed,
-	EContextDeleted,
-	EContextDeletedFailed,
-	// add new signals here
-	
-	// network signals
-	EQoSProfileChangeNetwork,
-	EConfigGPRSChangeNetwork,
-	EContextStatusChangeNetwork,
-	EServiceStatusChangeNetwork,
-	EPacketStatusChangeNetwork,
-	// add new signals here
-	
-	ESentinelSignal
-	};
-} // namespace PdpFsm
-
-
-
-
-/**
-A buffer to potentially hold one of the following:
-Unfortuntely can't use a union for these since they have default ctors.
-
-RPacketQoS::TQoSR99_R4Negotiated
-RPacketQoS::TQoSR5Negotiated
-
-@internalComponent
-*/
-struct TNegotiatedProfileBuffer
-    {
-private:    
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-    RPacketQoS::TQoSR5Negotiated iNegotiatedBuffer;
-#else
-    RPacketQoS::TQoSR99_R4Negotiated iNegotiatedBuffer;
-#endif    
-    
-public:
-    inline TInt ExtensionId();
-
-    inline const RPacketQoS::TQoSR99_R4Negotiated& NegotiatedQoSR99_R4();
-    inline TNegotiatedProfileBuffer& operator=(const RPacketQoS::TQoSR99_R4Negotiated& aParam);
-    
-#ifdef SYMBIAN_NETWORKING_UMTSR5    
-    inline const RPacketQoS::TQoSR5Negotiated& NegotiatedQoSR5();
-    inline TNegotiatedProfileBuffer& operator=(const RPacketQoS::TQoSR5Negotiated& aParam);
-#endif    
-    };
-    
-
-struct TRequestedProfileBuffer
-    {
-private:
-    // Use R5 since its the largest
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-    RPacketQoS::TQoSR5Requested iRequestedBuffer;
-#else
-    RPacketQoS::TQoSR99_R4Requested iRequestedBuffer;
-#endif  
-
-public:
-    inline TInt ExtensionId();
-
-    inline const RPacketQoS::TQoSR99_R4Requested& RequestedQoSR99_R4();
-    inline TRequestedProfileBuffer& operator=(const RPacketQoS::TQoSR99_R4Requested& aParam);
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-    inline const RPacketQoS::TQoSR5Requested& RequestedQoSR5();
-    inline TRequestedProfileBuffer& operator=(const RPacketQoS::TQoSR5Requested& aParam);
-#endif    
-    };
-
-
-inline TInt TNegotiatedProfileBuffer::ExtensionId()
-    {
-    return (reinterpret_cast<TPacketDataConfigBase&>(iNegotiatedBuffer)).ExtensionId();
-    }
-
-
-inline const RPacketQoS::TQoSR99_R4Negotiated& TNegotiatedProfileBuffer::NegotiatedQoSR99_R4()
-    {
-    return reinterpret_cast<RPacketQoS::TQoSR99_R4Negotiated&>(iNegotiatedBuffer);
-    }
-
-
-inline TNegotiatedProfileBuffer& TNegotiatedProfileBuffer::operator=(const RPacketQoS::TQoSR99_R4Negotiated& aParam)
-    {
-    // Use this tmp value, since its ExtensionId is set when it is constructed.
-    // Can't trust the ExtensionId of struct passed in.
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-    // If we support R5 then store as R5
-    RPacketQoS::TQoSR5Negotiated tmp; 
-    tmp.iSignallingIndication = EFalse;
-    tmp.iSourceStatisticsDescriptor = RPacketQoS::ESourceStatisticsDescriptorUnknown;
-
-#else
-    RPacketQoS::TQoSR99_R4Negotiated tmp; 
-#endif
-
-    tmp.iBER = aParam.iBER;
-    tmp.iDeliverErroneousSDU = aParam.iDeliverErroneousSDU;
-    tmp.iDeliveryOrderReqd = aParam.iDeliveryOrderReqd;
-    tmp.iGuaranteedRate = aParam.iGuaranteedRate;
-    tmp.iMaxRate = aParam.iMaxRate;
-    tmp.iMaxSDUSize = aParam.iMaxSDUSize;
-    tmp.iSDUErrorRatio = aParam.iSDUErrorRatio;
-    tmp.iTrafficClass = aParam.iTrafficClass;
-    tmp.iTrafficHandlingPriority = aParam.iTrafficHandlingPriority;
-    tmp.iTransferDelay = aParam.iTransferDelay;
-    
-    iNegotiatedBuffer = tmp;
-
-    return *this;
-    }
-
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-inline const RPacketQoS::TQoSR5Negotiated& TNegotiatedProfileBuffer::NegotiatedQoSR5()
-    {
-    return iNegotiatedBuffer;
-    }
-
-
-inline TNegotiatedProfileBuffer& TNegotiatedProfileBuffer::operator=(const RPacketQoS::TQoSR5Negotiated& aParam)
-    {
-    // Use this tmp value, since its ExtensionId is set when it is constructed.
-    // Can't trust the ExtensionId of struct passed in.
-    RPacketQoS::TQoSR5Negotiated tmp;
-
-    tmp.iBER = aParam.iBER;
-    tmp.iDeliverErroneousSDU = aParam.iDeliverErroneousSDU;
-    tmp.iDeliveryOrderReqd = aParam.iDeliveryOrderReqd;
-    tmp.iGuaranteedRate = aParam.iGuaranteedRate;
-    tmp.iMaxRate = aParam.iMaxRate;
-    tmp.iMaxSDUSize = aParam.iMaxSDUSize;
-    tmp.iSDUErrorRatio = aParam.iSDUErrorRatio;
-    tmp.iTrafficClass = aParam.iTrafficClass;
-    tmp.iTrafficHandlingPriority = aParam.iTrafficHandlingPriority;
-    tmp.iTransferDelay = aParam.iTransferDelay;
-    tmp.iSignallingIndication = aParam.iSignallingIndication;
-    tmp.iSourceStatisticsDescriptor = aParam.iSourceStatisticsDescriptor;
- 
-    iNegotiatedBuffer = tmp;
-
-    return *this;
-    }
-#endif
-
-    
-
-
-inline TInt TRequestedProfileBuffer::ExtensionId()
-    {
-    return (reinterpret_cast<TPacketDataConfigBase&>(iRequestedBuffer)).ExtensionId();
-    }
-
-    
-inline const RPacketQoS::TQoSR99_R4Requested& TRequestedProfileBuffer::RequestedQoSR99_R4()
-    {
-    return reinterpret_cast<RPacketQoS::TQoSR99_R4Requested&>(iRequestedBuffer);
-    }
-
-    
-inline TRequestedProfileBuffer& TRequestedProfileBuffer::operator=(const RPacketQoS::TQoSR99_R4Requested& aParam)
-    {
-    // Use this tmp value, since its ExtensionId is set when it is constructed.
-    // Can't trust the ExtensionId of struct passed in.
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-    // If we support R5 then store as R5
-    RPacketQoS::TQoSR5Requested tmp;
-    tmp.iSignallingIndication = EFalse;
-    tmp.iSourceStatisticsDescriptor = RPacketQoS::ESourceStatisticsDescriptorUnknown;
-
-#else
-    // If we don't support R5 then store as R4/R99
-    RPacketQoS::TQoSR99_R4Requested tmp;
-#endif
-
-    tmp.iReqTrafficClass = aParam.iReqTrafficClass;
-    tmp.iMinTrafficClass = aParam.iMinTrafficClass;
-    tmp.iReqDeliveryOrderReqd = aParam.iReqDeliveryOrderReqd;
-    tmp.iMinDeliveryOrderReqd = aParam.iMinDeliveryOrderReqd;
-    tmp.iReqDeliverErroneousSDU = aParam.iReqDeliverErroneousSDU;
-    tmp.iMinDeliverErroneousSDU = aParam.iMinDeliverErroneousSDU;
-    tmp.iReqMaxSDUSize = aParam.iReqMaxSDUSize;
-    tmp.iMinAcceptableMaxSDUSize = aParam.iMinAcceptableMaxSDUSize;
-    tmp.iReqMaxRate = aParam.iReqMaxRate;
-    tmp.iMinAcceptableMaxRate = aParam.iMinAcceptableMaxRate;
-    tmp.iReqBER = aParam.iReqBER;
-    tmp.iMaxBER = aParam.iMaxBER;
-    tmp.iReqSDUErrorRatio = aParam.iReqSDUErrorRatio;
-    tmp.iMaxSDUErrorRatio = aParam.iMaxSDUErrorRatio;
-    tmp.iReqTrafficHandlingPriority = aParam.iReqTrafficHandlingPriority;
-    tmp.iMinTrafficHandlingPriority = aParam.iMinTrafficHandlingPriority;
-    tmp.iReqTransferDelay = aParam.iReqTransferDelay;
-    tmp.iMaxTransferDelay = aParam.iMaxTransferDelay;
-    tmp.iReqGuaranteedRate = aParam.iReqGuaranteedRate;
-    tmp.iMinGuaranteedRate = aParam.iMinGuaranteedRate;
- 
-    iRequestedBuffer = tmp;
-
-    return *this;
-    }
-
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-inline const RPacketQoS::TQoSR5Requested& TRequestedProfileBuffer::RequestedQoSR5()
-    {
-    return iRequestedBuffer;
-    }
-    
-    
-inline TRequestedProfileBuffer& TRequestedProfileBuffer::operator=(const RPacketQoS::TQoSR5Requested& aParam)
-    {
-    // Use this tmp value, since its ExtensionId is set when it is constructed.
-    // Can't trust the ExtensionId of struct passed in.
-    RPacketQoS::TQoSR5Requested tmp; 
-
-    tmp.iReqTrafficClass = aParam.iReqTrafficClass;
-    tmp.iMinTrafficClass = aParam.iMinTrafficClass;
-    tmp.iReqDeliveryOrderReqd = aParam.iReqDeliveryOrderReqd;
-    tmp.iMinDeliveryOrderReqd = aParam.iMinDeliveryOrderReqd;
-    tmp.iReqDeliverErroneousSDU = aParam.iReqDeliverErroneousSDU;
-    tmp.iMinDeliverErroneousSDU = aParam.iMinDeliverErroneousSDU;
-    tmp.iReqMaxSDUSize = aParam.iReqMaxSDUSize;
-    tmp.iMinAcceptableMaxSDUSize = aParam.iMinAcceptableMaxSDUSize;
-    tmp.iReqMaxRate = aParam.iReqMaxRate;
-    tmp.iMinAcceptableMaxRate = aParam.iMinAcceptableMaxRate;
-    tmp.iReqBER = aParam.iReqBER;
-    tmp.iMaxBER = aParam.iMaxBER;
-    tmp.iReqSDUErrorRatio = aParam.iReqSDUErrorRatio;
-    tmp.iMaxSDUErrorRatio = aParam.iMaxSDUErrorRatio;
-    tmp.iReqTrafficHandlingPriority = aParam.iReqTrafficHandlingPriority;
-    tmp.iMinTrafficHandlingPriority = aParam.iMinTrafficHandlingPriority;
-    tmp.iReqTransferDelay = aParam.iReqTransferDelay;
-    tmp.iMaxTransferDelay = aParam.iMaxTransferDelay;
-    tmp.iReqGuaranteedRate = aParam.iReqGuaranteedRate;
-    tmp.iMinGuaranteedRate = aParam.iMinGuaranteedRate;
-    tmp.iSignallingIndication = aParam.iSignallingIndication;
-    tmp.iSourceStatisticsDescriptor = aParam.iSourceStatisticsDescriptor;
-
-    iRequestedBuffer = tmp; 
-    
-    return *this;
-    }
-#endif    
-
-
-typedef TPckg<TNegotiatedProfileBuffer> TNegotiatedProfileBufferPckg;
-typedef TPckg<TRequestedProfileBuffer>  TRequestedProfileBufferPckg;
-
-	
-#endif
-// PDPFSMNMSPACE_H
--- a/telephonyprotocols/umtsgprsscpr/spudfsm/src/PDPFSM.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,814 +0,0 @@
-// Copyright (c) 2005-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:
-// Implementation file for the PDP Context Finite State Machine
-// 
-//
-
-/**
- @file 
-*/
-
-
-#include "PDPFSM.h"
-#include "cpdpfsmfactory.h"
-#include "spudfsmdebuglogger.h"
-#include "UmtsGprs_defaultSubconnProv.h"
-
-
-//-=========================================================
-// Custom methods
-//-=========================================================
-CPdpFsmInterface::CPdpFsmInterface(CUmtsGprsDefaultSubConnProvd& aOwner)
-:iPdpFsmFactory(NULL), 
- iNetworkStatus(RPacketService::EStatusUnattached),
- iDefaultSubConnProvd(aOwner)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::()");
-    }
-
-CPdpFsmInterface::~CPdpFsmInterface()
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::()");
-	
-	CPdpFsmInterface::Close();
-	delete iPdpFsmFactory;
-    }
-
-
-void CPdpFsmInterface::SpudInput(TContextId aPdpId, TInt aNotification, TInt aParam)
-    {
-    switch (aNotification)
-        {  
-          //------------------------------
-          // responses - these are explicitly responses to previously issued requests.
-          //             These should only reach the entity that sent the request.
-          //------------------------------
-          case KContextTFTModifiedEvent:
-             {
-             TTFTOperationCode opCode;
-             Get(aPdpId, opCode);
-             if (opCode == KDeleteTFT && aParam == KErrNone)
-                {
-                //captured response to a successful delete TFT request. We now
-                //have a new default.
-                #ifdef _DEBUG
-                TTFTInfo ttfinfo;
-                Get(aPdpId, ttfinfo);
-                ASSERT(ttfinfo.FilterCount() == 0);
-                #endif //_DEBUG
-
-                iDefaultSubConnProvd.NewDefaultElected(aPdpId);
-                }
-                
-             iSpudManInterface.Input(aPdpId, aNotification, aParam);
-             }
-             break;
-
-          case KSecondaryContextCreated:
-          case KContextQoSSetEvent:
-          case KContextActivateEvent:
-          case KContextModifyActiveEvent:
-             {
-             if (aPdpId == iDefaultSubConnProvd.GetContextId())
-                {
-                TBool handled = iDefaultSubConnProvd.PdpFsmEvent(aPdpId, aNotification, aParam);
-                if (!handled)
-                    {
-                    // Chances are the default context is in fact a promoted secondary context
-                    // We must be careful to make sure that GuQoS gets the notification it expects
-                    // otherwise it can cause problems. On the other hand if it gets notifications
-                    // or events its not expecting it will Panic.
-                    iSpudManInterface.Input(aPdpId, aNotification, aParam);
-                    }
-                }
-             else
-                {
-                iSpudManInterface.Input(aPdpId, aNotification, aParam);
-                }
-             }
-             break;
-
-          //------------------------------
-          // events - Received either as responses to previously sent requests
-          //          or as indications of network initiated actions.
-          //------------------------------
-          case KContextDeleteEvent:
-          case KNetworkStatusEvent:
-          case KContextParametersChangeEvent:
-          case KContextBlockedEvent:
-          case KContextUnblockedEvent:
-          case KPrimaryContextCreated:
-          case KGetNegQoSEvent:
-             {
-             if ( aPdpId == iDefaultSubConnProvd.GetContextId() || aPdpId == KAllContexts)
-                {
-                iDefaultSubConnProvd.PdpFsmEvent(iDefaultSubConnProvd.GetContextId(), aNotification, aParam);
-                }
-             iSpudManInterface.Input(aPdpId, aNotification, aParam);
-             }
-             break;
-        }
-    }
-
-
-
-
-//-=========================================================
-// MPdpFsmInterface methods
-//-=========================================================
-/** request to open the FSM
-
-@param aSpudManInterface reference to SpudMan interface
-*/
-void CPdpFsmInterface::OpenL(MSpudManInterface * aSpudManInterface, TName& aTsyName)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::OpenL()");
-
-	if (aSpudManInterface == NULL)
-	    {
-		User::Leave(KErrBadHandle);
-		}
-	
-	iSpudManInterface.Init(aSpudManInterface);
-
-	iPdpFsmFactory = CPdpFsmFactory::NewL();
-
-	iPdpFsmFactory->InitL(aTsyName, this);
-    }
-
-/** closes the FSM and frees underlying resources
-*/
-void CPdpFsmInterface::Close()
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Close()");
-	
-    iSpudManInterface.Close ();
-
-	if (iPdpFsmFactory)
-	    {
-		iPdpFsmFactory->Close();
-	    }
-    }
-
-
-/** 
- Performs and input action/notification for context ID aPdpId
- If aPdpId is KAllContexts, the notification is sent to every context, unless it is of type EServiceStatusChangeNetwork
-
-@param aPdpId the PDP context ID, 0 to KMaxPdpContexts
-@param aOperation the operation id to perform
-@param aParam extra id for ETelDriver errors
-@return error code for the synchronus patrt of the operation
-*/
-TInt CPdpFsmInterface::Input(TContextId aPdpId, const TInt aOperation, const TInt aParam)
-    {
-	TInt ret = KErrNone;
-
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Input(aParam)");
-
-	ASSERT(iPdpFsmFactory);
-
-
-    // Control structure is in order of the most frequent operation first (hopefully)
-    //
-	if (iPdpFsmFactory->ContextIsValid(aPdpId))
-	    {
-	    // We have a valid PDP FSM Context, so go ahead with the operation...
-	    //
-	    ret = (iPdpFsmFactory->GetFsmContext(aPdpId))->Input(aOperation, aParam);
-		if (aOperation == PdpFsm::EContextStatusChangeNetwork && aParam != KErrNone)
-			{
-			SPUDFSMVERBOSE_LOG1(_L("iSpudManInterface.SetContextTerminationErrorAndStop %d"),aParam);
-			iSpudManInterface.SetContextTerminationErrorAndStop(aPdpId, aParam);
-			}
-
-        // Recovering memory by deleting the Fsm Context
-        //
-        // Tricky, definitely don't try with 'SpudMan::EContextDelete' it's far too early.
-        // You can get a bit further deleting on 'PdpFsm::EContextDeleted' (and 'PdpFsm::EContextDeletedFailed')
-        // from TContextDeleteStrategy::NotifyFsm(), but you then find that GuQoS is calling into Spud in order to
-        // transfer data from the deleted context to another...
-        //
-        // Additionally, the spud unit test is expecting to be able to "reuse" deleted contexts...
-	    }
-	else if (aPdpId == KAllContexts)
-	    {
-		TInt err = KErrNone;
-	
-		// this has to be here to avoid sending it from every context
-		//
-		if (aOperation == PdpFsm::EServiceStatusChangeNetwork)
-		    {	
-			iPdpFsmFactory->SpudInput(KAllContexts, KNetworkStatusEvent, KErrNone);
-		    }
-		else
-		    {
-			for (TContextId i = 0; (i < KMaxPdpContexts) && iPdpFsmFactory->HaveFsmContext(i); i++)
-			    {
-		        // Process any current PDP contexts.
-		        
-		        err = (iPdpFsmFactory->GetFsmContext(i))->Input(aOperation, aParam);
-
-                // See above about trials and tribulations of trying to recover the memory taken by these 
-                // CPdpFsm objects.
-
-				if (err != KErrNone)
-				    {
-				    // We return the last error found, ignoring any earlier ones
-				    //
-					ret = err;
-				    }
-			    }
-		    }		
-        }
-	else
-	    {
-		ret = KErrBadHandle;
-	    }
-	
-	return ret;
-    }
-
-
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-
-void CPdpFsmInterface::SetIMCNSignalling(TBool aImCnSignalling)
-/**
-Sets the IM CN signalling Parameters
-
-@param aImCnSignalling The status of the IMCN signalling Flag
-*/
-	{
-	TRAP_IGNORE(iDefaultSubConnProvd.AddIMCNInformationToParameterBundleL(aImCnSignalling));
-	}	
-	
-
-/**
-Set context parameters
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts - 1
-@param aParam - RPacketQoS::TQoSR5Requested data to set
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR5Requested& aParam)
-{
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR5Requested)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-	 TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	return KErrNone;
-}
-
-
-/**
-Set context parameters
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts - 1
-@param aParam - RPacketQoS::TQoSR5Negotiated data to set
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR5Negotiated& aParam)
-{
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR5Negotiated)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-	
-	TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	return KErrNone;
-}
-
-
-#else
-// !SYMBIAN_NETWORKING_UMTSR5
-
-/**
-Set context parameters
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketQoS::TQoSR99_R4Requested data to set
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Requested& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Requested)");
-
-	ASSERT(iPdpFsmFactory);
-    ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-    TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-
-    iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	return KErrNone;
-    }
-
-
-/**
-Set context parameters
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketQoS::TQoSR99_R4Negotiated data to set
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Negotiated& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-    TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	return KErrNone;
-    }
-
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 
-
-
-
-
-/** Set context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - TFTInfo data to set
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Set(TContextId aPdpId, const TTFTInfo& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(TFTInfo)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-    TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	return KErrNone;
-    }
-
-/** Set context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - TFTOperationCode to set to go with the data
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Set(TContextId aPdpId, const TTFTOperationCode& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(TTFTOperationCode)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-    TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	return KErrNone;
-    }
-
-/** Set context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketContext::TDataChannelV2 data to set
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketContext::TDataChannelV2& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TDataChannelV2)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-    TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	return KErrNone;
-    }
-
-/** Set context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketContext::TContextStatus data to set
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketContext::TContextStatus& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TContextStatus)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-    TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	return KErrNone;
-    }
-
-/** Set context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketContext::TContextConfigGPRS& data to set
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketContext::TContextConfigGPRS& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TContextConfigGPRS)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-    TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	return KErrNone;
-    }
-
-/** Set network status
-
-@param aParam - RPacketService::TStatus data to set
-*/
-void CPdpFsmInterface::Set(const RPacketService::TStatus aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketService::TStatus)");
-
-	ASSERT(iPdpFsmFactory);
-
-	iNetworkStatus = aParam;
-    }
-
-/** Set ETel termination error and stop context
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aErrorCode - the Etel error code detected on this context
-*/
-void CPdpFsmInterface::SetContextTerminationErrorAndStop(TContextId aPdpId, TInt aErrorCode)
-{
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::SetContextTerminationErrorAndStop(TContextId aPdpId, TInt aErrorCode)");
-
-	iSpudManInterface.SetContextTerminationErrorAndStop(aPdpId, aErrorCode);
-
-}
-
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-/**
-Get context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketQoS::TQoSR5Requested data to get
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR5Requested& aParam) const
-{
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQos::TQoSR5Requested)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-	TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	return KErrNone;
-}
-
-
-/**
-Get context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketQoS::TQoSR5Negotiated data to get
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR5Negotiated& aParam) const
-{
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQoS::TQoSR5Negotiated)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-	TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	return KErrNone;
-}
-
-#else
-// !SYMBIAN_NETWORKING_UMTSR5
-
-/**
-Get context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketQoS::TQoSR99_R4Requested data to get
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Requested& aParam) const
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQos::TQoSRequestedR99_R4)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-    TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	return KErrNone;
-    }
-
-
-/**
-Get context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketQoS::TQoSR99_R4Negotiated data to get
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Negotiated& aParam) const
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQoS::TQoSR99_R4Negotiated)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-    TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	return KErrNone;
-    }
-
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 
-
-
-
-/** Get context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - TTFTInfo data to get
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Get(TContextId aPdpId, TTFTInfo& aParam) const
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(TFTInfo)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-    TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	return KErrNone;
-    }
-
-/** Get context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - TTFTOperationCode for the TFT data
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Get(TContextId aPdpId, TTFTOperationCode& aParam) const
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(TFTInfo)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-    TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	return KErrNone;
-    }
-
-
-
-/** Get context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketContext::TDataChannelV2 data to set
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketContext::TDataChannelV2& aParam) const
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TDataChannelV2)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-    TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	return KErrNone;
-    }
-
-/** Get context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketContext::TContextConfigGPRS data to set
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketContext::TContextConfigGPRS& aParam) const
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TContextConfigGPRS)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-    TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	return KErrNone;
-    }
-
-/** Get context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketContext::TContextStatus data to get
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketContext::TContextStatus& aParam) const
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TContextStatus)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-    TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	return KErrNone;
-    }
-
-/** Get context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketContext::TContextConfigGPRS data to set
-@return - KErrBadHandle or KErrNone
-*/
-void CPdpFsmInterface::Get(RPacketService::TStatus& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketService::TStatus)");
-
-	ASSERT(iPdpFsmFactory);
-
-	aParam = iNetworkStatus;
-    }
-
-
-TInt CPdpFsmInterface::GetLastErrorCause(TContextId aPdpId, TInt& aLastErrorCause) const
-	{
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::GetLastErrorCause(RPacketContext::GetLastErrorCause)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-
-	TInt ret;
-    if (!iPdpFsmFactory->HaveFsmContext(aPdpId))
-        {
-        if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone)
-            {
-            return ret;
-            }
-        }
-        
-	iPdpFsmFactory->GetFsmContext(aPdpId)->GetLastErrorCause(aLastErrorCause);
-	
-	return KErrNone;
-	}
-
-/** Get the TsyName
-
-@return - TsyName in a TName
-*/
-const TName& CPdpFsmInterface::TsyName(void)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::TsyName");
-
-	ASSERT(iPdpFsmFactory);
-	
-	return iPdpFsmFactory->TsyName();
-}
-
-
--- a/telephonyprotocols/umtsgprsscpr/spudfsm/src/PDPSCPRFSM.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,534 +0,0 @@
-// Copyright (c) 2005-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:
-// Implementation file for the PDP Context Finite State Machine
-// 
-//
-
-/**
- @file 
-*/
-
-
-#include "PDPFSM.h"
-#include "cpdpfsmfactory.h"
-#include "spudfsmdebuglogger.h"
-#include "PDPDeftSCPR.h"
-
-
-//-=========================================================
-// Custom methods
-//-=========================================================
-CPdpFsmInterface::CPdpFsmInterface(CPDPDefaultSubConnectionProvider& aOwner)
-:iPdpFsmFactory(NULL), 
- iNetworkStatus(RPacketService::EStatusUnattached),
- iDefaultSubConnProvd(aOwner)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::()");
-    }
-
-CPdpFsmInterface::~CPdpFsmInterface()
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::()");
-	
-	CPdpFsmInterface::Close();
-	delete iPdpFsmFactory;
-    }
-
-TContextId CPdpFsmInterface::NewFsmContextL(MPdpFsmEventHandler& aPdpFsmEventHandler)
-    {
-    return iPdpFsmFactory->NewFsmContextL(aPdpFsmEventHandler);
-    }
-
-
-/** request to open the FSM
-
-@param aSpudManInterface reference to SpudMan interface
-*/
-void CPdpFsmInterface::OpenL(TName& aTsyName)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::OpenL()");
-
-	iPdpFsmFactory = CPdpFsmFactory::NewL();
-	iPdpFsmFactory->InitL(aTsyName, this);
-    }
-
-/** closes the FSM and frees underlying resources
-*/
-void CPdpFsmInterface::Close()
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Close()");
-
-	if (iPdpFsmFactory)
-	    {
-		iPdpFsmFactory->Close();
-	    }
-    }
-
-
-/** 
- Performs and input action/notification for context ID aPdpId
- If aPdpId is KAllContexts, the notification is sent to every context, unless it is of type EServiceStatusChangeNetwork
-
-@param aPdpId the PDP context ID, 0 to KMaxPdpContexts
-@param aOperation the operation id to perform
-@param aParam extra id for ETelDriver errors
-@return error code for the synchronus patrt of the operation
-*/
-TInt CPdpFsmInterface::Input(TContextId aPdpId, const TInt aOperation, const TInt aParam)
-    {
-	TInt ret = KErrNone;
-
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Input(aParam)");
-
-	ASSERT(iPdpFsmFactory);
-
-
-    // Control structure is in order of the most frequent operation first (hopefully)
-    //
-	if (iPdpFsmFactory->ContextIsValid(aPdpId))
-	    {
-	    // We have a valid PDP FSM Context, so go ahead with the operation...
-	    //
-	    ret = (iPdpFsmFactory->GetFsmContext(aPdpId))->Input(aOperation, aParam);
-
-        // Recovering memory by deleting the Fsm Context
-        //
-        // Tricky, definitely don't try with 'SpudMan::EContextDelete' it's far too early.
-        // You can get a bit further deleting on 'PdpFsm::EContextDeleted' (and 'PdpFsm::EContextDeletedFailed')
-        // from TContextDeleteStrategy::NotifyFsm(), but you then find that GuQoS is calling into Spud in order to
-        // transfer data from the deleted context to another...
-        //
-        // Additionally, the spud unit test is expecting to be able to "reuse" deleted contexts...
-	    }
-	else if (aPdpId == KAllContexts)
-	    {
-		TInt err = KErrNone;
-	
-		// this has to be here to avoid sending it from every context
-		//
-		if (aOperation == PdpFsm::EServiceStatusChangeNetwork)
-		    {	
-			iDefaultSubConnProvd.PdpFsmAllContextEvent(KNetworkStatusEvent, KErrNone);
-		    }
-		else
-		    {
-			for (TContextId i = 0; (i < KMaxPdpContexts) && iPdpFsmFactory->HaveFsmContext(i); i++)
-			    {
-		        // Process any current PDP contexts.
-		        
-		        err = (iPdpFsmFactory->GetFsmContext(i))->Input(aOperation, aParam);
-
-                // See above about trials and tribulations of trying to recover the memory taken by these 
-                // CPdpFsm objects.
-
-				if (err != KErrNone)
-				    {
-				    // We return the last error found, ignoring any earlier ones
-				    //
-					ret = err;
-				    }
-			    }
-		    }		
-        }
-	else
-	    {
-		ret = KErrBadHandle;
-	    }
-	
-	return ret;
-    }
-
-
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-
-/**
-Set context parameters
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts - 1
-@param aParam - RPacketQoS::TQoSR5Requested data to set
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR5Requested& aParam)
-{
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR5Requested)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	return KErrNone;
-}
-
-
-/**
-Set context parameters
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts - 1
-@param aParam - RPacketQoS::TQoSR5Negotiated data to set
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR5Negotiated& aParam)
-{
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR5Negotiated)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	return KErrNone;
-}
-
-
-#else
-// !SYMBIAN_NETWORKING_UMTSR5
-
-/**
-Set context parameters
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketQoS::TQoSR99_R4Requested data to set
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Requested& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Requested)");
-
-	ASSERT(iPdpFsmFactory);
-    ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
-    iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	return KErrNone;
-    }
-
-
-/**
-Set context parameters
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketQoS::TQoSR99_R4Negotiated data to set
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Negotiated& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	return KErrNone;
-    }
-
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 
-
-
-
-
-/** Set context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - TFTInfo data to set
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Set(TContextId aPdpId, const TTFTInfo& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(TFTInfo)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	return KErrNone;
-    }
-
-/** Set context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - TFTOperationCode to set to go with the data
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Set(TContextId aPdpId, const TTFTOperationCode& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(TTFTOperationCode)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	return KErrNone;
-    }
-
-/** Set context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketContext::TDataChannelV2 data to set
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketContext::TDataChannelV2& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TDataChannelV2)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	return KErrNone;
-    }
-
-/** Set context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketContext::TContextStatus data to set
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketContext::TContextStatus& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TContextStatus)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	return KErrNone;
-    }
-
-/** Set context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketContext::TContextConfigGPRS& data to set
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketContext::TContextConfigGPRS& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TContextConfigGPRS)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	return KErrNone;
-    }
-
-/** Set network status
-
-@param aParam - RPacketService::TStatus data to set
-*/
-void CPdpFsmInterface::Set(const RPacketService::TStatus aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketService::TStatus)");
-
-	ASSERT(iPdpFsmFactory);
-
-	iNetworkStatus = aParam;
-    }
-
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-/**
-Get context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketQoS::TQoSR5Requested data to get
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR5Requested& aParam) const
-{
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQos::TQoSR5Requested)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	return KErrNone;
-}
-
-
-/**
-Get context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketQoS::TQoSR5Negotiated data to get
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR5Negotiated& aParam) const
-{
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQoS::TQoSR5Negotiated)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	return KErrNone;
-}
-
-#else
-// !SYMBIAN_NETWORKING_UMTSR5
-
-/**
-Get context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketQoS::TQoSR99_R4Requested data to get
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Requested& aParam) const
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQos::TQoSRequestedR99_R4)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	return KErrNone;
-    }
-
-
-/**
-Get context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketQoS::TQoSR99_R4Negotiated data to get
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Negotiated& aParam) const
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQoS::TQoSR99_R4Negotiated)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	return KErrNone;
-    }
-
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 
-
-
-
-/** Get context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - TTFTInfo data to get
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Get(TContextId aPdpId, TTFTInfo& aParam) const
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(TFTInfo)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	return KErrNone;
-    }
-
-/** Get context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - TTFTOperationCode for the TFT data
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Get(TContextId aPdpId, TTFTOperationCode& aParam) const
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(TFTInfo)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	return KErrNone;
-    }
-
-
-
-/** Get context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketContext::TDataChannelV2 data to set
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketContext::TDataChannelV2& aParam) const
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TDataChannelV2)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	return KErrNone;
-    }
-
-/** Get context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketContext::TContextConfigGPRS data to set
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketContext::TContextConfigGPRS& aParam) const
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TContextConfigGPRS)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	return KErrNone;
-    }
-
-/** Get context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketContext::TContextStatus data to get
-@return - KErrBadHandle or KErrNone
-*/
-TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketContext::TContextStatus& aParam) const
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TContextStatus)");
-
-	ASSERT(iPdpFsmFactory);
-	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
-	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
-	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	return KErrNone;
-    }
-
-/** Get context parameters
-
-@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
-@param aParam - RPacketContext::TContextConfigGPRS data to set
-@return - KErrBadHandle or KErrNone
-*/
-void CPdpFsmInterface::Get(RPacketService::TStatus& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketService::TStatus)");
-
-	ASSERT(iPdpFsmFactory);
-
-	aParam = iNetworkStatus;
-    }
-
-
-/** Get the TsyName
-
-@return - TsyName in a TName
-*/
-const TName& CPdpFsmInterface::TsyName(void)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::TsyName");
-
-	ASSERT(iPdpFsmFactory);
-	
-	return iPdpFsmFactory->TsyName();
-}
-
-
--- a/telephonyprotocols/umtsgprsscpr/spudfsm/src/cpdpfsm.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,431 +0,0 @@
-// Copyright (c) 2004-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:
-// PDP FSM implementation
-// @internalTechnology
-// 
-//
-
-
-#include "tpdpstates.h"
-#include "cpdpfsm.h"
-#include "cpdpfsmfactory.h"
-#include "spudfsmdebuglogger.h"
-#include "eteldrivernmspace.h"
-
-void CPdpFsm::ConstructL()
-	{
-	// Create EtelDriver for this ID - does nothing on ETel
-	iEtelDriverInput->CreatePdpL(iPdpId);
-	
-	// we need a state
-	iState = &iPdpFsmFactory->iStateInitialised;
-	}
-	
-CPdpFsm* CPdpFsm::NewL(TContextId aPdpId, CPdpFsmFactory * aPdpFsmFactory, REtelDriverInput * aEtelDriverInput)
-	{
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::NewL()");
-	CPdpFsm* self = new (ELeave)CPdpFsm(aPdpId, aPdpFsmFactory, aEtelDriverInput);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-CPdpFsm::CPdpFsm(TContextId aPdpId, CPdpFsmFactory * aPdpFsmFactory, REtelDriverInput * aEtelDriverInput) :
-	iPdpFsmFactory(aPdpFsmFactory),
-	iEtelDriverInput(aEtelDriverInput),
-	iPdpId(aPdpId)
-// NOTE: Both pointers are valid when called - see CPdpFsmFactory and CPdpFsmInterface. 
-// No other caller is expected.
-    {
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-	}
-	
-CPdpFsm::~CPdpFsm()
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::~CPdpFsm()");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-    }
-
-	
-TInt CPdpFsm::Input (const TInt aOperation, const TInt aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Input()");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-	
-#ifdef _DEBUG // NOT DEBUGRELEASE
-	SPUDFSMVERBOSE_LOG1(_L("State : %S"), &iState->iName);
-#endif	
-
-	SPUDFSM_LOG3(_L("Pdp ID %d, State '%S', Operation '%S'"),iPdpId, &iState->iName, iState->LogOperation(*this, aOperation));
-
-	return iState->Input (*this, aOperation, aParam);
-    }
-	
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-void CPdpFsm::Get(RPacketQoS::TQoSR5Requested& aParam)
-{
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(QoSR5Req)");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-
-	ASSERT(iQosRequested.ExtensionId() == TPacketDataConfigBase::KConfigRel5);
-	aParam = iQosRequested.RequestedQoSR5();
-}
-
-void CPdpFsm::Get(RPacketQoS::TQoSR5Negotiated& aParam)
-{
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(QoSR5Neg)");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-
-	ASSERT(iQosNegotiated.ExtensionId() == TPacketDataConfigBase::KConfigRel5);
-	aParam = iQosNegotiated.NegotiatedQoSR5();
-}
-
-#else
-// !SYMBIAN_NETWORKING_UMTSR5
-
-void CPdpFsm::Get(RPacketQoS::TQoSR99_R4Requested& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(QosReq)");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-
-	aParam = iQosRequested.RequestedQoSR99_R4();
-    }
-
-void CPdpFsm::Get(RPacketQoS::TQoSR99_R4Negotiated& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(QoSNeg)");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-
-	aParam = iQosNegotiated.NegotiatedQoSR99_R4();
-    }
-    
-#endif
-// SYMBIAN_NETWORKING_UMTSR5
-
-
-void CPdpFsm::Get(TTFTInfo& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(TFTInfo)");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-
-	aParam = iTFT;
-    }
-
-void CPdpFsm::Get(TTFTOperationCode& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(TFTOperationCode)");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-
-	aParam = iTFTOperationCode;
-    }
-
-void CPdpFsm::Get(RPacketContext::TDataChannelV2& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(RPacketContext::TDataChannelV2)");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-
-	aParam = iDataChannelV2;
-    }
-
-void CPdpFsm::Get(RPacketContext::TContextConfigGPRS& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(RPacketContext::TContextConfigGPRS)");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-
-	aParam = iGPRS;
-    }
-
-void CPdpFsm::Get(RPacketContext::TContextStatus& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(RPacketContext::TContextStatus)");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-
-	aParam = iContextStatus;
-    }
-
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-void CPdpFsm::Set(const RPacketQoS::TQoSR5Requested& aParam)
-{
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(QoSR5Req)");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-
-	iQosRequested = aParam;
-}
-
-void CPdpFsm::Set(const RPacketQoS::TQoSR5Negotiated& aParam)
-{
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(QoSR5Neg)");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-
-	iQosNegotiated = aParam;
-}
-
-#else
-// !SYMBIAN_NETWORKING_UMTSR5
-
-
-void CPdpFsm::Set(const RPacketQoS::TQoSR99_R4Requested& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(QoSReq)");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-
-	iQosRequested = aParam;
-
-    }
-
-
-void CPdpFsm::Set(const RPacketQoS::TQoSR99_R4Negotiated& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(QoSNeg)");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-
-	iQosNegotiated = aParam;
-    }
-
-
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5
-
-
-void CPdpFsm::Set(const TTFTInfo& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(TFT)");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-
-	iTFT = aParam;
-    }
-
-void CPdpFsm::Set(const TTFTOperationCode& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(TFTOperationCode)");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-
-	iTFTOperationCode = aParam;
-    }
-
-void CPdpFsm::Set(const RPacketContext::TDataChannelV2& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(RPacketContext::TDataChannelV2)");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-
-	iDataChannelV2 = aParam;
-    }
-
-void CPdpFsm::Set(const RPacketContext::TContextStatus& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(RPacketContext::TContextStatus)");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-
-	iContextStatus = aParam;
-    }
-
-void CPdpFsm::Set(const RPacketContext::TContextConfigGPRS& aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(RPacketContext::TContextConfigGPRS)");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-
-	iGPRS = aParam;
-    }
-
-void CPdpFsm::EtelInput (EtelDriver::TEtelInput aOperation)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::EtelInput");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-	
-	iEtelDriverInput->Input (iPdpId, aOperation);
-    }
-
-void CPdpFsm::EtelCancel (void)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::EtelCancel");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-	
-	iEtelDriverInput->CancelPdp (iPdpId);
-    }
-
-void CPdpFsm::GetLastErrorCause  (TInt& aLastErrorCause)
-{
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::GetLastErrorCause");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-	
-	iEtelDriverInput->GetLastErrorCause (iPdpId, aLastErrorCause);
-}
-
-void CPdpFsm::SpudInput (TInt aNotification, TInt aParam)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::SpudInput");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-	
-	iPdpFsmFactory->SpudInput (iPdpId, aNotification, aParam);
-    }
-
-// state change members
-
-void CPdpFsm::ChangeStateToInitialised(void)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToInitialised");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-	SPUDFSM_LOG(_L("New State : Initialised"));
-	
-	iState = &iPdpFsmFactory->iStateInitialised;
-    }
-
-void CPdpFsm::ChangeStateToOpeningPhone(void)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToOpeningPhone");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-	SPUDFSM_LOG(_L("New State : OpeningPhone"));
-	
-	iState = &iPdpFsmFactory->iStateOpeningPhone;
-    }
-
-void CPdpFsm::ChangeStateToCreatingPrimary(void)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToCreatingPrimary");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-	SPUDFSM_LOG(_L("New State : CreatingPrimary"));
-	
-	iState = &iPdpFsmFactory->iStateCreatingPrimary;
-    }
-
-void CPdpFsm::ChangeStateToActivatingPrimary(void)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToActivatingPrimary");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-	SPUDFSM_LOG(_L("New State : ActivatingPrimary"));
-	
-	iState = &iPdpFsmFactory->iStateActivatingPrimary;
-    }
-
-void CPdpFsm::ChangeStateToCreatingSecondary(void)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToCreatingSecondary");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-	SPUDFSM_LOG(_L("New State : CreatingSecondary"));
-	
-	iState = &iPdpFsmFactory->iStateCreatingSecondary;
-    }
-
-void CPdpFsm::ChangeStateToCreatedSecondary(void)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToCreatedSecondary");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-	SPUDFSM_LOG(_L("New State : CreatedSecondary"));
-	
-	iState = &iPdpFsmFactory->iStateCreatedSecondary;
-    }
-
-void CPdpFsm::ChangeStateToSettingTFT(void)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToSettingTFT");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-	SPUDFSM_LOG(_L("New State : SettingTFT"));
-	
-	iState = &iPdpFsmFactory->iStateSettingTFT;
-    }
-
-void CPdpFsm::ChangeStateToSettingQoS(void)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToSettingQoS");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-	SPUDFSM_LOG(_L("New State : SettingQoS"));
-	
-	iState = &iPdpFsmFactory->iStateSettingQoS;
-    }
-
-void CPdpFsm::ChangeStateToActivatingSecondary(void)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToActivatingSecondary");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-	SPUDFSM_LOG(_L("New State : ActivatingSecondary"));
-	
-	iState = &iPdpFsmFactory->iStateActivatingSecondary;
-    }
-
-void CPdpFsm::ChangeStateToOpen(void)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToOpen");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-	SPUDFSM_LOG(_L("New State : Open"));
-	
-	iState = &iPdpFsmFactory->iStateOpen;
-    }
-
-void CPdpFsm::ChangeStateToChangingQoS(void)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToChangingQoS");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-	SPUDFSM_LOG(_L("New State : ChangingQoS"));
-	
-	iState = &iPdpFsmFactory->iStateChangingQoS;
-    }
-
-void CPdpFsm::ChangeStateToChangingTFT(void)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToChangingTFT");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-	SPUDFSM_LOG(_L("New State : ChangingTFT"));
-	
-	iState = &iPdpFsmFactory->iStateChangingTFT;
-    }
-
-void CPdpFsm::ChangeStateToGettingNegQoS(void)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToGettingNegQoS");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-	SPUDFSM_LOG(_L("New State : GettingNegQoS"));
-	
-	iState = &iPdpFsmFactory->iStateGettingNegQoS;
-    }
-
-
-
-void CPdpFsm::ChangeStateToModifingActive(void)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToModifingActive");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-	SPUDFSM_LOG(_L("New State : ModifingActive"));
-	
-	iState = &iPdpFsmFactory->iStateModifyingActive;
-    }
-
-void CPdpFsm::ChangeStateToSuspended(void)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToSuspended");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-	SPUDFSM_LOG(_L("New State : Suspended"));
-	
-	iState = &iPdpFsmFactory->iStateSuspended;
-    }
-
-void CPdpFsm::ChangeStateToClosing(void)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToClosing");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-	SPUDFSM_LOG(_L("New State : Closing"));
-	
-	iState = &iPdpFsmFactory->iStateClosing;
-    }
-
-void CPdpFsm::ChangeStateToStopping(void)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToStopping");
-	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
-	SPUDFSM_LOG(_L("New State : Stopping"));
-	
-	iState = &iPdpFsmFactory->iStateStopping;
-    }
--- a/telephonyprotocols/umtsgprsscpr/spudfsm/src/cpdpfsm.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,171 +0,0 @@
-// Copyright (c) 2004-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:
-// PDP FSM header
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#ifndef CPDPFSM_H
-#define CPDPFSM_H
-
-#include <e32base.h>
-#include <etelmm.h>
-#include <etelqos.h>
-#include <networking/umtsnifcontrolif.h>
-#include "reteldriverinput.h"
-#include "pdpfsmnmspace.h"
-
-#include "tpdpstates.h"
-
-class CPdpFsmFactory;
-class RPacketQoS;
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-class TQoSR5Requested;
-class TQoSR5Negotiated; 
-#else
-class TQoSR99_R4Requested;
-class TQoSR99_R4Negotiated;
-
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5
-class TFTInfo;
-class TFTOperationCode;
-
-class CPdpFsm : public CBase
-{
-	friend class TPdpState;
-	friend class TPdpStateInitialised;
-	friend class TPdpStateOpeningPhone;
-	friend class TPdpStateCreatingPrimary;
-	friend class TPdpStateActivatingPrimary;
-	friend class TPdpStateCreatingSecondary;
-	friend class TPdpStateCreatedSecondary;
-	friend class TPdpStateSettingQoS;
-	friend class TPdpStateSettingTFT;
-	friend class TPdpStateActivatingSecondary;
-	friend class TPdpStateOpen;
-	friend class TPdpStateChangingQoS;
-	friend class TPdpStateChangingTFT;
-	friend class TPdpStateGettingNegQoS;
-	friend class TPdpStateModifyingActive;
-	friend class TPdpStateSuspended;
-	friend class TPdpStateClosing;
-	friend class TPdpStateStopping;
-	
-public:
-	static CPdpFsm* NewL(TContextId aPdpId, CPdpFsmFactory * aPdpFsmFactory, REtelDriverInput * aEtelDriverInput);
-	void ConstructL();
-	~CPdpFsm();
-	
-	TInt Input (const TInt aOperation, const TInt aParam);
-	
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-	void Get(RPacketQoS::TQoSR5Requested& aParam);
-	void Get(RPacketQoS::TQoSR5Negotiated& aParam);
-	void Set(const RPacketQoS::TQoSR5Requested& aParam);
-	void Set(const RPacketQoS::TQoSR5Negotiated& aParam);
-	
-#else
-	void Get(RPacketQoS::TQoSR99_R4Requested& aParam);
-	void Get(RPacketQoS::TQoSR99_R4Negotiated& aParam);
-	void Set(const RPacketQoS::TQoSR99_R4Requested& aParam);
-	void Set(const RPacketQoS::TQoSR99_R4Negotiated& aParam);
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5
-
-	void Get(TTFTInfo& aParam);
-	void Get(TTFTOperationCode& aParam);
-	void Get(RPacketContext::TDataChannelV2& aParam);
-	void Get(RPacketContext::TContextConfigGPRS& aParam);
-	void Get(RPacketContext::TContextStatus& aParam);
-
-	void GetLastErrorCause(TInt& aLastErrorCause);
- 	
-	void Set(const TTFTInfo& aParam);
-	void Set(const TTFTOperationCode& aParam);
-	void Set(const RPacketContext::TDataChannelV2& aParam);
-	void Set(const RPacketContext::TContextConfigGPRS& aParam);
-
-	void Set(const RPacketContext::TContextStatus& aParam);
-
-    void EtelInput (EtelDriver::TEtelInput aOperation);
-	void EtelCancel (void);
-    void SpudInput (TInt aNotification, TInt aParam);
-    
-protected:
-	CPdpFsm(TContextId aPdpId, CPdpFsmFactory * aPdpFsmFactory, REtelDriverInput * aEtelDriverInput);
-	
-private:
-	void ChangeStateToInitialised(void);
-	void ChangeStateToOpeningPhone(void);
-	void ChangeStateToCreatingPrimary(void);
-	void ChangeStateToActivatingPrimary(void);
-	void ChangeStateToCreatingSecondary(void);
-	void ChangeStateToCreatedSecondary(void);
-	void ChangeStateToSettingQoS(void);
-	void ChangeStateToSettingTFT(void);
-	void ChangeStateToActivatingSecondary(void);
-	void ChangeStateToOpen(void);
-	void ChangeStateToChangingQoS(void);
-	void ChangeStateToChangingTFT(void);
-	void ChangeStateToGettingNegQoS(void);
-	void ChangeStateToModifingActive(void);
-	void ChangeStateToSuspended(void);
-	void ChangeStateToClosing(void);
-	void ChangeStateToStopping(void);
-
-	
-public:
-protected:
-private:
-	
-	// local data cache for this context
-	TRequestedProfileBuffer iQosRequested;
-	TNegotiatedProfileBuffer iQosNegotiated;
-
-	RPacketContext::TDataChannelV2     iDataChannelV2;
-	RPacketContext::TContextStatus     iContextStatus;
-	TTFTInfo 						   iTFT;
-	TTFTOperationCode				   iTFTOperationCode;
-	RPacketContext::TContextConfigGPRS iGPRS;
-
-	CPdpFsmFactory   * iPdpFsmFactory; // need stuff from  factory
-	REtelDriverInput * iEtelDriverInput;
-	
-	TPdpState * iState; // current state
-	
-	TContextId  iPdpId; // our instance PDP context id - fixed when allocateed
-
-	enum TContextType
-	{
-		ENone,
-		EPrimary,
-		ESecondary
-	} iContextType;
-	
-
-};
-
-
-
-#endif // CPDPFSM_H
-
-
-
--- a/telephonyprotocols/umtsgprsscpr/spudfsm/src/cpdpfsmfactory.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,152 +0,0 @@
-// Copyright (c) 2004-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:
-// PDP FSM factory implementation
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
- 
-#include "cpdpfsmfactory.h"
-#include "spudfsmdebuglogger.h"
-
-// NewL 
-CPdpFsmFactory* CPdpFsmFactory::NewL ()
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::NewL()");
-	
-	return new (ELeave) CPdpFsmFactory ();	
-    }
-
-#if defined(__VC32__)
-#if (_MSC_VER >= 1200)
-#pragma warning(disable:4355) 
-#endif
-#endif
-//Cpdpfsmfactory.cpp(22...) : warning C4355: 'this' : used in base member initializer list
-// these warnings are benign unless the designed usage of SpudFsm changes such that SpudFsm is used
-// as a base class to something else, in which case this code will have to change IFF the this pointer
-// passed is used in the states c'tor. Currently, the pointer is just stored.
-// In V9, e32def.h turns this warning off.
-
-CPdpFsmFactory::CPdpFsmFactory()
-: iStateInitialised (this),
-  iStateOpeningPhone (this),
-  iStateCreatingPrimary (this),
-  iStateActivatingPrimary (this),
-  iStateCreatingSecondary (this),
-  iStateCreatedSecondary (this),
-  iStateSettingQoS (this),
-  iStateSettingTFT (this),
-  iStateActivatingSecondary (this),
-  iStateOpen (this),
-  iStateChangingQoS (this),
-  iStateChangingTFT (this),
-  iStateGettingNegQoS (this),
-  iStateModifyingActive (this),
-  iStateSuspended (this),
-  iStateClosing (this),
-  iStateStopping (this)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::CPdpFsmFactory()");
-    }
-
-
-CPdpFsmFactory::~CPdpFsmFactory()
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::~CPdpFsmFactory()");
-	
-	delete iEtelDriverInput;
-
-    iContexts.DeleteAll();
-    iContexts.Reset();
-    }
-
-
-void CPdpFsmFactory::InitL(TName& aTsyName, CPdpFsmInterface * aPdpFsmInterface)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::InitL()");
-
-	iPdpFsmInterface = aPdpFsmInterface;
-	
-	iTsyName = aTsyName;
-
-	// lets kick off the ETelDriver first then we only alloc FSMs if it works
-	//
-	iEtelDriverInput = new (ELeave) REtelDriverInput;
-
-	iEtelDriverInput->OpenL (*iPdpFsmInterface);
-
-	// Only create PDP contexts if specifically requested.
-    }
-
-
-void CPdpFsmFactory::Close (void)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::Close()");
-	iEtelDriverInput->Close();
-    }
-
-
-/** 
-@return may return NULL if there is no PDP context with that Id
-*/
-CPdpFsm* CPdpFsmFactory::GetFsmContext (TContextId aPdpId)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::GetContext()");
-
-	return iContexts[aPdpId];
-    }
-
-
-const TName& CPdpFsmFactory::TsyName(void)
-    {
-	return iTsyName;
-    }
-
-
-TInt CPdpFsmFactory::NewFsmContext(TContextId aPdpId)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::NewFsmContext()");
-	ASSERT(ContextIdIsValid(aPdpId));
-	
-	TInt ret = KErrNone;
-
-    if (!HaveFsmContext(aPdpId))
-        {
-	    // Only ever called by non-leaving functions. We're going to have to trap at some point in the calling hierarchy...
-	    //
-	    TRAP(ret,
-	         CPdpFsm* p = CPdpFsm::NewL(aPdpId, this, iEtelDriverInput);
-	         iContexts[aPdpId] = p;
-	         );
-	    }
-
-    return ret;	
-    }
-    
-    
-TInt CPdpFsmFactory::DeleteFsmContext(TContextId aPdpId)
-    {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::DeleteFsmContext()");
-	ASSERT(ContextIsValid(aPdpId));
-
-    delete iContexts[aPdpId];
-    iContexts[aPdpId] = NULL;
-    
-	return KErrNone;
-    }
-    
--- a/telephonyprotocols/umtsgprsscpr/spudfsm/src/cpdpfsmfactory.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
-// Copyright (c) 2004-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:
-// PDP FSM factory header
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#ifndef CPDPFSMFACTORY_H
-#define CPDPFSMFACTORY_H
-
-#include <networking/umtsnifcontrolif.h>
-
-#include "PDPFSM.h"
-#include "reteldriverinput.h"
-#include "cpdpfsm.h"
-#include "tpdpstates.h"
-
-/** factory (and owner) of FSM objects */
-class CPdpFsmFactory : public CBase
-{
-	friend class CPdpFsm;
-	friend class TPdpState;
-	friend class TPdpStateInitialised; // Needs iEtelOpened
-	friend class TPdpStateOpeningPhone; // Needs iEtelOpened
-public:
-	static CPdpFsmFactory * NewL();
-	
-	virtual ~CPdpFsmFactory();
-	void InitL(TName& aTsyName, CPdpFsmInterface * aPdpFsmInterface);
-	
-	TInt NewFsmContext(TContextId aPdpId);
-	TInt DeleteFsmContext(TContextId aPdpId);
-	
-	CPdpFsm*  GetFsmContext(TContextId aPdpId);
-	
-	inline TBool HaveFsmContext(TContextId aPdpId)   const;
-	inline TBool ContextIdIsValid(TContextId aPdpId) const;
-	inline TBool ContextIsValid(TContextId aPdpId)   const;
-	
-	void Close (void);
-	
-	void SpudInput (TContextId aPdpId, TInt aNotification, TInt aParam);
-
-	void SetContextTerminationErrorAndStop(TContextId aPdpId, TInt aErrorCode);
-
-	TInt GetLastErrorCause(TContextId aPdpId, TInt& aLastErrorCause);
-
-	const TName& TsyName(void);
-
-protected:	
-private:
-	CPdpFsmFactory();
-
-public:
-protected:
-private:
-	TFixedArray<CPdpFsm*, KMaxPdpContexts> iContexts;
-
-	// the states
-	TPdpStateInitialised   		 iStateInitialised;
-	TPdpStateOpeningPhone		 iStateOpeningPhone;
-	TPdpStateCreatingPrimary     iStateCreatingPrimary;
-	TPdpStateActivatingPrimary   iStateActivatingPrimary;
-	TPdpStateCreatingSecondary   iStateCreatingSecondary;
-	TPdpStateCreatedSecondary    iStateCreatedSecondary;
-	TPdpStateSettingQoS	   		 iStateSettingQoS;
-	TPdpStateSettingTFT	   		 iStateSettingTFT;
-	TPdpStateActivatingSecondary iStateActivatingSecondary;
-	TPdpStateOpen		   		 iStateOpen;
-	TPdpStateChangingQoS   		 iStateChangingQoS;
-	TPdpStateChangingTFT   		 iStateChangingTFT;
-	TPdpStateGettingNegQoS		 iStateGettingNegQoS;
-	TPdpStateModifyingActive	 iStateModifyingActive;
-	TPdpStateSuspended	   		 iStateSuspended;
-	TPdpStateClosing	   		 iStateClosing;
-	TPdpStateStopping	   		 iStateStopping;
-	
-	CPdpFsmInterface  * iPdpFsmInterface;
-	REtelDriverInput  * iEtelDriverInput;
-	
-	TBool iEtelOpened;
-	
-	TName iTsyName;	
-};
-
-
-inline void CPdpFsmFactory::SpudInput (TContextId aPdpId, TInt aNotification, TInt aParam)
-    {
-	iPdpFsmInterface->SpudInput (aPdpId, aNotification, aParam);
-    }
-
-
-inline TBool CPdpFsmFactory::HaveFsmContext(TContextId aPdpId) const
-    {
-	return (iContexts[aPdpId] != NULL);
-    }
-
-
-inline TBool CPdpFsmFactory::ContextIdIsValid(TContextId aPdpId) const
-    {
-	return (aPdpId >= 0 && aPdpId < KMaxPdpContexts);
-    }
-
-
-inline TBool CPdpFsmFactory::ContextIsValid(TContextId aPdpId) const
-    {
-	return (ContextIdIsValid(aPdpId) && HaveFsmContext(aPdpId));
-    }
-
-#endif // CPDPFSMFACTORY_H
--- a/telephonyprotocols/umtsgprsscpr/spudfsm/src/spudfsmdebuglogger.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-// Copyright (c) 2004-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:
-// SpudFsm Data and Event Logger header
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#ifndef SPUDFSMDEBUGLOGGER_H
-#define SPUDFSMDEBUGLOGGER_H
-
-#include "comms-infras/commsdebugutility.h"
-
-#ifdef __FLOG_ACTIVE
-
-#include <e32base.h>
-
-_LIT8(KSpudFsmLogFileVerbose,"SPUDFSMVERB.TXT");
-_LIT8(KSpudFsmLogFile,"SPUDFSM.TXT");
-_LIT8(KSpudFsmLogFolder,"SPUD");
-
-// Static Output Logging Macros
-#define SPUDFSMVERBOSE_LOG(text) 			__FLOG_STATIC0(KSpudFsmLogFolder,KSpudFsmLogFileVerbose,text)
-#define SPUDFSMVERBOSE_LOG1(text,a)		    __FLOG_STATIC1(KSpudFsmLogFolder,KSpudFsmLogFileVerbose,text, a)
-#define SPUDFSMVERBOSE_LOG2(text,a, b)		__FLOG_STATIC2(KSpudFsmLogFolder,KSpudFsmLogFileVerbose,text,a,b)
-#define SPUDFSMVERBOSE_LOG3(text,a, b, c)	__FLOG_STATIC3(KSpudFsmLogFolder,KSpudFsmLogFileVerbose,text,a,b,c)
-#define SPUDFSM_LOG(text) 					__FLOG_STATIC0(KSpudFsmLogFolder,KSpudFsmLogFile,text)
-#define SPUDFSM_LOG1(text,a)		    	__FLOG_STATIC1(KSpudFsmLogFolder,KSpudFsmLogFile,text, a)
-#define SPUDFSM_LOG2(text,a, b)				__FLOG_STATIC2(KSpudFsmLogFolder,KSpudFsmLogFile,text,a,b)
-#define SPUDFSM_LOG3(text,a, b, c)			__FLOG_STATIC3(KSpudFsmLogFolder,KSpudFsmLogFile,text,a,b,c)
-
-
-_LIT(KSpudFsmMsgIn, ">>%S");
-_LIT(KSpudFsmMsgOut,"<<%S");
-
-class TSpudFsmLogVerboseFn
-{
-	protected:
-	TBuf<100> iName;
-
-	public:
-	TSpudFsmLogVerboseFn(const TDesC& aName) 	{ iName = aName; SPUDFSMVERBOSE_LOG1(KSpudFsmMsgIn, &iName);};
-	~TSpudFsmLogVerboseFn()						{ SPUDFSMVERBOSE_LOG1(KSpudFsmMsgOut, &iName);};
-};
-
-#define SPUDFSMVERBOSE_FNLOG(name) TSpudFsmLogVerboseFn spudFsmVerboseFnLog(_L(name))
-
-// error logging
-#if defined(_ERROR_LOG)
-#define SPUDFSM_ERROR_LOG(errtext, err)	{ __FLOG_STATIC0(KSpudFsmLogFolder,KSpudFsmLogFile, _L("ERROR: ")); \
-										__FLOG_STATIC1(KSpudFsmLogFolder,KSpudFsmLogFile, errtext, err); }
-#else // defined(_ERROR_LOG)
-#define SPUDFSM_ERROR_LOG(errtext, err)
-#endif // defined(_ERROR_LOG)
-
-#else // __FLOG_ACTIVE
-
-#define SPUDFSM_LOG(t)
-#define SPUDFSM_LOG1(t,a)
-#define SPUDFSM_LOG2(t,a,b)
-#define SPUDFSM_LOG3(t,a,b,c)
-#define SPUDFSMVERBOSE_LOG(t)
-#define SPUDFSMVERBOSE_LOG1(t,a)
-#define SPUDFSMVERBOSE_LOG2(t,a,b)
-#define SPUDFSMVERBOSE_LOG3(t,a,b,c)
-#define SPUDFSMVERBOSE_FNLOG(name)
-#define SPUDFSM_ERROR_LOG(errtext, err)
-
-#endif // __FLOG_ACTIVE
-
-
-#endif
-// SPUDFSMDEBUGLOGGER_H
--- a/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstate.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,269 +0,0 @@
-// Copyright (c) 2004-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:
-// Base class to the various states required in Spud FSM. Each real state is derived from
-// this base class. The bass class is never instanciated but it's base functionality is 
-// used for default handling in the most part.
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
- 
-#include <networking/umtsnifcontrolif.h>
-#include "cpdpfsmfactory.h"
-#include "tpdpstate.h"
-#include "spudfsmdebuglogger.h"
-#include "pdpfsmnmspace.h"
-#include "reteldriverinput.h"
-#include "PDPFSM.h"
-
-// Literals for TPdpState::LogOperation
-
-_LIT(KPdpFsm_EPhoneOpened, "PdpFsm::EPhoneOpened");
-_LIT(KPdpFsm_EPhoneOpenedFailed, "PdpFsm::EPhoneOpenedFailed");
-_LIT(KPdpFsm_EQoSSet, "PdpFsm::EQoSSet");
-_LIT(KPdpFsm_EQoSSetFailed, "PdpFsm::EQoSSetFailed");
-_LIT(KPdpFsm_ETftSet, "PdpFsm::ETftSet");
-_LIT(KPdpFsm_ETftSetFailed, "PdpFsm::ETftSetFailed");
-_LIT(KPdpFsm_ETftChanged, "PdpFsm::ETftChanged");
-_LIT(KPdpFsm_ETftChangedFailed, "PdpFsm::ETftChangedFailed");
-_LIT(KPdpFsm_E1ryPdpContextCreated, "PdpFsm::E1ryPdpContextCreated");
-_LIT(KPdpFsm_E1ryPdpContextCreatedFailed, "PdpFsm::E1ryPdpContextCreatedFailed");
-_LIT(KPdpFsm_E2ryPdpContextCreated, "PdpFsm::E2ryPdpContextCreated");
-_LIT(KPdpFsm_E2ryPdpContextCreatedFailed, "PdpFsm::E2ryPdpContextCreatedFailed");
-_LIT(KPdpFsm_EPdpActivated, "PdpFsm::EPdpActivated");
-_LIT(KPdpFsm_EPdpActivatedFailed, "PdpFsm::EPdpActivatedFailed");
-_LIT(KPdpFsm_EContextDeleted, "PdpFsm::EContextDeleted");
-_LIT(KPdpFsm_EContextDeletedFailed, "PdpFsm::EContextDeletedFailed");
-_LIT(KPdpFsm_EQoSProfileChangeNetwork, "PdpFsm::EQoSProfileChangeNetwork");
-_LIT(KPdpFsm_EConfigGPRSChangeNetwork, "PdpFsm::EConfigGPRSChangeNetwork");
-_LIT(KPdpFsm_EPacketStatusChangeNetwork, "PdpFsm::EPacketStatusChangeNetwork");
-_LIT(KPdpFsm_EPdpContextModified, "PdpFsm::EPdpContextModified");
-_LIT(KPdpFsm_EPdpContextModifiedFailed, "PdpFsm::EPdpContextModifiedFailed");
-_LIT(KRPacketContext_EStatusUnknown, "RPacketContext::EStatusUnknown");
-_LIT(KRPacketContext_EStatusInactive, "RPacketContext::EStatusInactive");
-_LIT(KRPacketContext_EStatusActivating, "RPacketContext::EStatusActivating");
-_LIT(KRPacketContext_EStatusActive, "RPacketContext::EStatusActive");
-_LIT(KRPacketContext_EStatusDeactivating, "RPacketContext::EStatusDeactivating");
-_LIT(KRPacketContext_EStatusSuspended, "RPacketContext::EStatusSuspended");
-_LIT(KRPacketContext_EStatusDeleted, "RPacketContext::EStatusDeleted");
-_LIT(KEContextStatusChangeNetwork_Unknown, "EContextStatusChangeNetwork_Unknown");
-_LIT(KRPacketService_EStatusUnattached, "RPacketService::EStatusUnattached");
-_LIT(KRPacketService_EStatusAttached, "RPacketService::EStatusAttached");
-_LIT(KRPacketService_EStatusActive, "RPacketService::EStatusActive");
-_LIT(KRPacketService_EStatusSuspended, "RPacketService::EStatusSuspended");
-_LIT(KEServiceStatusChangeNetwork_Unknown, "EServiceStatusChangeNetwork_Unknown");
-_LIT(KSpudMan_EContextCreate, "SpudMan::EContextCreate");
-_LIT(KSpudMan_EContextDelete, "SpudMan::EContextDelete");
-_LIT(KSpudMan_EContextActivate, "SpudMan::EContextActivate");
-_LIT(KSpudMan_ERegisterEventHandler, "SpudMan::ERegisterEventHandler");
-_LIT(KSpudMan_EContextSetEvents, "SpudMan::EContextSetEvents");
-_LIT(KSpudMan_EContextQoSSet, "SpudMan::EContextQoSSet");
-_LIT(KSpudMan_EContextModifyActive, "SpudMan::EContextModifyActive");
-_LIT(KSpudMan_EContextTFTModify, "SpudMan::EContextTFTModify");
-_LIT(KSpudMan_ENifSetDefaultQoS, "SpudMan::ENifSetDefaultQoS");
-_LIT(KSpudMan_EStartupPrimaryContextCreation, "SpudMan::EStartupPrimaryContextCreation");
-_LIT(KSpudMan_ESetDefaultQoS, "SpudMan::ESetDefaultQoS");
-_LIT(KSpudMan_ECreatePrimaryPDPContext, "SpudMan::ECreatePrimaryPDPContext");
-_LIT(KSpudMan_ECreateSecondaryPDPContext, "SpudMan::ECreateSecondaryPDPContext");
-_LIT(KSpudMan_ESuspend, "SpudMan::ESuspend");
-_LIT(KSpudMan_EResume, "SpudMan::EResume");
-_LIT(KSpudMan_E1ryPdpActivate, "SpudMan::E1ryPdpActivate");
-_LIT(KSpudMan_ECancelContextCreate, "SpudMan::ECancelContextCreate");
-_LIT(KSpudMan_EGetNegQoS, "SpudMan::EGetNegQoS");
-_LIT(KUnknown, "Unknown");
-
-
-TPdpState::TPdpState()
-#ifdef _DEBUG
-	: iName()
-#endif		
-{
-	SPUDFSMVERBOSE_FNLOG("TPdpState::TPdpState()");
-}
-
-TInt TPdpState::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt /*aErrorCode*/)
-{
-	SPUDFSMVERBOSE_FNLOG("TPdpState::Input()");
-	SPUDFSMVERBOSE_LOG1(_L("aOperation : %d"), aOperation);
-
-	if (aOperation == PdpFsm::EContextDeleted || aOperation == SpudMan::EContextDelete ||
-		(aOperation == PdpFsm::EContextStatusChangeNetwork && aFsm.iContextStatus == RPacketContext::EStatusDeleted))
-	{
-		aFsm.ChangeStateToClosing();
-		EtelDriverCancel (aFsm);
-		EtelDriverInput(aFsm, EtelDriver::EContextDelete);
-		return KErrNone;
-	}
-
-	SPUDFSMVERBOSE_LOG1(_L("!!! Unhandled Operation (%S)!!!"), LogOperation (aFsm, aOperation));
-	return KErrGeneral;
-}
-
-void TPdpState::EtelDriverInput (CPdpFsm& aFsm, EtelDriver::TEtelInput aOperation)
-{
-	SPUDFSMVERBOSE_LOG1(_L("EtelDriverInput : %d"), aOperation);
-	aFsm.EtelInput (aOperation);
-}
-
-void TPdpState::EtelDriverCancel (CPdpFsm& aFsm)
-{
-	SPUDFSMVERBOSE_LOG(_L("EtelDriverCancel"));
-	aFsm.EtelCancel();
-}
-
-void TPdpState::SpudManNotify (CPdpFsm& aFsm, TInt aNotification, TInt aParam)
-{
-	SPUDFSMVERBOSE_LOG1(_L("SpudManNotify : %d"), aNotification);
-	aFsm.SpudInput (aNotification, aParam);
-}
-
-const TDesC * TPdpState::LogOperation (CPdpFsm& aFsm, TInt aOperation)
-{
-	switch (aOperation)
-	{
-	// ETel notifications
-	case PdpFsm::EPhoneOpened:
-		return &KPdpFsm_EPhoneOpened;
-	case PdpFsm::EPhoneOpenedFailed:
-		return &KPdpFsm_EPhoneOpenedFailed;
-	case PdpFsm::EQoSSet:
-		return &KPdpFsm_EQoSSet;
-	case SpudMan::EGetNegQoS:
-		return &KSpudMan_EGetNegQoS;
-	case PdpFsm::EQoSSetFailed:
-		return &KPdpFsm_EQoSSetFailed;
-	case PdpFsm::ETftSet:
-		return &KPdpFsm_ETftSet;
-	case PdpFsm::ETftSetFailed:
-		return &KPdpFsm_ETftSetFailed;
-	case PdpFsm::ETftChanged:
-		return &KPdpFsm_ETftChanged;
-	case PdpFsm::ETftChangedFailed:
-		return &KPdpFsm_ETftChangedFailed;
-	case PdpFsm::E1ryPdpContextCreated:
-		return &KPdpFsm_E1ryPdpContextCreated;
-	case PdpFsm::E1ryPdpContextCreatedFailed:
-		return &KPdpFsm_E1ryPdpContextCreatedFailed;
-	case PdpFsm::E2ryPdpContextCreated:
-		return &KPdpFsm_E2ryPdpContextCreated;
-	case PdpFsm::E2ryPdpContextCreatedFailed:
-		return &KPdpFsm_E2ryPdpContextCreatedFailed;
-	case PdpFsm::EPdpActivated:
-		return &KPdpFsm_EPdpActivated;
-	case PdpFsm::EPdpActivatedFailed:
-		return &KPdpFsm_EPdpActivatedFailed;
-	case PdpFsm::EContextDeleted:
-		return &KPdpFsm_EContextDeleted;
-	case PdpFsm::EContextDeletedFailed:
-		return &KPdpFsm_EContextDeletedFailed;
-	case PdpFsm::EPdpContextModified:
-		return &KPdpFsm_EPdpContextModified;
-	case PdpFsm::EPdpContextModifiedFailed:
-		return &KPdpFsm_EPdpContextModifiedFailed;
-		
-//		
-//	// network signals
-	case PdpFsm::EQoSProfileChangeNetwork:
-		//RPacketQoS::TQoSR99_R4Negotiated
-		return &KPdpFsm_EQoSProfileChangeNetwork;
-	case PdpFsm::EConfigGPRSChangeNetwork:
-		//RPacketContext::TContextConfigGPRS
-		return &KPdpFsm_EConfigGPRSChangeNetwork;
-	case PdpFsm::EContextStatusChangeNetwork:
-		switch (aFsm.iContextStatus)
-		{
-		case RPacketContext::EStatusUnknown:
-			return &KRPacketContext_EStatusUnknown;
-		case RPacketContext::EStatusInactive:
-			return &KRPacketContext_EStatusInactive;
-		case RPacketContext::EStatusActivating:
-			return &KRPacketContext_EStatusActivating;
-		case RPacketContext::EStatusActive:
-			return &KRPacketContext_EStatusActive;
-		case RPacketContext::EStatusDeactivating:
-			return &KRPacketContext_EStatusDeactivating;
-		case RPacketContext::EStatusSuspended:
-			return &KRPacketContext_EStatusSuspended;
-		case RPacketContext::EStatusDeleted:
-			return &KRPacketContext_EStatusDeleted;
-		}
-		return &KEContextStatusChangeNetwork_Unknown;
-	case PdpFsm::EServiceStatusChangeNetwork:
-		{
-		RPacketService::TStatus ns;
-		
-			aFsm.iPdpFsmFactory->iPdpFsmInterface->Get(ns);
-
-			switch (ns)
-			{
-			case RPacketService::EStatusUnattached:
-				return &KRPacketService_EStatusUnattached;
-			case RPacketService::EStatusAttached:
-				return &KRPacketService_EStatusAttached;
-			case RPacketService::EStatusActive:	
-				return &KRPacketService_EStatusActive;
-			case RPacketService::EStatusSuspended:
-				return &KRPacketService_EStatusSuspended;
-			}
-		}
-		return &KEServiceStatusChangeNetwork_Unknown;
-	case PdpFsm::EPacketStatusChangeNetwork: // not used in eteldriver
-		return &KPdpFsm_EPacketStatusChangeNetwork;
-		
-	// spudman signals
-	case SpudMan::EContextCreate:
-		return &KSpudMan_EContextCreate;
-	case SpudMan::EContextDelete:
-		return &KSpudMan_EContextDelete;
-	case SpudMan::EContextActivate:
-		return &KSpudMan_EContextActivate;
-	case SpudMan::ERegisterEventHandler:
-		return &KSpudMan_ERegisterEventHandler;
-	case SpudMan::EContextSetEvents:
-		return &KSpudMan_EContextSetEvents;
-	case SpudMan::EContextQoSSet:
-		return &KSpudMan_EContextQoSSet;
-	case SpudMan::EContextModifyActive:
-		return &KSpudMan_EContextModifyActive;
-	case SpudMan::EContextTFTModify:
-		return &KSpudMan_EContextTFTModify;
-	case SpudMan::ENifSetDefaultQoS:
-		return &KSpudMan_ENifSetDefaultQoS;
-	case SpudMan::EStartupPrimaryContextCreation:
-		return &KSpudMan_EStartupPrimaryContextCreation;
-
-	case SpudMan::ESetDefaultQoS:
-		return &KSpudMan_ESetDefaultQoS;
-	case SpudMan::ECreatePrimaryPDPContext:
-		return &KSpudMan_ECreatePrimaryPDPContext;
-	case SpudMan::ECreateSecondaryPDPContext:
-		return &KSpudMan_ECreateSecondaryPDPContext;
-	case SpudMan::ESuspend:
-		return &KSpudMan_ESuspend;
-	case SpudMan::EResume:
-		return &KSpudMan_EResume;
-	case SpudMan::E1ryPdpActivate:
-		return &KSpudMan_E1ryPdpActivate;
-	case SpudMan::ECancelContextCreate:
-		return &KSpudMan_ECancelContextCreate;
-				
-	default:
-		return &KUnknown;
-	}
-
-	
-}
--- a/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstate.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-// Copyright (c) 2004-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:
-// Base class to the various states required in Spud FSM. Each real state is derived from
-// this base class. The bass class is never instanciated but it's base functionality is 
-// used for default handling in the most part.
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#ifndef TPDPSTATE_H
-#define TPDPSTATE_H
-
-#include <networking/umtsnifcontrolif.h>
-#include "eteldrivernmspace.h"
-#include "reteldriverinput.h"
-#include "pdpfsmnmspace.h"
-
-
-class CPdpFsm;
-//class REtelDriverInput;
-class CPdpFsmFactory;
-
-// parent class
-class TPdpState
-{
-public:
-	TPdpState();
-	
-	// used as a default error handler
-	virtual TInt Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aParam);
-
-	const TDesC * LogOperation (CPdpFsm& aFsm, TInt aOperation);	
-
-protected:
-	// access helpers for use in the derived class
-	void EtelDriverInput (CPdpFsm& aFsm, EtelDriver::TEtelInput aOperation);
-	void EtelDriverCancel (CPdpFsm& aFsm);
-	void SpudManNotify (CPdpFsm& aFsm, TInt aNotification, TInt aParam);
-	
-public:
-#ifdef _DEBUG
-	TBuf<100> iName;
-#endif		
-
-protected:
-	CPdpFsmFactory   * iPdpFsmFactory;
-
-private:
-	
-};
-
-
-#endif // TPDPSTATE_H
--- a/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstateactivatingprimary.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-// Copyright (c) 2004-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:
-// Activating primary state
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
- 
-#include <networking/umtsnifcontrolif.h>
-#include "tpdpstates.h"
-#include "spudfsmdebuglogger.h"
-#include "pdpfsmnmspace.h"
-#include "cpdpfsm.h"
-#include "PDPFSM.h"
-	
-TInt TPdpStateActivatingPrimary::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
-{
-	SPUDFSMVERBOSE_FNLOG("TPdpStateActivatingPrimary::Input()");
-	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
-
-	switch (aOperation)
-	{
-	case PdpFsm::EPdpActivated:
-		// GuQoS assumes the primary context becomes active when created, so the context status
-		// must be updated before sending the event
-		aFsm.Set(RPacketContext::EStatusActive);
-		aFsm.ChangeStateToOpen();
-		SpudManNotify (aFsm, KPrimaryContextCreated, KErrNone);
-		return KErrNone;
-	case PdpFsm::EPdpActivatedFailed:
-		SPUDFSMVERBOSE_LOG(_L("*** FAILURE ***"));
-		aFsm.ChangeStateToClosing();
-		
-		SpudManNotify (aFsm, KPrimaryContextCreated, aErrorCode);
-		EtelDriverInput(aFsm, EtelDriver::EContextDelete);
-		return KErrNone;
-  case SpudMan::ECancelContextCreate:
-		aFsm.ChangeStateToStopping();
-		EtelDriverCancel(aFsm);
-		EtelDriverInput(aFsm, EtelDriver::EContextDelete);
-		return KErrNone;
-	// no default	
-	}
-
-	// default error handling
-	return TPdpState::Input(aFsm, aOperation, aErrorCode);
-}
-
-
--- a/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstateactivatingsecondary.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-// Copyright (c) 2004-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:
-// Activating secondary context state
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
- 
-#include <networking/umtsnifcontrolif.h>
-#include "tpdpstates.h"
-#include "spudfsmdebuglogger.h"
-#include "pdpfsmnmspace.h"
-#include "cpdpfsm.h"
-
-TInt TPdpStateActivatingSecondary::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
-{
-	SPUDFSMVERBOSE_FNLOG("TPdpStateActivatingSecondary::Input()");
-	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
-
-	switch (aOperation)
-	{
-	case PdpFsm::EPdpActivated:
-		// When a secondary context is activated, the context status must be updated before sending the activated event
-		// Normally this change in status is updated by a notify context status change event
-		aFsm.Set(RPacketContext::EStatusActive);
-		aFsm.ChangeStateToGettingNegQoS();  // Context was activated, but we don't necessarily have negotiated QoS yet; 
-                       					    // a TSY might wait for a successfull activation to report it to Etel. 
-		SpudManNotify (aFsm, KContextActivateEvent, KErrNone);
-		return KErrNone;
-	case PdpFsm::EPdpActivatedFailed:
-		SPUDFSMVERBOSE_LOG(_L("*** FAILURE ***"));
-		aFsm.ChangeStateToCreatedSecondary();
-		SpudManNotify (aFsm, KContextActivateEvent, aErrorCode);
-		return KErrNone;
-	// no default
-	}
-
-	// default error handling
-	return TPdpState::Input(aFsm, aOperation, aErrorCode);
-}
-
-
--- a/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatechangingqos.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-// Copyright (c) 2004-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:
-// ChangingQoS state
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
- 
-#include <networking/umtsnifcontrolif.h>
-#include "tpdpstates.h"
-#include "spudfsmdebuglogger.h"
-#include "pdpfsmnmspace.h"
-#include "cpdpfsm.h"
-
-TInt TPdpStateChangingQoS::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
-{
-	SPUDFSMVERBOSE_FNLOG("TPdpStateChangingQoS::Input()");
-	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
-
-	switch (aOperation)
-	{
-	case PdpFsm::EQoSSet:
-		aFsm.ChangeStateToOpen();
-		SpudManNotify (aFsm, KContextQoSSetEvent, KErrNone);
-		return KErrNone;
-	case PdpFsm::EQoSSetFailed:
-		aFsm.ChangeStateToOpen();
-		SpudManNotify (aFsm, KContextQoSSetEvent, aErrorCode);
-		return KErrNone;
-	
-	// no default	
-	}
-	
-	// default error handling
-	return TPdpState::Input(aFsm, aOperation, aErrorCode);
-}
-
-
--- a/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatechangingtft.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-// Copyright (c) 2004-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:
-// Changing TFT state
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
- 
-#include <networking/umtsnifcontrolif.h>
-#include "tpdpstates.h"
-#include "spudfsmdebuglogger.h"
-#include "pdpfsmnmspace.h"
-#include "cpdpfsm.h"
-
-TInt TPdpStateChangingTFT::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
-{
-	SPUDFSMVERBOSE_FNLOG("TPdpStateChangingTFT::Input()");
-	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
-
-	switch (aOperation)
-	{
-	case PdpFsm::ETftChanged:
-		aFsm.ChangeStateToOpen();
-		SpudManNotify (aFsm, KContextTFTModifiedEvent, KErrNone);
-		return KErrNone;
-	case PdpFsm::ETftChangedFailed:
-		aFsm.ChangeStateToOpen();
-		SpudManNotify (aFsm, KContextTFTModifiedEvent, aErrorCode);
-		return KErrNone;
-		
-	// no default
-	}
-
-	// default error handling
-	return TPdpState::Input(aFsm, aOperation, aErrorCode);
-}
-
--- a/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstateclosing.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-// Copyright (c) 2004-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:
-// Closing state
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
- 
-#include <networking/umtsnifcontrolif.h>
-#include "tpdpstates.h"
-#include "spudfsmdebuglogger.h"
-#include "pdpfsmnmspace.h"
-#include "PDPFSM.h"
-#include "cpdpfsm.h"
-
-TInt TPdpStateClosing::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
-{
-	SPUDFSMVERBOSE_FNLOG("TPdpStateClosing::Input()");
-	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
-
-	switch (aOperation)
-	{
-	case PdpFsm::EContextDeleted:
-		aFsm.ChangeStateToInitialised();
-		SpudManNotify (aFsm, KContextDeleteEvent, KErrNone);
-		return KErrNone;			
-	case PdpFsm::EContextDeletedFailed:
-		// There isn't any corrective action that can be taken here. 
-		// It is assumed when this context is used again, there will be a failure 
-		// or a failure elsewhere down the line that will correct the situation, ultimately
-		// involving the user. FSM and ETelDriver are not in a position to take any corrective action.
-		SPUDFSMVERBOSE_LOG(_L("**** DELETE FAILURE ****"));
-		aFsm.ChangeStateToInitialised();
-		SpudManNotify (aFsm, KContextDeleteEvent, aErrorCode);
-		return KErrNone;			
-	case SpudMan::EContextDelete:
-		// already doing this and don't want default action
-		return KErrInUse;
-	}
-
-	// default error handling
-	return TPdpState::Input(aFsm, aOperation, aErrorCode);
-}
-
-
--- a/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatecreatedSecondary.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-// Copyright (c) 2004-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:
-// State after secondary has been created, but not activated
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
- 
-#include <networking/umtsnifcontrolif.h>
-#include "tpdpstates.h"
-#include "spudfsmdebuglogger.h"
-#include "pdpfsmnmspace.h"
-#include "pdpfsmnmspace.h"
-#include "PDPFSM.h"
-#include "cpdpfsm.h"
-
-TInt TPdpStateCreatedSecondary::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
-{
-	SPUDFSMVERBOSE_FNLOG("TPdpStateCreatedSecondary::Input()");
-	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
-
-	switch (aOperation)
-	{
-	case SpudMan::EContextActivate: 
-		aFsm.ChangeStateToActivatingSecondary();
-		EtelDriverInput(aFsm, EtelDriver::EActivatePdp);
-		return KErrNone;		
-	case SpudMan::EContextQoSSet:
-		aFsm.ChangeStateToSettingQoS();
-		EtelDriverInput(aFsm, EtelDriver::ESetQoS);
-		return KErrNone;
-	case SpudMan::EContextTFTModify:
-		aFsm.ChangeStateToSettingTFT();
-		EtelDriverInput(aFsm, EtelDriver::ESetTft);
-		return KErrNone;
-	}
-	
-	// default error handling
-	return TPdpState::Input(aFsm, aOperation, aErrorCode);
-}
-
-
--- a/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatecreatingSecondary.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-// Copyright (c) 2004-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:
-// Creating secondary context state
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
- 
-#include <networking/umtsnifcontrolif.h>
-#include "tpdpstates.h"
-#include "spudfsmdebuglogger.h"
-#include "pdpfsmnmspace.h"
-#include "PDPFSM.h"
-#include "cpdpfsm.h"
-
-TInt TPdpStateCreatingSecondary::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
-{
-	SPUDFSMVERBOSE_FNLOG("TPdpStateCreatingSecondary::Input()");
-	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
-
-	switch (aOperation)
-	{
-	case PdpFsm::E2ryPdpContextCreated:
-		aFsm.ChangeStateToCreatedSecondary();
-		SpudManNotify(aFsm, KSecondaryContextCreated, KErrNone);
-		return KErrNone;
-	case PdpFsm::E2ryPdpContextCreatedFailed:
-		iErrorCode = aErrorCode;
-		EtelDriverInput(aFsm, EtelDriver::EContextDelete);
-		return KErrNone;
-
-	case PdpFsm::EContextDeletedFailed:
-		SPUDFSMVERBOSE_LOG(_L("**** DELETE FAILURE ****"));
-		// fall through
-	case PdpFsm::EContextDeleted:
-		aFsm.ChangeStateToInitialised();
-		SpudManNotify(aFsm, KSecondaryContextCreated, iErrorCode);
-		iErrorCode = KErrNone;
-		return KErrNone;
-	}
-	
-	// default error handling
-	return TPdpState::Input(aFsm, aOperation, aErrorCode);
-}
-
--- a/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatecreatingprimary.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-// Copyright (c) 2004-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:
-// Creating primary context state
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
- 
-#include <networking/umtsnifcontrolif.h>
-#include "tpdpstates.h"
-#include "spudfsmdebuglogger.h"
-#include "pdpfsmnmspace.h"
-#include "cpdpfsm.h"
-#include "PDPFSM.h"
-
-TInt TPdpStateCreatingPrimary::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
-{
-	SPUDFSMVERBOSE_FNLOG("TPdpStateCreatingPrimary::Input()");
-	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
-
-	switch (aOperation)
-	{
-	case PdpFsm::E1ryPdpContextCreated:
-		aFsm.ChangeStateToActivatingPrimary();
-		EtelDriverInput(aFsm, EtelDriver::EActivatePdp);
-		return KErrNone;
-	case PdpFsm::E1ryPdpContextCreatedFailed: 
-		aFsm.ChangeStateToInitialised();
-		SpudManNotify (aFsm, KPrimaryContextCreated, aErrorCode); // or is it KContextActivateEvent?
-		EtelDriverInput(aFsm, EtelDriver::EContextDelete);
-		return KErrNone;
-   case SpudMan::ECancelContextCreate:
-		aFsm.ChangeStateToStopping();
-		EtelDriverCancel(aFsm);
-		EtelDriverInput(aFsm, EtelDriver::EContextDelete);
-		return KErrNone;
-	}
-
-	// default error handling
-	return TPdpState::Input(aFsm, aOperation, aErrorCode);
-}
-
-
--- a/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstategettingnegqos.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-// Copyright (c) 2004-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:
-// Retrieving Negotiated QoS state
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
- 
-#include <networking/umtsnifcontrolif.h>
-#include "tpdpstates.h"
-#include "spudfsmdebuglogger.h"
-#include "pdpfsmnmspace.h"
-#include "MPdpFsmInterface.h"
-#include "cpdpfsm.h"
-
-TInt TPdpStateGettingNegQoS::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
-    {
-	SPUDFSMVERBOSE_FNLOG("TPdpStateGettingNegQoS::Input()");
-	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
-
-	switch (aOperation)
-	    {
-    	case SpudMan::EGetNegQoS:
-    		EtelDriverInput(aFsm, EtelDriver::ENegQoSGet);
-    		return KErrNone;
-    		
-    	case PdpFsm::EPdpNegQoSRetrieved:
-    		SPUDFSMVERBOSE_LOG(_L("*** SUCCESS ***"));
-    		aFsm.ChangeStateToOpen();
-    		SpudManNotify(aFsm, KGetNegQoSEvent, KErrNone);
-    		return KErrNone;
-    		
-    	case PdpFsm::EPdpNegQoSRetrievedFailed:
-    		SPUDFSMVERBOSE_LOG(_L("*** FAILURE ***"));
-    		// As far as everybody is concerned, the context was activated:
-    		// This makes it eligible for certain events. 
-    		// We have to move to Open state, so that that we can handle any operations
-    		// on the activated PDP context correctly.
-    		aFsm.ChangeStateToOpen(); 
-    		SpudManNotify(aFsm, KGetNegQoSEvent, aErrorCode);
-    		return KErrNone;
-    	}
-	
-	// default error handling
-	return TPdpState::Input(aFsm, aOperation, aErrorCode);
-    }
-
-
-
--- a/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstateinitialised.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-// Copyright (c) 2004-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:
-// Initialised state
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
- 
-#include <networking/umtsnifcontrolif.h>
-#include "tpdpstates.h"
-#include "spudfsmdebuglogger.h"
-#include "pdpfsmnmspace.h"
-#include "cpdpfsm.h"
-#include "cpdpfsmfactory.h"
-#include "eteldrivernmspace.h"
-
-TInt TPdpStateInitialised::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
-{
-	SPUDFSMVERBOSE_FNLOG("TPdpStateInitialised::Input()");
-	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
-
-	switch (aOperation)
-	{
-	case SpudMan::ECreatePrimaryPDPContext:
-		aFsm.iContextType = CPdpFsm::EPrimary;
-
-		// have to ensure EOpenPhone is called the first time a primary context is created
-		if (iPdpFsmFactory->iEtelOpened == EFalse)
-		{
-			aFsm.ChangeStateToOpeningPhone();
-			EtelDriverInput(aFsm, EtelDriver::EOpenPhone);
-		}
-		else // just create the primary
-		{
-			aFsm.ChangeStateToCreatingPrimary();
-			EtelDriverInput (aFsm, EtelDriver::ECreate1ryPdpContext);
-		}
-	
-		return KErrNone;
-	case SpudMan::ECreateSecondaryPDPContext:
-		aFsm.ChangeStateToCreatingSecondary();
-
-		aFsm.iContextType = CPdpFsm::ESecondary;
-
-		EtelDriverInput (aFsm, EtelDriver::ECreate2ryPdpContext);
-	
-		return KErrNone;
-		
-	// these stop the default actions which aren't of value in the Initialised state, although we 
-	// do not expect to see these here.
-	case PdpFsm::EContextDeleted:
-		return KErrNone;
-	case PdpFsm::EContextStatusChangeNetwork:
-		if (aFsm.iContextStatus == RPacketContext::EStatusDeleted)
-		{
-			return KErrNone;
-		}
-		break;
-	}
-
-	// default error handling
-	return TPdpState::Input(aFsm, aOperation, aErrorCode);
-
-}
-
-
--- a/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatemodifingactive.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-// Copyright (c) 2004-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:
-// tpdpstatemodifyingactive.cpp
-// Modifying active context state
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
- 
-#include <networking/umtsnifcontrolif.h>
-#include "tpdpstates.h"
-#include "spudfsmdebuglogger.h"
-#include "pdpfsmnmspace.h"
-#include "cpdpfsm.h"
-
-TInt TPdpStateModifyingActive::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
-{
-	SPUDFSMVERBOSE_FNLOG("TPdpStateModifyingActive::Input()");
-	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
-
-	switch (aOperation)
-	{
-	case PdpFsm::EPdpContextModified:
-		aFsm.ChangeStateToOpen();
-		SpudManNotify(aFsm, KContextModifyActiveEvent, KErrNone);
-		return KErrNone;
-	case PdpFsm::EPdpContextModifiedFailed:
-		aFsm.ChangeStateToOpen();
-		SpudManNotify(aFsm, KContextModifyActiveEvent, aErrorCode);
-		return KErrNone;
-	}
-	
-	// default error handling
-	return TPdpState::Input(aFsm, aOperation, aErrorCode);
-}
-
-
--- a/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstateopen.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-// Copyright (c) 2004-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:
-// Open state
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#include <etelpckt.h>
-#include <networking/umtsnifcontrolif.h>
-#include "tpdpstates.h"
-#include "spudfsmdebuglogger.h"
-#include "pdpfsmnmspace.h"
-#include "PDPFSM.h"
-#include "cpdpfsm.h"
-
-TInt TPdpStateOpen::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
-{
-	SPUDFSMVERBOSE_FNLOG("TPdpStateOpen::Input()");
-	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
-
-	switch (aOperation)
-	{
-	case PdpFsm::EQoSProfileChangeNetwork:
-//		//RPacketQoS::TQoSR99_R4Negotiated
-		SpudManNotify (aFsm, KContextParametersChangeEvent, KErrNone);
-		return KErrNone;
-	case PdpFsm::EConfigGPRSChangeNetwork:
-//		//RPacketContext::TContextConfigGPRS
-		SpudManNotify (aFsm, KContextParametersChangeEvent, KErrNone);
-		return KErrNone;
-	case PdpFsm::EContextStatusChangeNetwork:
-		if (aFsm.iContextStatus == RPacketContext::EStatusSuspended)
-    		{
-			aFsm.ChangeStateToSuspended();
-			SpudManNotify(aFsm, KContextBlockedEvent, KErrNone); 
-    		}
-		else if (aFsm.iContextStatus == RPacketContext::EStatusDeleted)
-    		{
-			aFsm.ChangeStateToClosing();
-			EtelDriverInput(aFsm, EtelDriver::EContextDelete);
-    		}
-		else
-    		{
-			// no change in state - the upper layer must change the state if it needs to
-			SpudManNotify (aFsm, KContextParametersChangeEvent, aErrorCode);
-    		}
-		return KErrNone;
-	case SpudMan::EContextDelete:
-		aFsm.ChangeStateToClosing();
-		EtelDriverInput(aFsm, EtelDriver::EContextDelete);
-		return KErrNone;
-	case SpudMan::EContextQoSSet:
-		aFsm.ChangeStateToChangingQoS();
-		EtelDriverInput(aFsm, EtelDriver::ESetQoS);
-		return KErrNone;
-	case SpudMan::EContextModifyActive:
-		aFsm.ChangeStateToModifingActive();
-		EtelDriverInput(aFsm, EtelDriver::EModifyActive);
-		return KErrNone;
-	case SpudMan::EContextTFTModify:
-		aFsm.ChangeStateToChangingTFT();
-		EtelDriverInput(aFsm, EtelDriver::EChangeTft);
-		return KErrNone;
-	case SpudMan::ESuspend: // think this is superfluous - DAN will see at review :)
-		aFsm.ChangeStateToSuspended();
-		SpudManNotify(aFsm, KContextBlockedEvent, KErrNone);
-		return KErrNone;
-	}
-	
-	// default error handling
-	return TPdpState::Input(aFsm, aOperation, aErrorCode);
-}
-
-
--- a/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstateopeningphone.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-// Copyright (c) 2004-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:
-// Opening phone state
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
- 
-#include <networking/umtsnifcontrolif.h>
-#include "tpdpstates.h"
-#include "spudfsmdebuglogger.h"
-#include "pdpfsmnmspace.h"
-#include "cpdpfsmfactory.h"
-#include "cpdpfsm.h"
-#include "PDPFSM.h"
-
-TInt TPdpStateOpeningPhone::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
-{
-	SPUDFSMVERBOSE_FNLOG("TPdpStateOpeningPhone::Input()");
-	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
-
-	switch (aOperation)
-	{
-	// ETel notifications
-	case PdpFsm::EPhoneOpened:
-		aFsm.ChangeStateToCreatingPrimary();
-		iPdpFsmFactory->iEtelOpened = ETrue;		
-		EtelDriverInput(aFsm, EtelDriver::ECreate1ryPdpContext);
-		return KErrNone;
-	case PdpFsm::EPhoneOpenedFailed:
-		aFsm.ChangeStateToInitialised();
-		iPdpFsmFactory->iEtelOpened = EFalse;		
-		SpudManNotify (aFsm, KPrimaryContextCreated, aErrorCode);
-		return KErrNone;
-  case SpudMan::ECancelContextCreate:
-		aFsm.ChangeStateToStopping();
-		EtelDriverCancel(aFsm);
-		EtelDriverInput(aFsm, EtelDriver::EContextDelete);
-		return KErrNone;
-	}
-	
-	// default error handling
-	return TPdpState::Input(aFsm, aOperation, aErrorCode);
-}
-
-
--- a/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstates.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-// Copyright (c) 2004-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:
-// PDP FSM states header
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#ifndef TPDPSTATES_H
-#define TPDPSTATES_H
-
-#include "tpdpstate.h"
-#include "spudfsmdebuglogger.h"
-
-class CPdpFsm;
-
-#if _DEBUG 
-#define DEFINE_TPDPSTATE_CLASS(state) _LIT(KName##state, #state); \
-NONSHARABLE_CLASS(TPdpState##state) : public TPdpState \
-{ \
-public: \
-	TPdpState##state (CPdpFsmFactory * aPdpFsmFactory) \
-	{ \
-		SPUDFSMVERBOSE_FNLOG("TPdpState" L ## #state L"::TPdpState" L ## #state L"()"); \
-		iName = KName##state; \
-		iPdpFsmFactory = aPdpFsmFactory; \
-	} \
-	TInt Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aParam); \
-private: \
-	TInt iErrorCode; \
-};	
-#else
-#define DEFINE_TPDPSTATE_CLASS(state) NONSHARABLE_CLASS(TPdpState##state) : public TPdpState \
-{ \
-public: \
-	TPdpState##state (CPdpFsmFactory * aPdpFsmFactory) \
-	{ \
-		SPUDFSMVERBOSE_FNLOG("TPdpState" L ## #state L"::TPdpState" L ## #state L"()"); \
-		iPdpFsmFactory = aPdpFsmFactory; \
-	} \
-	TInt Input (CPdpFsm& aFsm, TInt aOperation, TInt aErrorCode); \
-private: \
-	TInt iErrorCode; \
-};	
-#endif
-
-DEFINE_TPDPSTATE_CLASS(Initialised)
-DEFINE_TPDPSTATE_CLASS(OpeningPhone)
-DEFINE_TPDPSTATE_CLASS(CreatingPrimary)
-DEFINE_TPDPSTATE_CLASS(ActivatingPrimary)
-DEFINE_TPDPSTATE_CLASS(CreatingSecondary)
-DEFINE_TPDPSTATE_CLASS(CreatedSecondary)
-DEFINE_TPDPSTATE_CLASS(SettingQoS)
-DEFINE_TPDPSTATE_CLASS(SettingTFT)
-DEFINE_TPDPSTATE_CLASS(ActivatingSecondary)
-DEFINE_TPDPSTATE_CLASS(Open)
-DEFINE_TPDPSTATE_CLASS(ChangingQoS)
-DEFINE_TPDPSTATE_CLASS(ChangingTFT)
-DEFINE_TPDPSTATE_CLASS(ModifyingActive)
-DEFINE_TPDPSTATE_CLASS(Suspended)
-DEFINE_TPDPSTATE_CLASS(Closing)
-DEFINE_TPDPSTATE_CLASS(Stopping)
-DEFINE_TPDPSTATE_CLASS(GettingNegQoS)
-
-#endif // TPDPSTATES_H
--- a/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatesettingqos.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-// Copyright (c) 2004-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:
-// Setting QoS state
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
- 
-#include <networking/umtsnifcontrolif.h>
-#include "tpdpstates.h"
-#include "spudfsmdebuglogger.h"
-#include "pdpfsmnmspace.h"
-#include "cpdpfsm.h"
-
-TInt TPdpStateSettingQoS::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
-{
-	SPUDFSMVERBOSE_FNLOG("TPdpStateSettingQoS::Input()");
-	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
-
-	switch (aOperation)
-	{
-	case PdpFsm::EQoSSet:
-		aFsm.ChangeStateToCreatedSecondary();
-		SpudManNotify(aFsm, KContextQoSSetEvent, KErrNone);
-		return KErrNone;
-	case PdpFsm::EQoSSetFailed:
-		aFsm.ChangeStateToCreatedSecondary();
-		SpudManNotify(aFsm, KContextQoSSetEvent, aErrorCode);
-		return KErrNone;
-	}
-	
-	// default error handling
-	return TPdpState::Input(aFsm, aOperation, aErrorCode);
-}
-
-
--- a/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatesettingqosprimary.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-// Copyright (c) 2004-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:
-// Setting QoS on primary context state
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
- 
-#include <networking\UmtsNifControlIf.h>
-#include "tpdpstates.h"
-#include "spudfsmdebuglogger.h"
-#include "pdpfsmnmspace.h"
-#include "cpdpfsm.h"
-
-TInt TPdpStateSettingQoSPrimary::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
-{
-	SPUDFSMVERBOSE_FNLOG("TPdpStateSettingQoSPrimary::Input()");
-	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
-
-	switch (aOperation)
-	{
-	case PdpFsm::EQoSSet:
-		aFsm.ChangeStateToActivatingPrimary();
-		EtelDriverInput(aFsm, EtelDriver::EActivatePdp);
-		return KErrNone;
-	case PdpFsm::EQoSSetFailed:
-		aFsm.ChangeStateToClosing();
-		SpudManNotify (aFsm, KPrimaryContextCreated, aErrorCode); // or is it KContextActivateEvent?
-		EtelDriverInput(aFsm, EtelDriver::EContextDelete);
-		return KErrNone;
-	}
-	
-	// default error handling
-	return TPdpState::Input(aFsm, aOperation, aErrorCode);
-}
-
-
--- a/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatesettingtft.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-// Copyright (c) 2004-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:
-// Setting TFT state
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
- 						   
-#include <networking/umtsnifcontrolif.h>
-#include "tpdpstates.h"
-#include "spudfsmdebuglogger.h"
-#include "pdpfsmnmspace.h"
-#include "cpdpfsm.h"
-
-TInt TPdpStateSettingTFT::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
-{
-	SPUDFSMVERBOSE_FNLOG("TPdpStateSettingTFT::Input()");
-	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
-
-	switch (aOperation)
-	{
-	case PdpFsm::ETftSet:
-		aFsm.ChangeStateToCreatedSecondary();
-		SpudManNotify(aFsm, KContextTFTModifiedEvent, KErrNone);
-		return KErrNone;
-	case PdpFsm::ETftSetFailed:
-		aFsm.ChangeStateToCreatedSecondary();
-		SpudManNotify(aFsm, KContextTFTModifiedEvent, aErrorCode);
-		return KErrNone;
-	}
-	
-	// default error handling
-	return TPdpState::Input(aFsm, aOperation, aErrorCode);
-}
-
-
--- a/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatestopping.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-// Copyright (c) 2004-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:
-// Stopping state
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#include <networking/umtsnifcontrolif.h>
-#include "tpdpstates.h"
-#include "spudfsmdebuglogger.h"
-#include "pdpfsmnmspace.h"
-#include "PDPFSM.h"
-#include "cpdpfsm.h"
-
-TInt TPdpStateStopping::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
-{
-	SPUDFSMVERBOSE_FNLOG("TPdpStateStopping::Input()");
-	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
-
-	switch (aOperation)
-	{
-	case PdpFsm::EContextDeleted:
-		aFsm.ChangeStateToInitialised();
-		SpudManNotify (aFsm, KPrimaryContextCreated, KErrGeneral);
-		return KErrNone;			
-	case PdpFsm::EContextDeletedFailed:
-		// There isn't any corrective action that can be taken here. 
-		SPUDFSMVERBOSE_LOG(_L("**** DELETE FAILURE ****"));
-		SPUDFSM_LOG(_L("*** DELETE FAILURE ***"));
-		aFsm.ChangeStateToInitialised();
-		EtelDriverCancel (aFsm);
-		SpudManNotify (aFsm, KPrimaryContextCreated, KErrNone);
-		return KErrNone;
-	case SpudMan::EContextDelete:
-		// already doing this and don't want default action
-		return KErrInUse;
-	}
-
-	// default error handling
-	return TPdpState::Input(aFsm, aOperation, aErrorCode);
-}
-
-
--- a/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatesuspended.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-// Copyright (c) 2004-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:
-// Suspended state
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
- 
-#include <networking/umtsnifcontrolif.h>
-#include "tpdpstates.h"
-#include "spudfsmdebuglogger.h"
-#include "pdpfsmnmspace.h"
-#include "PDPFSM.h"
-#include "cpdpfsm.h"
-
-TInt TPdpStateSuspended::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
-{
-	SPUDFSMVERBOSE_FNLOG("TPdpStateSuspended::Input()");
-	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
-
-	switch (aOperation)
-	{
-	case SpudMan::EResume:
-		aFsm.ChangeStateToOpen();
-		SpudManNotify(aFsm, KContextUnblockedEvent, KErrNone);
-		return KErrNone;
-	case PdpFsm::EContextStatusChangeNetwork:
-		if (aFsm.iContextStatus == RPacketContext::EStatusActive)
-		{
-			aFsm.ChangeStateToOpen();
-			SpudManNotify(aFsm, KContextUnblockedEvent, KErrNone); 
-			//SpudManNotify (aFsm, KNetworkStatusEvent, KErrNone);
-			return KErrNone;
-		}
-		break;		
-	}
-	
-	// default error handling
-	return TPdpState::Input(aFsm, aOperation, aErrorCode);
-}
-
-
--- a/telephonyprotocols/umtsgprsscpr/spudtel/inc/ceteldrivercontext.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,380 +0,0 @@
-// Copyright (c) 2005-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:
-// Header for etel driver context class
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#ifndef CETELDRIVERCONTEXT_H
-#define CETELDRIVERCONTEXT_H
-
-#include <e32base.h>
-#include <etelmm.h>
-#include <etelqos.h>
-#include <networking/umtsnifcontrolif.h>
-
-#include "eteldrivernmspace.h"
-#include "PDPFSM.h"
-#include "meteldriverstrategy.h"
-#include "pdpfsmnmspace.h"
-
-
-class CEtelDriverFactory;
-
-//using namespace EtelDriver;
-/** 
- A data storage for pdp context 
-
- @internalComponent
-*/
-class CEtelDriverContext : public CActive
-	{
-public:
-	CEtelDriverContext (TContextId aId, CEtelDriverFactory& aFactory);
-	virtual ~CEtelDriverContext();
-
-	TInt Input (EtelDriver::TEtelInput aOperation);
-	
-	void StartNotifications() const;
-	void StopNotifications() const;
-
-    void PdpStatusChangeNotifierCancel();
-    void QoSChangeNotifierCancel();
-    void PdpConfigChangeNotifierCancel();
-    
-	// CActive methods
-	
-	/** accessors, basic */
-	inline TContextId Id() const;
-	inline TName& Name();
-	inline TRequestStatus& CompletionStatus();
-	MEtelDriverStrategy::TSequenceStep StrategyStep() const;
-	inline void SetStrategyStep (MEtelDriverStrategy::TSequenceStep aStep);
-
-		
-	/** accessors, eTel objects */
-	inline RPacketQoS& PacketQoS();
-	inline RPacketContext&	PacketContext();
-	RPhone& Phone() const;
-	RPacketService& PacketService() const;
-	CPdpFsmInterface& PdpFsmInterface() const;
-	const TName& ExistingContextName() const;
-
-	/** context data accessors */
-	
-	inline TRequestedProfileBuffer& QosRequested();
-	inline TNegotiatedProfileBuffer& QosNegotiated();
-	
-	inline RPacketContext::TContextConfigGPRS&	ContextConfigGPRS();
-
-	inline TRequestedProfileBufferPckg& QosRequestedPckg();
-	inline TNegotiatedProfileBufferPckg& QosNegotiatedPckg();
-	inline EtelDriver::TContextConfigGPRSPckg& ContextConfigGPRSPckg();
-	inline RPacketContext::TDataChannelV2& DataChannelV2();
-	inline RPacketContext::TDataChannelV2Pckg& DataChannelV2Pckg();
-	inline TTFTInfo& TftInfo();
-	inline RPacketContext::TPacketFilterV2& FilterV2();
-	inline RPacketContext::TPacketFilterV2Pckg& FilterV2Pckg();
-	inline TUint8 TftRequested() const;
-	inline TInt FirstFilterV2();
-	inline TInt NextFilterV2();
-	inline TTFTOperationCode& TftOperationCode();
-	
-#ifdef _DEBUG
-    void DumpReqProfileParameters ();
-    void DumpNegProfileParameters ();
-#endif
-		
-protected:
-	MEtelDriverStrategy& Strategy(EtelDriver::TEtelDriverStrategy aId) const;
-
-	// CActive methods
-	virtual void RunL();
-	virtual void DoCancel();
-
-protected:
-	/** ID */
-	TContextId				iId;
-	/** tsy name of a context */
-	TName					iName;
-	/** request status */
-	TRequestStatus			iCompletionStatus;
-	/** active strategy step */
-	MEtelDriverStrategy::TSequenceStep iStrategyStep;
-	/** id of active strategy */
-	EtelDriver::TEtelDriverStrategy 	iStrategyId;
-
-	/** packet QoS */
-	RPacketQoS				iPacketQoS;
-	/** packet context */
-	RPacketContext			iPacketContext;
-
-	// factory data:
-	/** etel driver factory */
-	CEtelDriverFactory& 	iFactory;
-
-	// data from pdp fsm
-	// all members below contain valid data for limited time only, 
-	//    i.e. for the duration of a strategy OR a duration of a single call to etel
-	/** Requested QoS */
-    TRequestedProfileBuffer iQosRequested;
-    TRequestedProfileBufferPckg iQosRequestedPckg;
-
-	/** Negotiated QoS */
-    TNegotiatedProfileBuffer iQosNegotiated;
-    TNegotiatedProfileBufferPckg iQosNegotiatedPckg;
-    
-
-	/** context config */
-	RPacketContext::TContextConfigGPRS	iContextConfigGPRS;
-	/** packaged context config */
-	EtelDriver::TContextConfigGPRSPckg				iContextConfigGPRSPckg;
-	/** tft info */
-	TTFTInfo							iTftInfo;
-	/** data channel V2 */
-	RPacketContext::TDataChannelV2		iDataChannelV2;
-	/** packaged data channel V2 */
-	RPacketContext::TDataChannelV2Pckg	iDataChannelV2Pckg;
-	
-private:
-	// TFT data
-	/** local var for tft count */
-	TUint8								iTftRequested;
-	/** local V2 filter */
-	RPacketContext::TPacketFilterV2		iFilterV2;
-	/** local packaged V2 filter */
-	EtelDriver::TPacketFilterV2Pckg					iFilterV2Pckg;
-	/** TFT Operation Code */
-	TTFTOperationCode					iTftOperationCode;
-	};
-
-
-// inlines
-/** accessor 
-
-@return id of first V2 filter 
-*/
-inline TInt CEtelDriverContext::FirstFilterV2()
-	{ 
-	iTftInfo.SetToFirst();
-	iTftRequested = 0;
-	return iTftInfo.NextPacketFilter(iFilterV2);
-	}
-
-/** accessor 
-
-@return id of next V2 filter
-*/
-inline TInt CEtelDriverContext::NextFilterV2()
-	{
-	TInt err = iTftInfo.NextPacketFilter(iFilterV2);
-	if (err == KErrNone)
-		{
-		++iTftRequested;
-		}
-	return err;
-	}
-
-/** accessor 
-
-@return context id 
-*/
-inline TContextId CEtelDriverContext::Id() const
-	{ 
-	return iId; 
-	}
-
-/** accessor 
-
-@return reference to name of pdp context
-*/
-inline TName& CEtelDriverContext::Name()
-	{ 
-	return iName; 
-	}
-
-/** accessor 
-
-@return reference to request status
-*/
-inline TRequestStatus& CEtelDriverContext::CompletionStatus()
-	{ 
-	return iCompletionStatus; 
-	}
-
-/** accessor 
-
-@return strategy sequence step 
-*/
-inline MEtelDriverStrategy::TSequenceStep CEtelDriverContext::StrategyStep() const
-	{ 
-	return iStrategyStep; 
-	}
-
-/** sets strategy sequence step 
-
-@param aStep - strategy sequence step 
-*/
-inline void CEtelDriverContext::SetStrategyStep(MEtelDriverStrategy::TSequenceStep aStep)
-	{ 
-	iStrategyStep = aStep; 
-	}
-	
-/** accessor
-
-@return reference to etel packet QoS
-*/
-inline RPacketQoS& CEtelDriverContext::PacketQoS() 
-	{ 
-	return iPacketQoS; 
-	}
-
-/** accessor 
-
-@return reference to etel packet context
-*/
-inline RPacketContext&	CEtelDriverContext::PacketContext()
-	{ 
-	return iPacketContext; 
-	}
-
-
-// context data accessors
-/**
-accessor 
-@return reference to QoSR5Requested
-*/
-
-inline TRequestedProfileBuffer& CEtelDriverContext::QosRequested()
-	{ 
-	return iQosRequested; 
-	}
-
-
-inline TNegotiatedProfileBuffer& CEtelDriverContext::QosNegotiated()
-	{ 
-	return iQosNegotiated;
-	}
-
-
-
-
-	
-
-/** accessor 
-
-@return reference to TRequestedProfileBufferPckg
-*/
-inline TRequestedProfileBufferPckg& CEtelDriverContext::QosRequestedPckg()
-	{ 
-	return iQosRequestedPckg; 
-	}
-
-/**
-accessor 
-@return reference to TNegotiatedProfileBufferPckg
-*/
-inline TNegotiatedProfileBufferPckg& CEtelDriverContext::QosNegotiatedPckg()
-	{ 
-	return iQosNegotiatedPckg; 
-	}
-
-
-/**
-accessor 
-@return reference to ContextConfigGPRS
-*/
-inline RPacketContext::TContextConfigGPRS&	CEtelDriverContext::ContextConfigGPRS()
-	{ 
-	return iContextConfigGPRS; 
-	}
-
-/** accessor 
-
-@return reference to ContextConfigGPRSPckg
-*/
-inline EtelDriver::TContextConfigGPRSPckg& CEtelDriverContext::ContextConfigGPRSPckg()
-	{ 
-	return iContextConfigGPRSPckg; 
-	}
-
-/** accessor 
-
-@return reference to packet context' DataChannelV2
-*/
-inline RPacketContext::TDataChannelV2& CEtelDriverContext::DataChannelV2()
-	{ 
-	return iDataChannelV2; 
-	}
-
-/** accessor 
-
-@return reference to packet context' DataChannelV2Pckg
-*/
-inline RPacketContext::TDataChannelV2Pckg& CEtelDriverContext::DataChannelV2Pckg()
-	{ 
-	return iDataChannelV2Pckg; 
-	}
-
-/** accessor 
-
-@return reference to TFT info
-*/
-inline TTFTInfo& CEtelDriverContext::TftInfo()
-	{ 
-	return iTftInfo; 
-	}
-
-/** accessor 
-
-@return reference to packet context' PacketFilterV2
-*/
-inline RPacketContext::TPacketFilterV2& CEtelDriverContext::FilterV2()
-	{ 
-	return iFilterV2; 
-	}
-
-/** accessor 
-
-@return reference to packet context' PacketFilterV2Pckg
-*/
-inline RPacketContext::TPacketFilterV2Pckg& CEtelDriverContext::FilterV2Pckg()
-	{ 
-	return iFilterV2Pckg; 
-	}
-
-/** accessor 
-
-@return requested TFT
-*/
-inline TUint8 CEtelDriverContext::TftRequested() const
-	{ 
-	return iTftRequested; 
-	}
-
-/** accessor 
-
-@return reference to TFT operation code
-*/
-inline TTFTOperationCode& CEtelDriverContext::TftOperationCode()
-	{
-	return iTftOperationCode;
-	}
-
-
-#endif // CETELDRIVERCONTEXT_H
--- a/telephonyprotocols/umtsgprsscpr/spudtel/inc/ceteldriverfactory.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,182 +0,0 @@
-// Copyright (c) 2004-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:
-// etel driver factory
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#ifndef CETELDRIVERFACTORY_H
-#define CETELDRIVERFACTORY_H
-
-#include <e32base.h>
-#include <etelmm.h>
-#include <etelpckt.h>
-
-#include "PDPFSM.h"
-#include "cservicechangenotifier.h"
-#include "eteldriverstrategies.h"
-#include "eteldrivernmspace.h"
-
-
-class CSpudContextElem;
-class CEtelDriverContext;
-
-/** factory (and owner) of spud etel driver objects */
-class CEtelDriverFactory : public CBase
-	{
-public:
-	static CEtelDriverFactory* NewL (CPdpFsmInterface& aPdpFsmInterface);
-	
-	virtual ~CEtelDriverFactory();
-	
-	virtual void InitL();
-	virtual void CreatePdpL (TContextId aPdpId);
-	virtual void FreePdp(TContextId aPdpId);
-	
-	virtual void StartPdpNotifications (TContextId aPdpId);
-	virtual void CancelPdpNotifications (TContextId aPdpId);
-	virtual void CancelAllPdpNotifications();
-
-    void PdpStatusChangeNotifierCancel(TContextId aPdpId);
-    void QoSChangeNotifierCancel(TContextId aPdpId);
-    void PdpConfigChangeNotifierCancel(TContextId aPdpId);
-
-    void GetLastErrorCause(TContextId aPdpId, TInt& aLastErrorCause);
-
-	/** accessors */
-	TBool HasContext(TContextId aId) const;
-	CEtelDriverContext& Context(TContextId aId);
-	inline TInt ContextCount() const;
-	inline RPacketService& PacketService();
-	inline RPhone& Phone();
-	inline MEtelDriverStrategy& Strategy(EtelDriver::TEtelDriverStrategy aId) const;
-	inline CPdpFsmInterface& PdpFsmInterface() const;
-
-		
-	/** map etel input to strategy id */
-	inline EtelDriver::TEtelDriverStrategy StrategyId(EtelDriver::TEtelInput aInput) const;
-
-private:
-	CEtelDriverFactory (CPdpFsmInterface& aPdpFsmInterface);
-	void ConstructL();
-
-private:
-	// data common among all pdp contexts
-	/** reference to clients CPdpFsmInterface */
-	CPdpFsmInterface& 	iPdpFsmInterface;
-	/** tel server */
-	RTelServer			iTelServer;
-	/** phone */
-	RPhone				iPhone;
-	/** packet service */
-	RPacketService 		iPacketService;
-	/** service change notify */
-	CServiceChangeNotifier iServiceChangeNotifier;
-	
-	/** global array of Etel Driver Stratergies */
-	TFixedArray<MEtelDriverStrategy*, EtelDriver::ESentinelStrategy>	iStrategies;
-	/** map of input to strategy id */
-	// Dev. note: we might have more Strategies then Inputs
-	TFixedArray<EtelDriver::TEtelDriverStrategy, EtelDriver::ESentinelInput> 		iInputToStrategyMap;
-
-
-	/** array of pdp contexts and notifiers
-		Dev. note: primary and secondary contexts could be in arbitrary slots
-	*/
-	TFixedArray<CSpudContextElem*, KMaxPdpContexts> 		iContexts;
-
-	/** open strategy */	
-	TOpenStrategy 					iOpenStrategy;
-	/** set QoS strategy */	
-	TSetQoSStrategy 				iSetQoSStrategy;
-	/** set TFT strategy */
-	TSetTftStrategy					iSetTftStrategy;
-	/** change TFT strategy */
-	TChangeTftStrategy				iChangeTftStrategy;
-	/** create primary pdp context strategy */
-	TCreate1ryPdpContextStrategy	iCreate1ryPdpContextStrategy;
-	/** create secondary pdp context strategy */
-	TCreate2ryPdpContextStrategy 	iCreate2ryPdpContextStrategy;
-	/** activate pdp context strategy */
-	TActivatePdpStrategy			iActivatePdpStrategy;
-	/** retrieve negotiated qos strategy */
-	TGetNegQoSStrategy				iGetNegQoSStrategy;
-	/** modify active pdp context strategy */
-	TModifyActiveStrategy			iModifyActivePdpStrategy;
-	/** delete pdp context strategy */
-	TContextDeleteStrategy			iContextDeleteStrategy;
-	};
-
-
-// inlines
-/** returns count of pdp contexts
-
-@return count of pdp contexts
-*/
-inline TInt CEtelDriverFactory::ContextCount() const
-	{ 
-	return iContexts.Count(); 
-	}
-	
-/** accessor 
-
-@return reference to etel RPacketService
-*/
-inline RPacketService& CEtelDriverFactory::PacketService()
-	{ 
-	return iPacketService; 
-	}
-	
-/** accessor 
-
-@return reference to etel RPhone
-*/
-inline RPhone& CEtelDriverFactory::Phone()
-	{ 
-	return iPhone; 
-	}
-	
-/** accessor 
-
-@return reference to etel driver strategy
-*/
-inline MEtelDriverStrategy& CEtelDriverFactory::Strategy(EtelDriver::TEtelDriverStrategy aId) const
-	{ 
-	return *iStrategies[aId]; 
-	}
-	
-/** accessor 
-
-@return reference to pdp fsm interface
-*/
-inline CPdpFsmInterface& CEtelDriverFactory::PdpFsmInterface() const
-	{ 
-	return iPdpFsmInterface;
-	}
-
-/** map etel input to strategy id 
-
-@param aInput - etel input id
-@return id of etel driver strategy 
-*/
-inline EtelDriver::TEtelDriverStrategy CEtelDriverFactory::StrategyId(EtelDriver::TEtelInput aInput) const
-	{ 
-	return iInputToStrategyMap[aInput]; 
-	}
-
-#endif // CETELDRIVERFACTORY_H
--- a/telephonyprotocols/umtsgprsscpr/spudtel/inc/ceteldrivernotifier.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-// Copyright (c) 2004-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:
-// service change notify
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#ifndef CETELDRIVERNOTIFIER_H
-#define CETELDRIVERNOTIFIER_H
-
-#include <e32base.h>
-
-class CPdpFsmInterface;
-
-
-/** base notifier class */
-class CEtelDriverNotifier : public CActive
-	{
-public:
-	CEtelDriverNotifier(CPdpFsmInterface& aPdpFsmInterface);
-
-	/** starts notifications */
-	virtual void Start() = 0;
-
-protected:
-	/** notifies SPUD FSM about network events */
-	virtual void Notify(const TRequestStatus& aStatus) = 0;
-
-	// CActive methods
-	virtual void RunL();
-
-protected:
-	/** Pdp Fsm Interface for FSM notification */
-	CPdpFsmInterface&	iPdpFsmInterface;
-	};
-
-#endif // CETELDRIVERNOTIFIER_H
--- a/telephonyprotocols/umtsgprsscpr/spudtel/inc/cpdpconfigchangenotifier.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-// Copyright (c) 2004-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:
-// PDP config change notifier
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#ifndef CPDPCONFIGCHAGENOTIFIER_H
-#define CPDPCONFIGCHAGENOTIFIER_H
-
-#include <e32base.h>
-#include <etelpckt.h>
-#include <networking/umtsnifcontrolif.h>
-
-#include "eteldrivernmspace.h"
-#include "ceteldrivernotifier.h"
-
-/** notifier for packet context config */
-class CPdpConfigChangeNotifier : public CEtelDriverNotifier
-	{
-public:
-	CPdpConfigChangeNotifier(TContextId aId, RPacketContext& aPacketContext, 
-								CPdpFsmInterface& aPdpFsmInterface);
-	virtual ~CPdpConfigChangeNotifier();
-	
-	virtual void Start();
-
-protected:
-	virtual void Notify(const TRequestStatus& aStatus);
-	virtual void DoCancel();
-
-private:
-	/** context id */
-	TContextId						iId;
-	/** underlying packet context */
-	RPacketContext&					iPacketContext;
-
-	/** packet context config */
-	RPacketContext::TContextConfigGPRS	iConfigGPRS;
-	/** packaged packet context config */
-	EtelDriver::TContextConfigGPRSPckg				iConfigGPRSPckg;
-	};
-
-#endif // CPDPCONFIGCHAGENOTIFIER_H
--- a/telephonyprotocols/umtsgprsscpr/spudtel/inc/cpdpstatuschangenotifier.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-// Copyright (c) 2004-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:
-// PDP status change notifier
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#ifndef CPDPSTATUSCHAGENOTIFIER_H
-#define CPDPSTATUSCHAGENOTIFIER_H
-
-#include <e32base.h>
-#include <etelpckt.h>
-
-#include <networking/umtsnifcontrolif.h>
-#include "ceteldrivernotifier.h"
-
-/** notifier for status of packet context */
-class CPdpStatusChangeNotifier : public CEtelDriverNotifier
-	{
-public:
-	CPdpStatusChangeNotifier(TContextId aId, RPacketContext& aPacketContext, 
-								CPdpFsmInterface& aPdpFsmInterface);
-	virtual ~CPdpStatusChangeNotifier();
-	
-	virtual void Start();
-
-protected:
-	virtual void Notify(const TRequestStatus& aStatus);
-	virtual void DoCancel();
-
-private:
-	/** context id */
-	TContextId						iId;
-	/** underlying packet context */
-	RPacketContext&					iPacketContext;
-
-	/** status of a packet context */
-	RPacketContext::TContextStatus	iContextStatus;
-	};
-
-#endif // CPDPSTATUSCHAGENOTIFIER_H
--- a/telephonyprotocols/umtsgprsscpr/spudtel/inc/cqoschangenotifier.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-// Copyright (c) 2004-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:
-// QoS profile change notifier
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#ifndef CQOSCHAGENOTIFIER_H
-#define CQOSCHAGENOTIFIER_H
-
-#include <e32base.h>
-
-#include "ceteldrivernotifier.h"
-#include "ceteldrivercontext.h" // definition of TQoSR99_R4NegotiatedPckg
-#include "pdpfsmnmspace.h"
-
-
-class RPacketQoS;
-
-/** QoS profile change notifier */
-class CQoSChangeNotifier : public CEtelDriverNotifier
-	{
-public:
-	CQoSChangeNotifier (TContextId aId, RPacketQoS& aPacketQoS, 
-							CPdpFsmInterface& aPdpFsmInterface);
-	virtual ~CQoSChangeNotifier();
-
-	virtual void Start();
-
-protected:
-	virtual void Notify(const TRequestStatus& aStatus);
-	virtual void DoCancel();
-
-private:
-	/** associated context id */
-	TContextId							iId;
-	/** ref to packet QoS */
-	RPacketQoS&							iPacketQoS;
-
-    TNegotiatedProfileBuffer iProfileBuffer;
-    TNegotiatedProfileBufferPckg iProfilePckg;
-	};
-
-#endif
-// CQOSCHAGENOTIFIER_H
--- a/telephonyprotocols/umtsgprsscpr/spudtel/inc/cservicechangenotifier.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-// Copyright (c) 2004-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:
-// service change notify
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#ifndef CSERVICECHAGENOTIFIER_H
-#define CSERVICECHAGENOTIFIER_H
-
-#include <e32base.h>
-#include <etelpckt.h>
-
-#include "ceteldrivernotifier.h"
-
-/** notifier for status of packet service */
-class CServiceChangeNotifier : public CEtelDriverNotifier
-	{
-public:
-	CServiceChangeNotifier(RPacketService& aPacketService, 
-							CPdpFsmInterface& aPdpFsmInterface);
-	~CServiceChangeNotifier();
-	
-	virtual void Start();
-
-protected:
-	virtual void Notify(const TRequestStatus& aStatus);
-	virtual void DoCancel();
-
-private:
-	/** underlying packet service */
-	RPacketService&				iPacketService;
-
-	/** status of a packet service */
-	RPacketService::TStatus		iServiceStatus;
-	};
-
-#endif // CSERVICECHAGENOTIFY_H
--- a/telephonyprotocols/umtsgprsscpr/spudtel/inc/cspudcontextelem.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-// Copyright (c) 2004-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:
-// spud context element
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#ifndef CSPUDCONTEXTELEM_H
-#define CSPUDCONTEXTELEM_H
-
-#include "ceteldrivercontext.h"
-#include "cpdpstatuschangenotifier.h"
-#include "cqoschangenotifier.h"
-#include "cpdpconfigchangenotifier.h"
-
-class CEtelDriverFactory;
-
-/** structure to keep context object and associated notifiers */
-class CSpudContextElem : CBase
-	{
-public:
-	static CSpudContextElem* NewL(TContextId aId, CEtelDriverFactory& aFactory, CPdpFsmInterface& aPdpFsmInterface);
-	virtual ~CSpudContextElem();
-
-	void Start();
-	void Cancel();
-
-	void GetLastErrorCause(TInt& aLastErrorCause);
-	
-    void PdpStatusChangeNotifierCancel();
-    void QoSChangeNotifierCancel();
-    void PdpConfigChangeNotifierCancel();
-
-	/** etel driver context */
-	CEtelDriverContext*			iContext;
-	/** pdp status change notifier */
-	CPdpStatusChangeNotifier*	iPdpStatusChangeNotifier;
-	/** QoS profile change notifier */
-	CQoSChangeNotifier*			iQoSChangeNotifier;
-	/** pdp config  change notifier */
-	CPdpConfigChangeNotifier*	iPdpConfigChangeNotifier;
-	
-private:
-	void ConstructL(TContextId aId, CEtelDriverFactory& aFactory, CPdpFsmInterface& aPdpFsmInterface);
-	};
-
-#endif // CSPUDCONTEXTELEM_H
--- a/telephonyprotocols/umtsgprsscpr/spudtel/inc/eteldrivernmspace.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-// Copyright (c) 2004-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:
-// etel driver namespace
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#ifndef ETELDRIVERNMSPACE_H
-#define ETELDRIVERNMSPACE_H
-
-namespace EtelDriver
-{
-
-/** input operations, which are handled by etel driver input */
-enum TEtelInput
-	{
-	EOpenPhone,
-	
-	ESetQoS,
-	ESetTft,
-	EChangeTft,
-	ECreate1ryPdpContext,
-	ECreate2ryPdpContext,
-
-	EActivatePdp,
-	ENegQoSGet,
-	EModifyActive,
-	EContextDelete,
-	
-	ESentinelInput
-	};
-
-/** input operations, which are handled by etel driver input */
-enum TEtelDriverStrategy
-	{
-	EOpenPhoneStrategy = 0,
-	
-	ESetQoSStrategy,
-	ESetTftStrategy,
-	EChangeTftStrategy,
-	
-	ECreate1ryPdpContextStrategy,
-	ECreate2ryPdpContextStrategy,
-	
-	EActivatePdpStrategy,
-	EGetNegQoSStrategy,
-	EModifyActiveStrategy,
-	EContextDeleteStrategy,
-
-	ESentinelStrategy
-	};
-
-	typedef TPckg<RPacketQoS::TQoSR99_R4Requested>  	TQoSR99_R4RequestedPckg;
-	typedef TPckg<RPacketQoS::TQoSR99_R4Negotiated>  	TQoSR99_R4NegotiatedPckg;
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5 
-	typedef TPckg<RPacketQoS::TQoSR5Requested>  	TQoSR5RequestedPckg;
-	typedef TPckg<RPacketQoS::TQoSR5Negotiated>  	TQoSR5NegotiatedPckg;
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 
-
-	typedef TPckg<RPacketContext::TContextConfigGPRS>  	TContextConfigGPRSPckg;
-	typedef TPckg<RPacketContext::TPacketFilterV2>		TPacketFilterV2Pckg;
-
-
-_LIT(KTxtSpudTel, "SPUDTEL");
-
-} // namespace EtelDriver
-
-	
-#endif // ETELDRIVERNMSPACE_H
--- a/telephonyprotocols/umtsgprsscpr/spudtel/inc/eteldriverstrategies.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,143 +0,0 @@
-// Copyright (c) 2004-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:
-// Header for all etel driver strategies classes.
-// Each class corresponds to an entry in TEtelInput
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#ifndef ETELDRIVERSTRATEGIES_H
-#define ETELDRIVERSTRATEGIES_H
-
-#include "meteldriverstrategy.h"
-
-
-/**
-Strategy to prepare etel for subsequent manipulations with pdp contexts.
-*/
-NONSHARABLE_CLASS(TOpenStrategy) : public MEtelDriverStrategy
-	{
-public:
-	virtual void Next (CEtelDriverContext& aContext, TRequestStatus* aStatus);
-	virtual void NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus );
-	virtual void CancelAsyncRequest(CEtelDriverContext& aContext);
-
-	};
-
-/**
-Strategy to delete pdp context.
-*/
-NONSHARABLE_CLASS(TContextDeleteStrategy) : public MEtelDriverStrategy
-	{
-public:
-	virtual void Next (CEtelDriverContext& aContext, TRequestStatus* aStatus);
-	virtual void NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus );
-	virtual void CancelAsyncRequest(CEtelDriverContext& aContext);
-
-	};
-	
-/**
-Strategy to set QoS for pdp context.
-*/
-NONSHARABLE_CLASS(TSetQoSStrategy) : public MEtelDriverStrategy
-	{
-public:
-	virtual void Next (CEtelDriverContext& aContext, TRequestStatus* aStatus);
-	virtual void NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus );
-	virtual void CancelAsyncRequest(CEtelDriverContext& aContext);
-	};
-	
-/**
-Strategy to set tft for pdp context.
-*/
-NONSHARABLE_CLASS(TSetTftStrategy) : public MEtelDriverStrategy
-	{
-public:
-	virtual void Next (CEtelDriverContext& aContext, TRequestStatus* aStatus);
-	virtual void NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus );
-	virtual void CancelAsyncRequest(CEtelDriverContext& aContext);
-	};
-
-/**
-Strategy to change tft for pdp context.
-*/
-NONSHARABLE_CLASS(TChangeTftStrategy) : public MEtelDriverStrategy
-	{
-public:
-	virtual void Next (CEtelDriverContext& aContext, TRequestStatus* aStatus);
-	virtual void NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus );
-	virtual void CancelAsyncRequest(CEtelDriverContext& aContext);
-	};
-
-/**
-Strategy to create primary pdp context.
-*/
-NONSHARABLE_CLASS(TCreate1ryPdpContextStrategy) : public MEtelDriverStrategy
-	{
-public:
-	virtual void Next (CEtelDriverContext& aContext, TRequestStatus* aStatus);
-	virtual void NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus );
-	virtual void CancelAsyncRequest(CEtelDriverContext& aContext);
-	};
-
-/**
-Strategy to create secondary pdp context.
-*/
-NONSHARABLE_CLASS(TCreate2ryPdpContextStrategy) : public MEtelDriverStrategy
-	{
-public:
-	virtual void Next (CEtelDriverContext& aContext, TRequestStatus* aStatus);
-	virtual void NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus );
-	virtual void CancelAsyncRequest(CEtelDriverContext& aContext);
-	};
-
-/**
-Strategy to activate pdp context, primary or secondary.
-*/
-NONSHARABLE_CLASS(TActivatePdpStrategy) : public MEtelDriverStrategy
-	{
-public:
-	virtual void Next (CEtelDriverContext& aContext, TRequestStatus* aStatus);
-	virtual void NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus );
-	virtual void CancelAsyncRequest(CEtelDriverContext& aContext);
-	};
-
-/**
-Strategy to retrieve negotiated qos from TSY for secondary pdp context
-*/
-NONSHARABLE_CLASS(TGetNegQoSStrategy) : public MEtelDriverStrategy
-	{
-public:
-	virtual void Next (CEtelDriverContext& aContext, TRequestStatus* aStatus);
-	virtual void NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus );
-	virtual void CancelAsyncRequest(CEtelDriverContext& aContext);
-	};
-
-
-/**
-Strategy to modify an active PDP context, primary or secondary.
-*/
-NONSHARABLE_CLASS(TModifyActiveStrategy) : public MEtelDriverStrategy
-	{
-public:
-	virtual void Next (CEtelDriverContext& aContext, TRequestStatus* aStatus);
-	virtual void NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus );
-	virtual void CancelAsyncRequest(CEtelDriverContext& aContext);
-	};
-
-#endif // ETELDRIVERSTRATEGIES_H
--- a/telephonyprotocols/umtsgprsscpr/spudtel/inc/meteldriverstrategy.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-// Copyright (c) 2004-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:
-// Header for etel driver strategy class
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#ifndef METELDRIVERSTRATEGY_H
-#define METELDRIVERSTRATEGY_H
-
-// forward declarations
-class CEtelDriverContext;
-
-/** base class for spud etel driver strategy */
-class MEtelDriverStrategy
-	{
-public:
-	/** union of all elementary steps to be performed during execution of strategies */
-	enum TSequenceStep
-		{
-		EStartStep,
-		EInitPhoneStep,
-		
-		EOpenNewQoSStep,
-		EGetConfigStep,
-		ESetConfigStep,
-		EInitialiseContextStep,
-		
-		ESetProfileParamsStep,
-		EGetProfileParamsStep,
-		
-		ECreateNewTFTStep,
-		EAddFirstTftStep,
-		EDeleteTftStep,
-		ERemoveFirstTftStep,
-		ERemoveTftStep,
-		EAddTftStep,
-		
-		EActivateStep,
-		EModifyActiveStep,
-		EDeactivateStep,
-		
-		EDeleteContextStep,
-		EChangeTftFinished,
-		EModifyActiveContext,
-		// add execution steps here
-		
-		EFinishStep
-		};
-
-public:
-	/** Executes next asynchronous step in a strategy. 
-
-	@param aContext - pdp context
-	@param aStatus - request status of this step
-	*/
-	virtual void Next (CEtelDriverContext& aContext, TRequestStatus* aStatus) = 0;
-	
-	/** 
-	Notifies SPUD FSM about execution results.
-
-	@param aContext - pdp context
-	@param aCompletionStatus - completion request status
-	*/	
-	virtual void NotifyFsm (CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus) = 0;
-	
-	/** Cancels last asynchronous request to eTel
-	
-	@param  aContext - pdp context
-	*/
-	virtual void CancelAsyncRequest(CEtelDriverContext& aContext) = 0;
-	};
-
-#endif // METELDRIVERSTRATEGY_H
--- a/telephonyprotocols/umtsgprsscpr/spudtel/inc/reteldriverinput.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-// Copyright (c) 2004-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:
-// Header for etel driver input class
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#ifndef RETELDRIVERINPUT_H
-#define RETELDRIVERINPUT_H
-
-#include <e32def.h>
-#include <e32std.h>
-#include <networking/umtsnifcontrolif.h>	// definition of TContextId
-
-#include "eteldrivernmspace.h"	// definition of EtelDriver::TEtelInput
-
-class CEtelDriverFactory;
-class CPdpFsmInterface;
-
-/** 
-	Definition of an input interface for SPUD eTel driver 
-
-@internalComponent
-*/
-class REtelDriverInput
-	{
-public:
-	REtelDriverInput();
-	virtual ~REtelDriverInput();
-
-	virtual void OpenL (CPdpFsmInterface& aPdpFsmInterface);
-	virtual void Close();
-	virtual void CreatePdpL (TContextId aPdpId);
-	virtual void DeletePdp (TContextId aPdpId);
-	virtual void Input(TContextId aPdpId, EtelDriver::TEtelInput aOperation);
-	virtual void CancelPdp (TContextId aPdpId);
-	virtual void StartPdpNotifications(TContextId aPdpId);
-	virtual void CancelPdpNotifications (TContextId aPdpId);
-	virtual void CancelAllPdps();
-	virtual void CancelAllPdpNotifications();
-	virtual void GetLastErrorCause (TContextId aPdpId, TInt& aLastErrorCause);
-
-protected:
-
-private:
-	// disable copy of an object
-	inline REtelDriverInput(REtelDriverInput&);
-	inline REtelDriverInput& operator= (REtelDriverInput& aInput);
-	
-private:
-	/** etel driver factory */
-	CEtelDriverFactory*	iDriverFactory;
-	};
-	
-
-// inlines
-/** copy c'tor
-	not supported for this class
-*/
-inline REtelDriverInput::REtelDriverInput(REtelDriverInput&)
-	{ 
-	// not supported
-	__ASSERT_ALWAYS(EFalse, User::Panic(EtelDriver::KTxtSpudTel, KErrNotSupported)); 
-	}
-	
-/** assignment operator
-	not supported for this class
-*/
-inline REtelDriverInput& REtelDriverInput::operator= (REtelDriverInput& aInput)
-	{ 
-	// not supported
-	__ASSERT_ALWAYS(EFalse, User::Panic(EtelDriver::KTxtSpudTel,KErrNotSupported));
-	return aInput; 
-	}
-
-#endif
-// RETELDRIVERINPUT_H
--- a/telephonyprotocols/umtsgprsscpr/spudtel/inc/spudteldebuglogger.h	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-// Copyright (c) 2004-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:
-// Event Logger header
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#ifndef SPUDTELDEBUGLOGGER_H
-#define SPUDTELDEBUGLOGGER_H
-
-
-#include "comms-infras/commsdebugutility.h"
-
-#ifdef __FLOG_ACTIVE
-
-#include <e32base.h>
-#include <e32def.h>
-
-
-_LIT8(KSpudTelLogFile,"SPUDTEL.TXT");
-_LIT8(KSpudTelLogFileVerbose,"SPUDTELVERB.TXT");
-_LIT8(KSpudTelLogFolder,"SPUD");
-
-// pure informational logging
-#if defined(_INFO_LOG)
-// Static info Output Logging Macros
-#define SPUDTEL_INFO_LOG(text) 					__FLOG_STATIC0(KSpudTelLogFolder,KSpudTelLogFile,text)
-#define SPUDTEL_INFO_LOG1(text,a)				__FLOG_STATIC1(KSpudTelLogFolder,KSpudTelLogFile,text, a)
-#define SPUDTEL_INFO_LOG2(text,a, b)			__FLOG_STATIC2(KSpudTelLogFolder,KSpudTelLogFile,text,a,b)
-#define SPUDTEL_INFO_LOG3(text,a, b, c)			__FLOG_STATIC3(KSpudTelLogFolder,KSpudTelLogFile,text,a,b,c)
-#define SPUDTELVERBOSE_INFO_LOG(text) 			__FLOG_STATIC0(KSpudTelLogFolder,KSpudTelLogFileVerbose,text)
-#define SPUDTELVERBOSE_INFO_LOG1(text,a)		__FLOG_STATIC1(KSpudTelLogFolder,KSpudTelLogFileVerbose,text, a)
-#define SPUDTELVERBOSE_INFO_LOG2(text,a, b)		__FLOG_STATIC2(KSpudTelLogFolder,KSpudTelLogFileVerbose,text,a,b)
-#define SPUDTELVERBOSE_INFO_LOG3(text,a, b, c)	__FLOG_STATIC3(KSpudTelLogFolder,KSpudTelLogFileVerbose,text,a,b,c)
-
-
-_LIT(KSpudTelMsgIn, ">>%S");
-_LIT(KSpudTelMsgOut,"<<%S");
-
-class TSpudTelLogFn
-{
-protected:
-	TName iName;
-
-public:
-	TSpudTelLogFn(const TDesC& aName) 	{ iName = aName; SPUDTELVERBOSE_INFO_LOG1(KSpudTelMsgIn, &iName);};
-	~TSpudTelLogFn()					{ SPUDTELVERBOSE_INFO_LOG1(KSpudTelMsgOut, &iName);};
-};
-
-#define SPUDTEL_FNLOG(name) TSpudTelLogFn spudTelLogFn(_L(name))
-
-#else // defined(_INFO_LOG)
-
-#define SPUDTEL_INFO_LOG(text)
-#define SPUDTEL_INFO_LOG1(text,a)
-#define SPUDTEL_INFO_LOG2(text,a, b)
-#define SPUDTEL_INFO_LOG3(text,a, b, c)
-#define SPUDTEL_FNLOG(name) 
-#define SPUDTELVERBOSE_INFO_LOG(text)
-#define SPUDTELVERBOSE_INFO_LOG1(text,a)
-#define SPUDTELVERBOSE_INFO_LOG2(text,a, b)
-#define SPUDTELVERBOSE_INFO_LOG3(text,a, b, c)
-
-#endif // defined(_INFO_LOG)
-
-
-// error logging
-#if defined(_ERROR_LOG)
-
-#define SPUDTEL_ERROR_LOG(errtext, err)	__FLOG_STATIC1(KSpudTelLogFolder,KSpudTelLogFile, errtext, err)
-#define SPUDTEL_ERROR_LOG0(errtext)		__FLOG_STATIC0(KSpudTelLogFolder,KSpudTelLogFile, errtext)
-
-#else // defined(_ERROR_LOG)
-
-#define SPUDTEL_ERROR_LOG(errtext, err)
-#define SPUDTEL_ERROR_LOG0(errtext)
-
-#endif // defined(_ERROR_LOG)
-
-
-#else	// __FLOG_ACTIVE
-
-#define SPUDTEL_INFO_LOG(t)
-#define SPUDTEL_INFO_LOG1(t,a)
-#define SPUDTEL_INFO_LOG2(t,a,b)
-#define SPUDTEL_INFO_LOG3(t,a,b,c)
-#define SPUDTEL_FNLOG(name)
-#define SPUDTELVERBOSE_INFO_LOG(t)
-#define SPUDTELVERBOSE_INFO_LOG1(t,a)
-#define SPUDTELVERBOSE_INFO_LOG2(t,a,b)
-#define SPUDTELVERBOSE_INFO_LOG3(t,a,b,c)
-#define SPUDTEL_ERROR_LOG(errtext, err)
-#define SPUDTEL_ERROR_LOG0(errtext)
-
-
-#endif //__FLOG_ACTIVE
-#endif
-// SPUDTELDEBUGLOGGER_H
-
--- a/telephonyprotocols/umtsgprsscpr/spudtel/src/ceteldrivercontext.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,327 +0,0 @@
-// Copyright (c) 2004-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:
-// implementation of etel driver context class
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-
-#include "ceteldrivercontext.h"
-#include "ceteldriverfactory.h"
-#include "spudteldebuglogger.h"
-
-
-using namespace EtelDriver;
-
-CEtelDriverContext::CEtelDriverContext (TContextId aId, CEtelDriverFactory& aFactory)
-: CActive(CActive::EPriorityStandard),
-  iId(aId),
-  iCompletionStatus(KErrNone),
-  iStrategyStep(MEtelDriverStrategy::EFinishStep),
-  iStrategyId(ESentinelStrategy),
-  iFactory(aFactory),
-  iQosRequestedPckg(iQosRequested),
-  iQosNegotiatedPckg(iQosNegotiated),
- iContextConfigGPRS(),
- iContextConfigGPRSPckg(iContextConfigGPRS),
- iDataChannelV2(),
- iDataChannelV2Pckg(iDataChannelV2),
- iFilterV2(),
- iFilterV2Pckg(iFilterV2)
- 	{
-	SPUDTEL_FNLOG("CEtelDriverContext::CEtelDriverContext");
-	CActiveScheduler::Add(this);
-  	}
-
-
-
-CEtelDriverContext::~CEtelDriverContext()
-	{
-	SPUDTEL_FNLOG("CEtelDriverContext::~CEtelDriverContext()");
-	Cancel(); // N.B. This cancels all outstanding operations on the context, including deletion!
-	
-	// Guarantees proper release of all handles.
-	// If everything is closed already, this does no harm.
-	iPacketQoS.Close(); // Close QoS first, a buggy TSY may not handle it the other way.
-	iPacketContext.Close(); // At this point the reference count on the context is zero.
-	// TSY should cleanly dispose of the context, if it had not done so already.
-	
-	// This is necessary only in a situtation where Spudman is destroyed while a strategy
-	// on a context is outstanding: in this case deletion of SpudTel results in cancellation
-	// of all outstanding operations, which is likely to result in handle leak.
-	// Under other circumstances, the handles will be closed via an appropriate strategy.
-	}
-
-/** initiates a new request 
-
-@param aOperation - type of an etel driver request 
-
-@return KErrInUse if pdp context has active strategy
-*/
-TInt CEtelDriverContext::Input (TEtelInput aOperation)
-	{
-	SPUDTEL_FNLOG("CEtelDriverContext::Input()");
-	SPUDTELVERBOSE_INFO_LOG1( _L("Operation %d"), aOperation );
-	
-	if (MEtelDriverStrategy::EFinishStep != iStrategyStep)
-		{
-		SPUDTEL_ERROR_LOG(_L("ERROR: Pdp context is in use, return %d"), KErrInUse);
-		// I'm still doing something
-		ASSERT(EFalse); // shouldn't happen
-		return KErrInUse;
-		}
-	
-	iStrategyId = iFactory.StrategyId(aOperation);
-	iStrategyStep = MEtelDriverStrategy::EStartStep;
-	iCompletionStatus = KErrNone;
-	
-	SetActive();
-	Strategy(iStrategyId).Next(*this, &iStatus);
-
-	return KErrNone;
-	}
-
-
-void CEtelDriverContext::RunL()
-	{
-	SPUDTEL_FNLOG("CEtelDriverContext::RunL()");
-	ASSERT(iStrategyId < ESentinelStrategy);
-	
-	if(iStatus != KErrNone)
-		{
-		if(iCompletionStatus == KErrNone)
-			{ 
-			iCompletionStatus = iStatus; 
-			SPUDTEL_ERROR_LOG(_L("Last async request completed with error %d"), iStatus.Int());
-			}
-		// Don't continue with the strategy for all cases except Delete
-		// N.B.: deletion of a context has to be done till the very last step
-		//	to ensure proper cleanup of resources.
-		if(EContextDeleteStrategy != iStrategyId)
-			{
-			iStrategyStep = MEtelDriverStrategy::EFinishStep;
-			}
-		SPUDTELVERBOSE_INFO_LOG(_L("Strategy is completed"));
-		}
-	
-	if(MEtelDriverStrategy::EFinishStep == iStrategyStep)
-		{
-		// we are done
-		SPUDTELVERBOSE_INFO_LOG(_L("Strategy is completed"));
-		Strategy(iStrategyId).NotifyFsm (*this, iCompletionStatus);
-		}
-	else
-		{
-		// continue with next step
-		SetActive();
-		Strategy(iStrategyId).Next(*this, &iStatus);
-		}
-	}
-
-/** cancels last async request */  	
-void CEtelDriverContext::DoCancel()
-	{
-	SPUDTEL_FNLOG("CEtelDriverContext::DoCancel()");
-
-	if(IsActive())
-		{
-		// delegate to strategy	
-		Strategy(iStrategyId).CancelAsyncRequest(*this);
-		}
-	iStrategyStep = MEtelDriverStrategy::EFinishStep;
-	SPUDTELVERBOSE_INFO_LOG(_L("Strategy is cancelled"));
-	}
-
-/** accessor */
-const TName& CEtelDriverContext::ExistingContextName() const 
-	{ 
-   	SPUDTEL_FNLOG("CEtelDriverContext::ExistingContextName()");
-	for (TContextId i = 0; i < static_cast<TContextId>(iFactory.ContextCount()); i++)
-		{
-        
-		if (iFactory.HasContext(i) && iFactory.Context(i).Name().Size())
-			{
-			return iFactory.Context(i).Name(); 
-			}
-		}
-		
-	// Unacceptable situation: we didn't create a single context yet
-	SPUDTEL_ERROR_LOG(_L("CEtelDriverContext::ExistingContextName - can't find existing context. return %S"), &iFactory.Context(0).Name());
-	ASSERT(EFalse);
-	return iFactory.Context(0).Name(); 
-	}
-
-/** accessor 
-
-@return reference to etel RPhone
-*/
-RPhone& CEtelDriverContext::Phone() const
-	{ 
-	return iFactory.Phone(); 
-	}
-
-/** accessor 
-
-@return reference to etel RPacketService
-*/
-RPacketService& CEtelDriverContext::PacketService() const
-	{ 
-	return iFactory.PacketService(); 
-	}
-
-/** accessor 
-
-@return reference to etel driver strategy
-*/
-MEtelDriverStrategy& CEtelDriverContext::Strategy(TEtelDriverStrategy aId) const
-	{ 
-	return iFactory.Strategy(aId); 
-	}
-
-/** accessor 
-
-@return reference to pdp fsm interface
-*/
-CPdpFsmInterface& CEtelDriverContext::PdpFsmInterface() const
-	{ 
-	return iFactory.PdpFsmInterface(); 
-	}
-
-/** start pdp notifications */
-void CEtelDriverContext::StartNotifications() const
-	{ 
-	iFactory.StartPdpNotifications(iId); 
-	}
-
-/** stops pdp notifications */
-void CEtelDriverContext::StopNotifications() const
-	{ 
-	iFactory.CancelPdpNotifications(iId); 
-	}
-
-void CEtelDriverContext::PdpStatusChangeNotifierCancel()
-    {
-    iFactory.PdpStatusChangeNotifierCancel(iId);
-    }
-
-void CEtelDriverContext::QoSChangeNotifierCancel()
-    {
-    iFactory.QoSChangeNotifierCancel(iId);
-    }
-
-void CEtelDriverContext::PdpConfigChangeNotifierCancel()
-    {
-    iFactory.PdpConfigChangeNotifierCancel(iId);
-    }
-
-#ifdef _DEBUG
-void CEtelDriverContext::DumpReqProfileParameters ()
-    {
-    SPUDTEL_INFO_LOG1( _L("Requested Profile Parameters Dump - Context Id = %d"), Id());
-    SPUDTEL_INFO_LOG( _L("==========================================================="));
-    SPUDTEL_INFO_LOG1( _L("ExtensionId = %d"), iQosRequested.ExtensionId());
-    
-    if (iQosRequested.ExtensionId() != TPacketDataConfigBase::KConfigRel99Rel4
-        && iQosRequested.ExtensionId() != TPacketDataConfigBase::KConfigRel5)
-        {
-        SPUDTEL_INFO_LOG( _L("Invalid/Unsupported ExtensionId"));
-        return;
-        }
-
-    if (iQosRequested.ExtensionId() == TPacketDataConfigBase::KConfigRel99Rel4
-        || iQosRequested.ExtensionId() == TPacketDataConfigBase::KConfigRel5)
-        {
-        SPUDTEL_INFO_LOG1( _L("[1]iReqTrafficClass = %d"), iQosRequested.RequestedQoSR99_R4().iReqTrafficClass);
-        SPUDTEL_INFO_LOG1( _L("[2]iMinTrafficClass = %d"), iQosRequested.RequestedQoSR99_R4().iMinTrafficClass);
-        SPUDTEL_INFO_LOG1( _L("[3]iReqDeliveryOrderReqd = %d"), iQosRequested.RequestedQoSR99_R4().iReqDeliveryOrderReqd);
-        SPUDTEL_INFO_LOG1( _L("[4]iMinDeliveryOrderReqd = %d"), iQosRequested.RequestedQoSR99_R4().iMinDeliveryOrderReqd);
-        SPUDTEL_INFO_LOG1( _L("[5]iReqDeliverErroneousSDU = %d"), iQosRequested.RequestedQoSR99_R4().iReqDeliverErroneousSDU);
-        SPUDTEL_INFO_LOG1( _L("[6]iMinDeliverErroneousSDU = %d"), iQosRequested.RequestedQoSR99_R4().iMinDeliverErroneousSDU);
-        SPUDTEL_INFO_LOG1( _L("[7]iReqMaxSDUSize = %d"), iQosRequested.RequestedQoSR99_R4().iReqMaxSDUSize);
-        SPUDTEL_INFO_LOG1( _L("[8]iMinAcceptableMaxSDUSize = %d"), iQosRequested.RequestedQoSR99_R4().iMinAcceptableMaxSDUSize);
-        SPUDTEL_INFO_LOG1( _L("[9]iReqMaxRate.iUplinkRate = %d"), iQosRequested.RequestedQoSR99_R4().iReqMaxRate.iUplinkRate);
-        SPUDTEL_INFO_LOG1( _L("[10]iReqMaxRate.iDownlinkRate = %d"), iQosRequested.RequestedQoSR99_R4().iReqMaxRate.iDownlinkRate);
-        SPUDTEL_INFO_LOG1( _L("[11]iMinAcceptableMaxRate.iUplinkRate = %d"), iQosRequested.RequestedQoSR99_R4().iMinAcceptableMaxRate.iUplinkRate);
-        SPUDTEL_INFO_LOG1( _L("[12]iMinAcceptableMaxRate.iDownlinkRate = %d"), iQosRequested.RequestedQoSR99_R4().iMinAcceptableMaxRate.iDownlinkRate);
-        SPUDTEL_INFO_LOG1( _L("[13]iReqBER = %d"), iQosRequested.RequestedQoSR99_R4().iReqBER);
-        SPUDTEL_INFO_LOG1( _L("[14]iMaxBER = %d"), iQosRequested.RequestedQoSR99_R4().iMaxBER);
-        SPUDTEL_INFO_LOG1( _L("[15]iReqSDUErrorRatio = %d"), iQosRequested.RequestedQoSR99_R4().iReqSDUErrorRatio);
-        SPUDTEL_INFO_LOG1( _L("[16]iMaxSDUErrorRatio = %d"), iQosRequested.RequestedQoSR99_R4().iMaxSDUErrorRatio);
-        SPUDTEL_INFO_LOG1( _L("[17]iReqTrafficHandlingPriority = %d"), iQosRequested.RequestedQoSR99_R4().iReqTrafficHandlingPriority);
-        SPUDTEL_INFO_LOG1( _L("[18]iReqTrafficHandlingPriority = %d"), iQosRequested.RequestedQoSR99_R4().iMinTrafficHandlingPriority);
-        SPUDTEL_INFO_LOG1( _L("[19]iReqTransferDelay = %d"), iQosRequested.RequestedQoSR99_R4().iReqTransferDelay);
-        SPUDTEL_INFO_LOG1( _L("[20]iMaxTransferDelay = %d"), iQosRequested.RequestedQoSR99_R4().iMaxTransferDelay);
-        SPUDTEL_INFO_LOG1( _L("[21]iReqGuaranteedRate.iUplinkRate = %d"), iQosRequested.RequestedQoSR99_R4().iReqGuaranteedRate.iUplinkRate);
-        SPUDTEL_INFO_LOG1( _L("[22]iReqGuaranteedRate.iDownlinkRate = %d"), iQosRequested.RequestedQoSR99_R4().iReqGuaranteedRate.iDownlinkRate);
-        SPUDTEL_INFO_LOG1( _L("[23]iMinGuaranteedRate.iUplinkRate = %d"), iQosRequested.RequestedQoSR99_R4().iMinGuaranteedRate.iUplinkRate);
-        SPUDTEL_INFO_LOG1( _L("[24]iMinGuaranteedRate.iDownlinkRate = %d"), iQosRequested.RequestedQoSR99_R4().iMinGuaranteedRate.iDownlinkRate);
-        }
-    
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-    if (iQosRequested.ExtensionId() == TPacketDataConfigBase::KConfigRel5)
-        {
-        SPUDTEL_INFO_LOG1( _L("[25]iSignallingIndication = %d"), iQosRequested.RequestedQoSR5().iSignallingIndication);
-        SPUDTEL_INFO_LOG1( _L("[26]iSourceStatisticsDescriptor = %d"), iQosRequested.RequestedQoSR5().iSourceStatisticsDescriptor);
-        }
-#endif        
-    }
-
-
-
-void CEtelDriverContext::DumpNegProfileParameters ()
-    {
-    SPUDTEL_INFO_LOG1( _L("Negotiated Profile Parameters Dump - Context Id = %d"), Id());
-    SPUDTEL_INFO_LOG( _L("==========================================================="));
-    SPUDTEL_INFO_LOG1( _L("ExtensionId = %d"), iQosNegotiated.ExtensionId());
-    
-    if (iQosNegotiated.ExtensionId() != TPacketDataConfigBase::KConfigRel99Rel4
-        && iQosNegotiated.ExtensionId() != TPacketDataConfigBase::KConfigRel5)
-        {
-        SPUDTEL_INFO_LOG( _L("Invalid/Unsupported ExtensionId"));
-        return;
-        }
-
-    if (iQosNegotiated.ExtensionId() == TPacketDataConfigBase::KConfigRel99Rel4
-        || iQosNegotiated.ExtensionId() == TPacketDataConfigBase::KConfigRel5)
-        {
-        SPUDTEL_INFO_LOG1( _L("[2]iTrafficClass = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iTrafficClass);
-        SPUDTEL_INFO_LOG1( _L("[3]iDeliveryOrderReqd = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iDeliveryOrderReqd);
-        SPUDTEL_INFO_LOG1( _L("[4]iDeliverErroneousSDU = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iDeliverErroneousSDU);
-        SPUDTEL_INFO_LOG1( _L("[5]iMaxSDUSize = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iMaxSDUSize);
-        SPUDTEL_INFO_LOG1( _L("[6]iBER = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iBER);
-        SPUDTEL_INFO_LOG1( _L("[7]iSDUErrorRatio = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iSDUErrorRatio);
-        SPUDTEL_INFO_LOG1( _L("[8]iTrafficHandlingPriority = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iTrafficHandlingPriority);
-        SPUDTEL_INFO_LOG1( _L("[9]iTransferDelay = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iTransferDelay);
-        SPUDTEL_INFO_LOG1( _L("[10]iGuaranteedRate.iUplinkRate = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iGuaranteedRate.iUplinkRate);
-        SPUDTEL_INFO_LOG1( _L("[11]iGuaranteedRate.iDownlinkRate = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iGuaranteedRate.iDownlinkRate);
-        SPUDTEL_INFO_LOG1( _L("[12]iMaxRate.iUplinkRate = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iMaxRate.iUplinkRate);
-        SPUDTEL_INFO_LOG1( _L("[13]iMaxRate.iDownlinkRate = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iMaxRate.iDownlinkRate);
-        }
-
-    
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-    if (iQosNegotiated.ExtensionId() == TPacketDataConfigBase::KConfigRel5)
-        {
-        SPUDTEL_INFO_LOG1( _L("[14]iSignallingIndication = %d"), iQosNegotiated.NegotiatedQoSR5().iSignallingIndication);
-        SPUDTEL_INFO_LOG1( _L("[15]iSourceStatisticsDescriptor = %d"), iQosNegotiated.NegotiatedQoSR5().iSourceStatisticsDescriptor);
-        }
-#endif
-    }
-    
-#endif
-// _DEBUG
--- a/telephonyprotocols/umtsgprsscpr/spudtel/src/ceteldriverfactory.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,277 +0,0 @@
-// Copyright (c) 2004-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:
-// etel driver factory
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#include <e32base.h>
-#include <etelmm.h>
-
-#include "cspudcontextelem.h"
-#include "ceteldriverfactory.h"
-#include "spudteldebuglogger.h"
-
-using namespace EtelDriver;
-
-/**
-@param aPdpFsmInterface - pdp fsm interface
-*/
-CEtelDriverFactory::CEtelDriverFactory (CPdpFsmInterface& aPdpFsmInterface)
-: iPdpFsmInterface(aPdpFsmInterface),
-  iServiceChangeNotifier(iPacketService, iPdpFsmInterface)
-	{
-	SPUDTELVERBOSE_INFO_LOG(_L("CEtelDriverFactory::CEtelDriverFactory()"));
-	}
-
-/**
-@param aPdpFsmInterface - pdp fsm interface
-*/
-CEtelDriverFactory* CEtelDriverFactory::NewL (CPdpFsmInterface& aPdpFsmInterface)
-	{
-	SPUDTEL_INFO_LOG(_L("CEtelDriverFactory::NewL()"));
-	
-	return new (ELeave) CEtelDriverFactory (aPdpFsmInterface);
-	}
-
-CEtelDriverFactory::~CEtelDriverFactory()
-	{
-	SPUDTEL_FNLOG("CEtelDriverFactory::~CEtelDriverFactory()");
-	SPUDTEL_INFO_LOG(_L("CEtelDriverFactory::~CEtelDriverFactory()"));
-
-	// cancel all notificators
-	iServiceChangeNotifier.Cancel();
-	
-	// cleanup array of CEtelDriverContext objs
-	for (TInt i = 0; i < iContexts.Count(); i++ )
-		{ 
-		delete iContexts[i]; 
-		}
-	iContexts.Reset();
-
-	// common data cleanup...
-	// sync operations only
-	iPacketService.Close();
-	iPhone.Close();
-
-	iTelServer.UnloadPhoneModule(iPdpFsmInterface.TsyName());
-
-	iTelServer.Close();	// Phone module unloaded automatically
-	
-	iStrategies.Reset();
-	}
-
-/**
-Function obtains the info on the phone object implemented in the TSY
-
-Assumes aloadedTsyName has no ".TSY" appendage
-Finds the phone information for the TSY just loaded. 
-Assumes just one phone in that TSY - or that every phone in it is equally useful.
-
-@param aTelServer - tel server
-@param aLoadedTsyName - name of the loaded Tsy.
-@param aInfo - information about the phone.
-*/
-static void GetPhoneInfoL(RTelServer& aTelServer, const TDesC& aLoadedTsyName, RTelServer::TPhoneInfo& aInfo)
-	{
-	// dev. note: leavescan reports an error in this method.
-	// But there is no visible ground for it.
-	SPUDTEL_FNLOG("GetPhoneInfoL()");
-	TInt count;
-	User::LeaveIfError(aTelServer.EnumeratePhones(count));
-	if (count<=0)
-		{
-		User::Leave(KErrNotFound);
-		}
-		
-	TBool found = EFalse;
-	for (TInt i=0; i < count; i++)
-		{
-		TBuf<KCommsDbSvrMaxFieldLength> currentTsyName;
-		User::LeaveIfError(aTelServer.GetTsyName(i,currentTsyName));
-		
-		TInt r=currentTsyName.Locate('.');
-		if (r!=KErrNotFound)
-			{
-			currentTsyName.SetLength(r);
-			}
-		if (currentTsyName.CompareF(aLoadedTsyName)==KErrNone)
-			{
-			User::LeaveIfError(aTelServer.GetPhoneInfo(i,aInfo));
-			found = ETrue;
-			break;
-			}
-		}
-
-	if (!found)
-		{
-		User::Leave(KErrNotFound);
-		}
-
-	}
-
-/** initializes factory objects */
-void CEtelDriverFactory::InitL()
-	{
-	SPUDTEL_FNLOG("CEtelDriverFactory::InitL()");
-	SPUDTEL_INFO_LOG(_L("Initializing Etel driver"));
-	
-	iStrategies[EOpenPhoneStrategy] 			= &iOpenStrategy;
-	iStrategies[ESetQoSStrategy] 				= &iSetQoSStrategy;
-	iStrategies[ESetTftStrategy] 				= &iSetTftStrategy;
-	iStrategies[EChangeTftStrategy]				= &iChangeTftStrategy;
-	
-	iStrategies[ECreate1ryPdpContextStrategy] 	= &iCreate1ryPdpContextStrategy;
-	iStrategies[ECreate2ryPdpContextStrategy] 	= &iCreate2ryPdpContextStrategy;
-	iStrategies[EActivatePdpStrategy] 			= &iActivatePdpStrategy;
-	iStrategies[EGetNegQoSStrategy] 			= &iGetNegQoSStrategy;
-	iStrategies[EModifyActiveStrategy] 			= &iModifyActivePdpStrategy;
-	iStrategies[EContextDeleteStrategy] 		= &iContextDeleteStrategy;
-
-	// initialization of operator to strategy id map
-	iInputToStrategyMap[EOpenPhone]				= EOpenPhoneStrategy;
-	iInputToStrategyMap[ESetQoS] 				= ESetQoSStrategy;
-	iInputToStrategyMap[ECreate1ryPdpContext] 	= ECreate1ryPdpContextStrategy;
-	iInputToStrategyMap[ECreate2ryPdpContext] 	= ECreate2ryPdpContextStrategy;
-	iInputToStrategyMap[ESetTft] 				= ESetTftStrategy;
-	iInputToStrategyMap[EChangeTft] 			= EChangeTftStrategy;
-	iInputToStrategyMap[EActivatePdp] 			= EActivatePdpStrategy;
-	iInputToStrategyMap[ENegQoSGet] 			= EGetNegQoSStrategy;
-	iInputToStrategyMap[EModifyActive] 			= EModifyActiveStrategy;
-	iInputToStrategyMap[EContextDelete]			= EContextDeleteStrategy;
-
-
-	User::LeaveIfError (iTelServer.Connect());
-	User::LeaveIfError(iTelServer.LoadPhoneModule(iPdpFsmInterface.TsyName()));
-
-	User::LeaveIfError(iTelServer.SetExtendedErrorGranularity(RTelServer::EErrorExtended));
-
-	RTelServer::TPhoneInfo phoneInfo;
-	GetPhoneInfoL(iTelServer, iPdpFsmInterface.TsyName(), phoneInfo);
-	User::LeaveIfError (iPhone.Open (iTelServer, phoneInfo.iName) );
-	User::LeaveIfError (iPacketService.Open (iPhone) );
-
-	// remaining async calls to phone are postponed to later async Input request
-	
-	iServiceChangeNotifier.Start();
-	}
-	
-/** creates pdp by id
-	dev. note: pdp context will NOT be opened during this call.
-
-@param aPdpId - id of a pdp context
-*/
-void CEtelDriverFactory::CreatePdpL (TContextId aPdpId)
-	{
-	SPUDTEL_FNLOG("CEtelDriverFactory::CreatePdpL()");
-	SPUDTELVERBOSE_INFO_LOG1(_L("pdp id : %d"), aPdpId);
-	__ASSERT_ALWAYS((NULL == iContexts[aPdpId]), User::Panic(KTxtSpudTel, KErrArgument));
-
-	iContexts[aPdpId] = CSpudContextElem::NewL(aPdpId, *this, iPdpFsmInterface);
-	}
-
-
-/** frees pdp context by id 
-
-@param aPdpId - id of a pdp context
-*/
-void CEtelDriverFactory::FreePdp(TContextId aPdpId)
-	{
-	SPUDTELVERBOSE_INFO_LOG1(_L("Free pdp id : %d"), aPdpId);
-	// the context has to be closed before a call to FreePdp
-	__ASSERT_ALWAYS(!Context(aPdpId).PacketContext().SubSessionHandle(), User::Panic(KTxtSpudTel, KErrInUse));
-	
-	delete iContexts[aPdpId];
-	iContexts[aPdpId] = NULL;
-	}
-
-
-/** starts etel notifications for pdp context
-
-@param aPdpId - id of a pdp context
-*/
-void CEtelDriverFactory::StartPdpNotifications (TContextId aPdpId)
-	{
-	SPUDTELVERBOSE_INFO_LOG1(_L("StartPdpNotifications for pdp id : %d"), aPdpId);
-	// sanity check
-	ASSERT(iContexts[aPdpId]);
-	
-	iContexts[aPdpId]->Start();
-	}
-
-/** cancels etel notifications for aPdpId context 
-
-@param aPdpId - id of a pdp context
-*/
-void CEtelDriverFactory::CancelPdpNotifications (TContextId aPdpId)
-	{
-	SPUDTELVERBOSE_INFO_LOG1(_L("CancelPdpNotifications for pdp id : %d"), aPdpId);
-	// sanity check
-	ASSERT(iContexts[aPdpId]);
-	
-	iContexts[aPdpId]->Cancel();
-	}
-
-/** cancels notifications for all pdp contexts */
-void CEtelDriverFactory::CancelAllPdpNotifications()
-	{
-	SPUDTEL_INFO_LOG(_L("CancelAllPdpNotifications"));
-	for(TContextId i = 0; i < static_cast<TContextId>(ContextCount()); i++)
-		{ 
-		CancelPdpNotifications (i); 
-		}
-	}
-
-void CEtelDriverFactory::PdpStatusChangeNotifierCancel(TContextId aPdpId)
-    {
-    iContexts[aPdpId]->PdpStatusChangeNotifierCancel();
-    }
-
-void CEtelDriverFactory::QoSChangeNotifierCancel(TContextId aPdpId)
-    {
-    iContexts[aPdpId]->QoSChangeNotifierCancel();
-    }
-
-void CEtelDriverFactory::PdpConfigChangeNotifierCancel(TContextId aPdpId)
-    {
-    iContexts[aPdpId]->PdpConfigChangeNotifierCancel();
-    }
-
-TBool CEtelDriverFactory::HasContext(TContextId aId) const
-    {
-    return (iContexts[aId] != NULL);
-    }
-
-
-/** context accessor
-
-@param aPdpId - id of a pdp context
-@return etel driver context
-*/
-CEtelDriverContext& CEtelDriverFactory::Context(TContextId aId) 
-	{ 
-	// sanity check
-	__ASSERT_ALWAYS(iContexts[aId], User::Panic(KTxtSpudTel, KErrBadHandle));
-
-	return *iContexts[aId]->iContext; 
-	}
-
-void CEtelDriverFactory::GetLastErrorCause(TContextId aPdpId, TInt& aLastErrorCause) 
-	{
-	iContexts[aPdpId]->GetLastErrorCause(aLastErrorCause);
-	}
--- a/telephonyprotocols/umtsgprsscpr/spudtel/src/ceteldrivernotifier.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-// Copyright (c) 2004-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:
-// implementation of base spud etel driver notifier
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#include <e32def.h>
-
-#include "ceteldrivernotifier.h"
-#include "PDPFSM.h"
-#include "spudteldebuglogger.h"
-
-
-/**
-@param aPdpFsmInterface - reference to pdp fsm interface
-*/
-CEtelDriverNotifier::CEtelDriverNotifier(CPdpFsmInterface& aPdpFsmInterface)
-: CActive(EPriorityStandard),
-  iPdpFsmInterface(aPdpFsmInterface)
-	{
-	CActiveScheduler::Add(this);
-	}
-
-
-void CEtelDriverNotifier::RunL()
-	{
-	// notify fsm in any case
-	Notify(iStatus);
-	
-	if(iStatus == KErrNone)
-		{
-		// repost
-		Start();
-		}
-	else // error
-		{
-		if(KErrCancel != iStatus.Int())
-			{
-			SPUDTEL_ERROR_LOG(_L("CEtelDriverNotifier::RunL() reported an error: %d"), 
-							iStatus.Int());
-			}
-		}
-	}
-	
--- a/telephonyprotocols/umtsgprsscpr/spudtel/src/cpdpconfigchangenotifier.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-// Copyright (c) 2004-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:
-// PDP config change notifier
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#include <e32base.h>
-#include <pcktcs.h>
-
-#include "cpdpconfigchangenotifier.h"
-#include "PDPFSM.h"
-#include "spudteldebuglogger.h"
-#include "pdpfsmnmspace.h"
-
-
-/**
-@param aId - pdp context id
-@param aPacketContext - reference to etel packet context
-@param aPdpFsmInterface - reference to pdp fsm interface
-*/
-CPdpConfigChangeNotifier::CPdpConfigChangeNotifier(TContextId aId,
-										RPacketContext& aPacketContext,
-										CPdpFsmInterface& aPdpFsmInterface)
-: CEtelDriverNotifier(aPdpFsmInterface),
-  iId(aId),
-  iPacketContext(aPacketContext),
-  iConfigGPRS(),
-  iConfigGPRSPckg(iConfigGPRS)
-	{
-	}
-
-CPdpConfigChangeNotifier::~CPdpConfigChangeNotifier()
-	{
-	Cancel();
-	}
-
-/** initiate notification */
-void CPdpConfigChangeNotifier::Start()
-	{
-	if (!IsActive())
-		{ 
-		iPacketContext.NotifyConfigChanged(iStatus, iConfigGPRSPckg); 
-		SetActive();
-		}
-	}
-
-/** stops notification */	
-void CPdpConfigChangeNotifier::DoCancel()
-	{
-	if(IsActive())
-		{ 
-		SPUDTELVERBOSE_INFO_LOG(
-			_L("CPdpConfigChangeNotifier::DoCancel EPacketContextNotifyConfigChanged"));
-		iPacketContext.CancelAsyncRequest(EPacketContextNotifyConfigChanged); 
-		}
-	}
-
-/** notifies pdp fsm 
-
-@param aStatus - request status
-*/
-void CPdpConfigChangeNotifier::Notify(const TRequestStatus& aStatus)
-	{
-	if(aStatus == KErrNone)
-		{
-		SPUDTELVERBOSE_INFO_LOG(_L("FSM set ConfigGPRS"));
-		iPdpFsmInterface.Set(iId, iConfigGPRS);
-		SPUDTELVERBOSE_INFO_LOG(_L("FSM input EConfigGPRSChangeNetwork"));
-		iPdpFsmInterface.Input(iId, PdpFsm::EConfigGPRSChangeNetwork);
-		}
-	else
-		{ 
-		SPUDTEL_ERROR_LOG(_L("CPdpConfigChangeNotifier::Notify(), error: %d"), 
-						aStatus.Int());
-		// Not all TSYs support RPacketContext::NotifyConfigChanged so we handle
-		// KErrNotSupported silently (PDEF118981).
-		ASSERT((aStatus == KErrCancel) || (aStatus == KErrNotSupported));
-		}
-	}
--- a/telephonyprotocols/umtsgprsscpr/spudtel/src/cpdpstatuschangenotifier.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-// Copyright (c) 2004-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:
-// PDP status change notifier
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#include <e32base.h>
-
-#include "cpdpstatuschangenotifier.h"
-#include "PDPFSM.h"
-#include "spudteldebuglogger.h"
-#include "pdpfsmnmspace.h"
-
-#include <pcktcs.h>
-
-
-/**
-@param aId - pdp context id
-@param aPacketContext - reference to etel packet context
-@param aPdpFsmInterface - reference to pdp fsm interface
-*/
-CPdpStatusChangeNotifier::CPdpStatusChangeNotifier(TContextId aId,
-										RPacketContext& aPacketContext,
-										CPdpFsmInterface& aPdpFsmInterface)
-: CEtelDriverNotifier(aPdpFsmInterface),
-  iId(aId),
-  iPacketContext(aPacketContext),
-  iContextStatus(RPacketContext::EStatusUnknown)
-	{
-	}
-
-CPdpStatusChangeNotifier::~CPdpStatusChangeNotifier()
-	{
-	Cancel();
-	}
-
-/** initiates notification */
-void CPdpStatusChangeNotifier::Start()
-	{
-	if (!IsActive() && (iContextStatus != RPacketContext::EStatusDeleted))
-		{ 
-		iPacketContext.NotifyStatusChange(iStatus, iContextStatus); 
-		SetActive();
-		}
-	}
-
-/** stops notification */	
-void CPdpStatusChangeNotifier::DoCancel()
-	{
-	if(IsActive())
-		{ 
-		SPUDTELVERBOSE_INFO_LOG(
-			_L("CPdpStatusChangeNotifier::DoCancel EPacketContextNotifyStatusChange"));
-		iPacketContext.CancelAsyncRequest(EPacketContextNotifyStatusChange); 
-		}
-	}
-
-/** notifies pdp fsm 
-
-@param aStatus - request status
-*/
-void CPdpStatusChangeNotifier::Notify(const TRequestStatus& aStatus)
-	{
-	if(aStatus == KErrNone)
-		{
-		SPUDTELVERBOSE_INFO_LOG(_L("Notified of context status change"));
-		RPacketContext::TContextStatus aOldContextStatus;
-		iPdpFsmInterface.Get(iId, aOldContextStatus);
-		// only notify of change if it has actually changed
-		if (iContextStatus != aOldContextStatus)
-			{
-			SPUDTELVERBOSE_INFO_LOG(_L("FSM input EContextStatusChangeNetwork"));
-			iPdpFsmInterface.Set(iId, iContextStatus);
-            TInt err = KErrNone;
-            iPacketContext.GetLastErrorCause(err); // Ignore error return code.
-			iPdpFsmInterface.Input(iId, PdpFsm::EContextStatusChangeNetwork, err);
-			}
-		}
-	else
-		{ 
-		SPUDTEL_ERROR_LOG(_L("CPdpStatusChangeNotifier::Notify(), error: %d"), 
-						aStatus.Int());
-		ASSERT(aStatus == KErrCancel); 
-		}
-	}
--- a/telephonyprotocols/umtsgprsscpr/spudtel/src/cqoschangenotifier.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-// Copyright (c) 2004-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:
-// QoS change notifier implementation
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#include "cqoschangenotifier.h"
-#include "spudteldebuglogger.h"
-#include <pcktcs.h>
-
-
-/** c'tor 
-
-@param aId - pdp context id
-@param aPacketQoS - etel packet QoS 
-@param aPdpFsmInterface - pdp fsm interface
-*/
-CQoSChangeNotifier::CQoSChangeNotifier(TContextId aId, 
-									RPacketQoS& aPacketQoS, 
-									CPdpFsmInterface& aPdpFsmInterface)
-: CEtelDriverNotifier(aPdpFsmInterface),
-  iId(aId),
-  iPacketQoS(aPacketQoS),
-  iProfilePckg(iProfileBuffer)
-  
-	{
-	SPUDTEL_FNLOG("CQoSChangeNotifier::CQoSChangeNotifier()");
-	}
-	
-CQoSChangeNotifier::~CQoSChangeNotifier()
-	{
-	SPUDTEL_FNLOG("CQoSChangeNotifier::~CQoSChangeNotifier()");
-	Cancel();
-	}
-	
-/** starts notification */
-void CQoSChangeNotifier::Start()
-	{
-	SPUDTEL_FNLOG("CQoSChangeNotifier::Start()");
-	if (!IsActive())
-		{ 
-		iPacketQoS.NotifyProfileChanged(iStatus, iProfilePckg); 
-		SetActive();
-		SPUDTEL_FNLOG("CQoSChangeNotifier::Start(), iPacketQoS.NotifyProfileChanged()");
-		}
-	}
-	
-/** stops notification */	
-void CQoSChangeNotifier::DoCancel()
-	{
-	if (IsActive())
-		{ 
-		SPUDTELVERBOSE_INFO_LOG(
-			_L("CQoSChangeNotifier::DoCancel EPacketQoSNotifyProfileChanged"));
-		iPacketQoS.CancelAsyncRequest(EPacketQoSNotifyProfileChanged);
-		}
-	}
-
-/** notifies pdp fsm 
-
-@param aStatus - request status
-*/
-void CQoSChangeNotifier::Notify(const TRequestStatus& aStatus)
-	{
-	if(aStatus == KErrNone)
-		{
-		SPUDTELVERBOSE_INFO_LOG(_L("FSM set QoSProfile"));
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-        iPdpFsmInterface.Set(iId, iProfileBuffer.NegotiatedQoSR5());
-
-#else
-// !SYMBIAN_NETWORKING_UMTSR5
-
-        iPdpFsmInterface.Set(iId, iProfileBuffer.NegotiatedQoSR99_R4());
-#endif
-// SYMBIAN_NETWORKING_UMTSR5
-
-		SPUDTELVERBOSE_INFO_LOG(_L("FSM input EQoSProfileChangeNetwork"));
-		iPdpFsmInterface.Input(iId, PdpFsm::EQoSProfileChangeNetwork);
-		}
-	else
-		{ 
-		SPUDTEL_ERROR_LOG(_L("CQoSChangeNotifier::Notify(), error: %d"), aStatus.Int());
-		ASSERT(aStatus == KErrCancel); 
-		}
-	}
-
-
-
--- a/telephonyprotocols/umtsgprsscpr/spudtel/src/cservicechangenotifier.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-// Copyright (c) 2004-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:
-// implementation for service change notifier
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#include <e32def.h>
-
-#include "cservicechangenotifier.h"
-#include "PDPFSM.h"
-#include "spudteldebuglogger.h"
-#include "pdpfsmnmspace.h"
-
-#include <pcktcs.h>
-
-/** c'tor
-
-@param aPacketService - reference to packet service
-@param aPdpFsmInterface - reference to pdp fsm interface
-*/
-CServiceChangeNotifier::CServiceChangeNotifier(RPacketService& aPacketService,
-										CPdpFsmInterface& aPdpFsmInterface)
-: CEtelDriverNotifier(aPdpFsmInterface),
-  iPacketService(aPacketService),
-  iServiceStatus(RPacketService::EStatusUnattached)
-	{
-	}
-
-CServiceChangeNotifier::~CServiceChangeNotifier()
-	{
-	Cancel();
-	}
-
-/** initiates notification */
-void CServiceChangeNotifier::Start()
-	{
-	if (!IsActive())
-		{ 
-		iPacketService.NotifyStatusChange(iStatus, iServiceStatus); 
-		SetActive();
-		}
-	}
-
-/** notifies pdp fsm 
-
-@param aStatus - request status
-*/
-void CServiceChangeNotifier::Notify(const TRequestStatus& aStatus)
-	{
-	if(aStatus == KErrNone)
-		{
-		SPUDTELVERBOSE_INFO_LOG(_L("FSM set ServiceStatus"));
-		iPdpFsmInterface.Set(iServiceStatus);
-		SPUDTELVERBOSE_INFO_LOG(_L("FSM input EServiceStatusChangeNetwork"));
-		iPdpFsmInterface.Input(KAllContexts, 
-								PdpFsm::EServiceStatusChangeNetwork);
-		}
-	else
-		{ 
-		SPUDTEL_ERROR_LOG(_L("CServiceChangeNotifier::Notify(), error: %d"), 
-							aStatus.Int());
-		ASSERT(aStatus == KErrCancel); 
-		}
-	}
-
-/** cancels notification */	
-void CServiceChangeNotifier::DoCancel()
-	{
-	if(IsActive())
-		{ 
-		SPUDTELVERBOSE_INFO_LOG(
-			_L("CServiceChangeNotifier::DoCancel EPacketNotifyStatusChange"));
-		iPacketService.CancelAsyncRequest(EPacketNotifyStatusChange); 
-		}
-	}
--- a/telephonyprotocols/umtsgprsscpr/spudtel/src/cspudcontextelem.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-// Copyright (c) 2004-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:
-// spud context element
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#include "cspudcontextelem.h"
-
-/**
-@param aId - pdp context id
-@param aFactory - reference to etel driver factory
-@param aPdpFsmInterface reference to pdp fsm interface
-@return new spud context element
-*/
-CSpudContextElem* CSpudContextElem::NewL(TContextId aId, 
-									CEtelDriverFactory& aFactory, 
-									CPdpFsmInterface& aPdpFsmInterface)
-	{
-	CSpudContextElem *me = new(ELeave) CSpudContextElem();
-	CleanupStack::PushL(me);
-	me->ConstructL(aId, aFactory, aPdpFsmInterface);
-	CleanupStack::Pop(me);
-	return me;
-	}
-
-/** 
-@param aId - pdp context id
-@param aFactory - reference to etel driver factory
-@param aPdpFsmInterface reference to pdp fsm interface
-*/
-void CSpudContextElem::ConstructL(TContextId aId, 
-								CEtelDriverFactory& aFactory, 
-								CPdpFsmInterface& aPdpFsmInterface)
-	{
-	iContext = new(ELeave) CEtelDriverContext(aId, aFactory);
-	iPdpStatusChangeNotifier = new(ELeave) CPdpStatusChangeNotifier(aId, 
-													iContext->PacketContext(), 
-													aPdpFsmInterface);
-	iQoSChangeNotifier = new(ELeave) CQoSChangeNotifier(aId, 
-													iContext->PacketQoS(), 
-													aPdpFsmInterface);
-	iPdpConfigChangeNotifier = new(ELeave) CPdpConfigChangeNotifier(aId, 
-													iContext->PacketContext(), 
-													aPdpFsmInterface);
-	}
-
-CSpudContextElem::~CSpudContextElem()
-	{
-	delete iPdpStatusChangeNotifier;
-	delete iQoSChangeNotifier;
-	delete iPdpConfigChangeNotifier;
-	delete iContext;
-	}
-
-/** starts all notifiers */
-void CSpudContextElem::Start()
-	{
-	iPdpStatusChangeNotifier->Start();
-	iQoSChangeNotifier->Start();
-	iPdpConfigChangeNotifier->Start();
-	}
-	
-/** cancels all notifiers */
-void CSpudContextElem::Cancel()
-	{
-	iPdpStatusChangeNotifier->Cancel();
-	iQoSChangeNotifier->Cancel();
-	iPdpConfigChangeNotifier->Cancel();
-	}
-
-/** Get LastErrorCause
-
-@param aLastErrorCause - LastErrorCause to get
-*/
-void CSpudContextElem::GetLastErrorCause(TInt& aLastErrorCause)
-	{
-	RPacketContext &aPacketContext = iContext->PacketContext();
-	aPacketContext.GetLastErrorCause(aLastErrorCause);
-	}
-
-void CSpudContextElem::PdpStatusChangeNotifierCancel()
-	{
-	iPdpStatusChangeNotifier->Cancel();
-	}
-
-void CSpudContextElem::QoSChangeNotifierCancel()
-	{
-	iQoSChangeNotifier->Cancel();
-	}
-void CSpudContextElem::PdpConfigChangeNotifierCancel()
-	{
-	iPdpConfigChangeNotifier->Cancel();
-	}
--- a/telephonyprotocols/umtsgprsscpr/spudtel/src/eteldriverstrategies.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1364 +0,0 @@
-// Copyright (c) 2004-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:
-// A collection of etel driver strategies
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#include <e32def.h>
-
-#include "ceteldrivercontext.h"
-#include "eteldriverstrategies.h"
-#include "spudteldebuglogger.h"
-#include "pdpfsmnmspace.h"
-
-#include <pcktcs.h>
-
-
-//
-//	TOpenStrategy
-//
-/** Executes next asynchronous step in a strategy. 
-
-@param aContext - pdp context
-@param aStatus - request status of this step
-*/
-void TOpenStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
-	{
-	SPUDTEL_FNLOG("TOpenStrategy::Next()");
-	
-	TInt err = KErrNone;
-	
-	switch(aContext.StrategyStep())
-		{
-		case EStartStep:
-			{
-			aContext.Phone().Initialise (*aStatus);
-			aContext.SetStrategyStep(EInitPhoneStep);
-			break;
-			}
-			
-		case EInitPhoneStep:
-			{
-			aContext.SetStrategyStep(EFinishStep);
-			break;
-			}
-			
-		default:
-			// incorrect step
-			SPUDTEL_ERROR_LOG0(_L("Incorrect step"));
-			ASSERT(EFalse);
-			err = KErrNotSupported;
-			break;
-				
-		} // switch
-
-	if(err || (EFinishStep == aContext.StrategyStep()))
-		{
-		User::RequestComplete( aStatus, err);
-		}
-	}
-	
-
-/** 
-Notifies SPUD FSM about execution results.
-
-@param aContext - pdp context
-@param aCompletionStatus - completion request status
-*/	
-void TOpenStrategy::NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus)
-	{
-	if(aCompletionStatus == KErrNone)
-		{
-		SPUDTEL_INFO_LOG(_L("Notifying FSM: EPhoneOpened"));
-		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPhoneOpened);
-		}
-	else
-		{
-		SPUDTEL_INFO_LOG(_L("Notifying FSM: EPhoneOpenedFailed"));
-		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPhoneOpenedFailed, aCompletionStatus.Int());
-		}
-	}
-
-/** Cancels last asynchronous request to eTel
-
-@param  aContext - pdp context
-*/
-void TOpenStrategy::CancelAsyncRequest(CEtelDriverContext& aContext)
-	{
-	switch(aContext.StrategyStep())
-		{
-		case EInitPhoneStep:
-			{
-			SPUDTEL_INFO_LOG(_L("Cancel Phone::InitialiseCancel"));
-			aContext.Phone().InitialiseCancel();
-			break;
-			}
-			
-		default:
-			// there're NO outstanding async requests
-			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TOpenStrategy::CancelAsyncRequest"));
-			ASSERT(EFalse);
-			break;
-		}
-	}
-
-
-//
-//	TContextDeleteStrategy
-//
-/** Executes next asynchronous step in a strategy. 
-
-@param aContext - pdp context
-@param aStatus - request status of this step
-*/
-void TContextDeleteStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
-	{
-	SPUDTEL_FNLOG("TContextDeleteStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)");
-	
-	TInt err = KErrNone;
-	
-	// steps:
-	//	-- cancel notifications
-	//	-- deactivate context
-	//	-- close QoS
-	//	-- close context
-	// 	-- delete context
-	switch(aContext.StrategyStep())
-		{
-		case EStartStep:
-			{
-			// cancel associated notifications
-			// -- 	StatusChangeNotifier
-			// --	QoSChangeNotifier
-			// --	ConfigChangeNotifier
-			
-			if (aContext.PacketContext().SubSessionHandle())
-				{
-				aContext.PacketContext().Deactivate(*aStatus);
-				aContext.SetStrategyStep (EDeactivateStep);
-				}
-			else
-				{
-				aContext.SetStrategyStep(EDeactivateStep);
-				User::RequestComplete(aStatus, err);
-				}
-			break;
-			}
-			
-		case EDeactivateStep:
-			{
-			if (aContext.PacketQoS().SubSessionHandle())
-				{
-                aContext.QoSChangeNotifierCancel();
-				aContext.PacketQoS().Close();
-				}
-				
-			if (aContext.PacketContext().SubSessionHandle())
-				{
-                aContext.PdpConfigChangeNotifierCancel();
-                aContext.PdpStatusChangeNotifierCancel();
-				aContext.PacketContext().Delete(*aStatus);
-				aContext.SetStrategyStep(EDeleteContextStep);
-				}
-			else
-				{
-				// jump to next step
-				aContext.SetStrategyStep(EDeleteContextStep);
-				User::RequestComplete( aStatus, err);
-				}
-			break;
-			}
-			
-			
-		case EDeleteContextStep:
-			{
-			aContext.PacketContext().Close();
-			// clear the name
-			aContext.Name().Zero();
-			aContext.SetStrategyStep (EFinishStep);
-			break;
-			}
-			
-		default:
-			// incorrect step
-			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
-			ASSERT(EFalse);
-			err = KErrNotSupported;
-			break;
-				
-		} // switch
-
-	if(err || (EFinishStep == aContext.StrategyStep()))
-		{
-		User::RequestComplete( aStatus, err);
-		}
-	
-	}
-
-
-/** 
-Notifies SPUD FSM about execution results.
-
-@param aContext - pdp context
-@param aCompletionStatus - completion request status
-*/	
-void TContextDeleteStrategy::NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus)
-	{
-	aContext.PdpFsmInterface().Set(aContext.Id(), RPacketContext::EStatusDeleted);
-	
-	if(aCompletionStatus == KErrNone)
-		{
-		SPUDTEL_INFO_LOG(_L("Notifying FSM: EContextDeleted"));
-		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EContextDeleted);
-		}
-	else
-		{
-		SPUDTEL_INFO_LOG(_L("Notifying FSM: EContextDeletedFailed"));
-		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EContextDeletedFailed, aCompletionStatus.Int());
-		}
-	}
-
-/** Cancels last asynchronous request to eTel
-
-@param  aContext - pdp context
-*/
-void TContextDeleteStrategy::CancelAsyncRequest(CEtelDriverContext& aContext)
-	{
-	SPUDTEL_FNLOG("TContextDeleteStrategy::CancelAsyncRequest()");
-	
-	// When there is no sub-session, the strategy will not call DeactivateContext, but will be in the EDeactivateStep state
-	// In this case we don't want to cancel the deactivate request
-	if (aContext.iStatus != KRequestPending)
-		{
-		return;
-		}
-		
-	switch(aContext.StrategyStep())
-		{
-		case EDeactivateStep:
-			{
-			SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextDeactivate"));
-			aContext.PacketContext().CancelAsyncRequest(EPacketContextDeactivate);
-			break;
-			}
-			
-		case EDeleteContextStep:
-			{
-			SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextDelete"));
-			aContext.PacketContext().CancelAsyncRequest(EPacketContextDelete);
-			break;
-			}
-			
-		default:
-			// there're NO outstanding async requests
-			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
-			ASSERT(EFalse);
-			break;
-		}
-	}
-
-
-// 
-//	TCreate1ryPdpContextStrategy 
-//
-/** Executes next asynchronous step in a strategy. 
-
-@param aContext - pdp context
-@param aStatus - request status of this step
-*/
-void TCreate1ryPdpContextStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
-	{
-	SPUDTEL_FNLOG("TCreate1ryPdpContextStrategy::Next()");
-	
-	TInt err = KErrNone;
-	
-	// possible steps:
-	// 	-- open new context
-	//	-- open new QoS
-	// 	-- initialise context
-	switch(aContext.StrategyStep())
-		{
-		case EStartStep:
-			{
-			err = aContext.PacketContext().OpenNewContext (aContext.PacketService(), aContext.Name());
-			if (err)
-				{
-				SPUDTEL_ERROR_LOG(_L("PacketContextOpenNewContext returned %d"), err);
-				break;
-				}
-				
-			// get packet config from fsm
-			aContext.PdpFsmInterface().Get (aContext.Id(), aContext.ContextConfigGPRS());
-			// async set config
-			aContext.PacketContext().SetConfig (*aStatus, aContext.ContextConfigGPRSPckg());
-			// set next step
-			aContext.SetStrategyStep (ESetConfigStep);
-			break;
-			}
-			
-		case ESetConfigStep:
-			{
-			// QoS name is not used anywhere
-			TName newName;
-			err = aContext.PacketQoS().OpenNewQoS (aContext.PacketContext(), newName);
-			if (err)
-				{ 
-				SPUDTEL_ERROR_LOG(_L("PacketQoS OpenNewQoS returned %d"), err);
-				break; 
-				}
-				
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-            RPacketQoS::TQoSR5Requested r5;
-            aContext.PdpFsmInterface().Get (aContext.Id(), r5);
-			aContext.QosRequested() = r5;
-#else
-            RPacketQoS::TQoSR99_R4Requested r4;
-			aContext.PdpFsmInterface().Get (aContext.Id(), r4);
-			aContext.QosRequested() = r4;
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5
-
-
-#ifdef _DEBUG
-            aContext.DumpReqProfileParameters ();
-#endif			
-			aContext.PacketQoS().SetProfileParameters (*aStatus, aContext.QosRequestedPckg());
-			aContext.SetStrategyStep (ESetProfileParamsStep);
-			break;
-			}
-			
-		case ESetProfileParamsStep:
-			{
-			aContext.SetStrategyStep (EFinishStep);
-			break;
-			}
-			
-		default:
-			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
-			ASSERT(EFalse);
-			err = KErrNotSupported;
-			break;
-		}
-		
-	if(err || (EFinishStep == aContext.StrategyStep()))
-		{
-		User::RequestComplete( aStatus, err);
-		}
-	
-	}
-
-
-/** 
-Notifies SPUD FSM about execution results.
-
-@param aContext - pdp context
-@param aCompletionStatus - completion request status
-*/	
-void TCreate1ryPdpContextStrategy::NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus)
-{
-	if(aCompletionStatus == KErrNone)
-		{
-		// start notifications in case of normal creation of a context
-		// -- 	StatusChangeNotifier
-		// --	QoSChangeNotifier
-		// --	ConfigChangeNotifier
-		aContext.StartNotifications();
-		
-		SPUDTEL_INFO_LOG(_L("Notifying FSM: E1ryPdpContextCreated"));
-		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::E1ryPdpContextCreated);
-		}
-	else
-		{
-		SPUDTEL_INFO_LOG(_L("Notifying FSM: E1ryPdpContextCreatedFailed"));
-		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::E1ryPdpContextCreatedFailed, aCompletionStatus.Int());
-		}
-}
-
-/** Cancels last asynchronous request to eTel
-
-@param  aContext - pdp context
-*/
-void TCreate1ryPdpContextStrategy::CancelAsyncRequest(CEtelDriverContext& aContext)
-	{
-	SPUDTEL_FNLOG("TCreate1ryPdpContextStrategy::CancelAsyncRequest()");
-	
-	switch(aContext.StrategyStep())
-		{
-		case ESetConfigStep:
-			{
-			SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextSetConfig"));
-			aContext.PacketContext().CancelAsyncRequest(EPacketContextSetConfig);
-			break;
-			}
-			
-		case ESetProfileParamsStep:
-			{
-			SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketQoSSetProfileParams"));
-			aContext.PacketQoS().CancelAsyncRequest(EPacketQoSSetProfileParams);
-			break;
-			}
-			
-		default:
-			// there're NO outstanding async requests
-			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
-			ASSERT(EFalse);
-			break;
-		}
-	}
-
-
-// 
-//	TCreate2ryPdpContextStrategy 
-//
-/** Executes next asynchronous step in a strategy. 
-
-@param aContext - pdp context
-@param aStatus - request status of this step
-*/
-void TCreate2ryPdpContextStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
-	{
-	SPUDTEL_FNLOG("TCreate2ryPdpContextStrategy::Next()");
-	
-	TInt err = KErrNone;
-	
-	// possible steps:
-	//	-- open new secondary context
-	//	-- open new QoS
-	//	-- initialise context
-	switch(aContext.StrategyStep())
-		{
-		case EStartStep:
-			{
-			const TName& existingContextName = aContext.ExistingContextName();
-			aContext.PacketContext().OpenNewSecondaryContext(aContext.PacketService(), existingContextName, aContext.Name());
-			
-			// QoS name is not used anywhere
-			TName newName;
-			err = aContext.PacketQoS().OpenNewQoS (aContext.PacketContext(), newName);
-			if (err)
-				{ 
-				SPUDTEL_ERROR_LOG(_L("PacketQoS OpenNewQoS returned %d"), err);
-				break; 
-				}
-			
-			aContext.SetStrategyStep (EFinishStep);
-			break;
-			}
-			
-		default:
-			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
-			ASSERT(EFalse);
-			err = KErrNotSupported;
-			break;
-		}
-		
-	if(err || (EFinishStep == aContext.StrategyStep()))
-		{
-		User::RequestComplete( aStatus, err);
-		}
-	
-	}
-
-
-/** 
-Notifies SPUD FSM about execution results.
-
-@param aContext - pdp context
-@param aCompletionStatus - completion request status
-*/	
-void TCreate2ryPdpContextStrategy::NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus )
-{
-	if(aCompletionStatus == KErrNone)
-		{
-		// start notifications in case of normal creation of a context
-		// -- 	StatusChangeNotifier
-		// --	QoSChangeNotifier
-		// --	ConfigChangeNotifier
-		aContext.StartNotifications();
-		
-		SPUDTEL_INFO_LOG(_L("Notifying FSM: E2ryPdpContextCreated"));
-		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::E2ryPdpContextCreated);
-		}
-	else
-		{
-		SPUDTEL_INFO_LOG(_L("Notifying FSM: E2ryPdpContextCreatedFailed"));
-		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::E2ryPdpContextCreatedFailed, aCompletionStatus.Int());
-		}
-}
-
-/** Cancels last asynchronous request to eTel
-
-@param  aContext - pdp context
-*/
-void TCreate2ryPdpContextStrategy::CancelAsyncRequest(CEtelDriverContext& /*aContext*/)
-	{
-	SPUDTEL_FNLOG("TCreate2ryPdpContextStrategy::CancelAsyncRequest()");
-	SPUDTEL_ERROR_LOG0(_L("ERROR: No outstanding requests"));
-	}
-
-
-//
-// TSetQoSStrategy
-//
-/** Executes next asynchronous step in a strategy. 
-
-@param aContext - pdp context
-@param aStatus - request status of this step
-*/
-void TSetQoSStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
-	{
-	SPUDTEL_FNLOG("TSetQoSStrategy::Next()");
-	
-	TInt err = KErrNone;
-	
-	// possible steps:
-	//	-- set QoS profile parameters
-	switch(aContext.StrategyStep())
-		{
-		case EStartStep:
-			{
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-            RPacketQoS::TQoSR5Requested req;
-#else
-            RPacketQoS::TQoSR99_R4Requested req;
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5
-
-			aContext.PdpFsmInterface().Get (aContext.Id(), req);
-			aContext.QosRequested() = req;	
-
-
-#ifdef _DEBUG
-            aContext.DumpReqProfileParameters ();
-#endif			
-            aContext.PacketQoS().SetProfileParameters (*aStatus, aContext.QosRequestedPckg());
-			aContext.SetStrategyStep (ESetProfileParamsStep);
-			break;
-			}
-			
-		case ESetProfileParamsStep:
-			{
-			aContext.SetStrategyStep (EFinishStep);
-			break;
-			}
-			
-		default:
-			{
-			// unexpected
-			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
-			ASSERT(EFalse);
-			err = KErrNotSupported;
-			break;
-			}
-		}
-		
-	if(err || (EFinishStep == aContext.StrategyStep()))
-		{
-		User::RequestComplete( aStatus, err);
-		}
-	
-	}
-	
-
-/** 
-FSM completion notification 
-and setting QoSR99_R4Negotiated in spud FSM
-*/	
-void TSetQoSStrategy::NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus )
-	{
-	if(aCompletionStatus == KErrNone)
-		{
-		SPUDTEL_INFO_LOG(_L("Notifying FSM: EQoSSet"));
-		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EQoSSet);
-		}
-	else
-		{
-		SPUDTEL_INFO_LOG(_L("Notifying FSM: EQoSSetFailed"));
-		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EQoSSetFailed, aCompletionStatus.Int());
-		}
-	}
-	
-/** Cancels last asynchronous request to eTel
-
-@param  aContext - pdp context
-*/
-void TSetQoSStrategy::CancelAsyncRequest(CEtelDriverContext& aContext)
-	{
-	switch(aContext.StrategyStep())
-		{
-		case ESetProfileParamsStep:
-			{
-			aContext.PacketQoS().CancelAsyncRequest(EPacketQoSSetProfileParams);
-			SPUDTEL_INFO_LOG(_L("Cancel PacketQoS::EPacketQoSSetProfileParams"));
-			break;
-			}
-			
-		default:
-			// there're NO outstanding async requests
-			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TSetQoSStrategy::CancelAsyncRequest"));
-			ASSERT(EFalse);
-			break;
-		}
-	}
-
-
-//
-// TSetTftStrategy
-//
-/** Executes next asynchronous step in a strategy. 
-
-@param aContext - pdp context
-@param aStatus - request status of this step
-*/
-void TSetTftStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
-	{
-	SPUDTEL_FNLOG("TSetTftStrategy::Next()");
-	
-	TInt err = KErrNone;
-
-	// possible steps:
-	// 	-- add filters
-	switch(aContext.StrategyStep())
-		{
-		case EStartStep:
-			{
-			aContext.PdpFsmInterface().Get (aContext.Id(), aContext.TftOperationCode());
-			switch(aContext.TftOperationCode())
-				{
-				case KAddFilters:
-					aContext.PdpFsmInterface().Get (aContext.Id(), aContext.TftInfo());
-					SPUDTELVERBOSE_INFO_LOG1(_L("TftOperationCode - Add Filters"), aContext.TftInfo().FilterCount());
-					// Set strategy assumes that TFT has to be created on a first place
-					SPUDTELVERBOSE_INFO_LOG(_L("Creating TFT..."));
-					aContext.PacketContext().CreateNewTFT(*aStatus, aContext.TftInfo().FilterCount());
-					aContext.SetStrategyStep (ECreateNewTFTStep);
-					break;
-
-				case KRemoveFilters:
-					err = KErrNotSupported;
-					SPUDTEL_ERROR_LOG(_L("TftOperationCode - Remove is not supported in a Set strategy, return %d"), err);
-					break;
-
-				case KDeleteTFT:
-					err = KErrNotSupported;
-					SPUDTEL_ERROR_LOG(_L("TftOperationCode - Delete is not supported in a Set strategy, return %d"), err);
-					break;
-
-				default:
-					// wrong case
-					SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
-					ASSERT(EFalse);
-					err = KErrNotSupported;
-					break;
-				}
-			break;
-			}
-	
-		case ECreateNewTFTStep:
-			{
-			TInt err1st = aContext.FirstFilterV2();
-			if(err1st == KErrNone)
-				{
-				aContext.PacketContext().AddPacketFilter( *aStatus, aContext.FilterV2Pckg());
-				aContext.SetStrategyStep (EAddTftStep);
-				}
-			else	// done
-				{ 
-				// internal check
-				ASSERT((aContext.TftRequested() <= aContext.TftInfo().FilterCount()));
-				aContext.SetStrategyStep (EFinishStep); 
-				}
-				
-			break;
-			}
-
-		case EAddTftStep:
-			{
-			TInt errV2 = aContext.NextFilterV2();
-			if(errV2 == KErrNone)
-				{
-				aContext.PacketContext().AddPacketFilter( *aStatus, aContext.FilterV2Pckg());
-				aContext.SetStrategyStep (EAddTftStep);
-				}
-			else	// done
-				{ 
-				// internal check
-				ASSERT((aContext.TftRequested() <= aContext.TftInfo().FilterCount()));
-				aContext.SetStrategyStep (EFinishStep); 
-				}
-				
-			break;
-			}
-
-		default:
-			// unexpected
-			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
-			ASSERT(EFalse);
-			err = KErrNotSupported;
-			break;
-		}
-		
-	if(err || (EFinishStep == aContext.StrategyStep()))
-		{
-		User::RequestComplete( aStatus, err);
-		}
-	
-	}
-	
-/** 
-Notifies SPUD FSM about execution results.
-
-@param aContext - pdp context
-@param aCompletionStatus - completion request status
-*/	
-void TSetTftStrategy::NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus )
-	{
-	if(aCompletionStatus == KErrNone)
-		{
-		SPUDTEL_INFO_LOG(_L("Notifying FSM: ETftSet"));
-		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::ETftSet);
-		}
-	else
-		{
-		SPUDTEL_INFO_LOG(_L("Notifying FSM: ETftSetFailed"));
-		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::ETftSetFailed, aCompletionStatus.Int());
-		}
-	}
-	
-/** Cancels last asynchronous request to eTel
-
-@param  aContext - pdp context
-*/
-void TSetTftStrategy::CancelAsyncRequest(CEtelDriverContext& aContext)
-	{
-	switch(aContext.StrategyStep())
-		{
-		case ECreateNewTFTStep:
-			{
-			aContext.PacketQoS().CancelAsyncRequest(EPacketContextCreateNewTFT);
-			SPUDTEL_INFO_LOG(_L("Cancel PacketQoS::EPacketContextCreateNewTFT"));
-			break;
-			}
-			
-		case EAddTftStep:
-			{
-			aContext.PacketQoS().CancelAsyncRequest(EPacketContextAddPacketFilter);
-			SPUDTEL_INFO_LOG(_L("Cancel PacketQoS::EPacketContextAddPacketFilter"));
-			break;
-			}
-
-		default:
-			// unexpected
-			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TSetTftStrategy::CancelAsyncRequest"));
-			ASSERT(EFalse);
-			break;
-		}
-	}
-
-
-//
-// TChangeTftStrategy
-//
-/** Executes next asynchronous step in a strategy. 
-
-@param aContext - pdp context
-@param aStatus - request status of this step
-*/
-void TChangeTftStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
-	{
-	SPUDTEL_FNLOG("TChangeTftStrategy::Next()");
-	
-	TInt err = KErrNone;
-
-	// special case. 
-	if(EStartStep == aContext.StrategyStep())
-		{
-		aContext.PdpFsmInterface().Get (aContext.Id(), aContext.TftOperationCode());
-		switch(aContext.TftOperationCode())
-			{
-			case KAddFilters:
-				aContext.PdpFsmInterface().Get (aContext.Id(), aContext.TftInfo());
-				SPUDTELVERBOSE_INFO_LOG1(_L("TftOperationCode - Add Filters"), aContext.TftInfo().FilterCount());
-				aContext.SetStrategyStep (EAddFirstTftStep);
-				break;
-
-			case KRemoveFilters:
-				aContext.PdpFsmInterface().Get (aContext.Id(), aContext.TftInfo());
-				SPUDTELVERBOSE_INFO_LOG1(_L("TftOperationCode - Remove %d Filters"), aContext.TftInfo().FilterCount());
-				aContext.SetStrategyStep (ERemoveFirstTftStep);
-				break;
-
-			case KDeleteTFT:
-				SPUDTELVERBOSE_INFO_LOG(_L("TftOperationCode - Delete TFT"));
-				// delete old TFT
-				aContext.PacketContext().DeleteTFT(*aStatus);
-				aContext.SetStrategyStep (EDeleteTftStep);
-				// DeleteTFT() ia an async operation => return 
-				return;
-
-			default:
-				// wrong case
-				SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
-				ASSERT(EFalse);
-				err = KErrNotSupported;
-				break;
-			}
-		}
-	
-	// possible steps:
-	//	-- delete TFT 
-	// 	-- add filters
-	// 	-- remove filters
-	if(!err)
-		{
-		switch(aContext.StrategyStep())
-			{
-			case EDeleteTftStep:
-				{
-				aContext.SetStrategyStep (EChangeTftFinished);
-				User::RequestComplete( aStatus, KErrNone);
-				break;
-				}
-				
-			case EAddFirstTftStep:
-				{
-				TInt errV2 = aContext.FirstFilterV2();
-				if(errV2 == KErrNone)
-					{
-					aContext.PacketContext().AddPacketFilter( *aStatus, aContext.FilterV2Pckg());
-					aContext.SetStrategyStep (EAddTftStep);
-					}
-				else	// done
-					{ 
-					aContext.SetStrategyStep (EChangeTftFinished);
-					User::RequestComplete( aStatus, KErrNone);
-					}
-					
-				break;
-				}
-
-			case EAddTftStep:
-				{
-				TInt errV2 = aContext.NextFilterV2();
-				if(errV2 == KErrNone)
-					{
-					aContext.PacketContext().AddPacketFilter( *aStatus, aContext.FilterV2Pckg());
-					aContext.SetStrategyStep (EAddTftStep);
-					}
-				else	// done
-					{ 
-					aContext.SetStrategyStep (EChangeTftFinished);
-					User::RequestComplete( aStatus, KErrNone);
-					}
-					
-				break;
-				}
-
-			case ERemoveFirstTftStep:
-				{
-				TInt errV2 = aContext.FirstFilterV2();
-				if(errV2 == KErrNone)
-					{
-					aContext.PacketContext().RemovePacketFilter( *aStatus, aContext.FilterV2().iId);
-					aContext.SetStrategyStep (ERemoveTftStep);
-					}
-				else	// done
-					{
-					aContext.SetStrategyStep (EChangeTftFinished);
-					User::RequestComplete( aStatus, KErrNone);
-					}
-					
-				break;
-				}
-				
-			case ERemoveTftStep:
-				{
-				TInt errV2 = aContext.NextFilterV2();
-				if(errV2 == KErrNone)
-					{
-					aContext.PacketContext().RemovePacketFilter( *aStatus, aContext.FilterV2().iId);
-					aContext.SetStrategyStep (ERemoveTftStep);
-					}
-				else	// done
-					{
-					aContext.SetStrategyStep (EChangeTftFinished);
-					User::RequestComplete( aStatus, KErrNone);
-					}
-					
-				break;
-				}
-
-			case EChangeTftFinished:
-				{
-				aContext.SetStrategyStep (EFinishStep);
-				}
-				break;
-
-				
-			default:
-				// unexpected
-				SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
-				ASSERT(EFalse);
-				err = KErrNotSupported;
-				break;
-			}
-		}
-		
-	if(err || (EFinishStep == aContext.StrategyStep()))
-		{
-		User::RequestComplete( aStatus, err);
-		}
-	
-	}
-	
-
-/** 
-Notifies SPUD FSM about execution results.
-
-@param aContext - pdp context
-@param aCompletionStatus - completion request status
-*/	
-void TChangeTftStrategy::NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus )
-	{
-	if(aCompletionStatus == KErrNone)
-		{
-		SPUDTEL_INFO_LOG(_L("Notifying FSM: ETftChanged"));
-		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::ETftChanged);
-		}
-	else
-		{
-		SPUDTEL_INFO_LOG(_L("Notifying FSM: ETftChangedFailed"));
-		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::ETftChangedFailed, aCompletionStatus.Int());
-		}
-	}
-	
-/** Cancels last asynchronous request to eTel
-
-@param  aContext - pdp context
-*/
-void TChangeTftStrategy::CancelAsyncRequest(CEtelDriverContext& aContext)
-	{
-	switch(aContext.StrategyStep())
-		{
-		case EDeleteTftStep:
-			{
-			SPUDTEL_INFO_LOG(_L("Cancel PacketQoS::EPacketContextDeleteTFTCancel"));
-			aContext.PacketQoS().CancelAsyncRequest(EPacketContextDeleteTFTCancel);
-			break;
-			}
-		
-		case ERemoveTftStep:
-			{
-			SPUDTEL_INFO_LOG(_L("Cancel PacketQoS::EPacketContextRemovePacketFilterCancel"));
-			aContext.PacketQoS().CancelAsyncRequest(EPacketContextRemovePacketFilterCancel);
-			break;
-			}
-			
-		case EAddTftStep:
-			{
-			SPUDTEL_INFO_LOG(_L("Cancel PacketQoS::EPacketContextAddPacketFilter"));
-			aContext.PacketQoS().CancelAsyncRequest(EPacketContextAddPacketFilterCancel);
-			break;
-			}
-
-		default:
-			// unexpected
-			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TChangeTftStrategy::CancelAsyncRequest"));
-			ASSERT(EFalse);
-			break;
-		}
-	}
-
-
-//
-// TActivatePdpStrategy
-//
-/** Executes next asynchronous step in a strategy. 
-
-@param aContext - pdp context
-@param aStatus - request status of this step
-*/
-void TActivatePdpStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
-	{
-	SPUDTEL_FNLOG("TActivatePdpStrategy::Next()");
-	
-	TInt err = KErrNone;
-	
-	switch(aContext.StrategyStep())
-		{
-		case EStartStep:
-			{
-			aContext.PacketContext().Activate(*aStatus);
-			aContext.SetStrategyStep (EActivateStep);
-			break;
-			}
-		
-		case EActivateStep:
-			{
-			aContext.PdpFsmInterface().Get (aContext.Id(), aContext.ContextConfigGPRS());
-			aContext.PacketContext().GetConfig (*aStatus, aContext.ContextConfigGPRSPckg());
-			aContext.SetStrategyStep (EGetConfigStep);
-			break;
-			}
-			
-		case EGetConfigStep:
-			{
-			aContext.PdpFsmInterface().Set (aContext.Id(), aContext.ContextConfigGPRS());
-			aContext.PacketContext().InitialiseContext(*aStatus, aContext.DataChannelV2Pckg());
-			aContext.SetStrategyStep (EInitialiseContextStep);
-			break;
-			}
-
-		case EInitialiseContextStep:
-			{
-			if (KPrimaryContextId == aContext.Id())
-				{
-                aContext.PacketQoS().GetProfileParameters (*aStatus, aContext.QosNegotiatedPckg());	
-#ifdef _DEBUG
-                aContext.DumpNegProfileParameters ();
-#endif
-                aContext.SetStrategyStep (EGetProfileParamsStep);
-                }
-			else
-                {
-                aContext.SetStrategyStep (EFinishStep);
-                }
-            break;
-			}
-			
-		case EGetProfileParamsStep:
-			{
-			aContext.SetStrategyStep (EFinishStep);
-			break;
-			}
-			
-		default:
-			// unexpected
-			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
-			ASSERT(EFalse);
-			err = KErrNotSupported;
-			break;
-		}
-		
-	if(err || (EFinishStep == aContext.StrategyStep()))
-		{
-		User::RequestComplete( aStatus, err);
-		}
-	
-	}
-	
-
-/** 
-Notifies SPUD FSM about execution results.
-
-@param aContext - pdp context
-@param aCompletionStatus - completion request status
-*/	
-void TActivatePdpStrategy::NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus )
-	{
-	if(aCompletionStatus == KErrNone)
-		{
-		SPUDTELVERBOSE_INFO_LOG(_L("FSM set: DataChannelV2"));
-		aContext.PdpFsmInterface().Set(aContext.Id(), aContext.DataChannelV2());
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-		SPUDTELVERBOSE_INFO_LOG(_L("FSM set: QoSR5Negotiated"));
-		aContext.PdpFsmInterface().Set(aContext.Id(), aContext.QosNegotiated().NegotiatedQoSR5());
-
-#else
-		SPUDTELVERBOSE_INFO_LOG(_L("FSM set: QoSR99_R4Negotiated"));
-		aContext.PdpFsmInterface().Set(aContext.Id(), aContext.QosNegotiated().NegotiatedQoSR99_R4());
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5
-
-		SPUDTEL_INFO_LOG(_L("Notifying FSM: EPdpActivated"));
-		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPdpActivated);
-		}
-	else
-		{
-		SPUDTEL_INFO_LOG(_L("Notifying FSM: EPdpActivatedFailed"));
-		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPdpActivatedFailed, aCompletionStatus.Int());
-		}
-	}
-	
-/** Cancels last asynchronous request to eTel
-
-@param  aContext - pdp context
-*/
-void TActivatePdpStrategy::CancelAsyncRequest(CEtelDriverContext& aContext)
-	{
-	switch(aContext.StrategyStep())
-		{
-		case EActivateStep:
-			{
-			aContext.PacketContext().CancelAsyncRequest(EPacketContextActivate);
-			SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextActivate"));
-			break;
-			}
-			
-		case EGetConfigStep:
-			{
-			aContext.PacketContext().CancelAsyncRequest(EGetConfigStep);
-			SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EGetConfigStep"));
-			break;
-			}
-		
-		case EInitialiseContextStep:
-			{
-			aContext.PacketContext().CancelAsyncRequest(EPacketContextInitialiseContext);	
-			SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextInitialiseContext"));
-			break;
-			}
-			
-		case EGetProfileParamsStep:
-			{
-			if(KPrimaryContextId == aContext.Id())
-				{
-				aContext.PacketContext().CancelAsyncRequest(EPacketQoSGetProfileParams);	
-				SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketQoSGetProfileParams"));
-				break;
-				}
-			}
-			
-		default:
-			// unexpected
-			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TActivatePdpStrategy::CancelAsyncRequest"));
-			ASSERT(EFalse);
-			break;
-		}
-	}
-
-//
-// TGetNegQoSStrategy
-//
-/** Executes next asynchronous step in a strategy. 
-
-@param aContext - pdp context
-@param aStatus - request status of this step
-*/
-void TGetNegQoSStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
-	{
-	SPUDTEL_FNLOG("TGetNegQoSStrategy::Next()");
-	
-	TInt err = KErrNone;
-	
-	switch(aContext.StrategyStep())
-		{
-		case EStartStep:
-			{
-			aContext.PacketQoS().GetProfileParameters (*aStatus, aContext.QosNegotiatedPckg());
-#ifdef _DEBUG
-            aContext.DumpNegProfileParameters ();
-#endif
-			aContext.SetStrategyStep (EGetProfileParamsStep);
-			break;
-			}
-
-		case EGetProfileParamsStep:
-			{
-			aContext.SetStrategyStep (EFinishStep);
-			break;
-			}
-			
-		default:
-			// unexpected
-			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
-			ASSERT(EFalse);
-			err = KErrNotSupported;
-			break;
-		}
-		
-	if(err || (EFinishStep == aContext.StrategyStep()))
-		{
-		User::RequestComplete( aStatus, err);
-		}
-	
-	}
-	
-
-/** 
-Notifies SPUD FSM about execution results.
-
-@param aContext - pdp context
-@param aCompletionStatus - completion request status
-*/	
-void TGetNegQoSStrategy::NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus )
-	{
-	if(aCompletionStatus == KErrNone)
-		{
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-		SPUDTELVERBOSE_INFO_LOG(_L("FSM set: QoSR5Negotiated"));
-		aContext.PdpFsmInterface().Set(aContext.Id(), aContext.QosNegotiated().NegotiatedQoSR5());
-
-#else
-// !SYMBIAN_NETWORKING_UMTSR5
-
-		SPUDTELVERBOSE_INFO_LOG(_L("FSM set: QoSR99_R4Negotiated"));
-		aContext.PdpFsmInterface().Set(aContext.Id(), aContext.QosNegotiated().NegotiatedQoSR99_R4());
-#endif
-// SYMBIAN_NETWORKING_UMTSR5
-		
-		SPUDTEL_INFO_LOG(_L("Notifying FSM: EPdpNegQoSRetrieved"));
-		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPdpNegQoSRetrieved);
-		}
-	else
-		{
-		SPUDTEL_INFO_LOG(_L("Notifying FSM: EPdpNegQoSRetrievedFailed"));
-		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPdpNegQoSRetrievedFailed, aCompletionStatus.Int());
-		}
-	}
-	
-/** Cancels last asynchronous request to eTel
-
-@param  aContext - pdp context
-*/
-void TGetNegQoSStrategy::CancelAsyncRequest(CEtelDriverContext& aContext)
-	{
-	switch(aContext.StrategyStep())
-		{	
-		case EGetProfileParamsStep:
-			{
-			aContext.PacketContext().CancelAsyncRequest(EPacketQoSGetProfileParams);	
-			SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketQoSGetProfileParams"));
-			break;
-			}
-			
-		default:
-			// unexpected
-			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TGetNegQoSStrategy::CancelAsyncRequest"));
-			ASSERT(EFalse);
-			break;
-		}
-	}
-
-
-//
-// TModifyActiveStrategy
-//
-/** Executes next asynchronous step in a strategy. 
-
-@param aContext - pdp context
-@param aStatus - request status of this step
-*/
-void TModifyActiveStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
-	{
-	SPUDTEL_FNLOG("TModifyActiveStrategy::Next()");
-	
-	TInt err = KErrNone;
-	
-	switch(aContext.StrategyStep())
-		{
-		case EStartStep:
-			{
-			aContext.PacketContext().ModifyActiveContext(*aStatus);
-			aContext.SetStrategyStep (EModifyActiveStep);
-			break;
-			}
-		
-		case EModifyActiveStep:
-			{
-			aContext.PacketQoS().GetProfileParameters (*aStatus, aContext.QosNegotiatedPckg());
-#ifdef _DEBUG
-            aContext.DumpNegProfileParameters ();
-#endif
-			aContext.SetStrategyStep (EGetProfileParamsStep);
-			break;
-			}
-			
-		case EGetProfileParamsStep:
-			{
-			aContext.SetStrategyStep (EFinishStep);
-			break;
-			}
-			
-		default:
-			// unexpected
-			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
-			ASSERT(EFalse);
-			err = KErrNotSupported;
-			break;
-		}
-		
-	if(err || (EFinishStep == aContext.StrategyStep()))
-		{
-		User::RequestComplete( aStatus, err);
-		}
-	
-	}
-	
-
-/** 
-Notifies SPUD FSM about execution results.
-
-@param aContext - pdp context
-@param aCompletionStatus - completion request status
-*/	
-void TModifyActiveStrategy::NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus )
-	{
-	if(aCompletionStatus == KErrNone)
-		{
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-		SPUDTELVERBOSE_INFO_LOG(_L("FSM set: QoSR5Negotiated"));
-		aContext.PdpFsmInterface().Set(aContext.Id(), aContext.QosNegotiated().NegotiatedQoSR5());
-
-#else
-		SPUDTELVERBOSE_INFO_LOG(_L("FSM set: QoSR99_R4Negotiated"));
-		aContext.PdpFsmInterface().Set(aContext.Id(), aContext.QosNegotiated().NegotiatedQoSR99_R4());
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5
-
-		SPUDTEL_INFO_LOG(_L("Notifying FSM: EPdpContextModified"));
-		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPdpContextModified);
-		}
-	else
-		{
-		SPUDTEL_INFO_LOG(_L("Notifying FSM: EPdpContextModifiedFailed"));
-		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPdpContextModifiedFailed, aCompletionStatus.Int());
-		}
-	}
-	
-/** Cancels last asynchronous request to eTel
-
-@param  aContext - pdp context
-*/
-void TModifyActiveStrategy::CancelAsyncRequest(CEtelDriverContext& aContext)
-	{
-	switch(aContext.StrategyStep())
-		{
-		case EModifyActiveStep:
-			{
-			aContext.PacketContext().CancelAsyncRequest(EPacketContextModifyActiveContext);
-			SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextModifyActiveContext"));
-			break;
-			}
-			
-		case EGetProfileParamsStep:
-			{
-			aContext.PacketContext().CancelAsyncRequest(EPacketQoSGetProfileParams);
-			SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketQoSGetProfileParams"));
-			break;
-			}
-			
-		default:
-			// unexpected
-			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TModifyActiveStrategy::CancelAsyncRequest"));
-			ASSERT(EFalse);
-			break;
-		}
-	}
--- a/telephonyprotocols/umtsgprsscpr/spudtel/src/reteldriverinput.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,196 +0,0 @@
-// Copyright (c) 2004-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:
-// implementation of etel driver input
-// 
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-#include <e32def.h>
-#include <e32std.h>
-
-#include "ceteldriverfactory.h"
-#include "ceteldrivercontext.h"
-#include "reteldriverinput.h"
-#include "spudteldebuglogger.h"
-
-using namespace EtelDriver;
-
-REtelDriverInput::REtelDriverInput()
-: iDriverFactory(NULL)
-	{
-	}
-
-
-REtelDriverInput::~REtelDriverInput()
-	{
-	SPUDTEL_FNLOG("REtelDriverInput::~REtelDriverInput()");
-	
-	if (iDriverFactory)
-	   {
-	   delete iDriverFactory;
-	   }	  
-	}
-
-
-/** requests to open etel driver
-
-@param aPdpFsmInterface - reference to pdp FSM interface
-*/
-void REtelDriverInput::OpenL (CPdpFsmInterface& aPdpFsmInterface)
-	{
-	SPUDTEL_FNLOG("REtelDriverInput::OpenL()");
-	ASSERT(iDriverFactory==NULL);
-
-	// internal check
-	iDriverFactory = CEtelDriverFactory::NewL(aPdpFsmInterface);
-	if (iDriverFactory)
-		{
-		iDriverFactory->InitL();
-		}
-	}
-
-
-/** closes eTel driver and frees underlying resources
-*/
-void REtelDriverInput::Close()
-	{
-	SPUDTEL_FNLOG("REtelDriverInput::Close()");
-	
-	// cancel all outstanding requests
-	if (iDriverFactory)
-		{
-		CancelAllPdps();
-		}
-
-	delete iDriverFactory;
-	iDriverFactory = NULL;
-	}
-	
-/** requests to create new pdp context
-	Note: this request will not open new primary or secondary context
-		  But rather allocate necessary resources to do it.
-		  Creation / deletion of eTel contexts should be done though Input method.
-
-@param aPdpId - id of new pdp context
-*/
-void REtelDriverInput::CreatePdpL (TContextId aPdpId)
-	{
-	SPUDTEL_FNLOG("REtelDriverInput::CreatePdpL()");
-	SPUDTELVERBOSE_INFO_LOG1(_L("pdp id : %d"), aPdpId);
-	
-	ASSERT(iDriverFactory);
-	iDriverFactory->CreatePdpL (aPdpId);
-	}
-	
-/** deletes pdp context
-
-@param aPdpId - id of a pdp context
-*/
-void REtelDriverInput::DeletePdp (TContextId aPdpId)
-	{
-	SPUDTEL_FNLOG("REtelDriverInput::DeletePdp()");
-	SPUDTELVERBOSE_INFO_LOG1(_L("pdp id : %d"), aPdpId);
-	
-	ASSERT(iDriverFactory);
-
-	iDriverFactory->FreePdp(aPdpId);
-	}
-
-/** requests to perform aOperation for aPdpId context
-
-@param aPdpId - id of a pdp context
-@param aOperation - etel driver operation
-*/
-void REtelDriverInput::Input(TContextId aPdpId, TEtelInput aOperation)
-	{
-	SPUDTEL_FNLOG("REtelDriverInput::Input()");
-	SPUDTEL_INFO_LOG2(_L("REtelDriverInput::Input: pdp id : %d, operation %d"), aPdpId, aOperation);
-	ASSERT(iDriverFactory);
-	
-	iDriverFactory->Context(aPdpId).Input(aOperation);
-	}
-
-/** cancels last operation for aPdpId context 
-
-@param aPdpId - id of a pdp context
-*/
-void REtelDriverInput::CancelPdp (TContextId aPdpId)
-	{
-	SPUDTEL_FNLOG("REtelDriverInput::CancelPdp()");
-	SPUDTEL_INFO_LOG1(_L("REtelDriverInput::CancelPdp: pdp id : %d"), aPdpId);
-	ASSERT(iDriverFactory);
-	
-	iDriverFactory->Context(aPdpId).Cancel();
-	}
-	
-/** starts network notifications for aPdpId context 
-
-@param aPdpId - id of a pdp context
-*/
-void REtelDriverInput::StartPdpNotifications(TContextId aPdpId)
-	{
-	SPUDTEL_FNLOG("REtelDriverInput::StartPdpNotifications()");
-	ASSERT(iDriverFactory);
-
-	iDriverFactory->StartPdpNotifications(aPdpId);
-	}
-	
-/** cancels network notifications for aPdpId context 
-
-@param aPdpId - id of a pdp context
-*/
-void REtelDriverInput::CancelPdpNotifications (TContextId aPdpId)
-	{
-	SPUDTEL_FNLOG("REtelDriverInput::CancelPdpNotifications()");
-	SPUDTEL_INFO_LOG1(_L("REtelDriverInput::CancelPdpNotifications: pdp id : %d"), aPdpId);
-	ASSERT(iDriverFactory);
-
-	iDriverFactory->CancelPdpNotifications (aPdpId);
-	}
-	
-/** cancels last operations for all created pdp contexts */
-void REtelDriverInput::CancelAllPdps ()
-	{
-	SPUDTEL_FNLOG("REtelDriverInput::CancelAllPdps()");
-	ASSERT(iDriverFactory);
-	
-	for(TContextId i = 0; i < static_cast<TContextId>(iDriverFactory->ContextCount()); i++)
-		{
-		if (iDriverFactory->HasContext(i))
-		    {
-    		iDriverFactory->Context(i).Cancel();
-		    }
-		}
-	}
-
-/** cancels all notifications for all pdp contexts */
-void REtelDriverInput::CancelAllPdpNotifications ()
-	{
-	SPUDTEL_FNLOG("REtelDriverInput::CancelAllPdpNotifications()");
-	ASSERT(iDriverFactory);
-
-	iDriverFactory->CancelAllPdpNotifications();
-	}
-
-void REtelDriverInput::GetLastErrorCause (TContextId aPdpId, TInt& aLastErrorCause)
-	{
-	SPUDTEL_FNLOG("REtelDriverInput::GetLastErrorCause()");
-	ASSERT(iDriverFactory);
-
-	iDriverFactory->GetLastErrorCause(aPdpId, aLastErrorCause);
-	}
--- a/telephonyprotocols/umtsgprsscpr/src/1020D45E.rss	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-// Copyright (c) 2005-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:
-// Registry info for Umts/Gprs Sub-Connection Provider plug-in
-// 
-//
-
-/**
- @file
-*/
-
-#include <ecom/registryinfo.rh>
-
-RESOURCE REGISTRY_INFO theInfo
-{
-dll_uid = 0x1020D45E;
-interfaces = 
-    {
-    INTERFACE_INFO
-        {
-        interface_uid = 0x10204301;
-        implementations = 
-            {
-           IMPLEMENTATION_INFO
-                {
-                implementation_uid = 0x1020D45F;
-                version_no = 1;
-                display_name = "Umts/Gprs Sub-Connection Provider Factory";
-                default_data = "UmtsGprsSubConnProvdFactory";
-                opaque_data = "";
-                }
-            };
-        }
-    };
-}
--- a/telephonyprotocols/umtsgprsscpr/src/PdpFsmRequest.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,334 +0,0 @@
-// Copyright (c) 2005-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:
-// The implementation file for the PDP Context control requests.
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-
-#include "PdpFsmRequest.h"
-
-
-//-=========================================================
-//
-//CModifyActivePDPCtx
-//
-//-=========================================================
-CModifyActivePDPCtx::CModifyActivePDPCtx(CUmtsGprsSubConnProvd& aProvider, MPdpFsmRequestOwner& aOwner)
-:CPdpFsmRequestBase(aProvider, aOwner)
-{	
-}
-
-CModifyActivePDPCtx::~CModifyActivePDPCtx()
-{
-}
-
-
-TInt CModifyActivePDPCtx::Start()
-{
-	// Store the Context Id in order to check replies later
-	iContextId = iProvider.GetContextId();
-	return iProvider.GetPdpFsmInterface().Input(iContextId, SpudMan::EContextModifyActive);
-}
-
-/**
-@param aEvent The event Id
-@param aParam Data relavent to the event. Usually a system-wide error code
-@return ETrue if the event was consumed, EFalse if it was of no interest and should
-be passed on to SpudMan for processing.
-*/
-TBool CModifyActivePDPCtx::PdpFsmEvent(TContextId aContextId, TInt aEvent, TInt aParam)
-{
-	if (aContextId == iContextId && aEvent == KContextModifyActiveEvent)
-		{
-		iOwner.Done(aParam, *this);
-		return ETrue;
-		}
-	
-	return EFalse;
-}
-
-
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-//-=========================================================
-//
-//CModifyR5QoS
-//
-//-=========================================================
-CModifyR5QoS::CModifyR5QoS(CUmtsGprsSubConnProvd& aProvider, MPdpFsmRequestOwner& aOwner, RPacketQoS::TQoSR5Requested& aParams)
-:CPdpFsmRequestBase(aProvider, aOwner),
- iModifyActive(NULL),
- i5(aParams)
-{
-}
-
-CModifyR5QoS::~CModifyR5QoS()
-{
-    ASSERT(iModifyActive == NULL || iContextId == 0); 
-    //If we assert here is is becuase Start has been called (allocated iContextId), but Done has not been called (cleans iModifyActive)
-	delete iModifyActive;
-}
-
-void CModifyR5QoS::GrantedSetupL()
-	{
-	CSubConGenEventParamsGranted* event = CSubConGenEventParamsGranted::NewL();
-	CleanupStack::PushL (TCleanupItem(SubconEventCleanupFunction, event));
-	event->SetFamily (KSubConQoSFamily);
-	RPacketQoS::TQoSR5Negotiated negotiatedQoS;
-	iProvider.GetPdpFsmInterface().Get(iProvider.GetContextId(), negotiatedQoS);
-	iProvider.MapQosEtelToGrantedParamsL(&negotiatedQoS, *event);
-	iProvider.NotifyClientEvent (*event);
-	CleanupStack::Pop();
-	delete event;
-	
-	}
-
-void CModifyR5QoS::RejectedSetupL(TInt aResult)
-	{
-	CSubConGenEventParamsRejected* event = CSubConGenEventParamsRejected::NewL();
-	CleanupStack::PushL (TCleanupItem(SubconEventCleanupFunction, event));
-	event->SetFamilyId (KSubConQoSFamily);
-	event->SetError (aResult);
-	iProvider.NotifyClientEvent (*event);
-	CleanupStack::Pop();
-	delete event;
-	}
-
-void CModifyR5QoS::Done( TInt aResult, CPdpFsmRequestBase&  aThis )
-{
-   __ASSERT_ALWAYS(iModifyActive == &aThis, User::Invariant());
-
-	if ( aResult == KErrNone )
-   		{
-		// QoS Modification complete with success.
-	  	__FLOG_1(_L("CModifyR5QoS [this=%08x]:\tDone(): QoS Params Granted"), this);
-	  	TRAP_IGNORE(GrantedSetupL());
-   		}
-	else
-	  	{
-	  	//QoS Modification complete with failure.
-	  	__FLOG_2(_L("CModifyR5QoS [this=%08x]:\tDone(): QoS Params Rejected [aResult=%d]"), this, aResult); 
-	  	TRAP_IGNORE(RejectedSetupL(aResult));
-	  	}
-
-
-   delete iModifyActive;
-   iModifyActive = NULL;
-   iOwner.Done(aResult, *this);
-}
-
-
-TInt CModifyR5QoS::Start()
-{
-	// Store the Context Id in order to check replies later
-	iContextId = iProvider.GetContextId();
-
-	TInt result;
-	result = iProvider.GetPdpFsmInterface().Set(iContextId, i5);
-	if (result == KErrNone)
-		{
-		result = iProvider.GetPdpFsmInterface().Input(iContextId, SpudMan::EContextQoSSet);
-		}
-	  
-	return result;
-}
-
-
-TBool CModifyR5QoS::PdpFsmEvent(TContextId aContextId, TInt aEvent, TInt aParam)
-{
-	if (aContextId != iContextId)
-		{
-		return EFalse;
-		}
-		
-	TBool handled(EFalse);
-	if (aEvent == KContextQoSSetEvent)
-		{
-		if (aParam == KErrNone)
-			{
-			iModifyActive->Start();
-			}
-		else
-			{
-			//QoS Modification complete with failure.
-			__FLOG_2(_L("CModifyR5QoS [this=%08x]:\tPdpFsmEvent(): QoS Params Rejected [aParam=%d]"), this, aParam);
-	   
-			Done(aParam, *iModifyActive);
-			}
-		handled = ETrue;
-		}
-	else
-		{
-		handled = iModifyActive->PdpFsmEvent(aContextId, aEvent, aParam);
-		}
-
-	return handled;
-}
-
-
-void CModifyR5QoS::ConstructL()
-{
-	iModifyActive = new(ELeave)CModifyActivePDPCtx(iProvider, *this);
-}
-
-
-CModifyR5QoS* CModifyR5QoS::NewL(CUmtsGprsSubConnProvd& aProvider, MPdpFsmRequestOwner& aOwner, RPacketQoS::TQoSR5Requested& aParams)
-{
-	CModifyR5QoS* request = new(ELeave) CModifyR5QoS(aProvider, aOwner, aParams);
-	CleanupStack::PushL(request);
-	request->ConstructL();
-	CleanupStack::Pop(request);
-	return request;
-}
-
-
-#else
-// !SYMBIAN_NETWORKING_UMTSR5
-
-//-=========================================================
-//
-//CModifyR4QoS
-//
-//-=========================================================
-CModifyR4QoS::CModifyR4QoS(CUmtsGprsSubConnProvd& aProvider, MPdpFsmRequestOwner& aOwner, RPacketQoS::TQoSR99_R4Requested aParams)
-:CPdpFsmRequestBase(aProvider, aOwner),
- iModifyActive(NULL),
- i99(aParams)
-{
-}
-
-CModifyR4QoS::~CModifyR4QoS()
-{
-    ASSERT(iModifyActive == NULL || iContextId == 0); 
-    //If we assert here is is becuase Start has been called (allocated iContextId), but Done has not been called (cleans iModifyActive)
-	delete iModifyActive;
-
-}
-
-void CModifyR4QoS::GrantedSetupL()
-	{
-	CSubConGenEventParamsGranted* event = CSubConGenEventParamsGranted::NewL();
-	CleanupStack::PushL (TCleanupItem(SubconEventCleanupFunction, event));
-	event->SetFamily (KSubConQoSFamily);
-	RPacketQoS::TQoSR99_R4Negotiated negotiatedQoS;
-	iProvider.GetPdpFsmInterface().Get(iProvider.GetContextId(), negotiatedQoS);
-	iProvider.MapQosEtelToGrantedParamsL(&negotiatedQoS, *event);
-	iProvider.NotifyClientEvent (*event);
-	CleanupStack::Pop();
-	delete event;
-	}
-
-void CModifyR4QoS::RejectedSetupL(TInt aResult)
-	{
-	CSubConGenEventParamsRejected* event = CSubConGenEventParamsRejected::NewL();
-	CleanupStack::PushL (TCleanupItem(SubconEventCleanupFunction, event));
-	event->SetFamilyId (KSubConQoSFamily);
-	event->SetError (aResult);
-	iProvider.NotifyClientEvent (*event);
-	CleanupStack::Pop();
-	delete event;
-	}
-
-void CModifyR4QoS::Done( TInt aResult, CPdpFsmRequestBase&  aThis )
-{
-
-	__ASSERT_ALWAYS(iModifyActive == &aThis, User::Invariant());
-   	if ( aResult == KErrNone )
-		{
-		// QoS Modification complete with success.
-		__FLOG_1(_L("CModifyR4QoS [this=%08x]:\tDone(): QoS Params Granted"), this);
-		TRAP_IGNORE(GrantedSetupL());
-		}
-	else
-	{
-		//QoS Modification complete with failure.
-		__FLOG_2(_L("CModifyR4QoS [this=%08x]:\tDone(): QoS Params Rejected [aResult=%d]"), this, aResult);
-		TRAP_IGNORE(RejectedSetupL(aResult));
-	}
-	delete iModifyActive;
-	iModifyActive = NULL;
-	iOwner.Done(aResult, *this);
-}
-
-
-TInt CModifyR4QoS::Start()
-{
-	// Store the Context Id in order to check replies later
-	iContextId = iProvider.GetContextId();
-
-	TInt result;
-	result = iProvider.GetPdpFsmInterface().Set(iContextId, i99);
-	if (result == KErrNone)
-		{
-		result = iProvider.GetPdpFsmInterface().Input(iContextId, SpudMan::EContextQoSSet);
-		}
-	  
-	return result;
-}
-
-TBool CModifyR4QoS::PdpFsmEvent(TContextId aContextId, TInt aEvent, TInt aParam)
-{   
-	if (aContextId != iContextId)
-		{
-		return EFalse;
-		}
-
-	TBool handled(EFalse);
-	if (aEvent == KContextQoSSetEvent)
-		{
-		if (aParam == KErrNone)
-			{
-		   	iModifyActive->Start();
-			}
-		else
-			{
-			//QoS Modification complete with failure.
-			__FLOG_2(_L("CModifyR4QoS [this=%08x]:\tPdpFsmEvent(): QoS Params Rejected [aParam=%d]"), this, aParam);
-			Done(aParam, *iModifyActive);
-			}
-		handled = ETrue;
-		}
-	else
-		{
-		handled = iModifyActive->PdpFsmEvent(aContextId, aEvent, aParam);
-		}
-		
-	return handled;
-}
-
-
-void CModifyR4QoS::ConstructL()
-{
-	iModifyActive = new(ELeave)CModifyActivePDPCtx(iProvider, *this);
-}
-
-CModifyR4QoS* CModifyR4QoS::NewL(CUmtsGprsSubConnProvd& aProvider, MPdpFsmRequestOwner& aOwner, RPacketQoS::TQoSR99_R4Requested aParams)
-{
-	CModifyR4QoS* request = new(ELeave) CModifyR4QoS(aProvider, aOwner, aParams);
-	CleanupStack::PushL(request);
-	request->ConstructL();
-	CleanupStack::Pop(request);
-	return request;
-}
-
-
-
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5
-
--- a/telephonyprotocols/umtsgprsscpr/src/RSpudManInterface.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-// Copyright (c) 2005-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:
-// The MSpudManInterface handle implementation.
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#include "RSpudManInterface.h"
-
-
-RSpudManInterface::RSpudManInterface()
-   :iSpudManImpl(NULL)
-{
-#ifdef __FLOG_ACTIVE
-   // Logging tags
-   _LIT8(KUmtsGprsLogTag1,"SubConn");
-   _LIT8(KUmtsGprsLogTag2,"UmtsGprs");
-	__FLOG_OPEN(KUmtsGprsLogTag1, KUmtsGprsLogTag2);
-#endif
-}
-
-
-void RSpudManInterface::Init(MSpudManInterface* aSpudManImpl)
-{
-   __FLOG_2(_L("RSpudManInterface::Init: [this=%08x] [aSpudManImpl=%08x]"), this, aSpudManImpl);
-   iSpudManImpl = aSpudManImpl;
-}
-
-
-void RSpudManInterface::Input(TContextId aContextId, TInt aEvent, TInt aParam)
-{
-   if (iSpudManImpl)
-      {
-      //ignoring calls to an unitialised handle - apparently there is no 
-      //SpudMan.
-      __FLOG_4(_L("RSpudManInterface::Input: Sending input. [this=%08x] [aContextId=%d] [aEvent=%d] [aParam=%d]"),
-         this, aContextId, aEvent, aParam);
-      iSpudManImpl->Input(aContextId, aEvent, aParam);        
-      }
-   else
-      {
-      __FLOG_4(_L("RSpudManInterface::Input: Discarding input. [this=%08x] [aContextId=%d] [aEvent=%d] [aParam=%d]"),
-         this, aContextId, aEvent, aParam);
-      }
-}
-
-void RSpudManInterface::SetContextTerminationErrorAndStop(TContextId aContextId, TInt aErrorCode)
-{
-   if (iSpudManImpl)
-      {
-      //ignoring calls to an unitialised handle - apparently there is no 
-      //SpudMan.
-      __FLOG_3(_L("SetContextTerminationErrorAndStop: [this=%08x] [aContextId=%d] [aErrorCode=%d]"),
-         this, aContextId, aErrorCode);
-      iSpudManImpl->SetContextTerminationErrorAndStop(aContextId, aErrorCode);        
-      }
-   else
-      {
-      __FLOG_3(_L("RSpudManInterface::SetContextTerminationErrorAndStop: Discarded! [this=%08x] [aContextId=%d] [aErrorCode=%d]"),
-         this, aContextId, aErrorCode);
-      }
-}
-
-void RSpudManInterface::Close ()
-{
-   __FLOG_1(_L("RSpudManInterface::Close: [this=%08x]"), this);
-   
-   if (iSpudManImpl)
-      {
-      // Clear the member first to avoid ping-ponging Close() messages
-      // between the PdpFsmInterface and SpudManInterface
-      MSpudManInterface* spudManImpl = iSpudManImpl;
-      iSpudManImpl = NULL;
-      spudManImpl->Input (0, KPdpFsmShuttingDown, 0);
-   }
-}
-   
--- a/telephonyprotocols/umtsgprsscpr/src/UmtsGprs_defaultSubconnProv.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,299 +0,0 @@
-// Copyright (c) 2005-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:
-// Implementation file for the Default Umts/Gprs SubConnection Provider
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-
-#include "UmtsGprs_defaultSubconnProv.h"
-#include "UmtsGprs_subconnProvFactory.h"
-#include "PdpFsmRequest.h"
-
-#include <commsdattypesv1_1.h>
-#include <ss_connsettings.h>
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-#include <ip_subconparams.h>
-#endif	
-
-CUmtsGprsDefaultSubConnProvd* CUmtsGprsDefaultSubConnProvd::NewL(CSubConnectionProviderFactoryBase& aFactory, 
-	                          CConnectionProviderBase& aConnProvider)
-    {
-    CUmtsGprsDefaultSubConnProvd* provider = new(ELeave)CUmtsGprsDefaultSubConnProvd(aFactory, aConnProvider);
-	CleanupStack::PushL(provider);
-    provider->ConstructL();
-    CleanupStack::Pop(provider);
-    return provider;
-    }
-
-
-
-CUmtsGprsDefaultSubConnProvd::CUmtsGprsDefaultSubConnProvd(
-                              CSubConnectionProviderFactoryBase& aFactory, 
-	                          CConnectionProviderBase& aConnProvider)
-:CUmtsGprsSubConnProvd(aFactory, aConnProvider),
- iPdpFsm(NULL)
-/** 
-Constructs a default UMTS SubConnection Provider
-
-@param aFactory CSubConnectionProviderFactoryBase that should own the reference to 'this'
-@param aConnProvider a connection that 'this' subconnection belongs to
-*/
-	{
-	iContextId = KPrimaryContextId;
-	}
-
-
-void CUmtsGprsDefaultSubConnProvd::ConstructL()
-    {
-    iPdpFsm = new(ELeave) CPdpFsmInterface(*this);
-    }
-    
-    
-CUmtsGprsDefaultSubConnProvd::~CUmtsGprsDefaultSubConnProvd()
-    {
-    delete iPdpFsm;
-    }
-    
-    
-CUmtsGprsSubConnProvd& CUmtsGprsDefaultSubConnProvd::GetDefaultSubConnection()
-    {
-    return *this;
-    }
-
-TBool CUmtsGprsDefaultSubConnProvd::ShouldIDeleteNow()
-    {
-    // Never allow client leaving events to destroy this default scpr
-    // The CPr will call ConnectionGoingDown when it is deleted
-    // and then we will delete this.
-    return EFalse;
-    }
-
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-
-TInt CUmtsGprsDefaultSubConnProvd::AddIMCNInformationToParameterBundleL(TBool aImCnInfo)
-
-/**
-Will add the information related to the IMCN Signalling Flag into the SubCon Parameter Bundle
-so that it can be accessible by the IPSCPR while restricting the sockets
-
-@param aImCnInfo Grant status of the IMCN signalling flag  
-*/
-
-	{
-	// Check and create the parameter bundle if NULL
-	if (iParameterBundle == NULL)
-		{
-		iParameterBundle = CSubConParameterBundle::NewL();
-		}
-		
-	// Add information Regarding the grant status to the parameter bundle with family
-    CSubConParameterFamily * imcnFamily = CSubConParameterFamily::NewL(*iParameterBundle,KSubConnContextDescrParamsFamily);
-	CleanupStack::PushL(imcnFamily);
-	CSubConImsExtParamSet *imcnFlag = CSubConImsExtParamSet::NewL(*imcnFamily,CSubConParameterFamily::EGranted);
-	CleanupStack::Pop(imcnFamily);
-	// Set the Signalling Indication
-	imcnFlag->SetImsSignallingIndicator(aImCnInfo);
-	
-	return KErrNone;
-	}
-
-#endif //SYMBIAN_NETWORKING_UMTSR5
-
-
-void CUmtsGprsDefaultSubConnProvd::DoParametersAboutToBeSetL(CSubConParameterBundle& aParameterBundle)
-/** Should set parameters on the primary/default PDP context represented by 'this'
-
-@param 
-*/
-{
-	__FLOG_1(_L("CUmtsGprsDefaultSubConnProvd [this=%08x]:\tDoParametersAboutToBeSetL()"), this);
-
-	if (iCurrentPdpFsmReq)
-	{
-	User::Leave(KErrInUse);
-	}
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-	// For PREQ 635, The information regarding the dedicated signalling indication is used to be stored in the
-	// iParameterBundle of the Base class. Since after this call and lower layer calls (if any) is completed then 
-	// iParameterBundle will be replaced by aParameterBundle coming as formal function parameters. 
-
-	// To be able to save the information if somebody calls RSubConnection::SetParameters(...), which is there in 
-	// existing Parameter Bundle we need to copy the information about IMCN Signalling flag which is already there 
-	// iParameterBundle into aParameterBundle. 
-	
-	// The catch here is that The layer above this must call the SetParameters() to get the parameter values, because
-	// This particular call adds the granted status
-
-	// Check for the existance of the appropriate family
-	CSubConParameterFamily * imCnFamily = iParameterBundle != NULL ? iParameterBundle->FindFamily(KSubConnContextDescrParamsFamily): NULL;
-	if (imCnFamily)
-		{
-		// we have the Family, get the status of IMCN signalling Flag
-		CSubConImsExtParamSet *imCnSig = static_cast<CSubConImsExtParamSet*>
-    	(imCnFamily->FindExtensionSet(STypeId::CreateSTypeId(KSubConIPParamsUid,KSubConImsExtParamsType), 
-    	CSubConParameterFamily::EGranted));
-		
-		// We have the variable, copy the contents
-		if(imCnSig)
-    		{ 
-    		CSubConParameterFamily * contextFamily = CSubConParameterFamily::NewL(aParameterBundle,KSubConnContextDescrParamsFamily);
-			CleanupStack::PushL(contextFamily);
-    	  	CSubConImsExtParamSet *imCnFlag = CSubConImsExtParamSet::NewL(*contextFamily,CSubConParameterFamily::EGranted);
-			CleanupStack::Pop(contextFamily);
-		    imCnFlag->SetImsSignallingIndicator(imCnSig->GetImsSignallingIndicator());
-    	  	}
-		}
-
-#endif // SYMBIAN_NETWORKING_UMTSR5 
-
-    ResetQosRelease();
-	
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-    
-        RPacketQoS::TQoSR5Requested requestedParams;
-        MapQosParamBundleToEtelL(aParameterBundle, &requestedParams);
-        CModifyR5QoS* modifyR5QoS = CModifyR5QoS::NewL(*this, *this, requestedParams);
-        iCurrentPdpFsmReq = modifyR5QoS;
-        modifyR5QoS->Start();
-        
-#else
-		RPacketQoS::TQoSR99_R4Requested requestedParams;
-		MapQosParamBundleToEtelL(aParameterBundle, &requestedParams);
-		CModifyR4QoS* modifyR4QoS = CModifyR4QoS::NewL(*this, *this, requestedParams);
-		iCurrentPdpFsmReq = modifyR4QoS;
-		modifyR4QoS->Start();
-		
-#endif // SYMBIAN_NETWORKING_UMTSR5
-
-}
-    
-
-void CUmtsGprsDefaultSubConnProvd::GetQoSDefaultsL(RPacketQoS::TQoSR99_R4Requested* aParams)
-{
-   CConnectionSettings& settingAccess = iConnectionProvider->SettingsAccessL();
-	TUint32 data;
-	    
-	settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSReqTrafficClass),data, NULL);
-	aParams->iReqTrafficClass = (RPacketQoS::TTrafficClass)data;
-	
-	settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSMinTrafficClass),data, NULL);
-	aParams->iMinTrafficClass = (RPacketQoS::TTrafficClass)data;
-	
-	settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSReqDeliveryOrder),data, NULL);
-	aParams->iReqDeliveryOrderReqd = (RPacketQoS::TDeliveryOrder)data;
-	
-	settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSMinDeliveryOrder),data, NULL);
-	aParams->iMinDeliveryOrderReqd = (RPacketQoS::TDeliveryOrder)data;
-	
-	settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSReqDeliverErroneousSDU),data, NULL);
-	aParams->iReqDeliverErroneousSDU = (RPacketQoS::TErroneousSDUDelivery)data;
-	
-	settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSMinDeliverErroneousSDU),data, NULL);
-	aParams->iMinDeliverErroneousSDU = (RPacketQoS::TErroneousSDUDelivery)data;
-	
-	settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSReqMaxSDUSize),data, NULL);
-	aParams->iReqMaxSDUSize = (TInt)data;
-	
-	settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSMinAcceptableMaxSDUSize),data, NULL);
-	aParams->iMinAcceptableMaxSDUSize = (TInt)data;
-	
-	settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSReqMaxUplinkRate),data, NULL);
-	aParams->iReqMaxRate.iUplinkRate = (TInt)data;
-	
-	settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSReqMinUplinkRate),data, NULL);
-	aParams->iMinAcceptableMaxRate.iUplinkRate = (TInt)data;
-	
-	settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSReqMaxDownlinkRate),data, NULL);
-	aParams->iReqMaxRate.iDownlinkRate = (TInt)data;
-	
-	settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSReqMinDownlinkRate),data, NULL);
-	aParams->iMinAcceptableMaxRate.iDownlinkRate = (TInt)data;
-		
-	settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSReqBER),data, NULL);
-	aParams->iReqBER = (RPacketQoS::TBitErrorRatio)data;
-	
-	settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSMaxBER),data, NULL);
-	aParams->iMaxBER = (RPacketQoS::TBitErrorRatio)data;
-	
-	settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSReqSDUErrorRatio),data, NULL);
-	aParams->iReqSDUErrorRatio = (RPacketQoS::TSDUErrorRatio)data;
-	
-	settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSMaxSDUErrorRatio),data, NULL);
-	aParams->iMaxSDUErrorRatio = (RPacketQoS::TSDUErrorRatio)data;
-	
-	settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSReqTrafficHandlingPriority),data, NULL);
-	aParams->iReqTrafficHandlingPriority = (RPacketQoS::TTrafficHandlingPriority)data;
-	
-	settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSMinTrafficHandlingPriority),data, NULL);
-	aParams->iMinTrafficHandlingPriority = (RPacketQoS::TTrafficHandlingPriority)data;
-	
-	settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSReqTransferDelay),data, NULL);
-	aParams->iReqTransferDelay = (TInt)data;
-	
-	settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSMaxTransferDelay),data, NULL);
-	aParams->iMaxTransferDelay = (TInt)data;
-	
-	settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSReqGuaranteedUplinkRate),data, NULL);
-	aParams->iReqGuaranteedRate.iUplinkRate = (TInt)data;
-	
-	settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSMinGuaranteedUplinkRate),data, NULL);			
-	aParams->iMinGuaranteedRate.iUplinkRate = (TInt)data;
-	
-	settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSReqGuaranteedDownlinkRate),data, NULL);
-	aParams->iMinGuaranteedRate.iDownlinkRate = (TInt)data;
-		
-	settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSMinGuaranteedDownlinkRate),data, NULL);
-	aParams->iMinGuaranteedRate.iDownlinkRate = (TInt)data;
-}
-
-
-
-
-/** 
-This override of the DoControl() method is used to initialise the RPdpFsmInterface object
-in the SpudMan with a pointer to the real CPdpFsmInterface object owned by the 
-subconnection provider.
-
-@param aOptionLevel
-@param aOptionName
-@param aOption
-*/
-TInt CUmtsGprsDefaultSubConnProvd::DoControl(TUint aOptionLevel, TUint aOptionName, TDes8& aOption)
-    {
-	__FLOG_1(_L("CUmtsGprsDefaultSubConnProvd::DoControl [%08x]"), this);
-	if (aOptionLevel == KSOLInterface && aOptionName == KInitialisePdpFsm)
-    	{
-    	CNifIfBase* nif = *reinterpret_cast<CNifIfBase**>(const_cast<TUint8*>(aOption.Ptr()));
-    	ASSERT(nif != NULL);
-        TPckg<MPdpFsmInterface*> pdpfsm(iPdpFsm);    	
-    	return nif->Control(KSOLInterface, KInitialisePdpFsm, pdpfsm);
-    	}
-
-    return CUmtsGprsSubConnProvd::Control(aOptionLevel, aOptionName, aOption);
-    }
-    
-    
-CPdpFsmInterface& CUmtsGprsDefaultSubConnProvd::GetPdpFsmInterface()
-    {
-    return *iPdpFsm;
-    }
-    
--- a/telephonyprotocols/umtsgprsscpr/src/UmtsGprs_subconnProv.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,764 +0,0 @@
-// Copyright (c) 2005-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:
-// Implementation file for the Umts/Gprs SubConnection Provider
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-
-
-#include <cs_subconevents.h>
-#include "UmtsGprs_subconnProv.h"
-
-const TInt KQoSMappingBorderDelay = 250;
-
-#define IN_RANGE_INCLUSIVE(value, left, right) (value >= left && value <= right )
-#define MIN(left, right) (left < right ? left : right)
-
-//We need to use a cleanup item here becuase CSubConNotificationEvents are not CBase derived. This means that on cleanup, things are not cleaned up as expected
-//We therefore need a TCleanupItem to deal with it.
-void SubconEventCleanupFunction(TAny* aEvent)
-	{
-	CSubConNotificationEvent* ptr = static_cast<CSubConNotificationEvent*>(aEvent);
-	delete ptr;
-	}
-
-void SubconParamSetCleanupFunction(TAny* aEvent)
-	{
-	CSubConParameterSet* ptr = static_cast<CSubConParameterSet*>(aEvent);
-	delete ptr;
-	}
-	
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-void CUmtsGprsSubConnProvd::MapQosParamBundleToEtelL(const CSubConParameterBundle& aIn, 
-   RPacketQoS::TQoSR5Requested* aOut)
-
-#else
-// !SYMBIAN_NETWORKING_UMTSR5
-
-void CUmtsGprsSubConnProvd::MapQosParamBundleToEtelL(const CSubConParameterBundle& aIn, 
-    RPacketQoS::TQoSR99_R4Requested* aOut)
-#endif
-// SYMBIAN_NETWORKING_UMTSR5
-   {
-	ASSERT(aOut);
-
-    //Note: There should probably be const and non-const versions of FindFamily. 
-    //There is only non-const, hence casting below.
-	CSubConParameterFamily* family = const_cast<CSubConParameterBundle&>(aIn).FindFamily(KSubConQoSFamily);
-	if (!family)
-        {
-        User::Leave(KErrArgument);
-        }
-
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-	// check the UMTS R5 extension first
-	CSubConQosR5ParamSet* extRequestedR5 = NULL;
-	CSubConQosR5ParamSet* extAcceptableR5 = NULL;
-	
-	extRequestedR5 = static_cast<CSubConQosR5ParamSet*>(family->FindExtensionSet(
-        STypeId::CreateSTypeId(KSubCon3GPPExtParamsFactoryUid,KSubConQosR5ParamsType), CSubConParameterFamily::ERequested));
-
-	extAcceptableR5 = static_cast<CSubConQosR5ParamSet*>(family->FindExtensionSet(
-        STypeId::CreateSTypeId(KSubCon3GPPExtParamsFactoryUid,KSubConQosR5ParamsType), CSubConParameterFamily::EAcceptable));
-
-	if (extRequestedR5)
-        {
-        MapQosR5ExtensionSetToEtel (*extRequestedR5, extAcceptableR5, aOut);
-        iParameterRelease = KParameterRel5;
-        return;
-        }
-#endif
-
-	// No R5 so check the UMTS R99/R4 extension next
-	CSubConQosR99ParamSet* extRequestedR99 = NULL;
-	CSubConQosR99ParamSet* extAcceptableR99 = NULL;
-	extRequestedR99 = static_cast<CSubConQosR99ParamSet*>(family->FindExtensionSet(
-        STypeId::CreateSTypeId(KSubCon3GPPExtParamsFactoryUid,KSubConQosR99ParamsType), CSubConParameterFamily::ERequested));
-
-	extAcceptableR99 = static_cast<CSubConQosR99ParamSet*>(family->FindExtensionSet(
-        STypeId::CreateSTypeId(KSubCon3GPPExtParamsFactoryUid,KSubConQosR99ParamsType), CSubConParameterFamily::EAcceptable));
-
-	if (extRequestedR99)
-        {
-        MapQosR99ExtensionSetToEtel (*extRequestedR99, extAcceptableR99, aOut);
-        iParameterRelease = KParameterRel4Rel99;
-        return;
-        }
-      
-      
-	// Still nothing specific, try to use the generic params
-	CSubConQosGenericParamSet* genericRequested = 
-        static_cast<CSubConQosGenericParamSet*>(family->GetGenericSet(CSubConParameterFamily::ERequested));
-	CSubConQosGenericParamSet* genericAcceptable = 
-        static_cast<CSubConQosGenericParamSet*>(family->GetGenericSet(CSubConParameterFamily::EAcceptable));
-
-    if (genericRequested)
-        {
-        MapQosGenericSetToEtel (*genericRequested, genericAcceptable, aOut);
-        iParameterRelease = KParameterRelGeneric;
-        return;
-        }
-    	
-    // Nothing left that we support
-    User::Leave(KErrNotSupported);
-    }
-
-    
-/** 
-Maps given requested and acceptable sets of R99/R4 parameters as defined CSubConQosR99ParamSet
-into the Etel format (RPacketQoS::TQoSR99_R4Requested).
-
-@param aInRequested requested CSubConQosR99ParamSet to be converted
-@param aInAcceptable optional acceptable CSubConQosR99ParamSet to be converted
-@param aOut RPacketQoS::TQoSR99_R4Requested derived class to be mapped into.
-*/
-void CUmtsGprsSubConnProvd::MapQosR99ExtensionSetToEtel(const CSubConQosR99ParamSet& aInRequested,
-   const CSubConQosR99ParamSet* aInAcceptable, RPacketQoS::TQoSR99_R4Requested* aOut)
-   {
-   ASSERT (aOut);
-   
-	aOut->iReqTrafficClass =  aInRequested.GetTrafficClass();
-	aOut->iReqDeliveryOrderReqd = aInRequested.GetDeliveryOrder();
-	aOut->iReqDeliverErroneousSDU = aInRequested.GetErroneousSDUDelivery();
-	aOut->iReqBER = aInRequested.GetResidualBitErrorRatio();
-	aOut->iReqSDUErrorRatio = aInRequested.GetSDUErrorRatio();
-	aOut->iReqTrafficHandlingPriority = aInRequested.GetTrafficHandlingPriority();
-	aOut->iReqTransferDelay = aInRequested.GetTransferDelay();
-	aOut->iReqMaxSDUSize = aInRequested.GetMaxSduSize();
-	aOut->iReqMaxRate.iUplinkRate = aInRequested.GetMaxBitrateUplink();
-	aOut->iReqMaxRate.iDownlinkRate = aInRequested.GetMaxBitrateDownlink();
-	aOut->iReqGuaranteedRate.iUplinkRate = aInRequested.GetGuaBitrateUplink();
-	aOut->iReqGuaranteedRate.iDownlinkRate = aInRequested.GetGuaBitrateDownlink();
-	
-	if (!aInAcceptable)
-	   {
-	   // when aInAcceptable is ommitted the minimum is the requested
-	   aInAcceptable = &aInRequested;
-	   }
-	   
-	aOut->iMinTrafficClass = aInAcceptable->GetTrafficClass();
-	aOut->iMinDeliveryOrderReqd = aInAcceptable->GetDeliveryOrder();
-	aOut->iMinDeliverErroneousSDU = aInAcceptable->GetErroneousSDUDelivery();
-	aOut->iMaxBER = aInAcceptable->GetResidualBitErrorRatio();
-	aOut->iMaxSDUErrorRatio = aInAcceptable->GetSDUErrorRatio();
-	aOut->iMinTrafficHandlingPriority = aInAcceptable->GetTrafficHandlingPriority();
-	aOut->iMaxTransferDelay = aInAcceptable->GetTransferDelay();
-	aOut->iMinAcceptableMaxSDUSize = aInAcceptable->GetMaxSduSize();
-	aOut->iMinAcceptableMaxRate.iUplinkRate = aInAcceptable->GetMaxBitrateUplink();
-	aOut->iMinAcceptableMaxRate.iDownlinkRate = aInAcceptable->GetMaxBitrateDownlink();
-	aOut->iMinGuaranteedRate.iUplinkRate = aInAcceptable->GetGuaBitrateUplink();
-	aOut->iMinGuaranteedRate.iDownlinkRate = aInAcceptable->GetGuaBitrateDownlink();
-   }
-    
-  
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-/** 
-Maps given requested and acceptable sets of R5 parameters as defined CSubConQosR5ParamSet
-into the Etel format (RPacketQoS::TQoSR5Requested).
-
-
-@param aInRequested requested CSubConQosR5ParamSet to be converted
-@param aInAcceptable optional acceptable CSubConQosR5ParamSet to be converted
-@param aOut RPacketQoS::TQoSR5Requested derived class to be mapped into.
-*/
-void CUmtsGprsSubConnProvd::MapQosR5ExtensionSetToEtel(const CSubConQosR5ParamSet& aInRequested,
-    const CSubConQosR5ParamSet* aInAcceptable, RPacketQoS::TQoSR5Requested* aOut)
-    {
-    MapQosR99ExtensionSetToEtel(aInRequested,aInAcceptable,aOut);
-    aOut->iSourceStatisticsDescriptor =  aInRequested.GetSourceStatisticsDescriptor();
-    aOut->iSignallingIndication = aInRequested.GetSignallingIndicator();
-    }
-    
-    
-void CUmtsGprsSubConnProvd::MapQosR99ExtensionSetToEtel(const CSubConQosR99ParamSet& aInRequested,
-    const CSubConQosR99ParamSet* aInAcceptable, RPacketQoS::TQoSR5Requested* aOut)
-    {
-    MapQosR99ExtensionSetToEtel(aInRequested, aInAcceptable, static_cast<RPacketQoS::TQoSR99_R4Requested*>(aOut));
-    aOut->iSourceStatisticsDescriptor =  RPacketQoS::ESourceStatisticsDescriptorUnknown;
-    aOut->iSignallingIndication = EFalse;
-    }
-
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5   
-    
-/** 
-Given a set of generic parameters, the method derives the R99 value for the traffic class.
-
-
-@param aIn requested CSubConQosGenericParamSet to be converted
-@return the value of RPacketQoS::TTrafficClass
-*/	
-RPacketQoS::TTrafficClass CUmtsGprsSubConnProvd::DeriveTrafficClass(const CSubConQosGenericParamSet& aIn )
-    {
-    //-----------------------------------
-    // Traffic class
-    //-----------------------------------
-    if (IN_RANGE_INCLUSIVE(aIn.GetUpLinkDelay(), 0, KQoSMappingBorderDelay-1) ||
-        IN_RANGE_INCLUSIVE(aIn.GetDownLinkDelay(), 0, KQoSMappingBorderDelay-1) )
-	    {
-	    return RPacketQoS::ETrafficClassConversational;
-	    }
-    else if (aIn.GetUpLinkDelay() >= KQoSMappingBorderDelay || 
-    		 aIn.GetDownLinkDelay() >= KQoSMappingBorderDelay )
-	    {
-	    return RPacketQoS::ETrafficClassStreaming;	
-	    }  
-    else if (IN_RANGE_INCLUSIVE(aIn.GetUpLinkPriority(), 1, 3) ||
-    		 IN_RANGE_INCLUSIVE(aIn.GetDownLinkPriority(), 1, 3))
-	    {
-	    return RPacketQoS::ETrafficClassInteractive;	
-	    }
-
-	return RPacketQoS::ETrafficClassBackground;	
-	}
-	
-	
-/** 
-Given a set of generic parameters, the method derives the R99 value for the traffic priority.
-
-
-@param aIn requested CSubConQosGenericParamSet to be converted
-@return the value of RPacketQoS::TTrafficHandlingPriority
-*/	
-RPacketQoS::TTrafficHandlingPriority CUmtsGprsSubConnProvd::DeriveTrafficPriority(const CSubConQosGenericParamSet& aIn )
-    {    
-    //
-    // Traffic handling priority
-    //
-    if (aIn.GetUpLinkPriority() == 1 || aIn.GetDownLinkPriority() == 1)
-	    {
-	    return RPacketQoS::ETrafficPriority1;	
-	    }
-    else if (aIn.GetUpLinkPriority() == 2 || aIn.GetDownLinkPriority() == 2)
-	    {
-	    return RPacketQoS::ETrafficPriority2;
-	    }
-
-	return RPacketQoS::ETrafficPriority3;
-    }
-	    
-    
-/** 
-Maps given requested and acceptable sets of generic QoS parameters as defined CSubConQosGenericParamSet
-into the Etel format (RPacketQoS::TQoSR99_R4Requested).
-
-
-@param aInRequested requested CSubConQosGenericParamSet to be converted
-@param aInAcceptable optional acceptable CSubConQosGenericParamSet to be converted
-@param aOut RPacketQoS::TQoSR99_R4Requested to be produced.
-*/	
-void CUmtsGprsSubConnProvd::MapQosGenericSetToEtel(const CSubConQosGenericParamSet& aInRequested, 
-   const CSubConQosGenericParamSet* aInAcceptable, RPacketQoS::TQoSR99_R4Requested* aOut)
-	{
-	ASSERT (aOut);
-	
-	aOut->iReqDeliveryOrderReqd = RPacketQoS::EDeliveryOrderNotRequired;
-	aOut->iReqDeliverErroneousSDU = RPacketQoS::EErroneousSDUDeliveryNotRequired;;
-	aOut->iReqBER = RPacketQoS::EBERUnspecified;
-   aOut->iReqSDUErrorRatio = RPacketQoS::ESDUErrorRatioUnspecified;
-
-	aOut->iReqTrafficClass = DeriveTrafficClass(aInRequested);
-	aOut->iReqTrafficHandlingPriority = DeriveTrafficPriority(aInRequested);
-	aOut->iReqTransferDelay = MIN(aInRequested.GetUpLinkDelay(), aInRequested.GetDownLinkDelay());
-	aOut->iReqMaxSDUSize = aInRequested.GetUpLinkMaximumPacketSize();
-	aOut->iReqMaxRate.iUplinkRate = aInRequested.GetUplinkBandwidth();
-	aOut->iReqMaxRate.iDownlinkRate = aInRequested.GetDownlinkBandwidth();
-	aOut->iReqGuaranteedRate.iUplinkRate = aInRequested.GetUplinkBandwidth();
-	aOut->iReqGuaranteedRate.iDownlinkRate = aInRequested.GetDownlinkBandwidth();
-	
-	if (!aInAcceptable)
-	   {
-	   // when aInAcceptable is ommitted the minimum is the requested
-	   aInAcceptable = &aInRequested;
-	   }
-	
-	aOut->iMinDeliveryOrderReqd = RPacketQoS::EDeliveryOrderNotRequired;
-	aOut->iMinDeliverErroneousSDU = RPacketQoS::EErroneousSDUDeliveryNotRequired;
-	aOut->iMaxBER = RPacketQoS::EBERUnspecified;
-	aOut->iMaxSDUErrorRatio = RPacketQoS::ESDUErrorRatioUnspecified;
-
-	aOut->iMinTrafficClass = DeriveTrafficClass(*aInAcceptable);
-	aOut->iMinTrafficHandlingPriority = DeriveTrafficPriority(*aInAcceptable);
-	aOut->iMaxTransferDelay = MIN(aInAcceptable->GetUpLinkDelay(), aInAcceptable->GetDownLinkDelay());
-	aOut->iMinAcceptableMaxSDUSize = aInAcceptable->GetUpLinkMaximumPacketSize();
-	aOut->iMinAcceptableMaxRate.iUplinkRate = aInAcceptable->GetUplinkBandwidth();
-	aOut->iMinAcceptableMaxRate.iDownlinkRate = aInAcceptable->GetDownlinkBandwidth();
-	aOut->iMinGuaranteedRate.iUplinkRate = aInAcceptable->GetUplinkBandwidth();
-	aOut->iMinGuaranteedRate.iDownlinkRate = aInAcceptable->GetDownlinkBandwidth();
-	}
-
-
-
-/**
-Maps QoS parameters received from the network via Etel into a CSubConGenEventParamsGranted class
-so that it is usable by the RSubConnection API.
-
-@param aNetworkQoS  - A pointer to an Etel TPacketDataConfigBase class containing the
-QoS to be mapped into the QoS event.
-@param aGranted - A reference to the CSubConGenEventParamsGranted object that should receive the mapped
-QoS parameters.
-*/
-void CUmtsGprsSubConnProvd::MapQosEtelToGrantedParamsL (TPacketDataConfigBase* aNetworkQoS,CSubConGenEventParamsGranted& aGranted)
-    {
-    ASSERT (aNetworkQoS);
-    
-    // Always set the generic set
-    MapQosEtelToGenericSetL ((static_cast<RPacketQoS::TQoSR99_R4Negotiated*>(aNetworkQoS)), aGranted);
-
-
-    
-    switch (iParameterRelease)
-        {
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-        case KParameterRel5:
-            // Control client sent us an R5 qos request
-            MapQosEtelToR5SetL ((static_cast<RPacketQoS::TQoSR5Negotiated*>(aNetworkQoS)), aGranted);
-            break;
-#endif
-// SYMBIAN_NETWORKING_UMTSR5
-            
-        case KParameterRelInvalid:
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-            // This will be the case if the client hasn't actually requested a level of QoS yet
-            // but the network has notified us of a QoS change. We don't know what the client might
-            // support so return both sets (if the define is set, else just what the code supports)
-            MapQosEtelToR5SetL ((static_cast<RPacketQoS::TQoSR5Negotiated*>(aNetworkQoS)), aGranted);
-#endif
-            MapQosEtelToR99SetL ((static_cast<RPacketQoS::TQoSR99_R4Negotiated*>(aNetworkQoS)), aGranted);
-            break;
-            
-        case KParameterRel4Rel99:
-            // Control client sent us an R4/R99 qos request
-            MapQosEtelToR99SetL ((static_cast<RPacketQoS::TQoSR99_R4Negotiated*>(aNetworkQoS)), aGranted);
-            break;
-        
-        case KParameterRelGeneric:
-            // Generic set always returned. Done above.
-            break;
-        }
-    }
-    
-
-/**
-Maps QoS parameters received from the network via Etel into a 3GPP Release R4/R99 set and
-sets it in the given event.
-
-@param aNetworkQoS  - A pointer to an Etel RPacketQoS::TQoSR99_R4Requested derived class containing
-the QoS to be mapped.
-@param aGranted - A reference to the CSubConGenEventParamsGranted object that should receive the
-extension QoS parameters.
-*/
-void CUmtsGprsSubConnProvd::MapQosEtelToR99SetL (RPacketQoS::TQoSR99_R4Negotiated* aNetworkQoS,
-   CSubConGenEventParamsGranted& aGranted)
-   {
-   ASSERT (aNetworkQoS);
-   
-   CSubConQosR99ParamSet* r99Extension = CSubConQosR99ParamSet::NewL ();
-   CleanupStack::PushL(TCleanupItem(SubconParamSetCleanupFunction,r99Extension));
-   r99Extension->SetTrafficClass(aNetworkQoS->iTrafficClass);
-   r99Extension->SetDeliveryOrder(aNetworkQoS->iDeliveryOrderReqd);
-   r99Extension->SetErroneousSDUDelivery(aNetworkQoS->iDeliverErroneousSDU);
-   r99Extension->SetResidualBitErrorRatio(aNetworkQoS->iBER);
-   r99Extension->SetSDUErrorRatio(aNetworkQoS->iSDUErrorRatio);
-   r99Extension->SetTrafficHandlingPriority(aNetworkQoS->iTrafficHandlingPriority);
-   r99Extension->SetTransferDelay(aNetworkQoS->iTransferDelay);
-   r99Extension->SetMaxSduSize(aNetworkQoS->iMaxSDUSize);
-   r99Extension->SetMaxBitrateUplink(aNetworkQoS->iMaxRate.iUplinkRate);
-   r99Extension->SetMaxBitrateDownlink(aNetworkQoS->iMaxRate.iDownlinkRate);
-   r99Extension->SetGuaBitrateUplink(aNetworkQoS->iGuaranteedRate.iUplinkRate);
-   r99Extension->SetGuaBitrateDownlink(aNetworkQoS->iGuaranteedRate.iDownlinkRate);
-   
-   aGranted.AddExtensionSetL (r99Extension);
-   CleanupStack::Pop(); //r99Extension
-   }
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5
-/**
-Maps QoS parameters received from the network via Etel into a 3GPP Release R5 set and
-sets it in the given event.
-
-@param aNetworkQoS  - A pointer to an Etel RPacketQoS::TQoSR5Requested derived class containing
-the QoS to be mapped.
-@param aGranted - A reference to the CSubConGenEventParamsGranted object that should receive the
-extension QoS parameters.
-*/
-void CUmtsGprsSubConnProvd::MapQosEtelToR5SetL (RPacketQoS::TQoSR5Negotiated* aNetworkQoS,
-   CSubConGenEventParamsGranted& aGranted)
-   {
-   ASSERT (aNetworkQoS);
-   
-   CSubConQosR5ParamSet* r5Extension = CSubConQosR5ParamSet::NewL ();
-   CleanupStack::PushL(TCleanupItem(SubconParamSetCleanupFunction,r5Extension));
-   r5Extension->SetTrafficClass(aNetworkQoS->iTrafficClass);
-   r5Extension->SetDeliveryOrder(aNetworkQoS->iDeliveryOrderReqd);
-   r5Extension->SetErroneousSDUDelivery(aNetworkQoS->iDeliverErroneousSDU);
-   r5Extension->SetResidualBitErrorRatio(aNetworkQoS->iBER);
-   r5Extension->SetSDUErrorRatio(aNetworkQoS->iSDUErrorRatio);
-   r5Extension->SetTrafficHandlingPriority(aNetworkQoS->iTrafficHandlingPriority);
-   r5Extension->SetTransferDelay(aNetworkQoS->iTransferDelay);
-   r5Extension->SetMaxSduSize(aNetworkQoS->iMaxSDUSize);
-   r5Extension->SetMaxBitrateUplink(aNetworkQoS->iMaxRate.iUplinkRate);
-   r5Extension->SetMaxBitrateDownlink(aNetworkQoS->iMaxRate.iDownlinkRate);
-   r5Extension->SetGuaBitrateUplink(aNetworkQoS->iGuaranteedRate.iUplinkRate);
-   r5Extension->SetGuaBitrateDownlink(aNetworkQoS->iGuaranteedRate.iDownlinkRate);
-
-   r5Extension->SetSourceStatisticsDescriptor(aNetworkQoS->iSourceStatisticsDescriptor);
-   r5Extension->SetSignallingIndicator(aNetworkQoS->iSignallingIndication);		
-   
-   aGranted.AddExtensionSetL (r5Extension);
-   CleanupStack::Pop(); //r5Extension
-   }
-
-    
-#endif 
-// SYMBIAN_NETWORKING_UMTSR5 
-
-
-/**
-Maps QoS parameters received from the network via Etel into a generic set and sets it in the given event.
-
-@param aNetworkQoS  - A pointer to an Etel RPacketQoS::TQoSR99_R4Requested derived class containing the QoS
-to be mapped.
-@param aFamily - A reference to the CSubConGenEventParamsGranted object that should receive the
-generic QoS parameters.
-*/
-void CUmtsGprsSubConnProvd::MapQosEtelToGenericSetL (RPacketQoS::TQoSR99_R4Negotiated* aNetworkQoS,
-   CSubConGenEventParamsGranted& aGranted)
-   {
-   ASSERT (aNetworkQoS);
-   
-   CSubConQosGenericParamSet* genericQoS = CSubConQosGenericParamSet::NewL ();
-   
-   genericQoS->SetDownlinkBandwidth (aNetworkQoS->iGuaranteedRate.iDownlinkRate);
-   genericQoS->SetUplinkBandwidth (aNetworkQoS->iGuaranteedRate.iUplinkRate);
-   genericQoS->SetDownLinkDelay (aNetworkQoS->iTransferDelay);
-   genericQoS->SetUpLinkDelay (aNetworkQoS->iTransferDelay);
-   genericQoS->SetDownLinkMaximumPacketSize (aNetworkQoS->iMaxSDUSize);
-   genericQoS->SetUpLinkMaximumPacketSize (aNetworkQoS->iMaxSDUSize);
-   
-   switch (aNetworkQoS->iTrafficHandlingPriority) 
-      {
-         case RPacketQoS::ETrafficPriority1:
-            genericQoS->SetDownLinkPriority (RPacketQoS::ETrafficPriority1);
-            genericQoS->SetUpLinkPriority (RPacketQoS::ETrafficPriority1);
-            break;
-
-         case RPacketQoS::ETrafficPriority2:
-            genericQoS->SetDownLinkPriority (RPacketQoS::ETrafficPriority2);
-            genericQoS->SetUpLinkPriority (RPacketQoS::ETrafficPriority2);
-            break;
-
-         case RPacketQoS::ETrafficPriority3:
-            genericQoS->SetDownLinkPriority (RPacketQoS::ETrafficPriority3);
-            genericQoS->SetUpLinkPriority (RPacketQoS::ETrafficPriority3);
-            break;
-            
-         default:
-            genericQoS->SetDownLinkPriority (RPacketQoS::ETrafficPriorityUnspecified);
-            genericQoS->SetUpLinkPriority (RPacketQoS::ETrafficPriorityUnspecified);
-            break;
-      }
-      
-   aGranted.SetGenericSet (genericQoS);
-   }
-   
-
-   
-CPdpFsmInterface& CUmtsGprsSubConnProvd::GetPdpFsmInterface()
-    {
-    return GetDefaultSubConnection().GetPdpFsmInterface();
-    }
-
-
-TBool CUmtsGprsSubConnProvd::PdpFsmEvent(TContextId aContextId, TInt aEvent, TInt aParam)
-    {
-    if (iCurrentPdpFsmReq)
-        {
-        TBool handled(EFalse);
-        handled = iCurrentPdpFsmReq->PdpFsmEvent(aContextId, aEvent, aParam);
-        return handled;
-        }
-
-	// Any events that are not a result of a request that we've made must be forwarded to
-	// control clients.
-
-	switch(aEvent)
-		{
-		case KContextParametersChangeEvent:
-	    // For QoS Changed the event must be processed here, it doesn't occur as a response
-    	// to something we've requested.
-        __FLOG_2(_L("CUmtsGprsSubConnProvd [this=%08x]:\tPdpFsmEvent(): QoS Params Changed [aParam=%d]"), this, aParam);
-        TRAP_IGNORE(NotifyParamsChangedL(aParam));
-		break;
-		
-		case KContextDeleteEvent:
-		// For network-initiate close of PDP context.
-        __FLOG_2(_L("CUmtsGprsSubConnProvd [this=%08x]:\tPdpFsmEvent(): Context Delete Event [aParam=%d]"), this, aParam);
-        TRAP_IGNORE(NotifySubConDownL(aParam));
-		break;
-		
-		case KContextBlockedEvent:		// A PDP context becomes blocked
-		case KContextUnblockedEvent:	// A PDP context becomes unblocked
-		case KNetworkStatusEvent:		// For different network indications	
-		case KContextQoSSetEvent:		// Response to KContextQoSSet
-		case KContextTFTModifiedEvent:	// Response to KContextTFTModify
-		case KPrimaryContextCreated:	// Primary context at startup created
-		case KSecondaryContextCreated:	// Secondary context created
-		case KContextModifyActiveEvent:	// Response to KModifyActive
-		case KGetNegQoSEvent:			// Response to KGetNegQoS. ** Used internally by NIF **
-		default:
-		// Do nothing.
-		break;
-		}
-
-    // Although we have notified the change of qos to the client application we haven't handled this
-    // event. We can get here because the network changed the QoS without a request from us, or
-    // because a secondary context (actually owned by GuQoS) has been promoted to default. 
-    return EFalse;
-    }
-    
-void CUmtsGprsSubConnProvd::NotifySubConDownL(TInt aError)
-	{
-   	CSubConGenEventSubConDown* event = CSubConGenEventSubConDown::NewL();
-	CleanupStack::PushL(TCleanupItem(SubconEventCleanupFunction, event));
-	event->SetError(aError);
-	NotifyClientEvent(*event);
-	CleanupStack::PopAndDestroy (); //event
-	}
-
-
-void CUmtsGprsSubConnProvd::NotifyParamsChangedL(TInt aError)
-    {
-    CSubConGenEventParamsChanged* event = CSubConGenEventParamsChanged::NewL();
-    CleanupStack::PushL(TCleanupItem(SubconEventCleanupFunction, event));
-    event->SetFamily (KSubConQoSFamily);
-    event->SetError (aError);
-
-#ifdef SYMBIAN_NETWORKING_UMTSR5  
-	RPacketQoS::TQoSR5Negotiated negotiatedQoS;
-#else
-    RPacketQoS::TQoSR99_R4Negotiated negotiatedQoS;
-#endif 
-
-    GetPdpFsmInterface().Get(GetContextId(), negotiatedQoS);
-    MapQosEtelToGrantedParamsL(&negotiatedQoS, *event);
-	NotifyClientEvent (*event);
-	CleanupStack::PopAndDestroy (); //event
-    }
-
-    
-MConnectionDataClient* CUmtsGprsSubConnProvd::DoSelfConnectionDataClient()
-    {
-    return this;
-    }    
-
-
-CPdpFsmRequestBase::CPdpFsmRequestBase(CUmtsGprsSubConnProvd& aProvider, MPdpFsmRequestOwner& aOwner)
-   :iProvider(aProvider), iOwner(aOwner)
-   {
-   __FLOG_OPEN(KUmtsGprsLogTag1, KUmtsGprsLogTag2);     
-   }
-
-
-CSubConnectionProviderBase* CUmtsGprsSubConnProvd::DoNextLayer()
-    {
-	__FLOG_1(_L("CUmtsGprsSubConnProvd::DoNextLayer [this=%08x] - this is (by design) the last layer"), this);
-	return NULL;
-    }
-
-
-//-=========================================================
-//
-// Ignored overrides.
-//
-//-=========================================================	
-
-
-
-/** Convert the given parameter budle to Etel language (r99) and if at the time possible, submit the request SPUDFSM.
-@param 
-*/
-void CUmtsGprsSubConnProvd::DoParametersAboutToBeSetL(CSubConParameterBundle& /*aParameterBundle*/)
-    {
-	__FLOG_1(_L("CUmtsGprsSubConnProvd::DoParametersAboutToBeSetL [this=%08x]"), this);
-
-	iParameterRelease = KParameterRelInvalid;
-    //TODO: implement set qos on secondaries when UmtsGprsSCPR enables ECreateNew SubConnection Providers.
-    }
-
-
-CConnDataTransfer& CUmtsGprsSubConnProvd::DoDataTransferL()
-    {
-    //TODO: implement when UmtsGprsSCPR enables ECreateNew SubConnection Providers.    
-	User::Leave(KErrNotSupported);
-	return iNextLayer->DataTransferL();    
-    }
-
-
-    
-/**
-From MConnectionDataClient
-*/
-void CUmtsGprsSubConnProvd::Notify(TNotify /*aNotifyType*/, CConnectionProviderBase* /*aConnProvider*/, 
-                                   TInt /*aError*/, const CConNotificationEvent* /*aConNotificationEvent*/)
-    {   
-    //TODO: implement when UmtsGprsSCPR enables ECreateNew SubConnection Providers.
-    }
-
-/**
-From MConnectionDataClient
-*/
-void CUmtsGprsSubConnProvd::AttachToNext(CSubConnectionProviderBase* /*aSubConnProvider*/)
-    {
-    //TODO: implement when UmtsGprsSCPR enables ECreateNew SubConnection Providers.
-    }
-    
-/**
-From MConnectionDataClient
-*/
-void CUmtsGprsSubConnProvd::ConnectionGoingDown(CConnectionProviderBase& aConnProvider)
-   {
-   (void)aConnProvider;
-	__FLOG_2(_L("CUmtsGprsSubConnProvd [this=%08x]:\tConnectionGoingDown() [aConnProvider=%08x]"), this, &aConnProvider);
-	iConnectionProvider = NULL;
-	DeleteMeNow();
-   }
-
-/**
-From MConnectionDataClient
-*/
-void CUmtsGprsSubConnProvd::ConnectionError(TInt /*aStage*/, TInt /*aError*/)
-    {   
-    //TODO: implement when UmtsGprsSCPR enables ECreateNew SubConnection Providers.
-    }
-    
-/**
-Function called by Connection Provider when a socket is to be added to the QoS Flow ('this')
-
-@param aDataClient Data Client to add to the QoS Channel
-*/
-void CUmtsGprsSubConnProvd::DoDataClientJoiningL(MSubConnectionDataClient& aDataClient)
-    {
-    (void)aDataClient;    
-	__FLOG_3(_L("CUmtsGprsSubConnProvd [this=%08x]:\tDoDataClientJoiningL() [iDataClients.Count=%d] [aDataClient=%08x]"), this, iDataClients.Count(), &aDataClient);
-	//We're not interested in knowing about MSubConnectionDataClient joining this sub-connection
-    }
-    
-/**
-Function called by Connection Provider when a socket is to be removed from the QoS Flow ('this')
-
-@param aDataClient Data Client to remove from this QoS Channel
-*/
-void CUmtsGprsSubConnProvd::DoDataClientLeaving(MSubConnectionDataClient& aDataClient)
-    {
-    (void)aDataClient;
-	__FLOG_3(_L("CUmtsGprsSubConnProvd [this=%08x]:\tDoDataClientLeaving() [iDataClients.Count=%d] [aDataClient=%08x]"), this, iDataClients.Count(), &aDataClient);
-	 aDataClient.LeaveComplete (*this);
-    }
-    
-/**
-Function called by SubConnection Provider when a control client is to join to this the QoS Flow ('this')
-
-@param aControlClient Control Client to remove from this QoS Channel
-*/
-void CUmtsGprsSubConnProvd::DoControlClientJoiningL(MSubConnectionControlClient& aControlClient)
-    {
-    (void)aControlClient;
-	__FLOG_3(_L("CUmtsGprsSubConnProvd [this=%08x]:\tDoControlClientJoiningL() [iControlClients.Count=%d] [aControlClient=%08x]"), this, iControlClients.Count(), &aControlClient);
-	//We're not interested in knowing about MSubConnectionControlClient joining this sub-connection
-    }
-    
-/**
-Function called by SubConnection Provider when a control client is to be removed from the QoS Flow ('this')
-
-@param aControlClient Control Client to remove from this QoS Channel
-*/
-void CUmtsGprsSubConnProvd::DoControlClientLeaving(MSubConnectionControlClient& aControlClient)
-    {
-    (void)aControlClient;
-	__FLOG_3(_L("CUmtsGprsSubConnProvd [this=%08x]:\tDoControlClientLeaving() [iControlClients.Count=%d] [aControlClient=%08x]"), this, iControlClients.Count(), &aControlClient);
-	//We're not interested in knowing about MSubConnectionControlClient leaving this sub-connection
-    }
-
-
-/** 
-@param 
-*/
-void CUmtsGprsSubConnProvd::DoSourceAddressUpdate(MSubConnectionDataClient& /*aDataClient*/, const TSockAddr& /*aSource*/)
-    {
-    //TODO: implement when UmtsGprsSCPR enables ECreateNew SubConnection Providers.
-    }
-    
-/** 
-@param 
-*/
-void CUmtsGprsSubConnProvd::DoDestinationAddressUpdate(MSubConnectionDataClient& /*aDataClient*/, const TSockAddr& /*aDestination*/)
-    {
-    //TODO: implement when UmtsGprsSCPR enables ECreateNew SubConnection Providers.
-    }
-    
-void CUmtsGprsSubConnProvd::DoDataClientRouted(MSubConnectionDataClient& /*aDataClient*/, const TSockAddr& /*aSource*/, const TSockAddr& /*aDestination*/, const TDesC8& /*aConnectionInfo*/)
-/** 
-
-@param 
-*/
-    {
-    //TODO: implement when UmtsGprsSCPR enables ECreateNew SubConnection Providers.
-    }
-
-TInt CUmtsGprsSubConnProvd::DoControl(TUint /*aOptionLevel*/, TUint /*aOptionName*/, TDes8& /*aOption*/)
-/** 
-
-@param 
-*/
-    {
-	__FLOG_1(_L("CUmtsGprsSubConnProvd::DoControl [this=%08x]"), this);
-	return KErrNotSupported;
-    }
- 
-void CUmtsGprsSubConnProvd::DoStartL()
-/** 
-
-@param 
-*/
-    {
-    //TODO: implement when UmtsGprsSCPR enables ECreateNew SubConnection Providers.
-    }
-    
-void CUmtsGprsSubConnProvd::DoStop()
-/** 
-
-@param 
-*/
-    {
-    //TODO: implement when UmtsGprsSCPR enables ECreateNew SubConnection Providers.
-    }
-
-
-CUmtsGprsSubConnProvd::~CUmtsGprsSubConnProvd ()
-   {
-	__FLOG_1(_L("~CUmtsGprsSubConnProvd [this=%08x]"), this);
-	if (iConnectionProvider)
-		{
-		iConnectionProvider->Leave(*this);
-		}   
-    delete iCurrentPdpFsmReq;
-    __FLOG_CLOSE;
-   }
--- a/telephonyprotocols/umtsgprsscpr/src/UmtsGprs_subconnProvFactory.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-// Copyright (c) 2005-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:
-// Implementation file for the Umts/Gprs SubConnection Provider Factory
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#include "UmtsGprs_subconnProvFactory.h"
-#include <networking/qos3gpp_subconparams.h>
-#include "UmtsGprs_defaultSubconnProv.h"
-#include <implementationproxy.h>
-
-/**
-Data required for instantiating ECOM Plugin
-*/
-const TImplementationProxy ImplementationTable[] =
-	{
-	IMPLEMENTATION_PROXY_ENTRY(KUmtsGprsSubConnectionProviderFactoryId, CUmtsGprsSubConnProvdFactory::NewL),
-	};
-
-
-/**
-ECOM Implementation Factory
-*/
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
-    {
-    aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-
-    return ImplementationTable;
-    }
-
-
-CUmtsGprsSubConnProvdFactory* CUmtsGprsSubConnProvdFactory::NewL(TAny* aConstructionParameters)
-/**
-Constructs a Umts/Gprs SubConnection Provider Factory
-
-@param aConstructionParameters construction data passed by ECOM
-
-@returns pointer to a constructed factory
-*/
-	{
-   CUmtsGprsSubConnProvdFactory* ptr = 
-      new (ELeave) CUmtsGprsSubConnProvdFactory(KUmtsGprsSubConnectionProviderFactoryId, 
-         *(reinterpret_cast<CSubConnectionFactoryContainer*>(aConstructionParameters)));
-                  
-	return ptr;
-	}
-
-	
-
-CUmtsGprsSubConnProvdFactory::CUmtsGprsSubConnProvdFactory(TUint aFactoryId, 
-                                     CSubConnectionFactoryContainer& aParentContainer)
-	: CSubConnectionProviderFactoryBase(aFactoryId, aParentContainer)
-/**
-Umts/Gprs SubConnection Provider Factory Constructor
-
-@param aFactoryId ECOM Implementation Id
-@param aParentContainer Object Owner
-*/
-	{
-	}
-	
-
-CUmtsGprsSubConnProvdFactory::~CUmtsGprsSubConnProvdFactory()
-    {
-    }
-    
-
-CSubConnectionProviderBase* CUmtsGprsSubConnProvdFactory::DoCreateProviderL(
-                                   CConnectionProviderBase& aConnProvider, 
-                                   RSubConnection::TSubConnType aType)
-  {
-  CSubConnectionProviderBase* provider = NULL;
-  if (aType == RSubConnection::EAttachToDefault)
-    {
-    provider = CUmtsGprsDefaultSubConnProvd::NewL(*this, aConnProvider);
-    }
-  else
-    {
-    User::Leave(KErrNotSupported);
-    }
-  return provider;
-  }
-  
--- a/telephonyserverplugins/common_tsy/commontsy/inc/mmcustomtsy/CMmCustomTsy.h	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmcustomtsy/CMmCustomTsy.h	Tue Sep 14 17:55:14 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -1652,6 +1652,15 @@
          */
         TInt GetIccCallForwardingStatusCancel();
         
+		/**
+         * Resets an entry in the req handle store 
+         * 
+         * @param aTsyReqHandle req handle 
+         * @param aIpc IPC value
+         * @return EFalse if req handle not found
+         */
+        virtual TBool ResetReqHandle( const TTsyReqHandle aTsyReqHandle, const TInt aIpc );
+        
     private:
 
         enum TSubTsyIdx
--- a/telephonyserverplugins/common_tsy/commontsy/inc/mmcustomtsy/CMmPacketTsy.h	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmcustomtsy/CMmPacketTsy.h	Tue Sep 14 17:55:14 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -194,6 +194,16 @@
         virtual void Complete( TInt aReqHandleType, TInt aError );
 #endif // REQHANDLE_TIMER
 
+        /**
+         * Resets an entry in the req handle store 
+         * 
+         * 
+         * @param aTsyReqHandle req handle 
+         * @param aIpc IPC value
+         * return EFalse if req handle not found
+         */      
+        virtual TBool ResetReqHandle(const TTsyReqHandle aTsyReqHandle, const TInt aIpc);
+        
     private:
 
         /**
--- a/telephonyserverplugins/common_tsy/commontsy/inc/mmpacket/Cmmpacketservicetsy.h	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmpacket/Cmmpacketservicetsy.h	Tue Sep 14 17:55:14 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -1021,7 +1021,16 @@
             const TInt aError );
                                                            
 #endif // TF_LOGGING_ENABLED
-
+        
+		/**
+         * Resets an entry in the req handle store 
+         * 
+         * 
+         * @param aTsyReqHandle req handle 
+         * return EFalse if request handle not found
+         */       
+        virtual TBool ResetReqHandle( const TTsyReqHandle aTsyReqHandle );
+        
     private: // New functions
 
         /** 
--- a/telephonyserverplugins/common_tsy/commontsy/inc/mmutility/CMmSubTsyBase.h	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmutility/CMmSubTsyBase.h	Tue Sep 14 17:55:14 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -135,6 +135,19 @@
             return;
             }
         
+        /**
+         * Resets an entry in the req handle store 
+         * 
+         * 
+         * @param aTsyReqHandle req handle 
+         * @param aIpc IPC value
+         * return EFalse if req handle not found
+         */        
+        virtual TBool ResetReqHandle(const TTsyReqHandle /*aTsyReqHandle*/, const TInt /*aIpc*/)
+            {
+            return EFalse;
+            }
+        
 #endif //REHANDLE_TIMER
 
     protected:
--- a/telephonyserverplugins/common_tsy/commontsy/inc/mmutility/CMmTsyBase.h	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmutility/CMmTsyBase.h	Tue Sep 14 17:55:14 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -163,6 +163,16 @@
                                     const TInt anIpc,
                                     const TDataPackage& aPackage);
 
+        /**
+         * Resets an entry in a handle request store for a given request handle
+         *          
+         * 
+         * @param aTsyReqHandle Request handle
+         * @param aIpc IPC value
+         * @return EFalse if req handle not found 
+         */        
+        virtual TBool ResetReqHandle(const TTsyReqHandle aTsyReqHandle, const TInt aIpc);
+        
     };
 
 #endif // CMMTSYBASE_H
--- a/telephonyserverplugins/common_tsy/commontsy/inc/mmutility/cmmtsyreqhandlestore.h	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmutility/cmmtsyreqhandlestore.h	Tue Sep 14 17:55:14 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -94,7 +94,15 @@
          * @param aIndex index which req handle to reset.
          */
         TTsyReqHandle ResetTsyReqHandle( const TInt aIndex );
-
+        
+        /**
+         * Reset TSY request handle by req handle value.
+         *           
+         * @param aTsyReqHanle req handle to be reset.
+         * return TInt EFalse if handle not found
+         */
+        TBool FindAndResetTsyReqHandle( const TTsyReqHandle aTsyReqHandle);
+        
 #ifdef REQHANDLE_TIMER
 
         /**
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmCustomTsy.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmCustomTsy.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -230,9 +230,10 @@
         if ( KErrNone != trapError )
             {
             // error handling. Object cannot be created.
-            ret = trapError;
-            }
-        if ( KErrNone != ret )
+            ResetReqHandle(aTsyReqHandle, aIpc);
+		    ret = trapError;            
+			}
+      	if ( KErrNone != ret )
             {
             ReqCompleted( aTsyReqHandle, ret );
             }
@@ -6914,4 +6915,15 @@
     return KErrNone;
     }
 
+TBool CMmCustomTsy::ResetReqHandle( const TTsyReqHandle aTsyReqHandle, TInt aIpc )
+    {
+    TBool ret = CMmTsyBase::ResetReqHandle(aTsyReqHandle, aIpc);
+    if(!ret)
+        {
+        ret = iTsyReqHandleStore->FindAndResetTsyReqHandle( aTsyReqHandle );
+        }
+    return ret;
+    }
+    
+
 //  End of File
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmPacketTsy.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmPacketTsy.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -573,6 +573,32 @@
     }
 #endif // REQHANDLE_TIMER
 
+// ---------------------------------------------------------------------------
+// CMmPacketTsy::ResetReqHandle
+// Resets the request handle in req handle store
+// (other items were commented in a header).
+// ---------------------------------------------------------------------------
+//
+TBool CMmPacketTsy::ResetReqHandle(const TTsyReqHandle aTsyReqHandle, const TInt aIpc)
+    {
+    //handle has not been reset yet
+    TInt ret = EFalse;
+    if(aIpc == ECustomSetAlwaysOnMode)
+        { 
+		// request handle is set in packet data session
+        CMmPacketServiceTsy* packetSession = iMmPhone->PacketDataSession();
+        if(packetSession)
+            {
+            ret = packetSession->ResetReqHandle(aTsyReqHandle);
+            }
+        }
+    else
+        { 
+		// request handle stored locally
+        ret = iTsyReqHandleStore->FindAndResetTsyReqHandle(aTsyReqHandle);
+        }
+    return ret;
+    }
 
 //  End of File
 
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmcallgsmwcdmaext.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmcallgsmwcdmaext.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -1812,7 +1812,30 @@
         {
         iMobileCallInfo.iAlternatingCall = mobileCallInfo->iAlternatingCall;
         }
-
+    
+    // If a Mobile Originated call, take Alpha ID and Icon ID values from iCallParams, if valid.
+    if ( iMobileCallInfo.iRemoteParty.iDirection == RMobileCall::EMobileOriginated)
+        {
+        // Set the Alpha ID, if not set.
+        if ( iMobileCallInfo.iAlphaId.Length() <= 0 && 
+                iCallParams.iAlphaId.Length() > 0 &&
+                iCallParams.iAlphaId.Length() <= RMobileCall::KAlphaIdMaxSize )
+            {
+            iMobileCallInfo.iAlphaId.Zero();
+            iMobileCallInfo.iAlphaId.Copy(iCallParams.iAlphaId );
+            iMobileCallInfo.iValid |= RMobileCall::KCallAlphaId;
+            }
+        // Set the Icon ID, if not set.
+        if ( iMobileCallInfo.iIconId.iIdentifier == 0 && 
+                iMobileCallInfo.iIconId.iQualifier == RMobileCall::EIconQualifierNotSet &&
+                iCallParams.iIconId.iIdentifier > 0 &&
+                iCallParams.iIconId.iQualifier != RMobileCall::EIconQualifierNotSet )
+            {
+            iMobileCallInfo.iIconId.iIdentifier = iCallParams.iIconId.iIdentifier;
+            iMobileCallInfo.iIconId.iQualifier = iCallParams.iIconId.iQualifier;
+            iMobileCallInfo.iValid |= RMobileCall::KCallIconId;
+            }
+        }
  
     // TMobileCallInfoV3
     if ( (KETelExtMultimodeV3 == extensionId) ||
@@ -1844,14 +1867,20 @@
         	iMobileCallInfo.iCallParamOrigin = mobileCallInfoV7->iCallParamOrigin;
         	}
             
-        if(RMobileCall::KCallIconId & mobileCallInfo->iValid) 
+        // Set the Alpha ID if call is not Mobile Originated.
+        // If MO, the Alpha ID would be set above from iCallParams
+        if(RMobileCall::KCallIconId & mobileCallInfo->iValid &&
+                iMobileCallInfo.iRemoteParty.iDirection != RMobileCall::EMobileOriginated) 
         	{
         	// TIconId iIconId;
 	        iMobileCallInfo.iIconId.iIdentifier = mobileCallInfoV7->iIconId.iIdentifier;
 	        iMobileCallInfo.iIconId.iQualifier = mobileCallInfoV7->iIconId.iQualifier;
         	}
         
-        if(RMobileCall::KCallAlphaId & mobileCallInfo->iValid) 
+        // Set the Icon ID if call is not Mobile Originated.
+        // If MO, Icon ID would be set above from iCallParams
+        if(RMobileCall::KCallAlphaId & mobileCallInfo->iValid &&
+                iMobileCallInfo.iRemoteParty.iDirection != RMobileCall::EMobileOriginated) 
            	{
            	// TAlphaIdBuf iAlphaId;
    	        iMobileCallInfo.iAlphaId.Zero();
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketcontexttsy.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketcontexttsy.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -187,6 +187,8 @@
 
     if ( KErrNone != trapError )
         {
+		// Reset the request handle to indicate the request is no longer ongoing
+        iTsyReqHandleStore->FindAndResetTsyReqHandle( aTsyReqHandle );
         ReqCompleted( aTsyReqHandle, trapError );
         }
 
@@ -195,20 +197,19 @@
         ReqCompleted( aTsyReqHandle, ret );
         }
 
-    if ( EMultimodePacketContextReqHandleUnknown != iReqHandleType )
+    else if ( EMultimodePacketContextReqHandleUnknown != iReqHandleType )
         {
 #ifdef REQHANDLE_TIMER
         SetTypeOfResponse( iReqHandleType, aTsyReqHandle );
 #else
         iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, aTsyReqHandle );
 #endif // REQHANDLE_TIMER
+        }
 #ifdef ADD_REMOVE_PACKETFILTER_DEFECT_FIXED  // search for this up from bottom of file
-        // We've finished with this value now. Clear it so it doesn't leak
-        //  up to any other instances of this method down the call stack
-        iReqHandleType = EMultimodePacketContextReqHandleUnknown;
+     // We've finished with this value now. Clear it so it doesn't leak
+     //  up to any other instances of this method down the call stack
+     iReqHandleType = EMultimodePacketContextReqHandleUnknown;
 #endif
-        }
-
     return KErrNone;
     }
 
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketqostsy.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketqostsy.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -140,26 +140,27 @@
 
     if ( KErrNone != trapError )
         {
+		//reset request handle to indicate the request is no longer ongoing
+        iTsyReqHandleStore->FindAndResetTsyReqHandle(aTsyReqHandle);
+        iReqHandleType = EMultimodePacketQoSReqHandleUnknown;
         CMmPacketQoSTsy::ReqCompleted( aTsyReqHandle, trapError );
         }
     else if ( KErrNone != ret )
         {
         CMmPacketQoSTsy::ReqCompleted( aTsyReqHandle, ret );
         }
-
-    // Save request handle
-    if ( EMultimodePacketQoSReqHandleUnknown != iReqHandleType )
+    else if ( EMultimodePacketQoSReqHandleUnknown != iReqHandleType )
         {
+        // Save request handle
 #ifdef REQHANDLE_TIMER
         SetTypeOfResponse( iReqHandleType, aTsyReqHandle );
 #else
         iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, aTsyReqHandle );
 #endif //REQHANDLE_TIMER
-        // We've finished with this value now. Clear it so it doesn't leak
-        //  up to any other instances of this method down the call stack
-        iReqHandleType = EMultimodePacketQoSReqHandleUnknown;
         }
-
+    // We've finished with this value now. Clear it so it doesn't leak
+    //  up to any other instances of this method down the call stack
+    iReqHandleType = EMultimodePacketQoSReqHandleUnknown;
     return KErrNone;
 
     }
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketservicetsy.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketservicetsy.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -1989,14 +1989,15 @@
 
     if ( KErrNone != trapError )
         {
+		//reset request handle to indicate the request is no longer ongoing
+        iTsyReqHandleStore->FindAndResetTsyReqHandle(aTsyReqHandle);
         CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, trapError );
         }
     else if ( KErrNone != ret )
         {
         CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, ret );
         }
-
-    if ( EMultimodePacketServiceReqHandleUnknown != iReqHandleType )
+    else if ( EMultimodePacketServiceReqHandleUnknown != iReqHandleType )
         {
         // Save request handle type
 
@@ -2005,11 +2006,10 @@
 #else
         iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, iTsyReqHandle );
 #endif // REQHANDLE_TIMER
-        // We've finished with this value now. Clear it so it doesn't leak
-        //  up to any other instances of this method down the call stack
-        iReqHandleType = EMultimodePacketServiceReqHandleUnknown;
         }
-
+    // We've finished with this value now. Clear it so it doesn't leak
+    //  up to any other instances of this method down the call stack
+    iReqHandleType = EMultimodePacketServiceReqHandleUnknown;
     return KErrNone;
     }
 
@@ -4112,5 +4112,16 @@
     return iMaxActiveServices;
     }
 
+    
+//-----------------------------------------------------------------------------
+// TBool CMmPacketServiceTsy::ResetReqHandle
+// Resets request handle in the req handle store
+//-----------------------------------------------------------------------------
+// 
+TBool CMmPacketServiceTsy::ResetReqHandle( const TTsyReqHandle aTsyReqHandle )
+    {
+    return iTsyReqHandleStore->FindAndResetTsyReqHandle( aTsyReqHandle );
+    }
+
 //  End of File
 
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmmbmscontexttsy.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmmbmscontexttsy.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -136,6 +136,8 @@
 
     if ( KErrNone != trapError )
         {
+		// Reset request handle to indicate the request is no longer ongoing
+        iTsyReqHandleStore->FindAndResetTsyReqHandle(aTsyReqHandle);
         ReqCompleted( aTsyReqHandle, trapError );
         }
 
@@ -143,8 +145,7 @@
         {
         ReqCompleted( aTsyReqHandle, ret );
         }
-
-    if ( EMultimodePacketMbmsReqHandleUnknown != iReqHandleType )
+    else if ( EMultimodePacketMbmsReqHandleUnknown != iReqHandleType )
         {
 #ifdef REQHANDLE_TIMER
         SetTypeOfResponse( iReqHandleType, aTsyReqHandle );
@@ -152,7 +153,7 @@
         iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, aTsyReqHandle );
 #endif // REQHANDLE_TIMER
         }
-
+    iReqHandleType = EMultimodePacketMbmsReqHandleUnknown;
     return KErrNone;
     }
 
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmbroadcasttsy.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmbroadcasttsy.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -173,11 +173,13 @@
 
             if ( KErrNone != leaveCode )
                 {
-                ReqCompleted( aTsyReqHandle, leaveCode );
+				// reset request handle to indicate the request is no longer ongoing
+                iTsyReqHandleStore->FindAndResetTsyReqHandle(aTsyReqHandle);
+                ReqCompleted( aTsyReqHandle, leaveCode );				
                 }
 
             // save request handle
-            if ( EMultimodeBroadcastReqHandleUnknown != iReqHandleType )
+            else if ( EMultimodeBroadcastReqHandleUnknown != iReqHandleType )
                 {
 #ifdef REQHANDLE_TIMER
                 SetTypeOfResponse( iReqHandleType, aTsyReqHandle );
@@ -186,10 +188,10 @@
                 iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, 
                     aTsyReqHandle );
 #endif // REQHANDLE_TIMER
-                // We've finished with this value now. Clear it so it doesn't leak
-                //  up to any other instances of this method down the call stack
-                iReqHandleType = EMultimodeBroadcastReqHandleUnknown;
                 }
+            // We've finished with this value now. Clear it so it doesn't leak
+            //  up to any other instances of this method down the call stack
+            iReqHandleType = EMultimodeBroadcastReqHandleUnknown;
             break;
         }
 
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmsstoragetsy.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmsstoragetsy.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -83,9 +83,9 @@
         }
     iSmsListArray = NULL;
 
-    iSmsReadAllArray->ResetAndDestroy();
     if ( iSmsReadAllArray )
         {
+        iSmsReadAllArray->ResetAndDestroy();
         delete iSmsReadAllArray;
         }
 	iSmsReadAllArray = NULL;
@@ -160,23 +160,24 @@
 
             if ( KErrNone != leaveCode )
                 {
-                ReqCompleted( aTsyReqHandle, leaveCode );
+				//reset request handle to indicate the request is no longer ongoing
+                iMmTsyReqHandleStore->FindAndResetTsyReqHandle( aTsyReqHandle );
+				ReqCompleted( aTsyReqHandle, leaveCode );
                 }
-
-            // save request handle
-            if ( CMmSmsTsy::EMultimodeSmsReqHandleUnknown != iReqHandleType )
+            else if ( CMmSmsTsy::EMultimodeSmsReqHandleUnknown != iReqHandleType )
                 {
+                // save request handle
 #ifdef REQHANDLE_TIMER
                 iMmSmsTsy->SetTypeOfResponse( iReqHandleType, aTsyReqHandle );
 #else
                 // Never comes here. See SetTypeOfResponse.
                 iMmTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, 
                     aTsyReqHandle );
-#endif // REQHANDLE_TIMER
-                // We've finished with this value now. Clear it so it doesn't leak
-                //  up to any other instances of this method down the call stack
-                iReqHandleType = CMmSmsTsy::EMultimodeSmsReqHandleUnknown;
+#endif // REQHANDLE_TIMER   
                 }
+            // We've finished with this value now. Clear it so it doesn't leak
+            //  up to any other instances of this method down the call stack
+            iReqHandleType = CMmSmsTsy::EMultimodeSmsReqHandleUnknown;
             break;
         }
     
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmstsy.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmstsy.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -307,11 +307,13 @@
                 if ( KErrNone != leaveCode )
                     {
 OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_EXTFUNC_2, "CMmSmsTsy: Leave trapped!, IPC=%d, error value:%d", aIpc, leaveCode );
+                    //reset request handle to indicate the request is no longer ongoing
+					iTsyReqHandleStore->FindAndResetTsyReqHandle( aTsyReqHandle );
                     ReqCompleted( aTsyReqHandle, leaveCode );
                     }
 
                 //save request handle
-                if ( EMultimodeSmsReqHandleUnknown != iReqHandleType )
+                else if ( EMultimodeSmsReqHandleUnknown != iReqHandleType )
                     {
 #ifdef REQHANDLE_TIMER
                     SetTypeOfResponse( iReqHandleType, aTsyReqHandle );
@@ -320,10 +322,10 @@
                     iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, 
                         aTsyReqHandle );
 #endif // REQHANDLE_TIMER
-                    // We've finished with this value now. Clear it so it doesn't leak
-                    //  up to any other instances of this method down the call stack
-                    iReqHandleType = EMultimodeSmsReqHandleUnknown;
                     }
+                // We've finished with this value now. Clear it so it doesn't leak
+                //  up to any other instances of this method down the call stack
+                iReqHandleType = EMultimodeSmsReqHandleUnknown;
                 break;
             }
         }
@@ -1799,69 +1801,63 @@
         
         // structure for all sms parameters and data
         TSendSmsDataAndAttributes sendData;
-        
+        TSmsRequestTypes reqType;
+
         sendData.iAttributes = &msgAttr;
         sendData.iMsgData = aMsgData;
   
         if ( iSmsNoFdnCheckFlag == ESmsNoFdnCheckUsed )
             {
             //set ipc
-            sendData.iIpc = EMobileSmsMessagingSendMessageNoFdnCheck;    
+            sendData.iIpc = EMobileSmsMessagingSendMessageNoFdnCheck; 
+            reqType = EMultimodeSmsSendMessageNoFdnCheck;
             }
-        if ( iSmsNoFdnCheckFlag == ESmsNoFdnCheckNotUsed )
+        else //(iSmsNoFdnCheckFlag == ESmsNoFdnCheckNotUsed)
             {
             //set ipc
-            sendData.iIpc = EMobileSmsMessagingSendMessage;        
+            sendData.iIpc = EMobileSmsMessagingSendMessage;
+            reqType = EMultimodeSmsSendMessage;
             }
 
         // Pack parameters
         package.PackData( &sendData );
 
-        CSmsSendRequest* smsSendReq = new (ELeave) CSmsSendRequest();
-        smsSendReq->SetSmsDataAndAttributes( sendData );
+        iSmsSendReq = new (ELeave) CSmsSendRequest();
+        iSmsSendReq->SetSmsDataAndAttributes( sendData );
 
-        // save send request
-        iSmsSendReq = smsSendReq;
 OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_SENDMESSAGEL_1, "TSY: CMmSmsTsy::SendMessageL: Send request saved");
 
+#ifdef REQHANDLE_TIMER
+        SetTypeOfResponse( reqType, aTsyReqHandle );
+#else
+        iTsyReqHandleStore->SetTsyReqHandle( reqType, aTsyReqHandle );
+#endif // REQHANDLE_TIMER
+
+        TInt leaveCode( KErrNone );
         // send request to DOS
         // packed parameter: TSendSmsDataAndAttributes
-        if ( iSmsNoFdnCheckFlag == ESmsNoFdnCheckUsed )
-            {
-            ret = iMmPhone->MessageManager()->HandleRequestL( 
-                EMobileSmsMessagingSendMessageNoFdnCheck, &package );
-            }
-        if ( iSmsNoFdnCheckFlag == ESmsNoFdnCheckNotUsed )
-            {
-            ret = iMmPhone->MessageManager()->HandleRequestL( 
-                EMobileSmsMessagingSendMessage, &package );
-            }
+        TRAP(leaveCode, ret = iMmPhone->MessageManager()->HandleRequestL(sendData.iIpc, &package ););
 
-        if ( KErrNone == ret )
-            {  
-            if ( iSmsNoFdnCheckFlag == ESmsNoFdnCheckUsed )
-                {
-                //set request type
-                iReqHandleType = EMultimodeSmsSendMessageNoFdnCheck;    
-                }
-            if ( iSmsNoFdnCheckFlag == ESmsNoFdnCheckNotUsed )
-                {
-                //set request type
-                iReqHandleType = EMultimodeSmsSendMessage;    
-                }            
-            smsSendReq->IncreaseSendCounter();
-            }
-        else 
+        if ( (leaveCode != KErrNone) || (ret != KErrNone) )
             {
-            // Phonet returned error
-            delete smsSendReq;              // Delete object
+            iTsyReqHandleStore->ResetTsyReqHandle( reqType );
+            delete iSmsSendReq;              // Delete object
             iSmsSendReq = NULL; // Reset pointer
-            // Message construction failed or phonet sender returned error
-            ReqCompleted( aTsyReqHandle, ret );
             // reset pointer to client memory
             iSendMessageMsgAttrPckgPtr = NULL;
-            
             iSmsNoFdnCheckFlag = ESmsNoFdnCheckUnknown;
+            if (leaveCode != KErrNone)
+                {
+                ReqCompleted( aTsyReqHandle, leaveCode );
+                }
+            else
+                {
+                ReqCompleted( aTsyReqHandle, ret );
+                }
+            }
+        else
+            {
+            iSmsSendReq->IncreaseSendCounter();
             }
         }
 
@@ -1938,10 +1934,14 @@
         // reset req handle and complete request
         TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
                    EMultimodeSmsSendMessage );
-        ReqCompleted( reqHandle, extendedError );
-        // reset pointer to client memory
-        iSendMessageMsgAttrPckgPtr = NULL;
-        iSmsNoFdnCheckFlag = ESmsNoFdnCheckUnknown;
+
+        if ( EMultimodeSmsReqHandleUnknown < reqHandle ) 
+            {
+            ReqCompleted( reqHandle, extendedError );
+            // reset pointer to client memory
+            iSendMessageMsgAttrPckgPtr = NULL;
+            iSmsNoFdnCheckFlag = ESmsNoFdnCheckUnknown;
+            }
         }        
     else if ( ( KErrNone != aError ) && ( KErrTimedOut != aError ) 
         && ( KErrGsmSMSOperationNotAllowed != 
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmussdtsy.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmussdtsy.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -146,7 +146,9 @@
 
         if ( trapError != KErrNone )
             {
-            // Object cannot be created. 
+            // Object cannot be created.
+			// reset request handle to indicate the request is no longer ongoing
+            iTsyReqHandleStore->FindAndResetTsyReqHandle(aTsyReqHandle);
             ReqCompleted( aTsyReqHandle, trapError );
             }
         else if ( ret != KErrNone )
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmenstoretsy.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmenstoretsy.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -333,6 +333,8 @@
     if ( trapError != KErrNone )
         {
         // Complete with error if trap error
+		// Reset request handle to indicate the request is no longer ongoing
+        iTsyReqHandleStore->FindAndResetTsyReqHandle( aTsyReqHandle );
         ReqCompleted( aTsyReqHandle, trapError );
         }
     else if ( ret != KErrNone )
@@ -340,21 +342,19 @@
         // Complete with error if return value error
         ReqCompleted( aTsyReqHandle, ret );
         }
-
-    // Save request handle
-    if ( EMultimodeENStoreReqHandleUnknown != iReqHandleType )
+    else if ( EMultimodeENStoreReqHandleUnknown != iReqHandleType )
         {
+        // Save request handle
 #ifdef REQHANDLE_TIMER
         SetTypeOfResponse( iReqHandleType, aTsyReqHandle );
 #else
         iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, aTsyReqHandle );
 #endif
+        }
         // We've finished with this value now. Clear it so it doesn't leak
         //  up to any other instances of this method down the call stack
         iReqHandleType = EMultimodeENStoreReqHandleUnknown;
-        }
-
-    return KErrNone;
+        return KErrNone;
     }
 
 // ---------------------------------------------------------------------------
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmonstoretsy.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmonstoretsy.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -309,15 +309,15 @@
 
     if ( KErrNone != trapError )
         {
+		// Reset request handle to indicate the request is no longer ongoing
+        iTsyReqHandleStore->FindAndResetTsyReqHandle( aTsyReqHandle );
         ReqCompleted( aTsyReqHandle, trapError );
         }
     else if ( KErrNone != ret )
         {
         ReqCompleted( aTsyReqHandle, ret );
         }
-
-    // Save request handle
-    if ( EMultimodeONStoreReqHandleUnknown != iReqHandleType )
+    else if ( EMultimodeONStoreReqHandleUnknown != iReqHandleType )
         {
 #ifdef REQHANDLE_TIMER
         SetTypeOfResponse( iReqHandleType, aTsyReqHandle );
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmphonebookstoretsy.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmphonebookstoretsy.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -505,27 +505,27 @@
     TRAP( trapError, ret = DoExtFuncL( aTsyReqHandle, aIpc, aPackage ); );
 
     if ( KErrNone != trapError )
-        {
+        {        
+		// Reset request handle to indicate the request is no longer ongoing
+        iTsyReqHandleStore->FindAndResetTsyReqHandle( aTsyReqHandle );
         ReqCompleted( aTsyReqHandle, trapError );
         }
     else if ( KErrNone != ret )
         {
         ReqCompleted( aTsyReqHandle, ret );
         }
-
-    // Save request handle
-    if ( EMultimodePhoneBookStoreReqHandleUnknown != iReqHandleType )
+    else if ( EMultimodePhoneBookStoreReqHandleUnknown != iReqHandleType )
         {
+        // Save request handle
 #ifdef REQHANDLE_TIMER
         SetTypeOfResponse( iReqHandleType, aTsyReqHandle );
 #else
         iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, aTsyReqHandle );
 #endif
-        // We've finished with this value now. Clear it so it doesn't leak
-        //  up to any other instances of this method down the call stack
-        iReqHandleType = EMultimodePhoneBookStoreReqHandleUnknown;
         }
-
+    // We've finished with this value now. Clear it so it doesn't leak
+    //  up to any other instances of this method down the call stack
+    iReqHandleType = EMultimodePhoneBookStoreReqHandleUnknown;
     return KErrNone;
     }
 
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmcalltsy.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmcalltsy.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -343,26 +343,27 @@
         if ( trapError != KErrNone )
             {
             //error handling. Object cannot be created. 
+			//reset request handle to indicate the request is no longer ongoing
+            iTsyReqHandleStore->FindAndResetTsyReqHandle(aTsyReqHandle);
             ReqCompleted( aTsyReqHandle, trapError );
             }
         else if ( ret != KErrNone )
             {
             ReqCompleted( aTsyReqHandle, ret );
             }   
-        //save request handle
-        if ( EMultimodeCallReqHandleUnknown != iReqHandleType )
+        else if ( EMultimodeCallReqHandleUnknown != iReqHandleType )
             {
+            //save request handle
 #ifdef REQHANDLE_TIMER
             SetTypeOfResponse( iReqHandleType, aTsyReqHandle );
 #else
             iTsyReqHandleStore->SetTsyReqHandle(
                 iReqHandleType, aTsyReqHandle );
 #endif
-            // We've finished with this value now. Clear it so it doesn't leak
-            //  up to any other instances of this method down the call stack
-            iReqHandleType = EMultimodeCallReqHandleUnknown;
             }
-    
+        // We've finished with this value now. Clear it so it doesn't leak
+        //  up to any other instances of this method down the call stack
+        iReqHandleType = EMultimodeCallReqHandleUnknown;
         }
 
     return KErrNone;
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmconferencecalltsy.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmconferencecalltsy.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -197,7 +197,9 @@
     if ( trapError != KErrNone )
         {
         //error handling. Object cannot be created.
-        ReqCompleted( 0, trapError );
+		//reset request handle to indicate the request is no longer ongoing
+        iTsyReqHandleStore->FindAndResetTsyReqHandle(aTsyReqHandle);
+        ReqCompleted( aTsyReqHandle, trapError );
         }
     //if return value is not KErrNone
     else if ( ret != KErrNone )
@@ -205,20 +207,20 @@
         //Complete request with this error value
         ReqCompleted( aTsyReqHandle, ret );
         }
-
-    //save request handle
-    if ( EMultimodeConferenceCallReqHandleUnknown != iReqHandleType )
+    else if ( EMultimodeConferenceCallReqHandleUnknown != iReqHandleType )
         {
+        //save request handle
 #ifdef REQHANDLE_TIMER
         SetTypeOfResponse ( iReqHandleType, aTsyReqHandle );
 #else
         iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, aTsyReqHandle );
 #endif
-        // We've finished with this value now. Clear it so it doesn't leak
-        //  up to any other instances of this method down the call stack
-        iReqHandleType = EMultimodeConferenceCallReqHandleUnknown;
         }
-
+    
+    // We've finished with this value now. Clear it so it doesn't leak
+    //  up to any other instances of this method down the call stack
+    iReqHandleType = EMultimodeConferenceCallReqHandleUnknown;
+    
     return KErrNone;
 
     }
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmlinetsy.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmlinetsy.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -287,16 +287,17 @@
     if ( trapError != KErrNone )
         {
         // Object cannot be created.
+		// Reset request handle to indicate the request is no longer ongoing
+        iTsyReqHandleStore->FindAndResetTsyReqHandle( aTsyReqHandle );
         ReqCompleted( aTsyReqHandle, trapError );
         }
     else if ( ret != KErrNone )
         {
         ReqCompleted( aTsyReqHandle, ret );
         }
-    
-    //save request handle
-    if ( EMultimodeLineReqHandleUnknown != iReqHandleType )
+    else if ( EMultimodeLineReqHandleUnknown != iReqHandleType )
         {
+        //save request handle
         iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, aTsyReqHandle );
         }
 
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmphonetsy.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmphonetsy.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -1157,14 +1157,15 @@
 
         if ( trapError != KErrNone )
             {
+			//reset request handle to indicate the request is no longer ongoing
+            iTsyReqHandleStore->FindAndResetTsyReqHandle( aTsyReqHandle );
             ReqCompleted( aTsyReqHandle, trapError );
             }
         else if ( ret != KErrNone )
             {
             ReqCompleted( aTsyReqHandle, ret );
             }
-
-        if ( EMultimodePhoneReqHandleUnknown != iReqHandleType )
+        else if ( EMultimodePhoneReqHandleUnknown != iReqHandleType )
             {
 #ifdef REQHANDLE_TIMER
             SetTypeOfResponse( iReqHandleType, aTsyReqHandle );
@@ -1172,10 +1173,10 @@
             iTsyReqHandleStore->SetTsyReqHandle( 
                 iReqHandleType, aTsyReqHandle );
 #endif //REQHANDLE_TIMER
-            // We've finished with this value now. Clear it so it doesn't leak
-            //  up to any other instances of this method down the call stack
-            iReqHandleType = EMultimodePhoneReqHandleUnknown;
             }
+        // We've finished with this value now. Clear it so it doesn't leak
+        //  up to any other instances of this method down the call stack
+        iReqHandleType = EMultimodePhoneReqHandleUnknown;
         }
 
     return KErrNone;
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmutility/CMmTsyBase.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmutility/CMmTsyBase.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -291,5 +291,32 @@
 
 #endif
 
+// ---------------------------------------------------------------------------
+// CMmTsyBase::ResetReqHandle
+// Resets the request handle in the right req handle store
+// (other items were commented in a header).
+// ---------------------------------------------------------------------------
+//
+TBool CMmTsyBase::ResetReqHandle(const TTsyReqHandle aTsyReqHandle, const TInt aIpc)
+    {
+    TInt max = GetMaxNumberOfSubsystems();
+    CMmSubTsyBase** subTsyPtr = GetSubsystemArrayPtr();
+    TBool ret = EFalse;
+    
+    for ( TInt i = 0 ; max > i; i++ )
+        {
+         //check which custom object handles this IPC
+        if ( ( NULL != subTsyPtr[i] ) 
+        && ( EFalse != subTsyPtr[i]->SupportingIPC( aIpc ) ) )
+               {
+               //call reset handle method of the right custom object
+               ret = subTsyPtr[i]->ResetReqHandle( aTsyReqHandle, aIpc );
+               i = max;
+               }
+        }
+    return ret;
+    }
+
+
 //  End of File
 
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmutility/cmmtsyreqhandlestore.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmutility/cmmtsyreqhandlestore.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -220,6 +220,27 @@
     return ret;
 }
 
+// ---------------------------------------------------------------------------
+// CMmTsyReqHandleStore::FindAndResetTsyReqHandle
+// Finds and resets all TSY req handle of a given value.
+// (other items were commented in a header).
+// ---------------------------------------------------------------------------
+//
+TBool CMmTsyReqHandleStore::FindAndResetTsyReqHandle( const TTsyReqHandle aTsyReqHandle )
+    {
+        TInt ret = EFalse;  
+        for( TInt i = 0; i < iNumOfRequests  ; i++ )
+            {
+            if( *( iReqHandles + i ) == aTsyReqHandle )
+                {
+                    //reset req handle
+					ResetTsyReqHandle(i);
+                    ret = ETrue;
+                }
+            }
+        return ret;
+    }
+
 #ifdef REQHANDLE_TIMER
 
 // ---------------------------------------------------------------------------
--- a/telephonyserverplugins/common_tsy/customapi/bwins/CUSTOMAPIU.def	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/customapi/bwins/CUSTOMAPIU.def	Tue Sep 14 17:55:14 2010 +0100
@@ -4,8 +4,8 @@
 	??0TGprsInformation@RMmCustomAPI@@QAE@XZ @ 3 NONAME ; public: __thiscall RMmCustomAPI::TGprsInformation::TGprsInformation(void)
 	??0TLifeTimeData@RMmCustomAPI@@QAE@XZ @ 4 NONAME ; public: __thiscall RMmCustomAPI::TLifeTimeData::TLifeTimeData(void)
 	??0TSimFileInfo@RMmCustomAPI@@QAE@XZ @ 5 NONAME ; public: __thiscall RMmCustomAPI::TSimFileInfo::TSimFileInfo(void)
-	?ActivateSimLock@RMmCustomAPI@@QBEHABV?$TBuf@$0P@@@W4TLockNumber@1@@Z @ 6 NONAME ; public: int __thiscall RMmCustomAPI::ActivateSimLock(class TBuf<15> const &,enum RMmCustomAPI::TLockNumber)const 
-	?ActivateSimLock@RMmCustomAPI@@QBEXAAVTRequestStatus@@ABV?$TBuf@$0P@@@W4TLockNumber@1@@Z @ 7 NONAME ; public: void __thiscall RMmCustomAPI::ActivateSimLock(class TRequestStatus &,class TBuf<15> const &,enum RMmCustomAPI::TLockNumber)const 
+	?ActivateSimLock@RMmCustomAPI@@QBEHABV?$TBuf@$0BO@@@W4TLockNumber@1@@Z @ 6 NONAME ; int RMmCustomAPI::ActivateSimLock(class TBuf<30> const &, enum RMmCustomAPI::TLockNumber) const 
+	?ActivateSimLock@RMmCustomAPI@@QBEXAAVTRequestStatus@@ABV?$TBuf@$0BO@@@W4TLockNumber@1@@Z @ 7 NONAME ; void RMmCustomAPI::ActivateSimLock(class TRequestStatus &, class TBuf<30> const &, enum RMmCustomAPI::TLockNumber) const 
 	?CallOrigin@RMmCustomAPI@@QBEHAAV?$TBuf@$0IA@@@AAW4TCallOrigin@1@@Z @ 8 NONAME ; public: int __thiscall RMmCustomAPI::CallOrigin(class TBuf<128> &,enum RMmCustomAPI::TCallOrigin &)const 
 	?CancelUssdSession@RMmCustomAPI@@QAEXAAVTRequestStatus@@@Z @ 9 NONAME ; public: void __thiscall RMmCustomAPI::CancelUssdSession(class TRequestStatus &)
 	?CancelUssdSession@RMmCustomAPI@@QBEHXZ @ 10 NONAME ; public: int __thiscall RMmCustomAPI::CancelUssdSession(void)const 
@@ -21,8 +21,8 @@
 	?ClearCallBlackList@RMmCustomAPI@@QBEHXZ @ 20 NONAME ; public: int __thiscall RMmCustomAPI::ClearCallBlackList(void)const 
 	?Close@RMmCustomAPI@@QAEXXZ @ 21 NONAME ; public: void __thiscall RMmCustomAPI::Close(void)
 	?ConstructL@RMmCustomAPI@@IAEXXZ @ 22 NONAME ; protected: void __thiscall RMmCustomAPI::ConstructL(void)
-	?DeActivateSimLock@RMmCustomAPI@@QBEHABV?$TBuf@$0P@@@W4TLockNumber@1@@Z @ 23 NONAME ; public: int __thiscall RMmCustomAPI::DeActivateSimLock(class TBuf<15> const &,enum RMmCustomAPI::TLockNumber)const 
-	?DeActivateSimLock@RMmCustomAPI@@QBEXAAVTRequestStatus@@ABV?$TBuf@$0P@@@W4TLockNumber@1@@Z @ 24 NONAME ; public: void __thiscall RMmCustomAPI::DeActivateSimLock(class TRequestStatus &,class TBuf<15> const &,enum RMmCustomAPI::TLockNumber)const 
+	?DeActivateSimLock@RMmCustomAPI@@QBEHABV?$TBuf@$0BO@@@W4TLockNumber@1@@Z @ 23 NONAME ; int RMmCustomAPI::DeActivateSimLock(class TBuf<30> const &, enum RMmCustomAPI::TLockNumber) const 
+	?DeActivateSimLock@RMmCustomAPI@@QBEXAAVTRequestStatus@@ABV?$TBuf@$0BO@@@W4TLockNumber@1@@Z @ 24 NONAME ; void RMmCustomAPI::DeActivateSimLock(class TRequestStatus &, class TBuf<30> const &, enum RMmCustomAPI::TLockNumber) const 
 	?DeleteSimCbTopic@RMmCustomAPI@@QAEHABI@Z @ 25 NONAME ; public: int __thiscall RMmCustomAPI::DeleteSimCbTopic(unsigned int const &)
 	?DeleteSimCbTopic@RMmCustomAPI@@QAEXAAVTRequestStatus@@ABI@Z @ 26 NONAME ; public: void __thiscall RMmCustomAPI::DeleteSimCbTopic(class TRequestStatus &,unsigned int const &)
 	?Destruct@RMmCustomAPI@@IAEXXZ @ 27 NONAME ; protected: void __thiscall RMmCustomAPI::Destruct(void)
@@ -122,10 +122,11 @@
 	?SetSystemNetworkBand@RMmCustomAPI@@QAEHW4TBandSelection@1@W4TNetworkModeCaps@1@@Z @ 121 NONAME ; int RMmCustomAPI::SetSystemNetworkBand(enum RMmCustomAPI::TBandSelection, enum RMmCustomAPI::TNetworkModeCaps)
 	?SetSystemNetworkBand@RMmCustomAPI@@QAEXAAVTRequestStatus@@W4TBandSelection@1@W4TNetworkModeCaps@1@@Z @ 122 NONAME ; void RMmCustomAPI::SetSystemNetworkBand(class TRequestStatus &, enum RMmCustomAPI::TBandSelection, enum RMmCustomAPI::TNetworkModeCaps)
 	?GetUSIMServiceSupport@RMmCustomAPI@@QBEXAAVTRequestStatus@@AAUTAppSupport@1@@Z @ 123 NONAME ; void RMmCustomAPI::GetUSIMServiceSupport(class TRequestStatus &, struct RMmCustomAPI::TAppSupport &) const
-	??0TSimAuthenticationGbaBootstrap@RMmCustomAPI@@QAE@XZ @ 124  NONAME ; RMmCustomAPI::TSimAuthenticationGbaBootstrap::TSimAuthenticationGbaBootstrap(void)
-	??0TSimAuthenticationGbaBootstrapUpdate@RMmCustomAPI@@QAE@XZ @ 125  NONAME ; RMmCustomAPI::TSimAuthenticationGbaBootstrapUpdate::TSimAuthenticationGbaBootstrapUpdate(void)
-	??0TSimAuthenticationGbaNafDerivation@RMmCustomAPI@@QAE@XZ @ 126  NONAME ; RMmCustomAPI::TSimAuthenticationGbaNafDerivation::TSimAuthenticationGbaNafDerivation(void)
-	??0TSimAuthenticationMgvMskDeletion@RMmCustomAPI@@QAE@XZ @ 127  NONAME ; RMmCustomAPI::TSimAuthenticationMgvMskDeletion::TSimAuthenticationMgvMskDeletion(void)
-	??0TSimAuthenticationMgvMskUpdate@RMmCustomAPI@@QAE@XZ @ 128  NONAME ; RMmCustomAPI::TSimAuthenticationMgvMskUpdate::TSimAuthenticationMgvMskUpdate(void)
-	??0TSimAuthenticationMgvMtkGeneration@RMmCustomAPI@@QAE@XZ @ 129  NONAME ; RMmCustomAPI::TSimAuthenticationMgvMtkGeneration::TSimAuthenticationMgvMtkGeneration(void)
+	??0TSimAuthenticationGbaBootstrap@RMmCustomAPI@@QAE@XZ @ 124 NONAME ; RMmCustomAPI::TSimAuthenticationGbaBootstrap::TSimAuthenticationGbaBootstrap(void)
+	??0TSimAuthenticationGbaBootstrapUpdate@RMmCustomAPI@@QAE@XZ @ 125 NONAME ; RMmCustomAPI::TSimAuthenticationGbaBootstrapUpdate::TSimAuthenticationGbaBootstrapUpdate(void)
+	??0TSimAuthenticationGbaNafDerivation@RMmCustomAPI@@QAE@XZ @ 126 NONAME ; RMmCustomAPI::TSimAuthenticationGbaNafDerivation::TSimAuthenticationGbaNafDerivation(void)
+	??0TSimAuthenticationMgvMskDeletion@RMmCustomAPI@@QAE@XZ @ 127 NONAME ; RMmCustomAPI::TSimAuthenticationMgvMskDeletion::TSimAuthenticationMgvMskDeletion(void)
+	??0TSimAuthenticationMgvMskUpdate@RMmCustomAPI@@QAE@XZ @ 128 NONAME ; RMmCustomAPI::TSimAuthenticationMgvMskUpdate::TSimAuthenticationMgvMskUpdate(void)
+	??0TSimAuthenticationMgvMtkGeneration@RMmCustomAPI@@QAE@XZ @ 129 NONAME ; RMmCustomAPI::TSimAuthenticationMgvMtkGeneration::TSimAuthenticationMgvMtkGeneration(void)
 	?NotifyRemoteAlertingToneStatusChange@RMmCustomAPI@@QAEXAAVTRequestStatus@@AAW4TRemoteAlertingToneStatus@1@@Z @ 130 NONAME ; void RMmCustomAPI::NotifyRemoteAlertingToneStatusChange(class TRequestStatus &, enum RMmCustomAPI::TRemoteAlertingToneStatus &)
+	
--- a/telephonyserverplugins/common_tsy/customapi/eabi/customapiU.def	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/customapi/eabi/customapiU.def	Tue Sep 14 17:55:14 2010 +0100
@@ -65,13 +65,13 @@
 	_ZNK12RMmCustomAPI13SetAlsBlockedENS_12TSetAlsBlockE @ 64 NONAME
 	_ZNK12RMmCustomAPI13TerminateCallER4TBufILi128EE @ 65 NONAME
 	_ZNK12RMmCustomAPI14ResetNetServerEv @ 66 NONAME
-	_ZNK12RMmCustomAPI15ActivateSimLockER14TRequestStatusRK4TBufILi15EENS_11TLockNumberE @ 67 NONAME
-	_ZNK12RMmCustomAPI15ActivateSimLockERK4TBufILi15EENS_11TLockNumberE @ 68 NONAME
+	_ZNK12RMmCustomAPI15ActivateSimLockER14TRequestStatusRK4TBufILi30EENS_11TLockNumberE @ 67 NONAME
+	_ZNK12RMmCustomAPI15ActivateSimLockERK4TBufILi30EENS_11TLockNumberE @ 68 NONAME
 	_ZNK12RMmCustomAPI16DisablePhoneLockER14TRequestStatusR4TBufILi10EE @ 69 NONAME
 	_ZNK12RMmCustomAPI17CancelUssdSessionEv @ 70 NONAME
 	_ZNK12RMmCustomAPI17CheckAlsPpSupportERNS_11TAlsSupportE @ 71 NONAME
-	_ZNK12RMmCustomAPI17DeActivateSimLockER14TRequestStatusRK4TBufILi15EENS_11TLockNumberE @ 72 NONAME
-	_ZNK12RMmCustomAPI17DeActivateSimLockERK4TBufILi15EENS_11TLockNumberE @ 73 NONAME
+	_ZNK12RMmCustomAPI17DeActivateSimLockER14TRequestStatusRK4TBufILi30EENS_11TLockNumberE @ 72 NONAME
+	_ZNK12RMmCustomAPI17DeActivateSimLockERK4TBufILi30EENS_11TLockNumberE @ 73 NONAME
 	_ZNK12RMmCustomAPI17GetPndCacheStatusER14TRequestStatusRNS_15TPndCacheStatusERK4TBufILi128EE @ 74 NONAME
 	_ZNK12RMmCustomAPI18ClearCallBlackListEv @ 75 NONAME
 	_ZNK12RMmCustomAPI18GetAirTimeDurationER20TTimeIntervalSeconds @ 76 NONAME
@@ -113,15 +113,15 @@
 	_ZNK12RMmCustomAPI23SetSimMessageStatusReadER5TTimeRi @ 112 NONAME
 	_ZNK12RMmCustomAPI31WriteViagHomeZoneUHZIUESettingsER14TRequestStatusRNS_19TViagUHZIUESettingsE @ 113 NONAME
 	_ZNK12RMmCustomAPI31WriteViagHomeZoneUHZIUESettingsERNS_19TViagUHZIUESettingsE @ 114 NONAME
-	_ZTI18CMmCustomPtrHolder @ 115 NONAME DATA 12 ; #<TI>#
-	_ZTV18CMmCustomPtrHolder @ 116 NONAME DATA 20 ; #<VT>#
+	_ZTI18CMmCustomPtrHolder @ 115 NONAME ; #<TI>#
+	_ZTV18CMmCustomPtrHolder @ 116 NONAME ; #<VT>#
 	_ZNK12RMmCustomAPI11SetAlwaysOnER14TRequestStatusRNS_16TSetAlwaysOnModeE @ 117 NONAME
 	_ZN12RMmCustomAPI14NotifyRauEventER14TRequestStatusRNS_15TRauEventStatusE @ 118 NONAME
 	_ZN12RMmCustomAPI15ReadHSxPAStatusER14TRequestStatusRNS_12THSxPAStatusE @ 119 NONAME
 	_ZN12RMmCustomAPI16WriteHSxPAStatusER14TRequestStatusRNS_12THSxPAStatusE @ 120 NONAME
 	_ZN12RMmCustomAPI17NotifyHSxPAStatusER14TRequestStatusRNS_12THSxPAStatusE @ 121 NONAME
 	_ZNK12RMmCustomAPI35GetIccCallForwardingIndicatorStatusER14TRequestStatusR5TDes8 @ 122 NONAME
- 	_ZN12RMmCustomAPI35NotifyIccCallForwardingStatusChangeER14TRequestStatusR5TDes8 @ 123 NONAME
+	_ZN12RMmCustomAPI35NotifyIccCallForwardingStatusChangeER14TRequestStatusR5TDes8 @ 123 NONAME
 	_ZN12RMmCustomAPI13TCFIndicatorsC1Ev @ 124 NONAME
 	_ZN12RMmCustomAPI13TCFIndicatorsC2Ev @ 125 NONAME
 	_ZNK12RMmCustomAPI11GetCellInfoER14TRequestStatusR5TDes8 @ 126 NONAME
@@ -146,3 +146,4 @@
 	_ZN12RMmCustomAPI36TSimAuthenticationGbaBootstrapUpdateC2Ev @ 145 NONAME
 	_ZNK12RMmCustomAPI21GetUSIMServiceSupportER14TRequestStatusRNS_11TAppSupportE @ 146 NONAME
 	_ZN12RMmCustomAPI36NotifyRemoteAlertingToneStatusChangeER14TRequestStatusRNS_25TRemoteAlertingToneStatusE @ 147 NONAME
+
--- a/telephonyserverplugins/common_tsy/customapi/inc/RMmCustomAPI.h	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/customapi/inc/RMmCustomAPI.h	Tue Sep 14 17:55:14 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -38,7 +38,7 @@
 
 _LIT(KCustomAPIName,"CUSTOMAPI");
 _LIT(KTerminateAllCalls,"ALL_CALLS");
-const TInt KSimLockMaxPasswordSize = 15;
+const TInt KSimLockMaxPasswordSize = 30;
 const TInt KSimCbTopicNameLength = 20;
 const TInt KSubAddressSize = 20;
 const TInt KBearerCapabilitySize = 14;
--- a/telephonyserverplugins/common_tsy/test/component/group/te_ctsy_component.mmp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/test/component/group/te_ctsy_component.mmp	Tue Sep 14 17:55:14 2010 +0100
@@ -161,4 +161,8 @@
 
 EPOCSTACKSIZE 0x14000
 
+EPOCHEAPSIZE    0x10000 0x400000   //4M maximize needed for TEF3.0 switch over
+//default without this would be >4k <1M for heap
 
+
+
--- a/telephonyserverplugins/common_tsy/test/component/inc/cctsyfixeddiallingfu.h	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/test/component/inc/cctsyfixeddiallingfu.h	Tue Sep 14 17:55:14 2010 +0100
@@ -38,6 +38,7 @@
 	void TestDialNoFdnCheck0001L();
 	void TestDialNoFdnCheck0001bL();
 	void TestDialNoFdnCheck0001cL();
+	void TestDialNoFdnCheck0001dL();
 	void TestDialNoFdnCheck0002L();
 	void TestDialNoFdnCheck0004L();
 	void TestDialNoFdnCheck0005L();
--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/eabi/mocklicenseetsyu.def	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/eabi/mocklicenseetsyu.def	Tue Sep 14 17:55:14 2010 +0100
@@ -14,7 +14,7 @@
 	_ZTI14TMockLtsyData1I31TMmMbmsMonitorServiceListParamsE @ 13 NONAME
 	_ZTI14TMockLtsyData1I4TBufILi10EEE @ 14 NONAME
 	_ZTI14TMockLtsyData1I4TBufILi128EEE @ 15 NONAME
-	_ZTI14TMockLtsyData1I4TBufILi15EEE @ 16 NONAME
+	_ZTI14TMockLtsyData1I4TBufILi30EEE @ 16 NONAME
 	_ZTI14TMockLtsyData1I4TBufILi16EEE @ 17 NONAME
 	_ZTI14TMockLtsyData1I4TBufILi32EEE @ 18 NONAME
 	_ZTI14TMockLtsyData1I4TBufILi6EEE @ 19 NONAME
@@ -125,7 +125,7 @@
 	_ZTI14TMockLtsyData2I14TContextParamsN10RPacketQoS19TQoSR99_R4RequestedEE @ 124 NONAME
 	_ZTI14TMockLtsyData2I21TContextConfigurationP13CArrayPtrFlatIN14RPacketContext24CTFTMediaAuthorizationV3EEE @ 125 NONAME
 	_ZTI14TMockLtsyData2I4TBufILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 126 NONAME
-	_ZTI14TMockLtsyData2I4TBufILi15EEN12RMmCustomAPI11TLockNumberEE @ 127 NONAME
+	_ZTI14TMockLtsyData2I4TBufILi30EEN12RMmCustomAPI11TLockNumberEE @ 127 NONAME
 	_ZTI14TMockLtsyData2I4TBufILi16EE12TContextMiscE @ 128 NONAME
 	_ZTI14TMockLtsyData2I4TBufILi16EE30TMmMbmsActiveServiceListParamsE @ 129 NONAME
 	_ZTI14TMockLtsyData2I4TBufILi16EE5TBuf8ILi1EEE @ 130 NONAME
@@ -197,7 +197,7 @@
 	_ZTI17TMockLtsyData1BufI31TMmMbmsMonitorServiceListParamsE @ 196 NONAME
 	_ZTI17TMockLtsyData1BufI4TBufILi10EEE @ 197 NONAME
 	_ZTI17TMockLtsyData1BufI4TBufILi128EEE @ 198 NONAME
-	_ZTI17TMockLtsyData1BufI4TBufILi15EEE @ 199 NONAME
+	_ZTI17TMockLtsyData1BufI4TBufILi30EEE @ 199 NONAME
 	_ZTI17TMockLtsyData1BufI4TBufILi16EEE @ 200 NONAME
 	_ZTI17TMockLtsyData1BufI4TBufILi32EEE @ 201 NONAME
 	_ZTI17TMockLtsyData1BufI4TBufILi6EEE @ 202 NONAME
@@ -308,7 +308,7 @@
 	_ZTI17TMockLtsyData2BufI14TContextParamsN10RPacketQoS19TQoSR99_R4RequestedEE @ 307 NONAME
 	_ZTI17TMockLtsyData2BufI21TContextConfigurationP13CArrayPtrFlatIN14RPacketContext24CTFTMediaAuthorizationV3EEE @ 308 NONAME
 	_ZTI17TMockLtsyData2BufI4TBufILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 309 NONAME
-	_ZTI17TMockLtsyData2BufI4TBufILi15EEN12RMmCustomAPI11TLockNumberEE @ 310 NONAME
+	_ZTI17TMockLtsyData2BufI4TBufILi30EEN12RMmCustomAPI11TLockNumberEE @ 310 NONAME
 	_ZTI17TMockLtsyData2BufI4TBufILi16EE12TContextMiscE @ 311 NONAME
 	_ZTI17TMockLtsyData2BufI4TBufILi16EE30TMmMbmsActiveServiceListParamsE @ 312 NONAME
 	_ZTI17TMockLtsyData2BufI4TBufILi16EE5TBuf8ILi1EEE @ 313 NONAME
@@ -480,7 +480,7 @@
 	_ZTV14TMockLtsyData1I31TMmMbmsMonitorServiceListParamsE @ 479 NONAME
 	_ZTV14TMockLtsyData1I4TBufILi10EEE @ 480 NONAME
 	_ZTV14TMockLtsyData1I4TBufILi128EEE @ 481 NONAME
-	_ZTV14TMockLtsyData1I4TBufILi15EEE @ 482 NONAME
+	_ZTV14TMockLtsyData1I4TBufILi30EEE @ 482 NONAME
 	_ZTV14TMockLtsyData1I4TBufILi16EEE @ 483 NONAME
 	_ZTV14TMockLtsyData1I4TBufILi32EEE @ 484 NONAME
 	_ZTV14TMockLtsyData1I4TBufILi6EEE @ 485 NONAME
@@ -591,7 +591,7 @@
 	_ZTV14TMockLtsyData2I14TContextParamsN10RPacketQoS19TQoSR99_R4RequestedEE @ 590 NONAME
 	_ZTV14TMockLtsyData2I21TContextConfigurationP13CArrayPtrFlatIN14RPacketContext24CTFTMediaAuthorizationV3EEE @ 591 NONAME
 	_ZTV14TMockLtsyData2I4TBufILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 592 NONAME
-	_ZTV14TMockLtsyData2I4TBufILi15EEN12RMmCustomAPI11TLockNumberEE @ 593 NONAME
+	_ZTV14TMockLtsyData2I4TBufILi30EEN12RMmCustomAPI11TLockNumberEE @ 593 NONAME
 	_ZTV14TMockLtsyData2I4TBufILi16EE12TContextMiscE @ 594 NONAME
 	_ZTV14TMockLtsyData2I4TBufILi16EE30TMmMbmsActiveServiceListParamsE @ 595 NONAME
 	_ZTV14TMockLtsyData2I4TBufILi16EE5TBuf8ILi1EEE @ 596 NONAME
@@ -663,7 +663,7 @@
 	_ZTV17TMockLtsyData1BufI31TMmMbmsMonitorServiceListParamsE @ 662 NONAME
 	_ZTV17TMockLtsyData1BufI4TBufILi10EEE @ 663 NONAME
 	_ZTV17TMockLtsyData1BufI4TBufILi128EEE @ 664 NONAME
-	_ZTV17TMockLtsyData1BufI4TBufILi15EEE @ 665 NONAME
+	_ZTV17TMockLtsyData1BufI4TBufILi30EEE @ 665 NONAME
 	_ZTV17TMockLtsyData1BufI4TBufILi16EEE @ 666 NONAME
 	_ZTV17TMockLtsyData1BufI4TBufILi32EEE @ 667 NONAME
 	_ZTV17TMockLtsyData1BufI4TBufILi6EEE @ 668 NONAME
@@ -774,7 +774,7 @@
 	_ZTV17TMockLtsyData2BufI14TContextParamsN10RPacketQoS19TQoSR99_R4RequestedEE @ 773 NONAME
 	_ZTV17TMockLtsyData2BufI21TContextConfigurationP13CArrayPtrFlatIN14RPacketContext24CTFTMediaAuthorizationV3EEE @ 774 NONAME
 	_ZTV17TMockLtsyData2BufI4TBufILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 775 NONAME
-	_ZTV17TMockLtsyData2BufI4TBufILi15EEN12RMmCustomAPI11TLockNumberEE @ 776 NONAME
+	_ZTV17TMockLtsyData2BufI4TBufILi30EEN12RMmCustomAPI11TLockNumberEE @ 776 NONAME
 	_ZTV17TMockLtsyData2BufI4TBufILi16EE12TContextMiscE @ 777 NONAME
 	_ZTV17TMockLtsyData2BufI4TBufILi16EE30TMmMbmsActiveServiceListParamsE @ 778 NONAME
 	_ZTV17TMockLtsyData2BufI4TBufILi16EE5TBuf8ILi1EEE @ 779 NONAME
--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/bwins/mockltsydllu.def	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/bwins/mockltsydllu.def	Tue Sep 14 17:55:14 2010 +0100
@@ -46,7 +46,7 @@
 	?DeserialiseL@?$TSerializer@UTContextConfiguration@@@@SAXABVTDesC8@@AAUTContextConfiguration@@@Z @ 45 NONAME ; void TSerializer<struct TContextConfiguration>::DeserialiseL(class TDesC8 const &, struct TContextConfiguration &)
 	??0TMockLtsyContextData0@@QAE@XZ @ 46 NONAME ; TMockLtsyContextData0::TMockLtsyContextData0(void)
 	?SerialiseL@TMockLtsyPacketQoSData0@@QBEXAAVRBuf8@@@Z @ 47 NONAME ; void TMockLtsyPacketQoSData0::SerialiseL(class RBuf8 &) const
-	?IsEqual@?$TComparator@V?$TBuf@$0P@@@@@SAHABV?$TBuf@$0P@@@0@Z @ 48 NONAME ; int TComparator<class TBuf<15> >::IsEqual(class TBuf<15> const &, class TBuf<15> const &)
+	?IsEqual@?$TComparator@V?$TBuf@$0BO@@@@@SAHABV?$TBuf@$0BO@@@0@Z @ 48 NONAME ; int TComparator<class TBuf<30> >::IsEqual(class TBuf<30> const &, class TBuf<30> const &)
 	?SerialiseL@?$TSerializer@UTMmMbmsActiveServiceListParams@@@@SAXABUTMmMbmsActiveServiceListParams@@AAVRBuf8@@@Z @ 49 NONAME ; void TSerializer<struct TMmMbmsActiveServiceListParams>::SerialiseL(struct TMmMbmsActiveServiceListParams const &, class RBuf8 &)
 	?IsEqual@?$TComparator@VTMobileUssdAttributesV1@RMobileUssdMessaging@@@@SAHABVTMobileUssdAttributesV1@RMobileUssdMessaging@@0@Z @ 50 NONAME ; int TComparator<class RMobileUssdMessaging::TMobileUssdAttributesV1>::IsEqual(class RMobileUssdMessaging::TMobileUssdAttributesV1 const &, class RMobileUssdMessaging::TMobileUssdAttributesV1 const &)
 	?InternalizeL@TPacketQoSR5Negotiated@@QAEXAAVRReadStream@@@Z @ 51 NONAME ; void TPacketQoSR5Negotiated::InternalizeL(class RReadStream &)
@@ -183,4 +183,4 @@
 	?IsEqual@?$TComparator@VTApduParameters@RMmCustomAPI@@@@SAHABVTApduParameters@RMmCustomAPI@@0@Z @ 182 NONAME ; int TComparator<class RMmCustomAPI::TApduParameters>::IsEqual(class RMmCustomAPI::TApduParameters const &, class RMmCustomAPI::TApduParameters const &)
 	?IsEqual@?$TComparator@VTSimFileInfo@RMmCustomAPI@@@@SAHABVTSimFileInfo@RMmCustomAPI@@0@Z @ 183 NONAME ; int TComparator<class RMmCustomAPI::TSimFileInfo>::IsEqual(class RMmCustomAPI::TSimFileInfo const &, class RMmCustomAPI::TSimFileInfo const &)
 	?IsEqual@?$TComparator@VTMobileDataCallParamsV8@RMobileCall@@@@SAHABVTMobileDataCallParamsV8@RMobileCall@@0@Z @ 184 NONAME ; int TComparator<class RMobileCall::TMobileDataCallParamsV8>::IsEqual(class RMobileCall::TMobileDataCallParamsV8 const &, class RMobileCall::TMobileDataCallParamsV8 const &)
-
+	
--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/eabi/mockltsydllu.def	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/eabi/mockltsydllu.def	Tue Sep 14 17:55:14 2010 +0100
@@ -141,7 +141,7 @@
 	_ZN12TConstructorI20CMobilePhoneSmspListE10ConstructLERPS0_ @ 140 NONAME
 	_ZN12TConstructorIN12RMobilePhone14TMultimodeTypeEE10ConstructLERPS1_ @ 141 NONAME
 	_ZN11TComparatorI4TBufILi10EEE7IsEqualERKS1_S4_ @ 142 NONAME
-	_ZN11TComparatorI4TBufILi15EEE7IsEqualERKS1_S4_ @ 143 NONAME
+	_ZN11TComparatorI4TBufILi30EEE7IsEqualERKS1_S4_ @ 143 NONAME
 	_ZN11TComparatorIN12RMmCustomAPI11TMmCellInfoEE7IsEqualERKS1_S4_ @ 144 NONAME
 	_ZN11TComparatorIN12RMmCustomAPI18TViagCacheRecordIdEE7IsEqualERKS1_S4_ @ 145 NONAME
 	_ZN11TComparatorIN12RMmCustomAPI20TEmerNumberCheckModeEE7IsEqualERKS1_S4_ @ 146 NONAME
--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_fixeddialling_individual.script	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_fixeddialling_individual.script	Tue Sep 14 17:55:14 2010 +0100
@@ -41,6 +41,17 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyFixedDiallingFU.TestDialNoFdnCheck0001cL
 END_TESTCASE BA-CTSY-FXD-CDNFC-0001c
 
+START_TESTCASE BA-CTSY-FXD-CDNFC-0001d
+//!@SYMTestCaseID BA-CTSY-FXD-CDNFC-0001d
+//!@SYMComponent telephony_ctsy
+@SYMTestCaseDesc est support in CTSY for RMobileCall::DialNoFdnCheck for voice calls with extended parameters (RMobileCall::TCallParamsV7)
+//!@SYMTestPriority High
+//!@SYMTestActions Invokes RMobileCall::DialNoFdnCheck for voice calls
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyFixedDiallingFU.TestDialNoFdnCheck0001dL
+END_TESTCASE BA-CTSY-FXD-CDNFC-0001d
+
 START_TESTCASE BA-CTSY-FXD-CDNFC-0002
 //!@SYMTestCaseID BA-CTSY-FXD-CDNFC-0002
 //!@SYMComponent telephony_ctsy
--- a/telephonyserverplugins/common_tsy/test/component/src/cctsycallcontrolfu.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/test/component/src/cctsycallcontrolfu.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -2071,6 +2071,11 @@
     callParams0.iInterval = callParams.iInterval;
     callParams0.iWaitForDialTone = callParams.iWaitForDialTone; 
     RCall::TCallParamsPckg   pckgCallParams0(callParams0);
+    // We should expect the appropriate Alpha ID and Icon ID
+    callInfo.iValid |= (RMobileCall::KCallAlphaId | RMobileCall::KCallIconId);    
+    callInfo.iAlphaId.Copy(_L("Alpha Id"));
+    callInfo.iIconId.iQualifier = RMobileCall::ESelfExplanatory;
+    callInfo.iIconId.iIdentifier = 0x0A;
 
     expectData.Close();
     TMockLtsyCallData2< RMobileCall::TMobileCallParamsV7, RMobileCall::TMobileCallInfoV8 >
--- a/telephonyserverplugins/common_tsy/test/component/src/cctsycustomipcfu.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/test/component/src/cctsycustomipcfu.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -749,7 +749,7 @@
  	//-------------------------------------------------------------------------
 	// Test cancelling of RMmCustomAPI::ActivateSimLock
  	//-------------------------------------------------------------------------
- 	RMmCustomAPI::TSimLockPassword password(_L("changeme"));
+ 	RMmCustomAPI::TSimLockPassword password(_L("changemechangemechangemechange"));
 	RMmCustomAPI::TLockNumber lockNumber(RMmCustomAPI::EImsi);	
 	
 	// data for ExpectL
@@ -806,7 +806,7 @@
 	// Test A: Test passing wrong parameters to
 	// RMmCustomAPI::ActivateSimLock
  	//-------------------------------------------------------------------------
-	RMmCustomAPI::TSimLockPassword password(_L("changeme"));
+	RMmCustomAPI::TSimLockPassword password(_L("changemechangemechangemechange"));
 	RMmCustomAPI::TLockNumber lockNumber((RMmCustomAPI::TLockNumber) 0); 	
 	  
     customAPI.ActivateSimLock(requestStatus, password, lockNumber);
@@ -863,7 +863,7 @@
 	// Test A: Test multiple clients requesting RMmCustomAPI::ActivateSimLock
  	//-------------------------------------------------------------------------	
 	// data for the first request
-	RMmCustomAPI::TSimLockPassword password(_L("changeme"));
+	RMmCustomAPI::TSimLockPassword password(_L("changemechangemechangemechange"));
 	RMmCustomAPI::TLockNumber lockNumber(RMmCustomAPI::EOperator_Gid1);	
 	
 	// data for the second request
@@ -924,7 +924,7 @@
 	//-------------------------------------------------------------------------
 	// Test A: Test timeout of RMmCustomAPI::ActivateSimLock
  	//-------------------------------------------------------------------------
- 	RMmCustomAPI::TSimLockPassword password(_L("changeme"));
+ 	RMmCustomAPI::TSimLockPassword password(_L("changemechangemechangemechange"));
 	RMmCustomAPI::TLockNumber lockNumber(RMmCustomAPI::EOperator_Gid2);	
 	
 	// data for ExpectL
@@ -974,7 +974,7 @@
  	//-------------------------------------------------------------------------
 	// TEST A: failure to dispatch request to LTSY
  	//-------------------------------------------------------------------------
-	RMmCustomAPI::TSimLockPassword password(_L("changeme"));
+	RMmCustomAPI::TSimLockPassword password(_L("changemechangemechangemechange"));
 	RMmCustomAPI::TLockNumber lockNumber(RMmCustomAPI::EOperator);	
 	
 	// data for ExpectL
@@ -1113,7 +1113,7 @@
  	//-------------------------------------------------------------------------
 	// Test cancelling of RMmCustomAPI::DeActivateSimLock
  	//-------------------------------------------------------------------------
- 	RMmCustomAPI::TSimLockPassword password(_L("changeme"));
+ 	RMmCustomAPI::TSimLockPassword password(_L("changemechangemechangemechange"));
 	RMmCustomAPI::TLockNumber lockNumber(RMmCustomAPI::EImsi);	
 	
 	// data for ExpectL
@@ -1171,7 +1171,7 @@
 	// Test A: Test passing wrong version of parameters to
 	// RMmCustomAPI::DeActivateSimLock
  	//-------------------------------------------------------------------------
-	RMmCustomAPI::TSimLockPassword password(_L("changeme"));
+	RMmCustomAPI::TSimLockPassword password(_L("changemechangemechangemechange"));
 	RMmCustomAPI::TLockNumber lockNumber((RMmCustomAPI::TLockNumber) 0); 	
 	  
     customAPI.DeActivateSimLock(requestStatus, password, lockNumber);
@@ -1228,11 +1228,11 @@
 	// Test A: Test multiple clients requesting RMmCustomAPI::DeActivateSimLock
  	//-------------------------------------------------------------------------	
 	// data for the first request
-	RMmCustomAPI::TSimLockPassword password(_L("changeme"));
+	RMmCustomAPI::TSimLockPassword password(_L("changemechangemechangemechange"));
 	RMmCustomAPI::TLockNumber lockNumber(RMmCustomAPI::EOperator_Gid1);	
 	
 	// data for the second request
-	RMmCustomAPI::TSimLockPassword password2(_L("changeme2"));
+	RMmCustomAPI::TSimLockPassword password2(_L("changemechangemechangemechang2"));
 	RMmCustomAPI::TLockNumber lockNumber2(RMmCustomAPI::EOperator_Gid2);	
 	
 	// data for the first ExpectL
@@ -1289,7 +1289,7 @@
 	//-------------------------------------------------------------------------
 	// Test A: Test timeout of RMmCustomAPI::DeActivateSimLock
  	//-------------------------------------------------------------------------
- 	RMmCustomAPI::TSimLockPassword password(_L("changeme"));
+ 	RMmCustomAPI::TSimLockPassword password(_L("changemechangemechangemechange"));
 	RMmCustomAPI::TLockNumber lockNumber(RMmCustomAPI::EOperator_Gid2);	
 	
 	// data for ExpectL
--- a/telephonyserverplugins/common_tsy/test/component/src/cctsyfixeddiallingfu.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/test/component/src/cctsyfixeddiallingfu.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -35,6 +35,7 @@
 	ADD_TEST_STEP_ISO_CPP(CCTsyFixedDiallingFU, TestDialNoFdnCheck0001L);
 	ADD_TEST_STEP_ISO_CPP(CCTsyFixedDiallingFU, TestDialNoFdnCheck0001bL);
     ADD_TEST_STEP_ISO_CPP(CCTsyFixedDiallingFU, TestDialNoFdnCheck0001cL);
+    ADD_TEST_STEP_ISO_CPP(CCTsyFixedDiallingFU, TestDialNoFdnCheck0001dL);
 	ADD_TEST_STEP_ISO_CPP(CCTsyFixedDiallingFU, TestDialNoFdnCheck0002L);
 	ADD_TEST_STEP_ISO_CPP(CCTsyFixedDiallingFU, TestDialNoFdnCheck0004L);	
 	ADD_TEST_STEP_ISO_CPP(CCTsyFixedDiallingFU, TestDialNoFdnCheck0005L);
@@ -539,12 +540,13 @@
 
     TRequestStatus requestStatus;    
     _LIT(KSomeNumber, "123456789");   
+    _LIT(KAlphaID, "Alpha ID");
 
     RMobilePhone::TMobileService mobileService = RMobilePhone::EVoiceService;    
     TInt expecteCallId = 0;
 
-    RMobileCall::TMobileCallParamsV1 callParams; 
-    RMobileCall::TMobileCallParamsV1Pckg    pckgCallParams(callParams);
+    RMobileCall::TMobileCallParamsV7 callParams; 
+    RMobileCall::TMobileCallParamsV7Pckg    pckgCallParams(callParams);
     RMobileCall::TMobileCallInfoV8 callInfo;   
     callParams.iSpeakerControl  = RCall::EMonitorSpeakerControlOnUntilCarrier;
     callParams.iSpeakerVolume   = RCall::EMonitorSpeakerVolumeLow;
@@ -555,7 +557,17 @@
     callParams.iCug.iCugIndex = 0xFFFF;
     callParams.iCug.iSuppressPrefCug = EFalse;
     callParams.iCug.iSuppressOA = EFalse;
+    
     callParams.iAutoRedial = EFalse;
+    callParams.iBearerMode = RMobileCall::EMulticallNewBearer;
+    callParams.iCallParamOrigin = RMobileCall::EOriginatorSIM;   
+    callParams.iBCRepeatIndicator = RMobileCall::EBCAlternateMode;      
+    callParams.iIconId.iQualifier = RMobileCall::ENoIconId;   
+    callParams.iAlphaId = KAlphaID;
+
+    
+    
+    
     callInfo.iValid = RMobileCall::KCallDialledParty | RMobileCall::KCallAlternating;    
     callInfo.iService   = mobileService;
     callInfo.iStatus    = RMobileCall::EStatusUnknown;
@@ -572,7 +584,7 @@
     callInfo.iDialledParty.iTypeOfNumber = 
             RMobilePhone::EUnknownNumber;   
 
-    TMockLtsyCallData2< RMobileCall::TMobileCallParamsV1, RMobileCall::TMobileCallInfoV8 >
+    TMockLtsyCallData2< RMobileCall::TMobileCallParamsV7, RMobileCall::TMobileCallInfoV8 >
     mockCallData(expecteCallId, mobileService, callParams, callInfo);
     mockCallData.SerialiseL(expectData);
     
@@ -599,12 +611,156 @@
     callParamsX.iWaitForDialTone = RCall::EDialToneWait;
     TPckg<RCall::TCallParams> pckgCallParamsX(callParamsX);
         
-    call.DialNoFdnCheck(requestStatus, pckgCallParamsX, KSomeNumber);   
+    
+    TPckg<RMobileCall::TMobileCallParamsV7> mmParamsPckgV7(callParams);
+    call.DialNoFdnCheck(requestStatus, mmParamsPckgV7, KSomeNumber);   
         
     User::WaitForRequest(requestStatus);          
     ASSERT_EQUALS(KErrNone, requestStatus.Int());
     AssertMockLtsyStatusL();   
     
+    RMobileCall::TMobileCallInfoV7 info;
+    RMobileCall::TMobileCallInfoV7Pckg  infoPckg(info);
+        
+    TInt ret = call.GetMobileCallInfo(infoPckg);
+    ASSERT_EQUALS(KErrNone, ret);
+    
+    ASSERT_TRUE(info.iAlphaId.Compare(KAlphaID)==KErrNone);
+    
+    CleanupStack::PopAndDestroy(5,this);
+    
+    }
+
+/**
+@SYMTestCaseID BA-CTSY-FXD-CDNFC-0001d
+@SYMComponent  telephony_ctsy
+@SYMTestCaseDesc Test support in CTSY for RMobileCall::DialNoFdnCheck for voice calls with extended parameters (RMobileCall::TCallParamsV7)
+@SYMTestPriority High
+@SYMTestActions Invokes RMobileCall::DialNoFdnCheck for voice calls
+@SYMTestExpectedResults Pass
+@SYMTestType CT
+*/
+void CCTsyFixedDiallingFU::TestDialNoFdnCheck0001dL()
+    {
+    
+    OpenEtelServerL(EUseExtendedError);
+    CleanupStack::PushL(TCleanupItem(Cleanup,this));
+    OpenPhoneL();
+
+    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");   
+    // Alpha ID to pass through TMobileCallParamsV7
+    _LIT(KAlphaID, "Alpha ID");
+
+    RMobilePhone::TMobileService mobileService = RMobilePhone::EVoiceService;    
+    TInt expecteCallId = 0;
+
+    RMobileCall::TMobileCallParamsV7 callParams; 
+    RMobileCall::TMobileCallParamsV7Pckg    pckgCallParams(callParams); 
+    callParams.iSpeakerControl  = RCall::EMonitorSpeakerControlOnUntilCarrier;
+    callParams.iSpeakerVolume   = RCall::EMonitorSpeakerVolumeLow;
+    callParams.iInterval        = 100;
+    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;
+    callParams.iBearerMode = RMobileCall::EMulticallNewBearer;
+    callParams.iCallParamOrigin = RMobileCall::EOriginatorSIM;   
+    callParams.iBCRepeatIndicator = RMobileCall::EBCAlternateMode;      
+    callParams.iIconId.iQualifier = RMobileCall::ENoIconId;   
+    callParams.iIconId.iIdentifier = 123;   
+    callParams.iAlphaId = KAlphaID;
+
+    // Create the basic TMobileCallInfoV3 object to pass back
+    RMobileCall::TMobileCallInfoV8 callInfo;   
+    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.iDuration.iIntervel  = 0;            // this is protected value
+    callInfo.iDialledParty.iTelNumber.Copy( KSomeNumber );
+    callInfo.iDialledParty.iNumberPlan = 
+            RMobilePhone::EUnknownNumberingPlan;
+    callInfo.iDialledParty.iTypeOfNumber = 
+            RMobilePhone::EUnknownNumber;   
+
+    TMockLtsyCallData2< RMobileCall::TMobileCallParamsV7, RMobileCall::TMobileCallInfoV8 >
+    mockCallData(expecteCallId, mobileService, callParams, callInfo);
+    mockCallData.SerialiseL(expectData);
+    
+    iMockLTSY.ExpectL(EMobileCallDialNoFdnCheck, expectData);
+
+    TInt callId = 1;
+    
+    completeData.Close();
+    TMockLtsyCallData1<RMobileCall::TMobileCallInfoV1> callInfoData(callId, mobileService, callInfo);
+    callInfoData.SerialiseL(completeData);
+    //Complete Mobile Call Info in order to set the call ID 
+    iMockLTSY.CompleteL(EMobileCallGetMobileCallInfo, KErrNone, completeData);
+    
+    TMockLtsyCallData0 mockDataComplete(callId, mobileService);
+    completeData.Close();
+    mockDataComplete.SerialiseL(completeData);
+    // Complete the Dial
+    iMockLTSY.CompleteL(EMobileCallDialNoFdnCheck, KErrNone, completeData);
+    
+    TPckg<RMobileCall::TMobileCallParamsV7> mmParamsPckgV7(callParams);
+    call.DialNoFdnCheck(requestStatus, mmParamsPckgV7, KSomeNumber);   
+        
+    User::WaitForRequest(requestStatus);          
+    ASSERT_EQUALS(KErrNone, requestStatus.Int());
+    AssertMockLtsyStatusL();   
+    
+    RMobileCall::TMobileCallInfoV7 info;
+    RMobileCall::TMobileCallInfoV7Pckg  infoPckg(info);
+        
+    TInt ret = call.GetMobileCallInfo(infoPckg);
+    ASSERT_EQUALS(KErrNone, ret);
+    
+    // The check to make sure that the AlphaID persisted in CTSY and returned properly.
+    ASSERT_TRUE(info.iAlphaId.Compare(KAlphaID)==KErrNone);
+    // The check to make sure that the IconID persisted in CTSY and returned properly.
+    ASSERT_TRUE(info.iIconId.iIdentifier == 123);
+    ASSERT_EQUALS(info.iIconId.iQualifier, RMobileCall::ENoIconId);
+    
     CleanupStack::PopAndDestroy(5,this);
     
     }
--- a/telephonyserverplugins/ctsydispatchlayer/src/ltsylogger.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/ctsydispatchlayer/src/ltsylogger.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -49,7 +49,7 @@
 */
 	:iFnName(aFnName), iLayer(aLayer), iErr(KErrNone)
 	{
-	VA_LIST list;
+	/* coverity[var_decl] */ VA_LIST list;
 	VA_START(list,aFmt);
 	TBuf8<KLineLength> line;
 	line.Append(_L8(">>"));
@@ -57,7 +57,7 @@
 	line.Append(' ');
 	line.Append(aFmt);
 	TBuf8<KLineLength> evaluatedLine;
-	evaluatedLine.FormatList(line,list);
+	/* coverity[uninit_use_in_call] */ evaluatedLine.FormatList(line,list);
 	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TLOGENTRYEXIT_TLOGENTRYEXIT1_1, "%s", evaluatedLine);
 	};
 
@@ -67,7 +67,7 @@
 */
 	:iFnName(aFnName), iLayer(aLayer), iErr(KErrNone)
 	{
-	VA_LIST list;
+	/* coverity[var_decl] */ VA_LIST list;
 	VA_START(list,aFmt);
 
 	TBuf<KLineLength> line;
@@ -76,7 +76,7 @@
 	line.Append(' ');
 	line.Append(aFmt);
 	TBuf<KLineLength> evaluatedLine;
-	evaluatedLine.FormatList(line,list);
+	/* coverity[uninit_use_in_call] */ evaluatedLine.FormatList(line,list);
 	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TLOGENTRYEXIT_TLOGENTRYEXIT2_1, "%S", evaluatedLine);
 	};
 			
--- a/telephonyserverplugins/multimodetsy/Multimode/gprs/Gprs.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/multimodetsy/Multimode/gprs/Gprs.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -75,7 +75,7 @@
     iATGprsClass        = CATGprsClass::NewL(iIo, this, iInit, iPhoneGlobals);
     iATGprsNtwkRegStatusChange= CATGprsNtwkRegStatusChange::NewL(iIo,this,iPhoneGlobals);
     iATGprsNtwkRegStatus= CATGprsNtwkRegStatus::NewL(iIo, this, iInit, iPhoneGlobals,iATGprsNtwkRegStatusChange);
-   	iMutex.CreateGlobal(KNullDesC, EOwnerProcess);
+   	User::LeaveIfError(iMutex.CreateGlobal(KNullDesC, EOwnerProcess));
     }
     
 RHandleBase* CGprs::GlobalKernelObjectHandle()
--- a/telephonyserverplugins/multimodetsy/Multimode/mSLOGGER.CPP	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/multimodetsy/Multimode/mSLOGGER.CPP	Tue Sep 14 17:55:14 2010 +0100
@@ -48,9 +48,8 @@
 
 
 void TSYLogger::WriteFormat(TRefByValue<const TDesC8> aFmt,...)
-	{
-    //coverity[var_decl]	
-	VA_LIST list;
+	{	
+	/* coverity[var_decl] */ VA_LIST list;
 	VA_START(list,aFmt);
 
 	//
@@ -60,8 +59,7 @@
 	now.UniversalTime();
 	TDateTime t(now.DateTime());
 	buf.Format(KTimeFormat,t.Hour(),t.Minute(),t.Second(),t.MicroSecond());
-    //coverity[uninit_use_in_call]	
-	buf.AppendFormatList(aFmt,list);
+	/* coverity[uninit_use_in_call] */ buf.AppendFormatList(aFmt,list);
 
 	//
 	// Open log, write text to log and close log
--- a/telephonyserverplugins/multimodetsy/hayes/SCHAT.CPP	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/multimodetsy/hayes/SCHAT.CPP	Tue Sep 14 17:55:14 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-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"
@@ -147,7 +147,6 @@
 				{
 				LOGTEXT2(_L8("SChat:\tFound match against =>%S<"), &cs->iMatch);
 				iNotify->ChatStringMatchL(cs);
-				cs = iter;	// In case user removed cs;
 				}
 			}
 		}
@@ -160,7 +159,6 @@
 				{
 				LOGTEXT2(_L8("SChat:\tFound match against partial line =>%S<"), &cs->iMatch);
 				iNotify->ChatStringMatchL(cs);
-				cs = iter;	// In case user removed cs;
 				}
 			}
 		}
--- a/telephonyserverplugins/simtsy/group/bld.inf	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/simtsy/group/bld.inf	Tue Sep 14 17:55:14 2010 +0100
@@ -19,6 +19,10 @@
  @file
 */
 
+
+#include "../testconfigfileparser/group/bld.inf"
+
+
 PRJ_EXPORTS
 
 ../inc/SimTsy.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(simtsy.h)
@@ -106,3 +110,5 @@
 ../test/Te_SimSS/Te_SimSS.mmp
 ../test/Te_SimVoice/Te_SimVoice.mmp
 ../test/te_simeap/te_simeap.mmp
+
+
--- a/telephonyserverplugins/simtsy/src/CSimPacketService.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/simtsy/src/CSimPacketService.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -122,7 +122,7 @@
 	iReleaseModeTimer = CSimTimer::NewL(iPhone);
 	iDynamicCapsTimer = CSimTimer::NewL(iPhone);
 	iMbmsPcktTimer = CSimTimer::NewL(iPhone);
-	iMutex.CreateGlobal(KNullDesC, EOwnerProcess);
+	User::LeaveIfError(iMutex.CreateGlobal(KNullDesC, EOwnerProcess));
 	
 	iNtwkRegStatusInfo = new(ELeave) CArrayFixFlat<TNtwkRegStatus>(KGranularity);
 	iPcktRegStatusInfo=new(ELeave) CArrayFixFlat<TPacketRegStatus>(KGranularity);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/simtsy/testconfigfileparser/bmarm/TESTCONFIGFILEPARSERU.DEF	Tue Sep 14 17:55:14 2010 +0100
@@ -0,0 +1,37 @@
+EXPORTS
+	__eq__C11CTestConfigRC11CTestConfig @ 1 NONAME R3UNUSED ; CTestConfig::operator==(CTestConfig const &) const
+	CopyLC__C18CTestConfigSection @ 2 NONAME R3UNUSED ; CTestConfigSection::CopyLC(void) const
+	CountElements__11CTestConfigRC6TDesC8G5TChar @ 3 NONAME R3UNUSED ; CTestConfig::CountElements(TDesC8 const &, TChar)
+	DeleteItemsL__18CTestConfigSectionRC6TDesC8 @ 4 NONAME R3UNUSED ; CTestConfigSection::DeleteItemsL(TDesC8 const &)
+	GetElement__11CTestConfigRC6TDesC8G5TChariR6TPtrC8i @ 5 NONAME ; CTestConfig::GetElement(TDesC8 const &, TChar, int, TPtrC8 &, int)
+	GetElement__11CTestConfigRC6TDesC8G5TChariRi @ 6 NONAME ; CTestConfig::GetElement(TDesC8 const &, TChar, int, int &)
+	ItemCount__C18CTestConfigSectionRC6TDesC8 @ 7 NONAME R3UNUSED ; CTestConfigSection::ItemCount(TDesC8 const &) const
+	ItemValue__C11CTestConfigRC6TDesC8N21 @ 8 NONAME ; CTestConfig::ItemValue(TDesC8 const &, TDesC8 const &, TDesC8 const &) const
+	ItemValue__C11CTestConfigRC6TDesC8T1i @ 9 NONAME ; CTestConfig::ItemValue(TDesC8 const &, TDesC8 const &, int) const
+	ItemValue__C18CTestConfigSectionRC6TDesC8T1 @ 10 NONAME R3UNUSED ; CTestConfigSection::ItemValue(TDesC8 const &, TDesC8 const &) const
+	ItemValue__C18CTestConfigSectionRC6TDesC8i @ 11 NONAME R3UNUSED ; CTestConfigSection::ItemValue(TDesC8 const &, int) const
+	Item__C18CTestConfigSectionRC6TDesC8 @ 12 NONAME R3UNUSED ; CTestConfigSection::Item(TDesC8 const &) const
+	Item__C18CTestConfigSectionRC6TDesC8i @ 13 NONAME R3UNUSED ; CTestConfigSection::Item(TDesC8 const &, int) const
+	NewLC__11CTestConfigR3RFsRC7TDesC16 @ 14 NONAME R3UNUSED ; CTestConfig::NewLC(RFs &, TDesC16 const &)
+	NewLC__11CTestConfigR3RFsRC7TDesC16T2 @ 15 NONAME R3UNUSED ; CTestConfig::NewLC(RFs &, TDesC16 const &, TDesC16 const &)
+	NewLC__15CTestConfigItemR18CTestConfigSectionRC6TDesC8T2 @ 16 NONAME R3UNUSED ; CTestConfigItem::NewLC(CTestConfigSection &, TDesC8 const &, TDesC8 const &)
+	NewLC__18CTestConfigSectionRC6TDesC8 @ 17 NONAME R3UNUSED ; CTestConfigSection::NewLC(TDesC8 const &)
+	NewLC__18CTestConfigSectionRC6TDesC8R18CTestConfigSection @ 18 NONAME R3UNUSED ; CTestConfigSection::NewLC(TDesC8 const &, CTestConfigSection &)
+	ReadScriptL__11CTestConfigRC7TDesC16 @ 19 NONAME R3UNUSED ; CTestConfig::ReadScriptL(TDesC16 const &)
+	ReplaceLC__11CTestConfigRC6TDesC8N21 @ 20 NONAME R3UNUSED ; CTestConfig::ReplaceLC(TDesC8 const &, TDesC8 const &, TDesC8 const &)
+	ResolveFile__11CTestConfigR3RFsRC7TDesC16T2R6TParse @ 21 NONAME ; CTestConfig::ResolveFile(RFs &, TDesC16 const &, TDesC16 const &, TParse &)
+	Section__C11CTestConfigRC6TDesC8 @ 22 NONAME R3UNUSED ; CTestConfig::Section(TDesC8 const &) const
+	WriteFileL__11CTestConfigRC7TDesC16 @ 23 NONAME R3UNUSED ; CTestConfig::WriteFileL(TDesC16 const &)
+	"_._11CTestConfig" @ 24 NONAME R3UNUSED ; CTestConfig::~CTestConfig(void)
+	"_._15CTestConfigItem" @ 25 NONAME R3UNUSED ; CTestConfigItem::~CTestConfigItem(void)
+	"_._18CTestConfigSection" @ 26 NONAME R3UNUSED ; CTestConfigSection::~CTestConfigSection(void)
+	AddItemL__18CTestConfigSectionRC6TDesC8T1 @ 27 NONAME R3UNUSED ; CTestConfigSection::AddItemL(TDesC8 const &, TDesC8 const &)
+	TrimLeft__11CTestConfigRC6TDesC8 @ 28 NONAME R3UNUSED ; CTestConfig::TrimLeft(TDesC8 const &)
+	TrimRight__11CTestConfigRC6TDesC8 @ 29 NONAME R3UNUSED ; CTestConfig::TrimRight(TDesC8 const &)
+	Trim__11CTestConfigRC6TDesC8 @ 30 NONAME R3UNUSED ; CTestConfig::Trim(TDesC8 const &)
+	Item__18CTestConfigSectionRC6TDesC8 @ 31 NONAME R3UNUSED ; CTestConfigSection::Item(TDesC8 const &)
+	Item__18CTestConfigSectionRC6TDesC8i @ 32 NONAME R3UNUSED ; CTestConfigSection::Item(TDesC8 const &, int)
+	ItemsL__18CTestConfigSectionRt13RPointerArray1Z15CTestConfigItemRC6TDesC8 @ 33 NONAME R3UNUSED ; CTestConfigSection::ItemsL(RPointerArray<CTestConfigItem> &, TDesC8 const &)
+	Section__11CTestConfigRC6TDesC8 @ 34 NONAME R3UNUSED ; CTestConfig::Section(TDesC8 const &)
+	ItemsL__C18CTestConfigSectionRt13RPointerArray1ZC15CTestConfigItemRC6TDesC8 @ 35 NONAME R3UNUSED ; CTestConfigSection::ItemsL(RPointerArray<CTestConfigItem const> &, TDesC8 const &) const
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/simtsy/testconfigfileparser/bwins/TESTCONFIGFILEPARSERU.DEF	Tue Sep 14 17:55:14 2010 +0100
@@ -0,0 +1,37 @@
+EXPORTS
+	??1CTestConfig@@UAE@XZ @ 1 NONAME ; public: virtual __thiscall CTestConfig::~CTestConfig(void)
+	??1CTestConfigItem@@UAE@XZ @ 2 NONAME ; public: virtual __thiscall CTestConfigItem::~CTestConfigItem(void)
+	??1CTestConfigSection@@UAE@XZ @ 3 NONAME ; public: virtual __thiscall CTestConfigSection::~CTestConfigSection(void)
+	??8CTestConfig@@QBEHABV0@@Z @ 4 NONAME ; public: int __thiscall CTestConfig::operator==(class CTestConfig const &)const 
+	?AddItemL@CTestConfigSection@@QAEAAVCTestConfigItem@@ABVTDesC8@@0@Z @ 5 NONAME ; public: class CTestConfigItem & __thiscall CTestConfigSection::AddItemL(class TDesC8 const &,class TDesC8 const &)
+	?CopyLC@CTestConfigSection@@QBEPAV1@XZ @ 6 NONAME ; public: class CTestConfigSection * __thiscall CTestConfigSection::CopyLC(void)const 
+	?CountElements@CTestConfig@@SAHABVTDesC8@@VTChar@@@Z @ 7 NONAME ; public: static int __cdecl CTestConfig::CountElements(class TDesC8 const &,class TChar)
+	?DeleteItemsL@CTestConfigSection@@QAEXABVTDesC8@@@Z @ 8 NONAME ; public: void __thiscall CTestConfigSection::DeleteItemsL(class TDesC8 const &)
+	?GetElement@CTestConfig@@SAHABVTDesC8@@VTChar@@HAAH@Z @ 9 NONAME ; public: static int __cdecl CTestConfig::GetElement(class TDesC8 const &,class TChar,int,int &)
+	?GetElement@CTestConfig@@SAHABVTDesC8@@VTChar@@HAAVTPtrC8@@H@Z @ 10 NONAME ; public: static int __cdecl CTestConfig::GetElement(class TDesC8 const &,class TChar,int,class TPtrC8 &,int)
+	?Item@CTestConfigSection@@QBEPBVCTestConfigItem@@ABVTDesC8@@@Z @ 11 NONAME ; public: class CTestConfigItem const * __thiscall CTestConfigSection::Item(class TDesC8 const &)const 
+	?Item@CTestConfigSection@@QBEPBVCTestConfigItem@@ABVTDesC8@@H@Z @ 12 NONAME ; public: class CTestConfigItem const * __thiscall CTestConfigSection::Item(class TDesC8 const &,int)const 
+	?ItemCount@CTestConfigSection@@QBEHABVTDesC8@@@Z @ 13 NONAME ; public: int __thiscall CTestConfigSection::ItemCount(class TDesC8 const &)const 
+	?ItemValue@CTestConfig@@QBEABVTDesC8@@ABV2@00@Z @ 14 NONAME ; public: class TDesC8 const & __thiscall CTestConfig::ItemValue(class TDesC8 const &,class TDesC8 const &,class TDesC8 const &)const 
+	?ItemValue@CTestConfig@@QBEHABVTDesC8@@0H@Z @ 15 NONAME ; public: int __thiscall CTestConfig::ItemValue(class TDesC8 const &,class TDesC8 const &,int)const 
+	?ItemValue@CTestConfigSection@@QBEABVTDesC8@@ABV2@0@Z @ 16 NONAME ; public: class TDesC8 const & __thiscall CTestConfigSection::ItemValue(class TDesC8 const &,class TDesC8 const &)const 
+	?ItemValue@CTestConfigSection@@QBEHABVTDesC8@@H@Z @ 17 NONAME ; public: int __thiscall CTestConfigSection::ItemValue(class TDesC8 const &,int)const 
+	?NewLC@CTestConfig@@SAPAV1@AAVRFs@@ABVTDesC16@@1@Z @ 18 NONAME ; public: static class CTestConfig * __cdecl CTestConfig::NewLC(class RFs &,class TDesC16 const &,class TDesC16 const &)
+	?NewLC@CTestConfig@@SAPAV1@AAVRFs@@ABVTDesC16@@@Z @ 19 NONAME ; public: static class CTestConfig * __cdecl CTestConfig::NewLC(class RFs &,class TDesC16 const &)
+	?NewLC@CTestConfigItem@@SAPAV1@AAVCTestConfigSection@@ABVTDesC8@@1@Z @ 20 NONAME ; public: static class CTestConfigItem * __cdecl CTestConfigItem::NewLC(class CTestConfigSection &,class TDesC8 const &,class TDesC8 const &)
+	?NewLC@CTestConfigSection@@SAPAV1@ABVTDesC8@@@Z @ 21 NONAME ; public: static class CTestConfigSection * __cdecl CTestConfigSection::NewLC(class TDesC8 const &)
+	?NewLC@CTestConfigSection@@SAPAV1@ABVTDesC8@@AAV1@@Z @ 22 NONAME ; public: static class CTestConfigSection * __cdecl CTestConfigSection::NewLC(class TDesC8 const &,class CTestConfigSection &)
+	?ReadScriptL@CTestConfig@@QAEXABVTDesC16@@@Z @ 23 NONAME ; public: void __thiscall CTestConfig::ReadScriptL(class TDesC16 const &)
+	?ReplaceLC@CTestConfig@@SAPAVHBufC8@@ABVTDesC8@@00@Z @ 24 NONAME ; public: static class HBufC8 * __cdecl CTestConfig::ReplaceLC(class TDesC8 const &,class TDesC8 const &,class TDesC8 const &)
+	?ResolveFile@CTestConfig@@SAHAAVRFs@@ABVTDesC16@@1AAVTParse@@@Z @ 25 NONAME ; public: static int __cdecl CTestConfig::ResolveFile(class RFs &,class TDesC16 const &,class TDesC16 const &,class TParse &)
+	?Section@CTestConfig@@QBEPBVCTestConfigSection@@ABVTDesC8@@@Z @ 26 NONAME ; public: class CTestConfigSection const * __thiscall CTestConfig::Section(class TDesC8 const &)const 
+	?Trim@CTestConfig@@SA?AVTPtrC8@@ABVTDesC8@@@Z @ 27 NONAME ; public: static class TPtrC8  __cdecl CTestConfig::Trim(class TDesC8 const &)
+	?WriteFileL@CTestConfig@@QAEXABVTDesC16@@@Z @ 28 NONAME ; public: void __thiscall CTestConfig::WriteFileL(class TDesC16 const &)
+	?TrimLeft@CTestConfig@@SA?AVTPtrC8@@ABVTDesC8@@@Z @ 29 NONAME ; public: static class TPtrC8  __cdecl CTestConfig::TrimLeft(class TDesC8 const &)
+	?TrimRight@CTestConfig@@SA?AVTPtrC8@@ABVTDesC8@@@Z @ 30 NONAME ; public: static class TPtrC8  __cdecl CTestConfig::TrimRight(class TDesC8 const &)
+	?Item@CTestConfigSection@@QAEPAVCTestConfigItem@@ABVTDesC8@@@Z @ 31 NONAME ; public: class CTestConfigItem * __thiscall CTestConfigSection::Item(class TDesC8 const &)
+	?Item@CTestConfigSection@@QAEPAVCTestConfigItem@@ABVTDesC8@@H@Z @ 32 NONAME ; public: class CTestConfigItem * __thiscall CTestConfigSection::Item(class TDesC8 const &,int)
+	?ItemsL@CTestConfigSection@@QAEXAAV?$RPointerArray@VCTestConfigItem@@@@ABVTDesC8@@@Z @ 33 NONAME ; public: void __thiscall CTestConfigSection::ItemsL(class RPointerArray<class CTestConfigItem> &,class TDesC8 const &)
+	?Section@CTestConfig@@QAEPAVCTestConfigSection@@ABVTDesC8@@@Z @ 34 NONAME ; public: class CTestConfigSection * __thiscall CTestConfig::Section(class TDesC8 const &)
+	?ItemsL@CTestConfigSection@@QBEXAAV?$RPointerArray@$$CBVCTestConfigItem@@@@ABVTDesC8@@@Z @ 35 NONAME ; public: void __thiscall CTestConfigSection::ItemsL(class RPointerArray<class CTestConfigItem const > &,class TDesC8 const &)const 
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/simtsy/testconfigfileparser/eabi/testconfigfileparserU.def	Tue Sep 14 17:55:14 2010 +0100
@@ -0,0 +1,49 @@
+EXPORTS
+	_ZN11CTestConfig10GetElementERK6TDesC85TChariR6TPtrC8i @ 1 NONAME
+	_ZN11CTestConfig10GetElementERK6TDesC85TChariRi @ 2 NONAME
+	_ZN11CTestConfig10WriteFileLERK7TDesC16 @ 3 NONAME
+	_ZN11CTestConfig11ReadScriptLERK7TDesC16 @ 4 NONAME
+	_ZN11CTestConfig11ResolveFileER3RFsRK7TDesC16S4_R6TParse @ 5 NONAME
+	_ZN11CTestConfig13CountElementsERK6TDesC85TChar @ 6 NONAME
+	_ZN11CTestConfig4TrimERK6TDesC8 @ 7 NONAME
+	_ZN11CTestConfig5NewLCER3RFsRK7TDesC16 @ 8 NONAME
+	_ZN11CTestConfig5NewLCER3RFsRK7TDesC16S4_ @ 9 NONAME
+	_ZN11CTestConfig7SectionERK6TDesC8 @ 10 NONAME
+	_ZN11CTestConfig8TrimLeftERK6TDesC8 @ 11 NONAME
+	_ZN11CTestConfig9ReplaceLCERK6TDesC8S2_S2_ @ 12 NONAME
+	_ZN11CTestConfig9TrimRightERK6TDesC8 @ 13 NONAME
+	_ZN11CTestConfigD0Ev @ 14 NONAME
+	_ZN11CTestConfigD1Ev @ 15 NONAME
+	_ZN11CTestConfigD2Ev @ 16 NONAME
+	_ZN15CTestConfigItem5NewLCER18CTestConfigSectionRK6TDesC8S4_ @ 17 NONAME
+	_ZN15CTestConfigItemD0Ev @ 18 NONAME
+	_ZN15CTestConfigItemD1Ev @ 19 NONAME
+	_ZN15CTestConfigItemD2Ev @ 20 NONAME
+	_ZN18CTestConfigSection12DeleteItemsLERK6TDesC8 @ 21 NONAME
+	_ZN18CTestConfigSection4ItemERK6TDesC8 @ 22 NONAME
+	_ZN18CTestConfigSection4ItemERK6TDesC8i @ 23 NONAME
+	_ZN18CTestConfigSection5NewLCERK6TDesC8 @ 24 NONAME
+	_ZN18CTestConfigSection5NewLCERK6TDesC8RS_ @ 25 NONAME
+	_ZN18CTestConfigSection6ItemsLER13RPointerArrayI15CTestConfigItemERK6TDesC8 @ 26 NONAME
+	_ZN18CTestConfigSection8AddItemLERK6TDesC8S2_ @ 27 NONAME
+	_ZN18CTestConfigSectionD0Ev @ 28 NONAME
+	_ZN18CTestConfigSectionD1Ev @ 29 NONAME
+	_ZN18CTestConfigSectionD2Ev @ 30 NONAME
+	_ZNK11CTestConfig7SectionERK6TDesC8 @ 31 NONAME
+	_ZNK11CTestConfig9ItemValueERK6TDesC8S2_S2_ @ 32 NONAME
+	_ZNK11CTestConfig9ItemValueERK6TDesC8S2_i @ 33 NONAME
+	_ZNK11CTestConfigeqERKS_ @ 34 NONAME
+	_ZNK18CTestConfigSection4ItemERK6TDesC8 @ 35 NONAME
+	_ZNK18CTestConfigSection4ItemERK6TDesC8i @ 36 NONAME
+	_ZNK18CTestConfigSection6CopyLCEv @ 37 NONAME
+	_ZNK18CTestConfigSection6ItemsLER13RPointerArrayIK15CTestConfigItemERK6TDesC8 @ 38 NONAME
+	_ZNK18CTestConfigSection9ItemCountERK6TDesC8 @ 39 NONAME
+	_ZNK18CTestConfigSection9ItemValueERK6TDesC8S2_ @ 40 NONAME
+	_ZNK18CTestConfigSection9ItemValueERK6TDesC8i @ 41 NONAME
+	_ZTI11CTestConfig @ 42 NONAME ; #<TI>#
+	_ZTI15CTestConfigItem @ 43 NONAME ; #<TI>#
+	_ZTI18CTestConfigSection @ 44 NONAME ; #<TI>#
+	_ZTV11CTestConfig @ 45 NONAME ; #<VT>#
+	_ZTV15CTestConfigItem @ 46 NONAME ; #<VT>#
+	_ZTV18CTestConfigSection @ 47 NONAME ; #<VT>#
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/simtsy/testconfigfileparser/group/bld.inf	Tue Sep 14 17:55:14 2010 +0100
@@ -0,0 +1,39 @@
+// Copyright (c) 2000-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:
+//
+
+
+PRJ_PLATFORMS
+
+DEFAULT
+
+PRJ_EXPORTS
+
+../inc/testconfigfileparser.h   SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(testconfigfileparser.h)
+../inc/testconfigfileparser.inl SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(testconfigfileparser.inl)
+
+../group/testconfigfileparser.iby	/epoc32/rom/include/testconfigfileparser.iby
+
+PRJ_MMPFILES
+
+../group/testconfigfileparser.mmp
+
+PRJ_TESTMMPFILES
+
+//../test/t_testconfigfileparser.mmp
+
+PRJ_TESTEXPORTS
+
+../test/t_testconfigfileparser.txt /epoc32/wins/c/testscripts/t_testconfigfileparser.txt
+../test/t_testconfigfileparser2.txt /epoc32/wins/c/testscripts/t_testconfigfileparser2.txt
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/simtsy/testconfigfileparser/group/testconfigfileparser.iby	Tue Sep 14 17:55:14 2010 +0100
@@ -0,0 +1,25 @@
+/*
+* Copyright (c) 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 __TEST_CONFIG_FILE_PARSER_IBY__
+#define __TEST_CONFIG_FILE_PARSER_IBY__
+
+REM For components that use the Autotest framework
+
+file=ABI_DIR\BUILD_DIR\testconfigfileparser.dll   System\Libs\testconfigfileparser.dll
+
+#endif
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/simtsy/testconfigfileparser/group/testconfigfileparser.mmp	Tue Sep 14 17:55:14 2010 +0100
@@ -0,0 +1,42 @@
+// Copyright (c) 2001-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:
+// Top-level project file for DLL that parses config files for test harnesses
+// 
+//
+
+/**
+ @file testconfigfileparser.mmp
+*/
+
+TARGET        testconfigfileparser.dll
+CAPABILITY All -Tcb
+TARGETTYPE    dll
+
+SOURCEPATH    ../src
+SOURCE        testconfigfile.cpp
+SOURCE        testconfigsection.cpp 
+SOURCE        testconfigitem.cpp
+
+#ifdef EABI
+DEFFILE       testconfigfileparser.def
+#else
+DEFFILE       TESTCONFIGFILEPARSER.DEF
+#endif
+
+USERINCLUDE   ../inc
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+LIBRARY       euser.lib efsrv.lib
+
+VENDORID 0x70000001
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/simtsy/testconfigfileparser/group/tools_testconfigfileparser.history.xml	Tue Sep 14 17:55:14 2010 +0100
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<relnotes name="TESTCONFIGFILEPARSER">
+  <purpose>
+  </purpose>
+</relnotes>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/simtsy/testconfigfileparser/group/tools_testconfigfileparser.mrp	Tue Sep 14 17:55:14 2010 +0100
@@ -0,0 +1,25 @@
+#
+# Copyright (c) 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: 
+#
+
+component	tools_testconfigfileparser
+source	\sf\os\cellularsrv\telephonyserverplugins\simtsy\testconfigfileparser
+binary	\sf\os\cellularsrv\telephonyserverplugins\simtsy\testconfigfileparser\group	all
+exports	\sf\os\cellularsrv\telephonyserverplugins\simtsy\testconfigfileparser\group
+notes_source	\component_defs\release.src
+
+
+ipr T 
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/simtsy/testconfigfileparser/inc/testconfigfileparser.h	Tue Sep 14 17:55:14 2010 +0100
@@ -0,0 +1,260 @@
+/*
+* Copyright (c) 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: 
+*
+*/
+/**
+ * @file testscripts.h Defines classes for reading a configuration file
+ *
+ * @note Configuration File Format:
+ * 
+ * [Defaults]
+ * defaults= another_config_file.txt
+ *
+ * [SectionName]
+ * variable= value
+ * variable2= value2
+ * variable= value3
+ *
+ * [SectionName2]
+ * variable= value
+ *
+ * endscript
+ *
+ * 
+ * @note Explanation:
+ *
+ * A configuration file is made up of a number of "sections", each of which can contain a number of "items" (name, value combination).
+ * 
+ * "Sections" must have a name and be surrounded by square backets, e.g.:
+ *
+ *      [SectionName]
+ *
+ *
+ * Each "item" consists of consists of a name, followed by an equals sign, followed by blank space, followed by the value to assign to that variable.
+ * 
+ * The value can be of any length, contain whitespace and span multiple lines. The value ends when the next item or section is found. E.g:
+ * 
+ * Simple Item:
+ *
+ *      variable= value
+ *
+ * Two items on one line:
+ *
+ *      variable= value variable2= value2
+ *
+ * Multi-line item:
+ *
+ *      variable= This variable
+ *      spans multiple
+ *      lines
+ *
+ * 
+ * @note Parsing stops at End-Of-File or if the tag "endscript" (without the quotes) appears in the file.
+ *
+ * @note A section may take some default values from another section or config file
+ *
+ * To specify default values for all sections, add a section at the start of the config file called [Defaults], e.g.:
+ *
+ *      [Defaults]
+ *      sc= +447785016005
+ *
+ * To read default values from another config file, add an item with name "defaults" and value is the name of the file. E.g.:
+ *
+ *      defaults= another_config_file.txt
+
+ */
+
+
+#ifndef __TEST_CONFIG_FILE_PARSER_H__
+#define __TEST_CONFIG_FILE_PARSER_H__
+
+#include <e32std.h>
+#include <e32base.h>
+
+class CTestConfigSection;
+class CTestConfigItem;
+class RFs;
+class TParse;
+class RFile;
+
+_LIT(KScriptPanic, "TEST-SCRIPT");
+_LIT(KScriptPathSep,"\\");
+_LIT8(KScriptSectionStart, "[");
+_LIT8(KScriptSectionEnd, "]");
+_LIT8(KScriptCRLF, "\r\n");
+_LIT8(KScriptCRLF8, "\r\n");
+_LIT8(KScriptLF, "\n");
+_LIT8(KScriptCR, "\r");
+_LIT8(KScriptItemEnd, "=");
+_LIT8(KScriptItemEnd8, "=");
+_LIT8(KScriptSpace8, " ");
+_LIT8(KScriptDefaults, "Defaults");
+_LIT8(KScriptDefault1, "Def");
+_LIT8(KScriptDefault2, "Default");
+_LIT8(KScriptCommentStart, "#");
+const TInt KScriptLFChar = '\n';
+const TInt KScriptCRChar = '\r';
+
+class CTestConfig : public CBase
+/**
+ * @internalComponent
+ * @deprecated
+ */
+	{
+	public:
+		IMPORT_C static CTestConfig* NewLC(RFs& aFs, const TDesC& aComponent, const TDesC& aScriptFile);
+		IMPORT_C static CTestConfig* NewLC(RFs& aFs, const TDesC& aComponent);
+		IMPORT_C ~CTestConfig();
+
+		IMPORT_C const TDesC8& ItemValue(const TDesC8& aSection, const TDesC8& aItem, const TDesC8& aDefault) const;
+		IMPORT_C TInt ItemValue(const TDesC8& aSection, const TDesC8& aItem, const TInt aDefault) const;
+		
+		IMPORT_C void ReadScriptL(const TDesC& aScript);
+
+		inline const RPointerArray<CTestConfigSection>& Sections() const;
+		inline RPointerArray<CTestConfigSection>& Sections();
+
+		IMPORT_C const CTestConfigSection* Section(const TDesC8& aSectionName) const; //return NULL if section not found
+		IMPORT_C CTestConfigSection* Section(const TDesC8& aSectionName); //return NULL if section not found
+		inline const CTestConfigSection& operator[](TInt aIndex) const {return *iSections[aIndex];}
+		inline CTestConfigSection& operator[](TInt aIndex) {return *iSections[aIndex];}
+
+		IMPORT_C static TInt CountElements(const TDesC8& aInput, TChar aDelimiter);
+		IMPORT_C static TInt GetElement(const TDesC8& aInput, TChar aDelimiter, TInt aIndex, TInt& aOutput);
+		IMPORT_C static TInt GetElement(const TDesC8& aInput, TChar aDelimiter, TInt aIndex, TPtrC8& aOutput, TBool aTrimOutput = ETrue);
+		IMPORT_C static TPtrC8 Trim(const TDesC8& aInput);
+		IMPORT_C static TPtrC8 TrimLeft(const TDesC8& aInput);
+		IMPORT_C static TPtrC8 TrimRight(const TDesC8& aInput);
+
+		IMPORT_C static HBufC8* ReplaceLC(const TDesC8& aOld, const TDesC8& aNew, const TDesC8& aOldString);
+		IMPORT_C static TInt ResolveFile(RFs& aFs, const TDesC& aComponent, const TDesC& aFileName, TParse& aParseOut);
+
+		IMPORT_C void WriteFileL(const TDesC& aFileName);
+		IMPORT_C TBool operator==(const CTestConfig& aFile) const;
+
+		IMPORT_C void AddSectionL(CTestConfigSection& aSection);
+
+	protected:
+
+		CTestConfig(RFs& aFs);
+		void ConstructL(const TDesC& aComponent);
+
+		TPtrC8 ParseValue(const TDesC8& aText, const TLex8& aInput, TInt aCurrentItemStart) const;
+		void ParseAndSetItemValueL(const TDesC8& aText, const TLex8& aInput, TInt aCurrentItemStart, CTestConfigItem*& arCurrentItem);
+		void CopyInDefaultsL(CTestConfigSection& aSection, const TDesC& aDefaultFile);
+
+		HBufC8* ReadFileL(const TDesC& aFile) const;
+
+		TBool IsDefaultSection(const TDesC8& aSectionName) const;
+		static TInt GetNextElement(TLex8& aInput, TChar aDelimiter, TPtrC8& aOutput);
+		TBool IsNewSection(const TDesC8& aSource, const TLex8& aInput) const;
+		TBool IsNewItem(const TDesC8& aSource, const TLex8& aLex, TPtrC8& aItem, TInt& aStartOfValue) const;
+		TBool IsNewComment(const TDesC8& aSource, const TLex8& aLex) const;
+		TBool IsAtStartOfNewLine(const TDesC8& aSource, const TLex8& aLex, TBool aIgnoreSpaces) const;
+		void SkipToNextLine(TLex8& aInput) const;
+
+
+	protected:
+
+		RFs& iFs;
+		HBufC* iComponent;
+		RPointerArray<CTestConfigSection> iSections;
+	};
+
+class CTestConfigSection : public CBase
+/**
+ * @internalComponent
+ * @deprecated
+ */
+	{
+	friend class CTestConfig;
+
+	public:
+		IMPORT_C static CTestConfigSection* NewLC(const TDesC8& aSectionName);
+		IMPORT_C static CTestConfigSection* NewLC(const TDesC8& aSectionName, CTestConfigSection& aDefaults);
+		IMPORT_C ~CTestConfigSection();
+		
+		inline const TDesC8& SectionName() const;
+
+		IMPORT_C const CTestConfigItem* Item(const TDesC8& aItemTag) const; //return NULL if the item does not exist
+		IMPORT_C CTestConfigItem* Item(const TDesC8& aItemTag); //return NULL if the item does not exist
+		IMPORT_C const CTestConfigItem* Item(const TDesC8& aItemTag,TInt aIndex) const; //return NULL if the item does not exist
+		IMPORT_C CTestConfigItem* Item(const TDesC8& aItemTag,TInt aIndex); //return NULL if the item does not exist
+
+		IMPORT_C const TDesC8& ItemValue(const TDesC8& aItemTag, const TDesC8& aDefault) const;
+		IMPORT_C TInt ItemValue(const TDesC8& aItemTag, TInt aDefault) const;
+
+		IMPORT_C CTestConfigItem& AddItemL(const TDesC8& aItemTag, const TDesC8& aValue);
+		IMPORT_C void DeleteItemsL(const TDesC8& aItem);
+
+		inline const RPointerArray<CTestConfigItem>& Items() const {return iItems;}
+		inline RPointerArray<CTestConfigItem>& Items() {return iItems;}
+
+		IMPORT_C TInt ItemCount(const TDesC8& aItemTag) const;
+		IMPORT_C void ItemsL(RPointerArray<CTestConfigItem>& aArray, const TDesC8& aItemTag);
+		IMPORT_C void ItemsL(RPointerArray<const CTestConfigItem>& aArray, const TDesC8& aItemTag) const;
+
+		inline const CTestConfigItem& operator[](TInt aIndex) const  {return *iItems[aIndex];}
+
+		inline void SetDefaultsL(const CTestConfigSection& aDefaults);
+		inline CTestConfigSection* Defaults() const {return iDefaults;}
+
+		IMPORT_C CTestConfigSection* CopyLC() const;
+
+		void WriteL(RFile& aFile) const;
+		TBool operator==(const CTestConfigSection& aFile) const;
+
+	private:
+		void ConstructL(const TDesC8& aSectionName);
+		CTestConfigSection();
+		RPointerArray<CTestConfigItem> iItems;
+		HBufC8* iSectionName;
+		CTestConfigSection* iDefaults;
+	};
+
+class CTestConfigItem : public CBase
+/**
+ * @internalComponent
+ * @deprecated
+ */
+	{
+	friend class CTestConfigSection;
+	friend class CTestConfig;
+
+	public:
+		IMPORT_C static CTestConfigItem* NewLC(CTestConfigSection& aParent, const TDesC8& aItem, const TDesC8& aValue);
+		inline CTestConfigItem* CopyLC() const;
+
+		IMPORT_C ~CTestConfigItem();
+		inline const TDesC8& Item() const;
+		inline const TDesC8& Value() const;
+
+		void WriteL(RFile& aFile) const;
+		TBool operator==(const CTestConfigItem& aItem) const {return Item() == aItem.Item() && Value() == aItem.Value();}
+
+	public:
+
+		CTestConfigSection& iParent;
+		
+	private:
+		CTestConfigItem(CTestConfigSection& aParent);
+		void ConstructL(const TDesC8& aItem, const TDesC8& aValue);
+		HBufC8* iItem;
+		HBufC8* iValue;
+	};
+
+#include "testconfigfileparser.inl"
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/simtsy/testconfigfileparser/inc/testconfigfileparser.inl	Tue Sep 14 17:55:14 2010 +0100
@@ -0,0 +1,64 @@
+/*
+* Copyright (c) 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 TEST_SCRIPTS_INL_
+#define TEST_SCRIPTS_INL_
+
+inline const RPointerArray<CTestConfigSection>& CTestConfig::Sections() const
+	{
+	return iSections;
+	}
+
+inline RPointerArray<CTestConfigSection>& CTestConfig::Sections()
+	{
+	return iSections;
+	}
+
+inline const TDesC8& CTestConfigSection::SectionName() const
+	{
+	return *iSectionName;
+	}
+
+inline const TDesC8& CTestConfigItem::Item() const
+	{
+	return *iItem;
+	}
+
+inline void CTestConfigSection::SetDefaultsL(const CTestConfigSection& aDefaults)
+	{
+	CTestConfigSection* def = aDefaults.CopyLC();
+	CleanupStack::Pop(def);
+	delete iDefaults;
+	iDefaults = NULL;
+	iDefaults = def;
+	}
+
+
+inline const TDesC8& CTestConfigItem::Value() const
+	{
+	return *iValue;
+	}
+
+
+inline CTestConfigItem* CTestConfigItem::CopyLC() const
+	{
+	return NewLC(iParent, *iItem, *iValue);
+	}
+
+
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/simtsy/testconfigfileparser/src/testconfigfile.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -0,0 +1,610 @@
+/*
+* Copyright (c) 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: 
+*
+*/
+#include "testconfigfileparser.h"
+#include <f32file.h>
+
+
+
+#ifndef EKA2
+GLDEF_C TInt E32Dll(TDllReason/* aReason*/)	
+//
+// DLL entry point
+//
+	{
+	return (KErrNone);
+	}
+#endif
+
+
+EXPORT_C CTestConfig* CTestConfig::NewLC(RFs& aFs, const TDesC& aComponent, const TDesC& aScript)
+	{
+	CTestConfig* self = NewLC(aFs, aComponent);
+	self->ReadScriptL(aScript);
+	return self;
+	}
+
+EXPORT_C CTestConfig* CTestConfig::NewLC(RFs& aFs, const TDesC& aComponent)
+	{
+	CTestConfig* self = new (ELeave) CTestConfig(aFs);
+	CleanupStack::PushL(self);
+	self->ConstructL(aComponent);
+	return self;
+	}
+
+void CTestConfig::ConstructL(const TDesC& aComponent)
+	{
+	iComponent = aComponent.AllocL();
+	}
+
+CTestConfig::CTestConfig(RFs& aFs)
+: iFs(aFs)
+	{
+	}
+
+EXPORT_C CTestConfig::~CTestConfig()
+	{
+	iSections.ResetAndDestroy();
+	iSections.Close();
+	delete iComponent;
+	}
+
+EXPORT_C const CTestConfigSection* CTestConfig::Section(const TDesC8& aSectionName) const
+	{
+	const CTestConfigSection* section = NULL;
+	const TInt count = iSections.Count();
+		
+	for (TInt i = 0; i < count; i++) //order important
+		{
+		if (iSections[i]->SectionName().CompareF(aSectionName) == 0)
+			{
+			section = iSections[i];
+			break;
+			}
+		}
+
+	return section;
+	}
+
+EXPORT_C CTestConfigSection* CTestConfig::Section(const TDesC8& aSectionName)
+	{
+	CTestConfigSection* section = NULL;
+	const TInt count = iSections.Count();
+		
+	for (TInt i = 0; i < count; i++) //order important
+		{
+		if (iSections[i]->SectionName().CompareF(aSectionName) == 0)
+			{
+			section = iSections[i];
+			break;
+			}
+		}
+
+	return section;
+	}
+
+EXPORT_C const TDesC8& CTestConfig::ItemValue(const TDesC8& aSection, const TDesC8& aItem, const TDesC8& aDefault) const
+	{
+	const CTestConfigSection* section = Section(aSection);
+
+	if (section != NULL)
+		return section->ItemValue(aItem, aDefault);
+
+	return aDefault;
+	}
+
+EXPORT_C TInt CTestConfig::ItemValue(const TDesC8& aSection, const TDesC8& aItem, const TInt aDefault) const
+	{
+	TInt output = aDefault;
+	const CTestConfigSection* section = Section(aSection);
+
+	if (section != NULL)
+		{
+		output = section->ItemValue(aItem, aDefault);
+		}
+
+	return output;
+	}
+
+
+
+
+HBufC8* CTestConfig::ReadFileL(const TDesC& aFile) const
+	{
+	//Returns a HBufC8 with the contents of aFile
+	RFile file;
+	const TInt err = file.Open(iFs, aFile, EFileShareAny | EFileRead);
+
+	if (err != KErrNone)
+		{
+		TParse fileOut;
+		User::LeaveIfError(ResolveFile(iFs, *iComponent, aFile, fileOut));
+		User::LeaveIfError(file.Open(iFs, fileOut.FullName(), EFileShareAny | EFileRead));
+		}
+
+	CleanupClosePushL(file);
+
+	TInt size = 0;
+	User::LeaveIfError(file.Size(size));
+
+	HBufC8* contents = HBufC8::NewLC(size + 4);
+	TPtr8 contentsPtr(contents->Des());
+	User::LeaveIfError(file.Read(0, contentsPtr));
+
+	CleanupStack::Pop(contents);
+	CleanupStack::PopAndDestroy(&file);
+	return contents;
+	}
+
+EXPORT_C TInt CTestConfig::ResolveFile(RFs& aFs, const TDesC& aComponent, const TDesC& aFileName, TParse& aParseOut)
+	{
+	TFileName* savedPath = new TFileName;
+	TFileName* fileName = new TFileName;
+	if ((savedPath == NULL) || (fileName == NULL))
+		{
+		delete savedPath;
+		delete fileName;
+		return KErrNoMemory;
+		}
+
+	fileName->Append(KScriptPathSep);
+//	fileName->Append(KSmsTestFileInputBase);
+//	fileName->Append(KScriptPathSep);
+	fileName->Append(aComponent);
+	fileName->Append(KScriptPathSep);
+	fileName->Append(aFileName);
+	
+	// file finder will look in the session drive first, then Y->A,Z
+	// so set session drive to Y (save old and restore it afterwards)
+	aFs.SessionPath(*savedPath);
+	_LIT(KTopDrive,"Y:\\");
+	aFs.SetSessionPath(KTopDrive);
+    TFindFile file_finder(aFs);
+    TInt err = file_finder.FindByDir(*fileName,KNullDesC);
+	if(err==KErrNone)
+		aParseOut.Set(file_finder.File(),NULL,NULL);
+	aFs.SetSessionPath(*savedPath);
+	delete savedPath;
+	delete fileName;
+	return(err);
+	}
+
+EXPORT_C void CTestConfig::ReadScriptL(const TDesC& aScript)
+	{
+	iSections.ResetAndDestroy();
+
+	CTestConfigSection* section = NULL;
+	CTestConfigItem* currentItem = NULL;
+	TInt currentItemStart = 0;
+	CTestConfigSection* sectionDefaults = NULL;
+
+	HBufC8* scriptContents = ReadFileL(aScript);
+	CleanupStack::PushL(scriptContents);
+
+	TLex8 input(*scriptContents);
+
+	while (!input.Eos())
+		{
+		input.SkipSpaceAndMark();
+		input.SkipCharacters();
+
+		if ( input.TokenLength() == 0)    // if valid potential token
+			{
+			//end of the script file found
+			break;
+			}
+
+		const TPtrC8 token(input.MarkedToken());
+
+		if (token.CompareF(_L8("endscript")) == 0)
+			{
+			//end of the script file found
+			break;
+			}
+		else if (IsNewSection(*scriptContents, input))
+			{
+			ParseAndSetItemValueL(*scriptContents, input, currentItemStart, currentItem);
+
+			TInt mid = 1;
+			TInt len = token.Length() - 2;
+
+			const TPtrC8 sectionName(token.Mid(mid, len));
+
+			if (sectionDefaults != NULL)
+				section = CTestConfigSection::NewLC(sectionName, *sectionDefaults);
+			else
+				section = CTestConfigSection::NewLC(sectionName);
+
+			if (sectionDefaults == NULL && IsDefaultSection(section->SectionName()))
+				sectionDefaults = section;
+
+			User::LeaveIfError(iSections.Append(section));
+			CleanupStack::Pop(section);
+			}
+		else if (section != NULL)
+			{
+			TInt valueOffset;
+			TPtrC8 newItem;
+
+			if (IsNewComment(*scriptContents, input))
+				{
+				ParseAndSetItemValueL(*scriptContents, input, currentItemStart, currentItem);
+				__ASSERT_DEBUG(currentItem == NULL, User::Invariant());
+				SkipToNextLine(input);
+				}
+			else if (IsNewItem(*scriptContents, input, newItem, valueOffset))
+				{
+				ParseAndSetItemValueL(*scriptContents, input, currentItemStart, currentItem);
+				currentItemStart = input.MarkedOffset() + valueOffset;
+				currentItem = &section->AddItemL(newItem, KNullDesC8);
+				}
+			}
+		}
+
+	ParseAndSetItemValueL(*scriptContents, input, currentItemStart, currentItem);
+	CleanupStack::PopAndDestroy(scriptContents);
+	}
+
+TBool CTestConfig::IsNewSection(const TDesC8& aSource, const TLex8& aInput) const
+/**
+ * Checks whether the current marked token in aInput starts with a '[' and ends with a ']',
+ * and checks that this token is at the start of a line.
+ *
+ * @returns Whether this is a new section in the script file
+ */
+	{
+	const TPtrC8 token(aInput.MarkedToken());
+	const TInt offset(aInput.MarkedOffset());
+
+	TBool ret = token.Length() > 2 && token.Find(KScriptSectionStart) == 0;
+	ret = ret && token.Find(KScriptSectionEnd) != KErrNotFound;
+
+	if (ret && offset > 0)
+		{
+		const TPtrC8 lastChar(aSource.Mid(offset-1, 1));
+		ret = ret && (lastChar == KScriptLF || lastChar == KScriptCR);
+		}
+
+	return ret;
+	}
+
+void CTestConfig::SkipToNextLine(TLex8& aInput) const
+	{
+	const TChar cr('\n');
+
+	while (!aInput.Eos() && aInput.Peek() != cr)
+		{
+		aInput.Inc();
+		}
+	}
+
+TBool CTestConfig::IsNewItem(const TDesC8& aSource, const TLex8& aLex, TPtrC8& aItem, TInt& aStartOfVal) const
+	{
+	TBool ret(EFalse);
+
+	if (IsAtStartOfNewLine(aSource, aLex, ETrue))
+		{
+		const TPtrC8 itemEnd(KScriptItemEnd);
+		const TInt itemEndLen(itemEnd.Length());
+
+		TPtrC8 token(aLex.MarkedToken());
+
+		//First check to see if this token contains '='
+		const TInt find = token.Find(itemEnd);
+		if (find > 0)
+			{
+			aStartOfVal = find + itemEndLen;
+			aItem.Set(token.Left(find));
+			ret = ETrue;
+			}
+		else
+			{
+			aItem.Set(token);
+			aStartOfVal = token.Length();
+
+			const TPtrC8 remain(aLex.Remainder());
+			TLex8 lex(remain);
+			//Check that the next token starts with and '='
+			lex.SkipSpaceAndMark();
+			lex.SkipCharacters();
+			token.Set(lex.MarkedToken());
+
+			if (token.Find(itemEnd) == 0)
+				{
+				aStartOfVal += lex.MarkedOffset() + itemEndLen;
+				ret = ETrue;
+				}
+			}
+		}
+
+	return ret;
+	}
+
+TBool CTestConfig::IsNewComment(const TDesC8& aSource, const TLex8& aLex) const
+	{
+	TBool ret(EFalse);
+
+	const TPtrC8 token(aLex.MarkedToken());
+	const TPtrC8 commentStart(KScriptCommentStart);
+	const TInt commentStartLen(commentStart.Length());
+	const TInt tokenLen(token.Length());
+
+	if (commentStartLen <= tokenLen && token.Left(commentStartLen).Compare(commentStart) == 0)
+		{
+		ret = IsAtStartOfNewLine(aSource, aLex, ETrue);
+		}
+
+	return ret;
+	}
+
+TBool CTestConfig::IsAtStartOfNewLine(const TDesC8& aSource, const TLex8& aLex, TBool aIgnoreSpaces) const
+	{
+	TInt offset(aLex.MarkedOffset());
+	__ASSERT_ALWAYS(offset != 0, User::Invariant());
+
+	TChar ch = NULL;
+
+	if (aIgnoreSpaces)
+		{
+		while (offset--)
+			{
+			ch = aSource[offset];
+			if (ch == KScriptLFChar || ch == KScriptCRChar || !ch.IsSpace())
+				break;
+			}
+		}
+	else
+		ch = aSource[offset-1];
+
+	TBool ret(EFalse);
+
+	if (offset <= 0)
+		ret = ETrue;
+	else
+		ret = (ch == KScriptLFChar || ch == KScriptCRChar);
+
+	return ret;
+	}
+
+TBool CTestConfig::IsDefaultSection(const TDesC8& aSectionName) const
+	{
+	TBool retVal = (aSectionName.CompareF(KScriptDefaults) == 0);
+	retVal = retVal || (aSectionName.CompareF(KScriptDefault1) == 0);
+	return retVal;
+	}
+
+TPtrC8 CTestConfig::ParseValue(const TDesC8& aText, const TLex8& aInput, TInt aCurrentItemStart) const
+	{
+	const TInt mid = aCurrentItemStart;
+	const TInt len = aInput.MarkedOffset() - mid;
+	TPtrC8 ret(KNullDesC8);
+
+	if (len > 0)
+		ret.Set(aText.Mid(mid, len));
+
+	return ret;
+	}
+
+void CTestConfig::ParseAndSetItemValueL(const TDesC8& aText, const TLex8& aInput, TInt aCurrentItemStart, CTestConfigItem*& arCurrentItem)
+	{
+	if (arCurrentItem)
+		{
+		delete arCurrentItem->iValue;
+		arCurrentItem->iValue = NULL;
+
+		TPtrC8 val(ParseValue(aText, aInput, aCurrentItemStart));
+		arCurrentItem->iValue = ReplaceLC(KScriptCRLF, KScriptLF, val);
+		arCurrentItem->iValue->Des().Trim();
+		CleanupStack::Pop(arCurrentItem->iValue);
+
+		if (arCurrentItem->Item().CompareF(KScriptDefaults) == 0)
+			{
+			TName filename;
+			filename.Copy(arCurrentItem->Value());
+			CopyInDefaultsL(arCurrentItem->iParent, filename);
+			}
+		}
+
+	arCurrentItem = NULL;
+	}
+
+void CTestConfig::CopyInDefaultsL(CTestConfigSection& aSection, const TDesC& aDefaultFile)
+	{
+	CTestConfig* file = CTestConfig::NewLC(iFs, aDefaultFile);
+
+	TInt count = file->Sections().Count();
+
+	if (count > 0)
+		{
+		const CTestConfigSection& def = (*file)[0];
+		aSection.SetDefaultsL(def);
+		}
+
+	CleanupStack::PopAndDestroy(file);
+	}
+
+EXPORT_C TInt CTestConfig::CountElements(const TDesC8& aInput, TChar aDelimiter)
+	{
+	TInt pos = aInput.Length();
+	TInt count = 1;
+
+	while (pos--)
+		{
+		if (TChar(aInput[pos]) == aDelimiter)
+			count++;
+		}
+
+	return count;
+	}
+
+EXPORT_C TInt CTestConfig::GetElement(const TDesC8& aInput, TChar aDelimiter, TInt aIndex, TInt& aOutput)
+	{
+	aOutput = 0;
+	TPtrC8 string;
+	TInt err = GetElement(aInput, aDelimiter, aIndex, string, ETrue);
+
+	if (err == KErrNone)
+		{
+		TLex8 number(string);
+		err = number.Val(aOutput);
+		}
+
+	return err;
+	}
+
+EXPORT_C TInt CTestConfig::GetElement(const TDesC8& aInput, TChar aDelimiter, TInt aIndex, TPtrC8& aOutput, TBool aTrimOutput)
+	{
+	TLex8 input(aInput);
+	TInt err = KErrNone;
+	TPtrC8 ptr;
+
+	for (TInt i = 0; i <= aIndex && err == KErrNone; i++)
+		{
+		err = GetNextElement(input, aDelimiter, ptr);
+		}
+
+	if (err == KErrNone)
+		{
+		if (aTrimOutput)
+			aOutput.Set(Trim(ptr));
+		else
+			aOutput.Set(ptr);
+		}
+	else 
+		{
+		const TInt count = CountElements(aInput, aDelimiter);
+		const TInt len = aInput.Length();
+
+		if (len != 0 && count - 1 == aIndex && TChar(aInput[len-1]) == aDelimiter)
+			{
+			aOutput.Set(KNullDesC8);
+			err = KErrNone;
+			}
+		}
+
+	return err;
+	}
+
+EXPORT_C TPtrC8 CTestConfig::Trim(const TDesC8& aInput)
+	{
+	const TPtrC8 ptr(TrimLeft(aInput));
+	return TrimRight(ptr);
+	}
+
+EXPORT_C TPtrC8 CTestConfig::TrimRight(const TDesC8& aInput)
+	{
+	const TText8* first = aInput.Ptr();					// pointer to first char
+	const TText8* last = first + aInput.Length() - 1;		// pointer to last char
+	while (last >= first && TChar(*last).IsSpace()) last--;	// trim the right
+	return TPtrC8(first, last + 1 - first);				// return the result
+	}
+
+EXPORT_C TPtrC8 CTestConfig::TrimLeft(const TDesC8& aInput)
+	{
+	const TText8* first = aInput.Ptr();					// pointer to first char
+	const TText8* last = first + aInput.Length() - 1;		// pointer to last char
+	while (first < last && TChar(*first).IsSpace()) first++;	// trim the left
+	return TPtrC8(first, last + 1 - first);				// return the result
+	}
+
+
+TInt CTestConfig::GetNextElement(TLex8& aInput, TChar aDelimiter, TPtrC8& aOutput)
+	{
+	if (aInput.Eos())
+		return KErrNotFound;
+
+	//Get to the start of the descriptor
+	while (!aInput.Eos() && aInput.Peek() != aDelimiter)
+		aInput.Inc();
+
+	aOutput.Set(aInput.MarkedToken());
+	if (!aInput.Eos())
+		aInput.SkipAndMark(1);
+
+	return KErrNone;
+	}
+
+/*EXPORT_C void CTestConfig::ReplaceL(const TDesC8& aOld, const TDesC8& aNew, HBufC*& rString)
+	{
+	HBufC* repl = ReplaceLC(aOld, aNew, *rString);
+	CleanupStack::Pop(repl);
+	rString = repl;
+	}*/
+
+EXPORT_C HBufC8* CTestConfig::ReplaceLC(const TDesC8& aOld, const TDesC8& aNew, const TDesC8& aOldString)
+	{
+	HBufC8* rString = aOldString.AllocLC();
+	TInt oldLen = aOld.Length();
+	TInt newLen = aNew.Length();
+
+	if (!oldLen)
+		return rString;
+
+	for (TInt pos = 0; pos < rString->Length(); pos += newLen)
+		{
+		TPtrC8 ptrC = rString->Mid(pos);
+		TInt find = ptrC.Find(aOld);
+
+		if (find == KErrNotFound)
+			return rString;
+	
+		pos += find;
+
+		if (newLen > oldLen)
+			{
+			rString = rString->ReAllocL(rString->Length() + newLen - oldLen);
+			CleanupStack::Pop();
+			CleanupStack::PushL(rString);
+			}
+
+		TPtr8 ptr(rString->Des());
+		ptr.Replace(pos, oldLen, aNew);
+		}
+
+	return rString;
+	}
+
+
+EXPORT_C void CTestConfig::WriteFileL(const TDesC& aFileName)
+	{
+	RFile file;
+	User::LeaveIfError(file.Replace(iFs, aFileName, EFileShareAny | EFileWrite));
+	CleanupClosePushL(file);
+
+	const TInt count = iSections.Count();
+	
+	for (TInt i=0; i < count; i++)
+		iSections[i]->WriteL(file);
+
+	User::LeaveIfError(file.Flush());
+	CleanupStack::PopAndDestroy();  //file
+	}
+
+EXPORT_C TBool CTestConfig::operator==(const CTestConfig& aFile) const
+	{
+	TInt count = iSections.Count();
+	if (count != aFile.Sections().Count())
+		return EFalse;
+
+	TBool retVal = ETrue;
+
+	while (count-- && retVal)
+		{
+		retVal = retVal && (*iSections[count] == aFile[count]);
+		}
+
+	return retVal;
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/simtsy/testconfigfileparser/src/testconfigitem.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -0,0 +1,68 @@
+/*
+* Copyright (c) 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: 
+*
+*/
+#include "testconfigfileparser.h"
+#include <f32file.h>
+
+CTestConfigItem::CTestConfigItem(CTestConfigSection& aParent)
+: iParent(aParent)
+	{
+	}
+
+void CTestConfigItem::ConstructL(const TDesC8& aItem, const TDesC8& aValue)
+	{
+	iItem = aItem.AllocL();
+	iValue = aValue.AllocL();
+	}
+
+EXPORT_C CTestConfigItem::~CTestConfigItem()
+	{
+	delete iItem;
+	delete iValue;
+	}
+
+EXPORT_C CTestConfigItem* CTestConfigItem::NewLC(CTestConfigSection& aParent, const TDesC8& aItem, const TDesC8& aValue)
+	{
+	CTestConfigItem* self = new (ELeave) CTestConfigItem(aParent);
+	CleanupStack::PushL(self);
+	self->ConstructL(aItem, aValue);
+	return self;
+	}
+
+void CTestConfigItem::WriteL(RFile& aFile) const
+	{
+		//Write the section name
+	HBufC8* buf = HBufC8::NewLC(iItem->Length());
+	TPtr8 ptr(buf->Des());
+
+	ptr.Copy(*iItem);
+	User::LeaveIfError(aFile.Write(*buf));
+	User::LeaveIfError(aFile.Write(KScriptItemEnd8));
+	User::LeaveIfError(aFile.Write(KScriptSpace8));
+	CleanupStack::PopAndDestroy(buf);
+
+	HBufC8* val = CTestConfig::ReplaceLC(KScriptLF, KScriptCRLF, *iValue);
+
+	buf = HBufC8::NewLC(val->Length());
+	ptr.Set(buf->Des());
+	ptr.Copy(*val);
+
+	User::LeaveIfError(aFile.Write(*buf));
+	User::LeaveIfError(aFile.Write(KScriptCRLF8));
+
+	CleanupStack::PopAndDestroy(buf);
+	CleanupStack::PopAndDestroy(val);
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/simtsy/testconfigfileparser/src/testconfigsection.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -0,0 +1,312 @@
+/*
+* Copyright (c) 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: 
+*
+*/
+#include "testconfigfileparser.h"
+#include <f32file.h>
+
+
+//
+// CTestConfigSection
+//
+
+CTestConfigSection::CTestConfigSection()
+	: CBase()
+	{
+	}
+
+EXPORT_C CTestConfigSection* CTestConfigSection::NewLC(const TDesC8& aSectionName, CTestConfigSection& aDefaults)
+	{
+	CTestConfigSection* self = new (ELeave) CTestConfigSection();
+	CleanupStack::PushL(self);
+	self->iDefaults = aDefaults.CopyLC();
+	CleanupStack::Pop(self->iDefaults);
+	self->ConstructL(aSectionName);
+	return self;
+	}
+
+EXPORT_C CTestConfigSection* CTestConfigSection::NewLC(const TDesC8& aSectionName)
+	{
+	CTestConfigSection* self = new (ELeave) CTestConfigSection();
+	CleanupStack::PushL(self);
+	self->ConstructL(aSectionName);
+	return self;
+	}
+
+void CTestConfigSection::ConstructL(const TDesC8& aSectionName)
+	{
+	iSectionName = aSectionName.AllocL();
+	}
+
+EXPORT_C const TDesC8& CTestConfigSection::ItemValue(const TDesC8& aItem, const TDesC8& aDefault) const
+	{
+	const CTestConfigItem* sectionItem = Item(aItem);
+
+	if (sectionItem != NULL)
+		{
+		const TPtrC8 value(sectionItem->Value());
+
+		if (iDefaults != NULL && (value.CompareF(KScriptDefault1) == 0 || value.CompareF(KScriptDefault2) == 0))
+			{
+			return iDefaults->ItemValue(aItem, aDefault);
+			}
+		else
+			{
+			return sectionItem->Value();
+			}
+		}
+	else if (iDefaults != NULL)
+		{
+		return iDefaults->ItemValue(aItem, aDefault);
+		}
+	else
+		{
+		return aDefault;
+		}
+	}
+
+
+EXPORT_C TInt CTestConfigSection::ItemValue(const TDesC8& aItem, const TInt aDefault) const
+	{
+	const TDesC8& value = ItemValue(aItem, KNullDesC8);
+
+	if (value.Length() == 0)
+		{
+		if (iDefaults != NULL)
+			return iDefaults->ItemValue(aItem, aDefault);
+		else
+			return aDefault;
+		}
+
+	TLex8 input(value);
+	TInt ret = aDefault;
+	TInt err = input.Val(ret);
+	
+	if (err)
+		{
+		if (iDefaults != NULL)
+			return iDefaults->ItemValue(aItem, aDefault);
+		else
+			return aDefault;
+		}
+
+	return ret;
+	}
+
+EXPORT_C CTestConfigItem& CTestConfigSection::AddItemL(const TDesC8& aItem, const TDesC8& aValue)
+	{
+	CTestConfigItem* sectionItem = CTestConfigItem::NewLC(*this, aItem, aValue);
+	User::LeaveIfError(iItems.Append(sectionItem));
+	CleanupStack::Pop(sectionItem);
+	return *sectionItem;
+	}
+
+EXPORT_C void CTestConfigSection::DeleteItemsL(const TDesC8& aItem)
+	{
+	TInt count = iItems.Count();
+
+	//Remove existing CTestConfigItems that have the same item name
+	while (count--)
+		{
+		CTestConfigItem* sectionItem = iItems[count];
+
+		if (sectionItem->Item().CompareF(aItem) == 0)
+			{
+			delete sectionItem;
+			iItems.Remove(count);
+			}
+		}	
+	}
+
+
+EXPORT_C CTestConfigSection::~CTestConfigSection()
+	{
+	iItems.ResetAndDestroy();
+	iItems.Close();
+
+	delete iSectionName;
+	delete iDefaults;
+	}
+
+EXPORT_C CTestConfigSection* CTestConfigSection::CopyLC() const
+	{
+	TInt count = iItems.Count();
+	CTestConfigSection* copy = NULL;
+
+	if (iDefaults != NULL)
+		copy = CTestConfigSection::NewLC(SectionName(), *iDefaults);
+	else
+		copy = CTestConfigSection::NewLC(SectionName());
+		
+	while (count--)
+		{
+		CTestConfigItem* item = iItems[count]->CopyLC();
+		User::LeaveIfError(copy->iItems.Append(item));
+		CleanupStack::Pop(item);
+		}
+
+	return copy;
+	}
+
+void CTestConfigSection::WriteL(RFile& aFile) const
+	{
+	//Write the section name
+	HBufC8* buf = HBufC8::NewLC(iSectionName->Length());
+	buf->Des().Copy(*iSectionName);
+
+	User::LeaveIfError(aFile.Write(KScriptSectionStart));
+	User::LeaveIfError(aFile.Write(*buf));
+	User::LeaveIfError(aFile.Write(KScriptSectionEnd));
+	User::LeaveIfError(aFile.Write(KScriptCRLF8));
+
+	CleanupStack::PopAndDestroy(buf);
+	const TInt count = iItems.Count();
+
+	//Write the items
+	for (TInt i = 0; i < count; i++)
+		iItems[i]->WriteL(aFile);
+
+	User::LeaveIfError(aFile.Write(KScriptCRLF8));
+	}
+
+TBool CTestConfigSection::operator==(const CTestConfigSection& aSection) const
+	{
+	TInt count = iItems.Count();
+
+	if (count != aSection.Items().Count())
+		return EFalse;
+
+	TBool retVal = (*iSectionName == aSection.SectionName());
+
+	while (count-- && retVal)
+		{
+		retVal = retVal && (*iItems[count] == aSection[count]);
+		}
+
+	return retVal;
+	}
+
+EXPORT_C const CTestConfigItem* CTestConfigSection::Item(const TDesC8& aItem) const
+	{
+	const CTestConfigItem* sectionItem = NULL;
+	const TInt count = iItems.Count();
+	for (TInt i = 0; i < count; i++)
+		{
+		if (iItems[i]->Item().CompareF(aItem) == 0)
+			{
+			sectionItem = iItems[i];
+			break;
+			}
+		}
+	return sectionItem;
+	}
+
+EXPORT_C CTestConfigItem* CTestConfigSection::Item(const TDesC8& aItem)
+	{
+	CTestConfigItem* sectionItem = NULL;
+	const TInt count = iItems.Count();
+	for (TInt i = 0; i < count; i++)
+		{
+		if (iItems[i]->Item().CompareF(aItem) == 0)
+			{
+			sectionItem = iItems[i];
+			break;
+			}
+		}
+	return sectionItem;
+	}
+
+EXPORT_C const CTestConfigItem* CTestConfigSection::Item(const TDesC8& aItem,TInt aIndex) const
+	{
+	const CTestConfigItem* sectionItem = NULL;
+	const TInt count = iItems.Count();
+	TInt foundItemCnt=0;
+	for (TInt i = 0; i < count; i++)
+		{
+		if (iItems[i]->Item().CompareF(aItem) == 0)
+			{
+			if(foundItemCnt++==aIndex)
+				{
+				sectionItem = iItems[i];
+				break;
+				}
+			}
+		}
+	return sectionItem;
+	}
+
+EXPORT_C CTestConfigItem* CTestConfigSection::Item(const TDesC8& aItem,TInt aIndex)
+	{
+	CTestConfigItem* sectionItem = NULL;
+	const TInt count = iItems.Count();
+	TInt foundItemCnt=0;
+	for (TInt i = 0; i < count; i++)
+		{
+		if (iItems[i]->Item().CompareF(aItem) == 0)
+			{
+			if(foundItemCnt++==aIndex)
+				{
+				sectionItem = iItems[i];
+				break;
+				}
+			}
+		}
+	return sectionItem;
+	}
+
+EXPORT_C void CTestConfigSection::ItemsL(RPointerArray<CTestConfigItem>& aArray, const TDesC8& aItemTag)
+	{
+	aArray.Reset();
+	const TInt count = iItems.Count();
+
+	for (TInt i = 0; i < count; i++) //< Order important
+		{
+		CTestConfigItem& item = *iItems[i];
+
+		if (item.Item().CompareF(aItemTag) == 0)
+			{
+			User::LeaveIfError(aArray.Append(&item));
+			}
+		}
+	}
+
+EXPORT_C void CTestConfigSection::ItemsL(RPointerArray<const CTestConfigItem>& aArray, const TDesC8& aItemTag) const
+	{
+	aArray.Reset();
+	const TInt count = iItems.Count();
+
+	for (TInt i = 0; i < count; i++) //< Order important
+		{
+		const CTestConfigItem& item = *iItems[i];
+
+		if (item.Item().CompareF(aItemTag) == 0)
+			{
+			User::LeaveIfError(aArray.Append(&item));
+			}
+		}
+	}
+
+
+EXPORT_C TInt CTestConfigSection::ItemCount(const TDesC8& aItem) const
+	{
+	const TInt count = iItems.Count();
+	TInt foundItemCnt=0;
+	for (TInt i = 0; i < count; i++)
+		{
+		if (iItems[i]->Item().CompareF(aItem) == 0)
+			foundItemCnt++;
+		}
+	return foundItemCnt;
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/simtsy/testconfigfileparser/test/t_testconfigfileparser.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -0,0 +1,261 @@
+// Copyright (c) 2001-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:
+// Tests classes defined in testconfigfileparser.h
+// 
+//
+
+/**
+ @file t_testconfigfileparser.cpp
+ @since Hurricane
+ @copyright Copyright (c) 2001 Symbian Ltd.  All rights reserved.
+*/
+
+#include <autotest.h>
+#include <e32base.h>
+#include <e32test.h>		//< for RTest
+#include "testconfigfileparser.h"
+#include <f32file.h>
+
+
+_LIT(KTestScriptFile, "t_testconfigfileparser.txt");
+_LIT(KTestScriptComponent, "testscripts");
+_LIT(KTestScriptComponentFull, "\\testscripts\\");
+_LIT(KTestScriptOutput, "c:\\output.txt");
+
+CAutoTest* gAutoTest;
+RTest gTest(_L("Test Config File Test"));
+
+void TestGetElementL(TInt aTestCase, const TDesC8& aInput, TChar aDel, TInt aIndex, const TDesC8& aExpected, TBool aTrimOutput=ETrue)
+	{
+	TPtrC8 item(KNullDesC8);
+	const TInt err = CTestConfig::GetElement(aInput, aDel, aIndex, item, aTrimOutput);
+
+	const TInt KPrintfMaxLen = 200;
+	TBuf<KPrintfMaxLen> temp;
+
+	if (aInput.Length() <= KPrintfMaxLen)
+		{
+		temp.Copy(aInput);
+		gTest.Printf(_L("aInput=\"%S\" "), &temp);
+		}
+	else
+		gTest.Printf(_L("aInput=TOO LONG "));
+
+	gTest.Printf(_L("aIndex=%d "), aIndex);
+	gTest.Printf(_L("aTimeOutput=%d "), aTrimOutput);
+
+	if (aExpected.Length() <= KPrintfMaxLen)
+		{
+		temp.Copy(aExpected);
+		gTest.Printf(_L("aExpected=\"%S\" "), &temp);
+		}
+	else
+		gTest.Printf(_L("aExpected=TOO LONG "));
+
+	if (item.Length() <= KPrintfMaxLen)
+		{
+		temp.Copy(item);
+		gTest.Printf(_L("Get=\"%S\" "), &temp);
+		}
+	else
+		gTest.Printf(_L("Get=TOO LONG "));
+
+	gTest.Printf(_L("Err=%d\n"), err);
+
+	GLOBAL_CHECKPOINT_COMPARE(err, KErrNone, _L("Error getting element"));
+
+	temp.Format(_L("Element not expected [test=%d"), aTestCase);
+	GLOBAL_CHECKPOINT_COMPARE(!(item == aExpected), EFalse, temp);
+	}
+
+void TestGetElementL(const CTestConfig& aFile)
+	{
+	TInt sectionCount = aFile.Sections().Count();
+
+	while (sectionCount--)
+		{
+		const CTestConfigSection& section = aFile[sectionCount];
+
+		TInt itemCount = section.Items().Count();
+
+		while (itemCount--)
+			{
+			const CTestConfigItem& item = section[itemCount];
+			TPtrC8 output(KNullDesC8);
+			aFile.GetElement(item.Value(), ',', 0, output);
+			}
+		}
+	}
+
+void TestParseFileL()
+	{
+	RFs fs;
+	User::LeaveIfError(fs.Connect());
+	CleanupClosePushL(fs);
+
+	TFindFile findFile(fs);
+	_LIT(KWild, "*.txt");
+
+	CDir* dirs=NULL;
+	User::LeaveIfError(findFile.FindWildByDir(KWild, KTestScriptComponentFull, dirs));
+
+	TInt count = dirs->Count();
+
+	while (count--)
+		{
+		const TFileName fileName((*dirs)[count].iName);
+
+		CTestConfig* file = CTestConfig::NewLC(fs, KTestScriptComponent, fileName); 
+
+		file->WriteFileL(KTestScriptOutput);
+
+		CTestConfig* output = CTestConfig::NewLC(fs, KTestScriptComponent, KTestScriptOutput); 
+
+		TBool test = (*output == *file);
+
+		GLOBAL_CHECKPOINT_COMPARE(!test, EFalse, _L("Output != File"));
+
+		TestGetElementL(*file);
+
+		CleanupStack::PopAndDestroy(output);
+		CleanupStack::PopAndDestroy(file);
+		}
+
+	CleanupStack::PopAndDestroy(&fs);
+	}
+
+const TInt del = ';';
+_LIT8(KFirst, "First");
+_LIT8(KMiddle, "Middle");
+_LIT8(KLast, "Last");
+_LIT8(KElem1, "First;Middle;Last");
+_LIT8(KElem2, "    First;           ;Last");
+_LIT8(KElem3, ";   Middle       ;Last");
+_LIT8(KElem4, "First;Middle;     ");
+_LIT8(KElem5, ";;");
+
+void TestGetElementL()
+	{
+	TInt testCase = 0;
+
+	TestGetElementL(++testCase, KElem1, del, 0, KFirst);
+	TestGetElementL(++testCase, KElem1, del, 1, KMiddle);
+	TestGetElementL(++testCase, KElem1, del, 2, KLast);
+
+	TestGetElementL(++testCase, KElem2, del, 0, KFirst);
+	TestGetElementL(++testCase, KElem2, del, 1, KNullDesC8);
+	TestGetElementL(++testCase, KElem2, del, 2, KLast);
+
+	TestGetElementL(++testCase, KElem3, del, 0, KNullDesC8);
+	TestGetElementL(++testCase, KElem3, del, 1, KMiddle);
+	TestGetElementL(++testCase, KElem3, del, 2, KLast);
+
+	TestGetElementL(++testCase, KElem4, del, 0, KFirst);
+	TestGetElementL(++testCase, KElem4, del, 1, KMiddle);
+	TestGetElementL(++testCase, KElem4, del, 2, KNullDesC8);
+
+	TestGetElementL(++testCase, KElem5, del, 0, KNullDesC8);
+	TestGetElementL(++testCase, KElem5, del, 1, KNullDesC8);
+	TestGetElementL(++testCase, KElem5, del, 2, KNullDesC8);
+	}
+
+void PrepareBuf(TDes8& aOutput, TInt aLeadingSpaces, const TDesC8& aInput, TInt aTrailingSpaces)
+	{
+	const TInt KSpace = ' ';
+	aOutput.Zero();
+	aOutput.AppendFill(KSpace, aLeadingSpaces);
+	aOutput.Append(aInput);
+	aOutput.AppendFill(KSpace, aTrailingSpaces);
+	}
+
+void TestGetElementWithoutTrimL()
+	{
+	TInt testCase = 0;
+	TBuf8<32> temp;
+
+	TestGetElementL(++testCase, KElem1, del, 0, KFirst, EFalse);
+	TestGetElementL(++testCase, KElem1, del, 1, KMiddle, EFalse);
+	TestGetElementL(++testCase, KElem1, del, 2, KLast, EFalse);
+
+	PrepareBuf(temp, 4, KFirst, 0);
+	TestGetElementL(++testCase, KElem2, del, 0, temp, EFalse);
+	PrepareBuf(temp, 11, KNullDesC8, 0);
+	TestGetElementL(++testCase, KElem2, del, 1, temp, EFalse);
+	TestGetElementL(++testCase, KElem2, del, 2, KLast, EFalse);
+
+	TestGetElementL(++testCase, KElem3, del, 0, KNullDesC8, EFalse);
+	PrepareBuf(temp, 3, KMiddle, 7);
+	TestGetElementL(++testCase, KElem3, del, 1, temp, EFalse);
+	TestGetElementL(++testCase, KElem3, del, 2, KLast, EFalse);
+
+	TestGetElementL(++testCase, KElem4, del, 0, KFirst, EFalse);
+	TestGetElementL(++testCase, KElem4, del, 1, KMiddle, EFalse);
+	PrepareBuf(temp, 5, KNullDesC8, 0);
+	TestGetElementL(++testCase, KElem4, del, 2, temp, EFalse);
+
+	TestGetElementL(++testCase, KElem5, del, 0, KNullDesC8, EFalse);
+	TestGetElementL(++testCase, KElem5, del, 1, KNullDesC8, EFalse);
+	TestGetElementL(++testCase, KElem5, del, 2, KNullDesC8, EFalse);
+
+	TPtrC8 output;
+	const TInt err = CTestConfig::GetElement(KNullDesC8, 0, 0, output);
+	GLOBAL_CHECKPOINT(err != KErrNone);
+	}
+
+
+// Set up the array of test functions, which make the API calls
+LOCAL_C const TAutoTestCase Cases[] =
+	{
+	{TestParseFileL,_S("Parse File")},
+	{TestGetElementL,_S("Get Element")},
+	{TestGetElementWithoutTrimL,_S("Get Element Without Trim")}
+	};
+
+void AutoTestExecuteL()
+	{
+	_LIT(KDummyTests,"TestConfigFileParser_testreport.txt");
+	_LIT8(KComponentInfo,"TestConfigFileParser");
+	// Library defined macro
+	// Uses a global pointer instance of CAutoTest
+	GLOBAL_AUTOTEST_EXECUTE(Cases, KDummyTests, KComponentInfo, gTest);
+	}
+
+TInt E32Main()
+/**
+ * Main
+ */
+	{
+	CTrapCleanup* cleanup = CTrapCleanup::New();
+
+	__UHEAP_MARK;
+
+	gTest.SetLogged(ETrue);
+	gTest.Title();
+	gTest.Start(_L("Starting tests..."));
+
+	TRAPD(err, AutoTestExecuteL());
+
+	if (err!=KErrNone)
+		gTest.Printf(_L("ERROR: Leave %d\n"),err);
+
+	gTest.Printf(_L("Test Complete. Press any key ...\n"));
+	gTest.Getch();
+	gTest.End();
+	gTest.Close();
+
+	__UHEAP_MARKEND;
+
+	delete cleanup;
+	return KErrNone;
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/simtsy/testconfigfileparser/test/t_testconfigfileparser.mmp	Tue Sep 14 17:55:14 2010 +0100
@@ -0,0 +1,36 @@
+// Copyright (c) 2001-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:
+// Test harness for testscripts
+// 
+//
+
+/**
+ @file t_testconfigfileparser.mmp
+ @since Hurricane
+*/
+
+
+TARGET        t_testconfigfileparser.exe
+TARGETTYPE    exe
+
+USERINCLUDE	..\inc
+SOURCE		t_testconfigfileparser.cpp
+
+
+SYSTEMINCLUDE \epoc32\include
+LIBRARY       euser.lib efsrv.lib testconfigfileparser.lib autotest.lib
+
+
+
+VENDORID 0x70000001
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/simtsy/testconfigfileparser/test/t_testconfigfileparser.txt	Tue Sep 14 17:55:14 2010 +0100
@@ -0,0 +1,54 @@
+[Defaults]
+
+#This is a comment
+
+Item1=This is item 1
+Item2 = This is item 2
+Item3= Thisitem3
+       Item4= Thisitem4
+       Item5=Thisitem5
+       Item6 =Thisitem6
+       Item7 = Thisitem7
+Item8          =          Thisitem8
+           	Item9          =          Thisitem9
+Item10=Thisitem10=9348092384
+Item11=Thisitem11=9348092384
+Item12=Thisitem12 = 9348092384=lksdjflskjf = 9348092384 = lksdjflskjf
+
+Test=Blah
+Test =Blah
+Test= Blah
+Test = Blah
+
+#This is my first comment
+
+[Section1]
+Section11= Section11Item
+Section12= Section12Item
+#This is my second comment
+Section122= Section12Item Hello
+
+[Section3]
+Section21= Section21Item Section22= blah blah blah Section23= tu tu tu
+Section24= Multi
+Line
+#This is my third comment
+Section Item < Note: this will be ignored
+#This is my fourth comment
+
+[Section4]
+RepeatItem= 1
+RepeatItem= 2
+RepeatItem= 3
+RepeatItem= 4
+RepeatItem= 5
+RepeatItem= 6
+RepeatItem= 7
+RepeatItem= 8
+
+endscript
+
+#This is my fifth comment
+
+[Section4]
+NotExpected= Nothing
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/simtsy/testconfigfileparser/test/t_testconfigfileparser2.txt	Tue Sep 14 17:55:14 2010 +0100
@@ -0,0 +1,167 @@
+[SendAndReceiveDifferentClasses0]
+#Messages
+Message= 1, SendAndReceiveDifferentClasses class is _
+#Classes
+SmsClass1= 0
+SmsClass2= 1
+SmsClass3= 2
+SmsClass4= 3
+
+
+[SendAndReceiveIndicatorMsgs0]
+#Messages
+Message= 1, VoicemailMessageWaiting WaitingIndication7Bit IndicationActive
+Message= 2, VoicemailMessageWaiting WaitingIndication7Bit IndicationInactive
+Message= 3, VoicemailMessageWaiting WaitingIndicationUCS2 IndicationActive
+Message= 4, FaxMessageWaiting WaitingIndication7Bit IndicationInactive
+Message= 5, ElectronicMailMessageWaiting WaitingIndication7Bit IndicationInactive
+Message= 6, FaxOtherMessageWaiting WaitingIndication7Bit IndicationActive
+Message= 7, VoicemailMessageWaiting WaitingIndicationDiscardMessage IndicationActive
+
+#IndicationTypes
+IndicationType1= 0 #ESmsVoicemailMessageWaiting
+IndicationType2= 0 
+IndicationType3= 0 
+IndicationType4= 1 #ESmsFaxMessageWaiting
+IndicationType5= 2 #ESmsElectronicMailMessageWaiting
+IndicationType6= 3 #ESmsFaxOtherMessageWaiting
+IndicationType7= 0 
+
+#DCSBits7To4s
+DCSBits7To41= 208 #0xD0 ESmsDCSMessageWaitingIndication7Bit
+DCSBits7To42= 208
+DCSBits7To43= 224 #0xE0 ESmsDCSMessageWaitingIndicationUCS2
+DCSBits7To44= 208
+DCSBits7To45= 208
+DCSBits7To46= 208
+DCSBits7To47= 192 #0xC0 ESmsDCSMessageWaitingIndicationDiscardMessage
+
+#IndicationStates
+IndicationState1= 8 #0x08 ESmsIndicationActive
+IndicationState2= 0 #0x00 ESmsIndicationInactive
+IndicationState3= 8
+IndicationState4= 0
+IndicationState5= 0
+IndicationState6= 8
+IndicationState7= 8
+
+
+[SendMsgsWithDifferentVP0]
+Message= 1, Message with validity period in minutes _
+
+#ValidityPeriods
+ValidityPeriod1= 60
+ValidityPeriod2= 120
+ValidityPeriod3= 240
+ValidityPeriod4= 480
+
+
+[CommandMessages0]
+Message= 1, test message length 22
+
+
+[SendAndRecvMsgsWithDifferentTON0]
+#Messages
+Message= 1, Test message.
+
+#Alphabets
+Alphabet1= 0 # ESmsAlphabet7Bit=0x00
+
+#TypeOfNumbers
+TypeOfNumber1= 0  #EGsmSmsTONUnknown=0x00
+TypeOfNumber2= 16 #EGsmSmsTONInternationalNumber=0x10
+TypeOfNumber3= 32 #EGsmSmsTONNationalNumber=0x20
+TypeOfNumber4= 48 #EGsmSmsTONNetworkSpecificNumber=0x30
+TypeOfNumber5= 96 #EGsmSmsTONAbbreviatedNumber=0x60
+TypeOfNumber6= 64 #EGsmSmsTONSubscriberNumber=0x40
+
+
+[SmartMessaging0]
+#Pdus
+PDU= 021B504A20543A5585510540D19082956108CD0549D06090045500008500
+
+#Messages
+Message= 1, BEGIN:VCALENDAR\nVERSION:1.0\nBEGIN:VEVENT\nCATEGORIES:MEETING\nSTATUS:TENTATIVE\nDTSTART:20010401T033000Z\nDTEND:20010401T043000Z\nSUMMARY:Messaging Meeting\nDESCRIPTION:Britney and Justin to review newest proposal material\nCLASS:PRIVATE\nEND:VEVENT\nEND:VCALENDAR
+Message= 2, BEGIN:VCARD\nVERSION:2.1\nN:Kukkonen;Sami\nTEL;PREF:+358503878682\nEND:VCARD
+Message= 3, 024A3A51D195CDD004001B20550590610560558550548540820849900000
+
+#IEIDatas
+ieiData11= 35  #0x23 Destination port 0x23F5
+ieiData12= 245 #0xF5
+ieiData13= 0   #0x00 Originator port 0x0000
+ieiData14= 0   #0x00
+ieiData21= 35  #0x23 Destination port 0x23F4
+ieiData22= 244 #0xF4
+ieiData23= 0   #0x00 Originator port 0x0000
+ieiData24= 0   #0x00
+ieiData31= 21  #0x15 Destination port 0x1581
+ieiData32= 129 #0x81
+ieiData33= 0   #0x00 Originator port 0x0000
+ieiData34= 0   #0x00
+
+#InformationElements
+InformationElement1= 5  #ESmsIEIApplicationPortAddressing16Bit
+InformationElement2= 4  #ESmsIEIApplicationPortAddressing8Bit
+InformationElement3= 5
+
+#Alphabets
+Alphabet1= 0 # ESmsAlphabet7Bit=0x00
+Alphabet2= 0
+Alphabet3= 4 # ESmsAlphabet8Bit=0x04
+
+
+[SendSMS2Port00000]
+Message= 1, //SCKL0000
+Message= 2, //SCKL23F4 \nBEGIN:VCARD\nVERSION:2.1\nNAME:HOWE\nTEL:+447747065825\nEND:VCARD
+
+
+# Used values:
+#
+# 	enum TSmsClass
+# 		{
+# 		ESmsClass0=0x00,
+# 		ESmsClass1=0x01,
+# 		ESmsClass2=0x02,
+# 		ESmsClass3=0x03,
+# 		};
+# 
+# 	enum TSmsIndicationType
+# 		{
+# 		ESmsVoicemailMessageWaiting=0x00,
+# 		ESmsFaxMessageWaiting=0x01,
+# 		ESmsElectronicMailMessageWaiting=0x02,
+# 		ESmsFaxOtherMessageWaiting=0x03,
+# 		};
+# 	enum TSmsDCSBits7To4
+# 		{
+# 		ESmsDCSTextUncompressedWithNoClassInfo=0x00,
+# 		ESmsDCSTextUncompressedWithClassInfo=0x10,
+# 		ESmsDCSTextCompressedWithNoClassInfo=0x20,
+# 		ESmsDCSTextCompressedWithClassInfo=0x30,
+# 		ESmsDCSMessageWaitingIndicationDiscardMessage=0xC0,
+# 		ESmsDCSMessageWaitingIndication7Bit=0xD0,  //  7 bit User data 
+# 		ESmsDCSMessageWaitingIndicationUCS2=0xE0,  //  unicode User data 
+# 		ESmsDCSTextUncompressed7BitOr8Bit=0xF0,
+# 		ESmsDCSBits7To4Mask=0xF0
+# 		};
+# 	enum TSmsIndicationState
+# 		{
+# 		ESmsIndicationInactive=0x00,
+# 		ESmsIndicationActive=0x08,
+# 		};
+# 	enum TGsmSmsTypeOfNumber
+# 		{
+# 		EGsmSmsTONUnknown=0x00,
+# 		EGsmSmsTONInternationalNumber=0x10,
+# 		EGsmSmsTONNationalNumber=0x20,
+# 		EGsmSmsTONNetworkSpecificNumber=0x30,
+# 		EGsmSmsTONSubscriberNumber=0x40,
+# 		EGsmSmsTONAlphaNumeric=0x50,
+# 		EGsmSmsTONAbbreviatedNumber=0x60,
+# 		EGsmSmsTONReserverved=0x70,
+# 		};
+
+
+
+
+
--- a/telephonyutils/telephonywatchers/group/telwatcher_test.pkg	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyutils/telephonywatchers/group/telwatcher_test.pkg	Tue Sep 14 17:55:14 2010 +0100
@@ -16,6 +16,6 @@
 "\sf\os\cellularsrv\telephonyutils\telephonywatchers\Test\TE_TelWatchers\TE_TelWatchers.cfg"-"c:\testdata\configs\TE_TelWatchers.cfg"
 "\sf\os\cellularsrv\telephonyutils\telephonywatchers\Test\TE_TelWatchers\TE_TelWatchers_config.txt"-"c:\testdata\configs\TE_TelWatchers_config.txt"
 
-"\sf\os\cellularsrv\telephonyutils\telephonywatchers\Test\TE_TelWatchers\TE_TelWatchers.script"-"c:\testdata\scripts\TE_TelWatchers.script"
 
 
+
--- a/wapstack/wapmessageapi/group/wapmessage_test.pkg	Mon Aug 09 17:43:08 2010 +0100
+++ b/wapstack/wapmessageapi/group/wapmessage_test.pkg	Tue Sep 14 17:55:14 2010 +0100
@@ -14,9 +14,9 @@
 //
 
 
-"\sf\os\cellularsrv\wapstack\te_wapstack\testdata\WapStackSuite_Config.ini"-"c:\testdata\configs\WapStackSuite_Config.ini"
-"\sf\os\cellularsrv\wapstack\te_wapstack\testdata\WapStackSuite.ini"-"c:\testdata\configs\WapStackSuite.ini"
-"\sf\os\cellularsrv\wapstack\te_wapstack\scripts\Te_WapStackSuite.script"-"c:\testdata\scripts\Te_WapStackSuite.script"
+"\sf\os\cellularsrv\wapstack\wapmessageapi\te_wapstack\testdata\WapStackSuite_Config.ini"-"c:\testdata\configs\WapStackSuite_Config.ini"
+"\sf\os\cellularsrv\wapstack\wapmessageapi\te_wapstack\testdata\WapStackSuite.ini"-"c:\testdata\configs\WapStackSuite.ini"
+"\sf\os\cellularsrv\wapstack\wapmessageapi\te_wapstack\scripts\Te_WapStackSuite.script"-"c:\testdata\scripts\Te_WapStackSuite.script"