# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1282119500 -10800
# Node ID 78fceed50f62e98917d4c3195c09e2a7b7b2ead0
# Parent  88121cf7904512a7a2d231438a0f82de0fb38c08
Revision: 201033
Kit: 201033

diff -r 88121cf79045 -r 78fceed50f62 build.config.xml
--- a/build.config.xml	Tue Jul 06 16:04:34 2010 +0300
+++ b/build.config.xml	Wed Aug 18 11:18:20 2010 +0300
@@ -97,12 +97,61 @@
   <systemModel>
     <layer name="os_layer">
       <module name="networkingsrv">
-	  	<unit unitID="NetSrvDo.buildall" mrp="" bldFile="sf\os\networkingsrv\group" name="networkingsrv" />
+	  	<unit unitID="production1" mrp="" bldFile="sf\os\networkingsrv\group" name="production1" />
       </module>
     </layer>
 	<layer name="api_test_layer">
       <module name="networkingsrv_test">
-        <unit unitID="NetSrvDo.networkingsrv_test" mrp="" bldFile="sf\os\networkingsrv\group" name="networkingsrv_test" />
+        <unit unitID="test50" mrp="" bldFile="sf\os\networkingsrv\group" name="test50" />
+		<unit unitID="test1" mrp="" bldFile="sf\os\commsfw\commsconfig\commsdatabaseshim\group" name="test1" />
+		<unit unitID="test2" mrp="" bldFile="sf\os\commsfw\commsfwtools\preparedefaultcommsdatabase\group" name="test2" />
+		<unit unitID="test3" mrp="" bldFile="sf\os\commsfw\commsfwtools\preparedefaultcommsdatabase\defaultcommdb\group" name="test3" />
+		<unit unitID="test4" mrp="" bldFile="sf\os\commsfw\commsfwtools\preparedefaultcommsdatabase\installdefaultcommdb\group" name="test4" />
+		<unit unitID="test5" mrp="" bldFile="sf\os\commsfw\commsfwsupport\commselements\commsfw\group" name="test5" />
+		<unit unitID="test6" mrp="" bldFile="sf\os\commsfw\commsfwsupport\commselements\group" name="test6" />
+		<unit unitID="test7" mrp="" bldFile="sf\os\commsfw\commsfwtools\commstools\group" name="test7" />
+		<unit unitID="test8" mrp="" bldFile="sf\os\commsfw\commsfwtools\commstools\messageinterceptregister\group" name="test8" />
+		<unit unitID="test9" mrp="" bldFile="sf\os\persistentdata\loggingservices\filelogger\group" name="test9" />
+		<unit unitID="test10" mrp="" bldFile="sf\os\commsfw\commsfwutils\commsbufs\group" name="test10" />
+		<unit unitID="test11" mrp="" bldFile="sf\os\networkingsrv\linklayercontrol\networkinterfacemgr\group" name="test11" />
+		<unit unitID="test12" mrp="" bldFile="sf\os\commsfw\commsprocess\commsrootserverconfig\group" name="test12" />
+		<unit unitID="test13" mrp="" bldFile="sf\os\networkingsrv\networkingtestandutils\ipv6to4tunnel\group" name="test13" />
+		<unit unitID="test14" mrp="" bldFile="sf\os\cellularsrv\basebandabstraction\basebandchanneladaptor\group" name="test14" />
+		<unit unitID="test15" mrp="" bldFile="sf\os\cellularsrv\basebandadaptationplugins\basebandchanneladaptorforc32\group" name="test15" />
+		<unit unitID="test16" mrp="" bldFile="sf\os\cellularsrv\telephonyprotocols\umtsgprsscpr\group" name="test16" />
+		<unit unitID="test17" mrp="" bldFile="sf\os\cellularsrv\smsprotocols\smsstack\group" name="test17" />
+		<unit unitID="test18" mrp="" bldFile="sf\os\cellularsrv\telephonyprotocols\csdagt\group" name="test18" />
+		<unit unitID="test19" mrp="" bldFile="sf\os\cellularsrv\telephonyserver\etelpacketdata\group" name="test19" />
+		<unit unitID="test20" mrp="" bldFile="sf\os\commsfw\datacommsserver\networkingdialogapi\group" name="test20" />
+		<unit unitID="test21" mrp="" bldFile="sf\os\commsfw\datacommsserver\networkingdialogapi\default" name="test21" />
+		<unit unitID="test22" mrp="" bldFile="sf\os\commsfw\datacommsserver\esockserver\group" name="test22" />
+		<unit unitID="test23" mrp="" bldFile="sf\os\cellularsrv\telephonyprotocols\gprsumtsqosprt\group" name="test23" />
+		<unit unitID="test24" mrp="" bldFile="sf\os\commsfw\datacommsserver\networkcontroller\group" name="test24" />
+		<unit unitID="test25" mrp="" bldFile="sf\os\cellularsrv\telephonyprotocols\pdplayer\group" name="test25" />
+		<unit unitID="test26" mrp="" bldFile="sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\group" name="test26" />
+		<unit unitID="test27" mrp="" bldFile="sf\os\cellularsrv\telephonyprotocols\psdagt\group" name="test27" />
+		<unit unitID="test28" mrp="" bldFile="sf\os\cellularsrv\telephonyprotocols\qosextnapi\group" name="test28" />
+		<unit unitID="test29" mrp="" bldFile="sf\os\cellularsrv\telephonyprotocols\qos3gppcpr\group" name="test29" />
+		<unit unitID="test30" mrp="" bldFile="sf\os\cellularsrv\telephonyprotocols\rawipnif\group" name="test30" />
+		<unit unitID="test31" mrp="" bldFile="sf\mw\netprotocols\applayerprotocols\telnetengine\group" name="test31" />
+		<unit unitID="test32" mrp="" bldFile="sf\os\networkingsrv\linklayerprotocols\tunnelnif\group" name="test31" />
+		<unit unitID="test33" mrp="" bldFile="sf\os\cellularsrv\telephonyprotocols\gprsumtsqosinterface\group" name="test33" />
+		<unit unitID="test34" mrp="" bldFile="sf\os\commsfw\serialserver\packetloopbackcsy\group" name="test34" />
+		<unit unitID="test35" mrp="" bldFile="sf\os\commsfw\serialserver\c32serialserver\group" name="test35" />
+		<unit unitID="test36" mrp="" bldFile="sf\os\commsfw\serialserver\c32serialserverconfig" name="test36" />
+		<unit unitID="test37" mrp="" bldFile="sf\mw\netprotocols\wapstack\wapmessageapi\group" name="test37" />
+		<unit unitID="test38" mrp="" bldFile="sf\os\security\cryptomgmtlibs\cryptotokenfw\group" name="test38" />
+		<unit unitID="test39" mrp="" bldFile="sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\Te_UmtsGprsSCPR\group" name="test39" />
+		<unit unitID="test40" mrp="" bldFile="sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_mbms\group" name="test40" />
+		<unit unitID="test41" mrp="" bldFile="sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spud\group" name="test41" />
+		<unit unitID="test42" mrp="" bldFile="sf\mw\netprotocols\applayerprotocols\ftpengine\group" name="test42" />
+		<unit unitID="test43" mrp="" bldFile="sf\mw\netprotocols\applayerprotocols\ftpengine\group" name="test43" />
+		<unit unitID="test44" mrp="" bldFile="sf\os\commsfw\commsfwtools\commstools\messageinterceptregister\group" name="test44" />
+		<unit unitID="test45" mrp="" bldFile="sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\Te_UmtsGprsSCPR\group" name="test45" />
+		<unit unitID="test46" mrp="" bldFile="sf\os\commsfw\datacommsserver\networkingdialogapi\agentnotifier\group" name="test46" />
+		<unit unitID="test47" mrp="" bldFile="sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_mbms\group" name="test47" />
+		<unit unitID="test48" mrp="" bldFile="sf\os\security\authorisation\userpromptutils\group" name="test48" />
+<!--		<unit unitID="test49" mrp="" bldFile="sf\os\commsfw\commsfwtools\preparedefaultcommsdatabase\Tools\ced\te_ced\group" name="test49" />	 -->
       </module>
     </layer>
   </systemModel>
diff -r 88121cf79045 -r 78fceed50f62 linklayercontrol/networkinterfacemgr/agentprcore/inc/tunnelagentcpr.h
--- a/linklayercontrol/networkinterfacemgr/agentprcore/inc/tunnelagentcpr.h	Tue Jul 06 16:04:34 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/agentprcore/inc/tunnelagentcpr.h	Wed Aug 18 11:18:20 2010 +0300
@@ -42,17 +42,30 @@
 }
 
 
-class CTunnelAgentConnectionProvider : public CAgentConnectionProvider
+class CTunnelAgentConnectionProvider : public CAgentConnectionProvider,
+									   public ESock::MPlatsecApiExt,
+									   public ITFHIERARCHY_LINK_1(CTunnelAgentConnectionProvider, CAgentConnectionProvider, ESock::MPlatsecApiExt)
+
 	{
 	friend class TunnelAgentCprStates::TJoinRealIAP;
 
 public:
+	typedef ITFHIERARCHY_LINK_1(CTunnelAgentConnectionProvider, CAgentConnectionProvider, ESock::MPlatsecApiExt) TIfStaticFetcherNearestInHierarchy;
+
+public:
     IMPORT_C static CTunnelAgentConnectionProvider* NewL(ESock::CConnectionProviderFactoryBase& aFactory);
     IMPORT_C ~CTunnelAgentConnectionProvider();
 
+    using CAgentConnectionProvider::ReturnInterfacePtrL;
+    void ReturnInterfacePtrL(ESock::MPlatsecApiExt*& aInterface);
 protected:
     CTunnelAgentConnectionProvider(ESock::CConnectionProviderFactoryBase& aFactory);
     CTunnelAgentConnectionProvider(ESock::CConnectionProviderFactoryBase& aFactory, const MeshMachine::TNodeActivityMap& aActivityMap);
+	// MPlatSecApiExt
+	TInt SecureId(TSecureId& aResult) const;
+	TInt VendorId(TVendorId& aResult) const;
+	TBool HasCapability(const TCapability aCapability) const;
+	TInt CheckPolicy(const TSecurityPolicy& aPolicy) const;
 	};
 
 
diff -r 88121cf79045 -r 78fceed50f62 linklayercontrol/networkinterfacemgr/agentprcore/src/tunnelagentcpr.cpp
--- a/linklayercontrol/networkinterfacemgr/agentprcore/src/tunnelagentcpr.cpp	Tue Jul 06 16:04:34 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/agentprcore/src/tunnelagentcpr.cpp	Wed Aug 18 11:18:20 2010 +0300
@@ -111,7 +111,8 @@
 
 
 CTunnelAgentConnectionProvider::CTunnelAgentConnectionProvider(CConnectionProviderFactoryBase& aFactory)
-   : CAgentConnectionProvider(aFactory, TunnelAgentCprStates::TunnelAgentCprActivities::Self())
+   : CAgentConnectionProvider(aFactory, TunnelAgentCprStates::TunnelAgentCprActivities::Self()),
+     TIfStaticFetcherNearestInHierarchy(this)
 	{
 	LOG_NODE_CREATE(KTunnelAgentCprTag, CTunnelAgentConnectionProvider);
 	}
@@ -125,5 +126,35 @@
 	LOG_NODE_DESTROY(KTunnelAgentCprTag, CTunnelAgentConnectionProvider);
 	}
 
+//
+// MPlatSecApiExt
+//
 
+void CTunnelAgentConnectionProvider::ReturnInterfacePtrL(MPlatsecApiExt*& aInterface)
+    {
+    aInterface = this;
+    }
 
+TInt CTunnelAgentConnectionProvider::SecureId(TSecureId& /*aResult*/) const
+	{
+	return KErrNotSupported;
+	}
+
+TInt CTunnelAgentConnectionProvider::VendorId(TVendorId& /*aResult*/) const
+	{
+	return KErrNotSupported;
+	}
+
+TBool CTunnelAgentConnectionProvider::HasCapability(const TCapability /*aCapability*/) const
+	{
+	return KErrNotSupported;
+	}
+
+TInt CTunnelAgentConnectionProvider::CheckPolicy(const TSecurityPolicy& /*aPolicy*/) const
+	{
+	// This is the whole reason that we need to implement MPlatSecApiExt in this node at all.  When TunnelAgentCpr issues
+	// a TStop towards IpCpr, IpCpr requires the sending node (normally ESockSvr but TunnelAgentCpr in this case)
+	// to implement MPlatSecApiExt through which IpCpr can check platsec capabilities (IpCprStates::TCheckStopCapabilities).
+	// If TunnelAgentCpr does not impement MPlatSecApiExt, then IpCpr will error the stop request with KErrInterfaceNotSupported.
+	return KErrNone;
+	}
diff -r 88121cf79045 -r 78fceed50f62 linklayercontrol/networkinterfacemgr/agentprcore/src/tunnelagentcprstates.cpp
--- a/linklayercontrol/networkinterfacemgr/agentprcore/src/tunnelagentcprstates.cpp	Tue Jul 06 16:04:34 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/agentprcore/src/tunnelagentcprstates.cpp	Wed Aug 18 11:18:20 2010 +0300
@@ -101,7 +101,9 @@
 
 	TNodeId thisNodeId = iContext.Node().NodeId();
 	
-	RNodeInterface* sp = iContext.Node().AddClientL(realIapNodeId, TClientType(TCFClientType::EServProvider));
+	//SP are peers added with TClientType ((TCFClientType::EServProvider, CFClientType::EActive))
+	RNodeInterface* sp = iContext.Node().AddClientL(realIapNodeId, TClientType(TCFClientType::EServProvider, TCFClientType::EActive));
+
 	__ASSERT_DEBUG(sp != NULL, User::Panic(KTunnelAgentCPRPanic, ETunnelAgentCprNoServiceProvider));
  	iContext.iNodeActivity->PostRequestTo(
  			realIapNodeId, 
diff -r 88121cf79045 -r 78fceed50f62 linklayercontrol/networkinterfacemgr/inc/nifman_internal.h
--- a/linklayercontrol/networkinterfacemgr/inc/nifman_internal.h	Tue Jul 06 16:04:34 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/inc/nifman_internal.h	Wed Aug 18 11:18:20 2010 +0300
@@ -24,10 +24,12 @@
 #define __NIFMAN_INTERNAL_H__
 
 #include <es_prot.h>
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-#include <es_prot_internal.h>
-#include <es_sock_partner.h>
-#endif
+
+// public headers not to include platform headers
+// #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+// #include <es_prot_internal.h>
+// #include <es_sock_partner.h>
+// #endif
 
 
 /**
diff -r 88121cf79045 -r 78fceed50f62 linklayercontrol/networkinterfacemgr/netcfgext/inc/netcfgextnotify.h
--- a/linklayercontrol/networkinterfacemgr/netcfgext/inc/netcfgextnotify.h	Tue Jul 06 16:04:34 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/netcfgext/inc/netcfgextnotify.h	Wed Aug 18 11:18:20 2010 +0300
@@ -38,6 +38,7 @@
 	   MNifIfNotify interface
 	   Only IfProgress, DoReadDes and DoReadInt supported.
 	*/
+	~CNetCfgExtNotify();
 	void LinkLayerDown(TInt aReason, TAction aAction);
 	void LinkLayerUp();
     void NegotiationFailed(CNifIfBase* aIf, TInt aReason);
diff -r 88121cf79045 -r 78fceed50f62 linklayercontrol/networkinterfacemgr/netcfgext/src/netcfgextnotify.cpp
--- a/linklayercontrol/networkinterfacemgr/netcfgext/src/netcfgextnotify.cpp	Tue Jul 06 16:04:34 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/netcfgext/src/netcfgextnotify.cpp	Wed Aug 18 11:18:20 2010 +0300
@@ -35,11 +35,18 @@
 	{
 	}
 
+CNetCfgExtNotify::~CNetCfgExtNotify()
+    {
+    iScpr = NULL;
+    }
 void CNetCfgExtNotify::IfProgress(TInt aStage, TInt aError)
 	{
 	TStateChange change(aStage, aError);
+	if(iScpr)
+	    {
 	RClientInterface::OpenPostMessageClose(iScpr->Id(), iScpr->Id(),
 		TCFMessage::TStateChange(change).CRef());
+	    }
 	}
 
 TInt CNetCfgExtNotify::DoReadInt(const TDesC& aField, TUint32& aValue,const RMessagePtr2* /*aMessage*/)
diff -r 88121cf79045 -r 78fceed50f62 linklayercontrol/nullagt/src/NullAgent.cpp
--- a/linklayercontrol/nullagt/src/NullAgent.cpp	Tue Jul 06 16:04:34 2010 +0300
+++ b/linklayercontrol/nullagt/src/NullAgent.cpp	Wed Aug 18 11:18:20 2010 +0300
@@ -22,7 +22,7 @@
 #include <cdbcols.h> // CommDB access
 
 #ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
-#include <networking\cfbearers.h>
+#include <networking/cfbearers.h>
 #endif //SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 
 /**
diff -r 88121cf79045 -r 78fceed50f62 networkcontrol/commsuserpromptmgr/state/src/netupsstatemachine.cpp
--- a/networkcontrol/commsuserpromptmgr/state/src/netupsstatemachine.cpp	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkcontrol/commsuserpromptmgr/state/src/netupsstatemachine.cpp	Wed Aug 18 11:18:20 2010 +0300
@@ -71,27 +71,71 @@
 	// Note the order in which the states are instantiated must match the 
 	// order in which they are defined in the enumeration TNetUpsState - or a panic will occur.
 
-	iState.Append(CState::NewL(ENull, *this));	
+	CState* state=CState::NewL(ENull, *this);
+		
+	CleanupStack::PushL(state);
+	iState.AppendL(state);
+	CleanupStack::Pop(state);
+		
 	switch(iNetUpsImpl.LifeTimeMode())
 		{
+			
 		case CNetUpsImpl::EProcessLifeTimeMode:
 			{
-			iState.Append(CState::NewL(EProcLife_NonSession, *this));			
-			iState.Append(CState::NewL(EProcLife_Transit_SessionYes, *this)); // a transient state is entered when the UPS Server responds with either SessionYes or SessionNo and there are 1 or more UPS requests outstanding to other subsessions which are associated with the same process.			
-			iState.Append(CState::NewL(EProcLife_SessionYes, *this));
-			iState.Append(CState::NewL(EProcLife_Transit_SessionNo, *this));
-			iState.Append(CState::NewL(EProcLife_SessionNo, *this));
+			CState* stateone= CState::NewL(EProcLife_NonSession, *this);
+			CleanupStack::PushL(stateone);
+			iState.AppendL(stateone);	
+			
+			CState* statetwo = CState::NewL(EProcLife_Transit_SessionYes, *this);
+			CleanupStack::PushL(statetwo);
+			iState.AppendL(statetwo); // a transient state is entered when the UPS Server responds with either SessionYes or SessionNo and there are 1 or more UPS requests outstanding to other subsessions which are associated with the same process.			
+			
+			CState* statethree = CState::NewL(EProcLife_SessionYes, *this);
+			CleanupStack::PushL(statethree);
+			iState.AppendL(statethree);
+			
+			CState* statefour = CState::NewL(EProcLife_Transit_SessionNo, *this);
+			CleanupStack::PushL(statefour);
+			iState.AppendL(statefour);
+			
+			CState* statefive = CState::NewL(EProcLife_SessionNo, *this);
+			CleanupStack::PushL(statefive);
+			iState.AppendL(statefive);
+			
+			CleanupStack::Pop(5);
 			break;
 			}
 		case CNetUpsImpl::ENetworkLifeTimeMode:
 			{
-			iState.Append(CState::NewL(ENetLife_NonSession, *this));			
-			iState.Append(CState::NewL(ENetLife_SessionNo_Transit_WithoutConnections, *this));			
-			iState.Append(CState::NewL(ENetLife_SessionNo_WithOutConnections, *this));
-			iState.Append(CState::NewL(ENetLife_SessionNo_Transit_WithConnections, *this));
-			iState.Append(CState::NewL(ENetLife_SessionNo_WithConnections, *this));
-			iState.Append(CState::NewL(ENetLife_Transit_SessionYes, *this));
-			iState.Append(CState::NewL(ENetLife_SessionYes, *this));
+			CState* stateone = CState::NewL(EProcLife_NonSession, *this);
+			CleanupStack::PushL(stateone);
+			iState.AppendL(stateone);
+			
+			CState* statetwo = CState::NewL(ENetLife_SessionNo_Transit_WithoutConnections, *this);
+			CleanupStack::PushL(statetwo);
+			iState.AppendL(statetwo);		
+			
+			CState* statethree = CState::NewL(ENetLife_SessionNo_WithOutConnections, *this);
+			CleanupStack::PushL(statethree);
+			iState.AppendL(statethree);
+			
+			CState* statefour = CState::NewL(ENetLife_SessionNo_Transit_WithConnections, *this);
+			CleanupStack::PushL(statefour);
+			iState.AppendL(statefour);
+			
+			CState* statefive = CState::NewL(ENetLife_SessionNo_WithConnections, *this);
+			CleanupStack::PushL(statefive);
+			iState.AppendL(statefive);
+			
+			CState* statesix = CState::NewL(ENetLife_Transit_SessionYes, *this);
+			CleanupStack::PushL(statesix);
+			iState.AppendL(statesix);
+								
+			CState* stateseven = CState::NewL(ENetLife_SessionYes, *this);
+			CleanupStack::PushL(stateseven);
+			iState.AppendL(stateseven);
+			
+			CleanupStack::Pop(7);
 			break;				
 			}
 		default:
diff -r 88121cf79045 -r 78fceed50f62 networkcontrol/ipnetworklayer/addressinfohook/src/hookaddrinfo.cpp
--- a/networkcontrol/ipnetworklayer/addressinfohook/src/hookaddrinfo.cpp	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkcontrol/ipnetworklayer/addressinfohook/src/hookaddrinfo.cpp	Wed Aug 18 11:18:20 2010 +0300
@@ -39,7 +39,9 @@
 	{
 	TIpAddrBinder *addrBinder =  new(ELeave) TIpAddrBinder(aBinder, aAddrInfo);
 	
-	iAddrInfo.Append(addrBinder);
+	CleanupStack::PushL(addrBinder);
+	iAddrInfo.AppendL(addrBinder);
+	CleanupStack::Pop(addrBinder);
 
 	//Try match the address info to existing flows	
 	TDblQueIter<CAddressInfoFlowInfo> iter(*iFlows);
diff -r 88121cf79045 -r 78fceed50f62 networkcontrol/ipnetworklayer/inc/IPProtoCPR.h
--- a/networkcontrol/ipnetworklayer/inc/IPProtoCPR.h	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkcontrol/ipnetworklayer/inc/IPProtoCPR.h	Wed Aug 18 11:18:20 2010 +0300
@@ -194,6 +194,7 @@
 	TBool iLinkUp:1;
 	TBool iConnectionControlActivity:1;
 	TBool iTimerExpired:1;
+	TBool iTimerStopped:1;
 	TBool iTimerRunning:1;
 	TBool iSubConnEventDataSent:1;	// Hack to cope with multiple DataClientStatusChange notifications for 'stopped'
 	TBool iNodeLocalExtensionsCreated;
diff -r 88121cf79045 -r 78fceed50f62 networkcontrol/ipnetworklayer/inc/IPProtoSCPRStates.h
--- a/networkcontrol/ipnetworklayer/inc/IPProtoSCPRStates.h	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkcontrol/ipnetworklayer/inc/IPProtoSCPRStates.h	Wed Aug 18 11:18:20 2010 +0300
@@ -19,7 +19,7 @@
 #define IPPROTOSCPRSTATES_H_DEFINED
 
 #include <comms-infras/corescprstates.h>
-#include "ipprotomessages.h"
+#include "IPProtoMessages.h"
 
 class CIPQoSProtoSubConnectionProviderBase;
 
diff -r 88121cf79045 -r 78fceed50f62 networkcontrol/ipnetworklayer/inc/ipprotodeftscpr.h
--- a/networkcontrol/ipnetworklayer/inc/ipprotodeftscpr.h	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkcontrol/ipnetworklayer/inc/ipprotodeftscpr.h	Wed Aug 18 11:18:20 2010 +0300
@@ -103,6 +103,8 @@
 	CNifConfigurationControl* iControl;
     Messages::RNodeInterface iFlow;
 	TBool iIoctlCancelled;
+public:
+	TBool iNetworkConfigurationState;
 	};
 
 #endif //SYMBIAN_IPPROTODEFTSCPR_H
diff -r 88121cf79045 -r 78fceed50f62 networkcontrol/ipnetworklayer/inc/ipprotodeftscprstates.h
--- a/networkcontrol/ipnetworklayer/inc/ipprotodeftscprstates.h	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkcontrol/ipnetworklayer/inc/ipprotodeftscprstates.h	Wed Aug 18 11:18:20 2010 +0300
@@ -19,7 +19,7 @@
 #define IPPROTODEFTSCPRSTATES_H_DEFINED
 
 #include <comms-infras/corescprstates.h>
-#include "ipprotomessages.h"
+#include "IPProtoMessages.h"
 
 class CIPProtoSubConnectionProviderBase;
 
diff -r 88121cf79045 -r 78fceed50f62 networkcontrol/ipnetworklayer/src/IPProtoCPR.cpp
--- a/networkcontrol/ipnetworklayer/src/IPProtoCPR.cpp	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkcontrol/ipnetworklayer/src/IPProtoCPR.cpp	Wed Aug 18 11:18:20 2010 +0300
@@ -757,6 +757,7 @@
 	if (!iTimerExpired)
 		{
 		iTimerExpired = ETrue;
+		iTimerStopped =  ETrue; 
 		CancelTimer();
 		if (CountActivities(ECFActivityStop) == 0 && CountActivities(ECFActivityDestroy) == 0)
 			{
diff -r 88121cf79045 -r 78fceed50f62 networkcontrol/ipnetworklayer/src/IPProtoCprStates.cpp
--- a/networkcontrol/ipnetworklayer/src/IPProtoCprStates.cpp	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkcontrol/ipnetworklayer/src/IPProtoCprStates.cpp	Wed Aug 18 11:18:20 2010 +0300
@@ -150,7 +150,7 @@
 	// stop has been caused by timer expiry, remove self from originators list, because we
 	// are not waiting for TStopped and in certain situations it would arrive after the node has been
 	// destroyed
-	if (iContext.Node().iTimerExpired)
+	if (iContext.Node().iTimerStopped)
 		{
 		TInt selfidx = iContext.iNodeActivity->FindOriginator(iContext.Node().SelfInterface());
 		ASSERT(selfidx != KErrNotFound);
@@ -378,6 +378,7 @@
 	iContext.Node().SetUsageProfile(KConnProfileMedium);
 	iContext.Node().SetTimerMode(CIPProtoConnectionProvider::ETimerMedium);
 
+    iContext.Node().iTimerStopped = EFalse;
 	CoreNetStates::TSendStarted transition(iContext);
 	transition.DoL();
 	}
diff -r 88121cf79045 -r 78fceed50f62 networkcontrol/ipnetworklayer/src/IPProtoSCPRFactory.cpp
--- a/networkcontrol/ipnetworklayer/src/IPProtoSCPRFactory.cpp	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkcontrol/ipnetworklayer/src/IPProtoSCPRFactory.cpp	Wed Aug 18 11:18:20 2010 +0300
@@ -21,7 +21,7 @@
  @internalComponent
 */
 
-#include "ipprotomessages.h"
+#include "IPProtoMessages.h"
 #include "IPProtoSCPRFactory.h"
 #include "ipprotodeftscpr.h"
 #include "IPProtoSCPR.h"
diff -r 88121cf79045 -r 78fceed50f62 networkcontrol/ipnetworklayer/src/ipprotodeftscpr.cpp
--- a/networkcontrol/ipnetworklayer/src/ipprotodeftscpr.cpp	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkcontrol/ipnetworklayer/src/ipprotodeftscpr.cpp	Wed Aug 18 11:18:20 2010 +0300
@@ -23,7 +23,7 @@
 
 #include <comms-infras/corescprstates.h>
 #include <comms-infras/corescpractivities.h>
-#include "ipprotocprstates.h"
+#include "IPProtoCprStates.h"
 
 #include "ipprotodeftscpr.h"
 #include "ipprotodeftscprstates.h"
@@ -164,7 +164,8 @@
 	 ALegacySubConnectionActiveApiExt(this),
 	 TIfStaticFetcherNearestInHierarchy(this),
 	 iNotify(NULL),
-	 iControl(NULL)
+	 iControl(NULL),
+	 iNetworkConfigurationState(EFalse)
     {
     LOG_NODE_CREATE(KIPProtoDeftScprTag, CIPProtoDeftSubConnectionProvider);
     }
@@ -195,10 +196,21 @@
 
 CIPProtoDeftSubConnectionProvider::~CIPProtoDeftSubConnectionProvider()
     {
+   if(iNetworkConfigurationState == EFalse)
+       {
+       if(iNotify)
+           {
+           delete iNotify;
+           iNotify = NULL;
+           }
+       }
 	if (iControl)
 		delete iControl;
 	if (iNotify)
+	    {
 		delete iNotify;
+		iNotify = NULL;
+		}
 
     LOG_NODE_DESTROY(KIPProtoDeftScprTag, CIPProtoDeftSubConnectionProvider);
     }
diff -r 88121cf79045 -r 78fceed50f62 networkcontrol/ipnetworklayer/src/ipprotodeftscprstates.cpp
--- a/networkcontrol/ipnetworklayer/src/ipprotodeftscprstates.cpp	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkcontrol/ipnetworklayer/src/ipprotodeftscprstates.cpp	Wed Aug 18 11:18:20 2010 +0300
@@ -162,6 +162,7 @@
 
 	if (msg.iStateChange.iStage == KLinkLayerOpen)
 		{
+		iContext.Node().iNetworkConfigurationState = ETrue;
 		return KNetworkConfigured;
 		}
 
@@ -171,6 +172,7 @@
 DEFINE_SMELEMENT(TNetworkConfiguredOrErrorTagOrCancelTagOrNoTagBackward, NetStateMachine::MStateFork, IPProtoDeftSCpr::TContext)
 TInt IPProtoDeftSCpr::TNetworkConfiguredOrErrorTagOrCancelTagOrNoTagBackward::TransitionTag()
 	{
+	iContext.Node().iNetworkConfigurationState = EFalse;
 	TInt tag = IPProtoDeftSCpr::TNetworkConfiguredOrErrorTagOrCancelTagOrNoTag::TransitionTag();
 	if (tag == KNoTag)
 		return tag | NetStateMachine::EBackward;
diff -r 88121cf79045 -r 78fceed50f62 networkcontrol/ipupsplugins/test/te_ipups/group/te_ipups.mmp
--- a/networkcontrol/ipupsplugins/test/te_ipups/group/te_ipups.mmp	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkcontrol/ipupsplugins/test/te_ipups/group/te_ipups.mmp	Wed Aug 18 11:18:20 2010 +0300
@@ -60,7 +60,7 @@
 
 START RESOURCE ups_test_always_101F7989_10281DD8.rss
 TARGETPATH	/system/data
-TARGET ups_test_always_101F7989_10281DD8.rss
+TARGET ups_test_always_101f7989_10281dd8.rss
 END
 
 #ifdef SYMBIAN_OLD_EXPORT_LOCATION
diff -r 88121cf79045 -r 78fceed50f62 networkcontrol/qosfwconfig/qostest/te_qos/group/bld.inf
--- a/networkcontrol/qosfwconfig/qostest/te_qos/group/bld.inf	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkcontrol/qosfwconfig/qostest/te_qos/group/bld.inf	Wed Aug 18 11:18:20 2010 +0300
@@ -22,8 +22,8 @@
 #else
 ../configs/te_QoSSuite_Mesh.cfg         z:/testdata/configs/te_qossuite_mesh.cfg
 #endif //#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
-../configs/te_QoSSuite_simtsy.txt		z:/testdata/configs/te_QoSSuite_simtsy.txt
-../configs/te_QoSSuite_LoopbackCsy.ini		z:/testdata/configs/te_QoSSuite_loopbackcsy.ini
+../configs/te_QoSSuite_simtsy.txt		z:/testdata/configs/te_qossuite_simtsy.txt
+../configs/te_QoSSuite_LoopbackCsy.ini		z:/testdata/configs/te_qossuite_loopbackcsy.ini
 
 #ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
 ../configs/CIT_P192_Qos_SimTsy.xml		z:/testdata/configs/cit_p192_qos_simtsy.xml
diff -r 88121cf79045 -r 78fceed50f62 networkingsrv_info/networkingrom/group/NetworkTest.iby
--- a/networkingsrv_info/networkingrom/group/NetworkTest.iby	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkingsrv_info/networkingrom/group/NetworkTest.iby	Wed Aug 18 11:18:20 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-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"
@@ -70,6 +70,7 @@
 
 // Initialisation before any tests are run
 data=EPOCROOT##epoc32\data\z\testdata\scripts\te_initialiseboard.script		TestData\scripts\te_initialiseboard.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\delay.script		TestData\scripts\delay.script
 
 REM ---------- Comms-Infras ----------
 
diff -r 88121cf79045 -r 78fceed50f62 networkingsrv_info/networkingrom/group/bld.inf
--- a/networkingsrv_info/networkingrom/group/bld.inf	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkingsrv_info/networkingrom/group/bld.inf	Wed Aug 18 11:18:20 2010 +0300
@@ -1,4 +1,4 @@
-// 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"
@@ -26,6 +26,8 @@
 PRJ_TESTEXPORTS
 // File run before every hardware test that can be added to pre-ROM build
 ../group/te_initialiseboard.script	z:/testdata/scripts/te_initialiseboard.script
+// Calling this delay.script in the ATS test drop before calling any connection based test cases
+../group/delay.script	z:/testdata/scripts/delay.script
 
 // #include "../../../../unref/orphan/comgen/networking/test/te_Anvl/group/bld.inf"
 // #include "../../../../unref/orphan/comgen/networking/test/te_TahiClient/group/bld.inf"
diff -r 88121cf79045 -r 78fceed50f62 networkingsrv_info/networkingrom/group/delay.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingsrv_info/networkingrom/group/delay.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,17 @@
+//
+// 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:
+//
+
+DELAY 10000
\ No newline at end of file
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/exampleinternetutilities/PING/PING.CPP
--- a/networkingtestandutils/exampleinternetutilities/PING/PING.CPP	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkingtestandutils/exampleinternetutilities/PING/PING.CPP	Wed Aug 18 11:18:20 2010 +0300
@@ -15,7 +15,7 @@
 // 
 //
 
-#include <pingeng.h>
+#include <PINGENG.H>
 #include <e32cons.h>
 #include <c32comm.h>
 #include <nifman.h>
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/exampleinternetutilities/PINGENG/PINGENG.CPP
--- a/networkingtestandutils/exampleinternetutilities/PINGENG/PINGENG.CPP	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkingtestandutils/exampleinternetutilities/PINGENG/PINGENG.CPP	Wed Aug 18 11:18:20 2010 +0300
@@ -13,7 +13,7 @@
 // Description:
 //
 
-#include <pingeng.h>
+#include <PINGENG.H>
 #include <e32hal.h>
 #include <icmp6_hdr.h>
 #include <in_chk.h>
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/exampleinternetutilities/TFTP/TFTP.CPP
--- a/networkingtestandutils/exampleinternetutilities/TFTP/TFTP.CPP	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkingtestandutils/exampleinternetutilities/TFTP/TFTP.CPP	Wed Aug 18 11:18:20 2010 +0300
@@ -17,7 +17,7 @@
 #include <c32comm.h>
 #include <e32base.h>
 #include <es_sock.h>
-#include <tftpeng.h>
+#include <TFTPENG.H>
 #include <nifman.h>
 
 // Device driver names
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/exampleinternetutilities/TFTPENG/TFTPENG.CPP
--- a/networkingtestandutils/exampleinternetutilities/TFTPENG/TFTPENG.CPP	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkingtestandutils/exampleinternetutilities/TFTPENG/TFTPENG.CPP	Wed Aug 18 11:18:20 2010 +0300
@@ -16,7 +16,7 @@
 // 
 //
 
-#include <tftpeng.h>
+#include <TFTPENG.H>
 
 EXPORT_C CTftpEngine::~CTftpEngine()
     {
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/exampleinternetutilities/TRACERT/TRACERT.CPP
--- a/networkingtestandutils/exampleinternetutilities/TRACERT/TRACERT.CPP	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkingtestandutils/exampleinternetutilities/TRACERT/TRACERT.CPP	Wed Aug 18 11:18:20 2010 +0300
@@ -16,7 +16,7 @@
 // 
 //
 
-#include <treng.h>
+#include <TRENG.H>
 #include <e32cons.h>
 #include <c32comm.h>
 #include <nifman.h>
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/exampleinternetutilities/TRENG/TRENG.CPP
--- a/networkingtestandutils/exampleinternetutilities/TRENG/TRENG.CPP	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkingtestandutils/exampleinternetutilities/TRENG/TRENG.CPP	Wed Aug 18 11:18:20 2010 +0300
@@ -13,7 +13,7 @@
 // Description:
 //
 
-#include <treng.h>
+#include <TRENG.H>
 #include <e32hal.h>
 #include <icmp6_hdr.h>
 #include <in_chk.h>
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/ipprobe/group/bld.inf
--- a/networkingtestandutils/ipprobe/group/bld.inf	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkingtestandutils/ipprobe/group/bld.inf	Wed Aug 18 11:18:20 2010 +0300
@@ -21,8 +21,8 @@
 
 PRJ_TESTEXPORTS
 ../data/probe.esk       /epoc32/data/z/private/101f7989/esock/ip.probe.esk
-../data/probe.esk       /epoc32/winscw/c/private/101f7989/Esock/ip.probe.esk
-../data/probe.esk       /epoc32/data/c/private/101f7989/Esock/ip.probe.esk
+../data/probe.esk       /epoc32/winscw/c/private/101f7989/esock/ip.probe.esk
+../data/probe.esk       /epoc32/data/c/private/101f7989/esock/ip.probe.esk
 ../group/probe.iby	/epoc32/rom/include/probe.iby
 
 
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/Group/bld.inf
--- a/networkingtestandutils/networkingintegrationtest/Group/bld.inf	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/Group/bld.inf	Wed Aug 18 11:18:20 2010 +0300
@@ -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"
@@ -49,6 +49,46 @@
 
 PRJ_TESTEXPORTS
 
+#ifdef SIROCCO_CODE_MIGRATION 
+../it_script_files/itest_s1/cccccc00_itest1.cre			/epoc32/release/wins/udeb/z/testdata/scripts/integration/cccccc00_itest1.cre
+../it_script_files/itest_s2/cccccc00_itest2.cre			/epoc32/release/wins/udeb/z/testdata/scripts/integration/cccccc00_itest2.cre
+../it_script_files/itest_s3/cccccc00_itest3.cre			/epoc32/release/wins/udeb/z/testdata/scripts/integration/cccccc00_itest3.cre
+../it_script_files/itest_s4/cccccc00_itest4.cre			/epoc32/release/wins/udeb/z/testdata/scripts/integration/cccccc00_itest4.cre
+../it_script_files/itest_s5/cccccc00_itest5.cre			/epoc32/release/wins/udeb/z/testdata/scripts/integration/cccccc00_itest5.cre
+#endif
+
+
+#ifdef SIROCCO_CODE_MIGRATION 
+// s1 scripts
+../it_script_files/itest_s1.script			/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1.script
+../it_script_files/itest_s1_manual_tcs.script			/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1_manual_tcs.script
+../it_script_files/LogOn.script				/epoc32/release/wins/udeb/z/testdata/scripts/integration/logon.script
+../it_script_files/itest_s1/itest_RConnection.script	/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest_rconnection.script
+../it_script_files/itest_s1/itest1_01_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_01_wlan.script
+../it_script_files/itest_s1/itest1_02_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_02_wlan.script
+../it_script_files/itest_s1/itest1_03_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_03_wlan.script
+../it_script_files/itest_s1/itest1_04.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_04.script
+../it_script_files/itest_s1/itest1_09.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_09.script
+../it_script_files/itest_s1/itest1_10_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_10_wlan.script
+../it_script_files/itest_s1/itest1_11.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_11.script
+../it_script_files/itest_s1/itest1_12.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_12.script
+../it_script_files/itest_s1/itest1_13_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_13_wlan.script
+../it_script_files/itest_s1/itest1_14.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_14.script
+../it_script_files/itest_s1/itest1_15.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_15.script
+../it_script_files/itest_s1/itest1_16.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_16.script
+../it_script_files/itest_s1/itest1_17_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_17_wlan.script
+../it_script_files/itest_s1/ipv4_wlan.ini			/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/ipv4_wlan.ini				
+../it_script_files/itest_s1/ipv6_wlan.ini			/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/ipv6_wlan.ini				
+../it_script_files/itest_s1/client_timeout.ini		/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/client_timeout.ini		
+../it_script_files/itest_s1/genconn.ini			/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/genconn.ini				
+../it_script_files/itest_s1/itest.ini			/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/itest.ini				
+../it_script_files/itest_s1/rnif_timeout.ini		/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/rnif_timeout.ini		
+../it_script_files/itest_s1/load_csd_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/load_csd_wlan.script			
+../it_script_files/itest_s1/n6210.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/n6210.script			
+../it_script_files/itest_s1/itest_load.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest_load.script			
+../it_script_files/itest_s1/big_ipv4.ini		/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/big_ipv4.ini			
+../it_script_files/itest_s1/te_teststeps.ini		/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/te_teststeps.ini				
+#else
 // s1 scripts
 ../it_script_files/itest_s1.script			/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1.script
 ../it_script_files/itest_s1_manual_tcs.script			/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1_manual_tcs.script
@@ -81,8 +121,7 @@
 ../it_script_files/itest_s1/big_ipv4.ini		/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/big_ipv4.ini			
 ../it_script_files/itest_s1/ipsec_csd.xml		/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/ipsec_csd.xml			
 ../it_script_files/itest_s1/te_teststeps.ini		/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/te_teststeps.ini				
-
-
+#endif
 
 ../it_script_files/itest_s1.script			/epoc32/release/winscw/udeb/z/testdata/scripts/integration/itest_s1.script
 ../it_script_files/LogOn.script				/epoc32/release/winscw/udeb/z/testdata/scripts/integration/logon.script
@@ -117,15 +156,24 @@
 
 
 
-
+#ifdef SIROCCO_CODE_MIGRATION 
 // s2 scripts
 ../it_script_files/itest_s2.script			/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s2.script
+../it_script_files/itest_s2/itest2_01_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s2/itest2_01_wlan.script
+../it_script_files/itest_s2/ipv4_wlan.ini			/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s2/ipv4_wlan.ini				
+../it_script_files/itest_s2/client_timeout.ini		/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s2/client_timeout.ini		
+../it_script_files/itest_s2/itest.ini			/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s2/itest.ini				
+../it_script_files/itest_s2/load_hscsd_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s2/load_hscsd_wlan.script			
+#else
+../it_script_files/itest_s2.script			/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s2.script
 ../it_script_files/itest_s2/itest2_01.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s2/itest2_01.script
 ../it_script_files/itest_s2/ipv4.ini			/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s2/ipv4.ini				
 ../it_script_files/itest_s2/client_timeout.ini		/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s2/client_timeout.ini		
 ../it_script_files/itest_s2/itest.ini			/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s2/itest.ini				
 ../it_script_files/itest_s2/load_hscsd.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s2/load_hscsd.script			
 ../it_script_files/itest_s2/hscsd.xml			/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s2/hscsd.xml			
+#endif
+
 
 ../it_script_files/itest_s2.script			/epoc32/release/winscw/udeb/z/testdata/scripts/integration/itest_s2.script
 ../it_script_files/itest_s2/itest2_01.script		/epoc32/release/winscw/udeb/z/testdata/scripts/integration/itest_s2/itest2_01.script
@@ -135,9 +183,38 @@
 ../it_script_files/itest_s2/load_hscsd.script		/epoc32/release/winscw/udeb/z/testdata/scripts/integration/itest_s2/load_hscsd.script			
 ../it_script_files/itest_s2/hscsd.xml			/epoc32/release/winscw/udeb/z/testdata/configs/integration/itest_s2/hscsd.xml			
 
+#ifdef SIROCCO_CODE_MIGRATION 
 // s3 scripts
 ../it_script_files/itest_s3.script			/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3.script
 ../it_script_files/itest_s3_manual_tcs.script			/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3_manual_tcs.script
+../it_script_files/itest_s3/itest3_01_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_01_wlan.script
+../it_script_files/itest_s3/itest3_02_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_02_wlan.script
+../it_script_files/itest_s3/itest3_03.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_03.script
+../it_script_files/itest_s3/itest3_04_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_04_wlan.script
+../it_script_files/itest_s3/itest3_05_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_05_wlan.script
+../it_script_files/itest_s3/itest3_05b.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_05b.script
+../it_script_files/itest_s3/itest3_05c_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_05c_wlan.script
+../it_script_files/itest_s3/itest3_09_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_09_wlan.script
+../it_script_files/itest_s3/itest3_10_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_10_wlan.script
+../it_script_files/itest_s3/itest3_11.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_11.script
+../it_script_files/itest_s3/itest3_12_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_12_wlan.script
+../it_script_files/itest_s3/itest3_13_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_13_wlan.script
+../it_script_files/itest_s3/itest3_14_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_14_wlan.script
+../it_script_files/itest_s3/itest3_15.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_15.script
+../it_script_files/itest_s3/itest3_16_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_16_wlan.script
+../it_script_files/itest_s3/itest3_17_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_17_wlan.script
+../it_script_files/itest_s3/ipv4_wlan.ini			/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s3/ipv4_wlan.ini				
+../it_script_files/itest_s3/ipv6_wlan.ini			/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s3/ipv6_wlan.ini				
+../it_script_files/itest_s3/client_timeout.ini		/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s3/client_timeout.ini		
+../it_script_files/itest_s3/route_timeout.ini		/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s3/route_timeout.ini	
+../it_script_files/itest_s3/genconn.ini			/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s3/genconn.ini				
+../it_script_files/itest_s3/itest.ini			/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s3/itest.ini				
+../it_script_files/itest_s3/rnif_timeout.ini		/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s3/rnif_timeout.ini		
+../it_script_files/itest_s3/load_gprs_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/load_gprs_wlan.script			
+../it_script_files/itest_s3/te_teststeps.ini		/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s3/te_teststeps.ini				
+#else
+../it_script_files/itest_s3.script			/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3.script
+../it_script_files/itest_s3_manual_tcs.script			/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3_manual_tcs.script
 ../it_script_files/itest_s3/itest3_01.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_01.script
 ../it_script_files/itest_s3/itest3_02.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_02.script
 ../it_script_files/itest_s3/itest3_03.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_03.script
@@ -164,7 +241,7 @@
 ../it_script_files/itest_s3/load_gprs.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/load_gprs.script			
 ../it_script_files/itest_s3/gprs.xml			/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s3/gprs.xml			
 ../it_script_files/itest_s3/te_teststeps.ini		/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s3/te_teststeps.ini				
-
+#endif
 
 ../it_script_files/itest_s3.script			/epoc32/release/winscw/udeb/z/testdata/scripts/integration/itest_s3.script
 ../it_script_files/itest_s3/itest3_01.script		/epoc32/release/winscw/udeb/z/testdata/scripts/integration/itest_s3/itest3_01.script
@@ -195,8 +272,37 @@
 ../it_script_files/itest_s3/gprs.xml			/epoc32/release/winscw/udeb/z/testdata/configs/integration/itest_s3/gprs.xml			
 ../it_script_files/itest_s3/te_teststeps.ini		/epoc32/release/winscw/udeb/z/testdata/configs/integration/itest_s3/te_teststeps.ini				
 
+#ifdef SIROCCO_CODE_MIGRATION 
+// s4 scripts
+../it_script_files/itest_s4.script			/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4.script
+../it_script_files/itest_s4_manual_tcs.script			/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4_manual_tcs.script
+../it_script_files/itest_s4/itest4_01_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_01_wlan.script
+../it_script_files/itest_s4/itest4_02.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_02.script
+../it_script_files/itest_s4/itest4_03.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_03.script
+../it_script_files/itest_s4/itest4_04.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_04.script
+../it_script_files/itest_s4/itest4_06_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_06_wlan.script
+../it_script_files/itest_s4/itest4_07.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_07.script
+../it_script_files/itest_s4/itest4_08.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_08.script
 
-// s4 scripts
+../it_script_files/itest_s4/itest4_09.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_09.script
+../it_script_files/itest_s4/itest4_10.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_10.script
+../it_script_files/itest_s4/itest4_11_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_11_wlan.script
+../it_script_files/itest_s4/itest4_12.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_12.script
+../it_script_files/itest_s4/itest4_13.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_13.script
+../it_script_files/itest_s4/itest4_14.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_14.script
+../it_script_files/itest_s4/itest4_15.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_15.script
+../it_script_files/itest_s4/itest4_16.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_16.script
+../it_script_files/itest_s4/itest4_17_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_17_wlan.script
+../it_script_files/itest_s4/ipv4_wlan.ini			/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/ipv4_wlan.ini				
+../it_script_files/itest_s4/ipv6_wlan.ini			/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/ipv6_wlan.ini				
+../it_script_files/itest_s4/client_timeout.ini		/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/client_timeout.ini		
+../it_script_files/itest_s4/genconn.ini			/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/genconn.ini				
+../it_script_files/itest_s4/genconn-psd.ini		/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/genconn-psd.ini
+../it_script_files/itest_s4/itest.ini			/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/itest.ini				
+../it_script_files/itest_s4/rnif_timeout.ini		/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/rnif_timeout.ini		
+../it_script_files/itest_s4/te_teststeps.ini		/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/te_teststeps.ini				
+../it_script_files/itest_s4/route_timeout.ini		/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/route_timeout.ini				
+#else
 ../it_script_files/itest_s4.script			/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4.script
 ../it_script_files/itest_s4_manual_tcs.script			/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4_manual_tcs.script
 ../it_script_files/itest_s4/itest4_01.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_01.script
@@ -225,8 +331,7 @@
 ../it_script_files/itest_s4/rnif_timeout.ini		/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/rnif_timeout.ini		
 ../it_script_files/itest_s4/te_teststeps.ini		/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/te_teststeps.ini				
 ../it_script_files/itest_s4/route_timeout.ini		/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/route_timeout.ini				
-
-
+#endif
 
 ../it_script_files/itest_s4.script			/epoc32/release/winscw/udeb/z/testdata/scripts/integration/itest_s4.script
 ../it_script_files/itest_s4/itest4_01.script		/epoc32/release/winscw/udeb/z/testdata/scripts/integration/itest_s4/itest4_01.script
@@ -257,8 +362,44 @@
 ../it_script_files/itest_s4/te_teststeps.ini		/epoc32/release/winscw/udeb/z/testdata/configs/integration/itest_s4/te_teststeps.ini				
 ../it_script_files/itest_s4/route_timeout.ini		/epoc32/release/winscw/udeb/z/testdata/configs/integration/itest_s4/route_timeout.ini
 
+#ifdef SIROCCO_CODE_MIGRATION 
+// s5 scripts
+../it_script_files/itest_s5.script			/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5.script
+../it_script_files/itest_s5_manual_tcs.script			/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5_manual_tcs.script
+../it_script_files/itest_s5/itest5_01_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_01_wlan.script
+../it_script_files/itest_s5/itest5_02.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_02.script
+../it_script_files/itest_s5/itest5_03_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_03_wlan.script
+../it_script_files/itest_s5/itest5_04.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_04.script
+../it_script_files/itest_s5/itest5_05.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_05.script
+../it_script_files/itest_s5/itest5_05b.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_05b.script
+../it_script_files/itest_s5/itest5_05c.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_05c.script
+../it_script_files/itest_s5/itest5_06.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_06.script
+../it_script_files/itest_s5/itest5_07.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_07.script
+../it_script_files/itest_s5/itest5_08.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_08.script
+../it_script_files/itest_s5/itest5_09.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_09.script
+../it_script_files/itest_s5/itest5_10_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_10_wlan.script
+../it_script_files/itest_s5/itest5_11.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_11.script
+../it_script_files/itest_s5/itest5_12_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_12_wlan.script
+../it_script_files/itest_s5/itest5_13_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_13_wlan.script
+../it_script_files/itest_s5/itest5_14.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_14.script
+../it_script_files/itest_s5/itest5_15.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_15.script
+../it_script_files/itest_s5/itest5_16.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_16.script
+../it_script_files/itest_s5/itest5_17_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_17_wlan.script
 
-// s5 scripts
+../it_script_files/itest_s5/itest5_18.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_18.script
+../it_script_files/itest_s5/itest5_19.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_19.script
+
+
+../it_script_files/itest_s5/ipv4_wlan.ini			/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s5/ipv4_wlan.ini				
+../it_script_files/itest_s5/ipv6_wlan.ini			/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s5/ipv6_wlan.ini				
+../it_script_files/itest_s5/client_timeout.ini		/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s5/client_timeout.ini		
+../it_script_files/itest_s5/genconn.ini			/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s5/genconn.ini				
+../it_script_files/itest_s5/itest.ini			/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s5/itest.ini				
+../it_script_files/itest_s5/rnif_timeout.ini		/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s5/rnif_timeout.ini		
+../it_script_files/itest_s5/route_timeout.ini		/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s5/route_timeout.ini			
+../it_script_files/itest_s5/load_ircsd_wlan.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/load_ircsd_wlan.script			
+../it_script_files/itest_s5/te_teststeps.ini		/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s5/te_teststeps.ini				
+#else
 ../it_script_files/itest_s5.script			/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5.script
 ../it_script_files/itest_s5_manual_tcs.script			/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5_manual_tcs.script
 ../it_script_files/itest_s5/itest5_01.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_01.script
@@ -295,7 +436,7 @@
 ../it_script_files/itest_s5/load_ircsd.script		/epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/load_ircsd.script			
 ../it_script_files/itest_s5/csd-ir.xml			/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s5/csd-ir.xml			
 ../it_script_files/itest_s5/te_teststeps.ini		/epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s5/te_teststeps.ini				
-
+#endif
 
 
 ../it_script_files/itest_s5.script			/epoc32/release/winscw/udeb/z/testdata/scripts/integration/itest_s5.script
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/Group/integrationtest.iby
--- a/networkingtestandutils/networkingintegrationtest/Group/integrationtest.iby	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/Group/integrationtest.iby	Wed Aug 18 11:18:20 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -41,7 +41,44 @@
 #include "te_DedicatedSignalling1ryCtx.iby"
 #endif // #ifdef SYMBIAN_NETWORKING_UMTSR5
 
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION 
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\cccccc00_itest1.cre		testdata\configs\cccccc00_itest1.cre
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\cccccc00_itest2.cre		testdata\configs\cccccc00_itest2.cre
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\cccccc00_itest3.cre		testdata\configs\cccccc00_itest3.cre
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\cccccc00_itest4.cre		testdata\configs\cccccc00_itest4.cre
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\cccccc00_itest5.cre		testdata\configs\cccccc00_itest5.cre
+#endif
+
 // S1 script files
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION  
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1.script			testdata\scripts\integration\itest_s1.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\LogOn.script			testdata\scripts\integration\LogOn.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest_RConnection.script		testdata\scripts\integration\itest_s1\itest_RConnection.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest1_01_wlan.script		testdata\scripts\integration\itest_s1\itest1_01.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest1_02_wlan.script		testdata\scripts\integration\itest_s1\itest1_02.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest1_03_wlan.script		testdata\scripts\integration\itest_s1\itest1_03.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest1_04.script		testdata\scripts\integration\itest_s1\itest1_04.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest1_09.script		testdata\scripts\integration\itest_s1\itest1_09.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest1_10_wlan.script		testdata\scripts\integration\itest_s1\itest1_10.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest1_11.script		testdata\scripts\integration\itest_s1\itest1_11.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest1_12.script		testdata\scripts\integration\itest_s1\itest1_12.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest1_13_wlan.script		testdata\scripts\integration\itest_s1\itest1_13.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest1_14.script		testdata\scripts\integration\itest_s1\itest1_14.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest1_15.script		testdata\scripts\integration\itest_s1\itest1_15.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest1_16.script		testdata\scripts\integration\itest_s1\itest1_16.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest1_17_wlan.script		testdata\scripts\integration\itest_s1\itest1_17.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s1\ipv4_wlan.ini			testdata\configs\integration\itest_s1\ipv4.ini				
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s1\ipv6_wlan.ini			testdata\configs\integration\itest_s1\ipv6.ini				
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s1\client_timeout.ini	testdata\configs\integration\itest_s1\client_timeout.ini		
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s1\genconn.ini		testdata\configs\integration\itest_s1\genconn.ini				
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s1\itest.ini		testdata\configs\integration\itest_s1\itest.ini				
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s1\rnif_timeout.ini		testdata\configs\integration\itest_s1\rnif_timeout.ini		
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\load_csd_wlan.script		testdata\scripts\integration\itest_s1\load_csd.script			
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\n6210.script		testdata\scripts\integration\itest_s1\n6210.script			
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest_load.script	testdata\scripts\integration\itest_s1\itest_load.script			
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s1\big_ipv4.ini		testdata\configs\integration\itest_s1\big_ipv4.ini			
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s1\te_teststeps.ini		testdata\configs\integration\itest_s1\te_teststeps.ini			
+#else
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1.script			testdata\scripts\integration\itest_s1.script
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\LogOn.script			testdata\scripts\integration\LogOn.script
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest_RConnection.script		testdata\scripts\integration\itest_s1\itest_RConnection.script
@@ -71,30 +108,61 @@
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s1\itest_load.script	testdata\scripts\integration\itest_s1\itest_load.script			
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s1\big_ipv4.ini		testdata\configs\integration\itest_s1\big_ipv4.ini			
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s1\ipsec_csd.xml			testdata\configs\integration\itest_s1\ipsec_csd.xml			
-
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s1\te_teststeps.ini		testdata\configs\integration\itest_s1\te_teststeps.ini			
-
-
-
+#endif
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION 
 // S2 script files
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s2.script			testdata\scripts\integration\itest_s2.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s2\itest2_01_wlan.script		testdata\scripts\integration\itest_s2\itest2_01.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s2\ipv4_wlan.ini			testdata\configs\integration\itest_s2\ipv4.ini				
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s2\client_timeout.ini	testdata\configs\integration\itest_s2\client_timeout.ini		
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s2\itest.ini		testdata\configs\integration\itest_s2\itest.ini				
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s2\load_hscsd_wlan.script	testdata\scripts\integration\itest_s2\load_hscsd.script			
+#else 
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s2.script			testdata\scripts\integration\itest_s2.script
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s2\itest2_01.script		testdata\scripts\integration\itest_s2\itest2_01.script
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s2\ipv4.ini			testdata\configs\integration\itest_s2\ipv4.ini				
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s2\client_timeout.ini	testdata\configs\integration\itest_s2\client_timeout.ini		
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s2\itest.ini		testdata\configs\integration\itest_s2\itest.ini				
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s2\load_hscsd.script	testdata\scripts\integration\itest_s2\load_hscsd.script			
-data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s2\hscsd.xml		testdata\configs\integration\itest_s2\hscsd.xml			
-
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s2\hscsd.xml		testdata\configs\integration\itest_s2\hscsd.xml
+#endif
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION 
 // S3 script files
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3.script			testdata\scripts\integration\itest_s3.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_01_wlan.script		testdata\scripts\integration\itest_s3\itest3_01.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_02_wlan.script		testdata\scripts\integration\itest_s3\itest3_02.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_03.script		testdata\scripts\integration\itest_s3\itest3_03.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_04_wlan.script		testdata\scripts\integration\itest_s3\itest3_04.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_05_wlan.script		testdata\scripts\integration\itest_s3\itest3_05.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_05b.script		testdata\scripts\integration\itest_s3\itest3_05b.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_05c_wlan.script	testdata\scripts\integration\itest_s3\itest3_05c.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_09_wlan.script		testdata\scripts\integration\itest_s3\itest3_09.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_10_wlan.script		testdata\scripts\integration\itest_s3\itest3_10.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_11.script		testdata\scripts\integration\itest_s3\itest3_11.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_12_wlan.script		testdata\scripts\integration\itest_s3\itest3_12.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_13_wlan.script		testdata\scripts\integration\itest_s3\itest3_13.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_14_wlan.script		testdata\scripts\integration\itest_s3\itest3_14.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_15.script		testdata\scripts\integration\itest_s3\itest3_15.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_16_wlan.script		testdata\scripts\integration\itest_s3\itest3_16.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_17_wlan.script		testdata\scripts\integration\itest_s3\itest3_17.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s3\ipv4_wlan.ini			testdata\configs\integration\itest_s3\ipv4.ini				
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s3\ipv6_wlan.ini			testdata\configs\integration\itest_s3\ipv6.ini				
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s3\client_timeout.ini	testdata\configs\integration\itest_s3\client_timeout.ini		
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s3\route_timeout.ini	testdata\configs\integration\itest_s3\route_timeout.ini	
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s3\genconn.ini		testdata\configs\integration\itest_s3\genconn.ini				
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s3\itest.ini		testdata\configs\integration\itest_s3\itest.ini				
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s3\rnif_timeout.ini		testdata\configs\integration\itest_s3\rnif_timeout.ini		
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\load_gprs_wlan.script		testdata\scripts\integration\itest_s3\load_gprs.script			
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s3\te_teststeps.ini		testdata\configs\integration\itest_s3\te_teststeps.ini			
+#else
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3.script			testdata\scripts\integration\itest_s3.script
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_01.script		testdata\scripts\integration\itest_s3\itest3_01.script
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_02.script		testdata\scripts\integration\itest_s3\itest3_02.script
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_03.script		testdata\scripts\integration\itest_s3\itest3_03.script
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_04.script		testdata\scripts\integration\itest_s3\itest3_04.script
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_05.script		testdata\scripts\integration\itest_s3\itest3_05.script
-
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_05b.script		testdata\scripts\integration\itest_s3\itest3_05b.script
-
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_05c.script	testdata\scripts\integration\itest_s3\itest3_05c.script
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_09.script		testdata\scripts\integration\itest_s3\itest3_09.script
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\itest3_10.script		testdata\scripts\integration\itest_s3\itest3_10.script
@@ -112,24 +180,47 @@
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s3\genconn.ini		testdata\configs\integration\itest_s3\genconn.ini				
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s3\itest.ini		testdata\configs\integration\itest_s3\itest.ini				
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s3\rnif_timeout.ini		testdata\configs\integration\itest_s3\rnif_timeout.ini		
-data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\load_gprs.script		testdata\scripts\integration\itest_s3\load_gprs.script			
-data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s3\gprs.xml			testdata\configs\integration\itest_s3\gprs.xml			
-
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s3\load_gprs_wlan.script		testdata\scripts\integration\itest_s3\load_gprs.script			
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s3\gprs_wlan.xml			testdata\configs\integration\itest_s3\gprs.xml			
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s3\te_teststeps.ini		testdata\configs\integration\itest_s3\te_teststeps.ini			
-
-
+#endif
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION 
 // S4 script files
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4.script			testdata\scripts\integration\itest_s4.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_01_wlan.script		testdata\scripts\integration\itest_s4\itest4_01.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_02.script		testdata\scripts\integration\itest_s4\itest4_02.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_03.script		testdata\scripts\integration\itest_s4\itest4_03.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_04.script		testdata\scripts\integration\itest_s4\itest4_04.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_06_wlan.script		testdata\scripts\integration\itest_s4\itest4_06.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_07.script		testdata\scripts\integration\itest_s4\itest4_07.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_08.script		testdata\scripts\integration\itest_s4\itest4_08.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_09.script		testdata\scripts\integration\itest_s4\itest4_09.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_10.script		testdata\scripts\integration\itest_s4\itest4_10.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_11_wlan.script		testdata\scripts\integration\itest_s4\itest4_11.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_12.script		testdata\scripts\integration\itest_s4\itest4_12.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_13.script		testdata\scripts\integration\itest_s4\itest4_13.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_14.script		testdata\scripts\integration\itest_s4\itest4_14.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_15.script		testdata\scripts\integration\itest_s4\itest4_15.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_16.script		testdata\scripts\integration\itest_s4\itest4_16.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_17_wlan.script		testdata\scripts\integration\itest_s4\itest4_17.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s4\ipv4_wlan.ini			testdata\configs\integration\itest_s4\ipv4.ini				
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s4\ipv6_wlan.ini			testdata\configs\integration\itest_s4\ipv6.ini				
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s4\client_timeout.ini	testdata\configs\integration\itest_s4\client_timeout.ini		
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s4\genconn.ini		testdata\configs\integration\itest_s4\genconn.ini				
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s4\genconn-psd.ini		testdata\configs\integration\itest_s4\genconn-psd.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s4\itest.ini		testdata\configs\integration\itest_s4\itest.ini				
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s4\rnif_timeout.ini		testdata\configs\integration\itest_s4\rnif_timeout.ini		
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s4\te_teststeps.ini		testdata\configs\integration\itest_s4\te_teststeps.ini			
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s4\route_timeout.ini	testdata\configs\integration\itest_s4\route_timeout.ini	
+#else
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4.script			testdata\scripts\integration\itest_s4.script
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_01.script		testdata\scripts\integration\itest_s4\itest4_01.script
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_02.script		testdata\scripts\integration\itest_s4\itest4_02.script
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_03.script		testdata\scripts\integration\itest_s4\itest4_03.script
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_04.script		testdata\scripts\integration\itest_s4\itest4_04.script
-
-
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_06.script		testdata\scripts\integration\itest_s4\itest4_06.script
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_07.script		testdata\scripts\integration\itest_s4\itest4_07.script
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_08.script		testdata\scripts\integration\itest_s4\itest4_08.script
-
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_09.script		testdata\scripts\integration\itest_s4\itest4_09.script
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_10.script		testdata\scripts\integration\itest_s4\itest4_10.script
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s4\itest4_11.script		testdata\scripts\integration\itest_s4\itest4_11.script
@@ -148,10 +239,42 @@
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s4\rnif_timeout.ini		testdata\configs\integration\itest_s4\rnif_timeout.ini		
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s4\te_teststeps.ini		testdata\configs\integration\itest_s4\te_teststeps.ini			
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s4\route_timeout.ini	testdata\configs\integration\itest_s4\route_timeout.ini	
-
-
+#endif
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION 
 // S5 script files
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5.script			testdata\scripts\integration\itest_s5.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_01_wlan.script		testdata\scripts\integration\itest_s5\itest5_01.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_02.script		testdata\scripts\integration\itest_s5\itest5_02.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_03_wlan.script		testdata\scripts\integration\itest_s5\itest5_03.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_04.script		testdata\scripts\integration\itest_s5\itest5_04.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_05.script		testdata\scripts\integration\itest_s5\itest5_05.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_05b.script	testdata\scripts\integration\itest_s5\itest5_05b.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_05c.script	testdata\scripts\integration\itest_s5\itest5_05c.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_06.script		testdata\scripts\integration\itest_s5\itest5_06.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_07.script		testdata\scripts\integration\itest_s5\itest5_07.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_08.script		testdata\scripts\integration\itest_s5\itest5_08.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_09.script		testdata\scripts\integration\itest_s5\itest5_09.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_10_wlan.script		testdata\scripts\integration\itest_s5\itest5_10.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_11.script		testdata\scripts\integration\itest_s5\itest5_11.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_12_wlan.script		testdata\scripts\integration\itest_s5\itest5_12.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_13_wlan.script		testdata\scripts\integration\itest_s5\itest5_13.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_14.script		testdata\scripts\integration\itest_s5\itest5_14.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_15.script		testdata\scripts\integration\itest_s5\itest5_15.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_16.script		testdata\scripts\integration\itest_s5\itest5_16.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_17_wlan.script		testdata\scripts\integration\itest_s5\itest5_17.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_18.script		testdata\scripts\integration\itest_s5\itest5_18.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_19.script		testdata\scripts\integration\itest_s5\itest5_19.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s5\ipv4_wlan.ini			testdata\configs\integration\itest_s5\ipv4.ini				
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s5\ipv6_wlan.ini			testdata\configs\integration\itest_s5\ipv6.ini				
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s5\client_timeout.ini	testdata\configs\integration\itest_s5\client_timeout.ini		
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s5\genconn.ini		testdata\configs\integration\itest_s5\genconn.ini				
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s5\itest.ini		testdata\configs\integration\itest_s5\itest.ini				
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s5\rnif_timeout.ini		testdata\configs\integration\itest_s5\rnif_timeout.ini		
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s5\route_timeout.ini	testdata\configs\integration\itest_s5\route_timeout.ini
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\load_ircsd_wlan.script	testdata\scripts\integration\itest_s5\load_ircsd.script			
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s5\te_teststeps.ini		testdata\configs\integration\itest_s5\te_teststeps.ini			
+#else
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5.script			testdata\scripts\integration\itest_s5.script
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_01.script		testdata\scripts\integration\itest_s5\itest5_01.script
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_02.script		testdata\scripts\integration\itest_s5\itest5_02.script
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_03.script		testdata\scripts\integration\itest_s5\itest5_03.script
@@ -171,11 +294,8 @@
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_15.script		testdata\scripts\integration\itest_s5\itest5_15.script
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_16.script		testdata\scripts\integration\itest_s5\itest5_16.script
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_17.script		testdata\scripts\integration\itest_s5\itest5_17.script
-
-
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_18.script		testdata\scripts\integration\itest_s5\itest5_18.script
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\itest5_19.script		testdata\scripts\integration\itest_s5\itest5_19.script
-
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s5\ipv4.ini			testdata\configs\integration\itest_s5\ipv4.ini				
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s5\ipv6.ini			testdata\configs\integration\itest_s5\ipv6.ini				
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s5\client_timeout.ini	testdata\configs\integration\itest_s5\client_timeout.ini		
@@ -185,10 +305,8 @@
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s5\route_timeout.ini	testdata\configs\integration\itest_s5\route_timeout.ini
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\integration\itest_s5\load_ircsd.script	testdata\scripts\integration\itest_s5\load_ircsd.script			
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s5\csd-ir.xml		testdata\configs\integration\itest_s5\csd-ir.xml			
-
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\itest_s5\te_teststeps.ini		testdata\configs\integration\itest_s5\te_teststeps.ini			
-
-
+#endif
 
 // Self test files.
 data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\integration\example.ini testdata\configs\integration\example.ini
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/Te_Http/src/TeInit.cpp
--- a/networkingtestandutils/networkingintegrationtest/Te_Http/src/TeInit.cpp	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/Te_Http/src/TeInit.cpp	Wed Aug 18 11:18:20 2010 +0300
@@ -1,4 +1,4 @@
-// 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"
@@ -47,7 +47,7 @@
 	{
 
 	TInt err;
-
+#ifndef SIROCCO_CODE_MIGRATION 
 	INFO_PRINTF1(_L("Load PDD"));	
 	err = User::LoadPhysicalDevice(PDD_NAME);
 	if (err != KErrNone && err != KErrAlreadyExists)
@@ -56,7 +56,7 @@
 		SetTestStepResult(EFail);
 		User::Leave(err);
 		}
-
+#endif
 	INFO_PRINTF1(_L("Load LDD"));	
 	err = User::LoadLogicalDevice(LDD_NAME);
 	if (err != KErrNone && err != KErrAlreadyExists)
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/Te_Msg/Scripts/te_msg_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/Te_Msg/Scripts/te_msg_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,41 @@
+//
+// 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:
+//
+//
+PRINT Run all Te_msg Tests
+//
+run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
+//
+//ced -i z:\testdata\configs\te_msg.xml te_msg.log
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_te_msg.cre c:\private\10202be9\persists\cccccc00.cre
+//
+run_script z:\TestData\scripts\te_esock_test_loadesock.script
+//
+LOAD_SUITE Te_msg
+
+START_TESTCASE			NET-Integration-Msg-0101
+//! @SYMTestCaseID		NET-Integration-Msg-0101
+
+RUN_TEST_STEP 100 Te_msg ConnectWithOverrides z:\testdata\configs\te_msg.ini
+END_TESTCASE			NET-Integration-Msg-0101
+
+//
+run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/Te_Msg/group/bld.inf
--- a/networkingtestandutils/networkingintegrationtest/Te_Msg/group/bld.inf	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/Te_Msg/group/bld.inf	Wed Aug 18 11:18:20 2010 +0300
@@ -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"
@@ -25,10 +25,18 @@
 // TE_msg - IBY
 te_msg.iby		                /epoc32/rom/include/te_msg.iby
 
-// TE_msg - Target
-../Scripts/te_msg.script		/epoc32/data/z/testdata/scripts/te_msg.script
+#ifdef SIROCCO_CODE_MIGRATION 
+../Scripts/te_msg_wlan.script		/epoc32/data/z/testdata/scripts/te_msg_wlan.script
+../testdata/te_msg_wlan.ini		/epoc32/data/z/testdata/configs/te_msg_wlan.ini  
+../testdata/cccccc00_te_msg.cre 	/epoc32/data/z/testdata/configs/cccccc00_te_msg.cre
+#else
+../Scripts/te_msg.script	/epoc32/data/z/testdata/scripts/te_msg.script
 ../testdata/te_msg.ini		/epoc32/data/z/testdata/configs/te_msg.ini  
 ../testdata/te_msg.xml		/epoc32/data/z/testdata/configs/te_msg.xml
+#endif
+
+// TE_msg - Target
+
 
 // TE_msg - WINS
 ../Scripts/te_msg.script		/epoc32/release/wins/udeb/z/testdata/scripts/te_msg.script
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/Te_Msg/group/te_msg.iby
--- a/networkingtestandutils/networkingintegrationtest/Te_Msg/group/te_msg.iby	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/Te_Msg/group/te_msg.iby	Wed Aug 18 11:18:20 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -22,8 +22,21 @@
 
 file=ABI_DIR\DEBUG_DIR\Te_msg.exe		System\libs\te_msg.exe
 
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=EPOCROOT##epoc32\data\z\TestData\Scripts\te_msg_wlan.script    TestData\Scripts\te_msg.script
+data=EPOCROOT##epoc32\data\z\TestData\Configs\te_msg_wlan.ini       TestData\configs\te_msg.ini  
+data=EPOCROOT##epoc32\data\z\TestData\Configs\cccccc00_te_msg.cre   TestData\configs\cccccc00_te_msg.cre 
+#else
 data=EPOCROOT##epoc32\data\z\TestData\Scripts\TE_MSG.script    TestData\Scripts\TE_MSG.script 
 data=EPOCROOT##epoc32\data\z\TestData\Configs\TE_MSG.xml       TestData\configs\TE_MSG.xml      
 data=EPOCROOT##epoc32\data\z\TestData\Configs\TE_MSG.ini       TestData\configs\TE_MSG.ini   
+#endif
+
+
+#if defined(TEXT_ONLY_ROM)
+file=ABI_DIR\DEBUG_DIR\tsecdlg_text.dll         sys\bin\tnotifiers\tsecdlg_text.dll 
+#else
+file=ABI_DIR\DEBUG_DIR\tsecdlg.dll              sys\bin\notifiers\tsecdlg.dll
+#endif    
 
 #endif
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/Te_Msg/src/TeMsgStep.cpp
--- a/networkingtestandutils/networkingintegrationtest/Te_Msg/src/TeMsgStep.cpp	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/Te_Msg/src/TeMsgStep.cpp	Wed Aug 18 11:18:20 2010 +0300
@@ -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"
@@ -29,6 +29,7 @@
 #include <commdbconnpref.h>
 #include <e32std.h>
 #include <securesocket.h>
+#include <e32property.h>
 
 
 _LIT(KIap,					"Iap");
@@ -46,9 +47,9 @@
 #define PDD_NAME _L("EUART1")
 #define LDD_NAME _L("ECOMM")
 #endif
-
+#ifndef SIROCCO_CODE_MIGRATION
 const TInt iapCount = 2;
-
+#endif
 CTestConnectStep::CTestConnectStep():iIapNumber(0), iPort(0), iScheduler(NULL)
 /**
  * Constructor
@@ -80,6 +81,9 @@
 		{
 		iScheduler = new CActiveScheduler();
 		CActiveScheduler::Install(iScheduler);
+#ifdef SIROCCO_CODE_MIGRATION 
+		TInt err;
+#else
 		INFO_PRINTF1(_L("Load PDD"));	
 		TInt err = User::LoadPhysicalDevice(PDD_NAME);
 		if (err != KErrNone && err != KErrAlreadyExists)
@@ -88,7 +92,7 @@
 			SetTestStepResult(EFail);
 			User::Leave(err);
 			}
-
+#endif
 		INFO_PRINTF1(_L("Load LDD"));	
 		err = User::LoadLogicalDevice(LDD_NAME);
 		if (err != KErrNone && err != KErrAlreadyExists)
@@ -155,6 +159,16 @@
 		INFO_PRINTF2((_L("IapNumber = %d")), iIapNumber);
 
 		TRequestStatus status;
+#ifdef SIROCCO_CODE_MIGRATION
+	TCommDbConnPref prefs;
+	prefs.SetIapId(iIapNumber);
+	prefs.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
+		const TUid KMyPropertyCat = {0x101FD9C5};
+        const TUint32 KMyPropertyDestPortv4 = 67;
+        TInt err = RProperty::Define(KMyPropertyCat, KMyPropertyDestPortv4, RProperty::EInt, TSecurityPolicy(TSecurityPolicy::EAlwaysPass),
+		     TSecurityPolicy(ECapabilityWriteDeviceData));
+        User::LeaveIfError(RProperty::Set(KMyPropertyCat, KMyPropertyDestPortv4, 93));
+#else
 
 		TInt rank = 1;
 
@@ -179,6 +193,7 @@
 			}
 
 		prefs.SetConnectionAttempts(rank-1);
+#endif 
 
 		// Start the connection
 		iConnection.Start(prefs, status);
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/Te_Msg/testdata/cccccc00_te_msg.cre
Binary file networkingtestandutils/networkingintegrationtest/Te_Msg/testdata/cccccc00_te_msg.cre has changed
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/Te_Msg/testdata/te_msg.ini
--- a/networkingtestandutils/networkingintegrationtest/Te_Msg/testdata/te_msg.ini	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/Te_Msg/testdata/te_msg.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -1,5 +1,5 @@
 [IAP]
-IapNumber = 1
+IapNumber = 3
 
 [TCP Config]
 HostName = httpsmtpssl.test.intra
@@ -8,6 +8,6 @@
 
 [General]
 EchoPort = 543
-LookupAddress = 192.168.10.11
+LookupAddress = 192.168.40.50
 
 
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/Te_Msg/testdata/te_msg_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/Te_Msg/testdata/te_msg_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,13 @@
+[IAP]
+IapNumber = 3
+
+[TCP Config]
+HostName = httpsmtpssl.test.intra
+Port = 643
+DNSName = SSL21
+
+[General]
+EchoPort = 543
+LookupAddress = 192.168.40.50
+
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/Te_Msg/testdata/te_msg_wlan.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/Te_Msg/testdata/te_msg_wlan.xml	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,1155 @@
+<?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
+ 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>NT RAS</Name>
+    </Network>
+    <Network operation="add">
+        <Name>Linux</Name>
+    </Network>
+    <Network operation="add">
+        <Name>Dummy</Name>
+    </Network>
+    <Network operation="add">
+        <Name>Hungry</Name>
+    </Network>
+    <Network operation="add">
+        <Name>Dummy (Long Timeout)</Name>
+    </Network>
+    <Network operation="add">
+        <Name>Hungry (Long Timeout)</Name>
+    </Network>
+</NetworkTable>
+
+<IAPTable>
+    <IAP operation="add">
+        <Name>Actual NT RAS</Name>
+        <IAPService>DialOutISP.NT RAS</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.NT RAS</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>NTRas GPRS</Name>
+        <IAPService>OutgoingGPRS.NTRas GPRS</IAPService>
+        <IAPBearer>ModemBearer.Hungry (Long Timeout)</IAPBearer>
+        <IAPNetwork>Network.NT RAS</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Mobile</LocationRef>
+    </IAP>
+</IAPTable>
+
+<ModemBearerTable>
+    <ModemBearer operation="template">
+        <Name>Default Modem</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</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>6</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>Null Modem 115200bps</Name>
+        <Agent>csd.agt</Agent>
+        <IfName>ppp</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>NTRASTSY</TSYName>
+        <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>
+    <ModemBearer operation="add">
+        <Name>Linux</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::3</PortName>
+        <TSYName>NTRASTSY</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>5</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>TRUE</MessageDeliveryReport>
+        <MinimumSignalLevel>0</MinimumSignalLevel>
+        <LastSocketActivityTimeout>30</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>20</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>Dummy</Name>
+        <Agent>NULLAGT.agt</Agent>
+        <IfName>dummynif</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>NTRASTSY</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>5</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>TRUE</MessageDeliveryReport>
+        <MinimumSignalLevel>0</MinimumSignalLevel>
+        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>2</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>4</LastSocketClosedTimeout>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>Hungry</Name>
+        <Agent>NULLAGT.agt</Agent>
+        <IfName>hungrynif</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>NTRASTSY</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>5</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>TRUE</MessageDeliveryReport>
+        <MinimumSignalLevel>0</MinimumSignalLevel>
+        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>2</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>4</LastSocketClosedTimeout>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>Dummy (Long Timeout)</Name>
+        <Agent>NULLAGT.agt</Agent>
+        <IfName>dummynif</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</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>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>TRUE</MessageDeliveryReport>
+        <MinimumSignalLevel>0</MinimumSignalLevel>
+        <LastSocketActivityTimeout>14</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>6</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>Hungry (Long Timeout)</Name>
+        <Agent>NULLAGT.agt</Agent>
+        <IfName>hungrynif</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</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>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>TRUE</MessageDeliveryReport>
+        <MinimumSignalLevel>0</MinimumSignalLevel>
+        <LastSocketActivityTimeout>100</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>8</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>12</LastSocketClosedTimeout>
+    </ModemBearer>
+</ModemBearerTable>
+
+<LANBearerTable>
+    <LANBearer operation="add">
+        <Name>Dummy LAN Bearer</Name>
+        <Agent>PSD.agt</Agent>
+        <IfName>ppp</IfName>
+        <LDDName>Dummy LDD</LDDName>
+        <PDDName>Dummy PDD</PDDName>
+    </LANBearer>
+</LANBearerTable>
+
+<LANServiceTable>
+    <LANService operation="add">
+        <Name>Ethernet</Name>
+        <IfNetworks>ip,ip6</IfNetworks>
+        <IpNetMask>255.255.255.0</IpNetMask>
+        <IpGateway>194.72.6.1</IpGateway>
+        <IpAddr>192.168.0.100</IpAddr>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <IpNameServer1>194.72.6.51</IpNameServer1>
+        <IpNameServer2>194.72.6.52</IpNameServer2>
+    </LANService>
+</LANServiceTable>
+
+<DialInISPTable>
+    <DialInISP operation="template">
+        <Name>Default Dial In ISP</Name>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <UseEdge>FALSE</UseEdge>
+    </DialInISP>
+    <DialInISP operation="add">
+        <Name>Dial In CS ISP</Name>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <UseEdge>FALSE</UseEdge>
+    </DialInISP>
+</DialInISPTable>
+
+<DialOutISPTable>
+    <DialOutISP operation="template">
+        <Name>Default Dial Out ISP</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>TRUE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>0</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>NT RAS</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>TRUE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Type>INTERNETONLY</Type>
+        <LoginScript>CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND &quot;CLIENT&quot;+&lt;0x0d&gt;\nWAIT 3\n{\n&quot;SERVER&quot; OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n</LoginScript>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpNameServer1>10.16.59.15</IpNameServer1>
+        <IpNameServer2>0.0.0.0</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>9600</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>0</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Linux</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Description>Linux</Description>
+        <Type>INTERNETONLY</Type>
+        <LoginScript>New Record</LoginScript>
+        <LoginName>RasUser</LoginName>
+        <LoginPass>pass</LoginPass>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <IfCallbackType>IETF0</IfCallbackType>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>9600</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>0</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Dummy</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Description>Dummy</Description>
+        <Type>INTERNETONLY</Type>
+        <LoginScript>New Record</LoginScript>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip,ip6</IfNetworks>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <IfCallbackType>IETF0</IfCallbackType>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>9600</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>0</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>Bad NT RAS</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>TRUE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Type>INTERNETONLY</Type>
+        <LoginScript>CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND &quot;CLIENT&quot;+&lt;0x0d&gt;\nWAIT 3\n{\n&quot;SERVER&quot; OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n</LoginScript>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>badpass</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerName>ASYNCHRONOUS</BearerName>
+        <BearerSpeed>UNSPECIFIED</BearerSpeed>
+        <BearerCE>UNSPECIFIED</BearerCE>
+        <BearerType>CSD</BearerType>
+        <ChannelCoding>UNSPECIFIED</ChannelCoding>
+        <AIUR>9600</AIUR>
+        <RequestedTimeSlots>0</RequestedTimeSlots>
+        <MaximumTimeSlots>0</MaximumTimeSlots>
+        <BearerProtocol>0</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+</DialOutISPTable>
+
+<AgentLookupTable>
+</AgentLookupTable>
+
+<CDMA2000PacketServiceTable>
+    <CDMA2000PacketService operation="add">
+        <Name>test name cdma2000</Name>
+        <IwfName>Test2000</IwfName>
+        <ServiceOption>HIGHSPEEDCDMA2000DATA</ServiceOption>
+        <PdpType>IPV4</PdpType>
+        <ReqFwdPriority>PRIORITY04</ReqFwdPriority>
+        <ReqRevPriority>PRIORITY04</ReqRevPriority>
+        <ReqFwdBitrate>32KBPS</ReqFwdBitrate>
+        <ReqRevBitrate>32KBPS</ReqRevBitrate>
+        <ReqFwdLoss>LOSS1</ReqFwdLoss>
+        <ReqRevLoss>LOSS1</ReqRevLoss>
+        <ReqFwdMaxdelay>40MS</ReqFwdMaxdelay>
+        <ReqRevMaxdelay>40MS</ReqRevMaxdelay>
+        <MinFwdBitrate>8KBPS</MinFwdBitrate>
+        <MinRevBitrate>8KBPS</MinRevBitrate>
+        <AccptFwdLoss>LOSS2</AccptFwdLoss>
+        <AccptRevLoss>LOSS2</AccptRevLoss>
+        <AccptFwdMaxdelay>120MS</AccptFwdMaxdelay>
+        <AccptRevMaxdelay>120MS</AccptRevMaxdelay>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <AuthRetries>1</AuthRetries>
+        <IpNetMask>0.255.255.255</IpNetMask>
+        <IpGateway>10.0.0.1</IpGateway>
+        <EnableLCPExtension>TRUE</EnableLCPExtension>
+        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
+        <ApType>2</ApType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <RlpMode>UNKNOWN</RlpMode>
+        <CDMAMobileIP>FALSE</CDMAMobileIP>
+        <CDMAMobileIPTimeout>10000000</CDMAMobileIPTimeout>
+    </CDMA2000PacketService>
+</CDMA2000PacketServiceTable>
+
+<DefaultCDMA2000Table>
+</DefaultCDMA2000Table>
+
+<ChargecardTable>
+    <Chargecard operation="add">
+        <Name>Dummy BT Chargecard</Name>
+        <AccountNumber>144,12345678</AccountNumber>
+        <Pin>0000</Pin>
+        <LocalRule>HG</LocalRule>
+        <NatRule>HFG</NatRule>
+        <IntlRule>HEFG</IntlRule>
+    </Chargecard>
+    <Chargecard operation="add">
+        <Name>Dummy Mercury Chargecard</Name>
+        <AccountNumber>0500800800,,12345678</AccountNumber>
+        <Pin>****</Pin>
+        <LocalRule>HG</LocalRule>
+        <NatRule>J,K,0FG</NatRule>
+        <IntlRule>HEFG</IntlRule>
+    </Chargecard>
+</ChargecardTable>
+
+<ConnectionPreferencesTable>
+    <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable1</Name>
+        <Ranking>2</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>PROMPT</DialogPref>
+        <BearerSet>PSD</BearerSet>
+        <IAPRef>IAP.NTRas GPRS</IAPRef>
+    </ConnectionPreferences>
+    <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable2</Name>
+        <Ranking>1</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>DONOTPROMPT</DialogPref>
+        <BearerSet>CSD</BearerSet>
+        <IAPRef>IAP.Actual NT RAS</IAPRef>
+    </ConnectionPreferences>
+</ConnectionPreferencesTable>
+
+<GlobalSettingsTable>
+    <GlobalSettings operation="add">
+        <Name>GlobalSettingsTable1</Name>
+        <RedialAttempts>3</RedialAttempts>
+        <SmsBearer>2</SmsBearer>
+        <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>
+    <IncomingGPRS operation="add">
+        <Name>Dummy Incoming GPRS Settings</Name>
+        <APN>Test</APN>
+        <PDPType>IPV4</PDPType>
+        <PDPAddress>0.0.0.0</PDPAddress>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <ReqPrecedence>1</ReqPrecedence>
+        <ReqDelay>1</ReqDelay>
+        <ReqReliability>1</ReqReliability>
+        <ReqPeakThroughput>1</ReqPeakThroughput>
+        <ReqMeanThroughput>1</ReqMeanThroughput>
+        <MinPrecedence>1</MinPrecedence>
+        <MinDelay>1</MinDelay>
+        <MinReliability>1</MinReliability>
+        <MinPeakThroughput>1</MinPeakThroughput>
+        <MinMeanThroughput>1</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <AuthRetries>1</AuthRetries>
+        <IpNameServer1>0.0.0.0</IpNameServer1>
+        <IpNameServer2>0.0.0.0</IpNameServer2>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+    </IncomingGPRS>
+</IncomingGPRSTable>
+
+<OutgoingGPRSTable>
+    <OutgoingGPRS operation="add">
+        <Name>NTRas GPRS</Name>
+        <APN>Test</APN>
+        <PDPType>IPV4</PDPType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</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>
+        <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>
+</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>
+    <Proxy operation="add">
+        <Name>ProxyTable1</Name>
+        <ISPRef>DialOutISP.NT RAS</ISPRef>
+        <UseProxyServer>TRUE</UseProxyServer>
+        <ProtocolName>http</ProtocolName>
+        <ProxyServerName>www.dummyproxy.com</ProxyServerName>
+        <PortNumber>80</PortNumber>
+        <Exceptions>www.dummyproxy.com/exception</Exceptions>
+    </Proxy>
+</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>Office Direct Dial</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>
+    </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>
+    <Location operation="add">
+        <Name>Home</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>TRUE</UsePulseDial>
+        <WaitForDialTone>TRUE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>181</AreaCode>
+    </Location>
+</LocationTable>
+
+<SecureSocketTable>
+    <SecureSocket operation="add">
+        <Name>SecureSocketTable1</Name>
+        <ProtocolName>ssl3.0</ProtocolName>
+        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
+    </SecureSocket>
+    <SecureSocket operation="add">
+        <Name>SecureSocketTable2</Name>
+        <ProtocolName>tls1.0</ProtocolName>
+        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
+    </SecureSocket>
+</SecureSocketTable>
+
+<BTDeviceTable>
+</BTDeviceTable>
+
+<BTPersistTable>
+</BTPersistTable>
+
+<BTSecurityTable>
+</BTSecurityTable>
+
+<BTDefaultTable>
+</BTDefaultTable>
+
+<WAPAccessPointTable>
+    <WAPAccessPoint operation="template">
+        <Name>Default Dial In ISP</Name>
+        <CurrentBearer>WAPIPBearer</CurrentBearer>
+    </WAPAccessPoint>
+    <WAPAccessPoint operation="add">
+        <Name>Dummy WAP Settings</Name>
+        <CurrentBearer>WAPIPBearer</CurrentBearer>
+        <StartPage>www.wapstart.com</StartPage>
+    </WAPAccessPoint>
+</WAPAccessPointTable>
+
+<WAPIPBearerTable>
+    <WAPIPBearer operation="template">
+        <Name>WAPIPBearerTable1</Name>
+        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
+        <WSPOption>CONNECTIONLESS</WSPOption>
+        <Security>FALSE</Security>
+        <IAPRef>IAP.-1</IAPRef>
+        <ProxyPortNumber>0</ProxyPortNumber>
+    </WAPIPBearer>
+    <WAPIPBearer operation="add">
+        <Name>WAPIPBearerTable2</Name>
+        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
+        <GatewayAddress>www.wapgateway.com</GatewayAddress>
+        <WSPOption>CONNECTIONORIENTED</WSPOption>
+        <Security>FALSE</Security>
+        <IAPRef>IAP.NTRas GPRS</IAPRef>
+        <ProxyPortNumber>1</ProxyPortNumber>
+    </WAPIPBearer>
+</WAPIPBearerTable>
+
+<WAPSMSBearerTable>
+    <WAPSMSBearer operation="template">
+        <Name>WAPSMSBearerTable1</Name>
+        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
+        <WSPOption>CONNECTIONLESS</WSPOption>
+        <Security>FALSE</Security>
+    </WAPSMSBearer>
+    <WAPSMSBearer operation="add">
+        <Name>WAPSMSBearerTable2</Name>
+        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
+        <GatewayAddress>+4412345678901</GatewayAddress>
+        <WSPOption>CONNECTIONORIENTED</WSPOption>
+        <Security>FALSE</Security>
+        <ServiceCentreAddress>+442071234567</ServiceCentreAddress>
+    </WAPSMSBearer>
+</WAPSMSBearerTable>
+
+<VirtualBearerTable>
+</VirtualBearerTable>
+
+<VpnServiceTable>
+</VpnServiceTable>
+
+
+</CommDB:Config>
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/Te_Msg/testdata/te_msg_wlan1.xml
Binary file networkingtestandutils/networkingintegrationtest/Te_Msg/testdata/te_msg_wlan1.xml has changed
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/cccccc00_itest1.cre
Binary file networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/cccccc00_itest1.cre has changed
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/connectionpref_wlan.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/connectionpref_wlan.xml	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CommDB:Config>
+	<ConnectionPreferencesTable>
+	  	<ConnectionPreferences>
+        		<Name>ConnectionPreferencesTable1</Name>
+       	 	<Ranking>1</Ranking>
+        		<Direction>OUTGOING</Direction>
+        		<DialogPref>DONOTPROMPT</DialogPref>
+        		<BearerSet>WLAN</BearerSet>
+        		<IAPRef>IAP.NT RAS with Null Modem</IAPRef>
+    		</ConnectionPreferences>
+  	</ConnectionPreferencesTable>
+</CommDB:Config>
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/ipv4_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/ipv4_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,16 @@
+[Test_Common]
+ipAddress=192.168.40.50
+
+
+
+[SendData]
+NoPackets=20
+PacketSize=1600
+connectTimer=90
+Port=7
+UdpEnable=true
+UdpPacketSize=200
+UdpPort=1030
+
+
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/ipv6_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/ipv6_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,15 @@
+[Test_Common]
+ipAddress=2001:618::20c:29ff:feb9:fe12
+
+
+
+[SendData]
+NoPackets=20
+PacketSize=1600
+connectTimer=60
+Port=7
+UdpEnable=true
+UdpPacketSize=200
+UdpPort=1030
+
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/itest1_01_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/itest1_01_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,68 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 1.1 - CSD outgoing with Ipv4, Client timeout
+
+
+// setup
+LOAD_SUITE TE_Esock  
+LOAD_SUITE te_esockutil
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\integration\itest_s1\csd.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest1.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+// open socket server 
+RUN_TEST_STEP 100 TE_Esock OpenServer   
+
+
+START_TESTCASE			NET-Integration-Csd-0101
+//! @SYMTestCaseID		NET-Integration-Csd-0101
+
+// open socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s1\itest.ini
+
+// use socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s1\ipv4.ini
+
+
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s1\itest.ini
+
+// wait for more than Commdb AgentClientTimeout
+print wait for more than Commdb AgentClientTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s1\client_timeout.ini
+
+// check the network is NOT active
+//replace below
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+TEST_COMPLETE CSD_test1_1
+END_TESTCASE			NET-Integration-Csd-0101
+
+
+// close socket server 
+RUN_TEST_STEP 100 TE_Esock CloseServer   
+
+// log result
+PRINT Result for Integration test 1.1 - CSD Outgoing with Ipv4
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/itest1_02_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/itest1_02_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,93 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+PRINT Integration Test 1.2 CSD Outgoing with Ipsec, Client timeout
+
+// setup
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+#use ced to make the required database for ipsec
+#run_script z:\TestData\scripts\esock_test_unloadesockForced.script
+#ced z:\testdata\configs\integration\itest_s1\ipsec_csd.xml csd.log
+#run_script z:\TestData\scripts\esock_test_loadesock.script
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\integration\itest_s1\csd.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest1.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+# ipsec dirs
+run_utils mkdir c:\system\data\security\
+run_utils mkdir c:\system\data\security\secfiles\
+
+
+
+# vpn test 1, the IAPs need to be configured for this in advance
+run_utils copyfile z:\TestData\configs\fbsd_tull.pol c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils copyfile z:\TestData\configs\fbsd_tull.pin c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils copyfile z:\TestData\configs\cisco_all.pol c:\system\data\security\secfiles\cisco_all.pol
+run_utils copyfile z:\TestData\configs\cisco_all.pin c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\cisco_all.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\cisco_all.pin
+
+
+run_utils copyfile z:\TestData\configs\algorithms.conf c:\system\data\security\secfiles\algorithms.conf
+run_utils MakeReadWrite c:\system\data\security\secfiles\algorithms.conf
+
+// open socket server 
+RUN_TEST_STEP 100 TE_Esock OpenServer   
+
+
+START_TESTCASE			NET-Integration-Csd-0201
+//! @SYMTestCaseID		NET-Integration-Csd-0201
+
+// run tests
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s1\itest.ini
+
+// use socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s1\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s1\itest.ini
+
+// close socket server 
+RUN_TEST_STEP 100 TE_Esock CloseServer   
+
+// wait for more than Commdb AgentClientTimeout
+print wait for more than Commdb AgentClientTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s1\client_timeout.ini
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+TEST_COMPLETE CSD_test1_02
+END_TESTCASE			NET-Integration-Csd-0201
+
+// close socket server 
+RUN_TEST_STEP 100 TE_Esock CloseServer   
+
+
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/itest1_03_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/itest1_03_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,78 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 1.03 - CSD outgoing with ipv4 and ipv6 
+
+// setup
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\integration\itest_s1\csd.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest1.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+// open socket server 
+RUN_TEST_STEP 100 TE_Esock OpenServer   
+
+
+START_TESTCASE			NET-Integration-Csd-0301
+//! @SYMTestCaseID		NET-Integration-Csd-0301
+
+// open Ipv4 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s1\itest.ini
+
+// send some data
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s1\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s1\itest.ini
+
+// open Ipv6 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s1\itest.ini
+
+// send some data
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s1\ipv6.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s1\itest.ini
+
+// wait for more than Commdb AgentClientTimeout
+print wait for more than Commdb AgentClientTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s1\client_timeout.ini
+
+
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+TEST_COMPLETE CSD_test1_3
+END_TESTCASE			NET-Integration-Csd-0301
+
+
+// close socket server 
+RUN_TEST_STEP 100 TE_Esock CloseServer   
+
+// log result
+PRINT Result for Integration test 1.03 - CSD outgoing with ipv4 and ipv6
+
+
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/itest1_10_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/itest1_10_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,89 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 1.10 - CSD Outgoing terminated By Rnif::Stop with Ipv4 and Ipsec
+
+// setup
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\integration\itest_s1\csd.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest1.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+# ipsec dirs
+run_utils mkdir c:\system\data\security\
+run_utils mkdir c:\system\data\security\secfiles\
+
+# vpn test 1, the IAPs need to be configured for this in advance
+run_utils copyfile z:\TestData\configs\fbsd_tull.pol c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils copyfile z:\TestData\configs\fbsd_tull.pin c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils copyfile z:\TestData\configs\cisco_all.pol c:\system\data\security\secfiles\cisco_all.pol
+run_utils copyfile z:\TestData\configs\cisco_all.pin c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\cisco_all.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils copyfile z:\TestData\configs\algorithms.conf c:\system\data\security\secfiles\algorithms.conf
+run_utils MakeReadWrite c:\system\data\security\secfiles\algorithms.conf
+
+// open socket server 
+RUN_TEST_STEP 100 TE_Esock OpenServer   
+
+
+START_TESTCASE			NET-Integration-Csd-0601
+//! @SYMTestCaseID		NET-Integration-Csd-0601
+
+// open Ipv4 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s1\itest.ini
+
+// use Ipv4 socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s1\ipv4.ini
+
+// close using rnif::stop 
+RUN_TEST_STEP 3000 te_esockutil TE_ESockUtilStopAllInterfaces
+
+
+// short delay
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s1\rnif_timeout.ini
+
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s1\itest.ini
+TEST_COMPLETE CSD_test1_10
+END_TESTCASE			NET-Integration-Csd-0601
+
+
+// close socket server 
+RUN_TEST_STEP 100 TE_Esock CloseServer   
+
+// log result
+PRINT Result for Integration test 1.10 - CSD Outgoing terminated By Rnif::Stop with Ipv4 and Ipsec
+
+
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/itest1_13_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/itest1_13_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,64 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 1.13 - CSD Outgoing terminated By Link failure with Ipv4
+
+// setup
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\integration\itest_s1\csd.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest1.cre c:\private\10202be9\persists\cccccc00.cre
+
+// open socket server 
+RUN_TEST_STEP 100 TE_Esock OpenServer   
+
+
+START_TESTCASE			NET-Integration-Csd-0901
+//! @SYMTestCaseID		NET-Integration-Csd-0901
+
+// open Ipv4 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s1\itest.ini
+
+// do something
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s1\ipv4.ini
+
+// simulate link failure - get the user to do this
+print User action required to break link
+print Press a key to continue when this has been done
+pause
+
+// check the link is closed
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s1\itest.ini
+TEST_COMPLETE CSD_test1_13
+END_TESTCASE			NET-Integration-Csd-0901
+
+
+// close socket server 
+RUN_TEST_STEP 100 TE_Esock CloseServer   
+
+// log result
+PRINT Result for Integration test 1.13 - CSD Outgoing terminated By Link failure with Ipv4
+
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/itest1_17_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/itest1_17_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,81 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 1.17 - CSD outgoing with Ipv4 and Client timeout
+
+// setup
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+LOAD_SUITE te_esockteststepsSuite -SharedData
+
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\integration\itest_s1\csd.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest1.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+
+// open connection using gencon
+//run_test_step 3000 ts_genconn test1_1 z:\testdata\configs\integration\itest_s1\genconn.ini
+//original genconn.ini says to leave connected after opening.
+//the above call results in OpenSocketServ, OpenConnection, StartConnection which are now all provided by
+//TE_EsockTestSteps
+RUN_TEST_STEP 3000 te_esockteststepsSuite creatersocketservStep z:\testdata\configs\integration\itest_s3\te_teststeps.ini CreateSockSvr1
+RUN_TEST_STEP 3000 te_esockteststepsSuite connectrsocketservStep z:\testdata\configs\integration\itest_s3\te_teststeps.ini ConnectSockSvr1
+RUN_TEST_STEP 3000 te_esockteststepsSuite createrconnectionStep z:\testdata\configs\integration\itest_s3\te_teststeps.ini CreateConn1
+RUN_TEST_STEP 3000 te_esockteststepsSuite openrconnectionStep 	z:\testdata\configs\integration\itest_s3\te_teststeps.ini OpenConn1
+RUN_TEST_STEP 3000 te_esockteststepsSuite startrconnectionStep 	z:\testdata\configs\integration\itest_s3\te_teststeps.ini StartConn1
+
+
+// open socket server
+RUN_TEST_STEP 100 TE_Esock OpenServer
+
+
+START_TESTCASE			NET-Integration-Csd-1301
+//! @SYMTestCaseID		NET-Integration-Csd-1301
+
+// open socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s1\itest.ini
+
+// use socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s1\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s1\itest.ini
+
+// wait for more than Commdb AgentClientTimeout
+print wait for more than Commdb AgentClientTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s1\client_timeout.ini
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// log result
+PRINT Result for Integration test 1.17 - CSD outgoing (gencon) with Ipv4 and Client timeout
+TEST_COMPLETE test1_17
+
+END_TESTCASE			NET-Integration-Csd-1301
+
+
+RUN_TEST_STEP 100 TE_Esock CloseServer
+run_script z:\TestData\scripts\te_esock_test_stopallinterfaces.script
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/itest1_wlan.xml
Binary file networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/itest1_wlan.xml has changed
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/load_csd_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s1/load_csd_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,41 @@
+//
+// 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:
+//
+
+// configure commdb for CSD Bearer Tests
+PRINT load commdb for CSD NTRAS (itest_s1) tests
+
+// create the directorys needed for logging and ipsec
+// log dirs
+run_utils mkdir c:\system\
+run_utils mkdir c:\system\data\
+run_utils mkdir c:\Logs\
+run_utils mkdir c:\Logs\testresults\
+
+// ipsec dirs
+run_utils mkdir c:\system\data\security\
+run_utils mkdir c:\system\data\security\secfiles\
+
+run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+// use ced to make the required database from csd.xml
+//ced z:\testdata\configs\integration\itest_s1\csd.xml csd.log
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest1.cre c:\private\10202be9\persists\cccccc00.cre
+# Reload esock thread so that the next tests can be run
+run_script z:\TestData\scripts\te_esock_test_loadesock.script
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s2/cccccc00_itest2.cre
Binary file networkingtestandutils/networkingintegrationtest/it_script_files/itest_s2/cccccc00_itest2.cre has changed
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s2/connectionpref_wlan.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s2/connectionpref_wlan.xml	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CommDB:Config>
+	<ConnectionPreferencesTable>
+	  	<ConnectionPreferences>
+        		<Name>ConnectionPreferencesTable1</Name>
+       	 	<Ranking>1</Ranking>
+        		<Direction>OUTGOING</Direction>
+        		<DialogPref>DONOTPROMPT</DialogPref>
+        		<BearerSet>WLAN</BearerSet>
+        		<IAPRef>IAP.NT RAS with Null Modem</IAPRef>
+    		</ConnectionPreferences>
+  	</ConnectionPreferencesTable>
+</CommDB:Config>
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s2/ipv4_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s2/ipv4_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,18 @@
+[Test_Common]
+ipAddress=192.168.40.50
+
+
+
+
+[SendData]
+NoPackets=20
+PacketSize=1600
+connectTimer=90
+Port=7
+UdpEnable=true
+UdpPacketSize=200
+UdpPort=1030
+
+
+
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s2/itest2_01_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s2/itest2_01_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,67 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 2.01 - HSCSD outgoing client timeout with ipv4
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\integration\itest_s2\hscsd.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest2.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+// open socket server 
+RUN_TEST_STEP 100 TE_Esock OpenServer   
+
+
+START_TESTCASE			NET-Integration-HsCsd-0101
+//! @SYMTestCaseID		NET-Integration-HsCsd-0101
+
+
+// open socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s2\itest.ini
+
+// use socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s2\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s2\itest.ini
+
+// close socket server 
+RUN_TEST_STEP 100 TE_Esock CloseServer   
+
+// wait for more than Commdb AgentClientTimeout
+print wait for more than Commdb AgentClientTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s2\client_timeout.ini
+
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// log result
+PRINT Result for Integration test 2.1 - HSCSD outgoing client timeout with ipv4
+test_complete HSCSD_test2_01
+
+END_TESTCASE			NET-Integration-HsCsd-0101
+
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s2/itest2_wlan.xml
Binary file networkingtestandutils/networkingintegrationtest/it_script_files/itest_s2/itest2_wlan.xml has changed
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s2/load_hscsd_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s2/load_hscsd_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,28 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT load commdb for hscsd
+
+run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
+// configure commdb for hscsd Tests
+// use ced to make the required database
+//ced z:\testdata\configs\integration\itest_s2\hscsd.xml hscsd.log
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest2.cre c:\private\10202be9\persists\cccccc00.cre
+run_script z:\TestData\scripts\te_esock_test_loadesock.script
\ No newline at end of file
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/cccccc00_itest3.cre
Binary file networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/cccccc00_itest3.cre has changed
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/connectionpref_wlan.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/connectionpref_wlan.xml	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CommDB:Config>
+	<ConnectionPreferencesTable>
+	  	<ConnectionPreferences>
+        		<Name>ConnectionPreferencesTable1</Name>
+       	 	<Ranking>1</Ranking>
+        		<Direction>OUTGOING</Direction>
+        		<DialogPref>DONOTPROMPT</DialogPref>
+        		<BearerSet>WLAN</BearerSet>
+        		<IAPRef>IAP.NT RAS with Null Modem</IAPRef>
+    		</ConnectionPreferences>
+  	</ConnectionPreferencesTable>
+</CommDB:Config>
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/ipv4_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/ipv4_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,31 @@
+// 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:
+// 
+
+[Test_Common]
+ipAddress=192.168.40.50
+//#note - this is HTTPSMTPSSL on the test network 
+//#This will have to be changed to an IP adddress 
+//#on the internet to test on a live gprs network 
+//#such as www.c-hacker.co.uk
+
+
+[SendData]
+NoPackets=10
+PacketSize=1600
+connectTimer=180
+Port=7
+UdpEnable=true
+UdpPacketSize=400
+UdpPort=9200
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/ipv6_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/ipv6_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,31 @@
+// 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:
+// 
+
+[Test_Common]
+ipAddress=2001:618::20c:29ff:feb9:fe12
+
+//note above address is a temp hack into test network.
+//really need a ipv6 address for gprs test
+
+[SendData]
+NoPackets=20
+PacketSize=1600
+connectTimer=30
+Port=7
+UdpEnable=true
+UdpPacketSize=200
+
+
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_01_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_01_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,66 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 3.1 - GPRS outgoing with Ipv4
+
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest3.cre c:\private\10202be9\persists\cccccc00.cre
+
+// open socket server 
+RUN_TEST_STEP 100 TE_Esock OpenServer   
+
+
+START_TESTCASE			NET-Integration-Gprs-0101
+//! @SYMTestCaseID		NET-Integration-Gprs-0101
+
+
+// open socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// use socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s3\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// close socket server 
+RUN_TEST_STEP 100 TE_Esock CloseServer   
+
+// wait for more than Commdb AgentClientTimeout
+print wait for more than Commdb AgentClientTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s3\client_timeout.ini
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// log result
+PRINT Result for Integration test 3.1 - GPRS Outgoing with Ipv4
+TEST_COMPLETE test3_01
+
+END_TESTCASE			NET-Integration-Gprs-0101
+
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_02_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_02_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,85 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration Test 3.2 GPRS Outgoing with Ipsec
+
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest3.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+# ipsec dirs
+run_utils mkdir c:\system\data\security\
+run_utils mkdir c:\system\data\security\secfiles\
+
+# vpn test 1, the IAPs need to be configured for this in advance
+run_utils copyfile z:\TestData\configs\fbsd_tull.pol c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils copyfile z:\TestData\configs\fbsd_tull.pin c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils copyfile z:\TestData\configs\cisco_all.pol c:\system\data\security\secfiles\cisco_all.pol
+run_utils copyfile z:\TestData\configs\cisco_all.pin c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\ciscol_all.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils copyfile z:\TestData\configs\algorithms.conf c:\system\data\security\secfiles\algorithms.conf
+run_utils MakeReadWrite c:\system\data\security\secfiles\algorithms.conf
+
+// open socket server 
+RUN_TEST_STEP 100 TE_Esock OpenServer   
+
+
+START_TESTCASE			NET-Integration-Gprs-0201
+//! @SYMTestCaseID		NET-Integration-Gprs-0201
+
+
+// open socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// use socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s3\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// close socket server 
+RUN_TEST_STEP 100 TE_Esock CloseServer   
+
+// wait for more than Commdb AgentClientTimeout
+print wait for more than Commdb AgentClientTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s3\client_timeout.ini
+
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// log result
+PRINT Result for Integration test 3.02 - GPRS Outgoing with Ipsec
+TEST_COMPLETE gprs_test_3_02
+
+END_TESTCASE			NET-Integration-Gprs-0201
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_04_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_04_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,97 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 3.04 - GPRS Outgoing terminated By Client timeout with Ipv6,Ipv4 and Ipsec
+
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest3.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+
+# ipsec dirs
+run_utils mkdir c:\system\data\security\
+run_utils mkdir c:\system\data\security\secfiles\
+
+# vpn test 1, the IAPs need to be configured for this in advance
+run_utils copyfile z:\TestData\configs\fbsd_tull.pol c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils copyfile z:\TestData\configs\fbsd_tull.pin c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils copyfile z:\TestData\configs\cisco_all.pol c:\system\data\security\secfiles\cisco_all.pol
+run_utils copyfile z:\TestData\configs\cisco_all.pin c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\ciscol_all.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils copyfile z:\TestData\configs\algorithms.conf c:\system\data\security\secfiles\algorithms.conf
+run_utils MakeReadWrite c:\system\data\security\secfiles\algorithms.conf
+
+// open socket server 
+RUN_TEST_STEP 100 TE_Esock OpenServer   
+
+
+START_TESTCASE			NET-Integration-Gprs-0401
+//! @SYMTestCaseID		NET-Integration-Gprs-0401
+
+
+// open Ipv4 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// do test
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s3\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// open Ipv6 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// do test
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s3\ipv6.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// close socket server 
+RUN_TEST_STEP 100 TE_Esock CloseServer   
+
+// wait for more than Commdb AgentClientTimeout
+print wait for more than Commdb AgentClientTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s3\client_timeout.ini
+
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// log result
+PRINT result for Integration test 3.04 - GPRS Outgoing terminated By Client timeout with Ipv6,Ipv4 and Ipsec
+TEST_COMPLETE
+
+END_TESTCASE			NET-Integration-Gprs-0401
+
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_05_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_05_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,70 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT integration test 3.5 - GPRS outgoing with ipv4 and route timeout
+
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest3.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+
+// open socket server 
+RUN_TEST_STEP 100 TE_Esock OpenServer   
+
+
+START_TESTCASE			NET-Integration-Gprs-0501
+//! @SYMTestCaseID		NET-Integration-Gprs-0501
+
+
+// open socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// send Tcp Data (only)
+RUN_TEST_STEP 100 TE_Esock SendTcpData z:\testdata\configs\integration\itest_s3\ipv4.ini
+
+// wait more than routetimout
+print wait for more than Commdb AgentRouteTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s3\client_timeout.ini
+
+
+
+// check the connection has been disconnected
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s3\itest.ini
+TEST_COMPLETE GPRS_test3_05
+END_TESTCASE			NET-Integration-Gprs-0501
+
+// close socket server 
+RUN_TEST_STEP 100 TE_Esock CloseServer
+// log result
+PRINT Result for Integration test 3.05 - GPRS Outgoing with ipv4 and route timeout
+
+
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_05c_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_05c_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,71 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+PRINT integration test 3.05c - GPRS outgoing with ipv4 and route timeout after socket close
+
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest3.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+
+
+
+// open socket server 
+RUN_TEST_STEP 100 TE_Esock OpenServer   
+
+
+START_TESTCASE			NET-Integration-Gprs-0701
+//! @SYMTestCaseID		NET-Integration-Gprs-0701
+
+// open socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// send Tcp Data (only)
+RUN_TEST_STEP 100 TE_Esock SendTcpData z:\testdata\configs\integration\itest_s3\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// wait more than routetimout
+print wait for more than Commdb AgentRouteTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s3\route_timeout.ini
+
+
+// check the connection has been disconnected
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+TEST_COMPLETE GPRS_test3_05c
+END_TESTCASE			NET-Integration-Gprs-0701
+
+// close socket server 
+RUN_TEST_STEP 100 TE_Esock CloseServer
+// log result
+PRINT Result for Integration test 3.05c - GPRS Outgoing terminated By route timeout
+
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_09_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_09_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,69 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 3.09 - GPRS outgoing with ipv4 termination using rnif::stop
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest3.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+
+// open socket server 
+RUN_TEST_STEP 100 TE_Esock OpenServer   
+
+
+START_TESTCASE			NET-Integration-Gprs-0801
+//! @SYMTestCaseID		NET-Integration-Gprs-0801
+
+
+// open socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// do test
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s3\ipv4.ini
+
+// close sockets
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s3\itest.ini
+// close socket server 
+RUN_TEST_STEP 100 TE_Esock CloseServer
+
+// close using rnif::stop 
+RUN_TEST_STEP 3000 te_esockutil TE_ESockUtilStopAllInterfaces
+
+// Pause for a while allow sys to sort itself out
+delay 5000
+
+// check the network is NOT active	
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// delay here to allow certain phones to recover from Stop
+delay 30000
+
+// log result
+PRINT Result for Integration test 3.9 - GPRS outgoing with ipv4 termination using rnif::stop
+TEST_COMPLETE gprs_test3_09
+
+END_TESTCASE			NET-Integration-Gprs-0801
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_10_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_10_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,85 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 3.10 - GPRS Outgoing terminated By Rnif::Stop with Ipv4 and Ipsec
+
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest3.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+
+# ipsec dirs
+run_utils mkdir c:\system\data\security\
+run_utils mkdir c:\system\data\security\secfiles\
+
+# vpn test 1, the IAPs need to be configured for this in advance
+run_utils copyfile z:\TestData\configs\fbsd_tull.pol c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils copyfile z:\TestData\configs\fbsd_tull.pin c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils copyfile z:\TestData\configs\cisco_all.pol c:\system\data\security\secfiles\cisco_all.pol
+run_utils copyfile z:\TestData\configs\cisco_all.pin c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\ciscol_all.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils copyfile z:\TestData\configs\algorithms.conf c:\system\data\security\secfiles\algorithms.conf
+run_utils MakeReadWrite c:\system\data\security\secfiles\algorithms.conf
+
+// open socket server 
+RUN_TEST_STEP 100 TE_Esock OpenServer   
+
+START_TESTCASE			NET-Integration-Gprs-0901
+//! @SYMTestCaseID		NET-Integration-Gprs-0901
+
+
+// open Ipv4 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// use Ipv4 socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s3\ipv4.ini
+
+// close using rnif::stop 
+RUN_TEST_STEP 3000 te_esockutil TE_ESockUtilStopAllInterfaces
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+
+// close sockets
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s3\itest.ini
+TEST_COMPLETE test3_10
+END_TESTCASE			NET-Integration-Gprs-0901
+
+// close socket server 
+RUN_TEST_STEP 100 TE_Esock CloseServer   
+
+// log result
+PRINT Result for Integration test 1.10 - GPRS Outgoing terminated By Rnif::Stop with Ipv4 and Ipsec
+
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_12_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_12_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,93 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 3.12 - GPRS Outgoing terminated By Link failure with Ipv6,Ipv4 and Ipsec
+
+// setup
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest3.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+
+# ipsec dirs
+run_utils mkdir c:\system\data\security\
+run_utils mkdir c:\system\data\security\secfiles\
+
+# vpn test 1, the IAPs need to be configured for this in advance
+run_utils copyfile z:\TestData\configs\fbsd_tull.pol c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils copyfile z:\TestData\configs\fbsd_tull.pin c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils copyfile z:\TestData\configs\cisco_all.pol c:\system\data\security\secfiles\cisco_all.pol
+run_utils copyfile z:\TestData\configs\cisco_all.pin c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\ciscol_all.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils copyfile z:\TestData\configs\algorithms.conf c:\system\data\security\secfiles\algorithms.conf
+run_utils MakeReadWrite c:\system\data\security\secfiles\algorithms.conf
+
+// open socket server 
+RUN_TEST_STEP 100 TE_Esock OpenServer   
+
+START_TESTCASE			NET-Integration-Gprs-1101
+//! @SYMTestCaseID		NET-Integration-Gprs-1101
+
+
+// open Ipv4 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// do test
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s3\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// open Ipv6 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// do test
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s3\ipv6.ini
+
+// close using rnif::stop 
+RUN_TEST_STEP 3000 te_esockutil TE_ESockUtilStopAllInterfaces
+
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+
+// close sockets
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s3\itest.ini
+TEST_COMPLETE test3_12
+END_TESTCASE			NET-Integration-Gprs-1101
+
+// close socket server 
+RUN_TEST_STEP 100 TE_Esock CloseServer   
+
+// log result
+PRINT Result for Integration test 1.12 - GPRS Outgoing terminated By Link failure with Ipv6,Ipv4 and Ipsec
+
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_13_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_13_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,63 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 3.13 - GPRS Outgoing terminated By Link failure with Ipv4
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest3.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+// open socket server 
+RUN_TEST_STEP 100 TE_Esock OpenServer   
+
+START_TESTCASE			NET-Integration-Gprs-1201
+//! @SYMTestCaseID		NET-Integration-Gprs-1201
+
+
+// open Ipv4 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// do something
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s3\ipv4.ini
+
+// simulate link failure - get the user to do this
+print User action required to break link - must be within 30 secs
+print Press a key to continue when this has been done
+pause
+
+// check the link is closed
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// close sockets
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s3\itest.ini
+TEST_COMPLETE test3_13
+END_TESTCASE			NET-Integration-Gprs-1201
+
+// close socket server 
+RUN_TEST_STEP 100 TE_Esock CloseServer   
+// log result
+PRINT Result for Integration test 1.13 - GPRS Outgoing terminated By Link failure with Ipv4
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_14_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_14_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,84 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 3.14 - GPRS Outgoing with Ipv4 and Ipsec
+
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest3.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+# ipsec dirs
+run_utils mkdir c:\system\data\security\
+run_utils mkdir c:\system\data\security\secfiles\
+
+# vpn test 1, the IAPs need to be configured for this in advance
+run_utils copyfile z:\TestData\configs\fbsd_tull.pol c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils copyfile z:\TestData\configs\fbsd_tull.pin c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils copyfile z:\TestData\configs\cisco_all.pol c:\system\data\security\secfiles\cisco_all.pol
+run_utils copyfile z:\TestData\configs\cisco_all.pin c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\ciscol_all.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils copyfile z:\TestData\configs\algorithms.conf c:\system\data\security\secfiles\algorithms.conf
+run_utils MakeReadWrite c:\system\data\security\secfiles\algorithms.conf
+
+// open socket server 
+RUN_TEST_STEP 100 TE_Esock OpenServer   
+
+START_TESTCASE			NET-Integration-Gprs-1301
+//! @SYMTestCaseID		NET-Integration-Gprs-1301
+
+
+// open Ipv4 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// use Ipv4 socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s3\ipv4.ini
+
+// simulate link failure - get the user to do this
+print User action required to break link
+print Press a key to continue when this has been done
+pause
+
+// check the link is closed
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// close sockets
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s3\itest.ini
+TEST_COMPLETE gprs_test3_14
+END_TESTCASE			NET-Integration-Gprs-1301
+
+// close socket server 
+RUN_TEST_STEP 100 TE_Esock CloseServer   
+
+// log result
+PRINT Result for Integration test 3.14 - GPRS Outgoing with Ipv4 and Ipsec
+
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_16_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_16_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,95 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 3.16 - GPRS Outgoing with Ipv6 and Linkfailure
+
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest3.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+
+# ipsec dirs
+run_utils mkdir c:\system\data\security\
+run_utils mkdir c:\system\data\security\secfiles\
+
+# vpn test 1, the IAPs need to be configured for this in advance
+run_utils copyfile z:\TestData\configs\fbsd_tull.pol c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils copyfile z:\TestData\configs\fbsd_tull.pin c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils copyfile z:\TestData\configs\cisco_all.pol c:\system\data\security\secfiles\cisco_all.pol
+run_utils copyfile z:\TestData\configs\cisco_all.pin c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\ciscol_all.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils copyfile z:\TestData\configs\algorithms.conf c:\system\data\security\secfiles\algorithms.conf
+run_utils MakeReadWrite c:\system\data\security\secfiles\algorithms.conf
+
+// open socket server 
+RUN_TEST_STEP 100 TE_Esock OpenServer   
+
+START_TESTCASE			NET-Integration-Gprs-1501
+//! @SYMTestCaseID		NET-Integration-Gprs-1501
+
+
+// open Ipv4 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// use socket connection
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s3\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// open Ipv6 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// do test
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s3\ipv6.ini
+
+// simulate link failure - get the user to do this
+print User action required to break link
+print Press a key to continue when this has been done
+pause
+
+// check the link is closed
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+
+// close sockets
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s3\itest.ini
+TEST_COMPLETE GPRS_Test3_16
+END_TESTCASE			NET-Integration-Gprs-1501
+
+// close socket server 
+RUN_TEST_STEP 100 TE_Esock CloseServer   
+
+// log result
+PRINT Result for Integration test 1.16 - GPRS Outgoing with Ipv6 and Linkfailure
+
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_17_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_17_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,95 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 3.17 - GPRS outgoing with Ipv4 and Client timeout
+
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+LOAD_SUITE te_esockteststepsSuite -SharedData
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest3.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+
+
+
+// open connection using gencon
+//run_test_step 3000 ts_genconn test1_1 z:\testdata\configs\integration\itest_s3\genconn.ini
+//original genconn.ini says to leave connected after opening.
+//the above call results in OpenSocketServ, OpenConnection, StartConnection which are now all provided by
+//TE_EsockTestSteps
+RUN_TEST_STEP 3000 te_esockteststepsSuite creatersocketservStep z:\testdata\configs\integration\itest_s3\te_teststeps.ini CreateSockSvr1
+RUN_TEST_STEP 3000 te_esockteststepsSuite connectrsocketservStep z:\testdata\configs\integration\itest_s3\te_teststeps.ini ConnectSockSvr1
+RUN_TEST_STEP 3000 te_esockteststepsSuite createrconnectionStep z:\testdata\configs\integration\itest_s3\te_teststeps.ini CreateConn1
+RUN_TEST_STEP 3000 te_esockteststepsSuite openrconnectionStep z:\testdata\configs\integration\itest_s3\te_teststeps.ini OpenConn1
+RUN_TEST_STEP 3000 te_esockteststepsSuite startrconnectionStep z:\testdata\configs\integration\itest_s3\te_teststeps.ini StartConn1
+
+
+
+
+// open socket server 
+RUN_TEST_STEP 100 TE_Esock OpenServer   
+
+START_TESTCASE			NET-Integration-Gprs-1601
+//! @SYMTestCaseID		NET-Integration-Gprs-1601
+
+
+// open socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// use socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s3\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s3\itest.ini
+
+// close socket server 
+RUN_TEST_STEP 100 TE_Esock CloseServer   
+
+// close connection using gencon
+//run_test_step 3000 ts_genconn test2_1
+//above results in calls to stopconnection, close connection, close socket serv
+RUN_TEST_STEP 3000 te_esockteststepsSuite stoprconnectionStep z:\testdata\configs\integration\itest_s3\te_teststeps.ini StopConn1
+RUN_TEST_STEP 3000 te_esockteststepsSuite closerconnectionStep z:\testdata\configs\integration\itest_s3\te_teststeps.ini CloseConn1
+RUN_TEST_STEP 3000 te_esockteststepsSuite closersocketservStep z:\testdata\configs\integration\itest_s3\te_teststeps.ini CloseSockSvr1
+
+
+
+
+// Pause to allow connection to be closed by ts_genconn
+delay 5000
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// delay here to allow certain phones to recover from Stop
+delay 30000
+// log result
+PRINT Result for Integration test 3.17 - GPRS outgoing with Ipv4 and Client timeout
+
+TEST_COMPLETE GPRS_Test_3_17
+
+END_TESTCASE			NET-Integration-Gprs-1601
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_wlan.xml
Binary file networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/itest3_wlan.xml has changed
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/load_gprs_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s3/load_gprs_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,27 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT load commdb for GPRS
+
+run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
+//ced z:\testdata\configs\integration\itest_s3\gprs.xml csd.log
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest3.cre c:\private\10202be9\persists\cccccc00.cre
+run_script z:\TestData\scripts\te_esock_test_loadesock.script
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s4/cccccc00_itest4.cre
Binary file networkingtestandutils/networkingintegrationtest/it_script_files/itest_s4/cccccc00_itest4.cre has changed
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s4/connectionpref_wlan.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s4/connectionpref_wlan.xml	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CommDB:Config>
+	<ConnectionPreferencesTable>
+	  	<ConnectionPreferences>
+        		<Name>ConnectionPreferencesTable1</Name>
+       	 	<Ranking>1</Ranking>
+        		<Direction>OUTGOING</Direction>
+        		<DialogPref>DONOTPROMPT</DialogPref>
+        		<BearerSet>WLAN</BearerSet>
+        		<IAPRef>IAP.NT RAS with Null Modem</IAPRef>
+    		</ConnectionPreferences>
+  	</ConnectionPreferencesTable>
+</CommDB:Config>
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s4/ipv4_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s4/ipv4_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,12 @@
+[Test_Common]
+ipAddress=192.168.40.50
+
+
+[SendData]
+NoPackets=20
+PacketSize=1600
+connectTimer=30
+Port=7
+UdpEnable=true
+UdpPacketSize=200
+UdpPort=1030
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s4/ipv6_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s4/ipv6_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,14 @@
+[Test_Common]
+ipAddress=2001:618::20c:29ff:feb9:fe12
+
+
+[SendData]
+NoPackets=20
+PacketSize=1600
+connectTimer=30
+Port=7
+UdpEnable=true
+UdpPacketSize=200
+UdpPort=1030
+
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s4/itest4_01_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s4/itest4_01_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,64 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 4.01 - CDMA outgoing with Ipv4
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest4.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+
+// open socket server 
+RUN_TEST_STEP 100 TE_Esock OpenServer   
+
+START_TESTCASE			NET-Integration-Cdma-0101
+//! @SYMTestCaseID		NET-Integration-Cdma-0101
+
+
+// open socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s4\itest.ini
+
+// use socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s4\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s4\itest.ini
+
+// close socket server 
+RUN_TEST_STEP 100 TE_Esock CloseServer   
+
+// wait for more than Commdb AgentClientTimeout
+print wait for more than Commdb AgentClientTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s4\client_timeout.ini
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// log result
+PRINT Result for Integration test 4.01 - CDMA outgoing with Ipv4
+TEST_COMPLETE CDMA_test_4_01
+
+END_TESTCASE			NET-Integration-Cdma-0101
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s4/itest4_06_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s4/itest4_06_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,83 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 4.06 - CDMA Outgoing terminated By Route Timeout with Ipv4 and Ipsec
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil		
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest4.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+
+
+# ipsec dirs
+run_utils mkdir c:\system\data\security\
+run_utils mkdir c:\system\data\security\secfiles\
+
+# vpn test 1, the IAPs need to be configured for this in advance
+run_utils copyfile z:\TestData\configs\fbsd_tull.pol c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils copyfile z:\TestData\configs\fbsd_tull.pin c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils copyfile z:\TestData\configs\cisco_all.pol c:\system\data\security\secfiles\cisco_all.pol
+run_utils copyfile z:\TestData\configs\cisco_all.pin c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\ciscol_all.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils copyfile z:\TestData\configs\algorithms.conf c:\system\data\security\secfiles\algorithms.conf
+run_utils MakeReadWrite c:\system\data\security\secfiles\algorithms.conf
+
+// open socket server 
+RUN_TEST_STEP 100 TE_Esock OpenServer   
+
+
+START_TESTCASE			NET-Integration-Cdma-0501
+//! @SYMTestCaseID		NET-Integration-Cdma-0501
+
+
+// open Ipv4 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s4\itest.ini
+
+// use socket connection
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s4\ipv4.ini
+
+// wait more than AgentRouteTimeout
+print wait for more than Commdb AgentRouteTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s4\rnif_timeout.ini
+
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s4\itest.ini
+TEST_COMPLETE CDMA_test4_06
+END_TESTCASE			NET-Integration-Cdma-0501
+
+// close socket server 
+RUN_TEST_STEP 100 TE_Esock CloseServer   
+
+// log result
+PRINT Result for Integration test 4.06 - CDMA Outgoing terminated By Route Timeout with Ipv4 and Ipsec
+
+
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s4/itest4_11_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s4/itest4_11_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,75 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 4.11 - CDMA Outgoing terminated By Rnif::Stop with Ipv6,Ipv4 
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest4.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+
+// open socket server 
+RUN_TEST_STEP 100 TE_Esock OpenServer   
+
+START_TESTCASE			NET-Integration-Cdma-1001
+//! @SYMTestCaseID		NET-Integration-Cdma-1001
+
+
+// open Ipv4 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s4\itest.ini
+
+// use Ipv4 socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s4\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s4\itest.ini
+
+// open Ipv6 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s4\itest.ini
+
+// use Ipv6 socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s4\ipv6.ini
+
+// close using rnif::stop 
+RUN_TEST_STEP 3000 te_esockutil TE_ESockUtilStopAllInterfaces
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s4\itest.ini
+TEST_COMPLETE CDMA_test4_11
+END_TESTCASE			NET-Integration-Cdma-1001
+
+// close socket server 
+RUN_TEST_STEP 100 TE_Esock CloseServer   
+
+// log result
+PRINT Result for Integration test 4.11 - CDMA Outgoing terminated By Rnif::Stop with Ipv6,Ipv4 
+
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s4/itest4_17_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s4/itest4_17_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,84 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 4.17 - CDMA outgoing with Ipv4 and Client timeout
+
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+LOAD_SUITE te_esockteststepsSuite -SharedData
+
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest4.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+
+
+// open connection using gencon
+//run_test_step 3000 ts_genconn test1_1 z:\testdata\configs\integration\itest_s4\genconn-psd.ini
+//original genconn.ini says to leave connected after opening.
+//above call results in OpenSocketServ, OpenConnection, StartConnection which are all provided by
+//TE_EsockTestSteps
+RUN_TEST_STEP 3000 te_esockteststepsSuite creatersocketservStep z:\testdata\configs\integration\itest_s4\te_teststeps.ini CreateSockSvr1
+RUN_TEST_STEP 3000 te_esockteststepsSuite connectrsocketservStep z:\testdata\configs\integration\itest_s4\te_teststeps.ini ConnectSockSvr1
+RUN_TEST_STEP 3000 te_esockteststepsSuite createrconnectionStep z:\testdata\configs\integration\itest_s4\te_teststeps.ini CreateConn1
+RUN_TEST_STEP 3000 te_esockteststepsSuite openrconnectionStep z:\testdata\configs\integration\itest_s4\te_teststeps.ini OpenConn1
+RUN_TEST_STEP 3000 te_esockteststepsSuite startrconnectionStep z:\testdata\configs\integration\itest_s4\te_teststeps.ini StartConn1
+
+
+ 
+// open socket server 
+RUN_TEST_STEP 100 TE_Esock OpenServer   
+
+START_TESTCASE			NET-Integration-Cdma-1601
+//! @SYMTestCaseID		NET-Integration-Cdma-1601
+
+
+// open socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s4\itest.ini
+
+// use socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s4\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s4\itest.ini
+
+// close socket server 
+RUN_TEST_STEP 100 TE_Esock CloseServer   
+
+// wait for more than Commdb AgentClientTimeout
+print wait for more than Commdb AgentClientTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s4\client_timeout.ini
+
+
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// log result
+PRINT Result for Integration test 4.17 - CDMA outgoing with Ipv4 and Client timeout
+TEST_COMPLETE CDMA_test_4_17
+
+END_TESTCASE			NET-Integration-Cdma-1601
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s4/itest4_wlan.xml
Binary file networkingtestandutils/networkingintegrationtest/it_script_files/itest_s4/itest4_wlan.xml has changed
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/cccccc00_itest5.cre
Binary file networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/cccccc00_itest5.cre has changed
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/connectionpref_wlan.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/connectionpref_wlan.xml	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CommDB:Config>
+	<ConnectionPreferencesTable>
+	  	<ConnectionPreferences>
+        		<Name>ConnectionPreferencesTable1</Name>
+       	 	<Ranking>1</Ranking>
+        		<Direction>OUTGOING</Direction>
+        		<DialogPref>DONOTPROMPT</DialogPref>
+        		<BearerSet>WLAN</BearerSet>
+        		<IAPRef>IAP.NT RAS with Null Modem</IAPRef>
+    		</ConnectionPreferences>
+  	</ConnectionPreferencesTable>
+</CommDB:Config>
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/ipv4_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/ipv4_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,13 @@
+[Test_Common]
+ipAddress=192.168.40.50
+
+
+[SendData]
+NoPackets=20
+PacketSize=1600
+connectTimer=180
+Port=7
+UdpEnable=true
+UdpPacketSize=200
+UdpPort=1030
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/ipv6_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/ipv6_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,12 @@
+[Test_Common]
+ipAddress=2001:618::20c:29ff:feb9:fe12
+
+
+[SendData]
+NoPackets=20
+PacketSize=1600
+connectTimer=180
+Port=7
+UdpEnable=true
+UdpPacketSize=200
+UdpPort=1030
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/itest5_01_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/itest5_01_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,69 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 5.1 - IR CSD outgoing with Ipv4
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//below fails as '-i' confuses test tool, tried csd_ir.xml file, but test fails with it
+//CED z:\testdata\configs\integration\itest_s5\csd-ir.xml
+//Commented as part of sirocco code migration.
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest5.cre c:\private\10202be9\persists\cccccc00.cre
+
+//RUN_SCRIPT Z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+
+// open socket server 
+RUN_TEST_STEP 100 TE_Esock OpenServer   
+
+START_TESTCASE			NET-Integration-IrCsd-0101
+//! @SYMTestCaseID		NET-Integration-IrCsd-0101
+
+
+// open socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s5\itest.ini
+
+// use socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s5\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s5\itest.ini
+
+// close socket server 
+RUN_TEST_STEP 100 TE_Esock CloseServer   
+
+// wait for more than Commdb AgentClientTimeout
+print wait for more than Commdb AgentClientTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s5\client_timeout.ini
+
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// log result
+PRINT Result for Integration test 5.1 - IR CSD Outgoing with Ipv4
+TEST_COMPLETE IR_CSD_test5_1
+
+END_TESTCASE			NET-Integration-IrCsd-0101
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/itest5_03_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/itest5_03_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,77 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 5.03 - IR CSD outgoing with ipv4 and ipv6 
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//below fails as '-i' confuses test tool, tried csd_ir.xml file, but test fails with it
+//CED z:\testdata\configs\integration\itest_s5\csd-ir.xml
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest5.cre c:\private\10202be9\persists\cccccc00.cre
+//RUN_SCRIPT Z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+
+
+// open socket server 
+RUN_TEST_STEP 100 TE_Esock OpenServer   
+
+START_TESTCASE			NET-Integration-IrCsd-0301
+//! @SYMTestCaseID		NET-Integration-IrCsd-0301
+
+
+// open Ipv4 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s5\itest.ini
+
+// do test
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s5\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s5\itest.ini
+
+// open Ipv6 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s5\itest.ini
+
+// do test
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s5\ipv6.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s5\itest.ini
+
+// close socket server 
+RUN_TEST_STEP 100 TE_Esock CloseServer   
+
+// wait for more than Commdb AgentClientTimeout
+print wait for more than Commdb AgentClientTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s5\route_timeout.ini
+
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// log result
+PRINT Result for Integration test 5.03 - IR CSD outgoing with ipv4 and ipv6
+TEST_COMPLETE IR_CSD_test5_03
+
+END_TESTCASE			NET-Integration-IrCsd-0301
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/itest5_10_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/itest5_10_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,84 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 5.10 - IR CSD Outgoing terminated By Rnif::Stop with Ipv4 and Ipsec
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//below fails as '-i' confuses test tool, tried csd_ir.xml file, but test fails with it
+//CED z:\testdata\configs\integration\itest_s5\csd-ir.xml
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest5.cre c:\private\10202be9\persists\cccccc00.cre
+//RUN_SCRIPT Z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+
+
+# ipsec dirs
+run_utils mkdir c:\system\data\security\
+run_utils mkdir c:\system\data\security\secfiles\
+
+# vpn test 1, the IAPs need to be configured for this in advance
+run_utils copyfile z:\TestData\configs\fbsd_tull.pol c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils copyfile z:\TestData\configs\fbsd_tull.pin c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils copyfile z:\TestData\configs\cisco_all.pol c:\system\data\security\secfiles\cisco_all.pol
+run_utils copyfile z:\TestData\configs\cisco_all.pin c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\ciscol_all.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils copyfile z:\TestData\configs\algorithms.conf c:\system\data\security\secfiles\algorithms.conf
+run_utils MakeReadWrite c:\system\data\security\secfiles\algorithms.conf
+
+// open socket server 
+RUN_TEST_STEP 100 TE_Esock OpenServer   
+
+START_TESTCASE			NET-Integration-IrCsd-1201
+//! @SYMTestCaseID		NET-Integration-IrCsd-1201
+
+
+// open Ipv4 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s5\itest.ini
+
+// use Ipv4 socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s5\ipv4.ini
+
+// close using rnif::stop 
+RUN_TEST_STEP 3000 te_esockutil TE_ESockUtilStopAllInterfaces
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s5\itest.ini
+TEST_COMPLETE IR_CSD_test5_10
+END_TESTCASE			NET-Integration-IrCsd-1201
+
+// close socket server 
+RUN_TEST_STEP 100 TE_Esock CloseServer   
+
+// log result
+PRINT Result for Integration test 5.10 - IR CSD Outgoing terminated By Rnif::Stop with Ipv4 and Ipsec
+
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/itest5_12_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/itest5_12_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,94 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 5.12 - IR CSD Outgoing terminated By Link failure with Ipv6,Ipv4 and Ipsec
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest5.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+
+
+
+# ipsec dirs
+run_utils mkdir c:\system\data\security\
+run_utils mkdir c:\system\data\security\secfiles\
+
+# vpn test 1, the IAPs need to be configured for this in advance
+run_utils copyfile z:\TestData\configs\fbsd_tull.pol c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils copyfile z:\TestData\configs\fbsd_tull.pin c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils copyfile z:\TestData\configs\cisco_all.pol c:\system\data\security\secfiles\cisco_all.pol
+run_utils copyfile z:\TestData\configs\cisco_all.pin c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pin
+run_utils MakeReadWrite c:\system\data\security\secfiles\fbsd_tull.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\ciscol_all.pol
+run_utils MakeReadWrite c:\system\data\security\secfiles\cisco_all.pin
+
+run_utils copyfile z:\TestData\configs\algorithms.conf c:\system\data\security\secfiles\algorithms.conf
+run_utils MakeReadWrite c:\system\data\security\secfiles\algorithms.conf
+
+// open socket server 
+RUN_TEST_STEP 100 TE_Esock OpenServer   
+
+START_TESTCASE			NET-Integration-IrCsd-1401
+//! @SYMTestCaseID		NET-Integration-IrCsd-1401
+
+
+// open Ipv4 socket
+#RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s5\itest.ini
+
+// use Ipv4 socket
+#RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s5\ipv4.ini
+
+// close socket
+#RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s5\itest.ini
+
+// open Ipv6 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s5\itest.ini
+
+// do test
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s5\ipv6.ini
+
+// close using rnif::stop 
+RUN_TEST_STEP 3000 te_esockutil TE_ESockUtilStopAllInterfaces
+
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+
+
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s4\itest.ini
+TEST_COMPLETE IR_CSD_test5_12
+END_TESTCASE			NET-Integration-IrCsd-1401
+
+// close socket server 
+RUN_TEST_STEP 100 TE_Esock CloseServer   
+
+// log result
+PRINT Result for Integration test 5.12 - IR CSD Outgoing terminated By Link failure with Ipv6,Ipv4 and Ipsec
+
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/itest5_13_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/itest5_13_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,70 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Integration test 5.13 - IR CSD Outgoing terminated By Link failure with Ipv4
+
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//below fails as '-i' confuses test tool, tried csd_ir.xml file, but test fails with it
+//CED z:\testdata\configs\integration\itest_s5\csd-ir.xml
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest5.cre c:\private\10202be9\persists\cccccc00.cre
+//RUN_SCRIPT Z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+
+
+// open socket server 
+RUN_TEST_STEP 100 TE_Esock OpenServer   
+
+START_TESTCASE			NET-Integration-IrCsd-1501
+//! @SYMTestCaseID		NET-Integration-IrCsd-1501
+
+
+// open Ipv4 socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s5\itest.ini
+
+// do something
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s5\ipv4.ini
+
+// simulate link failure - get the user to do this
+print User action required to break link
+print Press a key to continue when this has been done
+pause
+
+// check the link is closed
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s5\itest.ini
+TEST_COMPLETE IR_CSD_test5_13
+END_TESTCASE			NET-Integration-IrCsd-1501
+
+// close socket server 
+RUN_TEST_STEP 100 TE_Esock CloseServer   
+
+// log result
+PRINT Result for Integration test 5.13 - IR CSD Outgoing terminated By Link failure with Ipv4
+
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/itest5_17_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/itest5_17_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,87 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+PRINT Integration test 5.17 - IR CSD outgoing with Ipv4 and Client timeout
+
+LOAD_SUITE TE_Esock
+LOAD_SUITE te_esockutil
+LOAD_SUITE te_esockteststepsSuite -SharedData
+
+
+
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+//tried csd-ir.xml - '-i' causes test tool problems, tried csd_ir.xml and tests fail
+//CED z:\testdata\configs\te_esock.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest5.cre c:\private\10202be9\persists\cccccc00.cre
+
+
+START_TESTCASE			NET-Integration-IrCsd-1901
+//! @SYMTestCaseID		NET-Integration-IrCsd-1901
+
+
+// open connection using gencon
+//run_test_step 3000 ts_genconn test1_1 z:\testdata\configs\integration\itest_s5\genconn.ini		
+//original genconn.ini says to leave connected after opening.
+//above call results in OpenSocketServ, OpenConnection, StartConnection which are all provided by
+//TE_EsockTestSteps
+RUN_TEST_STEP 3000 te_esockteststepsSuite creatersocketservStep z:\testdata\configs\integration\itest_s5\te_teststeps.ini CreateSockSvr1
+RUN_TEST_STEP 3000 te_esockteststepsSuite connectrsocketservStep z:\testdata\configs\integration\itest_s5\te_teststeps.ini ConnectSockSvr1
+RUN_TEST_STEP 3000 te_esockteststepsSuite createrconnectionStep z:\testdata\configs\integration\itest_s5\te_teststeps.ini CreateConn1
+RUN_TEST_STEP 3000 te_esockteststepsSuite openrconnectionStep z:\testdata\configs\integration\itest_s5\te_teststeps.ini OpenConn1
+RUN_TEST_STEP 3000 te_esockteststepsSuite startrconnectionStep z:\testdata\configs\integration\itest_s5\te_teststeps.ini StartConn1
+
+END_TESTCASE			NET-Integration-IrCsd-1901
+
+
+// open socket server 
+RUN_TEST_STEP 100 TE_Esock OpenServer   
+
+START_TESTCASE			NET-Integration-IrCsd-1902
+//! @SYMTestCaseID		NET-Integration-IrCsd-1902
+
+// open socket
+RUN_TEST_STEP 100 TE_Esock Test1.2 z:\testdata\configs\integration\itest_s5\itest.ini
+
+// use socket
+RUN_TEST_STEP 1000 TE_Esock SendData z:\testdata\configs\integration\itest_s5\ipv4.ini
+
+// close socket
+RUN_TEST_STEP 100 TE_Esock Test1.15 z:\testdata\configs\integration\itest_s5\itest.ini
+
+// close socket server 
+RUN_TEST_STEP 100 TE_Esock CloseServer   
+
+// wait for more than Commdb AgentClientTimeout
+print wait for more than Commdb AgentClientTimeout
+run_test_step -1 te_esockutil TE_ESockUtilDelay z:\testdata\configs\integration\itest_s5\client_timeout.ini	
+
+
+// check the network is NOT active
+RUN_TEST_STEP 100 te_esockutil TE_ESockUtilIsNetworkNotActive
+
+
+// log result
+PRINT Result for Integration test 5.17 - IR CSD outgoing with Ipv4 and Client timeout
+TEST_COMPLETE IR_CSD_test5_17
+
+END_TESTCASE			NET-Integration-IrCsd-1902
+
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/itest5_wlan.xml
Binary file networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/itest5_wlan.xml has changed
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/load_ircsd_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/it_script_files/itest_s5/load_ircsd_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,56 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+///
+//PRINT load commdb for IR_CSD
+
+//run_script z:\TestData\scripts\esock_test_unloadesockForced.script
+// configure commdb for IR_CSD Bearer Tests
+// use ced to make the required database
+//ced z:\testdata\configs\integration\itest_s5\csd-ir.xml csd_ir.log
+//run_script z:\TestData\scripts\esock_test_loadesock.script
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//convert above
+
+
+
+///
+PRINT load commdb for IR_CSD
+
+run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
+// configure commdb for IR_CSD Bearer Tests
+// use ced to make the required database
+//ced z:\testdata\configs\integration\itest_s5\csd-ir.xml csd_ir.log
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_itest5.cre c:\private\10202be9\persists\cccccc00.cre
+run_script z:\TestData\scripts\te_esock_test_loadesock.script
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingunittest/dummynif_params/group/dummynif_params.mmp
--- a/networkingtestandutils/networkingunittest/dummynif_params/group/dummynif_params.mmp	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkingtestandutils/networkingunittest/dummynif_params/group/dummynif_params.mmp	Wed Aug 18 11:18:20 2010 +0300
@@ -22,20 +22,20 @@
 						  
 VENDORID	 0x70000001
 
-SOURCEPATH	  ..\src
+SOURCEPATH	  ../src
 
 SOURCE		  dummynif_params.cpp
 SOURCE		  dummynif_paramsfactory.cpp
 
-USERINCLUDE	 ..\inc
+USERINCLUDE	 ../inc
 #ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE	\epoc32\include
-SYSTEMINCLUDE	\epoc32\include\ecom
-SYSTEMINCLUDE   \epoc32\include\comms-infras
+SYSTEMINCLUDE	/epoc32/include
+SYSTEMINCLUDE	/epoc32/include/ecom
+SYSTEMINCLUDE   /epoc32/include/comms-infras
 #else
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-SYSTEMINCLUDE	\epoc32\include\platform\ecom
-SYSTEMINCLUDE   \epoc32\include\platform\comms-infras
+SYSTEMINCLUDE	/epoc32/include/platform/ecom
+SYSTEMINCLUDE   /epoc32/include/platform/comms-infras
 #endif
 
 START RESOURCE 01894606.rss
diff -r 88121cf79045 -r 78fceed50f62 networkingtestandutils/networkingunittest/group/DummyNifProtos.mmp
--- a/networkingtestandutils/networkingunittest/group/DummyNifProtos.mmp	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkingtestandutils/networkingunittest/group/DummyNifProtos.mmp	Wed Aug 18 11:18:20 2010 +0300
@@ -41,16 +41,16 @@
 USERINCLUDE		../../../linklayercontrol/networkinterfacemgr/agentprcore/inc
 
 #ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE	\epoc32\include
-SYSTEMINCLUDE	\epoc32\include\ecom
-SYSTEMINCLUDE   \epoc32\include\comms-infras
-SYSTEMINCLUDE   \epoc32\include\networking
+SYSTEMINCLUDE	/epoc32/include
+SYSTEMINCLUDE	/epoc32/include/ecom
+SYSTEMINCLUDE   /epoc32/include/comms-infras
+SYSTEMINCLUDE   /epoc32/include/networking
 #else
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-SYSTEMINCLUDE	\epoc32\include\platform\ecom
-SYSTEMINCLUDE   \epoc32\include\platform\comms-infras
-SYSTEMINCLUDE   \epoc32\include\platform\networking
-SYSTEMINCLUDE   \epoc32\include\comms-infras
+SYSTEMINCLUDE	/epoc32/include/platform/ecom
+SYSTEMINCLUDE   /epoc32/include/platform/comms-infras
+SYSTEMINCLUDE   /epoc32/include/platform/networking
+SYSTEMINCLUDE   /epoc32/include/comms-infras
 #endif
 
 START RESOURCE 10281C3A.rss
diff -r 88121cf79045 -r 78fceed50f62 networkprotocols/dnsproxy/test/group/bld.inf
--- a/networkprotocols/dnsproxy/test/group/bld.inf	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkprotocols/dnsproxy/test/group/bld.inf	Wed Aug 18 11:18:20 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-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"
@@ -37,6 +37,21 @@
 //-- iby file for the test
 t_dnsproxy.iby	/epoc32/rom/include/t_dnsproxy.iby
 
+
+../testdata/resolver01.ini				/epoc32/release/winscw/udeb/z/testdata/configs/resolver01.ini
+../testdata/resolver02.ini				/epoc32/release/winscw/udeb/z/testdata/configs/resolver02.ini
+../testdata/resolver03.ini				/epoc32/release/winscw/udeb/z/testdata/configs/resolver03.ini
+../testdata/resolver01.ini				/epoc32/release/winscw/urel/z/testdata/configs/resolver01.ini
+../testdata/resolver02.ini				/epoc32/release/winscw/urel/z/testdata/configs/resolver02.ini
+../testdata/resolver03.ini				/epoc32/release/winscw/urel/z/testdata/configs/resolver03.ini
+
+#ifdef SIROCCO_CODE_MIGRATION
+../testdata/cccccc00_dnsproxy1.cre				/epoc32/data/z/testdata/configs/cccccc00_dnsproxy1.cre
+../testdata/cccccc00_dnsproxy1.cre				/epoc32/data/z/testdata/configs/cccccc00_dnsproxy2.cre
+../testdata/cccccc00_dnsproxy1.cre				/epoc32/data/z/testdata/configs/cccccc00_dnsproxy3.cre
+../testdata/ns-dnsproxy-maintest-ops_wlan.ini /epoc32/data/z/testdata/configs/ns-dnsproxy-maintest-ops_wlan.ini
+../scripts/ns-dnsproxy-main-ops_wlan.script /epoc32/data/z/testdata/scripts/ns-dnsproxy-main-ops_wlan.script
+#else
 //-- test script files
 ../scripts/ns-dnsproxy-main-ops.script		/epoc32/release/winscw/udeb/z/testdata/scripts/ns-dnsproxy-main-ops.script
 ../testdata/ns-dnsproxy-maintest-ops.ini	/epoc32/release/winscw/udeb/z/testdata/scripts/ns-dnsproxy-maintest-ops.ini
@@ -44,9 +59,6 @@
 ../testdata/testdnsproxy.xml				/epoc32/release/winscw/udeb/z/testdata/configs/testdnsproxy.xml
 ../testdata/testdnsproxy2.xml				/epoc32/release/winscw/udeb/z/testdata/configs/testdnsproxy2.xml
 ../testdata/testdnsproxy3.xml				/epoc32/release/winscw/udeb/z/testdata/configs/testdnsproxy3.xml
-../testdata/resolver01.ini				/epoc32/release/winscw/udeb/z/testdata/configs/resolver01.ini
-../testdata/resolver02.ini				/epoc32/release/winscw/udeb/z/testdata/configs/resolver02.ini
-../testdata/resolver03.ini				/epoc32/release/winscw/udeb/z/testdata/configs/resolver03.ini
 
 //urel
 ../scripts/ns-dnsproxy-main-ops.script		/epoc32/release/winscw/urel/z/testdata/scripts/ns-dnsproxy-main-ops.script
@@ -55,8 +67,6 @@
 ../testdata/testdnsproxy.xml				/epoc32/release/winscw/urel/z/testdata/configs/testdnsproxy.xml
 ../testdata/testdnsproxy2.xml				/epoc32/release/winscw/urel/z/testdata/configs/testdnsproxy2.xml
 ../testdata/testdnsproxy3.xml				/epoc32/release/winscw/urel/z/testdata/configs/testdnsproxy3.xml
-../testdata/resolver01.ini						/epoc32/release/winscw/urel/z/testdata/configs/resolver01.ini
-../testdata/resolver02.ini						/epoc32/release/winscw/urel/z/testdata/configs/resolver02.ini
-../testdata/resolver03.ini				/epoc32/release/winscw/urel/z/testdata/configs/resolver03.ini
+#endif
 
 #endif 
\ No newline at end of file
diff -r 88121cf79045 -r 78fceed50f62 networkprotocols/dnsproxy/test/group/t_dnsproxy.iby
--- a/networkprotocols/dnsproxy/test/group/t_dnsproxy.iby	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkprotocols/dnsproxy/test/group/t_dnsproxy.iby	Wed Aug 18 11:18:20 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-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,15 +25,24 @@
 file=ABI_DIR\DEBUG_DIR\tdnd_dnsproxy.exe                sys\bin\tdnd_dnsproxy.exe
 file=ABI_DIR\DEBUG_DIR\t_dnsproxy.exe		        system\programs\t_dnsproxy.exe
 
+data=EPOCROOT##epoc32\release\winscw\udeb\z\testdata\configs\resolver01.ini	 		testdata\configs\resolver01.ini 
+data=EPOCROOT##epoc32\release\winscw\udeb\z\testdata\configs\resolver02.ini	 		testdata\configs\resolver02.ini 
+data=EPOCROOT##epoc32\release\winscw\udeb\z\testdata\configs\resolver03.ini	 		testdata\configs\resolver03.ini 
+
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=EPOCROOT##epoc32\data\z\testdata\configs\cccccc00_dnsproxy1.cre testdata\configs\cccccc00_dnsproxy1.cre
+data=EPOCROOT##epoc32\data\z\testdata\configs\cccccc00_dnsproxy2.cre testdata\configs\cccccc00_dnsproxy2.cre
+data=EPOCROOT##epoc32\data\z\testdata\configs\cccccc00_dnsproxy3.cre testdata\configs\cccccc00_dnsproxy3.cre
+data=EPOCROOT##epoc32\data\z\testdata\configs\ns-dnsproxy-maintest-ops_wlan.ini testdata\configs\ns-dnsproxy-maintest-ops_wlan.ini
+data=EPOCROOT##epoc32\data\z\testdata\scripts\ns-dnsproxy-main-ops_wlan.script testdata\scripts\ns-dnsproxy-main-ops.script
+#else
 data=EPOCROOT##epoc32\release\winscw\udeb\z\testdata\scripts\ns-dnsproxy-main-ops.script 	testdata\scripts\ns-dnsproxy-main-ops.script
 data=EPOCROOT##epoc32\release\winscw\udeb\z\testdata\scripts\ns-dnsproxy-maintest-ops.ini 	testdata\scripts\ns-dnsproxy-maintest-ops.ini
 data=EPOCROOT##epoc32\release\winscw\udeb\z\testdata\configs\tcpip_4dnxproxy.ini 		testdata\configs\tcpip_4dnxproxy.ini 
 data=EPOCROOT##epoc32\release\winscw\udeb\z\testdata\configs\testdnsproxy.xml	 		testdata\configs\testdnsproxy.xml 
 data=EPOCROOT##epoc32\release\winscw\udeb\z\testdata\configs\testdnsproxy2.xml	 		testdata\configs\testdnsproxy2.xml 
 data=EPOCROOT##epoc32\release\winscw\udeb\z\testdata\configs\testdnsproxy3.xml	 		testdata\configs\testdnsproxy3.xml 
-data=EPOCROOT##epoc32\release\winscw\udeb\z\testdata\configs\resolver01.ini	 		testdata\configs\resolver01.ini 
-data=EPOCROOT##epoc32\release\winscw\udeb\z\testdata\configs\resolver02.ini	 		testdata\configs\resolver02.ini 
-data=EPOCROOT##epoc32\release\winscw\udeb\z\testdata\configs\resolver03.ini	 		testdata\configs\resolver03.ini 
-
+#endif
 
 #endif
+
diff -r 88121cf79045 -r 78fceed50f62 networkprotocols/dnsproxy/test/group/t_dnsproxy.mmp
--- a/networkprotocols/dnsproxy/test/group/t_dnsproxy.mmp	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkprotocols/dnsproxy/test/group/t_dnsproxy.mmp	Wed Aug 18 11:18:20 2010 +0300
@@ -24,7 +24,7 @@
 SOURCE			t_dnsproxytestserver.cpp  
 SOURCE			t_dnsproxymain.cpp
 
-USERINCLUDE		..\inc
+USERINCLUDE		../inc
 
 #ifdef SYMBIAN_OLD_EXPORT_LOCATION
 SYSTEMINCLUDE	/epoc32/include
@@ -34,8 +34,8 @@
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 SYSTEMINCLUDE	/epoc32/include/platform/test
 SYSTEMINCLUDE	/epoc32/include/platform/networking
-SYSTEMINCLUDE   ..\..\dnsproxyclient\inc
-USERINCLUDE 	..\..\..\..\tcpiputils\networkaddressandporttranslation\inc
+SYSTEMINCLUDE   ../../dnsproxyclient/inc
+USERINCLUDE 	../../../../tcpiputils/networkaddressandporttranslation/inc
 #endif
 
 LIBRARY		testexecuteutils.lib euser.lib esock.lib commdb.lib insock.lib netmeta.lib ecom.lib
diff -r 88121cf79045 -r 78fceed50f62 networkprotocols/dnsproxy/test/scripts/ns-dnsproxy-main-ops_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkprotocols/dnsproxy/test/scripts/ns-dnsproxy-main-ops_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,153 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT dnsproxy TEF3.0 tests
+PRINT Run test case(s) for suite ns-dnsproxy-main
+LOAD_SUITE	t_dnsproxy   -SharedData
+
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\101f7989
+RUN_UTILS  MkDir c:\private\101f7989\esock
+RUN_UTILS  MakeReadWrite c:\private\101f7989\esock\tcpip.ini
+RUN_UTILS CopyFile c:\private\101f7989\esock\tcpip.ini c:\private\101f7989\esock\tcpip_old.ini
+RUN_UTILS CopyFile z:\testdata\configs\tcpip_4dnxproxy.ini c:\private\101f7989\esock\tcpip.ini
+RUN_UTILS DeleteFile  c:\private\200215F1\resolver.ini
+
+// Configure CommDB for the tests
+run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+
+//ced -i z:\testdata\configs\testdnsproxy.xml
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_dnsproxy1.cre c:\private\10202be9\persists\cccccc00.cre
+run_script z:\TestData\scripts\te_esock_test_loadesock.script
+
+START_TESTCASE NET-DNSProxy-globalUrl-001
+	START_TEST_BLOCK    300     t_dnsproxy     z:\testdata\configs\ns-dnsproxy-maintest-ops_wlan.ini
+	        CREATE_OBJECT   DnsProxyMainTestWrapper  MainTestSection
+	        COMMAND     	MainTestSection  New
+	        COMMAND     	MainTestSection  TestGlobal ParamSection_globalUrl-001
+	END_TEST_BLOCK	
+END_TESTCASE NET-DNSProxy-globalUrl-001
+
+START_TESTCASE NET-DNSProxy-globalUrl-002
+	START_TEST_BLOCK    300     t_dnsproxy     z:\testdata\configs\ns-dnsproxy-maintest-ops_wlan.ini
+	        CREATE_OBJECT   DnsProxyMainTestWrapper  MainTestSection
+	        COMMAND     	MainTestSection  New
+	        COMMAND     	MainTestSection  TestGlobal ParamSection_globalUrl-002
+	END_TEST_BLOCK	
+END_TESTCASE NET-DNSProxy-globalUrl-002
+
+START_TESTCASE NET-DNSProxy-globalUrl-003
+	START_TEST_BLOCK    300     t_dnsproxy     z:\testdata\configs\ns-dnsproxy-maintest-ops_wlan.ini
+	        CREATE_OBJECT   DnsProxyMainTestWrapper  MainTestSection
+	        COMMAND     	MainTestSection  New
+	        COMMAND     	MainTestSection  TestGlobal ParamSection_globalUrl-003
+	END_TEST_BLOCK	
+END_TESTCASE NET-DNSProxy-globalUrl-003
+
+START_TESTCASE NET-DNSProxy-localUrl-001
+	START_TEST_BLOCK    300     t_dnsproxy     z:\testdata\configs\ns-dnsproxy-maintest-ops_wlan.ini
+	        CREATE_OBJECT   DnsProxyMainTestWrapper  MainTestSection
+	        COMMAND     	MainTestSection  New
+	        COMMAND     	MainTestSection  TestLocal ParamSection_localUrl-001
+	END_TEST_BLOCK	
+END_TESTCASE NET-DNSProxy-localUrl-001
+
+START_TESTCASE NET-DNSProxy-localUrl-002
+	START_TEST_BLOCK    300     t_dnsproxy     z:\testdata\configs\ns-dnsproxy-maintest-ops_wlan.ini
+	        CREATE_OBJECT   DnsProxyMainTestWrapper  MainTestSection
+	        COMMAND     	MainTestSection  New
+	        COMMAND     	MainTestSection  TestLocal ParamSection_localUrl-002
+	END_TEST_BLOCK	
+END_TESTCASE NET-DNSProxy-localUrl-002
+
+RUN_UTILS MkDir  c:\private\200215F1\
+
+RUN_UTILS CopyFile z:\testdata\configs\resolver01.ini c:\private\200215F1\resolver.ini
+START_TESTCASE NET-DNSProxy-localUrl-002
+	START_TEST_BLOCK    300     t_dnsproxy     z:\testdata\configs\ns-dnsproxy-maintest-ops_wlan.ini
+	        CREATE_OBJECT   DnsProxyMainTestWrapper  MainTestSection
+	        COMMAND     	MainTestSection  New
+	        COMMAND     	MainTestSection  TestLocal ParamSection_localUrl-002-Fail
+	END_TEST_BLOCK	
+END_TESTCASE NET-DNSProxy-localUrl-002
+
+RUN_UTILS MakeReadWrite c:\private\200215F1\resolver.ini
+RUN_UTILS CopyFile z:\testdata\configs\resolver02.ini c:\private\200215F1\resolver.ini
+START_TESTCASE NET-DNSProxy-localUrl-002
+	START_TEST_BLOCK    300     t_dnsproxy     z:\testdata\configs\ns-dnsproxy-maintest-ops_wlan.ini
+	        CREATE_OBJECT   DnsProxyMainTestWrapper  MainTestSection
+	        COMMAND     	MainTestSection  New
+	        COMMAND     	MainTestSection  TestLocal ParamSection_localUrl-002-Fail
+	END_TEST_BLOCK	
+END_TESTCASE NET-DNSProxy-localUrl-002
+
+ 
+RUN_UTILS MakeReadWrite c:\private\200215F1\resolver.ini
+RUN_UTILS DeleteFile  c:\private\200215F1\resolver.ini
+START_TESTCASE NET-DNSProxy-localUrl-003
+	START_TEST_BLOCK    300     t_dnsproxy     z:\testdata\configs\ns-dnsproxy-maintest-ops_wlan.ini
+	        CREATE_OBJECT   DnsProxyMainTestWrapper  MainTestSection
+	        COMMAND     	MainTestSection  New
+	        COMMAND     	MainTestSection  TestLocal ParamSection_localUrl-003
+	END_TEST_BLOCK	
+END_TESTCASE NET-DNSProxy-localUrl-003
+
+START_TESTCASE NET-DNSProxy-localUrl-004
+	START_TEST_BLOCK    300     t_dnsproxy     z:\testdata\configs\ns-dnsproxy-maintest-ops_wlan.ini
+	        CREATE_OBJECT   DnsProxyMainTestWrapper  MainTestSection
+	        COMMAND     	MainTestSection  New
+	        COMMAND     	MainTestSection  TestLocal ParamSection_localUrl-004
+	END_TEST_BLOCK	
+END_TESTCASE NET-DNSProxy-localUrl-004
+START_TESTCASE NET-DNSProxy-Connection-001
+	START_TEST_BLOCK    300     t_dnsproxy     z:\testdata\configs\ns-dnsproxy-maintest-ops_wlan.ini
+  	        CREATE_OBJECT   DnsProxyMainTestWrapper  MainTestSection
+  	        COMMAND     	MainTestSection  TestConnection ParamSection_conn-001
+  	END_TEST_BLOCK	
+END_TESTCASE NET-DNSProxy-Connection-001
+//ced -i z:\testdata\configs\testdnsproxy2.xml
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_dnsproxy2.cre c:\private\10202be9\persists\cccccc00.cre
+START_TESTCASE NET-DNSProxy-Connection-002
+	START_TEST_BLOCK    300     t_dnsproxy     z:\testdata\configs\ns-dnsproxy-maintest-ops_wlan.ini
+  	        CREATE_OBJECT   DnsProxyMainTestWrapper  MainTestSection
+  	        COMMAND     	MainTestSection  TestConnection ParamSection_conn-002
+  	END_TEST_BLOCK	
+END_TESTCASE NET-DNSProxy-Connection-002
+//ced -i z:\testdata\configs\testdnsproxy3.xml
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_dnsproxy3.cre c:\private\10202be9\persists\cccccc00.cre
+START_TESTCASE NET-DNSProxy-Connection-003
+	START_TEST_BLOCK    300     t_dnsproxy     z:\testdata\configs\ns-dnsproxy-maintest-ops_wlan.ini
+	        CREATE_OBJECT   DnsProxyMainTestWrapper  MainTestSection
+	        COMMAND     	MainTestSection  TestConnection ParamSection_conn-003
+	END_TEST_BLOCK	
+END_TESTCASE NET-DNSProxy-Connection-003
+
+run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+RUN_UTILS MakeReadWrite c:\private\101f7989\esock\tcpip.ini
+RUN_UTILS MakeReadWrite c:\private\101f7989\esock\tcpip_old.ini
+RUN_UTILS DeleteFile c:\private\101f7989\esock\tcpip.ini
+RUN_UTILS CopyFile c:\private\101f7989\esock\tcpip_old.ini c:\private\101f7989\esock\tcpip.ini
+RUN_UTILS DeleteFile c:\private\101f7989\esock\tcpip_old.ini
+
+
+
+//PRINT Completed_tef3_t_dnsproxy	
diff -r 88121cf79045 -r 78fceed50f62 networkprotocols/dnsproxy/test/src/t_dnsproxymain.cpp
--- a/networkprotocols/dnsproxy/test/src/t_dnsproxymain.cpp	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkprotocols/dnsproxy/test/src/t_dnsproxymain.cpp	Wed Aug 18 11:18:20 2010 +0300
@@ -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"
@@ -168,9 +168,7 @@
 		ERR_PRINTF2(_L("<font color=FF0000>No parameter %S</font>"), &KUSEIAP());
 		SetBlockResult(EFail);
 		}
-		
-		
-	_LIT(KTestCaseName,"eth");	
+
 
 	TBuf8<256> name8;
 	name8.Copy(pname16);
@@ -244,11 +242,17 @@
 			}
 		iUseNapt = ETrue;	
 
+#ifdef SIROCCO_CODE_MIGRATION
+	_LIT(KInterfaceName,"wlan");
+	_LIT(KInterfaceName2,"wlan");
+#else
+	_LIT(KInterfaceName,"eth");
+	_LIT(KInterfaceName2,"eth");
+#endif
+
    		RSocket sock;
    		sock.Open(iSs,KAfInet, KSockDatagram, KProtocolInetUdp);     	
-   		_LIT(KInterfaceName,"eth");
    		TUint32 testaddr = GetInterfaceAddress(sock,KInterfaceName());
-   		_LIT(KInterfaceName2,"eth");
    		TUint32 ifindex = GetInterfaceIndex(sock, KInterfaceName2());
      	sock.Close();
      	     
@@ -775,11 +779,17 @@
 			}
 		iUseNapt = ETrue;	
 
+#ifdef SIROCCO_CODE_MIGRATION
+	_LIT(KInterfaceName,"wlan");
+	_LIT(KInterfaceName2,"wlan");
+#else
+	_LIT(KInterfaceName,"eth");
+	_LIT(KInterfaceName2,"eth");
+#endif
+
    		RSocket sock;
    		sock.Open(iSs,KAfInet, KSockDatagram, KProtocolInetUdp);     	
-   		_LIT(KInterfaceName,"eth");
    		TUint32 testaddr = GetInterfaceAddress(sock,KInterfaceName());
-   		_LIT(KInterfaceName2,"eth");
    		TUint32 ifindex = GetInterfaceIndex(sock, KInterfaceName2());
      	sock.Close();
      	     
diff -r 88121cf79045 -r 78fceed50f62 networkprotocols/dnsproxy/test/testdata/S-ced-hw-empty.cfg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkprotocols/dnsproxy/test/testdata/S-ced-hw-empty.cfg	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,557 @@
+############################################################
+## AUTO-GENERATED CONFIGURATION FILE
+## CommsDat Database Dump Utility
+## 1.1
+############################################################
+
+############################################################
+## ModemBearer
+## 
+[ModemBearer]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Modem
+	IfName=PPP
+	PortName=COMM::0
+	TSYName=MM
+	CSYName=ECUART
+	LastSocketActivityTimeout=30
+	LastSessionClosedTimeout=180
+	LastSocketClosedTimeout=30
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=0
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOff=Q0
+	QuietOn=Q1
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+44123456789
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	CommRole=0
+	SIRSettings=0
+	Agent=CSD.agt
+	FIELD_COUNT=70
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=GPRS Modem
+	IfName=spud-rawip
+	PortName=DATAPORT::0
+	TSYName=PHONETSY
+	CSYName=DATAPORT
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=1
+	LastSocketClosedTimeout=-1
+	DataBits=5
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=0
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOff=Q0
+	QuietOn=Q1
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+44123456789
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=0
+	CommRole=0
+	SIRSettings=0
+	Agent=gprsumtsagent.agt
+	BCAStack=BcaToIsc
+	FIELD_COUNT=71
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=CSD Modem
+	IfName=PPP
+	PortName=DATAPORT::0
+	TSYName=PHONETSY
+	CSYName=DATAPORT
+	LastSocketActivityTimeout=300
+	LastSessionClosedTimeout=1
+	LastSocketClosedTimeout=300
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=19200
+	Handshaking=196
+	SpecialRate=0
+	XonChar=17
+	XoffChar=19
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=ATZ
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOff=Q0
+	QuietOn=Q1
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+358508771010
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=0
+	CommRole=0
+	SIRSettings=0
+	Agent=csd.agt
+	FIELD_COUNT=70
+END_ADD
+
+
+############################################################
+## Location
+## 
+[Location]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Default Location
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## Chargecard
+## 
+[Chargecard]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Dummy BT Chargecard
+	AccountNumber=144,12345678
+	Pin=0000
+	LocalRule=HG
+	NatRule=HFG
+	IntlRule=HEFG
+	FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## GlobalSettings
+## 
+[GlobalSettings]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-1
+	WAPAccessPoint=1
+	ConnectionAttempts=1
+	RedialAttempts=0
+	SmsBearer=3
+	SmsReceiveMode=2
+	GPRSAttachMode=1
+	AcceptIncomingGprs=1
+	GPRSClassCBearer=GSM
+	ModemForDataAndFax=3
+	ModemForPhoneServicesAndSMS=3
+	LocationForDataAndFax=1
+	LocationForPhoneServicesAndSMS=1
+	MaxMBufHeap=1
+	DefaultNetwork=1
+	BearerAvailabilityCheckTSY=PHONETSY
+	FIELD_COUNT=17
+END_ADD
+
+
+############################################################
+## DialOutISP
+## 
+[DialOutISP]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Dial Out ISP
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=TRUE
+	DisplayPCT=FALSE
+	IfPromptForAuth=TRUE
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=UNSPECIFIED
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=29
+END_TEMPLATE
+
+
+############################################################
+## DialInISP
+## 
+[DialInISP]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Dial In ISP
+	UseLoginScript=FALSE
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=10
+END_TEMPLATE
+
+
+############################################################
+## OutgoingGPRS
+## 
+[OutgoingGPRS]
+ADD_TEMPLATE
+	Id=0
+	Name=template
+	PDPType=IPV4
+	ReqPrecedence=0
+	ReqDelay=0
+	ReqReliability=0
+	ReqPeakThroughput=0
+	ReqMeanThroughput=0
+	MinPrecedence=0
+	MinDelay=0
+	MinReliability=0
+	MinPeakThroughput=0
+	MinMeanThroughput=0
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=TRUE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	AuthRetries=0
+	IpGateway=0.0.0.0
+	IpAddrFromServer=TRUE
+	IpAddr=0.0.0.0
+	IpDNSAddrFromServer=TRUE
+	IpNameServer1=0.0.0.0
+	IpNameServer2=0.0.0.0
+	Ip6DNSAddrFromServer=TRUE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=TRUE
+	GprsAccessPointType=2
+	QosWarningTimeout=-1
+	UmtsR99QoSAndOn=1
+	FIELD_COUNT=32
+END_TEMPLATE
+
+
+############################################################
+## DefaultGPRS
+## 
+[DefaultGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Dummy Default GPRS Settings
+	Usage=1
+	PDPType=IPV6
+	PDPAddress=www.wid.com
+	Precedence=1
+	Delay=1
+	Reliability=1
+	PeakThroughput=1
+	MeanThroughput=1
+	MinPrecedence=1
+	MinDelay=1
+	MinReliability=1
+	MinPeakThroughput=1
+	MinMeanThroughput=1
+	DataCompression=TRUE
+	HeaderCompression=TRUE
+	GprsUseEdge=FALSE
+	AnonymousAccess=TRUE
+	FIELD_COUNT=19
+END_ADD
+
+
+############################################################
+## ConnectionPreferences
+## 
+[ConnectionPreferences]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-1
+	Ranking=0
+	Direction=OUTGOING
+	BearerSet=CSD & WCDMA
+	DialogPref=PROMPT
+	IAP=0
+	FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## WAPAccessPoint
+## 
+[WAPAccessPoint]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Dial In ISP
+	CurrentBearer=WAPIPBearer
+	FIELD_COUNT=3
+END_TEMPLATE
+
+
+############################################################
+## WAPIPBearer
+## 
+[WAPIPBearer]
+ADD_TEMPLATE
+	Id=0
+	Name=DefaultRecordName-1
+	AccessPointId=0
+	IAP=0
+	WSPOption=CONNECTIONLESS
+	Security=FALSE
+	ProxyPortNumber=0
+	FIELD_COUNT=7
+END_TEMPLATE
+
+
+############################################################
+## WAPSMSBearer
+## 
+[WAPSMSBearer]
+ADD_TEMPLATE
+	Id=0
+	Name=DefaultRecordName-1
+	AccessPointId=0
+	WSPOption=CONNECTIONLESS
+	Security=FALSE
+	FIELD_COUNT=5
+END_TEMPLATE
+
+
+############################################################
+## SecureSocketTable
+## 
+[SecureSocketTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-1
+	ProtocolName=ssl3.0
+	ProtoLibrary=ssladaptor.dll
+	FIELD_COUNT=4
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=DefaultRecordName-2
+	ProtocolName=tls1.0
+	ProtoLibrary=ssladaptor.dll
+	FIELD_COUNT=4
+END_ADD
+
+############################################################
+## UmtsR99QoSAndOn
+## 
+[UmtsR99QoSAndOn]
+ADD_SECTION
+# COMMDB_ID = 1
+        Name=PRIMARY1
+        ReqTrafficClass=1
+        MinTrafficClass=1
+        ReqDeliveryOrder=1
+        MinDeliveryOrder=1
+        ReqDeliverErroneousSDU=1
+        MinDeliverErroneousSDU=1
+        ReqMaxSDUSize=0
+        MinAcceptableMaxSDUSize=0
+        ReqMaxUplinkRate=0
+        ReqMinUplinkRate=0
+        ReqMaxDownlinkRate=0
+        ReqMinDownlinkRate=0
+        ReqBER=1
+        MaxBER=1
+        ReqSDUErrorRatio=1
+        MaxSDUErrorRatio=1
+        ReqTrafficHandlingPriority=1
+        MinTrafficHandlingPriority=1
+        ReqTransferDelay=0
+        MaxTransferDelay=0
+        ReqGuaranteedUplinkRate=0
+        MinGuaranteedUplinkRat=0
+        ReqGuaranteedDownlinkRate=0
+        MinGuaranteedDownlinkRate=0
+        SignallingIndication=FALSE
+        IMCNSignallingIndication=FALSE
+        SourceStatisticsDescriptor=0
+        FIELD_COUNT=28 
+END_ADD
diff -r 88121cf79045 -r 78fceed50f62 networkprotocols/dnsproxy/test/testdata/cccccc00_dnsproxy1.cre
Binary file networkprotocols/dnsproxy/test/testdata/cccccc00_dnsproxy1.cre has changed
diff -r 88121cf79045 -r 78fceed50f62 networkprotocols/dnsproxy/test/testdata/cccccc00_dnsproxy2.cre
Binary file networkprotocols/dnsproxy/test/testdata/cccccc00_dnsproxy2.cre has changed
diff -r 88121cf79045 -r 78fceed50f62 networkprotocols/dnsproxy/test/testdata/cccccc00_dnsproxy3.cre
Binary file networkprotocols/dnsproxy/test/testdata/cccccc00_dnsproxy3.cre has changed
diff -r 88121cf79045 -r 78fceed50f62 networkprotocols/dnsproxy/test/testdata/connectionpref1_wlan.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkprotocols/dnsproxy/test/testdata/connectionpref1_wlan.xml	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CommDB:Config>
+	<ConnectionPreferencesTable>
+	  <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable1</Name>
+        <Ranking>1</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>DONOTPROMPT</DialogPref>
+        <BearerSet>WLAN</BearerSet>
+        <IAPRef>IAP.EthernetwithDaemonDynamicIP1</IAPRef>
+    </ConnectionPreferences>
+  </ConnectionPreferencesTable>
+</CommDB:Config>
diff -r 88121cf79045 -r 78fceed50f62 networkprotocols/dnsproxy/test/testdata/connectionpref2_wlan.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkprotocols/dnsproxy/test/testdata/connectionpref2_wlan.xml	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CommDB:Config>
+	<ConnectionPreferencesTable>
+	  <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable1</Name>
+        <Ranking>1</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>DONOTPROMPT</DialogPref>
+        <BearerSet>WLAN</BearerSet>
+        <IAPRef>IAP.EthernetwithDaemonDynamicIP2</IAPRef>
+    </ConnectionPreferences>
+  </ConnectionPreferencesTable>
+</CommDB:Config>
diff -r 88121cf79045 -r 78fceed50f62 networkprotocols/dnsproxy/test/testdata/connectionpref3_wlan.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkprotocols/dnsproxy/test/testdata/connectionpref3_wlan.xml	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CommDB:Config>
+	<ConnectionPreferencesTable>
+	  <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable1</Name>
+        <Ranking>1</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>DONOTPROMPT</DialogPref>
+        <BearerSet>WLAN</BearerSet>
+        <IAPRef>IAP.EthernetwithDaemonDynamicIP3</IAPRef>
+    </ConnectionPreferences>
+  </ConnectionPreferencesTable>
+</CommDB:Config>
diff -r 88121cf79045 -r 78fceed50f62 networkprotocols/dnsproxy/test/testdata/ns-dnsproxy-maintest-ops_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkprotocols/dnsproxy/test/testdata/ns-dnsproxy-maintest-ops_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,138 @@
+// 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:
+// 
+
+// For the meaning of querytype  see  dns_qry.h
+[MainTestSection]
+name        = obj0
+object_value    = 010
+domainname = local
+iap1=6
+iap2=1
+useiap=1
+
+
+[MainTestSection02]
+name        = obj0
+object_value    = 010
+domainname = local
+iap1=1
+iap2=6
+useiap=6
+
+
+[ParamSection_globalUrl-001]
+url    =   http://www.sample.net
+addr = 66.116.109.14
+querytype = 1
+queryresp  = 0
+changeifaceinfo=0
+
+
+[ParamSection_globalUrl-001-Fail]
+url    =   http://www.sample.net
+addr = 66.116.109.14
+querytype = 1
+queryresp  = -5120
+changeifaceinfo=0
+
+
+[ParamSection_globalUrl-002]
+url    =   http://www.sample.net
+addr = 66.116.109.14
+querytype = 12
+queryresp  = 0
+changeifaceinfo=0
+
+
+[ParamSection_globalUrl-003]
+url    =   http://_sip._tls.nokia.com
+addr = 131.228.6.229
+querytype = 33
+queryresp  = 0
+changeifaceinfo=0
+
+
+[ParamSection_localUrl-001]
+url    =   ccc.local
+addr = 10.192.192.138
+querytype = 1
+queryresp  = 0
+updatedbflag = 0
+changeifaceinfo=0
+
+
+[ParamSection_localUrl-002]
+url    =   ccc.local
+addr = 10.192.192.138
+querytype = 1
+queryresp  = 0
+updatedbflag = 1
+changeifaceinfo=0
+
+
+[ParamSection_localUrl-002-Fail]
+url    =   ccc.local
+addr = 10.192.192.138
+querytype = 1
+queryresp  = -5120
+updatedbflag = 1
+changeifaceinfo=0
+
+
+[ParamSection_localUrl-003]
+url    =   ccc.local
+addr = 66.116.109.14
+querytype = 12
+queryresp  = 0
+updatedbflag = 1
+changeifaceinfo=0
+
+
+[ParamSection_localUrl-004]
+url    =   ccc.local
+addr = 10.192.192.138
+querytype = 1
+queryresp  = 0
+updatedbflag = 1
+changeifaceinfo=2
+
+
+[ParamSection_conn-001]
+name        = obj0
+object_value    = 010
+iap1=0
+iap2=1
+useiap=1
+expectation  = 0
+
+
+[ParamSection_conn-002]
+name        = obj0
+object_value    = 010
+iap1=0
+iap2=2
+useiap=2
+expectation  = 0
+
+
+[ParamSection_conn-003]
+name        = obj0
+object_value    = 010
+iap1=0
+iap2=3
+useiap=3
+expectation  = 0
+[EchoClientSection]
+
diff -r 88121cf79045 -r 78fceed50f62 networkprotocols/dnsproxy/test/testdata/te_dnsproxy_wlan.xml
Binary file networkprotocols/dnsproxy/test/testdata/te_dnsproxy_wlan.xml has changed
diff -r 88121cf79045 -r 78fceed50f62 networkprotocols/ipeventnotifier/src/DHCPUnicastTranslator.cpp
--- a/networkprotocols/ipeventnotifier/src/DHCPUnicastTranslator.cpp	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkprotocols/ipeventnotifier/src/DHCPUnicastTranslator.cpp	Wed Aug 18 11:18:20 2010 +0300
@@ -1,4 +1,4 @@
-// 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"
@@ -128,7 +128,7 @@
 #ifndef _DEBUG
     if (udp.iHdr->DstPort() == 68)
 #else
-	if (udp.iHdr->DstPort() == 68 || udp.iHdr->DstPort() == 127 || udp.iHdr->DstPort() == 119 || udp.iHdr->DstPort() == 125
+	if (udp.iHdr->DstPort() == 68 || udp.iHdr->DstPort() == 127 || udp.iHdr->DstPort() == 119 || udp.iHdr->DstPort() == 94 || udp.iHdr->DstPort() == 125
 	#ifdef SYMBIAN_NETWORKING_DHCP_MSG_HEADERS
 	|| udp.iHdr->DstPort() == 92 || udp.iHdr->DstPort() == 99
 	#endif//SYMBIAN_NETWORKING_DHCP_MSG_HEADERS	
diff -r 88121cf79045 -r 78fceed50f62 networkprotocols/iphook/inhook6/group/inhook6.mmp
--- a/networkprotocols/iphook/inhook6/group/inhook6.mmp	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkprotocols/iphook/inhook6/group/inhook6.mmp	Wed Aug 18 11:18:20 2010 +0300
@@ -38,9 +38,9 @@
 LIBRARY		euser.lib esock.lib esocksvr.lib mbufmgr.lib insock.lib
 
 #ifdef SYMBIAN_TCPIPDHCP_UPDATE
-deffile			inhook6.DEF
+deffile			inhook6.def
 #else
-deffile			inhook6_v1.DEF
+deffile			inhook6_v1.def
 #endif //SYMBIAN_TCPIPDHCP_UPDATE
 
 SOURCEPATH 			../data
diff -r 88121cf79045 -r 78fceed50f62 networkprotocols/tcpipv4v6prt/inc/tcp.h
--- a/networkprotocols/tcpipv4v6prt/inc/tcp.h	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/inc/tcp.h	Wed Aug 18 11:18:20 2010 +0300
@@ -617,7 +617,7 @@
 	void ProcessSegments();
 	void SendSegments(TBool aNagleOverride = EFalse);
 	void RetransmitTimeout();
-	void RetransmitSegments();
+	TBool RetransmitSegments();
 	void ClearSYNSettings();
 
 	/**
diff -r 88121cf79045 -r 78fceed50f62 networkprotocols/tcpipv4v6prt/src/tcp_sap.cpp
--- a/networkprotocols/tcpipv4v6prt/src/tcp_sap.cpp	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/src/tcp_sap.cpp	Wed Aug 18 11:18:20 2010 +0300
@@ -1771,7 +1771,8 @@
 		if (iFlags.iRetransmitPending)
 			{
 			iFlags.iRetransmitPending = EFalse;
-			RetransmitSegments();
+			if(RetransmitSegments())
+				return;
 			}
 
 		if (iFlags.iTransmitPending)
@@ -2375,7 +2376,12 @@
 		++iBackoff;
 		if (iRTO < Protocol()->MaxRTO())  // Avoid RTO overflow
 			ResetRTO();
-
+		
+		if(DetachIfDead())
+			{
+			Expire();
+			return;
+			}
 		//
 		// Timeout?
 		//
@@ -2490,7 +2496,7 @@
 //  - directly from RetransmitTimeout()
 //  - from CanSend(), in which case this is a delayed retransmission timeout
 //
-void CProviderTCP6::RetransmitSegments()
+TBool CProviderTCP6::RetransmitSegments()
 	{
 	ASSERT(iRetransTimer);
 
@@ -2506,7 +2512,7 @@
 		{
 		LOG(Log::Printf(_L("\ttcp SAP[%u] RetransmitSegments(): Flow pending"), (TInt)this));
 		ReSchedRetransmit();
-		return;
+		return EFalse;
 		}
 
 	//
@@ -2564,14 +2570,14 @@
 			// the receiver suddenly shrinks its window. The current solution covers
 			// both cases.
 			//
-			return;
+			return EFalse;
 			}
 
 		//
 		// This is a retransmit timout. Do we have anything to do?
 		//
 		if (!unacked)
-			return;
+			return EFalse;
 
 		LOG(if (iFlags.iFastRetransMode) Log::Printf(_L("\ttcp SAP[%u] RetransmitSegments(): Leaving FAST RETRANS mode"), (TInt)this));
 		iFlags.iFastRetransMode = EFalse;
@@ -2644,7 +2650,7 @@
 		// If the server doesn't respond because of broken NAT/FW or other, don't keep interface up.
 		if (InState(ETcpFinWait1|ETcpClosing|ETcpLastAck))
 			DetachIfDead();
-		return;
+		return EFalse;
 		}
 
 	//
@@ -2654,14 +2660,14 @@
 		{
 		// Retransmit SYN
 		SendSegment(KTcpCtlSYN, iSND.UNA);
-		return;
+		return EFalse;
 		}
 
 	if (InState(ETcpSynReceived))
 		{
 		// Retransmit SYN,ACK
 		SendSegment(KTcpCtlSYN|KTcpCtlACK, iSND.UNA);
-		return;
+		return EFalse;
 		}
 
 	if (InState(ETcpFinWait1|ETcpClosing|ETcpLastAck))
@@ -2671,18 +2677,22 @@
 	    //TSW error:JHAA-82JBNG -- FIN retransmission 
 		//Depending on the function return value the decision to
 	    //retransmitt FIN is decided
-
-		TBool continue_send = DetachIfDead();
+	
 		// Retransmit FIN
-		if(continue_send == EFalse)
+		if(DetachIfDead()== EFalse)
+			{
 			SendSegment(KTcpCtlFIN|KTcpCtlACK, iSND.UNA);
-		return;
+			return EFalse;
+			}
 		}
 
 	LOG(Log::Printf(_L("\ttcp SAP[%u] RetransmitSegments(): Retransmitter stopping"), (TInt)this));
 	if (!iSockFlags.iAttached)
+		{
 		Expire();
-	return;
+		return ETrue;
+		}
+	return EFalse;
 	}
 
 
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/ipsec/ipsecpol/src/ipsecpolmanhandler.cpp
--- a/networksecurity/ipsec/ipsecpol/src/ipsecpolmanhandler.cpp	Tue Jul 06 16:04:34 2010 +0300
+++ b/networksecurity/ipsec/ipsecpol/src/ipsecpolmanhandler.cpp	Wed Aug 18 11:18:20 2010 +0300
@@ -1450,7 +1450,9 @@
 
     if (autoloadListItem != NULL)
         {
-        iScopedAutoloadPolicyPairs.Append(autoloadListItem);
+		CleanupStack::PushL(autoloadListItem);
+        iScopedAutoloadPolicyPairs.AppendL(autoloadListItem);
+        CleanupStack::Pop(autoloadListItem);
         }
     }
 
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/ipsec/ipsecpol/src/ipsecpolmanutil.cpp
--- a/networksecurity/ipsec/ipsecpol/src/ipsecpolmanutil.cpp	Tue Jul 06 16:04:34 2010 +0300
+++ b/networksecurity/ipsec/ipsecpol/src/ipsecpolmanutil.cpp	Wed Aug 18 11:18:20 2010 +0300
@@ -73,7 +73,7 @@
             if (j==count)
                 {
                 TInt position = 0;
-                gatewayList.Insert( &itemL->iTunnel, position);
+                gatewayList.InsertL( &itemL->iTunnel, position);
 
                 // Build two strings for policy file
                 stringBuf.Zero();
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/ipsec/te_ipsec/group/t_ipsec.mmp
--- a/networksecurity/ipsec/te_ipsec/group/t_ipsec.mmp	Tue Jul 06 16:04:34 2010 +0300
+++ b/networksecurity/ipsec/te_ipsec/group/t_ipsec.mmp	Wed Aug 18 11:18:20 2010 +0300
@@ -27,25 +27,25 @@
 VENDORID		0x70000001
 
 
-SOURCEPATH		..\src
+SOURCEPATH		../src
 SOURCE			t_ipsectestserver.cpp
 SOURCE			t_ipsecikev2.cpp t_ipsecmultiplesa.cpp
 
 
-USERINCLUDE		..\inc
+USERINCLUDE		../inc
 
 #ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE	\epoc32\include
-SYSTEMINCLUDE	\epoc32\include\test
-SYSTEMINCLUDE   \epoc32\include\ecom
-SYSTEMINCLUDE   \epoc32\include\comms-infras
-SYSTEMINCLUDE   \epoc32\include\networking
+SYSTEMINCLUDE	/epoc32/include
+SYSTEMINCLUDE	/epoc32/include/test
+SYSTEMINCLUDE   /epoc32/include/ecom
+SYSTEMINCLUDE   /epoc32/include/comms-infras
+SYSTEMINCLUDE   /epoc32/include/networking
 #else
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-SYSTEMINCLUDE 	\epoc32\include\platform\test
-SYSTEMINCLUDE   \epoc32\include\platform\ecom
-SYSTEMINCLUDE   \epoc32\include\platform\comms-infras
-SYSTEMINCLUDE   \epoc32\include\platform\networking
+SYSTEMINCLUDE 	/epoc32/include/platform/test
+SYSTEMINCLUDE   /epoc32/include/platform/ecom
+SYSTEMINCLUDE   /epoc32/include/platform/comms-infras
+SYSTEMINCLUDE   /epoc32/include/platform/networking
 #endif
 
 LIBRARY euser.lib
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/ipsec/te_ipsec/inc/t_ipsecikev2.h
--- a/networksecurity/ipsec/te_ipsec/inc/t_ipsecikev2.h	Tue Jul 06 16:04:34 2010 +0300
+++ b/networksecurity/ipsec/te_ipsec/inc/t_ipsecikev2.h	Wed Aug 18 11:18:20 2010 +0300
@@ -23,7 +23,7 @@
 #if (!defined __TEF_IPSEC_IKEV2_TEST_WRAPPER_H__)
 #define __TEF_IPSEC_IKEV2_TEST_WRAPPER_H__
 
-#include <DataWrapper.h>
+#include <datawrapper.h>
 
 class CT_IPSecIKEv2TestWrapper : public CDataWrapper
 	{
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/ipsec/te_ipsec/inc/t_ipsecmultiplesa.h
--- a/networksecurity/ipsec/te_ipsec/inc/t_ipsecmultiplesa.h	Tue Jul 06 16:04:34 2010 +0300
+++ b/networksecurity/ipsec/te_ipsec/inc/t_ipsecmultiplesa.h	Wed Aug 18 11:18:20 2010 +0300
@@ -25,7 +25,7 @@
 
 
 
-#include <DataWrapper.h>
+#include <datawrapper.h>
 
 class CT_IPSecMultipleSATestWrapper : public CDataWrapper
 	{
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/group/ts_tls.iby
--- a/networksecurity/tls/group/ts_tls.iby	Tue Jul 06 16:04:34 2010 +0300
+++ b/networksecurity/tls/group/ts_tls.iby	Wed Aug 18 11:18:20 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-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"
@@ -33,16 +33,69 @@
 
 data=EPOCROOT##epoc32\data\Z\private\101f72a6\keys.dat			private\101f72a6\keys.dat
 
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=EPOCROOT##epoc32\data\Z\testdata\configs\cccccc00_ssl_30.cre			testdata\configs\cccccc00_ssl_30.cre
+data=EPOCROOT##epoc32\data\Z\testdata\configs\cccccc00_tls_psk.cre		testdata\configs\cccccc00_tls_psk.cre
+data=EPOCROOT##epoc32\data\Z\testdata\scripts\tls_oom_wlan.script		testdata\scripts\tls_oom.script
+data=EPOCROOT##epoc32\data\Z\testdata\scripts\tls_psk_wlan.script 		testdata\scripts\tls_psk.script
+data=EPOCROOT##epoc32\data\Z\testdata\scripts\ssl_ntras_30_wlan.script	testdata\scripts\ssl_ntras_30.script
+data=EPOCROOT##epoc32\data\Z\testdata\scripts\ssl_ntras_31_wlan.script	testdata\scripts\ssl_ntras_31.script
+#else
 data=EPOCROOT##epoc32\data\Z\testdata\configs\tls_ntras.cfg			testdata\configs\tls_ntras.cfg
 data=EPOCROOT##epoc32\data\Z\testdata\configs\tls_ethernet.xml		testdata\configs\tls_ethernet.xml
 data=EPOCROOT##epoc32\data\Z\testdata\scripts\tls_oom.script		testdata\scripts\tls_oom.script
 data=EPOCROOT##epoc32\data\Z\testdata\scripts\tls_psk.script 		testdata\scripts\tls_psk.script
 data=EPOCROOT##epoc32\data\Z\testdata\scripts\ssl_ntras_30.script	testdata\scripts\ssl_ntras_30.script
 data=EPOCROOT##epoc32\data\Z\testdata\scripts\ssl_ntras_31.script	testdata\scripts\ssl_ntras_31.script
+#endif //INCLUDE_SIROCCO_CODE_MIGRATION
+
 data=EPOCROOT##epoc32\data\Z\testdata\configs\tls_t_secdlg_in.dat	testdata\configs\tls_t_secdlg_in.dat
 data=EPOCROOT##epoc32\data\Z\testdata\configs\cacerts_psk.dat		testdata\configs\cacerts_psk.dat
 data=EPOCROOT##epoc32\data\Z\testdata\configs\certclients_psk.dat	testdata\configs\certclients_psk.dat
 data=EPOCROOT##epoc32\data\Z\testdata\configs\keys_psk.dat			testdata\configs\keys_psk.dat
+
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls3_wlan.ini			testdata\configs\tls3.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls4_wlan.ini			testdata\configs\tls4.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls5_wlan.ini			testdata\configs\tls5.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls8_wlan.ini			testdata\configs\tls8.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls9_wlan.ini			testdata\configs\tls9.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls11_wlan.ini			testdata\configs\tls11.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls12_wlan.ini			testdata\configs\tls12.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls13_wlan.ini			testdata\configs\tls13.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls14_wlan.ini			testdata\configs\tls14.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls16_wlan.ini			testdata\configs\tls16.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls19_wlan.ini			testdata\configs\tls19.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls20_wlan.ini			testdata\configs\tls20.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls21_wlan.ini			testdata\configs\tls21.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls22_wlan.ini			testdata\configs\tls22.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls23_wlan.ini			testdata\configs\tls23.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls24_wlan.ini			testdata\configs\tls24.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls25_wlan.ini			testdata\configs\tls25.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls26_wlan.ini			testdata\configs\tls26.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls28_wlan.ini			testdata\configs\tls28.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls5b_wlan.ini			testdata\configs\tls5b.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tlsA_wlan.ini			testdata\configs\tlsA.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tlssa_wlan.ini			testdata\configs\tlssa.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls2f_wlan.ini			testdata\configs\tls2f.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls35_wlan.ini			testdata\configs\tls35.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls36_wlan.ini			testdata\configs\tls36.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls37_wlan.ini			testdata\configs\tls37.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls38_wlan.ini			testdata\configs\tls38.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls_oom_wlan.ini		testdata\configs\tls_oom.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls1_wlan.ini			testdata\configs\tls1.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls2_wlan.ini			testdata\configs\tls2.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\TLS_RSA_WITH_NULL_SHA_wlan.ini						testdata\configs\TLS_RSA_WITH_NULL_SHA.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\TLS_RSA_WITH_NULL_MD5_wlan.ini						testdata\configs\TLS_RSA_WITH_NULL_MD5.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\TLS_SNE_SINGLE_SERVER_wlan.ini						testdata\configs\TLS_SNE_SINGLE_SERVER.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\TLS_SNE_MULTIPLE_SERVER_wlan.ini					testdata\configs\TLS_SNE_MULTIPLE_SERVER.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\TLS_PSK_WITH_RC4_128_SHA_wlan.ini					testdata\configs\TLS_PSK_WITH_RC4_128_SHA.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\TLS_SNE_SINGLE_SERVER_NEG_wlan.ini					testdata\configs\TLS_SNE_SINGLE_SERVER_NEG.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\TLS_PSK_WITH_AES_128_CBC_SHA_wlan.ini				testdata\configs\TLS_PSK_WITH_AES_128_CBC_SHA.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\TLS_PSK_WITH_AES_256_CBC_SHA_wlan.ini				testdata\configs\TLS_PSK_WITH_AES_256_CBC_SHA.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\TLS_PSK_WITH_3DES_EDE_CBC_SHA_wlan.ini				testdata\configs\TLS_PSK_WITH_3DES_EDE_CBC_SHA.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\TLS_PSK_WITH_AES_128_CBC_SHA_NOCALLBACK_wlan.ini	testdata\configs\TLS_PSK_WITH_AES_128_CBC_SHA_NOCALLBACK.ini
+#else
 data=EPOCROOT##epoc32\data\Z\testdata\configs\tls3.ini			testdata\configs\tls3.ini
 data=EPOCROOT##epoc32\data\Z\testdata\configs\tls4.ini			testdata\configs\tls4.ini
 data=EPOCROOT##epoc32\data\Z\testdata\configs\tls5.ini			testdata\configs\tls5.ini
@@ -83,5 +136,6 @@
 data=EPOCROOT##epoc32\data\Z\testdata\configs\TLS_PSK_WITH_AES_256_CBC_SHA.ini				testdata\configs\TLS_PSK_WITH_AES_256_CBC_SHA.ini
 data=EPOCROOT##epoc32\data\Z\testdata\configs\TLS_PSK_WITH_3DES_EDE_CBC_SHA.ini				testdata\configs\TLS_PSK_WITH_3DES_EDE_CBC_SHA.ini
 data=EPOCROOT##epoc32\data\Z\testdata\configs\TLS_PSK_WITH_AES_128_CBC_SHA_NOCALLBACK.ini	testdata\configs\TLS_PSK_WITH_AES_128_CBC_SHA_NOCALLBACK.ini
+#endif //INCLUDE_SIROCCO_CODE_MIGRATION
 
 #endif
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/test/codenomicon/TlsClientTest/Bld.inf
--- a/networksecurity/tls/test/codenomicon/TlsClientTest/Bld.inf	Tue Jul 06 16:04:34 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-// 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:
-// Component description file
-// 
-//
-
-
-PRJ_TESTEXPORTS
-.\WinTapStaticNoGateway.xml   \epoc32\winscw\c\WinTapStaticNoGateway.xml
-
-PRJ_TESTMMPFILES
-TlsClientTest.mmp
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/test/codenomicon/TlsClientTest/bld.nf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/test/codenomicon/TlsClientTest/bld.nf	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,23 @@
+// 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:
+// Component description file
+// 
+//
+
+
+PRJ_TESTEXPORTS
+.\WinTapStaticNoGateway.xml   \epoc32\winscw\c\WinTapStaticNoGateway.xml
+
+PRJ_TESTMMPFILES
+TlsClientTest.mmp
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/test/te_tlsunittest/group/te_tlsunittest.mmp
--- a/networksecurity/tls/test/te_tlsunittest/group/te_tlsunittest.mmp	Tue Jul 06 16:04:34 2010 +0300
+++ b/networksecurity/tls/test/te_tlsunittest/group/te_tlsunittest.mmp	Wed Aug 18 11:18:20 2010 +0300
@@ -23,16 +23,16 @@
 TARGET          te_tlsunittest.exe
 TARGETTYPE      exe
 
-USERINCLUDE	..\..\..\inc
+USERINCLUDE	../../../inc
 
-SOURCEPATH      ..\src
+SOURCEPATH      ../src
 SOURCE		te_tlsunittestblock.cpp te_tlsunittestserver.cpp te_tlsunittestwrapper.cpp
 
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 
-USERINCLUDE     ..\inc
+USERINCLUDE     ../inc
 
 LIBRARY 	efsrv.lib 
 LIBRARY		euser.lib 
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/COMINIT.CPP
--- a/networksecurity/tls/ts_tls/COMINIT.CPP	Tue Jul 06 16:04:34 2010 +0300
+++ b/networksecurity/tls/ts_tls/COMINIT.CPP	Wed Aug 18 11:18:20 2010 +0300
@@ -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"
@@ -30,6 +30,7 @@
 
 GLDEF_C void CommInitL()
 	{
+#ifndef SIROCCO_CODE_MIGRATION
 	TInt err;
  	// When bootstrapping C32 we have to avoid the PhBkSyncServer being started, since
  	// it needs a different CommDB
@@ -60,5 +61,6 @@
 	err=User::LoadLogicalDevice(LDD_NAME);
 	if (err!=KErrNone && err!=KErrAlreadyExists)
 		User::Leave(err);
+#endif //SIROCCO_CODE_MIGRATION
 	}
 
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/Tls_ethernet_wlan.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/Tls_ethernet_wlan.xml	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,2122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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"
+ 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">
+
+<InformationTable>
+</InformationTable>
+
+<NetworkTable>
+    <Network operation="add">
+        <Name>Intranet</Name>
+    </Network>
+    <Network operation="add">
+        <Name>mRouter</Name>
+    </Network>
+</NetworkTable>
+
+<IAPTable>
+    <IAP operation="add">
+        <Name>NT RAS with Null Modem</Name>
+        <IAPService>DialOutISP.NT RAS</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>CSD IAP PlaceHolder01</Name>
+        <IAPService>DialOutISP.ISP01</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>CSD IAP PlaceHolder02</Name>
+        <IAPService>DialOutISP.ISP02</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>GPRS IAP PlaceHolder01</Name>
+        <IAPService>OutgoingGPRS.GPRS01</IAPService>
+        <IAPBearer>ModemBearer.GPRS Ericsson R520m/T68i via Serial</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Mobile</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>GPRS IAP PlaceHolder02</Name>
+        <IAPService>OutgoingGPRS.GPRS02</IAPService>
+        <IAPBearer>ModemBearer.GPRS Ericsson R520m/T68i via Serial</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Mobile</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Ethernet No Daemon Static IP</Name>
+        <IAPService>LANService.Ethernet No Daemon</IAPService>
+        <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Incorrect ethernet setup 1</Name>
+        <IAPService>LANService.Ethernet Bad Daemon</IAPService>
+        <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
+        <IAPNetwork>Network.mRouter</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Incorrect ethernet setup 2</Name>
+        <IAPService>LANService.Ethernet Static IP</IAPService>
+        <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
+        <IAPNetwork>Network.mRouter</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Ethernet with Daemon Static IP</Name>
+        <IAPService>LANService.Ethernet Static IP</IAPService>
+        <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Incorrect ethernet setup 3</Name>
+        <IAPService>LANService.Ethernet</IAPService>
+        <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
+        <IAPNetwork>Network.mRouter</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Ethernet with Daemon Dynamic IP</Name>
+        <IAPService>LANService.Ethernet</IAPService>
+        <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+</IAPTable>
+
+<ModemBearerTable>
+    <ModemBearer operation="template">
+        <Name>Default Modem</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</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>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>
+        <MessageCentreNumber>+00000000000</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>Null Modem 115200bps</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <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>
+        <MessageCentreNumber>+00000000000</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>US Robotics Sportster</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>57600</Rate>
+        <Handshaking>244</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT&amp;F1</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT&amp;d2</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>
+        <MessageCentreNumber>+00000000000</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>Dacom Surfer</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>57600</Rate>
+        <Handshaking>244</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>0</XonChar>
+        <XoffChar>0</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>AFTERDIALUNTILANSWER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>AT&amp;F</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT&amp;d2</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>
+        <MessageCentreNumber>+00000000000</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>GSM Mobile Phone via Infrared</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>IRCOMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>IRCOMM</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>196</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>17</XonChar>
+        <XoffChar>19</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>ATZ</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>
+        <MessageCentreNumber>+00000000000</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>GSM Mobile Phone via Serial</Name>
+        <Agent>CSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>19200</Rate>
+        <Handshaking>196</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>17</XonChar>
+        <XoffChar>19</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>ATZ</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>
+        <MessageCentreNumber>+00000000000</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>GPRS Ericsson R520m via IR</Name>
+        <Agent>PSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>IRCOMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>IRCOMM</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>115200</Rate>
+        <Handshaking>4</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>17</XonChar>
+        <XoffChar>19</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>ATZ</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>
+        <MessageCentreNumber>+00000000000</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>GPRS Ericsson R520m/T68i via Serial</Name>
+        <Agent>PSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>19200</Rate>
+        <Handshaking>4</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>17</XonChar>
+        <XoffChar>19</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>ATZ</ModemInitString>
+        <DataInitString>AT</DataInitString>
+        <FaxInitString>AT</FaxInitString>
+        <IspInitString>*99***1#</IspInitString>
+        <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>
+        <MessageCentreNumber>+00000000000</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>GPRS Motorola Mobile Phone via Serial</Name>
+        <Agent>PSD.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECUART</CSYName>
+        <DataBits>8</DataBits>
+        <StopBits>1</StopBits>
+        <Parity>NONE</Parity>
+        <Rate>57600</Rate>
+        <Handshaking>4</Handshaking>
+        <SpecialRate>0</SpecialRate>
+        <XonChar>17</XonChar>
+        <XoffChar>19</XoffChar>
+        <FaxClassPref>AUTO</FaxClassPref>
+        <SpeakerPref>NEVER</SpeakerPref>
+        <SpeakerVolPref>QUIET</SpeakerVolPref>
+        <ModemInitString>ATZ</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>
+        <MessageCentreNumber>+00000000000</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>WinTunnel Modem</Name>
+        <Agent>null.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::6</PortName>
+        <TSYName>MM</TSYName>
+        <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>
+        <MessageCentreNumber>+00000000000</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>180</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>60</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>mRouterWinsBearer</Name>
+        <Agent>mRouterAgent.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>WINS::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>WINSCSY</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>
+        <MessageCentreNumber>+00000000000</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>mRouterRs232Bearer</Name>
+        <Agent>mRouterAgent.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>COMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <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>
+        <MessageCentreNumber>+00000000000</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>mRouterIrBearer</Name>
+        <Agent>mRouterAgent.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>IRCOMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>IRCOMM</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>
+        <MessageCentreNumber>+00000000000</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>mRouterBtBearer</Name>
+        <Agent>mRouterAgent.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>BTCOMM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>BTCOMM</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>
+        <MessageCentreNumber>+00000000000</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>mRouterUsbBearer</Name>
+        <Agent>mRouterAgent.agt</Agent>
+        <IfName>PPP</IfName>
+        <PortName>ACM::0</PortName>
+        <TSYName>MM</TSYName>
+        <CSYName>ECACM</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>
+        <MessageCentreNumber>+00000000000</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>9999</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
+        <SIRSettings>0</SIRSettings>
+        <CommRole>0</CommRole>
+    </ModemBearer>
+</ModemBearerTable>
+
+<LANBearerTable>
+    <LANBearer operation="add">
+	<Name>EKA1 Target Ethernet</Name>
+	<Agent>nullagt.agt</Agent>
+	<IfName>ethint</IfName>
+	<LDDFilename>ethercard</LDDFilename>
+	<LDDName>EtherCard</LDDName>
+	<PDDFilename>EtherSmc</PDDFilename>
+	<PDDName>EtherCard.Smc</PDDName>
+	<PacketDriverName>EtherPkt.drv</PacketDriverName>
+	<LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+	<LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
+	<LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+    </LANBearer>
+
+    <LANBearer operation="add">
+	<Name>EKA2 Target Ethernet</Name>
+	<Agent>nullagt.agt</Agent>
+	<IfName>ethint</IfName>
+	<LDDFilename>enet</LDDFilename>
+	<LDDName>Ethernet</LDDName>
+	<PDDFilename>ethernet</PDDFilename>
+	<PDDName>Ethernet.Assabet</PDDName>
+	<PacketDriverName>EtherPkt.drv</PacketDriverName>
+	<LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+	<LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
+	<LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+    </LANBearer>
+
+    <LANBearer operation="add">
+	<Name>EKA1 Emulator Ethernet</Name>
+	<Agent>nullagt.agt</Agent>
+	<IfName>ethint</IfName>
+	<LDDFilename>ethercard</LDDFilename>
+	<LDDName>Ethercard</LDDName>
+	<PDDFilename>etherwins</PDDFilename>
+	<PDDName>Ethercard.wins</PDDName>
+	<PacketDriverName>EtherPkt.drv</PacketDriverName>
+	<LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+	<LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
+	<LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+    </LANBearer>
+
+    <LANBearer operation="add">
+	<Name>EKA2 Emulator Ethernet</Name>
+	<Agent>nullagt.agt</Agent>
+	<IfName>ethint</IfName>
+	<LDDFilename>enet</LDDFilename>
+	<LDDName>=Ethernet</LDDName>
+	<PDDFilename>ethernet</PDDFilename>
+	<PDDName>Ethernet.Wins</PDDName>
+	<PacketDriverName>EtherPkt.drv</PacketDriverName>
+	<LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+	<LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
+	<LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+    </LANBearer>
+</LANBearerTable>
+
+<LANServiceTable>
+    <LANService operation="add">
+        <Name>Ethernet</Name>
+        <IfNetworks>ip</IfNetworks>
+        <IpNetMask>255.255.255.0</IpNetMask>
+        <IpGateway>10.32.194.254</IpGateway>
+        <IpAddr>10.32.194.251</IpAddr>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <IpNameServer1>194.72.6.51</IpNameServer1>
+        <IpNameServer2>194.72.6.52</IpNameServer2>
+        <ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
+        <ConfigDaemonName>!DhcpServ</ConfigDaemonName>
+    </LANService>
+    <LANService operation="add">
+        <Name>Ethernet Static IP</Name>
+        <IfNetworks>ip</IfNetworks>
+        <IpNetMask>255.255.255.0</IpNetMask>
+        <IpGateway>192.168.20.2</IpGateway>
+        <IpAddr>192.168.20.13</IpAddr>
+        <IpAddrFromServer>FALSE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <IpNameServer1>194.72.6.51</IpNameServer1>
+        <IpNameServer2>194.72.6.52</IpNameServer2>
+        <ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
+        <ConfigDaemonName>!DhcpServ</ConfigDaemonName>
+    </LANService>
+    <LANService operation="add">
+        <Name>Ethernet Bad Daemon</Name>
+        <IfNetworks>ip</IfNetworks>
+        <IpNetMask>255.255.255.0</IpNetMask>
+        <IpGateway>10.32.194.254</IpGateway>
+        <IpAddr>10.32.194.251</IpAddr>
+        <IpAddrFromServer>FALSE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <IpNameServer1>194.72.6.51</IpNameServer1>
+        <IpNameServer2>194.72.6.52</IpNameServer2>
+        <ConfigDaemonManagerName>NonExistingServ</ConfigDaemonManagerName>
+        <ConfigDaemonName>NonExistingServ</ConfigDaemonName>
+    </LANService>
+    <LANService operation="add">
+        <Name>Ethernet No Daemon</Name>
+        <IfNetworks>ip</IfNetworks>
+        <IpNetMask>255.255.255.0</IpNetMask>
+        <IpGateway>10.32.194.254</IpGateway>
+        <IpAddr>10.32.194.251</IpAddr>
+        <IpAddrFromServer>FALSE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <IpNameServer1>194.72.6.51</IpNameServer1>
+        <IpNameServer2>194.72.6.52</IpNameServer2>
+    </LANService>
+</LANServiceTable>
+
+<DialInISPTable>
+    <DialInISP operation="template">
+        <Name>Default Dial In ISP</Name>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Description>Default Dial In ISP</Description>
+        <IpAddr>TRUE</IpAddr>
+        <IpNetMask>TRUE</IpNetMask>
+        <IpGateway>TRUE</IpGateway>
+        <IpNameServer1>TRUE</IpNameServer1>
+        <IpNameServer2>TRUE</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <UseEdge>FALSE</UseEdge>
+    </DialInISP>
+    <DialInISP operation="add">
+        <Name>Dial In ISP01</Name>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Description>Dial In ISP01</Description>
+        <IpAddr>TRUE</IpAddr>
+        <IpNetMask>TRUE</IpNetMask>
+        <IpGateway>TRUE</IpGateway>
+        <IpNameServer1>TRUE</IpNameServer1>
+        <IpNameServer2>TRUE</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <UseEdge>FALSE</UseEdge>
+    </DialInISP>
+</DialInISPTable>
+
+<DialOutISPTable>
+    <DialOutISP operation="template">
+        <Name>Default Dial Out ISP</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>TRUE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Description>Default Dial Out ISP</Description>
+        <DefaultTelNum>Default Dial Out ISP</DefaultTelNum>
+        <LoginName>TRUE</LoginName>
+        <LoginPass>TRUE</LoginPass>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfParams>FALSE</IfParams>
+        <IfNetworks>FALSE</IfNetworks>
+        <IfAuthName>TRUE</IfAuthName>
+        <IfAuthPass>TRUE</IfAuthPass>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpAddr>TRUE</IpAddr>
+        <IpNetMask>TRUE</IpNetMask>
+        <IpGateway>TRUE</IpGateway>
+        <IpNameServer1>TRUE</IpNameServer1>
+        <IpNameServer2>TRUE</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>NT RAS</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>TRUE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Description>Test</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>INTERNETONLY</DefaultTelNum>
+        <LoginScript>CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND &quot;CLIENT&quot;+&lt;0x0d&gt;\nWAIT 3\n{\n&quot;SERVER&quot; OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n</LoginScript>
+        <LoginName>FALSE</LoginName>
+        <LoginPass>FALSE</LoginPass>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfParams>FALSE</IfParams>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpAddr>TRUE</IpAddr>
+        <IpNetMask>TRUE</IpNetMask>
+        <IpGateway>TRUE</IpGateway>
+        <IpNameServer1>TRUE</IpNameServer1>
+        <IpNameServer2>TRUE</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>ISP01</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Description>PlaceHolder for ISP01</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>INTERNETONLY</DefaultTelNum>
+        <LoginName>FALSE</LoginName>
+        <LoginPass>FALSE</LoginPass>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfParams>FALSE</IfParams>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>xxx</IfAuthName>
+        <IfAuthPass>yyy</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpAddr>TRUE</IpAddr>
+        <IpNetMask>TRUE</IpNetMask>
+        <IpGateway>TRUE</IpGateway>
+        <IpNameServer1>TRUE</IpNameServer1>
+        <IpNameServer2>TRUE</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>ISP02</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Description>PlaceHolder for ISP02</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>INTERNETONLY</DefaultTelNum>
+        <LoginName>FALSE</LoginName>
+        <LoginPass>FALSE</LoginPass>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfParams>FALSE</IfParams>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>xxx</IfAuthName>
+        <IfAuthPass>yyy</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpAddr>TRUE</IpAddr>
+        <IpNetMask>TRUE</IpNetMask>
+        <IpGateway>TRUE</IpGateway>
+        <IpNameServer1>TRUE</IpNameServer1>
+        <IpNameServer2>TRUE</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>ISP03</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Description>PlaceHolder for ISP03</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>INTERNETONLY</DefaultTelNum>
+        <LoginName>FALSE</LoginName>
+        <LoginPass>FALSE</LoginPass>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfParams>FALSE</IfParams>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>xxx</IfAuthName>
+        <IfAuthPass>yyy</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpAddr>TRUE</IpAddr>
+        <IpNetMask>TRUE</IpNetMask>
+        <IpGateway>TRUE</IpGateway>
+        <IpNameServer1>TRUE</IpNameServer1>
+        <IpNameServer2>TRUE</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>ISP04</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Description>PlaceHolder for ISP04</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>INTERNETONLY</DefaultTelNum>
+        <LoginName>FALSE</LoginName>
+        <LoginPass>FALSE</LoginPass>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfParams>FALSE</IfParams>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>xxx</IfAuthName>
+        <IfAuthPass>yyy</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpAddr>TRUE</IpAddr>
+        <IpNetMask>TRUE</IpNetMask>
+        <IpGateway>TRUE</IpGateway>
+        <IpNameServer1>TRUE</IpNameServer1>
+        <IpNameServer2>TRUE</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>ISP05</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>TRUE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Description>PlaceHolder for ISP05</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>INTERNETONLY</DefaultTelNum>
+        <LoginName>FALSE</LoginName>
+        <LoginPass>FALSE</LoginPass>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfParams>FALSE</IfParams>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>xxx</IfAuthName>
+        <IfAuthPass>yyy</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpAddr>TRUE</IpAddr>
+        <IpNetMask>TRUE</IpNetMask>
+        <IpGateway>TRUE</IpGateway>
+        <IpNameServer1>TRUE</IpNameServer1>
+        <IpNameServer2>TRUE</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+    <DialOutISP operation="add">
+        <Name>mRouterDialOutIsp</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>FALSE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Description>mRouterDialOutIsp</Description>
+        <Type>INTERNETONLY</Type>
+        <DefaultTelNum>INTERNETONLY</DefaultTelNum>
+        <LoginName>FALSE</LoginName>
+        <LoginPass>FALSE</LoginPass>
+        <DisplayPCT>FALSE</DisplayPCT>
+        <IfParams>FALSE</IfParams>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>IfAuthPass=</IfAuthName>
+        <IfAuthPass>AuthRetries=0</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
+        <CallbackTimeout>0</CallbackTimeout>
+        <IpAddr>TRUE</IpAddr>
+        <IpNetMask>TRUE</IpNetMask>
+        <IpGateway>TRUE</IpGateway>
+        <IpNameServer1>TRUE</IpNameServer1>
+        <IpNameServer2>TRUE</IpNameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+        <BearerService>0</BearerService>
+        <BearerProtocol>UNSPECIFIED</BearerProtocol>
+        <RlpVersion>0</RlpVersion>
+        <IwfToMs>0</IwfToMs>
+        <MsToIwf>0</MsToIwf>
+        <AckTimer>0</AckTimer>
+        <RetransmissionAttempts>0</RetransmissionAttempts>
+        <ResequencePeriod>0</ResequencePeriod>
+        <V42Compression>0</V42Compression>
+        <V42Codewords>0</V42Codewords>
+        <V42MaxLength>0</V42MaxLength>
+        <Asymmetry>0</Asymmetry>
+        <UserInitUpgrade>FALSE</UserInitUpgrade>
+        <UseEdge>FALSE</UseEdge>
+    </DialOutISP>
+</DialOutISPTable>
+
+<AgentLookupTable>
+</AgentLookupTable>
+
+<CDMA2000PacketServiceTable>
+    <CDMA2000PacketService operation="add">
+        <Name>test name cdma2000</Name>
+        <IwfName>Test2000</IwfName>
+        <ServiceOption>HIGHSPEEDCDMA2000DATA</ServiceOption>
+        <PdpType>IPV4</PdpType>
+        <ReqFwdPriority>PRIORITY04</ReqFwdPriority>
+        <ReqRevPriority>PRIORITY04</ReqRevPriority>
+        <ReqFwdBitrate>32KBPS</ReqFwdBitrate>
+        <ReqRevBitrate>32KBPS</ReqRevBitrate>
+        <ReqFwdLoss>LOSS1</ReqFwdLoss>
+        <ReqRevLoss>LOSS1</ReqRevLoss>
+        <ReqFwdMaxdelay>40MS</ReqFwdMaxdelay>
+        <ReqRevMaxdelay>40MS</ReqRevMaxdelay>
+        <MinFwdBitrate>32KBPS</MinFwdBitrate>
+        <MinRevBitrate>32KBPS</MinRevBitrate>
+        <AccptFwdLoss>LOSS2</AccptFwdLoss>
+        <AccptRevLoss>LOSS2</AccptRevLoss>
+        <AccptFwdMaxdelay>120MS</AccptFwdMaxdelay>
+        <AccptRevMaxdelay>120MS</AccptRevMaxdelay>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <AuthRetries>1</AuthRetries>
+        <IpNetMask>0.255.255.255</IpNetMask>
+        <IpGateway>10.0.0.1</IpGateway>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <EnableLCPExtension>TRUE</EnableLCPExtension>
+        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
+        <ApType>2</ApType>
+        <QosWarningTimeout>1000000</QosWarningTimeout>
+        <RlpMode>TRANSPARENT</RlpMode>
+        <CDMAMobileIP>FALSE</CDMAMobileIP>
+        <CDMAMobileIPTimeout>10000000</CDMAMobileIPTimeout>
+    </CDMA2000PacketService>
+</CDMA2000PacketServiceTable>
+
+<DefaultCDMA2000Table>
+</DefaultCDMA2000Table>
+
+<ChargecardTable>
+    <Chargecard operation="add">
+        <Name>Dummy BT Chargecard</Name>
+        <AccountNumber>144,12345678</AccountNumber>
+        <Pin>0000</Pin>
+        <LocalRule>HG</LocalRule>
+        <NatRule>HFG</NatRule>
+        <IntlRule>HEFG</IntlRule>
+    </Chargecard>
+    <Chargecard operation="add">
+        <Name>Dummy Mercury Chargecard</Name>
+        <AccountNumber>0500800800,,12345678</AccountNumber>
+        <Pin>****</Pin>
+        <LocalRule>HG</LocalRule>
+        <NatRule>J,K,0FG</NatRule>
+        <IntlRule>HEFG</IntlRule>
+    </Chargecard>
+</ChargecardTable>
+
+<ConnectionPreferencesTable>
+    <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable1</Name>
+        <Ranking>0</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>DONOTPROMPT</DialogPref>
+        <BearerSet>LAN</BearerSet>
+        <IAPRef>IAP.Ethernet with Daemon Dynamic IP</IAPRef>
+    </ConnectionPreferences>
+</ConnectionPreferencesTable>
+
+<GlobalSettingsTable>
+    <GlobalSettings operation="add">
+        <Name>GlobalSettingsTable1</Name>
+        <WAPAccess>WAPAccessPoint.Default Dial In ISP</WAPAccess>
+        <RedialAttempts>3</RedialAttempts>
+        <SmsBearer>2</SmsBearer>
+        <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.Intranet</DefaultNetwork>
+        <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
+    </GlobalSettings>
+</GlobalSettingsTable>
+
+<IncomingGPRSTable>
+    <IncomingGPRS operation="add">
+        <Name>Incoming GPRS Settings PlaceHolder</Name>
+        <APN>Test</APN>
+        <PDPType>IPV4</PDPType>
+        <PDPAddress>0.0.0.0</PDPAddress>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <ReqPrecedence>1</ReqPrecedence>
+        <ReqDelay>1</ReqDelay>
+        <ReqReliability>1</ReqReliability>
+        <ReqPeakThroughput>1</ReqPeakThroughput>
+        <ReqMeanThroughput>1</ReqMeanThroughput>
+        <MinPrecedence>1</MinPrecedence>
+        <MinDelay>1</MinDelay>
+        <MinReliability>1</MinReliability>
+        <MinPeakThroughput>1</MinPeakThroughput>
+        <MinMeanThroughput>1</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <AuthRetries>1</AuthRetries>
+        <IpNameServer1>0.0.0.0</IpNameServer1>
+        <IpNameServer2>0.0.0.0</IpNameServer2>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+    </IncomingGPRS>
+</IncomingGPRSTable>
+
+<OutgoingGPRSTable>
+    <OutgoingGPRS operation="add">
+        <Name>GPRS01</Name>
+        <APN>gprs01APNPlaceHolder</APN>
+        <PDPType>IPV4</PDPType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <ReqPrecedence>0</ReqPrecedence>
+        <ReqDelay>0</ReqDelay>
+        <ReqReliability>0</ReqReliability>
+        <ReqPeakThroughput>0</ReqPeakThroughput>
+        <ReqMeanThroughput>0</ReqMeanThroughput>
+        <MinPrecedence>0</MinPrecedence>
+        <MinDelay>0</MinDelay>
+        <MinReliability>0</MinReliability>
+        <MinPeakThroughput>0</MinPeakThroughput>
+        <MinMeanThroughput>0</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <AuthRetries>1</AuthRetries>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>0</QosWarningTimeout>
+    </OutgoingGPRS>
+    <OutgoingGPRS operation="add">
+        <Name>GPRS02</Name>
+        <APN>gprs02APNPlaceHolder</APN>
+        <PDPType>IPV4</PDPType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <ReqPrecedence>0</ReqPrecedence>
+        <ReqDelay>0</ReqDelay>
+        <ReqReliability>0</ReqReliability>
+        <ReqPeakThroughput>0</ReqPeakThroughput>
+        <ReqMeanThroughput>0</ReqMeanThroughput>
+        <MinPrecedence>0</MinPrecedence>
+        <MinDelay>0</MinDelay>
+        <MinReliability>0</MinReliability>
+        <MinPeakThroughput>0</MinPeakThroughput>
+        <MinMeanThroughput>0</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <AuthRetries>1</AuthRetries>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>0</QosWarningTimeout>
+    </OutgoingGPRS>
+    <OutgoingGPRS operation="add">
+        <Name>GPRS03</Name>
+        <APN>gprs03APNPlaceHolder</APN>
+        <PDPType>IPV4</PDPType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <ReqPrecedence>0</ReqPrecedence>
+        <ReqDelay>0</ReqDelay>
+        <ReqReliability>0</ReqReliability>
+        <ReqPeakThroughput>0</ReqPeakThroughput>
+        <ReqMeanThroughput>0</ReqMeanThroughput>
+        <MinPrecedence>0</MinPrecedence>
+        <MinDelay>0</MinDelay>
+        <MinReliability>0</MinReliability>
+        <MinPeakThroughput>0</MinPeakThroughput>
+        <MinMeanThroughput>0</MinMeanThroughput>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <AuthRetries>1</AuthRetries>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <GprsUseEdge>FALSE</GprsUseEdge>
+        <GprsAccessPointType>0</GprsAccessPointType>
+        <QosWarningTimeout>0</QosWarningTimeout>
+    </OutgoingGPRS>
+</OutgoingGPRSTable>
+
+<DefaultGPRSTable>
+    <DefaultGPRS operation="add">
+        <Name>Dummy Default GPRS Settings</Name>
+        <APN>Access point name</APN>
+        <PDPType>IPV6</PDPType>
+        <PDPAddress>www.symbianfoundation.org</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>
+    <Proxy operation="add">
+        <Name>ProxyTable1</Name>
+        <ISPRef>DialOutISP.NT RAS</ISPRef>
+        <UseProxyServer>TRUE</UseProxyServer>
+        <ProtocolName>http</ProtocolName>
+        <ProxyServerName>www.symbianfoundation.org</ProxyServerName>
+        <PortNumber>80</PortNumber>
+        <Exceptions>www.symbianfoundation.org</Exceptions>
+    </Proxy>
+</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>
+        <AreaCode>44</AreaCode>
+        <DialOutCode>44</DialOutCode>
+        <DisableCallWaitingCode>44</DisableCallWaitingCode>
+    </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>
+        <DisableCallWaitingCode>9,</DisableCallWaitingCode>
+    </Location>
+    <Location operation="add">
+        <Name>Office Direct Dial</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>171</DialOutCode>
+        <DisableCallWaitingCode>171</DisableCallWaitingCode>
+    </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>
+        <AreaCode>44</AreaCode>
+        <DialOutCode>44</DialOutCode>
+        <DisableCallWaitingCode>44</DisableCallWaitingCode>
+    </Location>
+    <Location operation="add">
+        <Name>Home</Name>
+        <Mobile>FALSE</Mobile>
+        <UsePulseDial>TRUE</UsePulseDial>
+        <WaitForDialTone>TRUE</WaitForDialTone>
+        <PauseAfterDialout>0</PauseAfterDialout>
+        <IntlPrefixCode>00</IntlPrefixCode>
+        <NatPrefixCode>0</NatPrefixCode>
+        <NatCode>44</NatCode>
+        <AreaCode>181</AreaCode>
+        <DialOutCode>181</DialOutCode>
+        <DisableCallWaitingCode>181</DisableCallWaitingCode>
+    </Location>
+</LocationTable>
+
+<SecureSocketTable>
+    <SecureSocket operation="add">
+        <Name>SecureSocketTable1</Name>
+        <ProtocolName>ssl3.0</ProtocolName>
+        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
+    </SecureSocket>
+    <SecureSocket operation="add">
+        <Name>SecureSocketTable2</Name>
+        <ProtocolName>tls1.0</ProtocolName>
+        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
+    </SecureSocket>
+</SecureSocketTable>
+
+<BTDeviceTable>
+</BTDeviceTable>
+
+<BTPersistTable>
+</BTPersistTable>
+
+<BTSecurityTable>
+</BTSecurityTable>
+
+<BTDefaultTable>
+</BTDefaultTable>
+
+<WAPAccessPointTable>
+    <WAPAccessPoint operation="template">
+        <Name>Default Dial In ISP</Name>
+        <CurrentBearer>WAPIPBearer</CurrentBearer>
+    </WAPAccessPoint>
+    <WAPAccessPoint operation="add">
+        <Name>Dummy WAP Settings</Name>
+        <CurrentBearer>WAPIPBearer</CurrentBearer>
+        <StartPage>www.symbianfoundation.org</StartPage>
+    </WAPAccessPoint>
+</WAPAccessPointTable>
+
+<WAPIPBearerTable>
+    <WAPIPBearer operation="template">
+        <Name>WAPIPBearerTable1</Name>
+        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
+        <GatewayAddress>0</GatewayAddress>
+        <WSPOption>CONNECTIONLESS</WSPOption>
+        <Security>FALSE</Security>
+        <IAPRef>IAP.-1</IAPRef>
+        <ProxyPortNumber>0</ProxyPortNumber>
+        <ProxyLogin>0</ProxyLogin>
+        <ProxyPassword>0</ProxyPassword>
+    </WAPIPBearer>
+    <WAPIPBearer operation="add">
+        <Name>WAPIPBearerTable2</Name>
+        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
+        <GatewayAddress>www.symbianfoundation.org</GatewayAddress>
+        <WSPOption>CONNECTIONORIENTED</WSPOption>
+        <Security>FALSE</Security>
+        <IAPRef>IAP.CSD IAP PlaceHolder01</IAPRef>
+        <ProxyPortNumber>1</ProxyPortNumber>
+        <ProxyLogin>1</ProxyLogin>
+        <ProxyPassword>1</ProxyPassword>
+    </WAPIPBearer>
+</WAPIPBearerTable>
+
+<WAPSMSBearerTable>
+    <WAPSMSBearer operation="template">
+        <Name>WAPSMSBearerTable1</Name>
+        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
+        <GatewayAddress>0</GatewayAddress>
+        <WSPOption>CONNECTIONLESS</WSPOption>
+        <Security>FALSE</Security>
+        <ServiceCentreAddress>0</ServiceCentreAddress>
+    </WAPSMSBearer>
+    <WAPSMSBearer operation="add">
+        <Name>WAPSMSBearerTable2</Name>
+        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
+        <GatewayAddress>+0000000000000</GatewayAddress>
+        <WSPOption>CONNECTIONORIENTED</WSPOption>
+        <Security>FALSE</Security>
+        <ServiceCentreAddress>+000000000000</ServiceCentreAddress>
+    </WAPSMSBearer>
+</WAPSMSBearerTable>
+
+<VirtualBearerTable>
+</VirtualBearerTable>
+
+<VpnServiceTable>
+</VpnServiceTable>
+
+
+</CommDB:Config>
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/Tls_ntras_wlan.cfg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/Tls_ntras_wlan.cfg	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,2137 @@
+############################################################
+## AUTO-GENERATED CONFIGURATION FILE
+## CommDB Database Dump Utility
+## 1.1
+############################################################
+
+############################################################
+## Network
+## 
+[Network]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Intranet
+	FIELD_COUNT=1
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=mRouter
+	FIELD_COUNT=1
+END_ADD
+
+
+############################################################
+## ModemBearer
+## 
+[ModemBearer]
+ADD_TEMPLATE
+	Name=Default Modem
+	Agent=CSD.agt
+	IfName=PPP
+	PortName=COMM::0
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=0
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+00000000000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Null Modem 115200bps
+	Agent=CSD.agt
+	IfName=PPP
+	PortName=COMM::0
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=4
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+00000000000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=210
+	LastSessionClosedTimeout=60
+	LastSocketClosedTimeout=90
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=US Robotics Sportster
+	Agent=CSD.agt
+	IfName=PPP
+	PortName=COMM::0
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=57600
+	Handshaking=244
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=AFTERDIALUNTILANSWER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT&F1
+	DataInitString=AT
+	FaxInitString=AT&d2
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+00000000000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=Dacom Surfer
+	Agent=CSD.agt
+	IfName=PPP
+	PortName=COMM::0
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=57600
+	Handshaking=244
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=AFTERDIALUNTILANSWER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT&F
+	DataInitString=AT
+	FaxInitString=AT&d2
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+00000000000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=GSM Mobile Phone via Infrared
+	Agent=CSD.agt
+	IfName=PPP
+	PortName=IRCOMM::0
+	TSYName=MM
+	CSYName=IRCOMM
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=196
+	SpecialRate=0
+	XonChar=17
+	XoffChar=19
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=ATZ
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+00000000000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=GSM Mobile Phone via Serial
+	Agent=CSD.agt
+	IfName=PPP
+	PortName=COMM::0
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=19200
+	Handshaking=196
+	SpecialRate=0
+	XonChar=17
+	XoffChar=19
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=ATZ
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+00000000000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=GPRS Ericsson R520m via IR
+	Agent=PSD.agt
+	IfName=PPP
+	PortName=IRCOMM::0
+	TSYName=MM
+	CSYName=IRCOMM
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=4
+	SpecialRate=0
+	XonChar=17
+	XoffChar=19
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=ATZ
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+00000000000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=GPRS Ericsson R520m/T68i via Serial
+	Agent=PSD.agt
+	IfName=PPP
+	PortName=COMM::0
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=19200
+	Handshaking=4
+	SpecialRate=0
+	XonChar=17
+	XoffChar=19
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=ATZ
+	DataInitString=AT
+	FaxInitString=AT
+	IspInitString=*99***1#
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+00000000000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=70
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Name=GPRS Motorola Mobile Phone via Serial
+	Agent=PSD.agt
+	IfName=PPP
+	PortName=COMM::0
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=57600
+	Handshaking=4
+	SpecialRate=0
+	XonChar=17
+	XoffChar=19
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=ATZ
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+00000000000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Name=WinTunnel Modem
+	Agent=null.agt
+	IfName=PPP
+	PortName=COMM::6
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=4
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+00000000000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+	Name=mRouterWinsBearer
+	Agent=mRouterAgent.agt
+	IfName=PPP
+	PortName=WINS::0
+	TSYName=MM
+	CSYName=WINSCSY
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=4
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+00000000000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=9999
+	LastSessionClosedTimeout=180
+	LastSocketClosedTimeout=30
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 12
+	Name=mRouterRs232Bearer
+	Agent=mRouterAgent.agt
+	IfName=PPP
+	PortName=COMM::0
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=4
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+00000000000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=9999
+	LastSessionClosedTimeout=180
+	LastSocketClosedTimeout=30
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 13
+	Name=mRouterIrBearer
+	Agent=mRouterAgent.agt
+	IfName=PPP
+	PortName=IRCOMM::0
+	TSYName=MM
+	CSYName=IRCOMM
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=4
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+00000000000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=9999
+	LastSessionClosedTimeout=180
+	LastSocketClosedTimeout=30
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 14
+	Name=mRouterBtBearer
+	Agent=mRouterAgent.agt
+	IfName=PPP
+	PortName=BTCOMM::0
+	TSYName=MM
+	CSYName=BTCOMM
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=4
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+00000000000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=9999
+	LastSessionClosedTimeout=180
+	LastSocketClosedTimeout=30
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 15
+	Name=mRouterUsbBearer
+	Agent=mRouterAgent.agt
+	IfName=PPP
+	PortName=ACM::0
+	TSYName=MM
+	CSYName=ECACM
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=4
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+00000000000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=9999
+	LastSessionClosedTimeout=180
+	LastSocketClosedTimeout=30
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+
+############################################################
+## LANBearer
+## 
+[LANBearer]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Assabet on-board Ethernet
+	Agent=nullagt.agt
+	IfName=ethint
+	LDDName=not used
+	PDDName=not used
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=-1
+	LastSocketClosedTimeout=-1
+	FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## Location
+## 
+[Location]
+ADD_TEMPLATE
+	Name=Default Location
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=8
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Office
+	IntlPrefixCode=00
+	NatPrefixCode=0
+	NatCode=44
+	AreaCode=171
+	DialOutCode=9,
+	Mobile=FALSE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=Office Direct Dial
+	IntlPrefixCode=00
+	NatPrefixCode=0
+	NatCode=44
+	AreaCode=171
+	Mobile=FALSE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=Home
+	IntlPrefixCode=00
+	NatPrefixCode=0
+	NatCode=44
+	AreaCode=181
+	Mobile=FALSE
+	UsePulseDial=TRUE
+	WaitForDialTone=TRUE
+	PauseAfterDialout=0
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## Chargecard
+## 
+[Chargecard]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Dummy BT Chargecard
+	AccountNumber=144,12345678
+	Pin=0000
+	LocalRule=HG
+	NatRule=HFG
+	IntlRule=HEFG
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Dummy Mercury Chargecard
+	AccountNumber=0500800800,,12345678
+	Pin=****
+	LocalRule=HG
+	NatRule=J,K,0FG
+	IntlRule=HEFG
+	FIELD_COUNT=6
+END_ADD
+
+
+############################################################
+## GlobalSettings
+## 
+[GlobalSettings]
+ADD_SECTION
+	WAPAccessPoint=1
+	RedialAttempts=3
+	SmsBearer=1
+	SmsReceiveMode=2
+	GPRSAttachMode=1
+	AcceptIncomingGprs=1
+	GPRSClassCBearer=GSM
+	ConnectionAttempts=2
+	ModemForDataAndFax=2
+	ModemForPhoneServicesAndSMS=2
+	LocationForDataAndFax=2
+	LocationForPhoneServicesAndSMS=2
+	DefaultNetwork=1
+	BearerAvailabilityCheckTSY=mm
+	FIELD_COUNT=14
+END_ADD
+
+
+############################################################
+## DialOutISP
+## 
+[DialOutISP]
+ADD_TEMPLATE
+	Name=Default Dial Out ISP
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=TRUE
+	DisplayPCT=FALSE
+	IfPromptForAuth=TRUE
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=0
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=28
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=NT RAS
+	Description=Test
+	Type=INTERNETONLY
+	DialResolution=TRUE
+	UseLoginScript=TRUE
+	LoginScript=CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND "CLIENT"+<0x0d>\nWAIT 3\n{\n"SERVER" OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n
+	PromptForLogin=FALSE
+	DisplayPCT=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=RasUser
+	IfAuthPass=pass
+	AuthRetries=0
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=0
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=35
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=ISP01
+	Description=PlaceHolder for ISP01
+	Type=INTERNETONLY
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=FALSE
+	DisplayPCT=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=TRUE
+	IfAuthName=xxx
+	IfAuthPass=yyy
+	AuthRetries=0
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=0
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=34
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=ISP02
+	Description=PlaceHolder for ISP02
+	Type=INTERNETONLY
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=FALSE
+	DisplayPCT=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=TRUE
+	IfAuthName=xxx
+	IfAuthPass=yyy
+	AuthRetries=0
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=0
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=34
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=ISP03
+	Description=PlaceHolder for ISP03
+	Type=INTERNETONLY
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=FALSE
+	DisplayPCT=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=TRUE
+	IfAuthName=xxx
+	IfAuthPass=yyy
+	AuthRetries=0
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=0
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=34
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=ISP04
+	Description=PlaceHolder for ISP04
+	Type=INTERNETONLY
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=FALSE
+	DisplayPCT=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=TRUE
+	IfAuthName=xxx
+	IfAuthPass=yyy
+	AuthRetries=0
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=0
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=34
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=ISP05
+	Description=PlaceHolder for ISP05
+	Type=INTERNETONLY
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=FALSE
+	DisplayPCT=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=TRUE
+	IfAuthName=xxx
+	IfAuthPass=yyy
+	AuthRetries=0
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=0
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=34
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=mRouterDialOutIsp
+	Description=mRouterDialOutIsp
+	Type=INTERNETONLY
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=FALSE
+	DisplayPCT=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=IfAuthPass=
+	IfAuthPass=AuthRetries=0
+	AuthRetries=0
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=0
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=34
+END_ADD
+
+
+############################################################
+## DialInISP
+## 
+[DialInISP]
+ADD_TEMPLATE
+	Name=Default Dial In ISP
+	UseLoginScript=FALSE
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=9
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Dial In ISP01
+	UseLoginScript=FALSE
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## OutgoingGPRS
+## 
+[OutgoingGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=GPRS01
+	APN=gprs01APNPlaceHolder
+	PDPType=IPV4
+	ReqPrecedence=0
+	ReqDelay=0
+	ReqReliability=0
+	ReqPeakThroughput=0
+	ReqMeanThroughput=0
+	MinPrecedence=0
+	MinDelay=0
+	MinReliability=0
+	MinPeakThroughput=0
+	MinMeanThroughput=0
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	AuthRetries=1
+	IpDNSAddrFromServer=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	IpAddrFromServer=TRUE
+	GprsAccessPointType=0
+	QosWarningTimeout=0
+	FIELD_COUNT=26
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=GPRS02
+	APN=gprs02APNPlaceHolder
+	PDPType=IPV4
+	ReqPrecedence=0
+	ReqDelay=0
+	ReqReliability=0
+	ReqPeakThroughput=0
+	ReqMeanThroughput=0
+	MinPrecedence=0
+	MinDelay=0
+	MinReliability=0
+	MinPeakThroughput=0
+	MinMeanThroughput=0
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	AuthRetries=1
+	IpDNSAddrFromServer=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	IpAddrFromServer=TRUE
+	GprsAccessPointType=0
+	QosWarningTimeout=0
+	FIELD_COUNT=26
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=GPRS03
+	APN=gprs03APNPlaceHolder
+	PDPType=IPV4
+	ReqPrecedence=0
+	ReqDelay=0
+	ReqReliability=0
+	ReqPeakThroughput=0
+	ReqMeanThroughput=0
+	MinPrecedence=0
+	MinDelay=0
+	MinReliability=0
+	MinPeakThroughput=0
+	MinMeanThroughput=0
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	AuthRetries=1
+	IpDNSAddrFromServer=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	IpAddrFromServer=TRUE
+	GprsAccessPointType=0
+	QosWarningTimeout=0
+	FIELD_COUNT=26
+END_ADD
+
+
+############################################################
+## IncomingGPRS
+## 
+[IncomingGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Incoming GPRS Settings PlaceHolder
+	APN=Test
+	PDPType=IPV4
+	ReqPrecedence=1
+	ReqDelay=1
+	ReqReliability=1
+	ReqPeakThroughput=1
+	ReqMeanThroughput=1
+	MinPrecedence=1
+	MinDelay=1
+	MinReliability=1
+	MinPeakThroughput=1
+	MinMeanThroughput=1
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=RasUser
+	IfAuthPass=pass
+	AuthRetries=1
+	IpDNSAddrFromServer=TRUE
+	IpNameServer1=0.0.0.0
+	IpNameServer2=0.0.0.0
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	PDPAddress=0.0.0.0
+	IpAddrFromServer=TRUE
+	FIELD_COUNT=29
+END_ADD
+
+
+############################################################
+## DefaultGPRS
+## 
+[DefaultGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Dummy Default GPRS Settings
+	Usage=1
+	APN=Access point name
+	PDPType=IPV6
+	PDPAddress=www.symbianfoundation.org
+	Precedence=1
+	Delay=1
+	Reliability=1
+	PeakThroughput=1
+	MeanThroughput=1
+	MinPrecedence=1
+	MinDelay=1
+	MinReliability=1
+	MinPeakThroughput=1
+	MinMeanThroughput=1
+	DataCompression=TRUE
+	HeaderCompression=TRUE
+	GprsUseEdge=FALSE
+	AnonymousAccess=TRUE
+	FIELD_COUNT=19
+END_ADD
+
+
+############################################################
+## CDMA2000PacketServiceTable
+## 
+[CDMA2000PacketServiceTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=test name cdma2000
+	IwfName=Test2000
+	ServiceOption=HIGHSPEEDCDMA2000DATA
+	PdpType=IPV4
+	ReqFwdPriority=PRIORITY04
+	ReqRevPriority=PRIORITY04
+	ReqFwdBitrate=32KBPS
+	ReqRevBitrate=32KBPS
+	ReqFwdLoss=LOSS1
+	ReqRevLoss=LOSS1
+	ReqFwdMaxdelay=40MS
+	ReqRevMaxdelay=40MS
+	MinFwdBitrate=32KBPS
+	MinRevBitrate=32KBPS
+	AccptFwdLoss=LOSS2
+	AccptRevLoss=LOSS2
+	AccptFwdMaxdelay=120MS
+	AccptRevMaxdelay=120MS
+	DataCompression=FALSE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=RasUser
+	IfAuthPass=pass
+	AuthRetries=1
+	IpNetMask=0.255.255.255
+	IpGateway=10.0.0.1
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableLCPExtension=TRUE
+	DisablePlainTextAuth=TRUE
+	ApType=2
+	QosWarningTimeout=1000000
+	RlpMode=TRANSPARENT
+	CDMAMobileIP=FALSE
+	CDMAMobileIPTimeout=10000000
+	FIELD_COUNT=36
+END_ADD
+
+
+############################################################
+## DefaultCDMA2000SettingsTable
+## 
+[DefaultCDMA2000SettingsTable]
+
+############################################################
+## LANService
+## 
+[LANService]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Ethernet
+	IfNetworks=ip,ip6
+	IpNetMask=255.255.255.0
+	IpGateway=194.72.6.1
+	IpAddrFromServer=TRUE
+	IpAddr=192.168.0.100
+	IpDNSAddrFromServer=FALSE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.52
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## IAP
+## 
+[IAP]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=NT RAS with Null Modem
+	IAPService=2
+	IAPServiceType=DialOutISP
+	IAPBearer=2
+	IAPBearerType=ModemBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=CSD IAP PlaceHolder01
+	IAPService=3
+	IAPServiceType=DialOutISP
+	IAPBearer=2
+	IAPBearerType=ModemBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=CSD IAP PlaceHolder02
+	IAPService=4
+	IAPServiceType=DialOutISP
+	IAPBearer=2
+	IAPBearerType=ModemBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=GPRS IAP PlaceHolder01
+	IAPService=1
+	IAPServiceType=OutgoingGPRS
+	IAPBearer=8
+	IAPBearerType=ModemBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=4
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=GPRS IAP PlaceHolder02
+	IAPService=2
+	IAPServiceType=OutgoingGPRS
+	IAPBearer=8
+	IAPBearerType=ModemBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=4
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=mRouter Rs232
+	IAPService=8
+	IAPServiceType=DialOutISP
+	IAPBearer=12
+	IAPBearerType=ModemBearer
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=mRouter Ir
+	IAPService=8
+	IAPServiceType=DialOutISP
+	IAPBearer=13
+	IAPBearerType=ModemBearer
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=mRouter BT
+	IAPService=8
+	IAPServiceType=DialOutISP
+	IAPBearer=14
+	IAPBearerType=ModemBearer
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Name=mRouter USB
+	IAPService=8
+	IAPServiceType=DialOutISP
+	IAPBearer=15
+	IAPBearerType=ModemBearer
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Name=mRouter Wins
+	IAPService=8
+	IAPServiceType=DialOutISP
+	IAPBearer=11
+	IAPBearerType=ModemBearer
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## ConnectionPreferences
+## 
+[ConnectionPreferences]
+ADD_SECTION
+	Ranking=0
+	Direction=OUTGOING
+	DialogPref=DONOTPROMPT
+	BearerSet=CSD
+	IAP=1
+	FIELD_COUNT=5
+END_ADD
+
+############################################################
+## BTDeviceTable
+## 
+[BTDeviceTable]
+
+############################################################
+## BTSecurityTable
+## 
+[BTSecurityTable]
+
+############################################################
+## BTDefaultTable
+## 
+[BTDefaultTable]
+
+############################################################
+## Proxies
+## 
+[Proxies]
+ADD_SECTION
+# COMMDB_ID = 1
+	ISP=2
+	ProxyServiceType=DialOutISP
+	UseProxyServer=TRUE
+	ProxyServerName=www.symbianfoundation.org
+	ProtocolName=http
+	PortNumber=80
+	Exceptions=www.symbianfoundation.org
+	FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## AgentLookup
+## 
+[AgentLookup]
+
+############################################################
+## WAPAccessPoint
+## 
+[WAPAccessPoint]
+ADD_TEMPLATE
+	Name=Default Dial In ISP
+	CurrentBearer=WAPIPBearer
+	FIELD_COUNT=2
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Dummy WAP Settings
+	CurrentBearer=WAPIPBearer
+	StartPage=www.symbianfoundation.org
+	FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## WAPIPBearer
+## 
+[WAPIPBearer]
+ADD_TEMPLATE
+	AccessPointId=0
+	IAP=0
+	WSPOption=CONNECTIONLESS
+	Security=FALSE
+	ProxyPortNumber=0
+	FIELD_COUNT=5
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	AccessPointId=2
+	GatewayAddress=www.symbianfoundation.org
+	IAP=2
+	WSPOption=CONNECTIONORIENTED
+	Security=FALSE
+	ProxyPortNumber=1
+	FIELD_COUNT=6
+END_ADD
+
+
+############################################################
+## WAPSMSBearer
+## 
+[WAPSMSBearer]
+ADD_TEMPLATE
+	AccessPointId=0
+	WSPOption=CONNECTIONLESS
+	Security=FALSE
+	FIELD_COUNT=3
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	AccessPointId=2
+	GatewayAddress=+0000000000000
+	ServiceCentreAddress=+000000000000
+	WSPOption=CONNECTIONORIENTED
+	Security=FALSE
+	FIELD_COUNT=5
+END_ADD
+
+
+############################################################
+## SecureSocketTable
+## 
+[SecureSocketTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	ProtocolName=ssl3.0
+	ProtoLibrary=ssladaptor.dll
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	ProtocolName=tls1.0
+	ProtoLibrary=ssladaptor.dll
+	FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## BTPersistTable
+## 
+[BTPersistTable]
+
+############################################################
+## AccessTypeTable
+## 
+[AccessTypeTable]
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/connectionpref_wlan.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/connectionpref_wlan.xml	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ 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"
+ 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>
+	<ConnectionPreferencesTable>
+	  <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable1</Name>
+        <Ranking>1</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>DONOTPROMPT</DialogPref>
+        <BearerSet>WLAN</BearerSet>
+        <IAPRef>IAP.NT RAS with Null Modem</IAPRef>
+    </ConnectionPreferences>
+  </ConnectionPreferencesTable>
+</CommDB:Config>
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/connectionpref_wlan1.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/connectionpref_wlan1.xml	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ 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"
+ 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>
+	<ConnectionPreferencesTable>
+	  <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable1</Name>
+        <Ranking>1</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>DONOTPROMPT</DialogPref>
+        <BearerSet>WLAN</BearerSet>
+        <IAPRef>IAP.Ethernet with Daemon Dynamic IP</IAPRef>
+    </ConnectionPreferences>
+  </ConnectionPreferencesTable>
+</CommDB:Config>
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_3DES_EDE_CBC_SHA_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_3DES_EDE_CBC_SHA_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,25 @@
+// 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:
+
+//TLS_PSK_WITH_3DES_EDE_CBC_SHA.ini
+
+[Tlstest]
+NumCipherSuites=1
+CipherSuite1=008b
+ExpectedFinalCipherSuit=008b
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+UsePsk=ETrue
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_AES_128_CBC_SHA_NOCALLBACK_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_AES_128_CBC_SHA_NOCALLBACK_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,25 @@
+// 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:
+
+//TLS_PSK_WITH_AES_128_CBC_SHA_NOCALLBACK.ini
+
+[Tlstest]
+NumCipherSuites=1
+CipherSuite1=008c
+ExpectedFinalCipherSuit=0035
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+ExpectedSetCipherError=-5
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_AES_128_CBC_SHA_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_AES_128_CBC_SHA_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,25 @@
+// 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:
+
+//TLS_PSK_WITH_AES_128_CBC_SHA.ini
+
+[Tlstest]
+NumCipherSuites=1
+CipherSuite1=008c
+ExpectedFinalCipherSuit=008c
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+UsePsk=ETrue
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_AES_256_CBC_SHA_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_AES_256_CBC_SHA_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,25 @@
+// 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:
+
+//TLS_PSK_WITH_AES_256_CBC_SHA.ini
+
+[Tlstest]
+NumCipherSuites=1
+CipherSuite1=008d
+ExpectedFinalCipherSuit=008d
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+UsePsk=ETrue
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_RC4_128_SHA_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/TLS_PSK_WITH_RC4_128_SHA_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,25 @@
+// 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:
+
+//TLS_PSK_WITH_RC4_128_SHA.ini
+
+[Tlstest]
+NumCipherSuites=1
+CipherSuite1=008a
+ExpectedFinalCipherSuit=008a
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+UsePsk=ETrue
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/TLS_RSA_WITH_NULL_MD5_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/TLS_RSA_WITH_NULL_MD5_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,27 @@
+// 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:
+
+//TLS_RSA_WITH_NULL_MD5.ini
+
+[Tlstest]
+NumCipherSuites=1
+CipherSuite1=0001
+ExpectedFinalCipherSuit=0001
+UseNullCipher=True
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+UsePsk=ETrue
+UseNullCipher=True
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/TLS_RSA_WITH_NULL_SHA_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/TLS_RSA_WITH_NULL_SHA_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,26 @@
+// 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:
+
+//TLS_RSA_WITH_NULL_SHA.ini
+
+[Tlstest]
+NumCipherSuites=1
+CipherSuite1=0002
+ExpectedFinalCipherSuit=0002
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+UsePsk=True
+UseNullCipher=True
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/TLS_SNE_MULTIPLE_SERVER_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/TLS_SNE_MULTIPLE_SERVER_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,31 @@
+// 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:
+
+//TLS_SNE_MULTIPLE_SERVER.ini
+
+[Tlstest]
+NumCipherSuites=1
+CipherSuite1=002f
+ExpectedFinalCipherSuit=002f
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+NumServerNames=3
+ServerName1=www.something.org
+ServerName2=www.something.com
+ServerName3=www.something.es
+
+ExpectedHandshakeError=-7550
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/TLS_SNE_SINGLE_SERVER_NEG_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/TLS_SNE_SINGLE_SERVER_NEG_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,33 @@
+// 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:
+
+//TLS_SNE_SINGLE_SERVER_NEG.ini
+
+[Tlstest]
+NumCipherSuites=1
+CipherSuite1=0002
+ExpectedFinalCipherSuit=0002
+
+UseNullCipher=True
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+ExpectedHandshakeError=-7550
+
+NumServerNames=3
+ServerName1=www.badservername.org
+ServerName2=www.badservername.uk
+ServerName3=www.badservername.es
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/TLS_SNE_SINGLE_SERVER_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/TLS_SNE_SINGLE_SERVER_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,30 @@
+// 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:
+
+//TLS_SNE_SINGLE_SERVER.ini
+
+[Tlstest]
+NumCipherSuites=0
+ExpectedFinalCipherSuit=008D
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+UsePsk=True
+UseNullCipher=True
+
+ExpectedSetCipherError=-5
+
+NumServerNames=1
+ServerName1=www.something.org
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/Tls11_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls11_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,33 @@
+// 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:
+/////////////////////////////////////////////
+
+TLS11
+//DSA sign client authentication
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+DNSName=TLS11
+Protocol=tls1.0
+IPPort=646
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=17
+CipherSuites=17
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/Tls12_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls12_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,33 @@
+// 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:
+/////////////////////////////////////////////
+
+TLS12
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+DNSName=TLS12
+Protocol=tls1.0
+IPPort=644
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=18
+CipherSuites=18
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/Tls13_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls13_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,33 @@
+// 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"
+// 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:
+/////////////////////////////////////////////
+
+TLS13
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+DNSName=TLS13
+Protocol=tls1.0
+IPPort=644
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=19
+CipherSuites=19
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/Tls14_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls14_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,33 @@
+// 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:
+/////////////////////////////////////////////
+
+TLS14
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=tls1.0
+DNSName=TLS14
+IPPort=643
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=20
+CipherSuites=20
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/Tls16_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls16_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,33 @@
+// 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:
+/////////////////////////////////////////////
+
+TLS16
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=tls1.0
+DNSName=TLS16
+IPPort=643
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=22
+CipherSuites=22
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/Tls19_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls19_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,33 @@
+// 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:
+/////////////////////////////////////////////
+
+TLS19
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=ssl3.0
+DNSName=SSL19
+IPPort=543
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=3
+CipherSuites=03
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/Tls20_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls20_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,33 @@
+// 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:
+/////////////////////////////////////////////
+
+TLS20
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=ssl3.0
+DNSName=SSL20
+IPPort=543
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=4
+CipherSuites=04
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/Tls21_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls21_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,33 @@
+// 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:
+/////////////////////////////////////////////
+
+TLS21
+//SSL 3.0 client authentication
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=ssl3.0
+DNSName=SSL21
+IPPort=545
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=8
+CipherSuites=08
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/Tls22_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls22_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,33 @@
+// 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:
+/////////////////////////////////////////////
+
+TLS22
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=ssl3.0
+DNSName=SSL22
+IPPort=543
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=9
+CipherSuites=09
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/Tls23_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls23_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,33 @@
+// 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:
+/////////////////////////////////////////////
+
+TLS23
+//DSA sign client authentication
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=ssl3.0
+DNSName=SSL23
+IPPort=546
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=17
+CipherSuites=17
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/Tls24_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls24_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,33 @@
+// 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:
+/////////////////////////////////////////////
+
+TLS24
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=ssl3.0
+DNSName=SSL24
+IPPort=544
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=18
+CipherSuites=18
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/Tls25_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls25_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,33 @@
+// 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:
+/////////////////////////////////////////////
+
+TLS25
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=ssl3.0
+DNSName=SSL25
+IPPort=544
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=19
+CipherSuites=19
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/Tls26_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls26_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,33 @@
+// 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:
+/////////////////////////////////////////////
+
+TLS26
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=ssl3.0
+DNSName=SSL26
+IPPort=543
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=20
+CipherSuites=20
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/Tls28_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls28_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,33 @@
+// 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:
+/////////////////////////////////////////////
+
+TLS28
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=ssl3.0
+DNSName=SSL28
+IPPort=543
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=22
+CipherSuites=22
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/Tls36_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls36_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,33 @@
+// 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:
+/////////////////////////////////////////////
+
+TLS36
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=ssl3.0
+DNSName=SSL28
+IPPort=543
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=22
+CipherSuites=22
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=true
+EAPKeyDerivation=false
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/Tls38_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls38_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,33 @@
+// 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:
+/////////////////////////////////////////////
+
+TLS38
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=ssl3.0
+DNSName=SSL28
+IPPort=543
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=22
+CipherSuites=22
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=true
+EAPKeyDerivation=true
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/Tls3_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls3_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,63 @@
+// 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:
+//
+// T_AUTOSSL config file. This file should be placed in /epoc32/wins/c/system/data/t_autossl.ini
+//
+// The following fields must be present for each site that is to be tested.
+// The field names ARE case sensitive, and MUST be followed imediately by a `:`, and then a space 
+// before the field data.
+//
+// IPAddress		The address to connect to (can be www.site.com)
+// DNSName              The domain name which is checked against cert
+// IPPort		The port to connect to
+// TLSMaxVersion	Highest version of TLS to use, ie 2.0, 3.0, 3.1 (not currently used)
+// TLSMinVersion	Lowest version of TLS to use, ie 2.0, 3.0, 3.1 (not currently used)
+// Cipher		Cipher suite that server is expected to use (decimal), compared with 
+//			actual cipher for pass/fail. If this field is 0, no comparisons with 
+//			the actual cipher suite used will be made.
+// CipherSuites		Cipher suites that client will tell server it supports (decimal)
+//			Should be in decimal, with 2 characters, ie for suites 3,7,8,9-
+//			this field would be - 03070809
+//			By entering a single `0` for this field, the SSL default cipher suites
+//			will be passed.
+// Page			The page that should be retrieved from the web server.
+//			The leading `/` should be included, ie /webpage.html
+// SimpleGet		If a 1, the page request will be a simple "GET [Page]", if 0
+//			a HTTP get request will be constructed.
+//			For testing against OpenSSL servers, this field should be 0,
+//			while most "real" web servers prefer the simple request, the 
+//			LLoydsTSB login page being an example.
+//
+
+
+/////////////////////////////////////////////
+
+
+// test 3 -> TLS -> SSL fallback
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=tls1.0
+DNSName=TLS3
+IPPort=543
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=3
+CipherSuites=03
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/Tls4_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls4_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,38 @@
+// 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:
+/////////////////////////////////////////
+
+//test 4
+//client authentication
+//////////////////////////////////////////
+
+[Tlstest]
+IPAddress=192.168.40.50
+Protocol=tls1.0
+DNSName=TLS4
+IPPort=645
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=4
+CipherSuites=04
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
+
+
+// invalid cipher suite
+[FailSuiteSelection]
+CipherSuites=42
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/Tls5_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls5_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,33 @@
+// 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:
+///////////////////////////////////////////
+
+//TLS5
+
+[Tlstest]
+///////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=tls1.0
+DNSName=TLS5
+IPPort=643
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=5
+CipherSuites=05
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/Tls5b_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls5b_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,33 @@
+// 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:
+/////////////////////////////////////////////
+
+TLS5B
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=ssl3.0
+DNSName=SSL5
+IPPort=543
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=5
+CipherSuites=05
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/Tls8_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls8_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,32 @@
+// 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:
+///////////////////////////////////////////
+
+//TLS8
+[Tlstest]
+///////////////////////////////////////////
+
+IPAddress=192.168.40.50
+DNSName=TLS8
+Protocol=tls1.0
+IPPort=643
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=8
+CipherSuites=08
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/Tls9_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls9_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,33 @@
+// 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:
+///////////////////////////////////////////
+
+//TLS9
+
+[Tlstest]
+///////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=tls1.0
+DNSName=TLS9
+IPPort=643
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=9
+CipherSuites=09
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/TlsA_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/TlsA_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,33 @@
+// 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:
+/////////////////////////////////////////////
+
+TLSA
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=tls1.0
+DNSName=SSLA
+IPPort=643
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=10
+CipherSuites=10
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/Tlssa_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tlssa_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,33 @@
+// 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:
+/////////////////////////////////////////////
+
+SSLA
+
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+DNSName=SSLA
+Protocol=ssl3.0
+IPPort=543
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=10
+CipherSuites=10
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/cccccc00_ssl_30.cre
Binary file networksecurity/tls/ts_tls/scripts/cccccc00_ssl_30.cre has changed
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/cccccc00_tls_psk.cre
Binary file networksecurity/tls/ts_tls/scripts/cccccc00_tls_psk.cre has changed
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/connectionpref1_wlan.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/connectionpref1_wlan.xml	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ All rights reserved.
+ This component and the accompanying materials are made available
+ under the terms of "Eclipse Public License v1.0"
+ which accompanies this distribution, and is available
+ at the URL "http://www.eclipse.org/legal/epl-v10.html".
+
+ Initial Contributors:
+ Nokia Corporation - initial contribution.
+
+ Contributors:
+
+ Description:
+ CommDB Settings File
+ All Rights Reserved
+
+-->
+
+<CommDB:Config>
+	<ConnectionPreferencesTable>
+	  <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable1</Name>
+        <Ranking>1</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>DONOTPROMPT</DialogPref>
+        <BearerSet>WLAN</BearerSet>
+        <IAPRef>IAP.WlanWithDaemonDynamicIP</IAPRef>
+    </ConnectionPreferences>
+  </ConnectionPreferencesTable>
+</CommDB:Config>
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/connectionpref_wlan.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/connectionpref_wlan.xml	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ All rights reserved.
+ This component and the accompanying materials are made available
+ under the terms of "Eclipse Public License v1.0"
+ which accompanies this distribution, and is available
+ at the URL "http://www.eclipse.org/legal/epl-v10.html".
+
+ Initial Contributors:
+ Nokia Corporation - initial contribution.
+
+ Contributors:
+
+ Description:
+ CommDB Settings File
+ All Rights Reserved
+
+-->
+
+<CommDB:Config>
+	<ConnectionPreferencesTable>
+	  <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable1</Name>
+        <Ranking>1</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>DONOTPROMPT</DialogPref>
+        <BearerSet>WLAN</BearerSet>
+        <IAPRef>IAP.WLANwithNullModem</IAPRef>
+    </ConnectionPreferences>
+  </ConnectionPreferencesTable>
+</CommDB:Config>
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/ssl_30_wlan.xml
Binary file networksecurity/tls/ts_tls/scripts/ssl_30_wlan.xml has changed
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/ssl_ntras_30_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/ssl_ntras_30_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,138 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT TLS tests
+PRINT using a serial NT Ras connection 
+
+
+LOAD_SUITE TS_tls.dll
+
+PAUSE_AT_END
+// set up commdb for a serial NT ras connection 
+// which will work with WinTunnel
+RUN_SCRIPT z:\TestData\scripts\esock_test_unloadesockForced.script
+//ced z:\testdata\configs\Tls_ntras.cfg ced.log
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_ssl_30.cre c:\private\10202be9\persists\cccccc00.cre
+RUN_SCRIPT z:\TestData\scripts\esock_test_loadesock.script
+
+//run_utils copy z:\testdata\configs\ssl\*.* c:\system\data\
+
+print Note the following ciphers suites are supported by TLS 
+print 4, 5, 10, 22, 19, 18, 9, 17, 20, 8, 3 
+print The following are weak crypto only 9,17,20
+print The following are AES cipher suites: 0x2F (47), 0x35 (53)
+print These tests require strong crypto
+
+// so some of the following list of test have been disabled tests 1,2,15,17,18,27
+// tests 9,11,14 should work with weak crypto 
+// also tests 480 and 580 are disabled as there is no server on the test network
+
+print These tests use the SSL servers on ports 543,544,643 an 644
+
+RUN_UTILS CopyFile  z:\TestData\Configs\tls_t_secdlg_in.dat c:\t_secdlg_in.dat
+RUN_UTILS MakeReadWrite c:\t_secdlg_in.dat
+
+// dialog mode test
+RUN_TEST_STEP 100000, TS_TLS, t_tls_DialogMode
+TEST_COMPLETE TLS_test_19
+
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls19.ini
+TEST_COMPLETE TLS_test_19
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls20.ini
+TEST_COMPLETE TLS_test_20
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls5b.ini
+TEST_COMPLETE TLS_test_5b
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls21.ini
+TEST_COMPLETE TLS_test_21
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls22.ini
+TEST_COMPLETE TLS_test_22
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tlssa.ini
+TEST_COMPLETE TLS_test_SSLA
+
+# weak crypto 
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls23.ini
+TEST_COMPLETE TLS_test_23
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls24.ini
+TEST_COMPLETE TLS_test_24
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls25.ini
+TEST_COMPLETE TLS_test_25
+
+# weak crypto 
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls26.ini
+TEST_COMPLETE TLS_test_26
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls28.ini
+TEST_COMPLETE TLS_test_28
+
+// Following Test fails as CSecureSocketLibraryLoader::OpenWithIdL ignores the Commsdat field
+//RUN_UTILS Delete c:\t_secdlg_out.dat
+//RUN_TEST_STEP 100000, TS_TLS, tls_TestSection2_1
+//TEST_COMPLETE tls_TestSection2_1
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, tls_TestSection3_1
+TEST_COMPLETE tls_TestSection3_1
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, OpenConnection, z:\testdata\configs\Tls28.ini
+RUN_TEST_STEP 100000, TS_TLS, oldgetOpts, z:\testdata\configs\Tls28.ini
+RUN_TEST_STEP 100000, TS_TLS, CloseConnection, z:\testdata\configs\Tls28.ini
+TEST_COMPLETE oldgetOpts
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, renegotiate, z:\testdata\configs\Tls28.ini
+TEST_COMPLETE RenegotiateTest
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, CancelRecv, z:\testdata\configs\Tls28.ini
+TEST_COMPLETE CancelRecvTest
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls36.ini
+TEST_COMPLETE TLS_test_36
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls38.ini
+TEST_COMPLETE TLS_test_38
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_SCRIPT Z:\TestData\Scripts\esock_test_stopallinterfaces.script
+RUN_SCRIPT Z:\TestData\scripts\esock_test_unloadesockForced.script
+
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/ssl_ntras_31_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/ssl_ntras_31_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,128 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT TLS tests
+PRINT using a serial NT Ras connection 
+
+
+LOAD_SUITE TS_tls.dll
+
+PAUSE_AT_END
+// set up commdb for a serial NT ras connection 
+// which will work with WinTunnel
+RUN_SCRIPT z:\TestData\scripts\esock_test_unloadesockForced.script
+//ced z:\testdata\configs\Tls_ntras.cfg ced.log
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_ssl_30.cre c:\private\10202be9\persists\cccccc00.cre
+RUN_SCRIPT z:\TestData\scripts\esock_test_loadesock.script
+
+//run_utils copy z:\testdata\configs\ssl\*.* c:\system\data\
+
+print Note the following ciphers suites are supported by TLS 
+print 4, 5, 10, 22, 19, 18, 9, 17, 20, 8, 3 , 2 , 1
+print The following are NULL ciphers 1,2
+print The following are weak crypto only 9,17,20
+print The following are AES cipher suites: 0x2F (47), 0x35 (53)
+print These tests require strong crypto
+
+// so some of the following list of test have been disabled tests 1,2,15,17,18,27
+// tests 9,11,14 should work with weak crypto 
+// also tests 480 and 580 are disabled as there is no server on the test network
+
+print These tests use the SSL servers on ports 543,544,643 an 644
+
+RUN_UTILS CopyFile  z:\TestData\Configs\tls_t_secdlg_in.dat c:\t_secdlg_in.dat
+RUN_UTILS MakeReadWrite c:\t_secdlg_in.dat
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls3.ini
+TEST_COMPLETE TLS_test_3
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls4.ini
+TEST_COMPLETE TLS_test_4
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls5.ini
+TEST_COMPLETE TLS_test_5
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls8.ini
+TEST_COMPLETE TLS_test_8
+
+# weak crypto 
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls9.ini
+TEST_COMPLETE TLS_test_9
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\TlsA.ini
+TEST_COMPLETE TLS_test_A
+
+# weak crypto 
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls11.ini
+TEST_COMPLETE TLS_test_11
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls12.ini
+TEST_COMPLETE TLS_test_12
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls13.ini
+TEST_COMPLETE TLS_test_13
+
+# weak crypto 
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls14.ini
+TEST_COMPLETE TLS_test_14
+
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls16.ini
+TEST_COMPLETE TLS_test_16
+
+#AES
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls2f.ini
+TEST_COMPLETE TLS_test_2f
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls35.ini
+TEST_COMPLETE TLS_test_35
+
+// tls test code for DEF022091
+// check correct error code when cipher suite id not available
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, FailSuiteSelection, z:\testdata\configs\tls4.ini
+TEST_COMPLETE FailSuiteSelection 
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls37.ini
+TEST_COMPLETE TLS_test_37
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls37.ini
+TEST_COMPLETE TLS_test_37
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_SCRIPT Z:\TestData\Scripts\esock_test_stopallinterfaces.script
+RUN_SCRIPT Z:\TestData\scripts\esock_test_unloadesockForced.script
+
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/tls1_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/tls1_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,64 @@
+// 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:
+//
+// T_AUTOSSL config file. This file should be placed in /epoc32/wins/c/system/data/t_autossl.ini
+//
+// The following fields must be present for each site that is to be tested.
+// The field names ARE case sensitive, and MUST be followed imediately by a `:`, and then a space 
+// before the field data.
+//
+// IPAddress		The address to connect to (can be www.site.com)
+// DNSName              The domain name which is checked against cert
+// IPPort		The port to connect to
+// TLSMaxVersion	Highest version of TLS to use, ie 2.0, 3.0, 3.1 (not currently used)
+// TLSMinVersion	Lowest version of TLS to use, ie 2.0, 3.0, 3.1 (not currently used)
+// Cipher		Cipher suite that server is expected to use (decimal), compared with 
+//			actual cipher for pass/fail. If this field is 0, no comparisons with 
+//			the actual cipher suite used will be made.
+// CipherSuites		Cipher suites that client will tell server it supports (decimal)
+//			Should be in decimal, with 2 characters, ie for suites 3,7,8,9-
+//			this field would be - 03070809
+//			By entering a single `0` for this field, the SSL default cipher suites
+//			will be passed.
+// Page			The page that should be retrieved from the web server.
+//			The leading `/` should be included, ie /webpage.html
+// SimpleGet		If a 1, the page request will be a simple "GET [Page]", if 0
+//			a HTTP get request will be constructed.
+//			For testing against OpenSSL servers, this field should be 0,
+//			while most "real" web servers prefer the simple request, the 
+//			LLoydsTSB login page being an example.
+//
+
+
+/////////////////////////////////////////////
+
+
+// test NULL ciphers
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=tls1.0
+P_rotocol=ssl3.0
+DNSName=TLS1
+IPPort=543
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=1
+CipherSuites=01
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
\ No newline at end of file
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/tls2_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/tls2_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,64 @@
+// 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:
+//
+// T_AUTOSSL config file. This file should be placed in /epoc32/wins/c/system/data/t_autossl.ini
+//
+// The following fields must be present for each site that is to be tested.
+// The field names ARE case sensitive, and MUST be followed imediately by a `:`, and then a space 
+// before the field data.
+//
+// IPAddress		The address to connect to (can be www.site.com)
+// DNSName              The domain name which is checked against cert
+// IPPort		The port to connect to
+// TLSMaxVersion	Highest version of TLS to use, ie 2.0, 3.0, 3.1 (not currently used)
+// TLSMinVersion	Lowest version of TLS to use, ie 2.0, 3.0, 3.1 (not currently used)
+// Cipher		Cipher suite that server is expected to use (decimal), compared with 
+//			actual cipher for pass/fail. If this field is 0, no comparisons with 
+//			the actual cipher suite used will be made.
+// CipherSuites		Cipher suites that client will tell server it supports (decimal)
+//			Should be in decimal, with 2 characters, ie for suites 3,7,8,9-
+//			this field would be - 03070809
+//			By entering a single `0` for this field, the SSL default cipher suites
+//			will be passed.
+// Page			The page that should be retrieved from the web server.
+//			The leading `/` should be included, ie /webpage.html
+// SimpleGet		If a 1, the page request will be a simple "GET [Page]", if 0
+//			a HTTP get request will be constructed.
+//			For testing against OpenSSL servers, this field should be 0,
+//			while most "real" web servers prefer the simple request, the 
+//			LLoydsTSB login page being an example.
+//
+
+
+/////////////////////////////////////////////
+
+
+// test NULL ciphers
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=tls1.0
+P_rotocol=ssl3.0
+DNSName=TLS1
+IPPort=543
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=2
+CipherSuites=02
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
\ No newline at end of file
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/tls2f_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/tls2f_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,64 @@
+// 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:
+//
+// T_AUTOSSL config file. This file should be placed in /epoc32/wins/c/system/data/t_autossl.ini
+//
+// The following fields must be present for each site that is to be tested.
+// The field names ARE case sensitive, and MUST be followed imediately by a `:`, and then a space 
+// before the field data.
+//
+// IPAddress		The address to connect to (can be www.site.com)
+// DNSName              The domain name which is checked against cert
+// IPPort		The port to connect to
+// TLSMaxVersion	Highest version of TLS to use, ie 2.0, 3.0, 3.1 (not currently used)
+// TLSMinVersion	Lowest version of TLS to use, ie 2.0, 3.0, 3.1 (not currently used)
+// Cipher		Cipher suite that server is expected to use (decimal), compared with 
+//			actual cipher for pass/fail. If this field is 0, no comparisons with 
+//			the actual cipher suite used will be made.
+// CipherSuites		Cipher suites that client will tell server it supports (decimal)
+//			Should be in decimal, with 2 characters, ie for suites 3,7,8,9-
+//			this field would be - 03070809
+//			By entering a single `0` for this field, the SSL default cipher suites
+//			will be passed.
+// Page			The page that should be retrieved from the web server.
+//			The leading `/` should be included, ie /webpage.html
+// SimpleGet		If a 1, the page request will be a simple "GET [Page]", if 0
+//			a HTTP get request will be constructed.
+//			For testing against OpenSSL servers, this field should be 0,
+//			while most "real" web servers prefer the simple request, the 
+//			LLoydsTSB login page being an example.
+//
+
+
+/////////////////////////////////////////////
+
+
+// test AES
+[Tlstest]
+/////////////////////////////////////////////
+
+IPAddress=192.168.40.50
+Protocol=tls1.0
+P_rotocol=ssl3.0
+DNSName=TLS2f
+IPPort=643
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=47
+CipherSuites=47
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/tls35_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/tls35_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,38 @@
+// 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:
+/////////////////////////////////////////
+
+test AES
+
+//////////////////////////////////////////
+
+[Tlstest]
+IPAddress=192.168.40.50
+Protocol=tls1.0
+DNSName=TLS35
+IPPort=643
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=53
+CipherSuites=53
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
+
+
+// invalid cipher suite
+[FailSuiteSelection]
+CipherSuites=42
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/tls37_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/tls37_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,33 @@
+// 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:
+/////////////////////////////////////////
+
+test37
+
+//////////////////////////////////////////
+
+[Tlstest]
+IPAddress=192.168.40.50
+Protocol=tls1.0
+DNSName=TLS35
+IPPort=643
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=22
+CipherSuites=22
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=true
+EAPKeyDerivation=false
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/tls_oom_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/tls_oom_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,45 @@
+// 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:
+/////////////////////////////////////////////
+
+#TLS Out of memory test
+
+/////////////////////////////////////////////
+[Tlstest]
+
+# READ ME!
+#
+### This is the range of values for __UHEAP_FAILNEXT that are tested.
+### TLS currently requires 846 heap allocations to make a connection.
+### If the test has not passed by MaxFailureThreshold then it fails.
+### This is to prevent the test running forever if the network or server is down.
+#
+# The above comment is outdated - in 8.0 it passes on the first iteration with 840.
+# The Comms Framework submission increases the threshold dramatically (as can be seen
+# below); this is at least substantially due to the new RFileLogger interface since
+# every single static logging call now makes an allocation (and the TLS client-side
+# has its own logging subsystem, hence a ten row hexdump becomes ten separate RFileLogger
+# calls).
+# Of course to be a strong OOM test the loop should start at one anyway, otherwise there
+# are many states we're not probing. It is suspected that the reason this is not done is two-
+# fold: firstly it would take a long time and so mightn't be suitable for routine run and
+# secondly and importantly the OpenSSL server currently used on the test network does not
+# handle spontaneous socket disconnection and so would need restarting after many of these
+# failures. Once a more robust test server is in place this part of the testing needs to be
+# revisited.
+
+FailureThreshold=1
+MaxThreshold=3200
+IPAddress=192.168.40.50
+IPPort=543
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/tls_oom_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/tls_oom_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,51 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT TLS Out of memory tests
+PRINT 
+
+LOAD_SUITE TS_tls.dll
+
+// set up commdb for a gsm dialup connection 
+// to demon using a serial connection
+RUN_SCRIPT z:\TestData\scripts\esock_test_unloadesockForced.script
+//ced z:\testdata\configs\Tls_ntras.cfg ced.log
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_ssl_30.cre c:\private\10202be9\persists\cccccc00.cre
+RUN_SCRIPT z:\TestData\scripts\esock_test_loadesock.script
+
+//run_utils copy z:\testdata\configs\ssl\*.* c:\system\data\
+
+RUN_UTILS CopyFile  z:\TestData\Configs\tls_t_secdlg_in.dat c:\t_secdlg_in.dat
+RUN_UTILS MakeReadWrite c:\t_secdlg_in.dat
+RUN_UTILS Delete c:\t_secdlg_out.dat
+
+# out of memory test 
+RUN_TEST_STEP 100000, TS_TLS, tls_oom, z:\testdata\configs\Tls_Oom.ini
+
+TEST_COMPLETE TLS_oomtest
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_SCRIPT Z:\TestData\Scripts\esock_test_stopallinterfaces.script
+RUN_SCRIPT Z:\TestData\scripts\esock_test_unloadesockForced.script
+
+
+
+
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/tls_psk_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/tls_psk_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,189 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT TLS PSK tests
+
+LOAD_SUITE TS_tls.dll
+
+PAUSE_AT_END
+RUN_SCRIPT z:\TestData\scripts\esock_test_unloadesockForced.script
+//ced z:\testdata\configs\Tls_ethernet.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_tls_psk.cre c:\private\10202be9\persists\cccccc00.cre
+RUN_SCRIPT z:\TestData\scripts\esock_test_loadesock.script
+RUN_UTILS CopyFile  z:\TestData\Configs\tls_t_secdlg_in.dat c:\t_secdlg_in.dat
+RUN_UTILS MakeReadWrite c:\t_secdlg_in.dat
+RUN_TEST_STEP 100000, TS_TLS, t_tls_DialogMode
+TEST_COMPLETE TLS_test_1
+
+RUN_UTILS MkDir c:\Private\101f72a6\
+RUN_UTILS Delete c:\Private\101f72a6\cacerts.dat
+RUN_UTILS Delete c:\Private\101f72a6\certclients.dat
+RUN_UTILS Delete c:\Private\101f72a6\keys.dat
+RUN_UTILS CopyFile z:\testdata\configs\cacerts_psk.dat c:\private\101f72a6\cacerts.dat
+RUN_UTILS CopyFile z:\testdata\configs\certclients_psk.dat c:\private\101f72a6\certclients.dat 
+RUN_UTILS CopyFile z:\testdata\configs\keys_psk.dat c:\private\101f72a6\keys.dat
+
+
+
+
+
+// TLS handshake with TLS_PSK_WITH_AES_128_CBC_SHA cipher suit
+// Preconditions:
+// There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.  
+// Test Actions:
+// Repeat sequence below including and not including identity hint in server hello message.
+// Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server. 
+// Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+// Instruct test client to connect to TLS test server.
+// Set test environment in a way that TLS_PSK_WITH_AES_128_CBC_SHA is set in “ServerHello” message.
+// Check that instance CSecureSocket was able to execute complete success handshake with test server 
+// using the cipher suit specified. 
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+print Tests for TLS_PSK_WITH_AES_128_CBC_SHA
+RUN_TEST_STEP 100000 TS_TLS, TLSPSK, z:\testdata\configs\TLS_PSK_WITH_AES_128_CBC_SHA.ini
+TEST_COMPLETE TLS_PSK_test_2
+RUN_UTILS Delete c:\t_secdlg_out.dat
+print Tests for TLS_PSK_WITH_AES_128_CBC_SHA NoCallBack
+RUN_TEST_STEP 100000 TS_TLS, TLSPSK, z:\testdata\configs\TLS_PSK_WITH_AES_128_CBC_SHA_NOCALLBACK.ini
+TEST_COMPLETE TLS_PSK_test_3
+
+
+
+
+
+
+// TLS handshake with TLS_PSK_WITH_3DES_EDE_CBC_SHA cipher suit
+// Preconditions:
+// There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.  
+// Test Actions:
+// Repeat sequence below including and not including identity hint in server hello message.
+// Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server. 
+// Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+// Instruct test client to connect to TLS test server.
+// Set test environment in a way that TLS_PSK_WITH_3DES_EDE_CBC_SHA is set in “ServerHello” message.
+// Check that instance CSecureSocket was able to execute complete success handshake with test server 
+// using the cipher suit specified. 
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+print Tests for TLS_PSK_WITH_3DES_EDE_CBC_SHA
+RUN_TEST_STEP 100000 TS_TLS, TLSPSK, z:\testdata\configs\TLS_PSK_WITH_3DES_EDE_CBC_SHA.ini
+TEST_COMPLETE TLS_PSK_test_4
+
+
+
+
+
+// TLS handshake with TLS_PSK_WITH_RC4_128_SHA cipher suit
+// Preconditions:
+// There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.  
+// Test Actions:
+// Repeat sequence below including and not including identity hint in server hello message.
+// Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server. 
+// Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+// Instruct test client to connect to TLS test server.
+// Set test environment in a way that TLS_PSK_WITH_RC4_128_SHA is set in “ServerHello” message.
+// Check that instance CSecureSocket was able to execute complete success handshake with test server 
+// using the cipher suit specified. 
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+print Tests for TLS_PSK_WITH_RC4_128_SHA
+RUN_TEST_STEP 100000 TS_TLS, TLSPSK, z:\testdata\configs\TLS_PSK_WITH_RC4_128_SHA.ini
+TEST_COMPLETE TLS_PSK_test_5
+
+
+
+
+
+// TLS handshake with TLS_PSK_WITH_AES_256_CBC_SHA cipher suit
+// Preconditions:
+// There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.  
+// Test Actions:
+// Repeat sequence below including and not including identity hint in server hello message.
+// Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server. 
+// Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+// Instruct test client to connect to TLS test server.
+// Set test environment in a way that TLS_PSK_WITH_AES_256_CBC_SHA is set in “ServerHello” message.
+// Check that instance CSecureSocket was able to execute complete success handshake with test server 
+// using the cipher suit specified. 
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+print Tests for TLS_PSK_WITH_AES_256_CBC_SHA
+RUN_TEST_STEP 100000 TS_TLS, TLSPSK, z:\testdata\configs\TLS_PSK_WITH_AES_256_CBC_SHA.ini
+TEST_COMPLETE TLS_PSK_test_6
+
+
+
+
+
+// TLS handshake with Null cipher suites
+// Preconditions:
+// There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.  
+// Test Actions:
+// Repeat sequence below including and not including identity hint in server hello message.
+// Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server. 
+// Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+// Instruct test client to connect to TLS test server.
+// Set test environment in a way that TLS_NULL_CIPHER_NOCLIENT_AUT_RSA_MD5 is set in “ServerHello” message.
+// Check that instance CSecureSocket was able to execute complete success handshake with test server 
+// using the cipher suit specified.
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+print Tests for TLS_RSA_WITH_NULL_MD5
+RUN_TEST_STEP 100000 TS_TLS, TLSPSK, z:\testdata\configs\TLS_RSA_WITH_NULL_MD5.ini
+TEST_COMPLETE TLS_PSK_test_7
+RUN_UTILS Delete c:\t_secdlg_out.dat
+print Tests for TLS_RSA_WITH_NULL_SHA
+RUN_TEST_STEP 100000 TS_TLS, TLSPSK, z:\testdata\configs\TLS_RSA_WITH_NULL_SHA.ini
+TEST_COMPLETE TLS_PSK_test_8
+
+
+
+
+// To ensure that TLS provider can send server name extensions in TLS handshake.  
+// Preconditions:
+// There is a TLS test server that can perform TLS handshakes using server name extensions.    
+// Test Actions:
+// Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with 
+// TLS test server. 
+// Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+// Instruct test client to connect to TLS test server.
+// Set test environment in a way that server name extensions is set in “ServerHello” message.
+// Check that instance CSecureSocket was able to execute complete success handshake with test 
+//server using the cipher suit specified. 
+
+RUN_UTILS Delete c:\t_secdlg_out.dat 
+RUN_TEST_STEP 100000 TS_TLS, TLSPSK, z:\testdata\configs\TLS_SNE_SINGLE_SERVER.ini
+TEST_COMPLETE TLS_PSK_test_9
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000 TS_TLS, TLSPSK, z:\testdata\configs\TLS_SNE_MULTIPLE_SERVER.ini
+TEST_COMPLETE TLS_PSK_test_10
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000 TS_TLS, TLSPSK, z:\testdata\configs\TLS_SNE_SINGLE_SERVER_NEG.ini
+TEST_COMPLETE TLS_PSK_test_11
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_UTILS Delete c:\private\101f72a6\cacerts.dat
+RUN_UTILS Delete c:\private\101f72a6\certclients.dat
+RUN_UTILS Delete c:\private\101f72a6\keys.dat
+
+RUN_SCRIPT Z:\TestData\Scripts\esock_test_stopallinterfaces.script
+RUN_SCRIPT Z:\TestData\scripts\esock_test_unloadesockForced.script
\ No newline at end of file
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/scripts/tls_psk_wlan.xml
Binary file networksecurity/tls/ts_tls/scripts/tls_psk_wlan.xml has changed
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/ssl_30_wlan.xml
Binary file networksecurity/tls/ts_tls/ssl_30_wlan.xml has changed
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tls/ts_tls/tls_psk_wlan.xml
Binary file networksecurity/tls/ts_tls/tls_psk_wlan.xml has changed
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tlsprovider/Test/group/TlsProvtestServer.iby
--- a/networksecurity/tlsprovider/Test/group/TlsProvtestServer.iby	Tue Jul 06 16:04:34 2010 +0300
+++ b/networksecurity/tlsprovider/Test/group/TlsProvtestServer.iby	Wed Aug 18 11:18:20 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-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"
@@ -47,8 +47,15 @@
 data=\epoc32\release\winscw\udeb\z\testdata\scripts\te_tlsprov.ini  TestData\scripts\te_tlsprov.ini
 data=\epoc32\release\winscw\udeb\z\tlstest2\scripts\tlstest2.script tlstest2\scripts\tlstest2.script
 data=\epoc32\release\winscw\udeb\z\tlstest2\scripts\tlstest2.ini tlstest2\scripts\tlstest2.ini
+
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=\epoc32\release\winscw\udeb\z\tlstest2\scripts\tls_smoke_wlan.script tlstest2\scripts\tls_smoke.script
+data=\epoc32\release\winscw\udeb\z\tlstest2\scripts\tls_smoke_wlan.ini tlstest2\scripts\tls_smoke.ini
+#else
 data=\epoc32\release\winscw\udeb\z\tlstest2\scripts\tls_smoke.script tlstest2\scripts\tls_smoke.script
 data=\epoc32\release\winscw\udeb\z\tlstest2\scripts\tls_smoke.ini tlstest2\scripts\tls_smoke.ini
+#endif //INCLUDE_SIROCCO_CODE_MIGRATION
+
 data=\epoc32\winscw\z\testdata\configs\tlsprovtestdata\tlsprov_ethernetced.xml testdata\configs\tlsprovtestdata\tlsprov_ethernetced.xml
 
 data=\epoc32\release\winscw\udeb\z\testdata\configs\tlsprovtestdata\KeyAndCertStore\keys.dat	TestData\configs\tlsprovtestdata\KeyAndCertStore\keys.dat	
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tlsprovider/Test/group/bld.inf
--- a/networksecurity/tlsprovider/Test/group/bld.inf	Tue Jul 06 16:04:34 2010 +0300
+++ b/networksecurity/tlsprovider/Test/group/bld.inf	Wed Aug 18 11:18:20 2010 +0300
@@ -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"
@@ -351,11 +351,19 @@
 ../tlstest2/data/tlsclientauthrsachain/server.rnd /epoc32/release/winscw/urel/z/tlstest2/data/tlsclientauthrsachain/server.rnd
 
 // Script files
+#ifdef SIROCCO_CODE_MIGRATION
+../tlstest2/scripts/tls_smoke_wlan.ini /epoc32/release/winscw/urel/z/tlstest2/scripts/tls_smoke_wlan.ini
+../tlstest2/scripts/tls_smoke_wlan.ini /epoc32/release/winscw/udeb/z/tlstest2/scripts/tls_smoke_wlan.ini
+
+../tlstest2/scripts/tls_smoke_wlan.script /epoc32/release/winscw/urel/z/tlstest2/scripts/tls_smoke_wlan.script
+../tlstest2/scripts/tls_smoke_wlan.script /epoc32/release/winscw/udeb/z/tlstest2/scripts/tls_smoke_wlan.script
+#else
 ../tlstest2/scripts/tls_smoke.ini /epoc32/release/winscw/urel/z/tlstest2/scripts/tls_smoke.ini
 ../tlstest2/scripts/tls_smoke.ini /epoc32/release/winscw/udeb/z/tlstest2/scripts/tls_smoke.ini
 
 ../tlstest2/scripts/tls_smoke.script /epoc32/release/winscw/urel/z/tlstest2/scripts/tls_smoke.script
 ../tlstest2/scripts/tls_smoke.script /epoc32/release/winscw/udeb/z/tlstest2/scripts/tls_smoke.script
+#endif //SIROCCO_CODE_MIGRATION
 
 ../tlstest2/scripts/tlstest2.ini /epoc32/release/winscw/urel/z/tlstest2/scripts/tlstest2.ini
 ../tlstest2/scripts/tlstest2.ini /epoc32/release/winscw/udeb/z/tlstest2/scripts/tlstest2.ini
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tlsprovider/Test/tlstest2/scripts/tls_smoke_wlan.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tlsprovider/Test/tlstest2/scripts/tls_smoke_wlan.ini	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,317 @@
+// 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:
+// 
+
+// SEC-TLS-SMOKE-0001
+[TLS_PSK_WITH_AES_128_CBC_SHA]
+NumCipherSuites=1
+CipherSuite1=008c
+ExpectedFinalCipherSuit=008c
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+UsePsk=ETrue
+
+
+[TLS_PSK_WITH_AES_128_CBC_SHA_NOCALLBACK]
+NumCipherSuites=1
+CipherSuite1=008c
+ExpectedFinalCipherSuit=0035
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+ExpectedSetCipherError=-5
+
+
+
+// SEC-TLS-SMOKE-0002
+[TLS_PSK_WITH_3DES_EDE_CBC_SHA]
+NumCipherSuites=1
+CipherSuite1=008b
+ExpectedFinalCipherSuit=008b
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+UsePsk=ETrue
+
+// SEC-TLS-SMOKE-0003
+[TLS_PSK_WITH_RC4_128_SHA]
+NumCipherSuites=1
+CipherSuite1=008a
+ExpectedFinalCipherSuit=008a
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+UsePsk=ETrue
+
+// SEC-TLS-SMOKE-0004
+[TLS_PSK_WITH_AES_256_CBC_SHA]
+NumCipherSuites=1
+CipherSuite1=008d
+ExpectedFinalCipherSuit=008d
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+UsePsk=ETrue
+
+
+// SEC-TLS-SMOKE-0005
+[TLS_RSA_EXPORT_WITH_RC4_40_MD5]
+NumCipherSuites=1
+CipherSuite1=0003
+ExpectedFinalCipherSuit=0003
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+
+// SEC-TLS-SMOKE-0006
+[TLS_RSA_WITH_RC4_128_MD5]
+NumCipherSuites=1
+CipherSuite1=0004
+ExpectedFinalCipherSuit=0004
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+// SEC-TLS-SMOKE-0007
+[TLS_RSA_WITH_RC4_128_SHA]
+NumCipherSuites=1
+CipherSuite1=0005
+ExpectedFinalCipherSuit=0005
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+
+// SEC-TLS-SMOKE-0008
+[TLS_RSA_EXPORT_WITH_DES40_CBC_SHA]
+NumCipherSuites=1
+CipherSuite1=0008
+ExpectedFinalCipherSuit=0008
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+// SEC-TLS-SMOKE-0009
+[TLS_RSA_WITH_DES_CBC_SHA]
+NumCipherSuites=1
+CipherSuite1=0009
+ExpectedFinalCipherSuit=0009
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+
+// SEC-TLS-SMOKE-0010
+[TLS_RSA_WITH_3DES_EDE_CBC_SHA]
+NumCipherSuites=1
+CipherSuite1=000a
+ExpectedFinalCipherSuit=000a
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+// SEC-TLS-SMOKE-0011
+[TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA]
+NumCipherSuites=1
+CipherSuite1=0011
+ExpectedFinalCipherSuit=0011
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+// SEC-TLS-SMOKE-0012
+[TLS_DHE_DSS_WITH_DES_CBC_SHA]
+NumCipherSuites=1
+CipherSuite1=0012
+ExpectedFinalCipherSuit=0012
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+
+// SEC-TLS-SMOKE-0013
+[TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA]
+NumCipherSuites=1
+CipherSuite1=0013
+ExpectedFinalCipherSuit=0013
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+// SEC-TLS-SMOKE-0014
+[TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA]
+NumCipherSuites=1
+CipherSuite1=0014
+ExpectedFinalCipherSuit=0014
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+
+// SEC-TLS-SMOKE-0015
+[TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA]
+NumCipherSuites=1
+CipherSuite1=0016
+ExpectedFinalCipherSuit=0016
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+
+// SEC-TLS-SMOKE-0016
+[TLS_RSA_WITH_AES_128_CBC_SHA]
+NumCipherSuites=1
+CipherSuite1=002f
+ExpectedFinalCipherSuit=002f
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+
+// SEC-TLS-SMOKE-0017
+[TLS_RSA_WITH_AES_256_CBC_SHA]
+NumCipherSuites=1
+CipherSuite1=0035
+ExpectedFinalCipherSuit=0035
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+
+
+// SEC-TLS-SMOKE-0018
+[single_server_name]
+
+NumCipherSuites=0
+ExpectedFinalCipherSuit=008D
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+UsePsk=True
+UseNullCipher=True
+
+ExpectedSetCipherError=-5
+
+NumServerNames=1
+ServerName1=www.symbianfoundation.org
+
+
+[multiple_server_name]
+NumCipherSuites=1
+CipherSuite1=002f
+ExpectedFinalCipherSuit=002f
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+NumServerNames=3
+ServerName1=www.something.org
+ServerName2=www.something.com
+ServerName3=www.something.es
+
+ExpectedHandshakeError=-7550
+
+[server_name_negative]
+
+NumCipherSuites=1
+CipherSuite1=0002
+ExpectedFinalCipherSuit=0002
+
+UseNullCipher=True
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+ExpectedHandshakeError=-7550
+
+NumServerNames=3
+ServerName1=www.badservername.org
+ServerName2=www.badservername.uk
+ServerName3=www.badservername.es
+
+
+// new smoke tests for Null cipher suites added.
+
+[TLS_NULL_CIPHER_NOCLIENT_AUT_RSA_MD5]
+NumCipherSuites=1
+CipherSuite1=0001
+ExpectedFinalCipherSuit=0001
+UseNullCipher=True
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+UsePsk=ETrue
+UseNullCipher=True
+
+[TLS_NULL_CIPHER_NOCLIENT_AUT_RSA_SHA]
+NumCipherSuites=1
+CipherSuite1=0002
+ExpectedFinalCipherSuit=0002
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+UsePsk=True
+UseNullCipher=True
+
+[TLS_NO_VALID_CIPHERSUITES]
+NumCipherSuites=3
+CipherSuite1=0002
+CipherSuite2=0006
+CipherSuite3=0007
+ExpectedSetCipherError=-5
+
+ExpectedFinalCipherSuit=0035
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+
+
+
+[TLS_NULL_SET_SUITES_ERROR]
+NumCipherSuites=1
+CipherSuite1=0002
+ExpectedFinalCipherSuit=0035
+
+WebAddress=10.225.209.34
+WebPage=hello.html
+PortNum=1666
+ExpectedSetCipherError=-5
+
+
+
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tlsprovider/Test/tlstest2/scripts/tls_smoke_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tlsprovider/Test/tlstest2/scripts/tls_smoke_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,647 @@
+//
+// 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:
+//
+
+LOAD_SUITE tlstest2
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
+//ced z:\testdata\configs\Tls_ethernet.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_tls_psk.cre c:\private\10202be9\persists\cccccc00.cre
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+
+RUN_UTILS MkDir c:\private\101f72a6
+RUN_UTILS DeleteFile c:\private\101f72a6\CACerts.dat 
+RUN_UTILS MakeReadWrite c:\private\101f72a6\certclients.dat
+RUN_UTILS DeleteFile c:\private\101f72a6\certclients.dat
+RUN_UTILS MakeReadWrite c:\private\101f72a6\keys.dat
+RUN_UTILS DeleteFile c:\private\101f72a6\keys.dat
+RUN_UTILS CopyFile z:\testdata\configs\tlsprovtestdata\KeyAndCertStore\cacerts.dat c:\private\101f72a6\CACerts.dat
+RUN_UTILS CopyFile z:\testdata\configs\tlsprovtestdata\KeyAndCertStore\certclients.dat    c:\private\101f72a6\certclients.dat
+RUN_UTILS CopyFile z:\testdata\configs\tlsprovtestdata\KeyAndCertStore\keys.dat c:\private\101f72a6\keys.dat
+
+
+//! @SYMTestCaseID 	SEC-TLSP-SMOKE-0021
+//! @SYMTestCaseDesc 	StartupComms
+
+START_TESTCASE SEC-TLSP-SMOKE-0021
+RUN_TEST_STEP 100 tlstest2 StartupCommsStep
+END_TESTCASE SEC-TLSP-SMOKE-0021
+
+
+//********************** SEC-TLS-SMOKE : Full TLS handshake tests **********************
+
+//! @SYMTestCaseID 	SEC-TLSP-SMOKE-0001
+//! @SYMTestCaseDesc 	TLS handshake with TLS_PSK_WITH_AES_128_CBC_SHA cipher suit
+//!			(TLS_PSK_WITH_AES_128_CBC_SHA)
+//! @SYMScriptPurpose  	To ensure that TLS provider can execute a TLS handshake using a 
+//!                    	TLS_PSK_WITH_AES_128_CBC_SHA cipher suit. 
+//!		
+//! @SYMPREQ 		PREQ1294
+//! @SYMREQ  		REQ8632, REQ8637, REQ8638, REQ8639
+//! @SYMTestPriority 	Critical
+//! @SYMTestStatus   	Implemented
+//! @SYMTestActions 	Preconditions:
+//!	•  There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.  
+//!			Test Actions:
+//!     •  Repeat sequence below including and not including identity hint in server hello message.
+//!     •  Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server. 
+//!	•  Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//!	•  Instruct test client to connect to TLS test server.
+//!	•  Set test environment in a way that TLS_PSK_WITH_AES_128_CBC_SHA is set in “ServerHello” message.
+//!	•  Check that instance CSecureSocket was able to execute complete success handshake with test server 
+//!	   using the cipher suit specified. 
+//!
+//! @SYMTestExpectedResults  • TLS handshake was complete and successful. 
+//!
+//! @SYMTestType 	CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0001
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_PSK_WITH_AES_128_CBC_SHA
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_PSK_WITH_AES_128_CBC_SHA_NOCALLBACK
+END_TESTCASE SEC-TLSP-SMOKE-0001
+
+
+//! @SYMTestCaseID 	SEC-TLSP-SMOKE-0002
+//! @SYMTestCaseDesc 	TLS handshake with TLS_PSK_WITH_3DES_EDE_CBC_SHA cipher suit
+//!			(TLS_PSK_WITH_3DES_EDE_CBC_SHA)
+//! @SYMScriptPurpose  	To ensure that TLS provider can execute a TLS handshake using a 
+//!                    	TLS_PSK_WITH_3DES_EDE_CBC_SHA suit. 
+//!		
+//! @SYMPREQ 		PREQ1294
+//! @SYMREQ  		REQ8632, REQ8637, REQ8638, REQ8639
+//! @SYMTestPriority 	Critical
+//! @SYMTestStatus   	Implemented
+//! @SYMTestActions 	Preconditions:
+//!	•  There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.  
+//!			Test Actions:
+//!     •  Repeat sequence below including and not including identity hint in server hello message.
+//!     •  Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server. 
+//!	•  Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//!	•  Instruct test client to connect to TLS test server.
+//!	•  Set test environment in a way that TLS_PSK_WITH_3DES_EDE_CBC_SHA is set in “ServerHello” message.
+//!	•  Check that instance CSecureSocket was able to execute complete success handshake with test server 
+//!	   using the cipher suit specified. 
+//!
+//! @SYMTestExpectedResults  • TLS handshake was complete and successful. 
+//!
+//! @SYMTestType 	CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0002 
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_PSK_WITH_3DES_EDE_CBC_SHA 
+END_TESTCASE SEC-TLSP-SMOKE-0002 
+
+
+
+//! @SYMTestCaseID 	SEC-TLSP-SMOKE-0003
+//! @SYMTestCaseDesc 	TLS handshake with TLS_PSK_WITH_RC4_128_SHA cipher suit
+//!			(TLS_PSK_WITH_RC4_128_SHA)
+//! @SYMScriptPurpose  	To ensure that TLS provider can execute a TLS handshake using a 
+//!                    	TLS_PSK_WITH_RC4_128_SHA suit. 
+//!		
+//! @SYMPREQ 		PREQ1294
+//! @SYMREQ  		REQ8632, REQ8637, REQ8638, REQ8639, REQ8640
+//! @SYMTestPriority 	Critical
+//! @SYMTestStatus   	Implemented
+//! @SYMTestActions 	Preconditions:
+//!	•  There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.  
+//!			Test Actions:
+//!     •  Repeat sequence below including and not including identity hint in server hello message.
+//!     •  Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server. 
+//!	•  Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//!	•  Instruct test client to connect to TLS test server.
+//!	•  Set test environment in a way that TLS_PSK_WITH_RC4_128_SHA is set in “ServerHello” message.
+//!	•  Check that instance CSecureSocket was able to execute complete success handshake with test server 
+//!	   using the cipher suit specified. 
+//!
+//! @SYMTestExpectedResults  • TLS handshake was complete and successful. 
+//!
+//! @SYMTestType 	CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0003 
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_PSK_WITH_RC4_128_SHA 
+END_TESTCASE SEC-TLSP-SMOKE-0003 
+
+//! @SYMTestCaseID 	SEC-TLSP-SMOKE-0004
+//! @SYMTestCaseDesc 	TLS handshake with TLS_PSK_WITH_AES_256_CBC_SHA cipher suit
+//!			(TLS_PSK_WITH_AES_256_CBC_SHA)
+//! @SYMScriptPurpose  	To ensure that TLS provider can execute a TLS handshake using a 
+//!                   	TLS_PSK_WITH_AES_256_CBC_SHA suit. 
+//!		
+//! @SYMPREQ 		PREQ1294
+//! @SYMREQ  		REQ8632, REQ8637, REQ8638, REQ8639, REQ8640
+//! @SYMTestPriority 	Critical
+//! @SYMTestStatus   	Implemented
+//! @SYMTestActions 	Preconditions:
+//!	•  There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.  
+//!			Test Actions:
+//!     •  Repeat sequence below including and not including identity hint in server hello message.
+//!     •  Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server. 
+//!	•  Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//!	•  Instruct test client to connect to TLS test server.
+//!	•  Set test environment in a way that TLS_PSK_WITH_AES_256_CBC_SHA is set in “ServerHello” message.
+//!	•  Check that instance CSecureSocket was able to execute complete success handshake with test server 
+//!	   using the cipher suit specified. 
+//!
+//! @SYMTestExpectedResults  • TLS handshake was complete and successful. 
+//!
+//! @SYMTestType 	CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0004 
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_PSK_WITH_AES_256_CBC_SHA 
+END_TESTCASE SEC-TLSP-SMOKE-0004 
+
+
+//! @SYMTestCaseID 	SEC-TLSP-SMOKE-0005
+//! @SYMTestCaseDesc 	TLS handshake with TLS_RSA_EXPORT_WITH_RC4_40_MD5 cipher suit
+//!			(TLS_RSA_EXPORT_WITH_RC4_40_MD5)
+//! @SYMScriptPurpose  	To ensure that TLS provider can execute a TLS handshake using a 
+//!                    	TLS_RSA_EXPORT_WITH_RC4_40_MD5 cipher suit. 
+//!		
+//! @SYMPREQ 		PREQ1294
+//! @SYMREQ  		REQ8631
+//! @SYMTestPriority 	Critical
+//! @SYMTestStatus   	Implemented
+//! @SYMTestActions 	Preconditions:
+//!	•  There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.  
+//!			Test Actions:
+//!     •  Repeat sequence below including and not including identity hint in server hello message.
+//!     •  Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server. 
+//!	•  Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//!	•  Instruct test client to connect to TLS test server.
+//!	•  Set test environment in a way that TLS_RSA_EXPORT_WITH_RC4_40_MD5 is set in “ServerHello” message.
+//!	•  Check that instance CSecureSocket was able to execute complete success handshake with test server 
+//!	   using the cipher suit specified. 
+//!
+//! @SYMTestExpectedResults  • TLS handshake was complete and successful. 
+//!
+//! @SYMTestType 	CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0005 
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_RSA_EXPORT_WITH_RC4_40_MD5 
+END_TESTCASE SEC-TLSP-SMOKE-0005 
+
+
+//! @SYMTestCaseID 	SEC-TLSP-SMOKE-0006
+//! @SYMTestCaseDesc 	TLS handshake with TLS_RSA_WITH_RC4_128_MD5 cipher suit
+//!			(TLS_RSA_WITH_RC4_128_MD5)
+//! @SYMScriptPurpose  	To ensure that TLS provider can execute a TLS handshake using a 
+//!                    	TLS_RSA_WITH_RC4_128_MD5 cipher suit. 
+//!		
+//! @SYMPREQ PREQ1294
+//! @SYMREQ  REQ8631
+//! @SYMTestPriority 	Critical
+//! @SYMTestStatus   	Implemented
+//! @SYMTestActions 	Preconditions:
+//!	•  There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.  
+//!			Test Actions:
+//!     •  Repeat sequence below including and not including identity hint in server hello message.
+//!     •  Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server. 
+//!	•  Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//!	•  Instruct test client to connect to TLS test server.
+//!	•  Set test environment in a way that TLS_RSA_WITH_RC4_128_MD5 is set in “ServerHello” message.
+//!	•  Check that instance CSecureSocket was able to execute complete success handshake with test server 
+//!	   using the cipher suit specified. 
+//!
+//! @SYMTestExpectedResults  • TLS handshake was complete and successful. 
+//!
+//! @SYMTestType 	CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0006 
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_RSA_WITH_RC4_128_MD5 
+END_TESTCASE SEC-TLSP-SMOKE-0006 
+
+
+//! @SYMTestCaseID 	SEC-TLSP-SMOKE-0007
+//! @SYMTestCaseDesc 	TLS handshake with TLS_RSA_WITH_RC4_128_SHA cipher suit
+//!			(TLS_RSA_WITH_RC4_128_SHA)
+//! @SYMScriptPurpose  	To ensure that TLS provider can execute a TLS handshake using a 
+//!                    	TLS_RSA_WITH_RC4_128_SHA cipher suit. 
+//!		
+//! @SYMPREQ 		PREQ1294
+//! @SYMREQ  		REQ8631
+//! @SYMTestPriority 	Critical
+//! @SYMTestStatus   	Implemented
+//! @SYMTestActions 	Preconditions:
+//!	•  There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.  
+//!			Test Actions:
+//!     •  Repeat sequence below including and not including identity hint in server hello message.
+//!     •  Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server. 
+//!	•  Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//!	•  Instruct test client to connect to TLS test server.
+//!	•  Set test environment in a way that TLS_RSA_WITH_RC4_128_SHA is set in “ServerHello” message.
+//!	•  Check that instance CSecureSocket was able to execute complete success handshake with test server 
+//!	   using the cipher suit specified. 
+//!
+//! @SYMTestExpectedResults  • TLS handshake was complete and successful. 
+//!
+//! @SYMTestType 	CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0007 
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_RSA_WITH_RC4_128_SHA 
+END_TESTCASE SEC-TLSP-SMOKE-0007 
+
+
+//! @SYMTestCaseID 	SEC-TLSP-SMOKE-0008
+//! @SYMTestCaseDesc 	TLS handshake with TLS_RSA_EXPORT_WITH_DES40_CBC_SHA cipher suit
+//!			(TLS_RSA_EXPORT_WITH_DES40_CBC_SHA)
+//! @SYMScriptPurpose  	To ensure that TLS provider can execute a TLS handshake using a 
+//!                    	TLS_RSA_EXPORT_WITH_DES40_CBC_SHA cipher suit. 
+//!		
+//! @SYMPREQ 		PREQ1294
+//! @SYMREQ  		REQ8631
+//! @SYMTestPriority 	Critical
+//! @SYMTestStatus   	Implemented
+//! @SYMTestActions 	Preconditions:
+//!	•  There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.  
+//!			Test Actions:
+//!     •  Repeat sequence below including and not including identity hint in server hello message.
+//!     •  Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server. 
+//!	•  Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//!	•  Instruct test client to connect to TLS test server.
+//!	•  Set test environment in a way that TLS_RSA_EXPORT_WITH_DES40_CBC_SHA is set in “ServerHello” message.
+//!	•  Check that instance CSecureSocket was able to execute complete success handshake with test server 
+//!	   using the cipher suit specified. 
+//!
+//! @SYMTestExpectedResults  • TLS handshake was complete and successful. 
+//!
+//! @SYMTestType 	CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0008 
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_RSA_EXPORT_WITH_DES40_CBC_SHA 
+END_TESTCASE SEC-TLSP-SMOKE-0008 
+
+
+//! @SYMTestCaseID 	SEC-TLSP-SMOKE-0009
+//! @SYMTestCaseDesc 	TLS handshake with TLS_RSA_WITH_DES_CBC_SHA cipher suit
+//!			(TLS_RSA_WITH_DES_CBC_SHA)
+//! @SYMScriptPurpose  	To ensure that TLS provider can execute a TLS handshake using a 
+//!                    	TLS_RSA_WITH_DES_CBC_SHA cipher suit. 
+//!		
+//! @SYMPREQ 		PREQ1294
+//! @SYMREQ  		REQ8631
+//! @SYMTestPriority 	Critical
+//! @SYMTestStatus   	Implemented
+//! @SYMTestActions 	Preconditions:
+//!	•  There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.  
+//!			Test Actions:
+//!     •  Repeat sequence below including and not including identity hint in server hello message.
+//!     •  Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server. 
+//!	•  Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//!	•  Instruct test client to connect to TLS test server.
+//!	•  Set test environment in a way that TLS_RSA_WITH_DES_CBC_SHA is set in “ServerHello” message.
+//!	•  Check that instance CSecureSocket was able to execute complete success handshake with test server 
+//!	   using the cipher suit specified. 
+//!
+//! @SYMTestExpectedResults  • TLS handshake was complete and successful. 
+//!
+//! @SYMTestType 	CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0009 
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_RSA_WITH_DES_CBC_SHA 
+END_TESTCASE SEC-TLSP-SMOKE-0009 
+
+//! @SYMTestCaseID 	SEC-TLSP-SMOKE-0010
+//! @SYMTestCaseDesc 	TLS handshake with TLS_RSA_WITH_3DES_EDE_CBC_SHA cipher suit
+//!			(TLS_RSA_WITH_3DES_EDE_CBC_SHA)
+//! @SYMScriptPurpose  	To ensure that TLS provider can execute a TLS handshake using a 
+//!                    	TLS_RSA_WITH_3DES_EDE_CBC_SHA cipher suit. 
+//!		
+//! @SYMPREQ 		PREQ1294
+//! @SYMREQ  		REQ8631
+//! @SYMTestPriority 	Critical
+//! @SYMTestStatus   	Implemented
+//! @SYMTestActions 	Preconditions:
+//!	•  There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.  
+//!			Test Actions:
+//!     •  Repeat sequence below including and not including identity hint in server hello message.
+//!     •  Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server. 
+//!	•  Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//!	•  Instruct test client to connect to TLS test server.
+//!	•  Set test environment in a way that TLS_RSA_WITH_3DES_EDE_CBC_SHA is set in “ServerHello” message.
+//!	•  Check that instance CSecureSocket was able to execute complete success handshake with test server 
+//!	   using the cipher suit specified. 
+//!
+//! @SYMTestExpectedResults  • TLS handshake was complete and successful. 
+//!
+//! @SYMTestType 	CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0010 
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_RSA_WITH_3DES_EDE_CBC_SHA 
+END_TESTCASE SEC-TLSP-SMOKE-0010 
+
+
+//! @SYMTestCaseID 	SEC-TLSP-SMOKE-0011
+//! @SYMTestCaseDesc 	TLS handshake with TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA cipher suit
+//!			(TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA)
+//! @SYMScriptPurpose  	To ensure that TLS provider can execute a TLS handshake using a 
+//!                    	TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA cipher suit. 
+//!		
+//! @SYMPREQ 		PREQ1294
+//! @SYMREQ  		REQ8631
+//! @SYMTestPriority 	Critical
+//! @SYMTestStatus   	Implemented
+//! @SYMTestActions 	Preconditions:
+//!	•  There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.  
+//!			Test Actions:
+//!     •  Repeat sequence below including and not including identity hint in server hello message.
+//!     •  Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server. 
+//!	•  Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//!	•  Instruct test client to connect to TLS test server.
+//!	•  Set test environment in a way that TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA is set in “ServerHello” message.
+//!	•  Check that instance CSecureSocket was able to execute complete success handshake with test server 
+//!	   using the cipher suit specified. 
+//!
+//! @SYMTestExpectedResults  • TLS handshake was complete and successful. 
+//!
+//! @SYMTestType 	CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0011 
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA 
+END_TESTCASE SEC-TLSP-SMOKE-0011
+
+
+//! @SYMTestCaseID 	SEC-TLSP-SMOKE-0012
+//! @SYMTestCaseDesc 	TLS handshake with TLS_DHE_DSS_WITH_DES_CBC_SHA cipher suit
+//!			(TLS_DHE_DSS_WITH_DES_CBC_SHA)
+//! @SYMScriptPurpose  	To ensure that TLS provider can execute a TLS handshake using a 
+//!                    	TLS_DHE_DSS_WITH_DES_CBC_SHA cipher suit. 
+//!		
+//! @SYMPREQ 		PREQ1294
+//! @SYMREQ  		REQ8631
+//! @SYMTestPriority 	Critical
+//! @SYMTestStatus   	Implemented
+//! @SYMTestActions 	Preconditions:
+//!	•  There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.  
+//!			Test Actions:
+//!     •  Repeat sequence below including and not including identity hint in server hello message.
+//!     •  Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server. 
+//!	•  Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//!	•  Instruct test client to connect to TLS test server.
+//!	•  Set test environment in a way that TLS_DHE_DSS_WITH_DES_CBC_SHA is set in “ServerHello” message.
+//!	•  Check that instance CSecureSocket was able to execute complete success handshake with test server 
+//!	   using the cipher suit specified. 
+//!
+//! @SYMTestExpectedResults  • TLS handshake was complete and successful. 
+//!
+//! @SYMTestType 	CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0012 
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_DHE_DSS_WITH_DES_CBC_SHA 
+END_TESTCASE SEC-TLSP-SMOKE-0012 
+
+
+//! @SYMTestCaseID 	SEC-TLSP-SMOKE-0013
+//! @SYMTestCaseDesc 	TLS handshake with TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA cipher suit
+//!			(TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA)
+//! @SYMScriptPurpose  	To ensure that TLS provider can execute a TLS handshake using a 
+//!                    	TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA cipher suit. 
+//!		
+//! @SYMPREQ 		PREQ1294
+//! @SYMREQ  		REQ8631
+//! @SYMTestPriority 	Critical
+//! @SYMTestStatus   	Implemented
+//! @SYMTestActions 	Preconditions:
+//!	•  There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.  
+//!			Test Actions:
+//!     •  Repeat sequence below including and not including identity hint in server hello message.
+//!     •  Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server. 
+//!	•  Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//!	•  Instruct test client to connect to TLS test server.
+//!	•  Set test environment in a way that TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA is set in “ServerHello” message.
+//!	•  Check that instance CSecureSocket was able to execute complete success handshake with test server 
+//!	   using the cipher suit specified. 
+//!
+//! @SYMTestExpectedResults  • TLS handshake was complete and successful. 
+//!
+//! @SYMTestType 	CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0013 
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA 
+END_TESTCASE SEC-TLSP-SMOKE-0013 
+
+
+//! @SYMTestCaseID 	SEC-TLSP-SMOKE-0014
+//! @SYMTestCaseDesc 	TLS handshake with TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA cipher suit
+//!			(TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA)
+//! @SYMScriptPurpose  	To ensure that TLS provider can execute a TLS handshake using a 
+//!                    	TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA cipher suit. 
+//!		
+//! @SYMPREQ 		PREQ1294
+//! @SYMREQ  		REQ8631
+//! @SYMTestPriority 	Critical
+//! @SYMTestStatus   	Implemented
+//! @SYMTestActions 	Preconditions:
+//!	•  There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.  
+//!			Test Actions:
+//!     •  Repeat sequence below including and not including identity hint in server hello message.
+//!     •  Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server. 
+//!	•  Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//!	•  Instruct test client to connect to TLS test server.
+//!	•  Set test environment in a way that TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA is set in “ServerHello” message.
+//!	•  Check that instance CSecureSocket was able to execute complete success handshake with test server 
+//!	   using the cipher suit specified. 
+//!
+//! @SYMTestExpectedResults  • TLS handshake was complete and successful. 
+//!
+//! @SYMTestType 	CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0014 
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA 
+END_TESTCASE SEC-TLSP-SMOKE-0014 
+
+
+//! @SYMTestCaseID 	SEC-TLSP-SMOKE-0015
+//! @SYMTestCaseDesc 	TLS handshake with TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA cipher suit
+//!			(TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA)
+//! @SYMScriptPurpose  	To ensure that TLS provider can execute a TLS handshake using a 
+//!                    	TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA cipher suit. 
+//!		
+//! @SYMPREQ 		PREQ1294
+//! @SYMREQ  		REQ8631
+//! @SYMTestPriority 	Critical
+//! @SYMTestStatus   	Implemented
+//! @SYMTestActions 	Preconditions:
+//!	•  There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.  
+//!			Test Actions:
+//!     •  Repeat sequence below including and not including identity hint in server hello message.
+//!     •  Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server. 
+//!	•  Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//!	•  Instruct test client to connect to TLS test server.
+//!	•  Set test environment in a way that TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA is set in “ServerHello” message.
+//!	•  Check that instance CSecureSocket was able to execute complete success handshake with test server 
+//!	   using the cipher suit specified. 
+//!
+//! @SYMTestExpectedResults  • TLS handshake was complete and successful. 
+//!
+//! @SYMTestType 	CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0015 
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA 
+END_TESTCASE SEC-TLSP-SMOKE-0015 
+
+//! @SYMTestCaseID 	SEC-TLSP-SMOKE-0016
+//! @SYMTestCaseDesc 	TLS handshake with TLS_RSA_WITH_AES_128_CBC_SHA cipher suit
+//!			(TLS_RSA_WITH_AES_128_CBC_SHA)
+//! @SYMScriptPurpose  	To ensure that TLS provider can execute a TLS handshake using a 
+//!                    	TLS_RSA_WITH_AES_128_CBC_SHA cipher suit. 
+//!		
+//! @SYMPREQ 		PREQ1294
+//! @SYMREQ  		REQ8631
+//! @SYMTestPriority 	Critical
+//! @SYMTestStatus   	Implemented
+//! @SYMTestActions 	Preconditions:
+//!	•  There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.  
+//!			Test Actions:
+//!     •  Repeat sequence below including and not including identity hint in server hello message.
+//!     •  Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server. 
+//!	•  Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//!	•  Instruct test client to connect to TLS test server.
+//!	•  Set test environment in a way that TLS_RSA_WITH_AES_128_CBC_SHA is set in “ServerHello” message.
+//!	•  Check that instance CSecureSocket was able to execute complete success handshake with test server 
+//!	   using the cipher suit specified. 
+//!
+//! @SYMTestExpectedResults  • TLS handshake was complete and successful. 
+//!
+//! @SYMTestType 	CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0016 
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_RSA_WITH_AES_128_CBC_SHA 
+END_TESTCASE SEC-TLSP-SMOKE-0016 
+
+
+//! @SYMTestCaseID 	SEC-TLSP-SMOKE-0017
+//! @SYMTestCaseDesc 	TLS handshake with TLS_RSA_WITH_AES_256_CBC_SHA cipher suit
+//!			(TLS_RSA_WITH_AES_256_CBC_SHA)
+//! @SYMScriptPurpose  	To ensure that TLS provider can execute a TLS handshake using a 
+//!                    	TLS_RSA_WITH_AES_256_CBC_SHA cipher suit. 
+//!		
+//! @SYMPREQ 		PREQ1294
+//! @SYMREQ  		REQ8631
+//! @SYMTestPriority 	Critical
+//! @SYMTestStatus   	Implemented
+//! @SYMTestActions 	Preconditions:
+//!	•  There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.  
+//!			Test Actions:
+//!     •  Repeat sequence below including and not including identity hint in server hello message.
+//!     •  Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server. 
+//!	•  Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//!	•  Instruct test client to connect to TLS test server.
+//!	•  Set test environment in a way that TLS_RSA_WITH_AES_256_CBC_SHA is set in “ServerHello” message.
+//!	•  Check that instance CSecureSocket was able to execute complete success handshake with test server 
+//!	   using the cipher suit specified. 
+//!
+//! @SYMTestExpectedResults  • TLS handshake was complete and successful. 
+//!
+//! @SYMTestType 	CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0017 
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_RSA_WITH_AES_256_CBC_SHA 
+END_TESTCASE SEC-TLSP-SMOKE-0017 
+
+
+
+//! @SYMTestCaseID 	SEC-TLSP-SMOKE-0018
+//! @SYMTestCaseDesc 	Usage of RFC3546 server name extension
+//!			(SERVER_NAME_EXTENSION)
+//! @SYMScriptPurpose  	To ensure that TLS provider can send server name extensions in TLS handshake.  
+//!		
+//! @SYMPREQ 		PREQ1294
+//! @SYMREQ  		REQ8631
+//! @SYMTestPriority 	Critical
+//! @SYMTestStatus   	Implemented
+//! @SYMTestActions 	Preconditions:
+//!	•  There is a TLS test server that can perform TLS handshakes using server name extensions.    
+//!			Test Actions:
+//!     •  Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with 
+//!        TLS test server. 
+//!     •  Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//!     •  Instruct test client to connect to TLS test server.
+//!     •  Set test environment in a way that server name extensions is set in “ServerHello” message.
+//!     •  Check that instance CSecureSocket was able to execute complete success handshake with test 
+//!        server using the cipher suit specified. 
+//!
+//! @SYMTestExpectedResults  • TLS handshake was complete and successful. 
+//!
+//! @SYMTestType 	CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0018 
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini single_server_name
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini multiple_server_name
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini server_name_negative
+END_TESTCASE SEC-TLSP-SMOKE-0018 
+
+
+
+
+
+
+//! @SYMTestCaseID 	SEC-TLSP-SMOKE-0019
+//! @SYMTestCaseDesc 	TLS handshake with Null cipher suites
+//!			(TLS_NULL_CIPHER_SMOKE_DEFECT)
+//! @SYMScriptPurpose  	To ensure that TLS provider can execute a TLS handshake using a 
+//!                    	TLS_NULL_CIPHER_NOCLIENT_AUT_RSA_MD5 or TLS_NULL_CIPHER_NOCLIENT_AUT_RSA_SHA cipher suites. 
+//!		
+//! @SYMDEF 		DEF114941
+//! @SYMTestPriority 	Critical
+//! @SYMTestStatus   	Implemented
+//! @SYMTestActions 	Preconditions:
+//!	•  There is a TLS test server that can perform TLS handshakes using the cipher suit specific to this test.  
+//!			Test Actions:
+//!     •  Repeat sequence below including and not including identity hint in server hello message.
+//!     •  Launch test client that uses instance of symbian CSecureSocket to negotiate handshake with TLS test server. 
+//!	•  Set appropriate values to instance of TConnectSettings associated to instance of CSecureSocket.
+//!	•  Instruct test client to connect to TLS test server.
+//!	•  Set test environment in a way that TLS_NULL_CIPHER_NOCLIENT_AUT_RSA_MD5 is set in “ServerHello” message.
+//!	•  Check that instance CSecureSocket was able to execute complete success handshake with test server 
+//!	   using the cipher suit specified.
+//!	•  Repeat test sequence using TLS_NULL_CIPHER_NOCLIENT_AUT_RSA_SHA 
+//!
+//! @SYMTestExpectedResults  • TLS handshake was complete and successful. 
+//!
+//! @SYMTestType 	CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0019
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_NULL_CIPHER_NOCLIENT_AUT_RSA_MD5
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_NULL_CIPHER_NOCLIENT_AUT_RSA_SHA
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_NULL_SET_SUITES_ERROR
+END_TESTCASE SEC-TLSP-SMOKE-0019
+
+//! @SYMTestCaseID 	SEC-TLSP-SMOKE-0020
+//! @SYMTestCaseDesc 	TLS handshake with no valid ciphersuites
+//!			(TLS_NO_VALID_CIPHERSUITES)
+//! @SYMScriptPurpose  	To ensure that SetAvailableCiphersuites fails with the correct code if all supplied ciphersuites are invalid.
+//!		
+//! @SYMDEF 		DEF116261
+//! @SYMTestPriority 	Critical
+//! @SYMTestStatus   	Implemented
+//! @SYMTestExpectedResults  KErrNotSupported
+//!
+//! @SYMTestType 	CIT
+
+START_TESTCASE SEC-TLSP-SMOKE-0020
+RUN_TEST_STEP 100 tlstest2 HandShakeStep z:\tlstest2\scripts\tls_smoke.ini TLS_NO_VALID_CIPHERSUITES
+END_TESTCASE SEC-TLSP-SMOKE-0020
+
+RUN_UTILS DeleteFile c:\tlsprov_ethernetced.xml
+
+
+
+
+
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tlsprovider/Test/tlstest2/startupcommsstep.cpp
--- a/networksecurity/tlsprovider/Test/tlstest2/startupcommsstep.cpp	Tue Jul 06 16:04:34 2010 +0300
+++ b/networksecurity/tlsprovider/Test/tlstest2/startupcommsstep.cpp	Wed Aug 18 11:18:20 2010 +0300
@@ -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"
@@ -37,6 +37,7 @@
 	{
 	SetTestStepResult(EFail);
 	
+#ifndef SIROCCO_CODE_MIGRATION
 	TInt ret = User::LoadPhysicalDevice(PDD_NAME);
 	User::LeaveIfError(ret == KErrAlreadyExists?KErrNone:ret);
 
@@ -50,7 +51,7 @@
 	User::LeaveIfError(ret == KErrAlreadyExists?KErrNone:ret);
 	ret = StartC32();
 	User::LeaveIfError(ret == KErrAlreadyExists?KErrNone:ret);
+#endif //SIROCCO_CODE_MIGRATION
 	SetTestStepResult(EPass);
-
 	return TestStepResult();
 	}
diff -r 88121cf79045 -r 78fceed50f62 networksecurity/tlsprovider/source/tlsprovider/Ctlsclntauthenticate.cpp
--- a/networksecurity/tlsprovider/source/tlsprovider/Ctlsclntauthenticate.cpp	Tue Jul 06 16:04:34 2010 +0300
+++ b/networksecurity/tlsprovider/source/tlsprovider/Ctlsclntauthenticate.cpp	Wed Aug 18 11:18:20 2010 +0300
@@ -88,7 +88,7 @@
 void CTlsClntAuthenticate::GetAvailableKeyListL()	
 	{	
   	TLSPROV_LOG(_L("CTlsClntAuthenticate::GetAvailableKeyListL()..."))
-	iFs.Connect();
+	User::LeaveIfError(iFs.Connect());
 	iPtrUnifiedKeyStore = CUnifiedKeyStore::NewL(iFs);
 	
 	iStatus = KRequestPending;
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/dhcp/src/DHCPIP4Control.cpp
--- a/tcpiputils/dhcp/src/DHCPIP4Control.cpp	Tue Jul 06 16:04:34 2010 +0300
+++ b/tcpiputils/dhcp/src/DHCPIP4Control.cpp	Wed Aug 18 11:18:20 2010 +0300
@@ -31,7 +31,7 @@
 #include "DomainNameDecoder.h"
 #include <nifman.h>
 #include <comms-infras/es_config.h>
-#include "netcfgextndhcpmsg.h"
+#include "NetCfgExtnDhcpMsg.h"
 #include <f32file.h>
 #include <comms-infras/metatype.h>
 #include <comms-infras/metadata.h>
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/dhcp/src/DHCPIP6Control.cpp
--- a/tcpiputils/dhcp/src/DHCPIP6Control.cpp	Tue Jul 06 16:04:34 2010 +0300
+++ b/tcpiputils/dhcp/src/DHCPIP6Control.cpp	Wed Aug 18 11:18:20 2010 +0300
@@ -29,7 +29,7 @@
 #include "ExpireTimer.h"
 #include "DomainNameDecoder.h"
 #include <comms-infras/es_config.h>
-#include "netcfgextndhcpmsg.h"
+#include "NetCfgExtnDhcpMsg.h"
 #include <nifman.h>
 #include <f32file.h>
 #include <comms-infras/metatype.h>
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/dhcp/te_dhcp/bld.inf
--- a/tcpiputils/dhcp/te_dhcp/bld.inf	Tue Jul 06 16:04:34 2010 +0300
+++ b/tcpiputils/dhcp/te_dhcp/bld.inf	Wed Aug 18 11:18:20 2010 +0300
@@ -1,4 +1,4 @@
-// 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"
@@ -27,19 +27,36 @@
 
 
 //-- ip4 specific
+#ifdef SIROCCO_CODE_MIGRATION
+../te_dhcp/config/scripts/cccccc00_dhcptest_ip6.cre				z:/TestData/configs/dhcp/cccccc00_dhcptest_ip6.cre
+../te_dhcp/config/scripts/cccccc00_dhcptest_ip4.cre				z:/TestData/configs/dhcp/cccccc00_dhcptest_ip4.cre
+../te_dhcp/config/scripts/DHCP_OOM6_ip4_wlan.script					z:/testdata/scripts/dhcp/dhcp_oom6_ip4_wlan.script
+../te_dhcp/config/scripts/te_dhcptest_ip4_wlan.script				z:/testdata/scripts/dhcp/te_dhcptest_ip4_wlan.script
+../te_dhcp/config/scripts/DHCP_OOM6_ip6_wlan.script					z:/testdata/scripts/dhcp/dhcp_oom6_ip6_wlan.script
+../te_dhcp/config/scripts/TE_SIPServer_DHCP_hwonly_ip4_wlan.script	z:/testdata/scripts/dhcp/te_sipserver_dhcp_hwonly_ip4_wlan.script
+#else
 ../te_dhcp/config/scripts/te_dhcptest_ip4.script				z:/testdata/scripts/dhcp/te_dhcptest_ip4.script
+../te_dhcp/config/scripts/DHCP_OOM6_ip4.script					z:/testdata/scripts/dhcp/dhcp_oom6_ip4.script
+../te_dhcp/config/scripts/DHCP_OOM6_ip6.script					z:/testdata/scripts/dhcp/dhcp_oom6_ip6.script
+../te_dhcp/config/scripts/TE_SIPServer_DHCP_hwonly_ip4.script	z:/testdata/scripts/dhcp/te_sipserver_dhcp_hwonly_ip4.script
+#endif //SIROCCO_CODE_MIGRATION
 ../te_dhcp/config/scripts/DHCPBasicInteractions1_ip4.script		z:/testdata/scripts/dhcp/dhcpbasicinteractions1_ip4.script
 ../te_dhcp/config/scripts/DHCPConfiguration2_ip4.script			z:/testdata/scripts/dhcp/dhcpconfiguration2_ip4.script
 ../te_dhcp/config/scripts/DHCPRenewAndRelease3_ip4.script		z:/testdata/scripts/dhcp/dhcprenewandrelease3_ip4.script
 ../te_dhcp/config/scripts/DHCPDynamicInteraction4_ip4.script	z:/testdata/scripts/dhcp/dhcpdynamicinteraction4_ip4.script
 ../te_dhcp/config/scripts/DHCPManualtests5_ip4.script			z:/testdata/scripts/dhcp/dhcpmanualtests5_ip4.script
-../te_dhcp/config/scripts/DHCP_OOM6_ip4.script					z:/testdata/scripts/dhcp/dhcp_oom6_ip4.script
+
+
 
 //-- ip6 specific
 #ifdef SYMBIAN_TCPIPDHCP_UPDATE
 ../te_dhcp/config/scripts/te_dhcptest_ip6_PREQ1898.script				z:/testdata/scripts/dhcp/te_dhcptest_ip6.script
 #else
+#ifdef SIROCCO_CODE_MIGRATION
+../te_dhcp/config/scripts/te_dhcptest_ip6_wlan.script				z:/testdata/scripts/dhcp/te_dhcptest_ip6_wlan.script
+#else
 ../te_dhcp/config/scripts/te_dhcptest_ip6.script				z:/testdata/scripts/dhcp/te_dhcptest_ip6.script
+#endif //SIROCCO_CODE_MIGRATION
 #endif // SYMBIAN_TCPIPDHCP_UPDATE
 ../te_dhcp/config/scripts/DHCPBasicInteractions1_ip6.script		z:/testdata/scripts/dhcp/dhcpbasicinteractions1_ip6.script
 ../te_dhcp/config/scripts/DHCPConfiguration2_ip6.script			z:/testdata/scripts/dhcp/dhcpconfiguration2_ip6.script
@@ -47,7 +64,7 @@
 ../te_dhcp/config/scripts/DHCPDynamicInteraction4_ip6.script	z:/testdata/scripts/dhcp/dhcpdynamicinteraction4_ip6.script
 ../te_dhcp/config/scripts/DHCPManualtests5_ip6.script			z:/testdata/scripts/dhcp/dhcpmanualtests5_ip6.script
 ../te_dhcp/config/scripts/dhcpmanualTests2_ip6.script			z:/testdata/scripts/dhcp/dhcpmanualtests2_ip6.script
-../te_dhcp/config/scripts/DHCP_OOM6_ip6.script					z:/testdata/scripts/dhcp/dhcp_oom6_ip6.script
+
 ../te_dhcp/config/scripts/DHCPBasicInteractions1-inform_ip6.script		z:/testdata/scripts/dhcp/dhcpbasicinteractions1-inform_ip6.script
 ../te_dhcp/config/scripts/DHCPConfiguration2-inform_ip6.script			z:/testdata/scripts/dhcp/dhcpconfiguration2-inform_ip6.script
 ../te_dhcp/config/scripts/DHCPRenewAndRelease3-inform_ip6.script		z:/testdata/scripts/dhcp/dhcprenewandrelease3-inform_ip6.script
@@ -56,7 +73,6 @@
 ../te_dhcp/config/scripts/DHCPPREQ1898_Ipv6.script					z:/testdata/scripts/dhcp/dhcppreq1898_ipv6.script
 #endif //SYMBIAN_TCPIPDHCP_UPDATE 
 //SIP server
-../te_dhcp/config/scripts/TE_SIPServer_DHCP_hwonly_ip4.script	z:/testdata/scripts/dhcp/te_sipserver_dhcp_hwonly_ip4.script
 ../te_dhcp/config/scripts/SipServer_setup.script                z:/testdata/scripts/sipserver_setup.script
 ../te_dhcp/config/scripts/TE_SIPServerTesting.script            z:/testdata/scripts/te_sipservertesting.script
 ../te_dhcp/config/scripts/SipServer.xml                         z:/testdata/configs/sipserver.xml
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/dhcp/te_dhcp/config/scripts/DHCP_OOM6_ip4_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dhcp/te_dhcp/config/scripts/DHCP_OOM6_ip4_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,51 @@
+//
+// 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:
+//
+#
+# OOM test for DHCPv4. Here we use CommsDB with ipv4 settings
+#
+#   ORDER IS IMPORTANT! SetIAPToUse and SetAddressMode lines affect the operation of the subsequent commands
+
+# Unload esock forcefully
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+# Configure commdb
+# This config file has explicit settings for IPv4
+
+//ced -i z:\TestData\configs\DHCP\DHCPced_ip4.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+
+RUN_UTILS CopyFile z:\testdata\configs\dhcp\cccccc00_dhcptest_ip4.cre c:\private\10202be9\persists\cccccc00.cre
+
+load_suite DhcpTestServer
+
+# Load esock
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+
+START_TESTCASE          NET-Dhcp-1701
+//! @SYMTestCaseID      NET-Dhcp-1701
+run_test_step 5 DhcpTestServer SetAddressMode z:\TestData\configs\DHCP\dhcptest.ini IPv4
+run_test_step 5 DhcpTestServer SetIAPToUse z:\TestData\configs\DHCP\dhcptest.ini EtherWithDaemonNet1
+run_test_step 1200 DhcpTestServer OOM_1 z:\TestData\configs\DHCP\dhcptest.ini
+END_TESTCASE            NET-Dhcp-1701
+
+# Stop all interfaces
+RUN_SCRIPT Z:\TestData\Scripts\te_esock_test_stopallinterfaces.script
+
+# Unload esock
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/dhcp/te_dhcp/config/scripts/DHCP_OOM6_ip6_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dhcp/te_dhcp/config/scripts/DHCP_OOM6_ip6_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,51 @@
+//
+// 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:
+//
+#
+# OOM test for DHCPv6. Here we use CommsDB with ipv6 settings
+#
+#   ORDER IS IMPORTANT! SetIAPToUse and SetAddressMode lines affect the operation of the subsequent commands
+
+# Unload esock forcefully
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+# Configure commdb
+# This config file has explicit settings for IPv6
+
+//ced -i z:\TestData\configs\DHCP\DHCPced_ip6.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+
+RUN_UTILS CopyFile z:\testdata\configs\dhcp\cccccc00_dhcptest_ip6.cre c:\private\10202be9\persists\cccccc00.cre
+
+load_suite DhcpTestServer
+
+# Load esock
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+
+START_TESTCASE          NET-Dhcp-1801
+//! @SYMTestCaseID      NET-Dhcp-1801
+run_test_step 5 DhcpTestServer SetAddressMode z:\TestData\configs\DHCP\dhcptest.ini IPv6
+run_test_step 5 DhcpTestServer SetIAPToUse z:\TestData\configs\DHCP\dhcptest.ini EtherWithDaemonNet1
+run_test_step 1200 DhcpTestServer OOM_1 z:\TestData\configs\DHCP\dhcptest.ini
+END_TESTCASE            NET-Dhcp-1801
+
+# Stop all interfaces
+RUN_SCRIPT Z:\TestData\Scripts\te_esock_test_stopallinterfaces.script
+
+# Unload esock
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/dhcp/te_dhcp/config/scripts/TE_SIPServer_DHCP_hwonly_ip4_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dhcp/te_dhcp/config/scripts/TE_SIPServer_DHCP_hwonly_ip4_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,129 @@
+//
+// 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:
+//
+#
+#	Script file for DHCP testing on IPv4
+#
+#   ORDER IS IMPORTANT! SetIAPToUse and SetAddressMode lines affect the operation of the subsequent commands
+
+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:\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\SIP_Server_simtsy_config.txt c:\config.txt
+RUN_UTILS  CopyFile z:\TestData\Configs\te_sipservertesting_loopback.ini c:\loopback.ini
+RUN_UTILS  CopyFile z:\TestData\Configs\te_sipservertesting_qospolicies.ini c:\qospolicies.ini
+RUN_UTILS  CopyFile z:\TestData\Configs\te_sipservertesting_qospolicies.ini c:\private\101F7989\esock\qospolicies.ini
+RUN_UTILS  MakeReadWrite c:\simtsy\config.txt
+RUN_UTILS  MakeReadWrite c:\config.txt
+
+# Unload esock forcefully
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+# Configure commdb
+# This config file has explicit settings for IPv4
+
+//ced -i z:\TestData\configs\DHCP\DHCPced_ip4.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+
+RUN_UTILS CopyFile z:\testdata\configs\dhcp\cccccc00_dhcptest_ip4.cre c:\private\10202be9\persists\cccccc00.cre
+
+# Load esock
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+
+load_suite DhcpTestServer
+
+# Load esock
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+
+START_TESTCASE          NET-Dhcp-2201
+//! @SYMTestCaseID      NET-Dhcp-2201
+run_test_step 5 DhcpTestServer SetAddressMode z:\TestData\configs\DHCP\dhcptest.ini IPv4
+END_TESTCASE            NET-Dhcp-2201
+
+START_TESTCASE          NET-Dhcp-2202
+//! @SYMTestCaseID      NET-Dhcp-2202
+////////////////////////
+// SET IAP TO DYNAMIC //
+run_test_step 5 DhcpTestServer SetIAPToUse z:\TestData\configs\DHCP\dhcptest.ini EtherWithDaemonNet1
+////////////////////////
+END_TESTCASE            NET-Dhcp-2202
+
+// Test 2_13 - for receiving SIP address option via DHCP
+START_TESTCASE          NET-Dhcp-2203
+//! @SYMTestCaseID      NET-Dhcp-2203
+run_test_step 50 DhcpTestServer 2_GetSIPAddrViaDHCP z:\TestData\configs\DHCP\dhcptest.ini ExpectDHCPResponseBeforeCompletion
+END_TESTCASE            NET-Dhcp-2203
+
+// Test 2_14 - for receiving SIP domain option via DHCP
+START_TESTCASE          NET-Dhcp-2204
+//! @SYMTestCaseID      NET-Dhcp-2204
+run_test_step 50 DhcpTestServer 2_GetSIPDomain	z:\TestData\configs\DHCP\dhcptest.ini ExpectDHCPResponseBeforeCompletion
+END_TESTCASE            NET-Dhcp-2204
+
+START_TESTCASE          NET-Dhcp-2205
+//! @SYMTestCaseID      NET-Dhcp-2205
+///////////////////////////////////////////////////////
+// SET IAP TO STATIC IP STATIC DNS (DHCP STILL RUNS) //
+run_test_step 5 DhcpTestServer SetIAPToUse z:\TestData\configs\DHCP\dhcptest.ini EtherWithDaemon_StaticAddr_StaticDNS
+///////////////////////////////////////////////////////
+END_TESTCASE            NET-Dhcp-2205
+
+// Test 2_16 - after defect 69825 (INFORM mode must return immediately when IP address and DNS address are static)
+START_TESTCASE          NET-Dhcp-2206
+//! @SYMTestCaseID      NET-Dhcp-2206
+run_test_step 50 DhcpTestServer 2_GetRaw	z:\TestData\configs\DHCP\dhcptest.ini ExpectImmediateCompletion
+END_TESTCASE            NET-Dhcp-2206
+
+// Test 2_17 - INFORM Test for receiving SIP address option via DHCP
+START_TESTCASE          NET-Dhcp-2207
+//! @SYMTestCaseID      NET-Dhcp-2207
+run_test_step 50 DhcpTestServer 2_GetSIPAddrViaDHCP	z:\TestData\configs\DHCP\dhcptest.ini ExpectImmediateCompletion
+END_TESTCASE            NET-Dhcp-2207
+
+// Test 2_18 - INFORM Test for receiving SIP domain option
+START_TESTCASE          NET-Dhcp-2208
+//! @SYMTestCaseID      NET-Dhcp-2208
+run_test_step 50 DhcpTestServer 2_GetSIPDomain	z:\TestData\configs\DHCP\dhcptest.ini ExpectImmediateCompletion
+END_TESTCASE            NET-Dhcp-2208
+
+# Stop all interfaces
+RUN_SCRIPT Z:\TestData\Scripts\te_esock_test_stopallinterfaces.script
+
+# Unload esock
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
+// Cleanup
+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
+
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/dhcp/te_dhcp/config/scripts/cccccc00_dhcptest_ip4.cre
Binary file tcpiputils/dhcp/te_dhcp/config/scripts/cccccc00_dhcptest_ip4.cre has changed
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/dhcp/te_dhcp/config/scripts/cccccc00_dhcptest_ip6.cre
Binary file tcpiputils/dhcp/te_dhcp/config/scripts/cccccc00_dhcptest_ip6.cre has changed
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/dhcp/te_dhcp/config/scripts/dhcptest_ip4_wlan.cfg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dhcp/te_dhcp/config/scripts/dhcptest_ip4_wlan.cfg	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,1109 @@
+//
+// Name        : aino_gprs.cfg
+// Part of     : Aino STIF test module
+// Description : Aino WLAN config
+//
+// Author      : $Author: jojokine $
+// Revision    : $Revision: 19100 $
+// Date        : $Date: 2010-01-13 11:45:03 +0200 (Wed, 13 Jan 2010) $
+//
+// Copyright (C) 2010 Nokia Corporation.
+// This material, including documentation and any related 
+// computer programs, is protected by copyright controlled by 
+// Nokia Corporation. All rights are reserved. Copying, 
+// including reproducing, storing,  adapting or translating, any 
+// or all of this material requires the prior written consent of 
+// Nokia Corporation. This material also contains confidential 
+// information which may not be disclosed to others without the 
+// prior written consent of Nokia Corporation.
+//
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANStaticIPNoMask
+//-------------------------------------------------------
+[Configuration]
+Name=LANStaticIPNoMask
+AllowDuplicates=FALSE
+
+[Network]
+	Name=LANStaticIPNoMask
+[EndNetwork]
+
+[Location]
+    UseDefault=TRUE
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+	Name=LANStaticIPNoMask
+	IAPServiceType=LANService
+	IAPBearerType=LANBearer
+	IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+    UseDefault=TRUE
+	Name=WLANBearer
+	IfName=wlannif
+	LDDName=
+	PDDName=
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=1
+	LastSocketClosedTimeout=-1
+	Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+	Name=LANStaticIPNoMask
+	IfNetworks=ip
+	IpNetMask=0.0.0.0
+	IpGateway=192.168.0.2
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.0.8
+	IpDNSAddrFromServer=FALSE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.52
+	Ip6DnsAddrFromServer=TRUE
+	Ip6NameServer1=0:0:0:0:0:0:0:0
+	Ip6NameServer2=0:0:0:0:0:0:0:0
+	IpAddrLeaseValidFrom=0
+	ConfigDaemonManagerName=NetCfgExtnDhcp
+	ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+	Name=LANStaticIPNoMask
+	CurrentBearer=WAPIPBearer
+[EndWapAp]
+	
+
+[WapIpBearer]
+	Name=LANStaticIPNoMask
+	GatewayAddress=0.0.0.0
+	WSPOption=1
+	Security=FALSE
+	ProxyPortNumber=0
+[EndWapIpBearer]
+	
+[WlanService]
+	WlanConnMode=1
+	WlanSSID=AP#3
+	WlanWepKey1=
+	WlanWepKey2=
+	WlanWepKey3=
+	WlanWepKey4=
+	WlanWepIndex=0
+    WlanSecMode=1
+    WlanAuthMode=0
+    WlanEnableWpaPsk=FALSE
+    WlanWpaPreSharedKey=
+    WlanScanSSID=FALSE
+    WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANStaticIPNoGateway
+//-------------------------------------------------------
+[Configuration]
+Name=LANStaticIPNoGateway
+AllowDuplicates=FALSE
+
+[Network]
+	Name=LANStaticIPNoGateway
+[EndNetwork]
+
+[Location]
+    UseDefault=TRUE
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+	Name=LANStaticIPNoGateway
+	IAPServiceType=LANService
+	IAPBearerType=LANBearer
+	IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+    UseDefault=TRUE
+	Name=WLANBearer
+	IfName=wlannif
+	LDDName=
+	PDDName=
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=1
+	LastSocketClosedTimeout=-1
+	Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+	Name=LANStaticIPNoGateway
+	IfNetworks=ip
+	IpNetMask=255.255.255.0
+	IpGateway=0.0.0.0
+	IpAddrFromServer=TRUE
+	IpAddr=192.168.0.8
+	IpDNSAddrFromServer=FALSE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.52
+	Ip6DnsAddrFromServer=FALSE
+	Ip6NameServer1=0:0:0:0:0:0:0:0
+	Ip6NameServer2=0:0:0:0:0:0:0:0
+	IpAddrLeaseValidFrom=0
+	ConfigDaemonManagerName=NetCfgExtnDhcp
+	ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+	Name=LANStaticIPNoGateway
+	CurrentBearer=WAPIPBearer
+[EndWapAp]
+	
+
+[WapIpBearer]
+	Name=LANStaticIPNoGateway
+	GatewayAddress=0.0.0.0
+	WSPOption=1
+	Security=FALSE
+	ProxyPortNumber=0
+[EndWapIpBearer]
+	
+[WlanService]
+	WlanConnMode=1
+	WlanSSID=AP#3
+	WlanWepKey1=
+	WlanWepKey2=
+	WlanWepKey3=
+	WlanWepKey4=
+	WlanWepIndex=0
+    WlanSecMode=1
+    WlanAuthMode=0
+    WlanEnableWpaPsk=FALSE
+    WlanWpaPreSharedKey=
+    WlanScanSSID=FALSE
+    WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANStaticIPNoDNSservers
+//-------------------------------------------------------
+[Configuration]
+Name=LANStaticIPNoDNSservers
+AllowDuplicates=FALSE
+
+[Network]
+	Name=LANStaticIPNoDNSservers
+[EndNetwork]
+
+[Location]
+    UseDefault=TRUE
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+	Name=LANStaticIPNoDNSservers
+	IAPServiceType=LANService
+	IAPBearerType=LANBearer
+	IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+    UseDefault=TRUE
+	Name=WLANBearer
+	IfName=wlannif
+	LDDName=
+	PDDName=
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=1
+	LastSocketClosedTimeout=-1
+	Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+	Name=LANStaticIPNoDNSservers
+	IfNetworks=ip
+	IpNetMask=255.255.255.0
+	IpGateway=192.168.0.2
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.0.8
+	IpDNSAddrFromServer=FALSE
+	IpNameServer1=0.0.0.0
+	IpNameServer2=0.0.0.0
+	Ip6DnsAddrFromServer=TRUE
+	Ip6NameServer1=0:0:0:0:0:0:0:0
+	Ip6NameServer2=0:0:0:0:0:0:0:0
+	IpAddrLeaseValidFrom=0
+	ConfigDaemonManagerName=NetCfgExtnDhcp
+	ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+	Name=LANStaticIPNoDNSservers
+	CurrentBearer=WAPIPBearer
+[EndWapAp]
+	
+
+[WapIpBearer]
+	Name=LANStaticIPNoDNSservers
+	GatewayAddress=0.0.0.0
+	WSPOption=1
+	Security=FALSE
+	ProxyPortNumber=0
+[EndWapIpBearer]
+	
+[WlanService]
+	WlanConnMode=1
+	WlanSSID=AP#3
+	WlanWepKey1=
+	WlanWepKey2=
+	WlanWepKey3=
+	WlanWepKey4=
+	WlanWepIndex=0
+    WlanSecMode=1
+    WlanAuthMode=0
+    WlanEnableWpaPsk=FALSE
+    WlanWpaPreSharedKey=
+    WlanScanSSID=FALSE
+    WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - placeholder4
+//-------------------------------------------------------
+[Configuration]
+Name=placeholder4
+AllowDuplicates=FALSE
+
+[Network]
+	Name=placeholder4
+[EndNetwork]
+
+[Location]
+    UseDefault=TRUE
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+	Name=placeholder4
+	IAPServiceType=LANService
+	IAPBearerType=LANBearer
+	IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+    UseDefault=TRUE
+	Name=WLANBearer
+	IfName=wlannif
+	LDDName=
+	PDDName=
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=1
+	LastSocketClosedTimeout=-1
+	Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+	Name=placeholder4
+	IfNetworks=ip
+	IpNetMask=255.255.255.0
+	IpGateway=10.32.194.254
+	IpAddrFromServer=TRUE
+	IpAddr=10.32.194.251
+	IpDNSAddrFromServer=TRUE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.52
+	Ip6DnsAddrFromServer=TRUE
+	Ip6NameServer1=0:0:0:0:0:0:0:0
+	Ip6NameServer2=0:0:0:0:0:0:0:0
+	IpAddrLeaseValidFrom=0
+	ConfigDaemonManagerName=NetCfgExtnDhcp
+	ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+	Name=placeholder4
+	CurrentBearer=WAPIPBearer
+[EndWapAp]
+	
+
+[WapIpBearer]
+	Name=placeholder4
+	GatewayAddress=0.0.0.0
+	WSPOption=1
+	Security=FALSE
+	ProxyPortNumber=0
+[EndWapIpBearer]
+	
+[WlanService]
+	WlanConnMode=1
+	WlanSSID=AP#3
+	WlanWepKey1=
+	WlanWepKey2=
+	WlanWepKey3=
+	WlanWepKey4=
+	WlanWepIndex=0
+    WlanSecMode=1
+    WlanAuthMode=0
+    WlanEnableWpaPsk=FALSE
+    WlanWpaPreSharedKey=
+    WlanScanSSID=FALSE
+    WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - placeholder5
+//-------------------------------------------------------
+[Configuration]
+Name=placeholder5
+AllowDuplicates=FALSE
+
+[Network]
+	Name=placeholder5
+[EndNetwork]
+
+[Location]
+    UseDefault=TRUE
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+	Name=placeholder5
+	IAPServiceType=LANService
+	IAPBearerType=LANBearer
+	IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+    UseDefault=TRUE
+	Name=WLANBearer
+	IfName=wlannif
+	LDDName=
+	PDDName=
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=1
+	LastSocketClosedTimeout=-1
+	Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+	Name=placeholder5
+	IfNetworks=ip
+	IpNetMask=255.255.255.0
+	IpGateway=10.32.194.254
+	IpAddrFromServer=TRUE
+	IpAddr=10.32.194.251
+	IpDNSAddrFromServer=TRUE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.52
+	Ip6DnsAddrFromServer=TRUE
+	Ip6NameServer1=0:0:0:0:0:0:0:0
+	Ip6NameServer2=0:0:0:0:0:0:0:0
+	IpAddrLeaseValidFrom=0
+	ConfigDaemonManagerName=NetCfgExtnDhcp
+	ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+	Name=placeholder5
+	CurrentBearer=WAPIPBearer
+[EndWapAp]
+	
+
+[WapIpBearer]
+	Name=placeholder5
+	GatewayAddress=0.0.0.0
+	WSPOption=1
+	Security=FALSE
+	ProxyPortNumber=0
+[EndWapIpBearer]
+	
+[WlanService]
+	WlanConnMode=1
+	WlanSSID=AP#3
+	WlanWepKey1=
+	WlanWepKey2=
+	WlanWepKey3=
+	WlanWepKey4=
+	WlanWepIndex=0
+    WlanSecMode=1
+    WlanAuthMode=0
+    WlanEnableWpaPsk=FALSE
+    WlanWpaPreSharedKey=
+    WlanScanSSID=FALSE
+    WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANIAPNoDaemon
+//-------------------------------------------------------
+[Configuration]
+Name=LANIAPNoDaemon
+AllowDuplicates=FALSE
+
+[Network]
+	Name=LANIAPNoDaemon
+[EndNetwork]
+
+[Location]
+    UseDefault=TRUE
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+	Name=LANIAPNoDaemon
+	IAPServiceType=LANService
+	IAPBearerType=LANBearer
+	IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+    UseDefault=TRUE
+	Name=WLANBearer
+	IfName=wlannif
+	LDDName=
+	PDDName=
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=1
+	LastSocketClosedTimeout=-1
+	Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+	Name=LANIAPNoDaemon
+	IfNetworks=ip
+	IpNetMask=255.255.255.0
+	IpGateway=10.32.194.254
+	IpAddrFromServer=FALSE
+	IpAddr=10.32.194.251
+	IpDNSAddrFromServer=TRUE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.52
+	Ip6DnsAddrFromServer=TRUE
+	Ip6NameServer1=0:0:0:0:0:0:0:0
+	Ip6NameServer2=0:0:0:0:0:0:0:0
+	IpAddrLeaseValidFrom=0
+[EndLanService]
+
+[WapAp]
+	Name=LANIAPNoDaemon
+	CurrentBearer=WAPIPBearer
+[EndWapAp]
+	
+
+[WapIpBearer]
+	Name=LANIAPNoDaemon
+	GatewayAddress=0.0.0.0
+	WSPOption=1
+	Security=FALSE
+	ProxyPortNumber=0
+[EndWapIpBearer]
+	
+[WlanService]
+	WlanConnMode=1
+	WlanSSID=AP#3
+	WlanWepKey1=
+	WlanWepKey2=
+	WlanWepKey3=
+	WlanWepKey4=
+	WlanWepIndex=0
+    WlanSecMode=1
+    WlanAuthMode=0
+    WlanEnableWpaPsk=FALSE
+    WlanWpaPreSharedKey=
+    WlanScanSSID=FALSE
+    WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANIAPBadDaemon
+//-------------------------------------------------------
+[Configuration]
+Name=LANIAPBadDaemon
+AllowDuplicates=FALSE
+
+[Network]
+	Name=LANIAPBadDaemon
+[EndNetwork]
+
+[Location]
+    UseDefault=TRUE
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+	Name=LANIAPBadDaemon
+	IAPServiceType=LANService
+	IAPBearerType=LANBearer
+	IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+    UseDefault=TRUE
+	Name=WLANBearer
+	IfName=wlannif
+	LDDName=
+	PDDName=
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=1
+	LastSocketClosedTimeout=-1
+	Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+	Name=LANIAPBadDaemon
+	IfNetworks=ip
+	IpNetMask=255.255.255.0
+	IpGateway=10.32.194.254
+	IpAddrFromServer=FALSE
+	IpAddr=10.32.194.251
+	IpDNSAddrFromServer=TRUE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.52
+	Ip6DnsAddrFromServer=TRUE
+	Ip6NameServer1=0:0:0:0:0:0:0:0
+	Ip6NameServer2=0:0:0:0:0:0:0:0
+	IpAddrLeaseValidFrom=0
+	ConfigDaemonManagerName=NonExistingServ
+	ConfigDaemonName=NonExistingServ
+[EndLanService]
+
+[WapAp]
+	Name=LANIAPBadDaemon
+	CurrentBearer=WAPIPBearer
+[EndWapAp]
+	
+
+[WapIpBearer]
+	Name=LANIAPBadDaemon
+	GatewayAddress=0.0.0.0
+	WSPOption=1
+	Security=FALSE
+	ProxyPortNumber=0
+[EndWapIpBearer]
+	
+[WlanService]
+	WlanConnMode=1
+	WlanSSID=AP#3
+	WlanWepKey1=
+	WlanWepKey2=
+	WlanWepKey3=
+	WlanWepKey4=
+	WlanWepIndex=0
+    WlanSecMode=1
+    WlanAuthMode=0
+    WlanEnableWpaPsk=FALSE
+    WlanWpaPreSharedKey=
+    WlanScanSSID=FALSE
+    WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANIAPStaticIP1
+//-------------------------------------------------------
+[Configuration]
+Name=LANIAPStaticIP1
+AllowDuplicates=FALSE
+
+[Network]
+	Name=LANIAPStaticIP1
+[EndNetwork]
+
+[Location]
+    UseDefault=TRUE
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+	Name=LANIAPStaticIP1
+	IAPServiceType=LANService
+	IAPBearerType=LANBearer
+	IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+    UseDefault=TRUE
+	Name=WLANBearer
+	IfName=wlannif
+	LDDName=
+	PDDName=
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=1
+	LastSocketClosedTimeout=-1
+	Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+	Name=LANIAPStaticIP1
+	IfNetworks=ip
+	IpNetMask=255.255.255.0
+	IpGateway=192.168.0.2
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.0.8
+	IpDNSAddrFromServer=TRUE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.52
+	Ip6DnsAddrFromServer=TRUE
+	Ip6NameServer1=0:0:0:0:0:0:0:0
+	Ip6NameServer2=0:0:0:0:0:0:0:0
+	IpAddrLeaseValidFrom=0
+	ConfigDaemonManagerName=NetCfgExtnDhcp
+	ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+	Name=LANIAPStaticIP1
+	CurrentBearer=WAPIPBearer
+[EndWapAp]
+	
+
+[WapIpBearer]
+	Name=LANIAPStaticIP1
+	GatewayAddress=0.0.0.0
+	WSPOption=1
+	Security=FALSE
+	ProxyPortNumber=0
+[EndWapIpBearer]
+	
+[WlanService]
+	WlanConnMode=1
+	WlanSSID=AP#3
+	WlanWepKey1=
+	WlanWepKey2=
+	WlanWepKey3=
+	WlanWepKey4=
+	WlanWepIndex=0
+    WlanSecMode=1
+    WlanAuthMode=0
+    WlanEnableWpaPsk=FALSE
+    WlanWpaPreSharedKey=
+    WlanScanSSID=FALSE
+    WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANIAPStaticIP2
+//-------------------------------------------------------
+[Configuration]
+Name=LANIAPStaticIP2
+AllowDuplicates=FALSE
+
+[Network]
+	Name=LANIAPStaticIP2
+[EndNetwork]
+
+[Location]
+    UseDefault=TRUE
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+	Name=LANIAPStaticIP2
+	IAPServiceType=LANService
+	IAPBearerType=LANBearer
+	IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+    UseDefault=TRUE
+	Name=WLANBearer
+	IfName=wlannif
+	LDDName=
+	PDDName=
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=1
+	LastSocketClosedTimeout=-1
+	Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+	Name=LANIAPStaticIP2
+	IfNetworks=ip
+	IpNetMask=255.255.255.0
+	IpGateway=192.168.0.2
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.0.8
+	IpDNSAddrFromServer=TRUE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.52
+	Ip6DnsAddrFromServer=TRUE
+	Ip6NameServer1=0:0:0:0:0:0:0:0
+	Ip6NameServer2=0:0:0:0:0:0:0:0
+	IpAddrLeaseValidFrom=0
+	ConfigDaemonManagerName=NetCfgExtnDhcp
+	ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+	Name=LANIAPStaticIP2
+	CurrentBearer=WAPIPBearer
+[EndWapAp]
+	
+
+[WapIpBearer]
+	Name=LANIAPStaticIP2
+	GatewayAddress=0.0.0.0
+	WSPOption=1
+	Security=FALSE
+	ProxyPortNumber=0
+[EndWapIpBearer]
+	
+[WlanService]
+	WlanConnMode=1
+	WlanSSID=AP#3
+	WlanWepKey1=
+	WlanWepKey2=
+	WlanWepKey3=
+	WlanWepKey4=
+	WlanWepIndex=0
+    WlanSecMode=1
+    WlanAuthMode=0
+    WlanEnableWpaPsk=FALSE
+    WlanWpaPreSharedKey=
+    WlanScanSSID=FALSE
+    WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANIAP1
+//-------------------------------------------------------
+[Configuration]
+Name=LANIAP1
+AllowDuplicates=FALSE
+
+[Network]
+	Name=LANIAP1
+[EndNetwork]
+
+[Location]
+    UseDefault=TRUE
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+	Name=LANIAP1
+	IAPServiceType=LANService
+	IAPBearerType=LANBearer
+	IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+    UseDefault=TRUE
+	Name=WLANBearer
+	IfName=wlannif
+	LDDName=
+	PDDName=
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=1
+	LastSocketClosedTimeout=-1
+	Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+	Name=LANIAP1
+	IfNetworks=ip
+	IpNetMask=255.255.255.0
+	IpGateway=10.32.194.254
+	IpAddrFromServer=TRUE
+	IpAddr=10.32.194.251
+	IpDNSAddrFromServer=TRUE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.52
+	Ip6DnsAddrFromServer=TRUE
+	Ip6NameServer1=0:0:0:0:0:0:0:0
+	Ip6NameServer2=0:0:0:0:0:0:0:0
+	IpAddrLeaseValidFrom=0
+	ConfigDaemonManagerName=NetCfgExtnDhcp
+	ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+	Name=LANIAP1
+	CurrentBearer=WAPIPBearer
+[EndWapAp]
+	
+
+[WapIpBearer]
+	Name=LANIAP1
+	GatewayAddress=0.0.0.0
+	WSPOption=1
+	Security=FALSE
+	ProxyPortNumber=0
+[EndWapIpBearer]
+	
+[WlanService]
+	WlanConnMode=1
+	WlanSSID=AP#3
+	WlanWepKey1=
+	WlanWepKey2=
+	WlanWepKey3=
+	WlanWepKey4=
+	WlanWepIndex=0
+    WlanSecMode=1
+    WlanAuthMode=0
+    WlanEnableWpaPsk=FALSE
+    WlanWpaPreSharedKey=
+    WlanScanSSID=FALSE
+    WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANIAP2
+//-------------------------------------------------------
+[Configuration]
+Name=LANIAP2
+AllowDuplicates=FALSE
+
+[Network]
+	Name=LANIAP2
+[EndNetwork]
+
+[Location]
+    UseDefault=TRUE
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+	Name=LANIAP2
+	IAPServiceType=LANService
+	IAPBearerType=LANBearer
+	IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+    UseDefault=TRUE
+	Name=WLANBearer
+	IfName=wlannif
+	LDDName=
+	PDDName=
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=1
+	LastSocketClosedTimeout=-1
+	Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+	Name=LANIAP2
+	IfNetworks=ip
+	IpNetMask=255.255.255.0
+	IpGateway=10.32.194.254
+	IpAddrFromServer=TRUE
+	IpAddr=10.32.194.251
+	IpDNSAddrFromServer=TRUE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.52
+	Ip6DnsAddrFromServer=TRUE
+	Ip6NameServer1=0:0:0:0:0:0:0:0
+	Ip6NameServer2=0:0:0:0:0:0:0:0
+	IpAddrLeaseValidFrom=0
+	ConfigDaemonManagerName=NetCfgExtnDhcp
+	ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+	Name=LANIAP2
+	CurrentBearer=WAPIPBearer
+[EndWapAp]
+	
+
+[WapIpBearer]
+	Name=LANIAP2
+	GatewayAddress=0.0.0.0
+	WSPOption=1
+	Security=FALSE
+	ProxyPortNumber=0
+[EndWapIpBearer]
+	
+[WlanService]
+	WlanConnMode=1
+	WlanSSID=AP#3
+	WlanWepKey1=
+	WlanWepKey2=
+	WlanWepKey3=
+	WlanWepKey4=
+	WlanWepIndex=0
+    WlanSecMode=1
+    WlanAuthMode=0
+    WlanEnableWpaPsk=FALSE
+    WlanWpaPreSharedKey=
+    WlanScanSSID=FALSE
+    WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANStaticIPStaticDNS
+//-------------------------------------------------------
+[Configuration]
+Name=LANStaticIPStaticDNS
+AllowDuplicates=FALSE
+
+[Network]
+	Name=LANStaticIPStaticDNS
+[EndNetwork]
+
+[Location]
+    UseDefault=TRUE
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+	Name=LANStaticIPStaticDNS
+	IAPServiceType=LANService
+	IAPBearerType=LANBearer
+	IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+    UseDefault=TRUE
+	Name=WLANBearer
+	IfName=wlannif
+	LDDName=
+	PDDName=
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=1
+	LastSocketClosedTimeout=-1
+	Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+	Name=LANStaticIPStaticDNS
+	IfNetworks=ip
+	IpNetMask=255.255.255.0
+	IpGateway=192.168.0.2
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.0.8
+	IpDNSAddrFromServer=FALSE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.52
+	Ip6DnsAddrFromServer=TRUE
+	Ip6NameServer1=0:0:0:0:0:0:0:0
+	Ip6NameServer2=0:0:0:0:0:0:0:0
+	IpAddrLeaseValidFrom=0
+	ConfigDaemonManagerName=NetCfgExtnDhcp
+	ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+	Name=LANStaticIPStaticDNS
+	CurrentBearer=WAPIPBearer
+[EndWapAp]
+	
+
+[WapIpBearer]
+	Name=LANStaticIPStaticDNS
+	GatewayAddress=0.0.0.0
+	WSPOption=1
+	Security=FALSE
+	ProxyPortNumber=0
+[EndWapIpBearer]
+	
+[WlanService]
+	WlanConnMode=1
+	WlanSSID=AP#3
+	WlanWepKey1=
+	WlanWepKey2=
+	WlanWepKey3=
+	WlanWepKey4=
+	WlanWepIndex=0
+    WlanSecMode=1
+    WlanAuthMode=0
+    WlanEnableWpaPsk=FALSE
+    WlanWpaPreSharedKey=
+    WlanScanSSID=FALSE
+    WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
\ No newline at end of file
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/dhcp/te_dhcp/config/scripts/dhcptest_ip6_wlan.cfg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dhcp/te_dhcp/config/scripts/dhcptest_ip6_wlan.cfg	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,1093 @@
+//
+// Name        : aino_gprs.cfg
+// Part of     : Aino STIF test module
+// Description : Aino WLAN config
+//
+// Author      : $Author: jojokine $
+// Revision    : $Revision: 19100 $
+// Date        : $Date: 2010-01-13 11:45:03 +0200 (Wed, 13 Jan 2010) $
+//
+// Copyright (C) 2010 Nokia Corporation.
+// This material, including documentation and any related 
+// computer programs, is protected by copyright controlled by 
+// Nokia Corporation. All rights are reserved. Copying, 
+// including reproducing, storing,  adapting or translating, any 
+// or all of this material requires the prior written consent of 
+// Nokia Corporation. This material also contains confidential 
+// information which may not be disclosed to others without the 
+// prior written consent of Nokia Corporation.
+//
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANStaticIPNoMask
+//-------------------------------------------------------
+[Configuration]
+Name=LANStaticIPNoMask
+AllowDuplicates=FALSE
+
+[Network]
+	Name=LANStaticIPNoMask
+[EndNetwork]
+
+[Location]
+    UseDefault=TRUE
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+	Name=LANStaticIPNoMask
+	IAPServiceType=LANService
+	IAPBearerType=LANBearer
+	IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+    UseDefault=TRUE
+	Name=WLANBearer
+	IfName=wlannif
+	LDDName=
+	PDDName=
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=1
+	LastSocketClosedTimeout=-1
+	Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+	Name=LANStaticIPNoMask
+	IfNetworks=ip6,ip
+	IpNetMask=0.0.0.0
+	IpGateway=192.168.0.2
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.0.8
+	IpDNSAddrFromServer=FALSE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.52
+	Ip6DnsAddrFromServer=FALSE
+	Ip6NameServer1=2001::dd
+	Ip6NameServer2=2001::ee
+	IpAddrLeaseValidFrom=0
+	ConfigDaemonManagerName=NetCfgExtnDhcp
+	ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+	Name=LANStaticIPNoMask
+	CurrentBearer=WAPIPBearer
+[EndWapAp]
+	
+
+[WapIpBearer]
+	Name=LANStaticIPNoMask
+	GatewayAddress=0.0.0.0
+	WSPOption=1
+	Security=FALSE
+	ProxyPortNumber=0
+[EndWapIpBearer]
+	
+[WlanService]
+	WlanConnMode=1
+	WlanSSID=AP#3
+	WlanWepKey1=
+	WlanWepKey2=
+	WlanWepKey3=
+	WlanWepKey4=
+	WlanWepIndex=0
+    WlanSecMode=1
+    WlanAuthMode=0
+    WlanEnableWpaPsk=FALSE
+    WlanWpaPreSharedKey=
+    WlanScanSSID=FALSE
+    WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANStaticIPNoGateway
+//-------------------------------------------------------
+[Configuration]
+Name=LANStaticIPNoGateway
+AllowDuplicates=FALSE
+
+[Network]
+	Name=LANStaticIPNoGateway
+[EndNetwork]
+
+[Location]
+    UseDefault=TRUE
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+	Name=LANStaticIPNoGateway
+	IAPServiceType=LANService
+	IAPBearerType=LANBearer
+	IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+    UseDefault=TRUE
+	Name=WLANBearer
+	IfName=wlannif
+	LDDName=
+	PDDName=
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=1
+	LastSocketClosedTimeout=-1
+	Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+	Name=LANStaticIPNoGateway
+	IfNetworks=ip6,ip
+	IpNetMask=255.255.255.0
+	IpGateway=0.0.0.0
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.0.8
+	IpDNSAddrFromServer=FALSE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.52
+	Ip6DnsAddrFromServer=FALSE
+	Ip6NameServer1=2001::dd
+	Ip6NameServer2=2001::ee
+	IpAddrLeaseValidFrom=0
+	ConfigDaemonManagerName=NetCfgExtnDhcp
+	ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+	Name=LANStaticIPNoGateway
+	CurrentBearer=WAPIPBearer
+[EndWapAp]
+	
+
+[WapIpBearer]
+	Name=LANStaticIPNoGateway
+	GatewayAddress=0.0.0.0
+	WSPOption=1
+	Security=FALSE
+	ProxyPortNumber=0
+[EndWapIpBearer]
+	
+[WlanService]
+	WlanConnMode=1
+	WlanSSID=AP#3
+	WlanWepKey1=
+	WlanWepKey2=
+	WlanWepKey3=
+	WlanWepKey4=
+	WlanWepIndex=0
+    WlanSecMode=1
+    WlanAuthMode=0
+    WlanEnableWpaPsk=FALSE
+    WlanWpaPreSharedKey=
+    WlanScanSSID=FALSE
+    WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANStaticIPNoDNSservers
+//-------------------------------------------------------
+[Configuration]
+Name=LANStaticIPNoDNSservers
+AllowDuplicates=FALSE
+
+[Network]
+	Name=LANStaticIPNoDNSservers
+[EndNetwork]
+
+[Location]
+    UseDefault=TRUE
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+	Name=LANStaticIPNoDNSservers
+	IAPServiceType=LANService
+	IAPBearerType=LANBearer
+	IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+    UseDefault=TRUE
+	Name=WLANBearer
+	IfName=wlannif
+	LDDName=
+	PDDName=
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=1
+	LastSocketClosedTimeout=-1
+	Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+	Name=LANStaticIPNoDNSservers
+	IfNetworks=ip6,ip
+	IpNetMask=255.255.255.0
+	IpGateway=192.168.0.2
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.0.8
+	IpDNSAddrFromServer=FALSE
+	IpNameServer1=0.0.0.0
+	IpNameServer2=0.0.0.0
+	Ip6DnsAddrFromServer=FALSE
+	Ip6NameServer1=0:0:0:0:0:0:0:0
+	Ip6NameServer2=0:0:0:0:0:0:0:0
+	IpAddrLeaseValidFrom=0
+	ConfigDaemonManagerName=NetCfgExtnDhcp
+	ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+	Name=LANStaticIPNoDNSservers
+	CurrentBearer=WAPIPBearer
+[EndWapAp]
+	
+
+[WapIpBearer]
+	Name=LANStaticIPNoDNSservers
+	GatewayAddress=0.0.0.0
+	WSPOption=1
+	Security=FALSE
+	ProxyPortNumber=0
+[EndWapIpBearer]
+	
+[WlanService]
+	WlanConnMode=1
+	WlanSSID=AP#3
+	WlanWepKey1=
+	WlanWepKey2=
+	WlanWepKey3=
+	WlanWepKey4=
+	WlanWepIndex=0
+    WlanSecMode=1
+    WlanAuthMode=0
+    WlanEnableWpaPsk=FALSE
+    WlanWpaPreSharedKey=
+    WlanScanSSID=FALSE
+    WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - placeholder4
+//-------------------------------------------------------
+[Configuration]
+Name=placeholder4
+AllowDuplicates=FALSE
+
+[Network]
+	Name=placeholder4
+[EndNetwork]
+
+[Location]
+    UseDefault=TRUE
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+	Name=placeholder4
+	IAPServiceType=LANService
+	IAPBearerType=LANBearer
+	IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+    UseDefault=TRUE
+	Name=WLANBearer
+	IfName=wlannif
+	LDDName=
+	PDDName=
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=1
+	LastSocketClosedTimeout=-1
+	Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+	Name=placeholder4
+	IfNetworks=ip6,ip
+	IpNetMask=255.255.255.0
+	IpGateway=10.32.194.254
+	IpAddrFromServer=TRUE
+	IpAddr=10.32.194.251
+	IpDNSAddrFromServer=TRUE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.52
+	Ip6DnsAddrFromServer=TRUE
+	IpAddrLeaseValidFrom=0
+	ConfigDaemonManagerName=NetCfgExtnDhcp
+	ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+	Name=placeholder4
+	CurrentBearer=WAPIPBearer
+[EndWapAp]
+	
+
+[WapIpBearer]
+	Name=placeholder4
+	GatewayAddress=0.0.0.0
+	WSPOption=1
+	Security=FALSE
+	ProxyPortNumber=0
+[EndWapIpBearer]
+	
+[WlanService]
+	WlanConnMode=1
+	WlanSSID=AP#3
+	WlanWepKey1=
+	WlanWepKey2=
+	WlanWepKey3=
+	WlanWepKey4=
+	WlanWepIndex=0
+    WlanSecMode=1
+    WlanAuthMode=0
+    WlanEnableWpaPsk=FALSE
+    WlanWpaPreSharedKey=
+    WlanScanSSID=FALSE
+    WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - placeholder5
+//-------------------------------------------------------
+[Configuration]
+Name=placeholder5
+AllowDuplicates=FALSE
+
+[Network]
+	Name=placeholder5
+[EndNetwork]
+
+[Location]
+    UseDefault=TRUE
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+	Name=placeholder5
+	IAPServiceType=LANService
+	IAPBearerType=LANBearer
+	IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+    UseDefault=TRUE
+	Name=WLANBearer
+	IfName=wlannif
+	LDDName=
+	PDDName=
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=1
+	LastSocketClosedTimeout=-1
+	Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+	Name=placeholder5
+	IfNetworks=ip6,ip
+	IpNetMask=255.255.255.0
+	IpGateway=10.32.194.254
+	IpAddrFromServer=TRUE
+	IpAddr=10.32.194.251
+	IpDNSAddrFromServer=TRUE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.52
+	Ip6DnsAddrFromServer=TRUE
+	IpAddrLeaseValidFrom=0
+	ConfigDaemonManagerName=NetCfgExtnDhcp
+	ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+	Name=placeholder5
+	CurrentBearer=WAPIPBearer
+[EndWapAp]
+	
+
+[WapIpBearer]
+	Name=placeholder5
+	GatewayAddress=0.0.0.0
+	WSPOption=1
+	Security=FALSE
+	ProxyPortNumber=0
+[EndWapIpBearer]
+	
+[WlanService]
+	WlanConnMode=1
+	WlanSSID=AP#3
+	WlanWepKey1=
+	WlanWepKey2=
+	WlanWepKey3=
+	WlanWepKey4=
+	WlanWepIndex=0
+    WlanSecMode=1
+    WlanAuthMode=0
+    WlanEnableWpaPsk=FALSE
+    WlanWpaPreSharedKey=
+    WlanScanSSID=FALSE
+    WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANIAPNoDaemon
+//-------------------------------------------------------
+[Configuration]
+Name=LANIAPNoDaemon
+AllowDuplicates=FALSE
+
+[Network]
+	Name=LANIAPNoDaemon
+[EndNetwork]
+
+[Location]
+    UseDefault=TRUE
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+	Name=LANIAPNoDaemon
+	IAPServiceType=LANService
+	IAPBearerType=LANBearer
+	IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+    UseDefault=TRUE
+	Name=WLANBearer
+	IfName=wlannif
+	LDDName=
+	PDDName=
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=1
+	LastSocketClosedTimeout=-1
+	Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+	Name=LANIAPNoDaemon
+	IfNetworks=ip6,ip
+	IpNetMask=255.255.255.0
+	IpGateway=10.32.194.254
+	IpAddrFromServer=FALSE
+	IpAddr=10.32.194.251
+	IpDNSAddrFromServer=TRUE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.52
+	Ip6DnsAddrFromServer=TRUE
+	IpAddrLeaseValidFrom=0
+[EndLanService]
+
+[WapAp]
+	Name=LANIAPNoDaemon
+	CurrentBearer=WAPIPBearer
+[EndWapAp]
+	
+
+[WapIpBearer]
+	Name=LANIAPNoDaemon
+	GatewayAddress=0.0.0.0
+	WSPOption=1
+	Security=FALSE
+	ProxyPortNumber=0
+[EndWapIpBearer]
+	
+[WlanService]
+	WlanConnMode=1
+	WlanSSID=AP#3
+	WlanWepKey1=
+	WlanWepKey2=
+	WlanWepKey3=
+	WlanWepKey4=
+	WlanWepIndex=0
+    WlanSecMode=1
+    WlanAuthMode=0
+    WlanEnableWpaPsk=FALSE
+    WlanWpaPreSharedKey=
+    WlanScanSSID=FALSE
+    WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANIAPBadDaemon
+//-------------------------------------------------------
+[Configuration]
+Name=LANIAPBadDaemon
+AllowDuplicates=FALSE
+
+[Network]
+	Name=LANIAPBadDaemon
+[EndNetwork]
+
+[Location]
+    UseDefault=TRUE
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+	Name=LANIAPBadDaemon
+	IAPServiceType=LANService
+	IAPBearerType=LANBearer
+	IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+    UseDefault=TRUE
+	Name=WLANBearer
+	IfName=wlannif
+	LDDName=
+	PDDName=
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=1
+	LastSocketClosedTimeout=-1
+	Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+	Name=LANIAPBadDaemon
+	IfNetworks=ip6,ip
+	IpNetMask=255.255.255.0
+	IpGateway=10.32.194.254
+	IpAddrFromServer=FALSE
+	IpAddr=10.32.194.251
+	IpDNSAddrFromServer=TRUE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.52
+	Ip6DnsAddrFromServer=TRUE
+	IpAddrLeaseValidFrom=0
+	ConfigDaemonManagerName=NonExistingServ
+	ConfigDaemonName=NonExistingServ
+[EndLanService]
+
+[WapAp]
+	Name=LANIAPBadDaemon
+	CurrentBearer=WAPIPBearer
+[EndWapAp]
+	
+
+[WapIpBearer]
+	Name=LANIAPBadDaemon
+	GatewayAddress=0.0.0.0
+	WSPOption=1
+	Security=FALSE
+	ProxyPortNumber=0
+[EndWapIpBearer]
+	
+[WlanService]
+	WlanConnMode=1
+	WlanSSID=AP#3
+	WlanWepKey1=
+	WlanWepKey2=
+	WlanWepKey3=
+	WlanWepKey4=
+	WlanWepIndex=0
+    WlanSecMode=1
+    WlanAuthMode=0
+    WlanEnableWpaPsk=FALSE
+    WlanWpaPreSharedKey=
+    WlanScanSSID=FALSE
+    WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANIAPStaticIP1
+//-------------------------------------------------------
+[Configuration]
+Name=LANIAPStaticIP1
+AllowDuplicates=FALSE
+
+[Network]
+	Name=LANIAPStaticIP1
+[EndNetwork]
+
+[Location]
+    UseDefault=TRUE
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+	Name=LANIAPStaticIP1
+	IAPServiceType=LANService
+	IAPBearerType=LANBearer
+	IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+    UseDefault=TRUE
+	Name=WLANBearer
+	IfName=wlannif
+	LDDName=
+	PDDName=
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=1
+	LastSocketClosedTimeout=-1
+	Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+	Name=LANIAPStaticIP1
+	IfNetworks=ip6,ip
+	IpNetMask=0.0.0.0
+	IpGateway=0.0.0.0
+	IpAddrFromServer=FALSE
+	IpAddr=0.0.0.0
+	IpDNSAddrFromServer=TRUE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.52
+	Ip6DnsAddrFromServer=TRUE
+	IpAddrLeaseValidFrom=0
+	ConfigDaemonManagerName=NetCfgExtnDhcp
+	ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+	Name=LANIAPStaticIP1
+	CurrentBearer=WAPIPBearer
+[EndWapAp]
+	
+
+[WapIpBearer]
+	Name=LANIAPStaticIP1
+	GatewayAddress=0.0.0.0
+	WSPOption=1
+	Security=FALSE
+	ProxyPortNumber=0
+[EndWapIpBearer]
+	
+[WlanService]
+	WlanConnMode=1
+	WlanSSID=AP#3
+	WlanWepKey1=
+	WlanWepKey2=
+	WlanWepKey3=
+	WlanWepKey4=
+	WlanWepIndex=0
+    WlanSecMode=1
+    WlanAuthMode=0
+    WlanEnableWpaPsk=FALSE
+    WlanWpaPreSharedKey=
+    WlanScanSSID=FALSE
+    WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANIAPStaticIP2
+//-------------------------------------------------------
+[Configuration]
+Name=LANIAPStaticIP2
+AllowDuplicates=FALSE
+
+[Network]
+	Name=LANIAPStaticIP2
+[EndNetwork]
+
+[Location]
+    UseDefault=TRUE
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+	Name=LANIAPStaticIP2
+	IAPServiceType=LANService
+	IAPBearerType=LANBearer
+	IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+    UseDefault=TRUE
+	Name=WLANBearer
+	IfName=wlannif
+	LDDName=
+	PDDName=
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=1
+	LastSocketClosedTimeout=-1
+	Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+	Name=LANIAPStaticIP2
+	IfNetworks=ip6,ip
+	IpNetMask=0.0.0.0
+	IpGateway=0.0.0.0
+	IpAddrFromServer=FALSE
+	IpAddr=0.0.0.0
+	IpDNSAddrFromServer=TRUE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.52
+	Ip6DnsAddrFromServer=TRUE
+	IpAddrLeaseValidFrom=0
+	ConfigDaemonManagerName=NetCfgExtnDhcp
+	ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+	Name=LANIAPStaticIP2
+	CurrentBearer=WAPIPBearer
+[EndWapAp]
+	
+
+[WapIpBearer]
+	Name=LANIAPStaticIP2
+	GatewayAddress=0.0.0.0
+	WSPOption=1
+	Security=FALSE
+	ProxyPortNumber=0
+[EndWapIpBearer]
+	
+[WlanService]
+	WlanConnMode=1
+	WlanSSID=AP#3
+	WlanWepKey1=
+	WlanWepKey2=
+	WlanWepKey3=
+	WlanWepKey4=
+	WlanWepIndex=0
+    WlanSecMode=1
+    WlanAuthMode=0
+    WlanEnableWpaPsk=FALSE
+    WlanWpaPreSharedKey=
+    WlanScanSSID=FALSE
+    WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANIAP1
+//-------------------------------------------------------
+[Configuration]
+Name=LANIAP1
+AllowDuplicates=FALSE
+
+[Network]
+	Name=LANIAP1
+[EndNetwork]
+
+[Location]
+    UseDefault=TRUE
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+	Name=LANIAP1
+	IAPServiceType=LANService
+	IAPBearerType=LANBearer
+	IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+    UseDefault=TRUE
+	Name=WLANBearer
+	IfName=wlannif
+	LDDName=
+	PDDName=
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=1
+	LastSocketClosedTimeout=-1
+	Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+	Name=LANIAP1
+	IfNetworks=ip6,ip
+	IpNetMask=255.255.255.0
+	IpGateway=10.32.194.254
+	IpAddrFromServer=TRUE
+	IpAddr=10.32.194.251
+	IpDNSAddrFromServer=TRUE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.52
+	Ip6DnsAddrFromServer=TRUE
+	IpAddrLeaseValidFrom=0
+	ConfigDaemonManagerName=NetCfgExtnDhcp
+	ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+	Name=LANIAP1
+	CurrentBearer=WAPIPBearer
+[EndWapAp]
+	
+
+[WapIpBearer]
+	Name=LANIAP1
+	GatewayAddress=0.0.0.0
+	WSPOption=1
+	Security=FALSE
+	ProxyPortNumber=0
+[EndWapIpBearer]
+	
+[WlanService]
+	WlanConnMode=1
+	WlanSSID=AP#3
+	WlanWepKey1=
+	WlanWepKey2=
+	WlanWepKey3=
+	WlanWepKey4=
+	WlanWepIndex=0
+    WlanSecMode=1
+    WlanAuthMode=0
+    WlanEnableWpaPsk=FALSE
+    WlanWpaPreSharedKey=
+    WlanScanSSID=FALSE
+    WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANIAP2
+//-------------------------------------------------------
+[Configuration]
+Name=LANIAP2
+AllowDuplicates=FALSE
+
+[Network]
+	Name=LANIAP2
+[EndNetwork]
+
+[Location]
+    UseDefault=TRUE
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+	Name=LANIAP2
+	IAPServiceType=LANService
+	IAPBearerType=LANBearer
+	IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+    UseDefault=TRUE
+	Name=WLANBearer
+	IfName=wlannif
+	LDDName=
+	PDDName=
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=1
+	LastSocketClosedTimeout=-1
+	Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+	Name=LANIAP2
+	IfNetworks=ip6,ip
+	IpNetMask=255.255.255.0
+	IpGateway=10.32.194.254
+	IpAddrFromServer=TRUE
+	IpAddr=10.32.194.251
+	IpDNSAddrFromServer=TRUE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.52
+	Ip6DnsAddrFromServer=TRUE
+	IpAddrLeaseValidFrom=0
+	ConfigDaemonManagerName=NetCfgExtnDhcp
+	ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+	Name=LANIAP2
+	CurrentBearer=WAPIPBearer
+[EndWapAp]
+	
+
+[WapIpBearer]
+	Name=LANIAP2
+	GatewayAddress=0.0.0.0
+	WSPOption=1
+	Security=FALSE
+	ProxyPortNumber=0
+[EndWapIpBearer]
+	
+[WlanService]
+	WlanConnMode=1
+	WlanSSID=AP#3
+	WlanWepKey1=
+	WlanWepKey2=
+	WlanWepKey3=
+	WlanWepKey4=
+	WlanWepIndex=0
+    WlanSecMode=1
+    WlanAuthMode=0
+    WlanEnableWpaPsk=FALSE
+    WlanWpaPreSharedKey=
+    WlanScanSSID=FALSE
+    WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
+
+//-------------------------------------------------------
+// CONFIGURATION FOR OPEN WLAN NETWORK - LANStaticIPStaticDNS
+//-------------------------------------------------------
+[Configuration]
+Name=LANStaticIPStaticDNS
+AllowDuplicates=FALSE
+
+[Network]
+	Name=LANStaticIPStaticDNS
+[EndNetwork]
+
+[Location]
+    UseDefault=TRUE
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+[EndLocation]
+
+[Iap]
+	Name=LANStaticIPStaticDNS
+	IAPServiceType=LANService
+	IAPBearerType=LANBearer
+	IAPNetworkWeighting=0
+[EndIap]
+
+[LanBearer]
+    UseDefault=TRUE
+	Name=WLANBearer
+	IfName=wlannif
+	LDDName=
+	PDDName=
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=1
+	LastSocketClosedTimeout=-1
+	Agent=wlanagt.agt
+[EndLanBearer]
+
+[LanService]
+	Name=LANStaticIPStaticDNS
+	IfNetworks=ip6,ip
+	IpNetMask=0.0.0.0
+	IpGateway=0.0.0.0
+	IpAddrFromServer=FALSE
+	IpAddr=0.0.0.0
+	IpDNSAddrFromServer=FALSE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.52
+	Ip6DnsAddrFromServer=FALSE
+	Ip6NameServer1=2001::dd
+	Ip6NameServer2=2001::ee
+	IpAddrLeaseValidFrom=0
+	ConfigDaemonManagerName=NetCfgExtnDhcp
+	ConfigDaemonName=!DhcpServ
+[EndLanService]
+
+[WapAp]
+	Name=LANStaticIPStaticDNS
+	CurrentBearer=WAPIPBearer
+[EndWapAp]
+	
+
+[WapIpBearer]
+	Name=LANStaticIPStaticDNS
+	GatewayAddress=0.0.0.0
+	WSPOption=1
+	Security=FALSE
+	ProxyPortNumber=0
+[EndWapIpBearer]
+	
+[WlanService]
+	WlanConnMode=1
+	WlanSSID=AP#3
+	WlanWepKey1=
+	WlanWepKey2=
+	WlanWepKey3=
+	WlanWepKey4=
+	WlanWepIndex=0
+    WlanSecMode=1
+    WlanAuthMode=0
+    WlanEnableWpaPsk=FALSE
+    WlanWpaPreSharedKey=
+    WlanScanSSID=FALSE
+    WlanChannelID=0
+[EndWlanService]
+[EndConfiguration]
\ No newline at end of file
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/dhcp/te_dhcp/config/scripts/te_dhcptest_ip4_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dhcp/te_dhcp/config/scripts/te_dhcptest_ip4_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,103 @@
+//
+// 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
+//! @SYMTestSuiteName	 	  	NET-DHCP-CIT
+//! @SYMScriptTestEnvironment	TestExecuteFramework (TEF).
+//! @SYMScriptPurpose			Script file for DHCP testing on IPv4.
+//! @SYMScriptInfo				1.Here we use CommsDB with ipv4 settings.
+//!//////////////////////////////////////////////////////////////////
+
+//Unload esock forcefully
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+//Configure commdb.This config file has explicit settings for IPv4
+//ced -i z:\TestData\configs\DHCP\DHCPced_ip4.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+
+RUN_UTILS CopyFile z:\testdata\configs\dhcp\cccccc00_dhcptest_ip4.cre c:\private\10202be9\persists\cccccc00.cre
+
+//Load the Server
+LOAD_SUITE DhcpTestServer
+
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\101f7989
+RUN_UTILS  MkDir c:\private\101f7989\esock
+RUN_UTILS  MakeReadWrite c:\private\101f7989\esock\tcpip.ini
+RUN_UTILS  DeleteFile c:\private\101f7989\esock\tcpip.ini
+RUN_UTILS  CopyFile z:\private\101f7989\esock\tcpip.ini c:\private\101f7989\esock\tcpip.ini
+RUN_UTILS  MakeReadWrite c:\private\101f7989\esock\tcpip.ini
+
+# Test the IPv4 DHCP client using the disabled linklocal option.
+run_test_step 1 DhcpTestServer SetIPv4LinkLocal z:\TestData\configs\DHCP\dhcptest.ini IPv4LinkLocalDisabled
+
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPBasicInteractions1_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPConfiguration2_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPPREQ1647_48_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPRenewAndRelease3_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPDynamicInteraction4_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\dhcpmanualtests5_ip4.script
+
+# Unload esock forcefully
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+//Load the Server
+LOAD_SUITE DhcpTestServer
+
+# Test the IPv4 DHCP client using the always linklocal option.
+run_test_step 1 DhcpTestServer SetIPv4LinkLocal z:\TestData\configs\DHCP\dhcptest.ini IPv4LinkLocalAlways
+
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPBasicInteractions1_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPConfiguration2_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPPREQ1647_48_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPRenewAndRelease3_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPDynamicInteraction4_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\dhcpmanualtests5_ip4.script
+
+# Unload esock forcefully
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+//Load the Server
+LOAD_SUITE DhcpTestServer
+
+# Test the IPv4 DHCP client using the conditional linklocal option.
+run_test_step 1 DhcpTestServer SetIPv4LinkLocal z:\TestData\configs\DHCP\dhcptest.ini IPv4LinkLocalConditional
+
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPBasicInteractions1_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPConfiguration2_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPPREQ1647_48_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPRenewAndRelease3_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPDynamicInteraction4_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\dhcpmanualtests5_ip4.script
+
+# Unload esock forcefully
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+//Load the Server
+LOAD_SUITE DhcpTestServer
+
+# Test the IPv4 DHCP client using the config daemon controlled linklocal option.
+run_test_step 1 DhcpTestServer SetIPv4LinkLocal z:\TestData\configs\DHCP\dhcptest.ini IPv4LinkLocalConfigDaemonControlled
+
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPBasicInteractions1_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPConfiguration2_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPPREQ1647_48_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPRenewAndRelease3_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPDynamicInteraction4_ip4.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\dhcpmanualtests5_ip4.script
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/dhcp/te_dhcp/config/scripts/te_dhcptest_ip6_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dhcp/te_dhcp/config/scripts/te_dhcptest_ip6_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,65 @@
+//
+// 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
+//! @SYMTestSuiteName	 	  	NET-DHCP-CIT
+//! @SYMScriptTestEnvironment	TestExecuteFramework (TEF).
+//! @SYMScriptPurpose			Script file for DHCP testing on IPv4.
+//! @SYMScriptInfo				1.Here we use CommsDB with ipv6 settings.
+//!//////////////////////////////////////////////////////////////////
+
+//IPv6 DHCP tests
+
+//Unload esock forcefully
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+//Configure commdb.This config file has explicit settings for IPv6
+//ced -i z:\TestData\configs\DHCP\DHCPced_ip6.xml
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+
+RUN_UTILS CopyFile z:\testdata\configs\dhcp\cccccc00_dhcptest_ip6.cre c:\private\10202be9\persists\cccccc00.cre
+
+LOAD_SUITE DhcpTestServer
+
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPBasicInteractions1_ip6.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPConfiguration2_ip6.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPRenewAndRelease3_ip6.script
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPDynamicInteraction4_ip6.script
+RUN_UTILS DeleteFile c:\private\101F7989\esock\ip.ramod.esk
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPManualtests5_ip6.script
+RUN_UTILS DeleteFile c:\private\101F7989\esock\ip.ramod.esk
+RUN_SCRIPT z:\TestData\scripts\DHCP\dhcpmanualTests2_ip6.script
+
+//INFORM TESTS - add esk file to modify RA packet
+
+RUN_UTILS MkDir c:\private\
+RUN_UTILS MkDir c:\private\101f7989\
+RUN_UTILS MkDir c:\private\101f7989\ESock\
+RUN_UTILS CopyFile z:\testdata\configs\dhcp\TestDHCPv6Config1\ip.ramod.esk c:\private\101F7989\esock\ip.ramod.esk
+RUN_UTILS MakeReadWrite c:\private\101F7989\esock\ip.ramod.esk
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPBasicInteractions1-inform_ip6.script
+
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPConfiguration2-inform_ip6.script
+
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPRenewAndRelease3-inform_ip6.script
+
+RUN_SCRIPT z:\TestData\scripts\DHCP\DHCPDynamicInteraction4-inform_ip6.script
+
+//remove esk file
+RUN_UTILS DeleteFile c:\private\101F7989\esock\ip.ramod.esk
\ No newline at end of file
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/dhcp/te_dhcp/src/te_dhcpTestStep1.cpp
--- a/tcpiputils/dhcp/te_dhcp/src/te_dhcpTestStep1.cpp	Tue Jul 06 16:04:34 2010 +0300
+++ b/tcpiputils/dhcp/te_dhcp/src/te_dhcpTestStep1.cpp	Wed Aug 18 11:18:20 2010 +0300
@@ -27,7 +27,7 @@
 #include <comms-infras/es_config.h>
 #include "../../include/DHCP_Std.h"
 #include <comms-infras/startprocess.h>
-#include "te_TestDaemonClient.h"
+#include "Te_TestDaemonClient.h"
 #include "DHCPStatesDebug.h"
 
 TVerdict CDhcpTestStep1_1::doTestStepL()
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/dhcp/te_dhcp/te_dhcpTestServer.iby
--- a/tcpiputils/dhcp/te_dhcp/te_dhcpTestServer.iby	Tue Jul 06 16:04:34 2010 +0300
+++ b/tcpiputils/dhcp/te_dhcp/te_dhcpTestServer.iby	Wed Aug 18 11:18:20 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-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"
@@ -22,10 +22,9 @@
 file=ABI_DIR\DEBUG_DIR\DhcpTestServer.exe	System\bin\DhcpTestServer.exe
 
 
-#ifndef __DHCP
+#ifdef SYMBIAN_EXCLUDE_DHCP
 REM Feature DHCP is not included in this ROM
 data=\epoc32\data\z\testdata\scripts\DHCP\te_dhcpremovedtest_ip4.script			TestData\scripts\DHCP\te_dhcpremovedtest_ip4.script
-
 data=\epoc32\data\z\TestData\configs\DHCP\DHCPced_ip4.xml.omapxxx	TestData\configs\DHCP\DHCPced_ip4.xml
 data=\epoc32\data\z\TestData\configs\DHCP\dhcptest.ini    		    TestData\configs\DHCP\dhcptest.ini
 
@@ -34,8 +33,13 @@
 //##################### script files
 
 //-- ip4 specific
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=\epoc32\data\z\testdata\scripts\DHCP\DHCP_OOM6_ip4_wlan.script			        TestData\scripts\DHCP\DHCP_OOM6_ip4.script
+data=\epoc32\data\z\testdata\scripts\DHCP\te_DHCPTest_ip4_wlan.script				TestData\scripts\DHCP\te_DHCPTest_ip4.script
+#else
 data=\epoc32\data\z\testdata\scripts\DHCP\DHCP_OOM6_ip4.script			        TestData\scripts\DHCP\DHCP_OOM6_ip4.script
 data=\epoc32\data\z\testdata\scripts\DHCP\te_DHCPTest_ip4.script				TestData\scripts\DHCP\te_DHCPTest_ip4.script
+#endif //INCLUDE_SIROCCO_CODE_MIGRATION
 data=\epoc32\data\z\testdata\scripts\DHCP\DHCPBasicInteractions1_ip4.script		TestData\scripts\DHCP\DHCPBasicInteractions1_ip4.script
 data=\epoc32\data\z\testdata\scripts\DHCP\DHCPConfiguration2_ip4.script			TestData\scripts\DHCP\DHCPConfiguration2_ip4.script
 data=\epoc32\data\z\testdata\scripts\DHCP\DHCPRenewAndRelease3_ip4.script			TestData\scripts\DHCP\DHCPRenewAndRelease3_ip4.script
@@ -46,8 +50,13 @@
 file=ABI_DIR\DEBUG_DIR\ramod1.prt    SYSTEM_BINDIR\ramod1.prt
 file=ABI_DIR\DEBUG_DIR\ramod2.prt    SYSTEM_BINDIR\ramod2.prt
 file=ABI_DIR\DEBUG_DIR\ramod3.prt    SYSTEM_BINDIR\ramod3.prt
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=\epoc32\data\z\testdata\scripts\DHCP\DHCP_OOM6_ip6_wlan.script			        TestData\scripts\DHCP\DHCP_OOM6_ip6.script
+data=\epoc32\data\z\testdata\scripts\DHCP\te_DHCPTest_ip6_wlan.script				TestData\scripts\DHCP\te_DHCPTest_ip6.script
+#else
 data=\epoc32\data\z\testdata\scripts\DHCP\DHCP_OOM6_ip6.script			        TestData\scripts\DHCP\DHCP_OOM6_ip6.script
 data=\epoc32\data\z\testdata\scripts\DHCP\te_DHCPTest_ip6.script				TestData\scripts\DHCP\te_DHCPTest_ip6.script
+#endif //INCLUDE_SIROCCO_CODE_MIGRATION
 data=\epoc32\data\z\testdata\scripts\DHCP\DHCPBasicInteractions1_ip6.script		TestData\scripts\DHCP\DHCPBasicInteractions1_ip6.script
 data=\epoc32\data\z\testdata\scripts\DHCP\DHCPConfiguration2_ip6.script			TestData\scripts\DHCP\DHCPConfiguration2_ip6.script
 data=\epoc32\data\z\testdata\scripts\DHCP\DHCPRenewAndRelease3_ip6.script			TestData\scripts\DHCP\DHCPRenewAndRelease3_ip6.script
@@ -67,7 +76,11 @@
 data=\epoc32\data\z\testdata\configs\DHCP\TestDHCPv6Config3\ip.ramod.esk			        TestData\configs\DHCP\TestDHCPv6Config3\ip.ramod.esk
 
 //SIP server
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=\epoc32\data\z\testdata\scripts\DHCP\TE_SIPServer_DHCP_hwonly_ip4_wlan.script	TestData\scripts\DHCP\TE_SIPServer_DHCP_hwonly_ip4.script
+#else
 data=\epoc32\data\z\testdata\scripts\DHCP\TE_SIPServer_DHCP_hwonly_ip4.script	TestData\scripts\DHCP\TE_SIPServer_DHCP_hwonly_ip4.script
+#endif //INCLUDE_SIROCCO_CODE_MIGRATION
 data=\epoc32\data\z\testdata\scripts\SipServer_setup.script                     TestData\scripts\SipServer_setup.script
 data=\epoc32\data\z\testdata\scripts\TE_SIPServerTesting.script                 TestData\scripts\TE_SIPServerTesting.script
 data=\epoc32\data\z\testdata\configs\SipServer.xml                              TestData\configs\SipServer.xml
@@ -81,7 +94,11 @@
 #ifdef OMAP16XX
 data=\epoc32\data\z\TestData\configs\DHCP\DHCPced_ip4.xml.omapxxx	TestData\configs\DHCP\DHCPced_ip4.xml
 #else
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=\epoc32\data\z\TestData\configs\DHCP\cccccc00_dhcptest_ip4.cre   TestData\configs\DHCP\cccccc00_dhcptest_ip4.cre
+#else
 data=\epoc32\data\z\TestData\configs\DHCP\DHCPced_ip4.xml.lubbock   TestData\configs\DHCP\DHCPced_ip4.xml
+#endif //INCLUDE_SIROCCO_CODE_MIGRATION
 #endif
 
 
@@ -89,7 +106,11 @@
 #ifdef OMAP16XX
 data=\epoc32\data\z\TestData\configs\DHCP\DHCPced_ip6.xml.omapxxx    TestData\configs\DHCP\DHCPced_ip6.xml
 #else
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=\epoc32\data\z\TestData\configs\DHCP\cccccc00_dhcptest_ip6.cre    TestData\configs\DHCP\cccccc00_dhcptest_ip6.cre
+#else
 data=\epoc32\data\z\TestData\configs\DHCP\DHCPced_ip6.xml.lubbock    TestData\configs\DHCP\DHCPced_ip6.xml
+#endif //INCLUDE_SIROCCO_CODE_MIGRATION
 #endif
 
 
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/dhcp/te_unittest/dhcpservtest.cpp
--- a/tcpiputils/dhcp/te_unittest/dhcpservtest.cpp	Tue Jul 06 16:04:34 2010 +0300
+++ b/tcpiputils/dhcp/te_unittest/dhcpservtest.cpp	Wed Aug 18 11:18:20 2010 +0300
@@ -28,7 +28,7 @@
 #include "es_enum.h" 
 #include <nifman.h>
 #include <naptinterface.h>
-#include "dhcpstatesdebug.h"
+#include "DHCPStatesDebug.h"
 
 /**
  * MAC address length
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/dhcp/te_unittest/dhcpservtest.mmp
--- a/tcpiputils/dhcp/te_unittest/dhcpservtest.mmp	Tue Jul 06 16:04:34 2010 +0300
+++ b/tcpiputils/dhcp/te_unittest/dhcpservtest.mmp	Wed Aug 18 11:18:20 2010 +0300
@@ -21,17 +21,17 @@
 
 SOURCEPATH .
 SOURCE dhcpservtest.cpp
-USERINCLUDE ..\include
+USERINCLUDE ../include
 #ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE \epoc32\include \epoc32\include\Networking
+SYSTEMINCLUDE /epoc32/include /epoc32/include/networking
 #else
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-SYSTEMINCLUDE \epoc32\include\platform\Networking
-SYSTEMINCLUDE  ..\..\networkaddressandporttranslation\inc
+SYSTEMINCLUDE /epoc32/include/platform/networking
+SYSTEMINCLUDE  ../../networkaddressandporttranslation/inc
 #endif
 
 
-LIBRARY       euser.lib ecom.lib esock.lib InetProtUtil.lib commdb.lib insock.lib c32root.lib
+LIBRARY       euser.lib ecom.lib esock.lib inetprotutil.lib commdb.lib insock.lib c32root.lib
 
 CAPABILITY ALL -Tcb
 
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/dnd/Test/Group/BLD.INF
--- a/tcpiputils/dnd/Test/Group/BLD.INF	Tue Jul 06 16:04:34 2010 +0300
+++ b/tcpiputils/dnd/Test/Group/BLD.INF	Wed Aug 18 11:18:20 2010 +0300
@@ -14,5 +14,5 @@
 //
 
 
-#include"../TE_LLMNR/group/BLD.INF"
-#include"../te_dndunittest/group/BLD.INF"
\ No newline at end of file
+#include"../TE_LLMNR/group/bld.inf"
+#include"../te_dndunittest/group/bld.inf"
\ No newline at end of file
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/dnd/Test/te_dndunittest/group/te_dndunittest.mmp
--- a/tcpiputils/dnd/Test/te_dndunittest/group/te_dndunittest.mmp	Tue Jul 06 16:04:34 2010 +0300
+++ b/tcpiputils/dnd/Test/te_dndunittest/group/te_dndunittest.mmp	Wed Aug 18 11:18:20 2010 +0300
@@ -15,7 +15,7 @@
 // 
 //
 
-TARGET		  te_dndServer.exe
+TARGET		  te_dndserver.exe
 TARGETTYPE	  exe
 UID		  0 0xED4DC1CD
 
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/networkaddressandporttranslation/te_unittest/group/te_naptunittest.mmp
--- a/tcpiputils/networkaddressandporttranslation/te_unittest/group/te_naptunittest.mmp	Tue Jul 06 16:04:34 2010 +0300
+++ b/tcpiputils/networkaddressandporttranslation/te_unittest/group/te_naptunittest.mmp	Wed Aug 18 11:18:20 2010 +0300
@@ -23,14 +23,14 @@
 TARGET          te_naptunittest.exe
 TARGETTYPE      exe
 
-SOURCEPATH      ..\src
+SOURCEPATH      ../src
 SOURCE		te_naptunittesttestserver.cpp te_naptunittesttestblock.cpp te_naptunittesttestwrapper.cpp
 
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
-USERINCLUDE     ..\..\inc
-USERINCLUDE	..\inc
+USERINCLUDE     ../../inc
+USERINCLUDE	../inc
 
 LIBRARY euser.lib 
 LIBRARY esock.lib 
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/punycodeconv/te_punycodeconverter/configs/S-ced-hw-empty.cfg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/punycodeconv/te_punycodeconverter/configs/S-ced-hw-empty.cfg	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,557 @@
+############################################################
+## AUTO-GENERATED CONFIGURATION FILE
+## CommsDat Database Dump Utility
+## 1.1
+############################################################
+
+############################################################
+## ModemBearer
+## 
+[ModemBearer]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Modem
+	IfName=PPP
+	PortName=COMM::0
+	TSYName=MM
+	CSYName=ECUART
+	LastSocketActivityTimeout=30
+	LastSessionClosedTimeout=180
+	LastSocketClosedTimeout=30
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=0
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOff=Q0
+	QuietOn=Q1
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+44123456789
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	CommRole=0
+	SIRSettings=0
+	Agent=CSD.agt
+	FIELD_COUNT=70
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=GPRS Modem
+	IfName=spud-rawip
+	PortName=DATAPORT::0
+	TSYName=PHONETSY
+	CSYName=DATAPORT
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=1
+	LastSocketClosedTimeout=-1
+	DataBits=5
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=0
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOff=Q0
+	QuietOn=Q1
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+44123456789
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=0
+	CommRole=0
+	SIRSettings=0
+	Agent=gprsumtsagent.agt
+	BCAStack=BcaToIsc
+	FIELD_COUNT=71
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=CSD Modem
+	IfName=PPP
+	PortName=DATAPORT::0
+	TSYName=PHONETSY
+	CSYName=DATAPORT
+	LastSocketActivityTimeout=300
+	LastSessionClosedTimeout=1
+	LastSocketClosedTimeout=300
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=19200
+	Handshaking=196
+	SpecialRate=0
+	XonChar=17
+	XoffChar=19
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=ATZ
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOff=Q0
+	QuietOn=Q1
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+358508771010
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=0
+	CommRole=0
+	SIRSettings=0
+	Agent=csd.agt
+	FIELD_COUNT=70
+END_ADD
+
+
+############################################################
+## Location
+## 
+[Location]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Default Location
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## Chargecard
+## 
+[Chargecard]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Dummy BT Chargecard
+	AccountNumber=144,12345678
+	Pin=0000
+	LocalRule=HG
+	NatRule=HFG
+	IntlRule=HEFG
+	FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## GlobalSettings
+## 
+[GlobalSettings]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-1
+	WAPAccessPoint=1
+	ConnectionAttempts=1
+	RedialAttempts=0
+	SmsBearer=3
+	SmsReceiveMode=2
+	GPRSAttachMode=1
+	AcceptIncomingGprs=1
+	GPRSClassCBearer=GSM
+	ModemForDataAndFax=3
+	ModemForPhoneServicesAndSMS=3
+	LocationForDataAndFax=1
+	LocationForPhoneServicesAndSMS=1
+	MaxMBufHeap=1
+	DefaultNetwork=1
+	BearerAvailabilityCheckTSY=PHONETSY
+	FIELD_COUNT=17
+END_ADD
+
+
+############################################################
+## DialOutISP
+## 
+[DialOutISP]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Dial Out ISP
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=TRUE
+	DisplayPCT=FALSE
+	IfPromptForAuth=TRUE
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=UNSPECIFIED
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=29
+END_TEMPLATE
+
+
+############################################################
+## DialInISP
+## 
+[DialInISP]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Dial In ISP
+	UseLoginScript=FALSE
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=10
+END_TEMPLATE
+
+
+############################################################
+## OutgoingGPRS
+## 
+[OutgoingGPRS]
+ADD_TEMPLATE
+	Id=0
+	Name=template
+	PDPType=IPV4
+	ReqPrecedence=0
+	ReqDelay=0
+	ReqReliability=0
+	ReqPeakThroughput=0
+	ReqMeanThroughput=0
+	MinPrecedence=0
+	MinDelay=0
+	MinReliability=0
+	MinPeakThroughput=0
+	MinMeanThroughput=0
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=TRUE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	AuthRetries=0
+	IpGateway=0.0.0.0
+	IpAddrFromServer=TRUE
+	IpAddr=0.0.0.0
+	IpDNSAddrFromServer=TRUE
+	IpNameServer1=0.0.0.0
+	IpNameServer2=0.0.0.0
+	Ip6DNSAddrFromServer=TRUE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=TRUE
+	GprsAccessPointType=2
+	QosWarningTimeout=-1
+	UmtsR99QoSAndOn=1
+	FIELD_COUNT=32
+END_TEMPLATE
+
+
+############################################################
+## DefaultGPRS
+## 
+[DefaultGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Dummy Default GPRS Settings
+	Usage=1
+	PDPType=IPV6
+	PDPAddress=www.wid.com
+	Precedence=1
+	Delay=1
+	Reliability=1
+	PeakThroughput=1
+	MeanThroughput=1
+	MinPrecedence=1
+	MinDelay=1
+	MinReliability=1
+	MinPeakThroughput=1
+	MinMeanThroughput=1
+	DataCompression=TRUE
+	HeaderCompression=TRUE
+	GprsUseEdge=FALSE
+	AnonymousAccess=TRUE
+	FIELD_COUNT=19
+END_ADD
+
+
+############################################################
+## ConnectionPreferences
+## 
+[ConnectionPreferences]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-1
+	Ranking=0
+	Direction=OUTGOING
+	BearerSet=CSD & WCDMA
+	DialogPref=PROMPT
+	IAP=0
+	FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## WAPAccessPoint
+## 
+[WAPAccessPoint]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Dial In ISP
+	CurrentBearer=WAPIPBearer
+	FIELD_COUNT=3
+END_TEMPLATE
+
+
+############################################################
+## WAPIPBearer
+## 
+[WAPIPBearer]
+ADD_TEMPLATE
+	Id=0
+	Name=DefaultRecordName-1
+	AccessPointId=0
+	IAP=0
+	WSPOption=CONNECTIONLESS
+	Security=FALSE
+	ProxyPortNumber=0
+	FIELD_COUNT=7
+END_TEMPLATE
+
+
+############################################################
+## WAPSMSBearer
+## 
+[WAPSMSBearer]
+ADD_TEMPLATE
+	Id=0
+	Name=DefaultRecordName-1
+	AccessPointId=0
+	WSPOption=CONNECTIONLESS
+	Security=FALSE
+	FIELD_COUNT=5
+END_TEMPLATE
+
+
+############################################################
+## SecureSocketTable
+## 
+[SecureSocketTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-1
+	ProtocolName=ssl3.0
+	ProtoLibrary=ssladaptor.dll
+	FIELD_COUNT=4
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=DefaultRecordName-2
+	ProtocolName=tls1.0
+	ProtoLibrary=ssladaptor.dll
+	FIELD_COUNT=4
+END_ADD
+
+############################################################
+## UmtsR99QoSAndOn
+## 
+[UmtsR99QoSAndOn]
+ADD_SECTION
+# COMMDB_ID = 1
+        Name=PRIMARY1
+        ReqTrafficClass=1
+        MinTrafficClass=1
+        ReqDeliveryOrder=1
+        MinDeliveryOrder=1
+        ReqDeliverErroneousSDU=1
+        MinDeliverErroneousSDU=1
+        ReqMaxSDUSize=0
+        MinAcceptableMaxSDUSize=0
+        ReqMaxUplinkRate=0
+        ReqMinUplinkRate=0
+        ReqMaxDownlinkRate=0
+        ReqMinDownlinkRate=0
+        ReqBER=1
+        MaxBER=1
+        ReqSDUErrorRatio=1
+        MaxSDUErrorRatio=1
+        ReqTrafficHandlingPriority=1
+        MinTrafficHandlingPriority=1
+        ReqTransferDelay=0
+        MaxTransferDelay=0
+        ReqGuaranteedUplinkRate=0
+        MinGuaranteedUplinkRat=0
+        ReqGuaranteedDownlinkRate=0
+        MinGuaranteedDownlinkRate=0
+        SignallingIndication=FALSE
+        IMCNSignallingIndication=FALSE
+        SourceStatisticsDescriptor=0
+        FIELD_COUNT=28 
+END_ADD
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/punycodeconv/te_punycodeconverter/configs/cccccc00_punycodeconverter.cre
Binary file tcpiputils/punycodeconv/te_punycodeconverter/configs/cccccc00_punycodeconverter.cre has changed
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/punycodeconv/te_punycodeconverter/configs/te_punycodeconverter_connectionpref.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/punycodeconv/te_punycodeconverter/configs/te_punycodeconverter_connectionpref.xml	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CommDB:Config>
+	<ConnectionPreferencesTable>
+	  <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable1</Name>
+        <Ranking>1</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>DONOTPROMPT</DialogPref>
+        <BearerSet>WLAN</BearerSet>
+        <IAPRef>IAP.WLANWithDynamicDaemonIP</IAPRef>
+    </ConnectionPreferences>
+  </ConnectionPreferencesTable>
+</CommDB:Config>
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/punycodeconv/te_punycodeconverter/configs/te_punycodeconverter_wlan.xml
Binary file tcpiputils/punycodeconv/te_punycodeconverter/configs/te_punycodeconverter_wlan.xml has changed
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/punycodeconv/te_punycodeconverter/group/bld.inf
--- a/tcpiputils/punycodeconv/te_punycodeconverter/group/bld.inf	Tue Jul 06 16:04:34 2010 +0300
+++ b/tcpiputils/punycodeconv/te_punycodeconverter/group/bld.inf	Wed Aug 18 11:18:20 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2009-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"
@@ -15,10 +15,15 @@
 
 PRJ_TESTEXPORTS
 ./te_punycodeconverter.iby	/epoc32/rom/include/te_punycodeconverter.iby
+../configs/te_punycodeconverter.ini	z:/testdata/configs/te_punycodeconverter.ini
 
+#ifdef SIROCCO_CODE_MIGRATION
+../configs/cccccc00_punycodeconverter.cre z:/testdata/configs/cccccc00_punycodeconverter.cre
+../scripts/te_punycodeconverter_wlan.script 	z:/testdata/scripts/te_punycodeconverter_wlan.script
+#else
 ../scripts/te_punycodeconverter.script 	z:/testdata/scripts/te_punycodeconverter.script
-../configs/te_punycodeconverter.ini	z:/testdata/configs/te_punycodeconverter.ini
 ../configs/te_punycodeconverter_ced.xml	z:/testdata/configs/te_punycodeconverter_ced.xml
+#endif
 
 PRJ_TESTMMPFILES
 ./te_punycodeconverter.mmp
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/punycodeconv/te_punycodeconverter/group/te_punycodeconverter.iby
--- a/tcpiputils/punycodeconv/te_punycodeconverter/group/te_punycodeconverter.iby	Tue Jul 06 16:04:34 2010 +0300
+++ b/tcpiputils/punycodeconv/te_punycodeconverter/group/te_punycodeconverter.iby	Wed Aug 18 11:18:20 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2009-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"
@@ -20,8 +20,14 @@
 #include <punycodeconverter.iby>
 
 data=ABI_DIR\DEBUG_DIR\te_punycodeconverter.exe		System\bin\te_punycodeconverter.exe
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_punycodeconverter.ini	testdata\configs\te_punycodeconverter.ini
 
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_punycodeconverter_wlan.script 	testdata\scripts\te_punycodeconverter.script
+data=EPOCROOT##epoc32\data\z\testdata\configs\cccccc00_punycodeconverter.cre	testdata\configs\cccccc00_punycodeconverter.cre
+#else
 data=EPOCROOT##epoc32\data\z\testdata\scripts\te_punycodeconverter.script 	testdata\scripts\te_punycodeconverter.script
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_punycodeconverter.ini	testdata\configs\te_punycodeconverter.ini
 data=EPOCROOT##epoc32\data\z\testdata\configs\te_punycodeconverter_ced.xml	testdata\configs\te_punycodeconverter_ced.xml
+#endif
+
 #endif //__TE_PUNYCODECONVERTER_IBY__
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/punycodeconv/te_punycodeconverter/group/te_punycodeconverter.mmp
--- a/tcpiputils/punycodeconv/te_punycodeconverter/group/te_punycodeconverter.mmp	Tue Jul 06 16:04:34 2010 +0300
+++ b/tcpiputils/punycodeconv/te_punycodeconverter/group/te_punycodeconverter.mmp	Wed Aug 18 11:18:20 2010 +0300
@@ -23,18 +23,18 @@
 TARGET          te_punycodeconverter.exe
 TARGETTYPE      exe
 
-SOURCEPATH      ..\src
+SOURCEPATH      ../src
 SOURCE		te_punycodeconvertertestserver.cpp te_punycodeconvertertestblock.cpp te_punycodeconvertertestwrapper.cpp
 
 #ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   \epoc32\include\test
+SYSTEMINCLUDE   /epoc32/include
+SYSTEMINCLUDE   /epoc32/include/test
 #else
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-SYSTEMINCLUDE   \epoc32\include\platform\test
+SYSTEMINCLUDE   /epoc32/include/platform/test
 #endif
 
-USERINCLUDE     ..\inc
+USERINCLUDE     ../inc
 
 LIBRARY punycodeconverter.lib
 LIBRARY euser.lib 
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/punycodeconv/te_punycodeconverter/scripts/te_punycodeconverter_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/punycodeconv/te_punycodeconverter/scripts/te_punycodeconverter_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,441 @@
+//
+// 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
+//! @SYMTestSuiteName       NET-DND-punycodeconverter-CIT
+//! @SYMScriptTestEnvironment TestExecuteFramework
+//
+//Unload esock forcefully
+RUN_SCRIPT z:\testdata\scripts\te_esock_test_unloadesockForced.script
+
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+
+//Configure commdb.
+//ced -i z:\testdata\configs\te_punycodeconverter_ced.xml
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_punycodeconverter.cre c:\private\10202be9\persists\cccccc00.cre
+
+RUN_SCRIPT z:\testdata\scripts\te_esock_test_loadesock.script
+
+//Load the Server
+LOAD_SERVER te_punycodeconverter
+
+START_TESTCASE                NET-DND-punycodeconverter-test1
+//! @SYMTestCaseID              NET-DND-punycodeconverter-test1
+//! @SYMTestCaseDesc            PREQ2296 - REQ11948
+//!                             Resolve International Domain Name.
+//! @SYMTestPriority            Critical
+//! @SYMTestActions             Load te_punycodeconverter test server
+//!                             Run the ResolveName test case by passing te_punycodeconverter_test1.ini, which consists available IDN.
+//! @SYMTestExpectedResults     Domain name resolved successfully.
+//! @SYMTestType                CIT
+//! @SYMCreationDate            5/2/2009
+//! @SYMAuthor                  tamilarasub
+//! @SYMTestStatus              3. Released
+
+	START_TEST_BLOCK te_punycodeconverter 100 z:\testdata\configs\te_punycodeconverter.ini
+		CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test1
+		COMMAND punycodeconverter_test1 OpenResolver ResolveName1
+		COMMAND punycodeconverter_test1 EnableIdnSupport ResolveName1
+		COMMAND punycodeconverter_test1 ResolveName ResolveName1
+		COMMAND punycodeconverter_test1 CloseResolver ResolveName1
+	END_TEST_BLOCK
+
+END_TESTCASE                  NET-DND-punycodeconverter-test1
+
+
+START_TESTCASE                NET-DND-punycodeconverter-test2
+//! @SYMTestCaseID              NET-DND-punycodeconverter-test2
+//! @SYMTestCaseDesc            PREQ2296 - REQ11948
+//!                             DND must return valid error code for unavailable International Domain Name.
+//! @SYMTestPriority            High
+//! @SYMTestActions             Load te_punycodeconverter test server
+//!                             Run the ResolveName test case by passing te_punycodeconverter_test2.ini, which consists unavailable IDN.
+//! @SYMTestExpectedResults     DND must return valid error code KErrDndNameNotFound.
+//! @SYMTestType                CIT
+//! @SYMCreationDate            5/2/2009
+//! @SYMAuthor                  tamilarasub
+//! @SYMTestStatus              3. Released
+
+	START_TEST_BLOCK te_punycodeconverter 100 z:\testdata\configs\te_punycodeconverter.ini
+		CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test2
+		COMMAND punycodeconverter_test2 OpenResolver ResolveName2
+		COMMAND punycodeconverter_test2 EnableIdnSupport ResolveName2
+		COMMAND !Error=-5120 punycodeconverter_test2 ResolveName ResolveName2
+		COMMAND punycodeconverter_test2 CloseResolver ResolveName2
+	END_TEST_BLOCK
+
+END_TESTCASE                  NET-DND-punycodeconverter-test2
+
+
+START_TESTCASE                NET-DND-punycodeconverter-test3
+//! @SYMTestCaseID              NET-DND-punycodeconverter-test3
+//! @SYMTestCaseDesc            PREQ2296 - REQ11948
+//!                             Resolve manually converted punycode name.
+//! @SYMTestPriority            Critical
+//! @SYMTestActions             Load te_punycodeconverter test server
+//!                             Run the ResolveName test case by passing te_punycodeconverter.ini, which consists an domain name of type punycode.
+//! @SYMTestExpectedResults     Domain name resolved successfully.
+//! @SYMTestType                CIT
+//! @SYMCreationDate            5/2/2009
+//! @SYMAuthor                  tamilarasub
+//! @SYMTestStatus              3. Released
+
+	START_TEST_BLOCK te_punycodeconverter 100 z:\testdata\configs\te_punycodeconverter.ini
+		CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test3
+		COMMAND punycodeconverter_test3 OpenResolver ResolveName3
+		COMMAND punycodeconverter_test3 EnableIdnSupport ResolveName3
+		COMMAND punycodeconverter_test3 ResolveName ResolveName3
+		COMMAND punycodeconverter_test3 CloseResolver ResolveName3
+	END_TEST_BLOCK
+
+END_TESTCASE                  NET-DND-punycodeconverter-test3
+
+
+START_TESTCASE                NET-DND-punycodeconverter-test4
+//! @SYMTestCaseID              NET-DND-punycodeconverter-test4
+//! @SYMTestCaseDesc            PREQ2296 - REQ11948
+//!                             DND must return valid error codes for malformed punycode names.
+//! @SYMTestPriority            High
+//! @SYMTestActions             Load te_punycodeconverter test server
+//!                             Run the ResolveName test case by passing te_punycodeconverter_test4.ini, which consists an domain name of type punycode.
+//! @SYMTestExpectedResults     DND must return valid error code KErrDndNameNotFound.
+//! @SYMTestType                CIT
+//! @SYMCreationDate            5/2/2009
+//! @SYMAuthor                  tamilarasub
+//! @SYMTestStatus              3. Released
+
+	START_TEST_BLOCK te_punycodeconverter 100 z:\testdata\configs\te_punycodeconverter.ini
+		CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test4
+		COMMAND punycodeconverter_test4 OpenResolver ResolveName4
+		COMMAND punycodeconverter_test4 EnableIdnSupport ResolveName4
+		COMMAND !Error=-5120 punycodeconverter_test4 ResolveName ResolveName4
+		COMMAND punycodeconverter_test4 CloseResolver ResolveName4
+	END_TEST_BLOCK
+
+END_TESTCASE                  NET-DND-punycodeconverter-test4
+
+
+START_TESTCASE                NET-DND-punycodeconverter-test5
+//! @SYMTestCaseID              NET-DND-punycodeconverter-test5
+//! @SYMTestCaseDesc            PREQ2296 - REQ11948
+//!                             International domain name length exceeds the max limit of 255 chars
+//! @SYMTestPriority            High
+//! @SYMTestActions             Load te_punycodeconverter test server
+//!                             Run the ResolveName test case by passing te_punycodeconverter_test5.ini i, which consists an lengthy IDN.
+//! @SYMTestExpectedResults     DND must return valid error code KErrDndBadName.
+//! @SYMTestType                CIT
+//! @SYMCreationDate            5/2/2009
+//! @SYMAuthor                  tamilarasub
+//! @SYMTestStatus              3. Released
+
+	START_TEST_BLOCK te_punycodeconverter 100 z:\testdata\configs\te_punycodeconverter.ini
+		CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test5
+		COMMAND punycodeconverter_test5 OpenResolver ResolveName5
+		COMMAND punycodeconverter_test5 EnableIdnSupport ResolveName5
+		COMMAND !Error=-5127 punycodeconverter_test5 ResolveName ResolveName5
+		COMMAND punycodeconverter_test5 CloseResolver ResolveName5
+	END_TEST_BLOCK
+
+END_TESTCASE                  NET-DND-punycodeconverter-test5
+
+
+START_TESTCASE                NET-DND-punycodeconverter-test6
+//! @SYMTestCaseID              NET-DND-punycodeconverter-test6
+//! @SYMTestCaseDesc            PREQ2296 - REQ11950  REQ11948
+//!                             Using punycodeconverter API's convert valid IDN to punycode and use DND to resolve this punycode.
+//! @SYMTestPriority            Medium
+//! @SYMTestActions             Load te_punycodeconverter test server
+//!                             Run the IdnToPuny test case and preserve the punycode.
+//!                             Use the converted punycode and run the ResolveName test case.
+//! @SYMTestExpectedResults     Punycodeconverter conversion successfull.
+//!                             Converted punycode resolved successfully by DND.
+//! @SYMTestType                CIT
+//! @SYMCreationDate            5/2/2009
+//! @SYMAuthor                  tamilarasub
+//! @SYMTestStatus              3. Released
+
+	START_TEST_BLOCK te_punycodeconverter 100 z:\testdata\configs\te_punycodeconverter.ini
+		CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test6
+		COMMAND punycodeconverter_test6 IdnToPunyCode IdnToPunyCode6
+		COMMAND punycodeconverter_test6 OpenResolver ResolveName6
+		COMMAND punycodeconverter_test6 EnableIdnSupport ResolveName6
+		COMMAND punycodeconverter_test6 ResolveName ResolveName6
+		COMMAND punycodeconverter_test6 CloseResolver ResolveName6
+	END_TEST_BLOCK
+
+END_TESTCASE                  NET-DND-punycodeconverter-test6
+
+
+START_TESTCASE                NET-DND-punycodeconverter-test7
+//! @SYMTestCaseID              NET-DND-punycodeconverter-test7
+//! @SYMTestCaseDesc            PREQ2296 - REQ11950
+//!                             Convert the valid IDN to punycode and check this against maually converted one.
+//! @SYMTestPriority            High
+//! @SYMTestActions             Load te_punycodeconverter test server
+//!                             Run the IdnToPuny test case.
+//!                             Compare the converted punycode against the manually converted one which is fetched from te_punycodeconverter.ini.
+//! @SYMTestExpectedResults     Punycode converted by punycodeconverter and manually converted are same.
+//! @SYMTestType                CIT
+//! @SYMCreationDate            5/2/2009
+//! @SYMAuthor                  tamilarasub
+//! @SYMTestStatus              3. Released
+
+	START_TEST_BLOCK te_punycodeconverter 100 z:\testdata\configs\te_punycodeconverter.ini
+		CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test7
+		COMMAND punycodeconverter_test7 IdnToPunyCode IdnToPunyCode7
+	END_TEST_BLOCK
+
+END_TESTCASE                  NET-DND-punycodeconverter-test7
+
+
+START_TESTCASE                NET-DND-punycodeconverter-test8
+//! @SYMTestCaseID              NET-DND-punycodeconverter-test8
+//! @SYMTestCaseDesc            PREQ2296 - REQ11951
+//!                             Convert the valid punycode to IDN and check this against maually converted one.
+//! @SYMTestPriority            High
+//! @SYMTestActions             Load te_punycodeconverter test server.
+//!                             Run the PunyToIdn test case.
+//!                             Compare the converted IDN against the manually converted one which is fetched from te_punycodeconverter.ini.
+//! @SYMTestExpectedResults     IDN converted by punycodeconverter and manually converted are same.
+//! @SYMTestType                CIT
+//! @SYMCreationDate            5/2/2009
+//! @SYMAuthor                  tamilarasub
+//! @SYMTestStatus              3. Released
+
+	START_TEST_BLOCK te_punycodeconverter 100 z:\testdata\configs\te_punycodeconverter.ini
+		CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test8
+		COMMAND punycodeconverter_test8 PunyCodeToIdn PunyCodeToIdn8
+	END_TEST_BLOCK
+
+END_TESTCASE                  NET-DND-punycodeconverter-test8
+
+
+START_TESTCASE                NET-DND-punycodeconverter-test9
+//! @SYMTestCaseID              NET-DND-punycodeconverter-test9
+//! @SYMTestCaseDesc            PREQ2296 - REQ11950
+//!                             Punycode converter returns valid error upon receiving malformed punycode for conversion.
+//! @SYMTestPriority            High
+//! @SYMTestActions             Load te_punycodeconverter test server.
+//!                             Run the PunyToIdn test case.
+//! @SYMTestExpectedResults     Punycodeconverter conversion failed with error KErrDndBadName.
+//! @SYMTestType                CIT
+//! @SYMCreationDate            5/2/2009
+//! @SYMAuthor                  tamilarasub
+//! @SYMTestStatus              3. Released
+
+	START_TEST_BLOCK te_punycodeconverter 100 z:\testdata\configs\te_punycodeconverter.ini
+		CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test9
+		COMMAND !Error=-5127 punycodeconverter_test9 PunyCodeToIdn PunyCodeToIdn9
+	END_TEST_BLOCK
+
+END_TESTCASE                  NET-DND-punycodeconverter-test9
+
+
+START_TESTCASE                NET-DND-punycodeconverter-test10
+//! @SYMTestCaseID              NET-DND-punycodeconverter-test10
+//! @SYMTestCaseDesc            PREQ2296 - REQ11948
+//!                             Relsolve the IDN name by providing the IP address.
+//! @SYMTestPriority            Critical
+//! @SYMTestActions             Load te_punycodeconverter test server
+//!                             Run the ResolveAddress test case.
+//! @SYMTestExpectedResults     DND resolves the IP address successfully.
+//!                             Result is actual IDN must be as the one provided in te_punycodeconverter_test10.ini
+//! @SYMTestType                CIT
+//! @SYMCreationDate            5/2/2009
+//! @SYMAuthor                  tamilarasub
+//! @SYMTestStatus              3. Released
+
+	START_TEST_BLOCK te_punycodeconverter 100 z:\testdata\configs\te_punycodeconverter.ini
+		CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test10
+		COMMAND punycodeconverter_test10 OpenResolver ResolveAddress10
+		COMMAND punycodeconverter_test10 EnableIdnSupport ResolveAddress10
+		COMMAND punycodeconverter_test10 ResolveAddress ResolveAddress10
+		COMMAND punycodeconverter_test10 CloseResolver ResolveAddress10
+	END_TEST_BLOCK
+
+END_TESTCASE                  NET-DND-punycodeconverter-test10
+
+
+START_TESTCASE                NET-DND-punycodeconverter-test11
+//! @SYMTestCaseID              NET-DND-punycodeconverter-test11
+//! @SYMTestCaseDesc            PREQ2296 - REQ11951
+//!                             DND must resolve the punycodeconverter converted IDN
+//! @SYMTestPriority            High
+//! @SYMTestActions             Load te_punycodeconverter test server
+//!                             Run the PunyToIdn test case, preserve the IDN
+//!                             Use the preserved IDN and run ResolveName test case.
+//! @SYMTestExpectedResults     DND resolves the punycodeconverter converted IDN successfully.
+//! @SYMTestType                CIT
+//! @SYMCreationDate            5/2/2009
+//! @SYMAuthor                  tamilarasub
+//! @SYMTestStatus              3. Released
+
+	START_TEST_BLOCK te_punycodeconverter 100 z:\testdata\configs\te_punycodeconverter.ini
+		CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test11
+		COMMAND punycodeconverter_test11 PunyCodeToIdn PunyCodeToIdn11
+		COMMAND punycodeconverter_test11 OpenResolver PunyCodeToIdn11
+		COMMAND punycodeconverter_test11 EnableIdnSupport PunyCodeToIdn11
+		COMMAND punycodeconverter_test11 ResolveName ResolveName11
+		COMMAND punycodeconverter_test11 CloseResolver PunyCodeToIdn11
+	END_TEST_BLOCK
+
+END_TESTCASE                  NET-DND-punycodeconverter-test11
+
+
+START_TESTCASE                NET-DND-punycodeconverter-test12
+//! @SYMTestCaseID              NET-DND-punycodeconverter-test12
+//! @SYMTestCaseDesc            PREQ2296 - REQ11949
+//!                             New component capability test.
+//! @SYMTestPriority            Critical
+//! @SYMTestActions             Create te_punycodeconverter1 by setting the capability UserEnvironment
+//!                             Create te_punycodeconverter2 by setting the capability NetworkServices
+//!                             Load te_punycodeconverter1 test server.
+//!                             Run the CapTest test case
+//!                             Load te_punycodeconverter2 test server.
+//!                             Run the CapTest test case.
+//! @SYMTestExpectedResults     Error KErrPermissionDenied has to be reported for frist test case,
+//!                             KErrNone for the second one.
+//! @SYMTestType                CIT
+//! @SYMCreationDate            11/2/2009
+//! @SYMAuthor                  tamilarasub
+//! @SYMTestStatus              3. Released
+
+//capability UserEnvironment
+RUN_PROGRAM -1 setcap.exe te_punycodeconverter.exe 80000 -SID 10281806 te_punycodeconverter1.exe
+//capability NetworkServices
+RUN_PROGRAM -1 setcap.exe te_punycodeconverter.exe 400 -SID 10281806 te_punycodeconverter2.exe
+
+//Load the Server
+LOAD_SERVER te_punycodeconverter1
+
+	START_TEST_BLOCK te_punycodeconverter1 100 z:\testdata\configs\te_punycodeconverter.ini
+		CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test12
+		COMMAND punycodeconverter_test12 OpenResolver CapTest12
+		COMMAND punycodeconverter_test12 EnableIdnSupport CapTest12
+		COMMAND !Error=-46 punycodeconverter_test12 CapTest CapTest12
+		COMMAND punycodeconverter_test12 CloseResolver CapTest12
+	END_TEST_BLOCK
+
+//Load the Server
+LOAD_SERVER te_punycodeconverter2
+
+	START_TEST_BLOCK te_punycodeconverter2 100 z:\testdata\configs\te_punycodeconverter.ini
+		CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test12
+		COMMAND punycodeconverter_test12 OpenResolver CapTest12
+		COMMAND punycodeconverter_test12 EnableIdnSupport CapTest12
+		COMMAND punycodeconverter_test12 CapTest CapTest12
+		COMMAND punycodeconverter_test12 CloseResolver CapTest12
+	END_TEST_BLOCK
+
+END_TESTCASE                  NET-DND-punycodeconverter-test12
+
+
+START_TESTCASE                NET-DND-punycodeconverter-test13
+//! @SYMTestCaseID              NET-DND-punycodeconverter-test13
+//! @SYMTestCaseDesc            PREQ2296 - REQ12162
+//!                             Enable IDN, Resolve surrogate pair code unit
+//! @SYMTestPriority            High
+//! @SYMTestActions             Load te_punycodeconverter test server
+//!                             Run the surrogatepair test case
+//! @SYMTestExpectedResults     Expect KErrDndBadName error
+//! @SYMTestType                CIT
+//! @SYMCreationDate            5/2/2009
+//! @SYMAuthor                  tamilarasub
+//! @SYMTestStatus              3. Released
+
+	START_TEST_BLOCK te_punycodeconverter 100 z:\testdata\configs\te_punycodeconverter.ini
+		CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test13
+		COMMAND punycodeconverter_test13 OpenResolver SurrogatePair13
+		COMMAND punycodeconverter_test13 EnableIdnSupport SurrogatePair13
+		COMMAND !Error=-5127 punycodeconverter_test13 SurrogatePair SurrogatePair13
+		COMMAND punycodeconverter_test13 CloseResolver SurrogatePair13
+	END_TEST_BLOCK
+
+END_TESTCASE                  NET-DND-punycodeconverter-test13
+
+
+START_TESTCASE                NET-DND-punycodeconverter-test14
+//! @SYMTestCaseID              NET-DND-punycodeconverter-test14
+//! @SYMTestCaseDesc            PREQ2296 - REQ12162
+//!                             Disable IDN, Resolve surrogate pair code unit
+//! @SYMTestPriority            Medium
+//! @SYMTestActions             Load te_punycodeconverter test server
+//!                             run surrogatepair test case
+//! @SYMTestExpectedResults     Expect KErrDndBadName
+//! @SYMTestType                CIT
+//! @SYMCreationDate            5/2/2009
+//! @SYMAuthor                  tamilarasub
+//! @SYMTestStatus              3. Released
+
+	START_TEST_BLOCK te_punycodeconverter 100 z:\testdata\configs\te_punycodeconverter.ini
+		CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test14
+		COMMAND punycodeconverter_test14 OpenResolver SurrogatePair14
+		COMMAND punycodeconverter_test14 DisableIdnSupport SurrogatePair14
+		COMMAND !Error=-5127 punycodeconverter_test14 SurrogatePair SurrogatePair14
+		COMMAND punycodeconverter_test14 CloseResolver SurrogatePair14
+	END_TEST_BLOCK
+
+END_TESTCASE                  NET-DND-punycodeconverter-test14
+
+
+START_TESTCASE                NET-DND-punycodeconverter-test15
+//! @SYMTestCaseID              NET-DND-punycodeconverter-test15
+//! @SYMTestCaseDesc            Disable IDN using the RHostResolver API SetOpt, try to resolve valid IDN name
+//! @SYMTestPriority            High
+//! @SYMTestActions             Load te_punycodeconverter test server
+//!                             run ResolveName test case
+//! @SYMTestExpectedResults     Expect the error KErrDndNameNotFound
+//! @SYMTestType                CIT
+//! @SYMCreationDate            5/2/2009
+//! @SYMAuthor                  tamilarasub
+//! @SYMTestStatus              3. Released
+
+	START_TEST_BLOCK te_punycodeconverter 100 z:\testdata\configs\te_punycodeconverter.ini
+		CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test15
+		COMMAND punycodeconverter_test15 OpenResolver SurrogatePair15
+		COMMAND punycodeconverter_test15 DisableIdnSupport SurrogatePair15
+		COMMAND !Error=-5120 punycodeconverter_test15 ResolveName ResolveName15
+		COMMAND punycodeconverter_test15 CloseResolver SurrogatePair15
+	END_TEST_BLOCK
+
+END_TESTCASE                  NET-DND-punycodeconverter-test15
+
+START_TESTCASE                NET-DND-punycodeconverter-test16
+//! @SYMTestCaseID              NET-DND-punycodeconverter-test16
+//! @SYMTestCaseDesc            DEF141282 fix
+//!                             Convert the valid punycode to IDN and check this against maually converted one.
+//! @SYMTestPriority            High
+//! @SYMTestActions             Load te_punycodeconverter test server.
+//!                             Run the PunyToIdn test case.
+//!                             Compare the converted IDN against the manually converted one which is fetched from te_punycodeconverter.ini.
+//! @SYMTestExpectedResults     IDN converted by punycodeconverter and manually converted are same.
+//! @SYMTestType                CIT
+//! @SYMCreationDate            4/08/2009
+//! @SYMAuthor                  Maheswara
+//! @SYMTestStatus              3. Released
+
+	START_TEST_BLOCK te_punycodeconverter 100 z:\testdata\configs\te_punycodeconverter.ini
+		CREATE_OBJECT PunycodeConverterTestWrapper punycodeconverter_test16
+		COMMAND punycodeconverter_test16 PunyCodeToIdn PunyCodeToIdn16
+	END_TEST_BLOCK
+
+END_TESTCASE                  NET-DND-punycodeconverter-test16
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_stopallinterfaces.script
+RUN_SCRIPT z:\testdata\scripts\te_esock_test_unloadesockForced.script
+
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/punycodeconv/te_unittest/configs/S-ced-hw-empty.cfg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/punycodeconv/te_unittest/configs/S-ced-hw-empty.cfg	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,557 @@
+############################################################
+## AUTO-GENERATED CONFIGURATION FILE
+## CommsDat Database Dump Utility
+## 1.1
+############################################################
+
+############################################################
+## ModemBearer
+## 
+[ModemBearer]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Modem
+	IfName=PPP
+	PortName=COMM::0
+	TSYName=MM
+	CSYName=ECUART
+	LastSocketActivityTimeout=30
+	LastSessionClosedTimeout=180
+	LastSocketClosedTimeout=30
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=0
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOff=Q0
+	QuietOn=Q1
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+44123456789
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	CommRole=0
+	SIRSettings=0
+	Agent=CSD.agt
+	FIELD_COUNT=70
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=GPRS Modem
+	IfName=spud-rawip
+	PortName=DATAPORT::0
+	TSYName=PHONETSY
+	CSYName=DATAPORT
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=1
+	LastSocketClosedTimeout=-1
+	DataBits=5
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=0
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOff=Q0
+	QuietOn=Q1
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+44123456789
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=0
+	CommRole=0
+	SIRSettings=0
+	Agent=gprsumtsagent.agt
+	BCAStack=BcaToIsc
+	FIELD_COUNT=71
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=CSD Modem
+	IfName=PPP
+	PortName=DATAPORT::0
+	TSYName=PHONETSY
+	CSYName=DATAPORT
+	LastSocketActivityTimeout=300
+	LastSessionClosedTimeout=1
+	LastSocketClosedTimeout=300
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=19200
+	Handshaking=196
+	SpecialRate=0
+	XonChar=17
+	XoffChar=19
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=ATZ
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOff=Q0
+	QuietOn=Q1
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+358508771010
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=0
+	CommRole=0
+	SIRSettings=0
+	Agent=csd.agt
+	FIELD_COUNT=70
+END_ADD
+
+
+############################################################
+## Location
+## 
+[Location]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Default Location
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## Chargecard
+## 
+[Chargecard]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Dummy BT Chargecard
+	AccountNumber=144,12345678
+	Pin=0000
+	LocalRule=HG
+	NatRule=HFG
+	IntlRule=HEFG
+	FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## GlobalSettings
+## 
+[GlobalSettings]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-1
+	WAPAccessPoint=1
+	ConnectionAttempts=1
+	RedialAttempts=0
+	SmsBearer=3
+	SmsReceiveMode=2
+	GPRSAttachMode=1
+	AcceptIncomingGprs=1
+	GPRSClassCBearer=GSM
+	ModemForDataAndFax=3
+	ModemForPhoneServicesAndSMS=3
+	LocationForDataAndFax=1
+	LocationForPhoneServicesAndSMS=1
+	MaxMBufHeap=1
+	DefaultNetwork=1
+	BearerAvailabilityCheckTSY=PHONETSY
+	FIELD_COUNT=17
+END_ADD
+
+
+############################################################
+## DialOutISP
+## 
+[DialOutISP]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Dial Out ISP
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=TRUE
+	DisplayPCT=FALSE
+	IfPromptForAuth=TRUE
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=UNSPECIFIED
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=29
+END_TEMPLATE
+
+
+############################################################
+## DialInISP
+## 
+[DialInISP]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Dial In ISP
+	UseLoginScript=FALSE
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=10
+END_TEMPLATE
+
+
+############################################################
+## OutgoingGPRS
+## 
+[OutgoingGPRS]
+ADD_TEMPLATE
+	Id=0
+	Name=template
+	PDPType=IPV4
+	ReqPrecedence=0
+	ReqDelay=0
+	ReqReliability=0
+	ReqPeakThroughput=0
+	ReqMeanThroughput=0
+	MinPrecedence=0
+	MinDelay=0
+	MinReliability=0
+	MinPeakThroughput=0
+	MinMeanThroughput=0
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=TRUE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	AuthRetries=0
+	IpGateway=0.0.0.0
+	IpAddrFromServer=TRUE
+	IpAddr=0.0.0.0
+	IpDNSAddrFromServer=TRUE
+	IpNameServer1=0.0.0.0
+	IpNameServer2=0.0.0.0
+	Ip6DNSAddrFromServer=TRUE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=TRUE
+	GprsAccessPointType=2
+	QosWarningTimeout=-1
+	UmtsR99QoSAndOn=1
+	FIELD_COUNT=32
+END_TEMPLATE
+
+
+############################################################
+## DefaultGPRS
+## 
+[DefaultGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Dummy Default GPRS Settings
+	Usage=1
+	PDPType=IPV6
+	PDPAddress=www.wid.com
+	Precedence=1
+	Delay=1
+	Reliability=1
+	PeakThroughput=1
+	MeanThroughput=1
+	MinPrecedence=1
+	MinDelay=1
+	MinReliability=1
+	MinPeakThroughput=1
+	MinMeanThroughput=1
+	DataCompression=TRUE
+	HeaderCompression=TRUE
+	GprsUseEdge=FALSE
+	AnonymousAccess=TRUE
+	FIELD_COUNT=19
+END_ADD
+
+
+############################################################
+## ConnectionPreferences
+## 
+[ConnectionPreferences]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-1
+	Ranking=0
+	Direction=OUTGOING
+	BearerSet=CSD & WCDMA
+	DialogPref=PROMPT
+	IAP=0
+	FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## WAPAccessPoint
+## 
+[WAPAccessPoint]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Dial In ISP
+	CurrentBearer=WAPIPBearer
+	FIELD_COUNT=3
+END_TEMPLATE
+
+
+############################################################
+## WAPIPBearer
+## 
+[WAPIPBearer]
+ADD_TEMPLATE
+	Id=0
+	Name=DefaultRecordName-1
+	AccessPointId=0
+	IAP=0
+	WSPOption=CONNECTIONLESS
+	Security=FALSE
+	ProxyPortNumber=0
+	FIELD_COUNT=7
+END_TEMPLATE
+
+
+############################################################
+## WAPSMSBearer
+## 
+[WAPSMSBearer]
+ADD_TEMPLATE
+	Id=0
+	Name=DefaultRecordName-1
+	AccessPointId=0
+	WSPOption=CONNECTIONLESS
+	Security=FALSE
+	FIELD_COUNT=5
+END_TEMPLATE
+
+
+############################################################
+## SecureSocketTable
+## 
+[SecureSocketTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-1
+	ProtocolName=ssl3.0
+	ProtoLibrary=ssladaptor.dll
+	FIELD_COUNT=4
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=DefaultRecordName-2
+	ProtocolName=tls1.0
+	ProtoLibrary=ssladaptor.dll
+	FIELD_COUNT=4
+END_ADD
+
+############################################################
+## UmtsR99QoSAndOn
+## 
+[UmtsR99QoSAndOn]
+ADD_SECTION
+# COMMDB_ID = 1
+        Name=PRIMARY1
+        ReqTrafficClass=1
+        MinTrafficClass=1
+        ReqDeliveryOrder=1
+        MinDeliveryOrder=1
+        ReqDeliverErroneousSDU=1
+        MinDeliverErroneousSDU=1
+        ReqMaxSDUSize=0
+        MinAcceptableMaxSDUSize=0
+        ReqMaxUplinkRate=0
+        ReqMinUplinkRate=0
+        ReqMaxDownlinkRate=0
+        ReqMinDownlinkRate=0
+        ReqBER=1
+        MaxBER=1
+        ReqSDUErrorRatio=1
+        MaxSDUErrorRatio=1
+        ReqTrafficHandlingPriority=1
+        MinTrafficHandlingPriority=1
+        ReqTransferDelay=0
+        MaxTransferDelay=0
+        ReqGuaranteedUplinkRate=0
+        MinGuaranteedUplinkRat=0
+        ReqGuaranteedDownlinkRate=0
+        MinGuaranteedDownlinkRate=0
+        SignallingIndication=FALSE
+        IMCNSignallingIndication=FALSE
+        SourceStatisticsDescriptor=0
+        FIELD_COUNT=28 
+END_ADD
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/punycodeconv/te_unittest/configs/cccccc00_unittestidna.cre
Binary file tcpiputils/punycodeconv/te_unittest/configs/cccccc00_unittestidna.cre has changed
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/punycodeconv/te_unittest/configs/te_unittestidna_wlan.xml
Binary file tcpiputils/punycodeconv/te_unittest/configs/te_unittestidna_wlan.xml has changed
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/punycodeconv/te_unittest/configs/unittestidna_connectionpref.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/punycodeconv/te_unittest/configs/unittestidna_connectionpref.xml	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CommDB:Config>
+	<ConnectionPreferencesTable>
+	  <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable1</Name>
+        <Ranking>1</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>DONOTPROMPT</DialogPref>
+        <BearerSet>WLAN</BearerSet>
+        <IAPRef>IAP.WLANWithDynamicDaemonIP</IAPRef>
+    </ConnectionPreferences>
+  </ConnectionPreferencesTable>
+</CommDB:Config>
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/punycodeconv/te_unittest/group/bld.inf
--- a/tcpiputils/punycodeconv/te_unittest/group/bld.inf	Tue Jul 06 16:04:34 2010 +0300
+++ b/tcpiputils/punycodeconv/te_unittest/group/bld.inf	Wed Aug 18 11:18:20 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -19,11 +19,14 @@
 //-- iby file for the test
 ./te_unittestidna.iby	/epoc32/rom/include/te_unittestidna.iby
 
-
+#ifdef SIROCCO_CODE_MIGRATION
+../configs/cccccc00_unittestidna.cre z:/testdata/configs/cccccc00_unittestidna.cre
+../scripts/te_unittestidna_wlan.script  	z:/testdata/scripts/te_unittestidna_wlan.script
+#else
 //-- test script files
 ../scripts/te_unittestidna.script 	z:/testdata/scripts/te_unittestidna.script
 ../configs/te_unittestidna.xml		z:/testdata/configs/te_unittestidna.xml
-
+#endif
 
 PRJ_TESTMMPFILES
 te_unittestidna.mmp
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/punycodeconv/te_unittest/group/te_unittestidna.iby
--- a/tcpiputils/punycodeconv/te_unittest/group/te_unittestidna.iby	Tue Jul 06 16:04:34 2010 +0300
+++ b/tcpiputils/punycodeconv/te_unittest/group/te_unittestidna.iby	Wed Aug 18 11:18:20 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2009-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"
@@ -20,6 +20,12 @@
 #include <punycodeconverter.iby>
 
 file=ABI_DIR\DEBUG_DIR\testidnserver.exe				System\bin\testidnserver.exe
+#ifdef INCLUDE_SIROCCO_CODE_MIGRATION
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_unittestidna_wlan.script 	testdata\scripts\te_unittestidna.script
+data=EPOCROOT##epoc32\data\z\testdata\configs\cccccc00_unittestidna.cre	testdata\configs\cccccc00_unittestidna.cre
+#else
 data=EPOCROOT##epoc32\data\z\testdata\scripts\te_unittestidna.script 	testdata\scripts\te_unittestidna.script
 data=EPOCROOT##epoc32\data\z\testdata\configs\te_unittestidna.xml	testdata\configs\te_unittestidna.xml
+#endif
+
 #endif //__TE_IDNA_SERVER_IBY__
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/punycodeconv/te_unittest/group/te_unittestidna.mmp
--- a/tcpiputils/punycodeconv/te_unittest/group/te_unittestidna.mmp	Tue Jul 06 16:04:34 2010 +0300
+++ b/tcpiputils/punycodeconv/te_unittest/group/te_unittestidna.mmp	Wed Aug 18 11:18:20 2010 +0300
@@ -23,17 +23,17 @@
 TARGET          testidnserver.exe
 TARGETTYPE      exe
 
-SOURCEPATH      ..\src
+SOURCEPATH      ../src
 SOURCE 	    te_unittestidna.cpp
 SOURCE	    te_unittestidnaserver.cpp
 SOURCE	    te_unittestidnastepbase.cpp
 
 #ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   \epoc32\include\test
+SYSTEMINCLUDE   /epoc32/include
+SYSTEMINCLUDE   /epoc32/include/test
 #else
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-SYSTEMINCLUDE   \epoc32\include\platform\test
+SYSTEMINCLUDE   /epoc32/include/platform/test
 #endif
 
 LIBRARY         euser.lib 
diff -r 88121cf79045 -r 78fceed50f62 tcpiputils/punycodeconv/te_unittest/scripts/te_unittestidna_wlan.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/punycodeconv/te_unittest/scripts/te_unittestidna_wlan.script	Wed Aug 18 11:18:20 2010 +0300
@@ -0,0 +1,167 @@
+//
+// 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
+//! @SYMTestSuiteName      NET-DND-PUNYCODECONVERTER-UNITTEST
+//! @SYMScriptTestEnvironment TEF
+
+PRINT TE_UNITTESTIDNA: Testing International Domain Name Resolution
+
+run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+RUN_UTILS  MkDir c:\private
+RUN_UTILS  MkDir c:\private\10202be9
+RUN_UTILS  MkDir c:\private\10202be9\persists
+RUN_UTILS  MakeReadWrite c:\private\10202be9\persists\cccccc00.cre
+
+//Configure commdb.
+//ced z:\testdata\configs\te_unittestidna.xml
+RUN_UTILS CopyFile z:\testdata\configs\cccccc00_unittestidna.cre c:\private\10202be9\persists\cccccc00.cre
+run_script z:\TestData\scripts\te_esock_test_loadesock.script
+
+LOAD_SUITE testidnserver -SharedData
+
+
+
+START_TESTCASE                NET-DND-punycodeconverter-unittest01
+//! @SYMTestCaseID              NET-DND-punycodeconverter-unittest01
+//! @SYMTestCaseDesc            PREQ2296 - REQ11948
+//!                             Resolve International Domain Name.
+//! @SYMTestPriority            Critical
+//! @SYMTestActions             Load testidnserver test server.
+//!                             Test GetByName(IDN) without IDN Enabled
+//! @SYMTestExpectedResults     Domain name resolved with KErrDndNameNotFound.
+//! @SYMTestType                UT
+//! @SYMCreationDate            6/2/2009
+//! @SYMAuthor                  ahamedrafik
+//! @SYMTestStatus              3. Released
+RUN_TEST_STEP  			testidnserver TestIdna01
+END_TESTCASE            	NET-DND-punycodeconverter-unittest01
+
+
+START_TESTCASE                NET-DND-punycodeconverter-unittest02
+//! @SYMTestCaseID              NET-DND-punycodeconverter-unittest02
+//! @SYMTestCaseDesc            PREQ2296 - REQ11948, REQ 12163
+//!                             Resolve International Domain Name.
+//! @SYMTestPriority            Critical
+//! @SYMTestActions             Load testidnserver test server.
+//!                             Test GetByName(IDN) with IDN Enabled
+//! @SYMTestExpectedResults     Domain name resolved successfully.
+//! @SYMTestType                UT
+//! @SYMCreationDate            6/2/2009
+//! @SYMAuthor                  ahamedrafik
+//! @SYMTestStatus              3. Released
+RUN_TEST_STEP  			testidnserver  TestIdna02
+END_TESTCASE            	NET-DND-punycodeconverter-unittest02
+
+
+START_TESTCASE                NET-DND-punycodeconverter-unittest03
+//! @SYMTestCaseID              NET-DND-punycodeconverter-unittest03
+//! @SYMTestCaseDesc            PREQ2296 - REQ11948
+//!                             Resolve Address for IDN.
+//! @SYMTestPriority            Critical
+//! @SYMTestActions             Load testidnserver test server.
+//!                             Test GetByAddress for an IDN without IDN Enabled
+//! @SYMTestExpectedResults     Address resolved successfully.
+//! @SYMTestType                UT
+//! @SYMCreationDate            6/2/2009
+//! @SYMAuthor                  ahamedrafik
+//! @SYMTestStatus              3. Released
+RUN_TEST_STEP  			testidnserver  TestIdna03
+END_TESTCASE            	NET-DND-punycodeconverter-unittest03
+
+
+START_TESTCASE                NET-DND-punycodeconverter-unittest04
+//! @SYMTestCaseID              NET-DND-punycodeconverter-unittest04
+//! @SYMTestCaseDesc            PREQ2296 - REQ11948, REQ 12163
+//!                             Resolve Address for IDN.
+//! @SYMTestPriority            Critical
+//! @SYMTestActions             Load testidnserver test server.
+//!                             Test GetByAddress for an IDN with IDN Enabled
+//! @SYMTestExpectedResults     Address resolved successfully.
+//! @SYMTestType                UT
+//! @SYMCreationDate            6/2/2009
+//! @SYMAuthor                  ahamedrafik
+//! @SYMTestStatus              3. Released
+RUN_TEST_STEP  			testidnserver  TestIdna04
+END_TESTCASE            	NET-DND-punycodeconverter-unittest04
+
+
+START_TESTCASE                NET-DND-punycodeconverter-unittest05
+//! @SYMTestCaseID              NET-DND-punycodeconverter-unittest05
+//! @SYMTestCaseDesc            PREQ2296 - REQ12162
+//!                             Resolve IDN in UTF16 encoding
+//! @SYMTestPriority            Critical
+//! @SYMTestActions             Load testidnserver test server.
+//!                             Test GetByName(IDN in UTF-16) without IDN Enabled
+//! @SYMTestExpectedResults     Domain name resolved successfully.
+//! @SYMTestType                UT
+//! @SYMCreationDate            6/2/2009
+//! @SYMAuthor                  ahamedrafik
+//! @SYMTestStatus              3. Released
+RUN_TEST_STEP  			testidnserver  TestIdna05
+END_TESTCASE            	NET-DND-punycodeconverter-unittest05
+
+
+START_TESTCASE                NET-DND-punycodeconverter-unittest06
+//! @SYMTestCaseID              NET-DND-punycodeconverter-unittest06
+//! @SYMTestCaseDesc            PREQ2296 - 11950
+//!                             Convert UCS2.0 encoding to Punycode.
+//! @SYMTestPriority            Critical
+//! @SYMTestActions             Load testidnserver test server.
+//!                             Test IDN to Punycode Conversion functionality.
+//! @SYMTestExpectedResults     Conversion done successfully.
+//! @SYMTestType                UT
+//! @SYMCreationDate            6/2/2009
+//! @SYMAuthor                  ahamedrafik
+//! @SYMTestStatus              3. Released
+RUN_TEST_STEP  			testidnserver  TestIdna06
+END_TESTCASE            	NET-DND-punycodeconverter-unittest06
+
+
+START_TESTCASE                NET-DND-punycodeconverter-unittest07
+//! @SYMTestCaseID              NET-DND-punycodeconverter-unittest07
+//! @SYMTestCaseDesc            PREQ2296 - REQ11951
+//!                             Convert punycode to UCS2.0 encoding.
+//! @SYMTestPriority            Critical
+//! @SYMTestActions             Load testidnserver test server.
+//!                             Test Punycode to IDN Conversion functionality.
+//! @SYMTestExpectedResults     Domain name resolved successfully.
+//! @SYMTestType                UT
+//! @SYMCreationDate            6/2/2009
+//! @SYMAuthor                  ahamedrafik
+//! @SYMTestStatus              3. Released
+RUN_TEST_STEP  			testidnserver  TestIdna07
+END_TESTCASE            	NET-DND-punycodeconverter-unittest07
+
+
+START_TESTCASE                NET-DND-punycodeconverter-unittest08
+//! @SYMTestCaseID              NET-DND-punycodeconverter-unittest08
+//! @SYMTestCaseDesc            PREQ2296 - REQ11949
+//!                             Load the New library.
+//! @SYMTestPriority            Critical
+//! @SYMTestActions             Load te_punycodeconverter test server
+//!                             Load the punycodeconverter library.
+//! @SYMTestExpectedResults     Punycodeconverter library loaded succesfully.
+//! @SYMTestType                UT
+//! @SYMCreationDate            6/2/2009
+//! @SYMAuthor                  ahamedrafik
+//! @SYMTestStatus              3. Released
+RUN_TEST_STEP  			testidnserver  TestIdna08
+END_TESTCASE            	NET-DND-punycodeconverter-unittest08
+
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_stopallinterfaces.script
+RUN_SCRIPT z:\testdata\scripts\te_esock_test_unloadesockForced.script
+