Revision: 201033 RCL_3
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Thu, 19 Aug 2010 11:25:30 +0300
branchRCL_3
changeset 20 7e41d162e158
parent 19 3652a10b304a
child 21 abbed5a4b42a
Revision: 201033 Kit: 201033
esockapiextensions/internetsockets/inc/in_sock.h
linklayercontrol/networkinterfacemgr/agentprcore/inc/CAgentAdapter.h
linklayercontrol/networkinterfacemgr/agentprcore/inc/agentscpr.h
linklayercontrol/networkinterfacemgr/agentprcore/src/CAgentAdapter.cpp
linklayercontrol/networkinterfacemgr/agentprcore/src/agentscpr.cpp
linklayercontrol/nullagt/TS_AgentAdapter/bwins/csdagttestsu.def
linklayercontrol/nullagt/TS_AgentAdapter/eabi/csdagttestsu.def
linklayercontrol/nullagt/TS_AgentAdapter/group/bld.inf
linklayercontrol/nullagt/TS_AgentAdapter/group/cedout.cfg
linklayercontrol/nullagt/TS_AgentAdapter/group/connection_start.script
linklayercontrol/nullagt/TS_AgentAdapter/group/connection_start_failure.script
linklayercontrol/nullagt/TS_AgentAdapter/group/csdagenttest.script
linklayercontrol/nullagt/TS_AgentAdapter/group/csdagenttests.mmp
linklayercontrol/nullagt/TS_AgentAdapter/group/csdagttests.iby
linklayercontrol/nullagt/TS_AgentAdapter/inc/CsdAgentTestSteps.h
linklayercontrol/nullagt/TS_AgentAdapter/inc/CsdAgentTestSuite.h
linklayercontrol/nullagt/TS_AgentAdapter/src/csdAgent_Connection.cpp
linklayercontrol/nullagt/TS_AgentAdapter/src/csdAgent_ConnectionFailure.cpp
linklayercontrol/nullagt/TS_AgentAdapter/src/csdAgent_TestSteps.cpp
linklayercontrol/nullagt/TS_AgentAdapter/src/csdAgent_Testsuite.cpp
linklayercontrol/nullagt/group/bld.inf
networkcontrol/ipnetworklayer/inc/IPProtoCPR.h
networkcontrol/ipnetworklayer/inc/IPProtoMCpr.h
networkcontrol/ipnetworklayer/inc/IPProtoSCPRStates.h
networkcontrol/ipnetworklayer/inc/ipprotodeftscprstates.h
networkcontrol/ipnetworklayer/src/IPProtoCPR.cpp
networkcontrol/ipnetworklayer/src/IPProtoCprStates.cpp
networkcontrol/ipnetworklayer/src/IPProtoMCpr.cpp
networkcontrol/ipnetworklayer/src/IPProtoSCPR.cpp
networkcontrol/ipnetworklayer/src/IPProtoSCPRFactory.cpp
networkcontrol/ipnetworklayer/src/IPProtoTierManagerSelector.cpp
networkcontrol/ipnetworklayer/src/ipprotodeftscpr.cpp
networkcontrol/iptransportlayer/inc/ipcpr_states.h
networkcontrol/iptransportlayer/src/ipcpr_activities.cpp
networkcontrol/iptransportlayer/src/ipcpr_states.cpp
networkcontrol/iptransportlayer/src/ipdeftbasescpr.cpp
networkcontrol/iptransportlayer/src/netmcpr.cpp
networkcontrol/qosfwconfig/qostest/te_qos/configs/te_QoSSuite_Mesh_pdpcpr.cfg
networkcontrol/qosfwconfig/qostest/te_qos/group/bld.inf
networkcontrol/qosipscpr/inc/ip_subconparams.h
networkingsrv_info/networkingrom/group/NetworkTest.iby
networkingtestandutils/exampleinternetutilities/PING/PING.CPP
networkingtestandutils/exampleinternetutilities/PINGENG/PINGENG.CPP
networkingtestandutils/exampleinternetutilities/TFTP/TFTP.CPP
networkingtestandutils/exampleinternetutilities/TFTPENG/TFTPENG.CPP
networkingtestandutils/exampleinternetutilities/TRACERT/TRACERT.CPP
networkingtestandutils/exampleinternetutilities/TRENG/TRENG.CPP
networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/configs/te_dedicatedsignalling1ryctx_changedsid_pdpcpr.cfg
networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/configs/te_dedicatedsignalling1ryctx_imssi_pdpcpr.cfg
networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/configs/te_dedicatedsignalling1ryctx_nosid_pdpcpr.cfg
networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/configs/te_dedicatedsignalling1ryctx_pdpcpr.cfg
networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/group/bld.inf
networkingtestandutils/networkingintegrationtest/te_Sblp/configs/te_Sblp_Mesh_pdpcpr.cfg
networkingtestandutils/networkingintegrationtest/te_Sblp/group/bld.inf
networkingtestandutils/networkingunittest/dummynif_params/group/dummynif_params.mmp
networkingtestandutils/networkingunittest/group/DummyNifProtos.mmp
networkprotocols/dnsproxy/test/group/t_dnsproxy.mmp
networkprotocols/dnsproxy/test/src/hacked_servers.cpp
networkprotocols/iphook/inhook6/group/inhook6.mmp
networkprotocols/iphook/inhook6/inc/res_sock.h
networkprotocols/iphook/inhook6/include/in_bind.h
networkprotocols/tcpipv4v6prt/inc/inet.h
networkprotocols/tcpipv4v6prt/inc/tcp.h
networkprotocols/tcpipv4v6prt/src/iface.cpp
networkprotocols/tcpipv4v6prt/src/inet.cpp
networkprotocols/tcpipv4v6prt/src/res.cpp
networkprotocols/tcpipv4v6prt/src/tcp.cpp
networkprotocols/tcpipv4v6prt/src/tcp_sap.cpp
networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_edge.txt
networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_gprs.txt
networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_hsdpa.txt
networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_umts.txt
networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_edge_gprs_config.txt
networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_edge_hsdpa_config.txt
networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_edge_umts_config.txt
networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_gprs_edge_config.txt
networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_gprs_hsdpa_config.txt
networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_gprs_umts_config.txt
networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_hsdpa_edge_config.txt
networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_hsdpa_gprs_config.txt
networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_hsdpa_umts_config.txt
networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_umts_edge_config.txt
networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_umts_gprs_config.txt
networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_umts_hsdpa_config.txt
networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_edge_gprs.script
networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_edge_gprs_user_set.script
networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_edge_hsdpa.script
networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_edge_umts.script
networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_gprs_edge.script
networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_gprs_hsdpa.script
networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_gprs_umts.script
networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_hsdpa_edge.script
networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_hsdpa_gprs.script
networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_hsdpa_umts.script
networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_umts_edge.script
networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_umts_gprs.script
networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_umts_hsdpa.script
networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_edge_gprs.script
networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_edge_hsdpa.script
networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_edge_umts.script
networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_gprs_edge.script
networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_gprs_hsdpa.script
networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_gprs_umts.script
networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_hsdpa_edge.script
networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_hsdpa_gprs.script
networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_hsdpa_umts.script
networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_umts_edge.script
networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_umts_gprs.script
networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_umts_hsdpa.script
networksecurity/ipsec/group/bld.inf
networksecurity/ipsec/ipsec6/group/ipsec6.mmp
networksecurity/ipsec/ipsec6/inc/sa_spec.h
networksecurity/ipsec/ipsec6/inc/spdb.h
networksecurity/ipsec/ipsec6/src/sc_prt6.cpp
networksecurity/ipsec/ipsec6/src/spdb.cpp
networksecurity/ipsec/ipsecpol/group/ipsecpol.mmp
networksecurity/ipsec/ipsecpol/inc/ipsecpol.h
networksecurity/ipsec/ipsecpol/inc/ipsecpolmanhandler.h
networksecurity/ipsec/ipsecpol/src/ipsecpolmanconflict.cpp
networksecurity/ipsec/ipsecpol/src/ipsecpolmanhandler.cpp
networksecurity/ipsec/ipsecpol/src/ipsecpolmansession.cpp
networksecurity/ipsec/ipsecpol/src/ipsecpolmanutil.cpp
networksecurity/ipsec/ipsecpolapi/bwins/IPSECPOLAPIU.DEF
networksecurity/ipsec/ipsecpolapi/eabi/ipsecpolapiU.DEF
networksecurity/ipsec/ipsecpolapi/inc/ipsecpolapi.h
networksecurity/ipsec/ipsecpolapi/src/ipsecpolapi.cpp
networksecurity/ipsec/lib_pfkey/include/lib_pfkey.h
networksecurity/ipsec/te_ipsec/group/t_ipsec.mmp
networksecurity/ipsec/te_ipsec/inc/t_ipsecikev2.h
networksecurity/ipsec/te_ipsec/inc/t_ipsecmultiplesa.h
networksecurity/ipsec/te_ipsec_selector_confilict/group/bld.inf
networksecurity/ipsec/te_ipsec_selector_confilict/group/te_ipsec_selector_confilict.iby
networksecurity/ipsec/te_ipsec_selector_confilict/group/te_ipsec_selector_confilict.mmp
networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_coverage_test.h
networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_ipsec_load_policy_base.h
networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_ipsecconst.h
networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_ipsectestserver.h
networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_loadpolicy_bbd.h
networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_loadpolicy_bdd.h
networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_loadpolicy_uma.h
networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_selectorconflict.h
networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict-uma1.script
networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict-uma2.script
networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict-uma3.script
networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict-uma4.script
networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict-uma5.script
networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict-uma6.script
networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_bbd1.script
networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_bbd2.script
networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_bbd3.script
networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_bdd1.script
networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_bdd2.script
networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_bdd3.script
networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_common.script
networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_coverage.script
networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ikev1test-ops.ini
networksecurity/ipsec/te_ipsec_selector_confilict/src/te_coverage_test.cpp
networksecurity/ipsec/te_ipsec_selector_confilict/src/te_ipsectestserver.cpp
networksecurity/ipsec/te_ipsec_selector_confilict/src/te_loadpolicy_bbd.cpp
networksecurity/ipsec/te_ipsec_selector_confilict/src/te_loadpolicy_bdd.cpp
networksecurity/ipsec/te_ipsec_selector_confilict/src/te_loadpolicy_uma.cpp
networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_2483.pin
networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_2483.pol
networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_2483_drop.pin
networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_2483_drop.pol
networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_ethced_2483.xml
networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_ethced_2483vpn.xml
networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_ethced_2483vpn_drop.xml
networksecurity/tls/group/BLD.INF
networksecurity/tls/group/SSL.MMP
networksecurity/tls/group/ts_tls.iby
networksecurity/tls/group/ts_tls.mmp
networksecurity/tls/protocol/tlsconnection.cpp
networksecurity/tls/secsock/SecureSocketInterface.h
networksecurity/tls/test/te_tlsunittest/group/te_tlsunittest.mmp
networksecurity/tls/ts_tls/T_Autossl_Const.h
networksecurity/tls/ts_tls/T_TLS_cntrl.cpp
networksecurity/tls/ts_tls/T_TLS_cntrl.h
networksecurity/tls/ts_tls/T_TLS_test.cpp
networksecurity/tls/ts_tls/T_TLS_test.h
networksecurity/tls/ts_tls/scripts/Tls39.ini
networksecurity/tls/ts_tls/scripts/Tls40.ini
networksecurity/tls/ts_tls/scripts/Tls41.ini
networksecurity/tls/ts_tls/scripts/ssl_ntras_30.script
networksecurity/tls/ts_tls/scripts/tls42.ini
networksecurity/tlsprovider/group/tlsprovider.mmp
networksecurity/tlsprovider/inc/tlstypedef.h
networksecurity/tlsprovider/inc/tlstypedef_internal.h
networksecurity/tlsprovider/source/tlsprovider/CTlsProvider.cpp
networksecurity/tlsprovider/source/tlsprovider/tlsprovinterface.cpp
tcpiputils/dhcp/group/DHCPServ.iby
tcpiputils/dhcp/group/DHCPServ.mmp
tcpiputils/dhcp/group/bld.inf
tcpiputils/dhcp/group/dhcp.ini
tcpiputils/dhcp/include/DHCPIP4Msg.h
tcpiputils/dhcp/include/DHCPIP4StateMachine.h
tcpiputils/dhcp/include/DHCPStateMachine.h
tcpiputils/dhcp/include/DHCP_Std.h
tcpiputils/dhcp/src/DHCPIP4Control.cpp
tcpiputils/dhcp/src/DHCPIP4Msg.cpp
tcpiputils/dhcp/src/DHCPIP4StateMachine.cpp
tcpiputils/dhcp/src/DHCPIP6Control.cpp
tcpiputils/dhcp/src/DHCPIP6StateMachine.cpp
tcpiputils/dhcp/src/DHCPStateMachine.cpp
tcpiputils/dhcp/te_dhcp/src/te_dhcpTestStep1.cpp
tcpiputils/dhcp/te_unittest/dhcpservtest.cpp
tcpiputils/dhcp/te_unittest/dhcpservtest.mmp
tcpiputils/dnd/Test/Group/BLD.INF
tcpiputils/dnd/Test/te_dndunittest/group/te_dndunittest.mmp
tcpiputils/dnd/Test/te_dnssuffix/configs/te_dnssuffix.ini
tcpiputils/dnd/Test/te_dnssuffix/configs/te_dnssuffixced.xml
tcpiputils/dnd/Test/te_dnssuffix/configs/te_dnssuffixced_basic.xml
tcpiputils/dnd/Test/te_dnssuffix/configs/te_dnssuffixcedv2.xml
tcpiputils/dnd/Test/te_dnssuffix/group/bld.inf
tcpiputils/dnd/Test/te_dnssuffix/group/te_dnssuffix.iby
tcpiputils/dnd/Test/te_dnssuffix/group/te_dnssuffix.mmp
tcpiputils/dnd/Test/te_dnssuffix/inc/CallBackHandler.h
tcpiputils/dnd/Test/te_dnssuffix/inc/DNSSuffixHostResolver.h
tcpiputils/dnd/Test/te_dnssuffix/inc/te_dnssuffixtestblock.h
tcpiputils/dnd/Test/te_dnssuffix/inc/te_dnssuffixtestserver.h
tcpiputils/dnd/Test/te_dnssuffix/inc/te_dnssuffixtestwrapper.h
tcpiputils/dnd/Test/te_dnssuffix/scripts/te_dnssuffixsuite.script
tcpiputils/dnd/Test/te_dnssuffix/src/DNSSuffixHostResolver.cpp
tcpiputils/dnd/Test/te_dnssuffix/src/te_dnssuffixtestblock.cpp
tcpiputils/dnd/Test/te_dnssuffix/src/te_dnssuffixtestserver.cpp
tcpiputils/dnd/Test/te_dnssuffix/src/te_dnssuffixtestwrapper.cpp
tcpiputils/dnd/data/resolver.ini
tcpiputils/dnd/group/bld.inf
tcpiputils/dnd/inc/dnd_ini.h
tcpiputils/dnd/inc/dns.h
tcpiputils/dnd/inc/dns_sock.h
tcpiputils/dnd/inc/engine.h
tcpiputils/dnd/inc/listener.h
tcpiputils/dnd/inc/servers.h
tcpiputils/dnd/src/dns.cpp
tcpiputils/dnd/src/dns_sock.cpp
tcpiputils/dnd/src/engine.cpp
tcpiputils/dnd/src/resolver.cpp
tcpiputils/dnd/src/servers.cpp
tcpiputils/networkaddressandporttranslation/te_unittest/group/te_naptunittest.mmp
tcpiputils/punycodeconv/te_punycodeconverter/group/te_punycodeconverter.mmp
tcpiputils/punycodeconv/te_unittest/group/te_unittestidna.mmp
--- a/esockapiextensions/internetsockets/inc/in_sock.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/esockapiextensions/internetsockets/inc/in_sock.h	Thu Aug 19 11:25:30 2010 +0300
@@ -32,6 +32,71 @@
 #include <in_sock_internal.h>
 #endif
 
+// Constants and typedef's for domain suffix support on interface
+const TInt KMaxDomainSuffixLength = 254; // Leaving space for minimum 1 letter hostname + '.' on maximum hostname length
+const TInt KMaxHostNameLength = 256;
+typedef TBuf<KMaxDomainSuffixLength> TSuffixName;
+typedef RArray<TSuffixName> RInetSuffixList;
+
+// Enumeration on type of operation done on the interface
+// for the domain suffix using RSocket::SetOpt
+enum TSoInetDomainSuffixFunction
+	{
+	EInetFunctionUndefined,
+	EInetAddSuffix,
+	EInetDeleteSuffix,
+	EInetDeleteAllSuffixes
+	};
+
+/**
+* Interface domain name structure
+* Used in TSoInetInterfaceInfoExtnDnsSuffix for adding/removing
+* Domain name suffices to an active interface using  RSocket::SetOpt
+*
+* @publishedAll
+* @released
+*/
+class TInetSuffix
+{
+private:
+	inline TInt AssignValue(const TDesC& aValue)
+		{
+        if (aValue.Length() > KMaxDomainSuffixLength)
+        	return KErrTooBig;
+		iSuffixName.Copy(aValue);
+		return KErrNone;
+		}
+
+public:
+	TInetSuffix() { iDomainSuffixFunction = EInetFunctionUndefined; }
+	
+	inline TInt Copy(const TDesC& aValue)
+		{
+		TInt err = AssignValue(aValue);
+       	if (err == KErrNone)
+       		iDomainSuffixFunction = EInetAddSuffix;
+       	return err;
+		}
+
+	inline TInt Delete(const TDesC& aValue)
+		{
+		TInt err = AssignValue(aValue);
+       	if (err == KErrNone)
+       		iDomainSuffixFunction = EInetDeleteSuffix;
+       	return err;
+		}
+		
+	inline void DeleteAll()
+		{
+		iDomainSuffixFunction = EInetDeleteAllSuffixes;
+		}
+		
+public:
+	TSuffixName iSuffixName;
+	TUint8 iDomainSuffixFunction;
+
+};
+
 /**
 * @name TCP/IP Protocol and address family
 *
@@ -739,6 +804,42 @@
 const TUint KSoInetStartInterface = 0x217;
 
 /**
+* @name Interface control socket options
+*
+* Level: #KSolInetIfCtrl
+*
+* Enumerating & Configuring Domain suffix on an using TSoInetInterfaceInfoExtnDnsSuffix
+*/ 
+//@{
+/**
+* Begin enumeration of domain suffixes on an enumerated interface. 
+* 
+* This option should be set before enumerating domain suffices with #KSoInetNextDomainSuffix.
+* As a pre-condition, the enumeration should be initiated on an active enumeration of interface
+* 
+* This option is for use with RSocket::SetOpt() only.
+*/
+const TUint KSoInetEnumDomainSuffix = 0x218;
+
+/**
+* Return details of the next domain suffix in an enumeration started by setting the 
+* option #KSoInetEnumDomainSuffix.
+*
+* This option is for use with RSocket::GetOpt() only.
+* 
+* Option data type is TSoInetInterfaceInfoExtnDnsSuffix.
+*
+* @note
+*	If the interface has multiple domain suffices, then each domain name
+*	is returned as a separate instance of TSoInetInterfaceInfoExtnDnsSuffix
+*	(only domain suffix name is different each time).
+* @note
+*	If the interface has no domain suffix, then SetOpt call
+*	returns with error KErrNotFound
+*/
+const TUint KSoInetNextDomainSuffix = 0x219;
+
+/**
 * Trigger link local creation.
 *
 * Option data type is TSoInet6InterfaceInfo.
@@ -1058,7 +1159,27 @@
 	*/
 	TUint iDoProxy:1;
 	};
-//@}
+
+/**
+* Extension class for TSoInet6InterfaceInfo. Available in Symbian OS vtb92 and later.
+*
+* Optionally used with the following interface level #KSolInetIfCtrl options:
+* @li	#KSoInetConfigInterface
+* @li	#KSoInetChangeInterface
+* @li	#KSoInetEnumInterface
+*
+* Provides specialised fields for the interface object that generally
+* supplement extended behaviors for certain applications
+*
+* @publishedAll
+* @released
+*/
+class TSoInetInterfaceInfoExtnDnsSuffix : public TSoInet6InterfaceInfo
+    {
+public:
+    /** Interface domain suffix (if any). Used by DND for name resolution */
+    TInetSuffix iDomainSuffix;
+    };
 
 /**
 * @name Interface query socket options
@@ -1171,6 +1292,12 @@
 	*/
 	TInetScopeIds iZone;
 	};
+
+/*class TSoInetSupplIfQuery : public TSoInetIfQuery
+    {
+    TInetSuffixList iSuffixList;
+    };*/
+
 /**
 * Get information for the interface specified by the destination address (iDstAddr) 
 * field of the passed packaged TSoInetIfQuery.
@@ -1839,6 +1966,17 @@
 * @since 7.0s
 */
 const TUint KSoNoSourceAddressSelect = 0x40b;
+
+/**
+ * Store the port number on which application to the Hook listens to.
+ * 
+ * This port number will be used to be set as the destination address which
+ * performing the UDP encapsulation from tunnel nif application to third party application.
+ * The same port number if used to identify the packets orignated from the application towards
+ * the Tunnel Nif.
+ */
+const TUint KSoTunnelPort = 0x40c;
+
 /**
 * Retrieve last error information.
 * 
--- a/linklayercontrol/networkinterfacemgr/agentprcore/inc/CAgentAdapter.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/agentprcore/inc/CAgentAdapter.h	Thu Aug 19 11:25:30 2010 +0300
@@ -99,7 +99,11 @@
 	// From MLinkCprServiceChangeNotificationApiExt Interface
 	void RequestServiceChangeNotificationL(const Messages::TNodeId& aSender, ESock::RLegacyResponseMsg& aResponse);
 	void CancelServiceChangeNotification(const Messages::TNodeId& aSender);
-
+	
+	  TBool IsAgentInErrorState() 
+	    {
+	    return iAgentErrorState;
+	    }	
 #ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 	inline CNifAgentBase * Agent() const; 
 #endif //SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
@@ -135,6 +139,7 @@
     TAgentConnectType iAgentConnectType;
     Elements::TStateChange iLastProgress;
 	RPointerArray<CAgentAdapterSessionNotifier> iAgentAdapterSessionNotifiers;
+	TBool iAgentErrorState;
     };
 
 
--- a/linklayercontrol/networkinterfacemgr/agentprcore/inc/agentscpr.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/agentprcore/inc/agentscpr.h	Thu Aug 19 11:25:30 2010 +0300
@@ -122,7 +122,7 @@
     TBool iAuthenticateInProgress;
     TBool iStopRequested;		// ETrue means an agent stop has been requested - not that the SCPr has received a TCFDataClient::TStop
     TInt iStoppingReason;
-
+    
     Elements::TStateChange iLastProgress;
     TBuf<KCommsDbSvrMaxUserIdPassLength> iUsername;
     TBuf<KCommsDbSvrMaxUserIdPassLength> iPassword;
--- a/linklayercontrol/networkinterfacemgr/agentprcore/src/CAgentAdapter.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/agentprcore/src/CAgentAdapter.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -71,7 +71,7 @@
     : iAgentScpr(aAgentScpr),
     iAgentState(EDisconnected),
     iAgentConnectType(EAgentNone),
-    iLastProgress(KFinishedSelection,KErrNone)
+    iLastProgress(KFinishedSelection,KErrNone),iAgentErrorState(EFalse)
     {
     }
 
@@ -148,16 +148,18 @@
 void CAgentAdapter::DisconnectAgent(TInt aReason)
     {
     if (iAgentState == EConnecting)
-        {
+        {    
         iAgent->CancelConnect();
         }
     else if (iAgentState == EReconnecting)
         {
         iAgent->CancelReconnect();
         }
-        
-    iAgentState = EDisconnecting;
-    iAgent->Disconnect(aReason);
+    if (iAgentState != EDisconnecting)
+        {        
+        iAgentState = EDisconnecting;
+    	iAgent->Disconnect(aReason);
+        }
     }
 
 
@@ -307,7 +309,9 @@
             }
         else
             {
-            iLastProgress.iError = aStatus;            
+            iLastProgress.iError = aStatus;
+            // set the agent state to EDisconnecting
+            iAgentState = EDisconnecting;
             iAgent->Disconnect(aStatus);
             }
         }
@@ -392,6 +396,7 @@
     else
         {
         iAgentScpr.Error(iLastProgress);
+        iAgentErrorState = ETrue;
         }
     }
 
--- a/linklayercontrol/networkinterfacemgr/agentprcore/src/agentscpr.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/agentprcore/src/agentscpr.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -296,10 +296,15 @@
 	    }
 	else
 	    {
-	    // Agent has stopped and disconnected without this node telling it to
-	    // Could be an error in the agent initiating a disconnect
-    	__CFLOG_VAR((KAgentSCprTag, KAgentSCprSubTag, _L8("CAgentSubConnectionProvider::ConnectionDownL() - Agent has stopped unexpectedly")));
-	    ControlProvider()->PostMessage(Id(), TCFControlProvider::TDataClientGoneDown(KErrDisconnected).CRef());
+	    // Verify AgentSCPR is Started, if its started, do not initiate TDataClientGoneDown, else initiate it
+        if(!AgentProvisionInfo()->AgentAdapter()->IsAgentInErrorState())
+            {
+	        // Agent has stopped and disconnected without this node telling it to
+	        // Could be an error in the agent initiating a disconnect
+	        __CFLOG_VAR((KAgentSCprTag, KAgentSCprSubTag, _L8("CAgentSubConnectionProvider::ConnectionDownL() - Agent has stopped unexpectedly")));
+	        ControlProvider()->PostMessage(Id(), TCFControlProvider::TDataClientGoneDown(KErrDisconnected).CRef());	        
+	        }
+	        
 	    }
 	}
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/bwins/csdagttestsu.def	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	?CreateTestSuite@@YAPAVCTestSuiteCsdAgt@@XZ @ 1 NONAME ; class CTestSuiteCsdAgt * CreateTestSuite(void)
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/eabi/csdagttestsu.def	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,11 @@
+EXPORTS
+	_Z15CreateTestSuitev @ 1 NONAME
+	_ZTI16CTestSuiteCsdAgt @ 2 NONAME
+	_ZTI16CsdAgentTestStep @ 3 NONAME
+	_ZTI27CTestStepCsdAgentConnection @ 4 NONAME
+	_ZTI32CTestStepCsdAgtConnectionFailure @ 5 NONAME
+	_ZTV16CTestSuiteCsdAgt @ 6 NONAME
+	_ZTV16CsdAgentTestStep @ 7 NONAME
+	_ZTV27CTestStepCsdAgentConnection @ 8 NONAME
+	_ZTV32CTestStepCsdAgtConnectionFailure @ 9 NONAME
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/group/bld.inf	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,39 @@
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+PRJ_PLATFORMS
+
+DEFAULT
+
+PRJ_EXPORTS
+
+PRJ_TESTEXPORTS
+
+..\group\csdagttests.iby  \epoc32\rom\include\csdagttests.iby
+
+..\group\csdagenttest.script   	\epoc32\release\wins\udeb\z\TestData\Scripts\csdagenttest.script
+..\group\csdagenttest.script   	\epoc32\release\winscw\udeb\z\TestData\Scripts\csdagenttest.script
+..\group\connection_start.script    	\epoc32\release\wins\udeb\z\TestData\Scripts\connection_start.script
+..\group\connection_start.script    	\epoc32\release\winscw\udeb\z\TestData\Scripts\connection_start.script
+..\group\connection_start_failure.script   	\epoc32\release\wins\udeb\z\TestData\Scripts\connection_start_failure.script
+..\group\connection_start_failure.script    	\epoc32\release\winscw\udeb\z\TestData\Scripts\connection_start_failure.script
+..\group\cedout.cfg    		\epoc32\release\wins\udeb\z\TestData\Configs\cedout.cfg
+..\group\cedout.cfg    		\epoc32\release\winscw\udeb\z\TestData\Configs\cedout.cfg
+
+PRJ_MMPFILES
+
+PRJ_TESTMMPFILES
+csdagenttests.mmp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/group/cedout.cfg	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,3148 @@
+############################################################
+## AUTO-GENERATED CONFIGURATION FILE
+## CommsDat 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
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=Vodafone
+	FIELD_COUNT=1
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=Orange
+	FIELD_COUNT=1
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=O2
+	FIELD_COUNT=1
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=TMobile
+	FIELD_COUNT=1
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=Airtel
+	FIELD_COUNT=1
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=Hutch
+	FIELD_COUNT=1
+END_ADD
+
+
+############################################################
+## ModemBearer
+## 
+[ModemBearer]
+ADD_TEMPLATE
+	Name=Default Modem
+	IfName=PPP
+	PortName=COMM::1
+	TSYName=MM
+	CSYName=ECUART
+	LastSocketActivityTimeout=600
+	LastSessionClosedTimeout=600
+	LastSocketClosedTimeout=600
+	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
+	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
+	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
+	ControlChannelPortName=COMM::0
+	SIRSettings=0
+	Agent=CSD.agt
+	FIELD_COUNT=71
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=GsmPhone1
+	PortName=COMM::0
+	Handshaking=4
+	XonChar=17
+	XoffChar=19
+	MessageCentreNumber=+447973100973
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=NTRAS (Com0) Null Modem 115200bps
+	PortName=COMM::0
+	TSYName=NTRAS
+	Handshaking=4
+	MessageDeliveryReport=TRUE
+	FIELD_COUNT=5
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=NTRAS (Com1) Null Modem 115200bps
+	TSYName=NTRAS
+	Handshaking=4
+	MessageDeliveryReport=TRUE
+	FIELD_COUNT=4
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=GsmPhone2
+	Handshaking=4
+	MessageDeliveryReport=TRUE
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=SimulatorPhone
+	PortName=COMM::0
+	TSYName=SIM
+	Rate=19200
+	Handshaking=196
+	XonChar=17
+	XoffChar=19
+	ModemInitString=ATZ
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=GsmPhone3
+	PortName=COMM::0
+	Handshaking=4
+	XonChar=17
+	XoffChar=19
+	ModemInitString=ATZ
+	MessageCentreNumber=+447973100973
+	Agent=PSD.agt
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=GsmPhone4
+	PortName=COMM::0
+	TSYName=DMM
+	Rate=19200
+	Handshaking=196
+	XonChar=17
+	XoffChar=19
+	ModemInitString=ATZ
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Name=mRouterWinsBearer
+	PortName=WINS::0
+	CSYName=WINSCSY
+	LastSocketActivityTimeout=9999
+	LastSessionClosedTimeout=180
+	LastSocketClosedTimeout=30
+	Handshaking=4
+	Agent=mRouterAgent.agt
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Name=mRouterUsbBearer
+	PortName=ACM::0
+	CSYName=ECACM
+	LastSocketActivityTimeout=9999
+	LastSessionClosedTimeout=180
+	LastSocketClosedTimeout=30
+	Handshaking=4
+	Agent=mRouterAgent.agt
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+	Name=trpat_psd
+	IfName=rawip
+	PortName=not used
+	TSYName=TRPAT
+	CSYName=CSY27010
+	LastSocketActivityTimeout=300
+	LastSessionClosedTimeout=300
+	LastSocketClosedTimeout=300
+	Handshaking=4
+	MessageCentreNumber=+447973100973
+	BCAStack=C32Bca
+	Agent=trp.agt
+	FIELD_COUNT=12
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 12
+	Name=trpat_csd
+	PortName=not used
+	TSYName=TRPAT
+	CSYName=CSY27010
+	LastSocketActivityTimeout=300
+	LastSessionClosedTimeout=300
+	LastSocketClosedTimeout=300
+	Handshaking=4
+	MessageCentreNumber=+447973100973
+	Agent=csd.agt
+	FIELD_COUNT=10
+END_ADD
+
+
+############################################################
+## LANBearer
+## 
+[LANBearer]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Ethernet 001
+	IfName=ethint
+	LDDFilename=enet
+	LDDName=Ethernet
+	PDDFilename=ethernet
+	PDDName=ethernet.wins
+	PacketDriverName=EtherPkt.drv
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=-1
+	LastSocketClosedTimeout=-1
+	Agent=nullagt.agt
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Ethernet 002
+	IfName=ethint
+	LDDName=EtherCard
+	PDDName=EtherWins
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=-1
+	LastSocketClosedTimeout=-1
+	Agent=nullagt.agt
+	FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## Location
+## 
+[Location]
+ADD_TEMPLATE
+	Name=Default Location
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	AreaCode=44
+	DialOutCode=44
+	DisableCallWaitingCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=11
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Office
+	IntlPrefixCode=00
+	AreaCode=171
+	DialOutCode=9,
+	DisableCallWaitingCode=9,
+	Mobile=FALSE
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=Office Direct Dial
+	IntlPrefixCode=00
+	AreaCode=171
+	DialOutCode=171
+	DisableCallWaitingCode=171
+	Mobile=FALSE
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=Mobile
+	FIELD_COUNT=1
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=Home
+	IntlPrefixCode=00
+	AreaCode=181
+	DialOutCode=181
+	DisableCallWaitingCode=181
+	Mobile=FALSE
+	UsePulseDial=TRUE
+	WaitForDialTone=TRUE
+	FIELD_COUNT=8
+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
+
+
+############################################################
+## 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=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=28
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Pipex CSD
+	Description=Pipex Service Provider
+	Type=INTERNETONLY
+	DefaultTelNum=08450885336
+	PromptForLogin=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=solabf75
+	IfAuthPass=oodifama
+	AuthRetries=0
+	IpDNSAddrFromServer=FALSE
+	IpNameServer1=158.43.128.1
+	IpNameServer2=158.43.192.1
+	BearerName=ASYNCHRONOUS
+	BearerSpeed=UNSPECIFIED
+	BearerCE=UNSPECIFIED
+	BearerType=CSD
+	ChannelCoding=UNSPECIFIED
+	Aiur=0
+	RequestedTimeSlots=0
+	MaximumTimeSlots=0
+	FIELD_COUNT=21
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=NT RAS
+	Description=Test
+	Type=INTERNETONLY
+	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
+	IfNetworks=ip,ip6
+	IfPromptForAuth=FALSE
+	IfAuthName=RasUser
+	IfAuthPass=pass
+	AuthRetries=0
+	BearerName=ASYNCHRONOUS
+	BearerSpeed=UNSPECIFIED
+	BearerCE=UNSPECIFIED
+	BearerType=CSD
+	ChannelCoding=UNSPECIFIED
+	Aiur=0
+	RequestedTimeSlots=0
+	MaximumTimeSlots=0
+	FIELD_COUNT=19
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=WSP Test CSD
+	Description=Symbian WSP Test Server
+	Type=INTERNETANDWAP
+	DefaultTelNum=02071541211
+	PromptForLogin=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=wapusr
+	IfAuthPass=train2
+	AuthRetries=0
+	IpDNSAddrFromServer=FALSE
+	IpNameServer1=158.43.128.1
+	IpNameServer2=158.43.192.1
+	BearerName=ASYNCHRONOUS
+	BearerSpeed=UNSPECIFIED
+	BearerCE=UNSPECIFIED
+	BearerType=CSD
+	ChannelCoding=UNSPECIFIED
+	Aiur=0
+	RequestedTimeSlots=0
+	MaximumTimeSlots=0
+	FIELD_COUNT=21
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=Auth CSD
+	Description=Authentication Service Provider
+	Type=INTERNETONLY
+	DefaultTelNum=+358331520777
+	UseLoginScript=TRUE
+	PromptForLogin=FALSE
+	LoginName=mailtst1
+	LoginPass=mailtest1
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=mailtst1
+	IfAuthPass=mailtest1
+	AuthRetries=0
+	BearerName=ASYNCHRONOUS
+	BearerSpeed=UNSPECIFIED
+	BearerCE=UNSPECIFIED
+	BearerType=CSD
+	ChannelCoding=UNSPECIFIED
+	Aiur=0
+	RequestedTimeSlots=0
+	MaximumTimeSlots=0
+	UseEdge=TRUE
+	FIELD_COUNT=22
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=IP6 Dial Test
+	Description=4th Floor Test Lab
+	Type=INTERNETONLY
+	DefaultTelNum=02071541455
+	PromptForLogin=FALSE
+	IfNetworks=ip,ip6
+	IfPromptForAuth=FALSE
+	IfAuthName=ipv6test
+	IfAuthPass=Symbian
+	AuthRetries=0
+	IpDNSAddrFromServer=FALSE
+	IpNameServer1=192.168.10.2
+	IpNameServer2=192.168.20.2
+	BearerName=ASYNCHRONOUS
+	BearerSpeed=UNSPECIFIED
+	BearerCE=UNSPECIFIED
+	BearerType=CSD
+	ChannelCoding=UNSPECIFIED
+	Aiur=0
+	RequestedTimeSlots=0
+	MaximumTimeSlots=0
+	FIELD_COUNT=21
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=USIM Test NT RAS
+	Type=INTERNETONLY
+	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
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=RasUser
+	IfAuthPass=pass
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=CityOnlines CSD India
+	Description=CityOnlines Indian Service Provider
+	Type=INTERNETONLY
+	DefaultTelNum=+9180172388
+	UseLoginScript=TRUE
+	PromptForLogin=FALSE
+	LoginName=ktl1@blr.cityonlines.com
+	LoginPass=1234
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=ktl1
+	IfAuthPass=1234
+	AuthRetries=0
+	BearerName=ASYNCHRONOUS
+	BearerSpeed=UNSPECIFIED
+	BearerCE=UNSPECIFIED
+	BearerType=CSD
+	ChannelCoding=UNSPECIFIED
+	Aiur=0
+	RequestedTimeSlots=0
+	MaximumTimeSlots=0
+	UseEdge=TRUE
+	FIELD_COUNT=22
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Name=Vodafone WAP GSM
+	Description=Vodafone WAP GSM
+	Type=INTERNETANDWAP
+	DefaultTelNum=+447836900808
+	PromptForLogin=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=user@vodafone.net
+	IfAuthPass=user
+	AuthRetries=0
+	BearerProtocol=V110
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Name=Orange WAP GSM
+	Description=Orange WAP GSM
+	Type=INTERNETANDWAP
+	DefaultTelNum=+447973100500
+	PromptForLogin=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=Orange
+	IfAuthPass=Multimedia
+	AuthRetries=0
+	BearerProtocol=V110
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+	Name=O2 WAP GSM
+	Description=O2 WAP GSM
+	Type=INTERNETANDWAP
+	DefaultTelNum=+447712927927
+	PromptForLogin=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=O2wap
+	IfAuthPass=password
+	AuthRetries=0
+	BearerProtocol=V110
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 12
+	Name=Test Network CSD
+	Description=Symbian Test Network
+	Type=INTERNETONLY
+	DefaultTelNum=02071541259
+	PromptForLogin=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=Systemtest09
+	IfAuthPass=l33ds
+	AuthRetries=0
+	BearerName=ASYNCHRONOUS
+	BearerSpeed=UNSPECIFIED
+	BearerCE=UNSPECIFIED
+	BearerType=CSD
+	ChannelCoding=UNSPECIFIED
+	Aiur=0
+	RequestedTimeSlots=0
+	MaximumTimeSlots=0
+	FIELD_COUNT=18
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 13
+	Name=IP6 Dial Test
+	Description=Symbian Test Network
+	Type=INTERNETONLY
+	DefaultTelNum=02077248525
+	PromptForLogin=FALSE
+	IfNetworks=ip,ip6
+	IfPromptForAuth=FALSE
+	IfAuthName=ipv6test
+	IfAuthPass=Symbian
+	AuthRetries=0
+	IpDNSAddrFromServer=FALSE
+	IpNameServer1=192.168.10.2
+	IpNameServer2=192.168.20.2
+	BearerName=ASYNCHRONOUS
+	BearerSpeed=UNSPECIFIED
+	BearerCE=UNSPECIFIED
+	BearerType=CSD
+	ChannelCoding=UNSPECIFIED
+	Aiur=0
+	RequestedTimeSlots=0
+	MaximumTimeSlots=0
+	FIELD_COUNT=21
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 14
+	Name=mRouterDialOutIsp
+	Description=mRouterDialOutIsp
+	Type=INTERNETONLY
+	PromptForLogin=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=IfAuthPass=
+	IfAuthPass=AuthRetries=0
+	AuthRetries=0
+	FIELD_COUNT=9
+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
+	FIELD_COUNT=1
+END_ADD
+
+
+############################################################
+## OutgoingGPRS
+## 
+[OutgoingGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Vodafone GPRS
+	APN=internet
+	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
+	IfParams=nullagt
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=web
+	IfAuthPass=web
+	AuthRetries=1
+	IpNetMask=255.255.255.0
+	IpGateway=1.2.3.4
+	IpAddrFromServer=TRUE
+	IpAddr=0.0.0.0
+	IpDNSAddrFromServer=TRUE
+	Ip6DNSAddrFromServer=TRUE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	GprsAccessPointType=0
+	QosWarningTimeout=0
+	FIELD_COUNT=33
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Vodafone WAP GPRS
+	APN=wap.vodafone.co.uk
+	PDPType=IPV4
+	ReqPrecedence=1
+	ReqDelay=1
+	ReqReliability=1
+	ReqPeakThroughput=1
+	ReqMeanThroughput=1
+	MinPrecedence=8
+	MinDelay=16
+	MinReliability=32
+	MinPeakThroughput=2
+	MinMeanThroughput=2
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfParams=nullagt
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=wap
+	IfAuthPass=wap
+	AuthRetries=1
+	IpNetMask=255.255.255.0
+	IpGateway=1.2.3.4
+	IpAddrFromServer=TRUE
+	IpAddr=0.0.0.0
+	IpDNSAddrFromServer=TRUE
+	Ip6DNSAddrFromServer=TRUE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	GprsAccessPointType=0
+	QosWarningTimeout=0
+	FIELD_COUNT=33
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=Orange GPRS
+	APN=orangeinternet
+	PDPType=IPV4
+	ReqPrecedence=1
+	ReqDelay=1
+	ReqReliability=1
+	ReqPeakThroughput=1
+	ReqMeanThroughput=1
+	MinPrecedence=8
+	MinDelay=16
+	MinReliability=32
+	MinPeakThroughput=2
+	MinMeanThroughput=2
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfParams=nullagt
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	AuthRetries=1
+	IpNetMask=255.255.255.0
+	IpGateway=1.2.3.4
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	GprsAccessPointType=0
+	QosWarningTimeout=0
+	FIELD_COUNT=29
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=Orange WAP GPRS
+	APN=orangewap
+	PDPType=IPV4
+	ReqPrecedence=1
+	ReqDelay=1
+	ReqReliability=1
+	ReqPeakThroughput=1
+	ReqMeanThroughput=1
+	MinPrecedence=8
+	MinDelay=16
+	MinReliability=32
+	MinPeakThroughput=2
+	MinMeanThroughput=2
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfParams=nullagt
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	AuthRetries=1
+	IpNetMask=255.255.255.0
+	IpGateway=1.2.3.4
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	GprsAccessPointType=0
+	QosWarningTimeout=0
+	FIELD_COUNT=29
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=O2 GPRS
+	APN=mobile.o2.co.uk
+	PDPType=IPV4
+	ReqPrecedence=1
+	ReqDelay=1
+	ReqReliability=1
+	ReqPeakThroughput=1
+	ReqMeanThroughput=1
+	MinPrecedence=8
+	MinDelay=16
+	MinReliability=32
+	MinPeakThroughput=2
+	MinMeanThroughput=2
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfParams=nullagt
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=web
+	IfAuthPass=password
+	AuthRetries=1
+	IpNetMask=255.255.255.0
+	IpGateway=1.2.3.4
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	IpNameServer1=0.0.0.0
+	IpNameServer2=0.0.0.0
+	Ip6DNSAddrFromServer=TRUE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	GprsAccessPointType=0
+	QosWarningTimeout=0
+	FIELD_COUNT=34
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=O2 WAP GPRS
+	APN=wap.o2.co.uk
+	PDPType=IPV4
+	ReqPrecedence=1
+	ReqDelay=1
+	ReqReliability=1
+	ReqPeakThroughput=1
+	ReqMeanThroughput=1
+	MinPrecedence=8
+	MinDelay=16
+	MinReliability=32
+	MinPeakThroughput=2
+	MinMeanThroughput=2
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfParams=nullagt
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=o2wap
+	IfAuthPass=o2wap
+	AuthRetries=1
+	IpNetMask=255.255.255.0
+	IpGateway=1.2.3.4
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	IpNameServer1=0.0.0.0
+	IpNameServer2=0.0.0.0
+	Ip6DNSAddrFromServer=TRUE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	GprsAccessPointType=0
+	QosWarningTimeout=0
+	FIELD_COUNT=34
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=Hutch GPRS
+	APN=portalnmms
+	PDPType=IPV4
+	ReqPrecedence=1
+	ReqDelay=1
+	ReqReliability=1
+	ReqPeakThroughput=1
+	ReqMeanThroughput=1
+	MinPrecedence=8
+	MinDelay=16
+	MinReliability=32
+	MinPeakThroughput=2
+	MinMeanThroughput=2
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfParams=nullagt
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	AuthRetries=1
+	IpGateway=10.10.1.100
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	GprsAccessPointType=0
+	QosWarningTimeout=0
+	FIELD_COUNT=28
+END_ADD
+
+
+############################################################
+## IncomingGPRS
+## 
+[IncomingGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Incoming GPRS Settings PlaceHolder
+	APN=Test
+	PDPType=IPV4
+	PDPAddress=0.0.0.0
+	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
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	IpNameServer1=0.0.0.0
+	IpNameServer2=0.0.0.0
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	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.wid.com
+	Precedence=1
+	Delay=150
+	Reliability=1
+	PeakThroughput=1
+	MinReliability=1
+	MinPeakThroughput=1
+	MinMeanThroughput=1
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=TRUE
+	FIELD_COUNT=16
+END_ADD
+
+
+############################################################
+## LANService
+## 
+[LANService]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=IP4 DHCP Ethernet
+	IfNetworks=ip
+	IpNetMask=255.255.252.0
+	IpGateway=10.192.203.254
+	IpAddrFromServer=TRUE
+	IpAddr=10.192.200.59
+	IpDNSAddrFromServer=TRUE
+	IpNameServer1=10.192.59.6
+	IpNameServer2=10.192.58.49
+	ConfigDaemonManagerName=NetCfgExtnDhcp
+	ConfigDaemonName=!DhcpServ
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=IP6 Ethernet
+	IfNetworks=ip,ip6
+	IpNetMask=255.255.255.0
+	IpGateway=194.72.6.1
+	IpAddrFromServer=TRUE
+	IpAddr=192.168.0.100
+	IpDNSAddrFromServer=FALSE
+	IpNameServer1=192.168.10.2
+	IpNameServer2=192.168.20.2
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## APPrioritySelectionPolicyTable
+## 
+[APPrioritySelectionPolicyTable]
+ADD_SECTION
+# COMMDB_ID = 254
+	Id=20000
+	Name=APSelPolNetworkDefault
+	AP1=Link.AccessPointTable.10026
+	APCOUNT=1
+	FIELD_COUNT=4
+END_ADD
+
+
+############################################################
+## TierTable
+## 
+[TierTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=2048
+	Name=Tier1
+	TierImplUid=271064536
+	TierThreadName=ESock_IP
+	TierManagerName=NetworkTierManager
+	DefaultAccessPoint=Link.AccessPointTable.10000
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=271064560
+	Name=Tier2
+	TierImplUid=271064560
+	TierThreadName=ESock_IP
+	TierManagerName=ProtoTierManager
+	DefaultAccessPoint=Link.AccessPointTable.10026
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=271064565
+	Name=Tier3
+	TierImplUid=271064565
+	TierThreadName=ESock_IP
+	TierManagerName=LinkTierManager
+	DefaultAccessPoint=Link.AccessPointTable.10000
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=536887799
+	Name=Tier4
+	TierImplUid=536887799
+	TierThreadName=ESock_SIP
+	TierManagerName=SIPTierManager
+	DefaultAccessPoint=Link.AccessPointTable.10002
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## MCprTable
+## 
+[MCprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=netmcpr
+	MCprUid=271009095
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=ipprotomcpr
+	MCprUid=271064558
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=pppmcpr
+	MCprUid=271064556
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=ethmcpr
+	MCprUid=271064572
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=rawipmcpr
+	MCprUid=271064576
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=tunnelmcpr
+	MCprUid=271064578
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=qospppmcpr
+	MCprUid=271064556
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=dummynifmcpr
+	MCprUid=271064580
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Name=hungrynifmcpr
+	MCprUid=271064580
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Name=pdpmcpr
+	MCprUid=271065840
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+	Name=sipmcpr
+	MCprUid=536887801
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 13
+	Name=panethermcpr
+	MCprUid=271070626
+	FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## CprTable
+## 
+[CprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=ipcpr
+	CprUid=270561519
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=ipprotocpr
+	CprUid=271064531
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=agentcpr
+	CprUid=271064552
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=vanillacpr
+	CprUid=271065843
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=sipcpr
+	CprUid=271010872
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=tunnelagentcpr
+	CprUid=271080968
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=pdpcpr
+	CprUid=271065826
+	FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## SCprTable
+## 
+[SCprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=qosipscpr
+	SCprUid=270549768
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=ipprotoscpr
+	SCprUid=271064529
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=agentscpr
+	SCprUid=271064554
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=pdpscpr
+	SCprUid=271065824
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=pppscpr
+	SCprUid=271065852
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=vanillascpr
+	SCprUid=271065844
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=qosscpr
+	SCprUid=271065811
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=sipscpr
+	SCprUid=271010839
+	FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## ProtocolTable
+## 
+[ProtocolTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=sapshim
+	ProtocolUid=270496898
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=ipshim4
+	ProtocolUid=271064118
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=ppp
+	ProtocolUid=271064143
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=ethernet
+	ProtocolUid=271064539
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=rawip
+	ProtocolUid=271064562
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=tunnel
+	ProtocolUid=271064567
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=qosppp
+	ProtocolUid=271064148
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=dummynif
+	ProtocolUid=271064123
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Name=hungrynif
+	ProtocolUid=271064125
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Name=panether
+	ProtocolUid=271070627
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+	Name=rawip2
+	ProtocolUid=271084280
+	FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## VirtualBearer
+## 
+[VirtualBearer]
+ADD_TEMPLATE
+	Name=Default VPN Bearer
+	IfName=VPN.nif
+	LastSocketActivityTimeout=600
+	LastSessionClosedTimeout=600
+	LastSocketClosedTimeout=600
+	Agent=VPN.agt
+	FIELD_COUNT=6
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=VPN Bearer1
+	IfName=ppp.nif
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=-1
+	LastSocketClosedTimeout=-1
+	Agent=ntras.agt
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=VPN Bearer2
+	IfName=tunnelnif
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=-1
+	LastSocketClosedTimeout=-1
+	Agent=vpnconnagt.agt
+	FIELD_COUNT=6
+END_ADD
+
+
+############################################################
+## BearerTypeTable
+## 
+[BearerTypeTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=ppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=ethint
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.4
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.4
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=rawip
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=tunnelnif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.6
+	Cpr=CprTable.7
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.6
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=qosppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.7
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.7
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=dummynif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.8
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.8
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=hungrynif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.9
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.9
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=spud-ppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.3
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.3
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Name=spud-rawip
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.3
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Name=IPProtoDefaultTemplate
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+	Name=NetworkDefaultTemplate
+	Tier=Link.TierTable.2048
+	MCpr=MCprTable.1
+	Cpr=CprTable.1
+	SCpr=SCprTable.7
+	Protocol=ProtocolTable.1
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 12
+	Name=rawip2
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.8
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.11
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 13
+	Name=spud-rawip2
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.8
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.11
+	FIELD_COUNT=6
+END_ADD
+
+
+############################################################
+## AccessPointTable
+## 
+[AccessPointTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=pppMappedFromIAP1
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=10003
+	Name=IPProto_generated_10003
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=1
+	CustomSelectionPolicy=1
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=2
+	Name=ethintMappedFromIAP2
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.4
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.4
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=10004
+	Name=IPProto_generated_10004
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=2
+	CustomSelectionPolicy=2
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=3
+	Name=pppMappedFromIAP3
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=10005
+	Name=IPProto_generated_10005
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=3
+	CustomSelectionPolicy=3
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=4
+	Name=pppMappedFromIAP4
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=10006
+	Name=IPProto_generated_10006
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=4
+	CustomSelectionPolicy=4
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=5
+	Name=pppMappedFromIAP5
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Id=10007
+	Name=IPProto_generated_10007
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=5
+	CustomSelectionPolicy=5
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+	Id=6
+	Name=pppMappedFromIAP6
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 12
+	Id=10008
+	Name=IPProto_generated_10008
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=6
+	CustomSelectionPolicy=6
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 13
+	Id=7
+	Name=pppMappedFromIAP7
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 14
+	Id=10009
+	Name=IPProto_generated_10009
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=7
+	CustomSelectionPolicy=7
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 15
+	Id=8
+	Name=pppMappedFromIAP8
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 16
+	Id=10010
+	Name=IPProto_generated_10010
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=8
+	CustomSelectionPolicy=8
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 17
+	Id=9
+	Name=ethintMappedFromIAP9
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.4
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.4
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 18
+	Id=10011
+	Name=IPProto_generated_10011
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=9
+	CustomSelectionPolicy=9
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 19
+	Id=10
+	Name=pppMappedFromIAP10
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 20
+	Id=10012
+	Name=IPProto_generated_10012
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=10
+	CustomSelectionPolicy=10
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 21
+	Id=11
+	Name=pppMappedFromIAP11
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 22
+	Id=10013
+	Name=IPProto_generated_10013
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=11
+	CustomSelectionPolicy=11
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 23
+	Id=12
+	Name=pppMappedFromIAP12
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 24
+	Id=10014
+	Name=IPProto_generated_10014
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=12
+	CustomSelectionPolicy=12
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 25
+	Id=13
+	Name=pppMappedFromIAP13
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 26
+	Id=10015
+	Name=IPProto_generated_10015
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=13
+	CustomSelectionPolicy=13
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 27
+	Id=14
+	Name=pppMappedFromIAP14
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 28
+	Id=10016
+	Name=IPProto_generated_10016
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=14
+	CustomSelectionPolicy=14
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 29
+	Id=15
+	Name=pppMappedFromIAP15
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 30
+	Id=10017
+	Name=IPProto_generated_10017
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=15
+	CustomSelectionPolicy=15
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 31
+	Id=16
+	Name=pppMappedFromIAP16
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 32
+	Id=10018
+	Name=IPProto_generated_10018
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=16
+	CustomSelectionPolicy=16
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 33
+	Id=17
+	Name=pppMappedFromIAP17
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 34
+	Id=10019
+	Name=IPProto_generated_10019
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=17
+	CustomSelectionPolicy=17
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 35
+	Id=18
+	Name=pppMappedFromIAP18
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 36
+	Id=10020
+	Name=IPProto_generated_10020
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=18
+	CustomSelectionPolicy=18
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 37
+	Id=19
+	Name=pppMappedFromIAP19
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 38
+	Id=10021
+	Name=IPProto_generated_10021
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=19
+	CustomSelectionPolicy=19
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 39
+	Id=20
+	Name=pppMappedFromIAP20
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 40
+	Id=10022
+	Name=IPProto_generated_10022
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=20
+	CustomSelectionPolicy=20
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 41
+	Id=21
+	Name=pppMappedFromIAP21
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 42
+	Id=10023
+	Name=IPProto_generated_10023
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=21
+	CustomSelectionPolicy=21
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 43
+	Id=22
+	Name=pppMappedFromIAP22
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 44
+	Id=10024
+	Name=IPProto_generated_10024
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=22
+	CustomSelectionPolicy=22
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 45
+	Id=23
+	Name=pppMappedFromIAP23
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 46
+	Id=10025
+	Name=IPProto_generated_10025
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=23
+	CustomSelectionPolicy=23
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 47
+	Id=24
+	Name=pppMappedFromIAP24
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 48
+	Id=10026
+	Name=IPProto_generated_10026
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=24
+	CustomSelectionPolicy=24
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 49
+	Id=25
+	Name=pppMappedFromIAP25
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 50
+	Id=10027
+	Name=IPProto_generated_10027
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=25
+	CustomSelectionPolicy=25
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 51
+	Id=26
+	Name=tunnelnifMappedFromIAP26
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.6
+	Cpr=CprTable.7
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.6
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 52
+	Id=10028
+	Name=IPProto_generated_10028
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=26
+	CustomSelectionPolicy=26
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 53
+	Id=27
+	Name=pppMappedFromIAP27
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 54
+	Id=10029
+	Name=IPProto_generated_10029
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=27
+	CustomSelectionPolicy=27
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 55
+	Id=28
+	Name=pppMappedFromIAP28
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 56
+	Id=10030
+	Name=IPProto_generated_10030
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=28
+	CustomSelectionPolicy=28
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 57
+	Id=29
+	Name=pppMappedFromIAP29
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 58
+	Id=10031
+	Name=IPProto_generated_10031
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=29
+	CustomSelectionPolicy=29
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 252
+	Id=10002
+	Name=SIPDefault
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.536887799
+	MCpr=MCprTable.11
+	Cpr=CprTable.5
+	SCpr=SCprTable.8
+	Protocol=ProtocolTable.2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 254
+	Id=10000
+	Name=NetworkDefault
+	AccessPointSelectionPolicy=Link.APPrioritySelectionPolicyTable.20000
+	Tier=Link.TierTable.2048
+	MCpr=MCprTable.1
+	Cpr=CprTable.1
+	SCpr=SCprTable.7
+	Protocol=ProtocolTable.1
+	FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## GlobalSettings
+## 
+[GlobalSettings]
+ADD_TEMPLATE
+	DefaultTier=1
+	FIELD_COUNT=1
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=DefaultRecordName-1
+	WAPAccessPoint=1
+	ConnectionAttempts=2
+	RedialAttempts=3
+	SmsBearer=1
+	SmsReceiveMode=2
+	GPRSAttachMode=1
+	AcceptIncomingGprs=1
+	GPRSClassCBearer=GSM
+	ModemForDataAndFax=2
+	ModemForPhoneServicesAndSMS=2
+	LocationForDataAndFax=2
+	LocationForPhoneServicesAndSMS=2
+	MaxMBufHeap=2
+	DefaultNetwork=1
+	BearerAvailabilityCheckTSY=mm
+	FIELD_COUNT=16
+END_ADD
+
+
+############################################################
+## IAP
+## 
+[IAP]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Pipex CSD
+	IAPServiceType=DialOutISP
+	IAPService=2
+	IAPBearerType=ModemBearer
+	IAPBearer=2
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=4
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Ethernet IP4
+	IAPServiceType=LANService
+	IAPService=1
+	IAPBearerType=LANBearer
+	IAPBearer=1
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=NT RAS Com 0
+	IAPServiceType=DialOutISP
+	IAPService=3
+	IAPBearerType=ModemBearer
+	IAPBearer=3
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=3
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=NT RAS Com 1
+	IAPServiceType=DialOutISP
+	IAPService=3
+	IAPBearerType=ModemBearer
+	IAPBearer=4
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=3
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=WSP Test CSD
+	IAPServiceType=DialOutISP
+	IAPService=4
+	IAPBearerType=ModemBearer
+	IAPBearer=2
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=4
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=Msg Test CSD
+	IAPServiceType=DialOutISP
+	IAPService=2
+	IAPBearerType=ModemBearer
+	IAPBearer=2
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=4
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=Msg Test Auth CSD
+	IAPServiceType=DialOutISP
+	IAPService=5
+	IAPBearerType=ModemBearer
+	IAPBearer=2
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=4
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=WinTunnel on Epoc Com1
+	IAPServiceType=DialOutISP
+	IAPService=3
+	IAPBearerType=ModemBearer
+	IAPBearer=5
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=3
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Name=Ethernet IP6
+	IAPServiceType=LANService
+	IAPService=2
+	IAPBearerType=LANBearer
+	IAPBearer=2
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Name=IP6 Dial
+	IAPServiceType=DialOutISP
+	IAPService=6
+	IAPBearerType=ModemBearer
+	IAPBearer=2
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=4
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+	Name=GSMPhone1
+	IAPServiceType=DialOutISP
+	IAPService=2
+	IAPBearerType=ModemBearer
+	IAPBearer=2
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=4
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 12
+	Name=USIM Test
+	IAPServiceType=DialOutISP
+	IAPService=7
+	IAPBearerType=ModemBearer
+	IAPBearer=6
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=4
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 13
+	Name=Vodafone GPRS
+	IAPServiceType=OutgoingGPRS
+	IAPService=1
+	IAPBearerType=ModemBearer
+	IAPBearer=7
+	IAPNetwork=3
+	IAPNetworkWeighting=0
+	Location=4
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 14
+	Name=Vodafone WAP GPRS
+	IAPServiceType=OutgoingGPRS
+	IAPService=2
+	IAPBearerType=ModemBearer
+	IAPBearer=7
+	IAPNetwork=3
+	IAPNetworkWeighting=0
+	Location=4
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 15
+	Name=Orange GPRS
+	IAPServiceType=OutgoingGPRS
+	IAPService=3
+	IAPBearerType=ModemBearer
+	IAPBearer=7
+	IAPNetwork=4
+	IAPNetworkWeighting=0
+	Location=4
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 16
+	Name=Orange WAP GPRS
+	IAPServiceType=OutgoingGPRS
+	IAPService=4
+	IAPBearerType=ModemBearer
+	IAPBearer=7
+	IAPNetwork=4
+	IAPNetworkWeighting=0
+	Location=4
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 17
+	Name=O2 GPRS
+	IAPServiceType=OutgoingGPRS
+	IAPService=5
+	IAPBearerType=ModemBearer
+	IAPBearer=7
+	IAPNetwork=5
+	IAPNetworkWeighting=0
+	Location=4
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 18
+	Name=O2 WAP GPRS
+	IAPServiceType=OutgoingGPRS
+	IAPService=6
+	IAPBearerType=ModemBearer
+	IAPBearer=7
+	IAPNetwork=5
+	IAPNetworkWeighting=0
+	Location=4
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 19
+	Name=CityOnlines CSD India
+	IAPServiceType=DialOutISP
+	IAPService=8
+	IAPBearerType=ModemBearer
+	IAPBearer=2
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=4
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 20
+	Name=Hutch GPRS
+	IAPServiceType=OutgoingGPRS
+	IAPService=7
+	IAPBearerType=ModemBearer
+	IAPBearer=7
+	IAPNetwork=6
+	IAPNetworkWeighting=0
+	Location=4
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 21
+	Name=Vodafone WAP GSM
+	IAPServiceType=DialOutISP
+	IAPService=9
+	IAPBearerType=ModemBearer
+	IAPBearer=2
+	IAPNetwork=3
+	IAPNetworkWeighting=0
+	Location=4
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 22
+	Name=Orange WAP GSM
+	IAPServiceType=DialOutISP
+	IAPService=10
+	IAPBearerType=ModemBearer
+	IAPBearer=2
+	IAPNetwork=4
+	IAPNetworkWeighting=0
+	Location=4
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 23
+	Name=O2 WAP GSM
+	IAPServiceType=DialOutISP
+	IAPService=11
+	IAPBearerType=ModemBearer
+	IAPBearer=2
+	IAPNetwork=5
+	IAPNetworkWeighting=0
+	Location=4
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 24
+	Name=Test Network CSD
+	IAPServiceType=DialOutISP
+	IAPService=12
+	IAPBearerType=ModemBearer
+	IAPBearer=2
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=4
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 25
+	Name=Test Network CSD IP6
+	IAPServiceType=DialOutISP
+	IAPService=13
+	IAPBearerType=ModemBearer
+	IAPBearer=2
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=4
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 26
+	Name=Cisco VPN IAP
+	IAPServiceType=VpnService
+	IAPService=3
+	IAPBearerType=VirtualBearer
+	IAPBearer=3
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=4
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 27
+	Name=DUMMY TSY
+	IAPServiceType=DialOutISP
+	IAPService=3
+	IAPBearerType=ModemBearer
+	IAPBearer=8
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=4
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 28
+	Name=mRouter USB
+	IAPServiceType=DialOutISP
+	IAPService=14
+	IAPBearerType=ModemBearer
+	IAPBearer=10
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 29
+	Name=mRouter Wins
+	IAPServiceType=DialOutISP
+	IAPService=14
+	IAPBearerType=ModemBearer
+	IAPBearer=9
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## ConnectionPreferences
+## 
+[ConnectionPreferences]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=DefaultRecordName-1
+	Ranking=1
+	Direction=OUTGOING
+	BearerSet=CSD
+	DialogPref=DONOTPROMPT
+	IAP=24
+	FIELD_COUNT=6
+END_ADD
+
+
+############################################################
+## Proxies
+## 
+[Proxies]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=DefaultRecordName-1
+	ISP=4
+	ProxyServiceType=DialOutISP
+	UseProxyServer=TRUE
+	ProxyServerName=www.dummyproxy.com
+	ProtocolName=http
+	PortNumber=80
+	Exceptions=www.dummyproxy.com/exception
+	FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## WAPAccessPoint
+## 
+[WAPAccessPoint]
+ADD_TEMPLATE
+	Name=Default Dial In ISP
+	CurrentBearer=WAPIPBearer
+	FIELD_COUNT=2
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Vodafone WAP GPRS
+	StartPage=wap:1999/vodafone.wml
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=Orange WAP GPRS
+	StartPage=orange.multimedia
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=O2 WAP GPRS
+	StartPage=wap.o2.co.uk
+	FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## WAPIPBearer
+## 
+[WAPIPBearer]
+ADD_TEMPLATE
+	Name=DefaultRecordName-1
+	GatewayAddress=0
+	WSPOption=CONNECTIONLESS
+	Security=FALSE
+	ProxyPortNumber=0
+	ProxyLogin=0
+	ProxyPassword=0
+	FIELD_COUNT=7
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=DefaultRecordName-2
+	AccessPointId=2
+	GatewayAddress=wap.closedtest.intra
+	IAP=24
+	WSPOption=CONNECTIONORIENTED
+	ProxyPortNumber=1
+	ProxyLogin=1
+	ProxyPassword=1
+	FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## WAPSMSBearer
+## 
+[WAPSMSBearer]
+ADD_TEMPLATE
+	Name=DefaultRecordName-1
+	GatewayAddress=0
+	ServiceCentreAddress=0
+	WSPOption=CONNECTIONLESS
+	Security=FALSE
+	FIELD_COUNT=5
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=DefaultRecordName-2
+	AccessPointId=2
+	GatewayAddress=+4412345678901
+	ServiceCentreAddress=+442071234567
+	WSPOption=CONNECTIONORIENTED
+	FIELD_COUNT=5
+END_ADD
+
+
+############################################################
+## SecureSocketTable
+## 
+[SecureSocketTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=DefaultRecordName-1
+	ProtocolName=ssl3.0
+	ProtoLibrary=ssladaptor.dll
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=DefaultRecordName-2
+	ProtocolName=tls1.0
+	ProtoLibrary=ssladaptor.dll
+	FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## VpnService
+## 
+[VpnService]
+ADD_TEMPLATE
+	Name=Default VPN
+	Policy=DefaultVPNpolicy
+	HomeIAP=1
+	FIELD_COUNT=3
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=VPN1
+	Policy=VPNpolicy1
+	HomeIAP=2
+	HomeNetwork=1
+	FIELD_COUNT=4
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=cisco tunnel
+	Policy=cisco_all
+	HomeIAP=8
+	HomeNetwork=1
+	FIELD_COUNT=4
+END_ADD
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/group/connection_start.script	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,28 @@
+//
+// 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:
+//
+//Create the CommDb required for the AgentAdapter tests & Run PPP Connection Start Tests
+
+RUN_SCRIPT z:\TestData\scripts\esock_test_unloadesockForced.script
+ced z:\TestData\configs\te_pppsize.xml ppp.log
+
+RUN_SCRIPT z:\TestData\scripts\esock_test_loadesock.script
+
+load_suite CSDAGTTESTS.DLL
+
+heap_mark
+run_test_step 0, CSDAGTTESTS, Connection
+heap_markend
+test_complete
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/group/connection_start_failure.script	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,27 @@
+//
+// 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:
+//
+//Create the CommDb required for the AgentAdapter tests & Run PPP Connection Start Failure Tests
+
+RUN_SCRIPT z:\TestData\scripts\esock_test_unloadesockForced.script
+ced z:\TestData\configs\cedout.cfg ced.log
+RUN_SCRIPT z:\TestData\scripts\esock_test_loadesock.script
+
+load_suite CSDAGTTESTS.DLL
+
+heap_mark
+run_test_step 0, CSDAGTTESTS, ConnectionStartFailure
+heap_markend
+test_complete
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/group/csdagenttest.script	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,19 @@
+//
+// 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:
+//
+//Split script files with those that need and doesnt need TestNetwork
+PRINT Run AgentAdapterTest
+run_script z:\TestData\scripts\connection_start.script
+run_script z:\TestData\scripts\connection_start_failure.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/group/csdagenttests.mmp	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,50 @@
+/*
+* 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:
+*
+*/
+TARGET		csdagttests.dll
+TARGETTYPE	DLL
+UID      0x1000008d 0x10003d9a
+VENDORID 0x70000001
+// UIDs need updating
+
+
+SOURCEPATH	../src
+
+SOURCE		csdAgent_Connection.cpp	
+SOURCE		csdAgent_ConnectionFailure.cpp
+SOURCE		csdAgent_TestSteps.cpp
+SOURCE		csdAgent_TestSuite.cpp  
+
+
+SYSTEMINCLUDE	../inc
+
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+SYSTEMINCLUDE	/epoc32/include
+#else
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+#endif
+
+LIBRARY		euser.lib integrationtestutils.lib esock.lib insock.lib commdb.lib  c32root.lib efsrv.lib
+
+
+START WINS
+BASEADDRESS		0x59100000
+END
+
+
+CAPABILITY ALL -Tcb
+
+SMPSAFE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/group/csdagttests.iby	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,33 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#ifndef __CSDAGTTESTS_IBY__
+#define __CSDAGTTESTS_IBY__
+
+REM KIPPER - LAN AGT
+
+#include <nullagt.iby>
+
+file=ABI_DIR\DEBUG_DIR\csdagttests.dll		System\Libs\csdagttests.dll
+
+// Scripts
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\csdagenttest.script		testdata\scripts\csdagenttest.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\connection_start.script		testdata\scripts\connection_start.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\scripts\connection_start_failure.script		testdata\scripts\connection_start_failure.script
+data=EPOCROOT##epoc32\release\wins\udeb\z\testdata\configs\cedout.cfg		TestData\configs\cedout.cfg
+
+#endif
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/inc/CsdAgentTestSteps.h	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,78 @@
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Contains the declarations of the test suite classes used to test 
+// the CSD Agent Connection/Connection Failure steps
+// 
+//
+
+
+/**
+ @file
+ @internalTechnology
+*/
+#ifndef __CSDAGENTTESTSTEPS_H__
+#define __CSDAGENTTESTSTEPS_H__
+
+#include "CsdAgentTestSuite.h"
+#include <networking/teststep.h>
+#include "es_sock.h"
+
+
+class CsdAgentTestStep : public CTestStep
+	{
+		public:
+            CsdAgentTestStep();
+            virtual ~CsdAgentTestStep();
+		
+		private:
+            enum TVerdict doTestStepPreambleL();
+		
+		protected:
+			TInt OpenConnection(RConnection& conn, RSocketServ& ss);
+			void CloseConnection(RConnection& conn);
+			TInt EnumerateConnections(RConnection& conn, TUint& num);
+			TInt WaitForAllInterfacesToCloseL(RSocketServ& ss);
+	};           
+
+
+_LIT(KSrcPath, "z:\\testdata\\configs\\agentdialog.ini");
+_LIT(KDestPath, "c:\\private\\101f7989\\esock\\agentdialog.ini");
+
+class CTestStepCsdAgentConnection: public CsdAgentTestStep
+	{
+	public:
+        CTestStepCsdAgentConnection(TPtrC aName);
+        void ConstructL() {};
+        virtual ~CTestStepCsdAgentConnection() {};
+	
+	// called by framework to do the test
+       virtual enum TVerdict doTestStepL(void);
+	
+	private:
+	};
+
+class CTestStepCsdAgtConnectionFailure: public CsdAgentTestStep
+    {
+    public:
+        CTestStepCsdAgtConnectionFailure(TPtrC aName);
+        void ConstructL() {};
+        virtual ~CTestStepCsdAgtConnectionFailure() {};
+    
+    // called by framework to do the test
+       virtual enum TVerdict doTestStepL(void);
+    
+    private:
+    };
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/inc/CsdAgentTestSuite.h	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,36 @@
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Contains the declarations of the test suite classes used to test 
+// the CSD Agent using the integration test framework (scheduleTest)
+// 
+//
+
+#ifndef __CSDAGENTTESTSUITE_H__
+#define __CSDAGENTTESTSUITE_H__
+
+#include <networking/testsuite.h>
+
+class CTestSuiteCsdAgt : public CTestSuite
+	{
+		public:
+			void InitialiseL(void);
+			CTestSuiteCsdAgt::~CTestSuiteCsdAgt() {};		  	
+		    TPtrC GetVersion(void);
+		private:		  		
+	};
+	
+IMPORT_C CTestSuiteCsdAgt *CreateTestSuite(void);
+	
+#endif
+	
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/src/csdAgent_Connection.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,67 @@
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Contain the implementation of the class for generic CSD agent test
+// 
+//
+#include "CsdAgentTestSteps.h"
+#include "es_sock.h"
+#include "in_sock.h"
+#include "commdbconnpref.h"
+
+CTestStepCsdAgentConnection::CTestStepCsdAgentConnection(TPtrC aName)
+{
+    iTestStepName=aName;
+}
+
+enum TVerdict CTestStepCsdAgentConnection::doTestStepL(void)
+	{
+    
+	__UHEAP_MARK;
+	TInt err;
+	RSocketServ server;
+	RConnection connection;
+	TRequestStatus status;
+		
+	err = server.Connect();
+	TESTEL(err == KErrNone, err);
+	CleanupClosePushL(server);
+		
+	err = connection.Open(server,KAfInet);
+	TESTEL(err == KErrNone, err);
+	 CleanupClosePushL(connection);
+		
+	//connection_start.script
+	//TestCase1: Start the connection (outgoing) which results in 0, KErrNone, it pulls pppLcp for te_ppsize.xml
+	// Verifies AgentAdapter state transition from EConnecting to EConnected 
+    TCommDbConnPref prefs;
+    prefs.SetIapId(0);
+    prefs.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
+    
+    connection.Start(prefs, status);
+    User::WaitForRequest(status);
+    TESTEL(status.Int() == KErrNone, status.Int());
+
+    // Verifies AgentAdapter state transition from EConnected to EDisconnecting
+    err = connection.Stop();
+    TESTEL(err == KErrNone, err);
+    CleanupStack::Pop();
+        
+    // close the socket server
+	server.Close();
+	CleanupStack::Pop();
+
+	__UHEAP_MARKEND;
+
+	return iTestStepResult;
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/src/csdAgent_ConnectionFailure.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,66 @@
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Contain the implementation of the class for generic CSD agent test
+// 
+//
+#include "CsdAgentTestSteps.h"
+#include "es_sock.h"
+#include "in_sock.h"
+
+
+CTestStepCsdAgtConnectionFailure::CTestStepCsdAgtConnectionFailure(TPtrC aName)
+{
+	iTestStepName=aName;
+}
+
+enum TVerdict CTestStepCsdAgtConnectionFailure::doTestStepL(void)
+	{
+	__UHEAP_MARK;
+	TInt err;
+	RSocketServ server;
+	RConnection connection;
+	TRequestStatus status;
+		
+	err = server.Connect();
+	TESTEL(err == KErrNone, err);
+	CleanupClosePushL(server);
+		
+	err = connection.Open(server,KAfInet);
+	TESTEL(err == KErrNone, err);
+	 CleanupClosePushL(connection);
+		
+	// Connection_Start_Failure.script
+	// Test Case2: Start the connection (outgoing) which results in a -1 Failure, it pulls pppLcp record from cedout.cfg
+	// It verifies AgentAdapter State transition from EConnecting to EDisconnecting state 
+	connection.Start(status);
+	User::WaitForRequest(status);
+	TESTEL(status.Int() == KErrNotFound, status.Int());
+    
+	// Verifies the AgentAdapter State is in EDisconnecting State, Upon Agent Start ending in  a failure
+    // Try to stop connection that failed to start
+	err = connection.Stop();
+	TESTEL(err == KErrNotReady, err);
+	CleanupStack::Pop();
+
+	// close the socket server
+	server.Close();
+	CleanupStack::Pop();
+
+	__UHEAP_MARKEND;
+
+	return iTestStepResult;
+	}
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/src/csdAgent_TestSteps.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,111 @@
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Contain the implementation of the class for generic CSD agent test
+// 
+//
+#include <f32file.h>
+#include "CsdAgentTestSteps.h"
+
+CsdAgentTestStep::CsdAgentTestStep()
+	{
+		
+	}
+	
+CsdAgentTestStep::~CsdAgentTestStep()
+	{
+		
+	}	
+	
+enum TVerdict CsdAgentTestStep::doTestStepPreambleL()
+	{
+		enum TVerdict result = EPass;
+		
+		RSocketServ ss;
+		ss.Connect();
+		CleanupClosePushL(ss);
+		
+		if(KErrNone == WaitForAllInterfacesToCloseL(ss))
+			result = EPass;
+		else
+			result = EFail;
+		
+		ss.Close();
+		CleanupStack::Pop();
+		return result;				
+	}	
+	
+TInt CsdAgentTestStep::WaitForAllInterfacesToCloseL(RSocketServ& ss)
+	{
+			TInt err;
+			TUint numOfConnections;
+			TUint count =0;
+			
+			RConnection conn;
+			
+			err = OpenConnection(conn,ss);
+			TESTEL(KErrNone == err,err);
+			CleanupClosePushL(conn);
+			
+			err = EnumerateConnections(conn,numOfConnections);
+			TESTEL(KErrNone == err,err);
+			
+			while((0 !=numOfConnections) && (count <60))
+			{
+				count++;
+				User::After(1000000); 
+				err = EnumerateConnections(conn,numOfConnections);
+			}
+			
+			CloseConnection(conn);
+			
+			CleanupStack::Pop();
+				
+			if(numOfConnections !=0)
+				{
+					return KErrTimedOut;
+				}
+			return KErrNone;
+		}			
+	
+	TInt CsdAgentTestStep::OpenConnection(RConnection& conn, RSocketServ& ss)
+/*
+ * Open the connection using the socket server too
+ * @param conn the connection to open
+ * @param ss the socket server within which the connection is to be opened
+ * @return system wide error code
+ */
+{
+	return (conn.Open(ss));
+}
+
+TInt CsdAgentTestStep::EnumerateConnections(RConnection& conn, TUint& num)
+/*
+ * Read how many connections (==interfaces?) exist at the moment
+ * @param conn - to be used to read the count
+ * @param num - on completion holds the number of connections
+ * @return system wide error code
+ */
+{
+	return (conn.EnumerateConnections(num));
+}
+
+void CsdAgentTestStep::CloseConnection(RConnection& conn)
+/*
+ * Close a connection
+ * @param conn the connection to close
+ * @return system wide error code
+ */
+{
+	conn.Close();
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/src/csdAgent_Testsuite.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,45 @@
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Contain the Test Steps for Connection/Connection Failure tests for CSD agent
+// 
+//
+#include <CsdAgentTestSuite.h>
+#include <CsdAgentTestSteps.h>
+
+#include "c32comm.h"
+
+EXPORT_C CTestSuiteCsdAgt* CreateTestSuite(void)
+{
+	return new (ELeave) CTestSuiteCsdAgt();
+}
+
+void CTestSuiteCsdAgt::InitialiseL()
+	{
+ 	_LIT(KPhbkSyncCMI, "phbsync.cmi");
+    TInt ret = StartC32WithCMISuppressions(KPhbkSyncCMI);
+    
+    if ( KErrNone != ret && KErrAlreadyExists != ret )
+		{
+		User::Leave( ret );
+		}
+
+    AddTestStepL(new (ELeave) CTestStepCsdAgentConnection(_L("Connection")) );
+    AddTestStepL(new (ELeave) CTestStepCsdAgtConnectionFailure(_L("ConnectionStartFailure")) );
+	}
+	
+TPtrC CTestSuiteCsdAgt::GetVersion(void)
+{
+    _LIT(KVersion, "1.0");
+    return KVersion();
+}
--- a/linklayercontrol/nullagt/group/bld.inf	Thu Jul 15 20:25:02 2010 +0300
+++ b/linklayercontrol/nullagt/group/bld.inf	Thu Aug 19 11:25:30 2010 +0300
@@ -49,4 +49,4 @@
 PRJ_TESTMMPFILES
 
 ../TS_nullagt/group/nullagttests.mmp
-
+#include "../TS_AgentAdapter/group/bld.inf"
--- a/networkcontrol/ipnetworklayer/inc/IPProtoCPR.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkcontrol/ipnetworklayer/inc/IPProtoCPR.h	Thu Aug 19 11:25:30 2010 +0300
@@ -187,17 +187,19 @@
     ESock::TDataMonitoringConnProvisioningInfo iDataMonitoringConnProvisioningInfo;
 	TInt iLastControlClientsCount;
 	TInt iRouteCount;
-	TBool iRouteCountStretchOne;
 	TBool iPeriodActivity;
 	TInt iTimerDisableCount;
 	TTime iStartTime;
+    TBool iRouteCountStretchOne:1;
 	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;
+	TBool iNodeLocalExtensionsCreated:1;
+	TBool iStopped:1;               // Hack to cope with AllInterfaceNotification not indicating a down/up sequence
+                                    // if the IpProtoCpr is restarted before it is destroyed.
 	ESock::RMetaExtensionContainer iNodeLocalExtensions;
     };
 
--- a/networkcontrol/ipnetworklayer/inc/IPProtoMCpr.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkcontrol/ipnetworklayer/inc/IPProtoMCpr.h	Thu Aug 19 11:25:30 2010 +0300
@@ -57,6 +57,7 @@
 
 public:
 	TBool iIapLocked;
+	TUint32 iLockedIapsid;
     };
 
 namespace IPProtoMCprActivities
--- a/networkcontrol/ipnetworklayer/inc/IPProtoSCPRStates.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkcontrol/ipnetworklayer/inc/IPProtoSCPRStates.h	Thu Aug 19 11:25:30 2010 +0300
@@ -19,7 +19,7 @@
 #define IPPROTOSCPRSTATES_H_DEFINED
 
 #include <comms-infras/corescprstates.h>
-#include "ipprotomessages.h"
+#include "IPProtoMessages.h"
 
 class CIPQoSProtoSubConnectionProviderBase;
 
--- a/networkcontrol/ipnetworklayer/inc/ipprotodeftscprstates.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkcontrol/ipnetworklayer/inc/ipprotodeftscprstates.h	Thu Aug 19 11:25:30 2010 +0300
@@ -19,7 +19,7 @@
 #define IPPROTODEFTSCPRSTATES_H_DEFINED
 
 #include <comms-infras/corescprstates.h>
-#include "ipprotomessages.h"
+#include "IPProtoMessages.h"
 
 class CIPProtoSubConnectionProviderBase;
 
--- a/networkcontrol/ipnetworklayer/src/IPProtoCPR.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkcontrol/ipnetworklayer/src/IPProtoCPR.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -386,6 +386,7 @@
 
 	iLinkUp = EFalse;
 	CancelTimer();
+	iStopped = ETrue;
 	}
 
 void CIPProtoConnectionProvider::OpenRoute()
@@ -1007,4 +1008,3 @@
 	{
 	CTimer::ConstructL();
 	}
-
--- a/networkcontrol/ipnetworklayer/src/IPProtoCprStates.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkcontrol/ipnetworklayer/src/IPProtoCprStates.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -38,6 +38,8 @@
 #include <commsdattypesv1_1_partner.h>
 #include <es_prot_internal.h>
 #include <elements/nm_messages_errorrecovery.h>
+#include <es_enum_internal.h>
+#include "ItfInfoConfigExt.h"
 
 using namespace Messages;
 using namespace MeshMachine;
@@ -153,8 +155,6 @@
 	if (iContext.Node().iTimerStopped)
 		{
 		TInt selfidx = iContext.iNodeActivity->FindOriginator(iContext.Node().SelfInterface());
-		ASSERT(selfidx != KErrNotFound);
-
 		if(selfidx != KErrNotFound)
 			{
 			iContext.iNodeActivity->RemoveOriginator(selfidx);
@@ -287,6 +287,19 @@
 	if (state.Accept())
 		{
 		iContext.Node().DisableTimers();
+		// Check if we have been re-started (i.e. a start request is processed immmediately after a stop request
+		// has been processed).  If so, we generate a special EInterfaceStarting notification towards ESock.
+		// This is to solve the problem where there is a missing EInterfaceDown/EInterfaceUp event sequence
+		// from AllInterfaceNotification in this scenario. 
+		if (iContext.Node().iStopped)
+		    {
+            const TItfInfoConfigExt* ext = static_cast<const TItfInfoConfigExt*>(iContext.Node().AccessPointConfig().FindExtension(STypeId::CreateSTypeId(KIpProtoConfigExtUid, EItfInfoConfigExt)));
+            if (ext)
+                {
+                TInterfaceNotification info = { ext->iConnectionInfo, TConnInterfaceState(EInterfaceRestarting) };
+                iContext.Node().Factory().InterfaceStateChange(TPckgC<TInterfaceNotification>(info));
+                }
+		    }
 		return ETrue;
 		}
 	return EFalse;
@@ -383,6 +396,7 @@
 	iContext.Node().SetTimerMode(CIPProtoConnectionProvider::ETimerMedium);
 
     iContext.Node().iTimerStopped = EFalse;
+    iContext.Node().iTimerExpired = EFalse;
 	CoreNetStates::TSendStarted transition(iContext);
 	transition.DoL();
 	}
@@ -413,14 +427,21 @@
     	TCFMessage::TSubConnDataTransferred wholeConnMsg(KNifEMCompatibilityLayerEntireSubConnectionUid, dmProvider->DataVolumesPtr()->iSentBytes, dmProvider->DataVolumesPtr()->iReceivedBytes);
     	TCFMessage::TSubConnDataTransferred defaultSubConnMsg(KNifEMCompatibilityLayerFakeSubConnectionId, dmProvider->DataVolumesPtr()->iSentBytes, dmProvider->DataVolumesPtr()->iReceivedBytes);
 
-    	RNodeInterface* ctrlClient = iContext.Node().GetFirstClient<TDefaultClientMatchPolicy>(TClientType(TCFClientType::ECtrl));
-		if(ctrlClient)
-			{ // Can't send this if the client's gone
-			ctrlClient->PostMessage(iContext.NodeId(), wholeConnMsg);
-			ctrlClient->PostMessage(iContext.NodeId(), defaultSubConnMsg);
-
-			iContext.Node().iSubConnEventDataSent = ETrue;
-			}
+      // Sending data clent status change message to all the control clients
+      TClientIter<TDefaultClientMatchPolicy> ccIter = iContext.Node().GetClientIter<TDefaultClientMatchPolicy>(TClientType(TCFClientType::ECtrl), TClientType(0, TCFClientType::ELeaving));        
+	RNodeInterface* ctrlClient; 
+	TBool ctrlClientPresent = false;
+	while ((ctrlClient = ccIter++) != NULL)            
+	    {
+          //If any cntl clinet is present setting the variable ctrlClientPresent as true.
+	    ctrlClientPresent = true;
+	    ctrlClient->PostMessage(iContext.NodeId(), wholeConnMsg);    
+	    ctrlClient->PostMessage(iContext.NodeId(), defaultSubConnMsg); 
+	    }
+	if(ctrlClientPresent)
+	    {
+	    iContext.Node().iSubConnEventDataSent = ETrue;
+	    }
     	}
     }
 
--- a/networkcontrol/ipnetworklayer/src/IPProtoMCpr.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkcontrol/ipnetworklayer/src/IPProtoMCpr.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -63,7 +63,7 @@
 CIPProtoMetaConnectionProvider::CIPProtoMetaConnectionProvider(CMetaConnectionProviderFactoryBase& aFactory,
                                                                const TProviderInfo& aProviderInfo,
                                                                const MeshMachine::TNodeActivityMap& aActivityMap)
-	:	CCoreMetaConnectionProvider(aFactory,aProviderInfo,aActivityMap), iIapLocked(EFalse)
+	:	CCoreMetaConnectionProvider(aFactory,aProviderInfo,aActivityMap), iIapLocked(EFalse) , iLockedIapsid(0)
 	{
 	LOG_NODE_CREATE(KIPProtoMCprTag, CIPProtoMetaConnectionProvider);
 	}
--- a/networkcontrol/ipnetworklayer/src/IPProtoSCPR.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkcontrol/ipnetworklayer/src/IPProtoSCPR.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -160,7 +160,7 @@
 CIPProtoSubConnectionProvider::~CIPProtoSubConnectionProvider()
     {
 	if (iControl)
-		delete iControl;
+		iControl->AsyncDelete();
 	if (iNotify)
 		delete iNotify;
 
--- a/networkcontrol/ipnetworklayer/src/IPProtoSCPRFactory.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkcontrol/ipnetworklayer/src/IPProtoSCPRFactory.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -21,7 +21,7 @@
  @internalComponent
 */
 
-#include "ipprotomessages.h"
+#include "IPProtoMessages.h"
 #include "IPProtoSCPRFactory.h"
 #include "ipprotodeftscpr.h"
 #include "IPProtoSCPR.h"
--- a/networkcontrol/ipnetworklayer/src/IPProtoTierManagerSelector.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkcontrol/ipnetworklayer/src/IPProtoTierManagerSelector.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -106,21 +106,26 @@
 	if (!(iSelectionPrefs.Scope()&TSelectionPrefs::ESelectFromExisting))
 		{
 		CIPProtoMetaConnectionProvider *ipprotomcpr = static_cast<CIPProtoMetaConnectionProvider *>(provider);
-		if (ipprotomcpr->iIapLocked)
-			User::Leave(KErrPermissionDenied);
+
 
 		TSecureId sid;
 		ASubSessionPlatsecApiExt platsecext(iSelectionPrefs.SubSessionUniqueId());
 		if (platsecext.SecureId(sid) == KErrNone)
 			{
-			CCommsDatIapView* iapView = CCommsDatIapView::NewLC(aIapToFind);
+            if (ipprotomcpr->iIapLocked && sid.iId!=ipprotomcpr->iLockedIapsid)
+                User::Leave(KErrPermissionDenied);
 
-			TUint32 iapsid;
-			iapView->GetIntL(KCDTIdIAPAppSid, iapsid);
-
-			if (sid.iId == iapsid && iapsid != 0)
-				ipprotomcpr->iIapLocked = ETrue;
-			CleanupStack::PopAndDestroy(iapView);
+            CCommsDatIapView* iapView = CCommsDatIapView::NewLC(aIapToFind);
+                
+            TUint32 iapsid;
+            iapView->GetIntL(KCDTIdIAPAppSid, iapsid);
+                    
+            if (sid.iId == iapsid && iapsid != 0)
+            {
+                ipprotomcpr->iIapLocked = ETrue;
+                ipprotomcpr->iLockedIapsid=iapsid;
+            }
+            CleanupStack::PopAndDestroy(iapView);
 			}
 		}
 	provider->IncrementBlockingDestroy();
--- a/networkcontrol/ipnetworklayer/src/ipprotodeftscpr.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkcontrol/ipnetworklayer/src/ipprotodeftscpr.cpp	Thu Aug 19 11:25:30 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"
@@ -202,7 +202,8 @@
            }
        }
 	if (iControl)
-		delete iControl;
+		iControl->AsyncDelete();
+	
 	//incase registration is successful and Network is configured. 
 	if (iNotify)
 	    {
--- a/networkcontrol/iptransportlayer/inc/ipcpr_states.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkcontrol/iptransportlayer/inc/ipcpr_states.h	Thu Aug 19 11:25:30 2010 +0300
@@ -108,9 +108,6 @@
 	virtual void DoL();
 DECLARE_SMELEMENT_FOOTER( TProcessSubConnDataTransferred)
 
-
-
-
 DECLARE_SMELEMENT_HEADER( TSendInitialSubConnectionOpenedEvent, MeshMachine::TStateTransition<TContext>, NetStateMachine::MStateTransition, TContext)
 	virtual void DoL();
 DECLARE_SMELEMENT_FOOTER( TSendInitialSubConnectionOpenedEvent)
@@ -179,6 +176,10 @@
    TSendParamsToSelf
    )
 #endif // SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
+   
+DECLARE_SMELEMENT_HEADER( TAwaitingSpecialGoneDown, MeshMachine::TState<TContext>, NetStateMachine::MState, TContext)
+    virtual TBool Accept();
+DECLARE_SMELEMENT_FOOTER( TAwaitingSpecialGoneDown)
 
 } // IpCprStates
 
--- a/networkcontrol/iptransportlayer/src/ipcpr_activities.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkcontrol/iptransportlayer/src/ipcpr_activities.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -48,6 +48,8 @@
 using namespace IpCprStates;
 using namespace MeshMachine;
 
+
+
 namespace IpCprActivities
 {
 
@@ -156,6 +158,20 @@
 NODEACTIVITY_END()
 #endif // SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 
+namespace IPCPRGoneDownActivity
+    {
+DECLARE_DEFINE_CUSTOM_NODEACTIVITY(ECFActivityGoneDown, IPCPRSpecialContentionManagementGoneDown, TCFControlClient::TGoneDown, PRActivities::CGoneDownActivity::New)
+       // Our Service Provider has gone down unexpectedly (we haven't issued a TStop)
+    FIRST_NODEACTIVITY_ENTRY(IpCprStates::TAwaitingSpecialGoneDown, MeshMachine::TNoTag)
+    THROUGH_NODEACTIVITY_ENTRY(KNoTag, CoreNetStates::TCancelAndCloseZone0ClientExtIfaces, MeshMachine::TNoTag)
+    NODEACTIVITY_ENTRY(KNoTag, PRActivities::CGoneDownActivity::TSendErrorRecoveryReq, MeshMachine::TAwaitingErrorRecoveryResponseOrError, CoreStates::TRetryOrIgnoreOrPropagate)
+    THROUGH_NODEACTIVITY_ENTRY(CoreStates::KRetry, MeshMachine::TDoNothing, PRActivities::CGoneDownActivity::TIgnoreOrPropagate)
+    LAST_NODEACTIVITY_ENTRY(CoreStates::KIgnore, MeshMachine::TDoNothing)
+    NODEACTIVITY_ENTRY(CoreStates::KPropagate, CoreNetStates::TCancelStartAndStopSelf, CoreNetStates::TAwaitingDataClientStopped, MeshMachine::TNoTag)
+    LAST_NODEACTIVITY_ENTRY(KNoTag, PRStates::TSendGoneDown)
+NODEACTIVITY_END()
+    }
+
 DEFINE_ACTIVITY_MAP(ipCprActivities)
 	ACTIVITY_MAP_ENTRY(IpCprActivities, IpCprStart)
 	ACTIVITY_MAP_ENTRY(IpCprActivities, IpCprStop)
@@ -167,6 +183,8 @@
 	ACTIVITY_MAP_ENTRY(IpCprActivities, IPCprEventNotification)
 #endif //SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 
+	ACTIVITY_MAP_ENTRY(IpCprActivities::IPCPRGoneDownActivity, IPCPRSpecialContentionManagementGoneDown)
+	
 #ifdef SYMBIAN_NETWORKING_UPS
 	ACTIVITY_MAP_ENTRY(IpCprActivities, IpCprControlClientJoin)
 	ACTIVITY_MAP_ENTRY(IpCprActivities, IpCprPolicyCheckRequest)
--- a/networkcontrol/iptransportlayer/src/ipcpr_states.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkcontrol/iptransportlayer/src/ipcpr_states.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -25,6 +25,7 @@
 #include "IPCpr.h"
 #include "ipcpr_states.h"
 #include "IPMessages.h"
+#include <gsmerror.h>
 #include <comms-infras/ss_nodemessages.h>
 #include <comms-infras/ss_nodemessages_internal_esock.h>
 #include <comms-infras/ss_datamonitoringprovider.h>
@@ -189,6 +190,26 @@
 
 #endif  //SYMBIAN_NETWORKING_UPS
 
+
+DEFINE_SMELEMENT( TAwaitingSpecialGoneDown, NetStateMachine::MState, IpCprStates::TContext)
+TBool IpCprStates::TAwaitingSpecialGoneDown::Accept()
+	{
+    TCFControlClient::TGoneDown* pGoneDown = message_cast<TCFControlClient::TGoneDown>(&iContext.iMessage);
+        if(pGoneDown && //If this is a TCFControlClient::TGoneDown message AND
+        iContext.Node().CountClients<TDefaultClientMatchPolicy>(
+                        TClientType(TCFClientType::ECtrl, TCFClientType::EAttach)) && //the local node is an attached ipcpr AND
+        ((pGoneDown->iValue1 == KErrGprsInsufficientResources) || //the error value suggests the contention management
+         (pGoneDown->iValue1 == KErrPacketDataTsyMaxPdpContextsReached) ||
+         (pGoneDown->iValue1 == KErrUmtsMaxNumOfContextExceededByNetwork) ||     
+         (pGoneDown->iValue1 == KErrUmtsMaxNumOfContextExceededByPhone))
+         )
+          {
+          return ETrue;
+          }
+        return EFalse;
+	}
+
+
 #ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 /*
 Constructor for the new parameter set to be sent in parameter bundle while requesting for bearer type.
--- a/networkcontrol/iptransportlayer/src/ipdeftbasescpr.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkcontrol/iptransportlayer/src/ipdeftbasescpr.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -240,7 +240,7 @@
     	}
 #ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 	iContext.iNodeActivity->PostRequestTo(*iContext.Node().ServiceProvider(),
-		TCFScpr::TGetParamsRequest(RCFParameterFamilyBundleC()).CRef());
+		TCFScpr::TSetParamsRequest(RCFParameterFamilyBundleC()).CRef());
 #else
  	iContext.iNodeActivity->PostRequestTo(*iContext.Node().ServiceProvider(),
 		TCFScpr::TParamsRequest(RCFParameterFamilyBundleC()).CRef());
@@ -254,7 +254,9 @@
 DECLARE_DEFINE_NODEACTIVITY(ECFActivityStartDataClient, IPDeftBaseSCprDataClientStart, TCFDataClient::TStart )
     FIRST_NODEACTIVITY_ENTRY(CoreNetStates::TAwaitingDataClientStart, MeshMachine::TNoTag)
 #ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
-	NODEACTIVITY_ENTRY(KNoTag, IPDeftBaseSCprDataClientStartActivity::TGetParams, CoreNetStates::TAwaitingParamResponse, CoreNetStates::TNoTagOrNoDataClients)
+	//NODEACTIVITY_ENTRY(KNoTag, IPDeftBaseSCprDataClientStartActivity::TGetParams, CoreNetStates::TAwaitingParamResponse, CoreNetStates::TNoTagOrNoDataClients)
+	NODEACTIVITY_ENTRY(KNoTag, IPDeftBaseSCprDataClientStartActivity::TGetParams, CoreNetStates::TAwaitingParamResponse, MeshMachine::TNoTag)
+	THROUGH_NODEACTIVITY_ENTRY(KNoTag, PRStates::TStoreParams, CoreNetStates::TNoTagOrNoDataClients)
 #else
 	NODEACTIVITY_ENTRY(KNoTag, IPDeftBaseSCprDataClientStartActivity::TGetParams, CoreNetStates::TAwaitingParamResponse, MeshMachine::TNoTag)
 	THROUGH_NODEACTIVITY_ENTRY(KNoTag, SCprStates::TStoreParams, CoreNetStates::TNoTagOrNoDataClients)
--- a/networkcontrol/iptransportlayer/src/netmcpr.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkcontrol/iptransportlayer/src/netmcpr.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -33,6 +33,8 @@
 
 #ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 #include <tcpdfltrecvwin.h>
+// Custom type for WLAN bearer
+const TUint32 KNetMcprWlanBearer = 0x3C;
 #endif //SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 #include <commsdattypeinfov1_1_internal.h>
 
@@ -477,8 +479,11 @@
    	//TCP receive window size for ethernet
    	iBearerInfoMap.Insert(KEthernetBearer,KBearerEthernetWinSize);
 
+    //TCP receive window size for WLAN bearer
+    iBearerInfoMap.Insert(KNetMcprWlanBearer,KBearerWlanWinSize);
+   	
    	//TCP receive window size for other bearer
-   	iBearerInfoMap.Insert(KDefaultBearer,KBearerWlanWinSize);
+   	iBearerInfoMap.Insert(KDefaultBearer,KBearerDefaultWinSize);
 	}
 
 void CDfltTCPReceiveWindowSize::SetTcpWin(TUint aBearerType)
@@ -486,8 +491,20 @@
  * Set TCP receive window 
  */
 	{
-	//Set the TCP Receive Window.
-	iWinSize = *static_cast<TUint*>(iBearerInfoMap.Find(aBearerType));
+    // Get bearer window size from hash table
+    TUint* iWinSizePtr = static_cast<TUint*>(iBearerInfoMap.Find(aBearerType));
+
+    // Check whether bearer type was known 
+    if ( iWinSizePtr != NULL )
+        {
+        // Set the TCP Receive Window
+        iWinSize = *iWinSizePtr;
+        }
+    else
+        {
+        // Use default window
+        iWinSize = KBearerDefaultWinSize;
+        }
 	  
 	//Set the Max TCP receive Window.
 	SetMaxWinSize(aBearerType);
@@ -511,12 +528,16 @@
 		//
 			iMaxWinSize = KBearerHsdpaWinSize; 
 			break; 
-		case KEthernetBearer:
-			iMaxWinSize = KEthernetMaxWinSize;
+		case KNetMcprWlanBearer:
+			iMaxWinSize = KBearerWlanWinSize;
 			break;
    
+        case KEthernetBearer:
+            iMaxWinSize = KEthernetMaxWinSize;
+            break;
+			
 		default:
-			iMaxWinSize = KEthernetMaxWinSize;
+			iMaxWinSize = KBearerDefaultMaxWinSize;
 			break;
 		}
 	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkcontrol/qosfwconfig/qostest/te_qos/configs/te_QoSSuite_Mesh_pdpcpr.cfg	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,1477 @@
+############################################################
+## HAND-GENERATED CONFIGURATION FILE
+## 
+## Start at the GlobalSettings table and ConnectionPreferences table
+############################################################
+
+############################################################
+## Network
+## 
+[Network]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Intranet
+	FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## ModemBearer
+## 
+[ModemBearer]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Loopback Modem
+	IfName=PPP
+	PortName=PKTLOOPBACK::502
+	TSYName=SIM
+	CSYName=PKTLOOPBACK
+	LastSocketActivityTimeout=6
+	LastSessionClosedTimeout=180
+	LastSocketClosedTimeout=10
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=0
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=AFTERDIALUNTILANSWER
+	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
+	Agent=NULLAGT
+	FIELD_COUNT=63
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Loopback_RawIP_1
+	IfName=RAWIP
+	PortName=PKTLOOPBACK::502
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Loopback_RawIP_3
+	IfName=RAWIP
+	PortName=PKTLOOPBACK::508
+	FIELD_COUNT=3
+END_ADD
+
+
+
+############################################################
+## LANBearer
+## 
+[LANBearer]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Assabet on-board Ethernet
+	IfName=ethint
+	LDDName=not used
+	PDDName=not used
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=-1
+	LastSocketClosedTimeout=-1
+	Agent=nullagent.agt
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## Location
+## 
+[Location]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Location
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=9
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Office
+	IntlPrefixCode=00
+	NatPrefixCode=0
+	NatCode=44
+	AreaCode=171
+	DialOutCode=9,
+	Mobile=FALSE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=Office Direct Dial
+	IntlPrefixCode=00
+	NatPrefixCode=0
+	NatCode=44
+	AreaCode=171
+	Mobile=FALSE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=Home
+	IntlPrefixCode=00
+	NatPrefixCode=0
+	NatCode=44
+	AreaCode=181
+	Mobile=FALSE
+	UsePulseDial=TRUE
+	WaitForDialTone=TRUE
+	PauseAfterDialout=0
+	FIELD_COUNT=10
+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
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=Dummy Mercury Chargecard
+	AccountNumber=0500800800,,12345678
+	Pin=****
+	LocalRule=HG
+	NatRule=J,K,0FG
+	IntlRule=HEFG
+	FIELD_COUNT=7
+END_ADD
+
+############################################################
+## GlobalSettings
+## 
+## links to Tier table
+## DefaultTier = 271064536 Tier1 ESock_IP NetworkTierManager
+## No defaultSnap - therefore 399 selection chosen
+##
+[GlobalSettings]
+ADD_TEMPLATE
+	DefaultTier=Link.TierTable.2048
+	FIELD_COUNT=1
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-1
+	ConnectionAttempts=2
+	RedialAttempts=3
+	SmsBearer=0
+	SmsReceiveMode=2
+	GPRSAttachMode=1
+	AcceptIncomingGprs=1
+	GPRSClassCBearer=GSM
+	ModemForDataAndFax=1
+	ModemForPhoneServicesAndSMS=1
+	LocationForDataAndFax=1
+	LocationForPhoneServicesAndSMS=1
+	MaxMBufHeap=41877760
+	DefaultNetwork=1
+	BearerAvailabilityCheckTSY=SIM
+	FIELD_COUNT=16
+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
+	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=28
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=NT RAS
+	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
+	LoginName=RasUser
+	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
+	BearerName=ASYNCHRONOUS
+	BearerSpeed=UNSPECIFIED
+	BearerCE=UNSPECIFIED
+	BearerType=CSD
+	ChannelCoding=UNSPECIFIED
+	Aiur=0
+	RequestedTimeSlots=0
+	MaximumTimeSlots=0
+	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=44
+END_ADD
+
+
+############################################################
+## 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
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Dial In CS ISP
+	UseLoginScript=FALSE
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=10
+END_ADD
+
+
+############################################################
+## OutgoingGPRS
+## 
+[OutgoingGPRS]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Outgoing GPRS
+	APN=Test
+	PDPType=IPV4
+	ReqPrecedence=2
+	ReqDelay=4
+	ReqReliability=3
+	ReqPeakThroughput=3
+	ReqMeanThroughput=31
+	MinPrecedence=2
+	MinDelay=4
+	MinReliability=3
+	MinPeakThroughput=3
+	MinMeanThroughput=31
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=RasUser
+	AuthRetries=1
+	IpNetMask=255.255.255.0
+	IpGateway=194.72.6.1
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.1.1
+	IpDNSAddrFromServer=FALSE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.51
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	UmtsR99QoSAndOn=1
+	FIELD_COUNT=32
+END_TEMPLATE
+
+ADD_SECTION
+##
+## Links from IAP table
+## Links to
+##
+# COMMDB_ID = 1
+	Id=1
+	Name=SPUD
+	PDPType=IPV4
+	IfParams=lowernif=RawIP
+	IfPromptForAuth=FALSE
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.1.1
+	IpDNSAddrFromServer=FALSE
+	FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## IncomingGPRS
+## 
+[IncomingGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Dummy Incoming GPRS Settings
+	APN=Test
+	PDPType=IPV4
+	PDPAddress=0.0.0.0
+	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
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.1.1
+	IpDNSAddrFromServer=FALSE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.51
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	FIELD_COUNT=30
+END_ADD
+
+
+############################################################
+## DefaultGPRS
+## 
+[DefaultGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Dummy Default GPRS Settings
+	Usage=1
+	APN=Access point name
+	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=20
+END_ADD
+
+
+############################################################
+## CDMA2000PacketServiceTable
+## 
+[CDMA2000PacketServiceTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	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=8KBPS
+	MinRevBitrate=8KBPS
+	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
+	RlpMode=UNKNOWN
+	CDMAMobileIP=FALSE
+	CDMAMobileIPTimeout=10000000
+	FIELD_COUNT=36
+END_ADD
+
+
+############################################################
+## LANService
+## 
+[LANService]
+ADD_SECTION
+# COMMDB_ID = 1
+	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=10
+END_ADD
+
+############################################################
+## APPrioritySelectionPolicyTable
+## 
+## Links from AccessPointTable
+## Links to the next layer in the AccessPointTable
+##
+[APPrioritySelectionPolicyTable]
+ADD_SECTION
+# COMMDB_ID = 1
+  	Id=1
+	Name=SelectionPolicy1
+	AP1=Link.AccessPointTable.10001
+	APCOUNT=1
+	FIELD_COUNT=4
+END_ADD
+
+############################################################
+## AccessPointTable
+## 
+## Links from TierTable
+## When 399 selection selected in GlobalSettings this Links to APPrioritySelectionPolicyTable
+## Bearer tier links to IAP table
+##
+[AccessPointTable]
+
+ADD_SECTION
+##
+## Links to IAP table
+## Links to nodes in bearer layer
+##  Id = 1 is IAP1
+##  SelectionPolicy zero marks the end of the 399 selection process
+## Consistent with spud-rawip BearerTypeTable entry
+##
+# COMMDB_ID = 251
+	Id=1
+	Name=MappedFromIAP1
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.8
+	CprConfig=1
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+	
+ADD_SECTION
+## 
+## Links to AccessPointTable next layer
+##	SelectionPolicy AccessPointTable entry 1 and IAP table entry 1
+##
+# COMMDB_ID = 253
+	Id=10001
+	Name=IPProtoDefault
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.2
+	CprConfig=1
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CustomSelectionPolicy=1
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+##
+## Links from TierTable
+## When 399 selection selected in GlobalSettings this Links to APPrioritySelectionPolicyTable
+##	Id 10000 linked from TierTable
+##	SelectionPolicy APPrioritySelectionPolicyTable entry 1
+##
+# COMMDB_ID = 254
+	Id=10000
+	Name=NetworkDefault
+	Tier=Link.TierTable.2048
+	MCpr=MCprTable.1
+	AccessPointSelectionPolicy=APPrioritySelectionPolicyTable.1
+	Cpr=CprTable.1
+	SCpr=SCprTable.1
+	Protocol=ProtocolTable.1
+	FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## BearerTypeTable
+## 
+## Links from ModemBearer table
+## Links to the bearer layer nodes
+## Consistent with the selected AccessPointTable
+##
+##
+[BearerTypeTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=ppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ethint
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.4
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.4
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=rawip
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=tunnelnif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.6
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.6
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=qosppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.7
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.7
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=dummynif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.8
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.8
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=hungrynif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.9
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.9
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=spud-ppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.8
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.3
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+##
+## Links from ModemBearer table
+## Links to bearer layer nodes
+## Consistent with the selected AccessPointTable
+##
+# COMMDB_ID = 9
+	Id=9
+	Name=spud-rawip
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.8
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	FIELD_COUNT=7
+END_ADD
+
+##This record here is the template record for the IPProto level APs generated by CommsDat.
+ADD_SECTION
+# COMMDB_ID = 10
+	##This name is a predefined name for the template for the IPProto APs.
+	##Please don't change it!
+	Name=IPProtoDefaultTemplate
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	FIELD_COUNT=6
+END_ADD
+
+
+############################################################
+## IAP
+## 
+## Linked from ConnectionPreferences
+## Links to several tables
+## OutgoingGPRS entry SPUD
+## ModemBearer entry 1 Null Modem 115200bps
+## 
+##
+[IAP]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=GPRS
+	IAPServiceType=OutgoingGPRS
+	IAPService=1
+	IAPBearerType=ModemBearer
+	IAPBearer=1
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=Location.1
+	FIELD_COUNT=9
+END_ADD
+
+############################################################
+## Proxies
+## 
+[Proxies]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-1
+	ISP=1
+	ProxyServiceType=DialOutISP
+	UseProxyServer=TRUE
+	ProxyServerName=www.dummyproxy.com
+	ProtocolName=http
+	PortNumber=80
+	Exceptions=www.dummyproxy.com/exception
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## WAPAccessPoint
+## 
+[WAPAccessPoint]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Dial In ISP
+	CurrentBearer=WAPIPBearer
+	FIELD_COUNT=3
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Dummy WAP Settings
+	CurrentBearer=WAPIPBearer
+	StartPage=www.wapstart.com
+	FIELD_COUNT=4
+END_ADD
+
+
+############################################################
+## WAPIPBearer
+## 
+[WAPIPBearer]
+ADD_TEMPLATE
+	Id=0
+	Name=DefaultRecordName-1
+	AccessPointId=0
+	IAP=0
+	WSPOption=CONNECTIONLESS
+	Security=FALSE
+	ProxyPortNumber=0
+	FIELD_COUNT=7
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-2
+	AccessPointId=58654976
+	GatewayAddress=www.wapgateway.com
+	IAP=50266624
+	WSPOption=CONNECTIONORIENTED
+	Security=FALSE
+	ProxyPortNumber=1
+	FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## WAPSMSBearer
+## 
+[WAPSMSBearer]
+ADD_TEMPLATE
+	Id=0
+	Name=DefaultRecordName-1
+	AccessPointId=0
+	WSPOption=CONNECTIONLESS
+	Security=FALSE
+	FIELD_COUNT=5
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-2
+	AccessPointId=1
+	GatewayAddress=+442079460221
+	ServiceCentreAddress=+442079460223
+	WSPOption=CONNECTIONORIENTED
+	Security=FALSE
+	FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## 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
+
+############################################################
+## TierTable
+## 
+## Links from GlobalSettings
+## Links to AccessPointTable
+##
+[TierTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=2048
+	TierImplUid=271064536
+	Name=Tier1
+	TierThreadName=ESock_IP
+	TierManagerName=NetworkTierManager
+	DefaultAccessPoint=Link.AccessPointTable.10000
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=271064560
+	TierImplUid=271064560
+	Name=Tier2
+	TierThreadName=ESock_IP
+	TierManagerName=ProtoTierManager
+	DefaultAccessPoint=Link.AccessPointTable.10001
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=271064565
+	TierImplUid=271064565
+	Name=Tier3
+	TierThreadName=ESock_IP
+	TierManagerName=LinkTierManager
+##NB defaultAccessPoint not present in this layer. This is only needed here to satisfy the check
+##on the link layer. However important that once this field has a value it has to be linked to a
+##correct accesspoint record in the accesspoint table because this will be checked either.
+	DefaultAccessPoint=Link.AccessPointTable.1
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## MCprTable
+## 
+[MCprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=netmcpr
+	MCprUid=271009095
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipprotomcpr
+	MCprUid=271064558
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=pppmcpr
+	MCprUid=271064556
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=ethmcpr
+	MCprUid=271064572
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=rawipmcpr
+	MCprUid=271064576
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=tunnelmcpr
+	MCprUid=271064578
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=qospppmcpr
+	MCprUid=271064556
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=dummynifmcpr
+	MCprUid=271064580
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=9
+	Name=hungrynifmcpr
+	MCprUid=271064580
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Id=10
+	Name=pdpmcpr
+	MCprUid=271065840
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+	Id=11
+	Name=sipmcpr
+	MCprUid=536887801
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 12
+	Id=12
+	Name=btgenericmcpr
+	MCprUid=271070577
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 13
+	Id=13
+	Name=panethermcpr
+	MCprUid=271070626
+	FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## CprTable
+## 
+[CprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=ipcpr
+	CprUid=270561519
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipprotocpr
+	CprUid=271064531
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=agentcpr
+	CprUid=271064552
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=vanillacpr
+	CprUid=271065843
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=sipcpr
+	CprUid=271010872
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=avctpcpr
+	CprUid=271030184
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=tunnelagentcpr
+	CprUid=271080968
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=pdpcpr
+	CprUid=271065826
+	FIELD_COUNT=3
+END_ADD
+
+############################################################
+## SCprTable
+## 
+[SCprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=ipscpr
+	SCprUid=271065811
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipprotoscpr
+	SCprUid=271064529
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=agentscpr
+	SCprUid=271064554
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=pdpscpr
+	SCprUid=271065824
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=pppscpr
+	SCprUid=271065852
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=vanillascpr
+	SCprUid=271065844
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=qosscpr
+	SCprUid=271065811
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=sipscpr
+	SCprUid=271010839
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=9
+	Name=avctpsaplinksmgr
+	SCprUid=271030185
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Id=10
+	Name=avctpmuxer
+	SCprUid=271030186
+	FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## ProtocolTable
+## 
+[ProtocolTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=sapshim
+	ProtocolUid=270496898
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipshim4
+	ProtocolUid=271064118
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=ppp
+	ProtocolUid=271064143
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=ethernet
+	ProtocolUid=271064539
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=rawip
+	ProtocolUid=271064562
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=tunnel
+	ProtocolUid=271064567
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=qosppp
+	ProtocolUid=271064148
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=dummynif
+	ProtocolUid=271064123
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=9
+	Name=hungrynif
+	ProtocolUid=271064125
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Id=10
+	Name=panether
+	ProtocolUid=271070627
+	FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## ConnectionPreferences
+## 
+## Links to 
+## IAP = 1 - GPRS - IAPService = SPUD - ModemBearer - Null Modem 115200bps - IAPNetwork = 1
+## BearerSet=PSD
+##
+[ConnectionPreferences]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-1
+	Ranking=0
+	Direction=INCOMING
+	BearerSet=PSD
+	DialogPref=DONOTPROMPT
+	IAP=1
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=DefaultRecordName-2
+	Ranking=1
+	Direction=OUTGOING
+	BearerSet=PSD
+	DialogPref=DONOTPROMPT
+	IAP=1
+	FIELD_COUNT=7
+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
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=SECONDARY1
+	ReqTrafficClass=4
+	MinTrafficClass=4
+	ReqDeliveryOrder=1
+	MinDeliveryOrder=1
+	ReqDeliverErroneousSDU=8
+	MinDeliverErroneousSDU=8
+	ReqMaxSDUSize=768
+	MinAcceptableMaxSDUSize=512
+	ReqMaxUplinkRate=1024
+	ReqMinUplinkRate=1024
+	ReqMaxDownlinkRate=1024
+	ReqMinDownlinkRate=1024
+	ReqBER=0
+	MaxBER=0
+	ReqSDUErrorRatio=1
+	MaxSDUErrorRatio=1
+	ReqTrafficHandlingPriority=1
+	MinTrafficHandlingPriority=1
+	ReqTransferDelay=250
+	MaxTransferDelay=250
+	ReqGuaranteedUplinkRate=1024
+	MinGuaranteedUplinkRat=1024
+	ReqGuaranteedDownlinkRate=1024
+	MinGuaranteedDownlinkRate=1024
+	SignallingIndication=FALSE
+	ImCnSignallingIndication=FALSE
+	SourceStatisticsDescriptor=0
+	FIELD_COUNT=28
+END_ADD
+
+############################################################
+## PolicySelectorTable
+## 
+[PolicySelectorTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=DefaultRecordName-1
+	PolicyId=1
+	SrcAddress=0.0.0.0
+	SrcMask=255.255.255.255
+	DstAddress=192.168.1.1
+	DstMask=255.255.255.255
+	SrcPort=0
+	DstPort=3461
+	SrcPortMax=1031
+	DstPortMax=3461
+	ProtocolId=17
+	IAPid=2
+	Priority=1
+	FIELD_COUNT=13
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=DefaultRecordName-2
+	PolicyId=2
+	SrcPort=0
+	SrcPortMax=0
+	ProtocolId=1
+	IAPid=2
+	Priority=1
+	FIELD_COUNT=7
+END_ADD
+
+
+
--- a/networkcontrol/qosfwconfig/qostest/te_qos/group/bld.inf	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkcontrol/qosfwconfig/qostest/te_qos/group/bld.inf	Thu Aug 19 11:25:30 2010 +0300
@@ -17,7 +17,11 @@
 
 PRJ_TESTEXPORTS
 
+#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
+../configs/te_QoSSuite_Mesh_pdpcpr.cfg       z:/testdata/configs/te_qossuite_mesh.cfg
+#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
 
--- a/networkcontrol/qosipscpr/inc/ip_subconparams.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkcontrol/qosipscpr/inc/ip_subconparams.h	Thu Aug 19 11:25:30 2010 +0300
@@ -27,8 +27,6 @@
 #define __IP_SUBCONPARAMS_H__
 
 #include <es_sock.h>
-#include <networking/Qos3GPP_subconparams.h>
-
  
 // NOTE: This Uid may be changed - See #ifdef at bottom of the file
 const TInt KSubConIPParamsUid = 0x10204309;
--- a/networkingsrv_info/networkingrom/group/NetworkTest.iby	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkingsrv_info/networkingrom/group/NetworkTest.iby	Thu Aug 19 11:25:30 2010 +0300
@@ -141,6 +141,9 @@
 // NULL AGT Tests
 #ifdef NW_TEST_ROM_1
 #include <nullagttests.iby>
+
+// Agent Adapter Tests
+#include <csdagttests.iby>
 #endif
 
 // Useful  Internet Utilities for all test roms
--- a/networkingtestandutils/exampleinternetutilities/PING/PING.CPP	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkingtestandutils/exampleinternetutilities/PING/PING.CPP	Thu Aug 19 11:25:30 2010 +0300
@@ -15,7 +15,7 @@
 // 
 //
 
-#include <pingeng.h>
+#include <PINGENG.H>
 #include <e32cons.h>
 #include <c32comm.h>
 #include <nifman.h>
--- a/networkingtestandutils/exampleinternetutilities/PINGENG/PINGENG.CPP	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkingtestandutils/exampleinternetutilities/PINGENG/PINGENG.CPP	Thu Aug 19 11:25:30 2010 +0300
@@ -13,7 +13,7 @@
 // Description:
 //
 
-#include <pingeng.h>
+#include <PINGENG.H>
 #include <e32hal.h>
 #include <icmp6_hdr.h>
 #include <in_chk.h>
--- a/networkingtestandutils/exampleinternetutilities/TFTP/TFTP.CPP	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkingtestandutils/exampleinternetutilities/TFTP/TFTP.CPP	Thu Aug 19 11:25:30 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
--- a/networkingtestandutils/exampleinternetutilities/TFTPENG/TFTPENG.CPP	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkingtestandutils/exampleinternetutilities/TFTPENG/TFTPENG.CPP	Thu Aug 19 11:25:30 2010 +0300
@@ -16,7 +16,7 @@
 // 
 //
 
-#include <tftpeng.h>
+#include <TFTPENG.H>
 
 EXPORT_C CTftpEngine::~CTftpEngine()
     {
--- a/networkingtestandutils/exampleinternetutilities/TRACERT/TRACERT.CPP	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkingtestandutils/exampleinternetutilities/TRACERT/TRACERT.CPP	Thu Aug 19 11:25:30 2010 +0300
@@ -16,7 +16,7 @@
 // 
 //
 
-#include <treng.h>
+#include <TRENG.H>
 #include <e32cons.h>
 #include <c32comm.h>
 #include <nifman.h>
--- a/networkingtestandutils/exampleinternetutilities/TRENG/TRENG.CPP	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkingtestandutils/exampleinternetutilities/TRENG/TRENG.CPP	Thu Aug 19 11:25:30 2010 +0300
@@ -13,7 +13,7 @@
 // Description:
 //
 
-#include <treng.h>
+#include <TRENG.H>
 #include <e32hal.h>
 #include <icmp6_hdr.h>
 #include <in_chk.h>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/configs/te_dedicatedsignalling1ryctx_changedsid_pdpcpr.cfg	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,1043 @@
+############################################################
+## AUTO-GENERATED CONFIGURATION FILE
+## CommsDat Database Dump Utility
+## 1.1
+############################################################
+
+############################################################
+## Network
+## 
+[Network]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Intranet
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=Intranet2
+	FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## ModemBearer
+## 
+[ModemBearer]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Loopback Modem
+	TSYName=SIM
+	CSYName=PKTLOOPBACK
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=4
+	LastSocketClosedTimeout=6
+	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
+	MessageValidityPeriod=0
+	MessageDeliveryReport=FALSE
+	CommRole=0
+	Agent=NULLAGT
+	BCAStack=C32Bca
+	FIELD_COUNT=66
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Loopback_RawIP_1
+	IfName=RAWIP
+	PortName=PKTLOOPBACK::501
+	CSYName=PKTLOOPBACK
+	FIELD_COUNT=5
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=Loopback_SPUD_2
+	IfName=SPUD
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=Loopback_RawIP_3
+	IfName=RAWIP
+	PortName=PKTLOOPBACK::503
+	CSYName=PKTLOOPBACK
+	FIELD_COUNT=5
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=Loopback_SPUD_4
+	IfName=SPUD
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=WinTunnel_SPUD_5
+	IfName=SPUD
+	Agent=NULLAGT
+	FIELD_COUNT=4
+END_ADD
+
+
+############################################################
+## Location
+## 
+[Location]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Location
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=9
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Office
+	IntlPrefixCode=00
+	NatPrefixCode=0
+	NatCode=44
+	AreaCode=171
+	DialOutCode=9,
+	Mobile=FALSE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=11
+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
+
+
+############################################################
+## GlobalSettings
+## 
+[GlobalSettings]
+ADD_TEMPLATE
+	DefaultTier=Link.TierTable.2048
+	FIELD_COUNT=1
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-1
+	ConnectionAttempts=2
+	RedialAttempts=3
+	SmsReceiveMode=2
+	GPRSAttachMode=1
+	AcceptIncomingGprs=1
+	GPRSClassCBearer=GSM
+	ModemForDataAndFax=2
+	ModemForPhoneServicesAndSMS=2
+	LocationForDataAndFax=41878016
+	LocationForPhoneServicesAndSMS=41878016
+	MaxMBufHeap=41878016
+	DefaultNetwork=33489152
+	BearerAvailabilityCheckTSY=mm
+	FIELD_COUNT=15
+END_ADD
+
+
+############################################################
+## OutgoingGPRS
+## 
+[OutgoingGPRS]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Outgoing GPRS
+	APN=Test
+	PDPType=IPV4
+	ReqPrecedence=2
+	ReqDelay=4
+	ReqReliability=3
+	ReqPeakThroughput=3
+	ReqMeanThroughput=31
+	MinPrecedence=2
+	MinDelay=4
+	MinReliability=3
+	MinPeakThroughput=3
+	MinMeanThroughput=31
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=RasUser
+	AuthRetries=1
+	IpGateway=0.0.0.1
+	IpAddrFromServer=FALSE
+	IpDNSAddrFromServer=FALSE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.51
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	UmtsR99QoSAndOn=1
+	FIELD_COUNT=30
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=RawIP_Bounce_1
+	PDPType=IPV4
+	IfPromptForAuth=FALSE
+	IpNetMask=255.255.255.0
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.1.1
+	IpDNSAddrFromServer=FALSE
+	UmtsR99QoSAndOn=1
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=SPUD_Echo_2
+	PDPType=IPV4
+	IfParams=lowernif=RAWIP
+	IfPromptForAuth=FALSE
+	IpNetMask=255.255.255.0
+	IpAddrFromServer=TRUE
+	IpAddr=192.168.1.2
+	IpDNSAddrFromServer=TRUE
+	UmtsR99QoSAndOn=1
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=RawIP_Bounce_3
+	PDPType=IPV4
+	IfPromptForAuth=FALSE
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.2.3
+	IpDNSAddrFromServer=FALSE
+	UmtsR99QoSAndOn=1
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=SPUD_Echo_4
+	PDPType=IPV4
+	IfParams=lowernif=RAWIP
+	IfPromptForAuth=FALSE
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.2.4
+	IpDNSAddrFromServer=FALSE
+	UmtsR99QoSAndOn=1
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## DefaultGPRS
+## 
+[DefaultGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Dummy Default GPRS Settings
+	Usage=1
+	APN=Access point name
+	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=20
+END_ADD
+
+
+############################################################
+## APPrioritySelectionPolicyTable
+## 
+[APPrioritySelectionPolicyTable]
+ADD_SECTION
+# COMMDB_ID = 1
+  	Id=1
+	Name=SelectionPolicy1
+	AP1=Link.AccessPointTable.10001
+	APCOUNT=1
+	FIELD_COUNT=4
+END_ADD
+
+############################################################
+## AccessPointTable
+## 
+[AccessPointTable]
+ADD_SECTION
+# COMMDB_ID = 243
+	Id=5
+	Name=rawipMappedFromIAP5
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.3
+	CprConfig=5
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 245
+	Id=4
+	Name=spud-rawipMappedFromIAP4
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.5
+	CprConfig=4
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 247
+	Id=3
+	Name=rawipMappedFromIAP3
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.3
+	CprConfig=3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 249
+	Id=2
+	Name=spud-rawipMappedFromIAP2
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.5
+	CprConfig=2
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 251
+	Id=1
+	Name=rawipMappedFromIAP1
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.3
+	CprConfig=1
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 253
+	Id=10001
+	Name=IPProtoDefault
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	CustomSelectionPolicy=2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 254
+	Id=10000
+	Name=NetworkDefault
+	Tier=Link.TierTable.2048
+	MCpr=MCprTable.1
+	AccessPointSelectionPolicy=Link.APPrioritySelectionPolicyTable.1
+	Cpr=CprTable.1
+	SCpr=SCprTable.7
+	Protocol=ProtocolTable.1
+	FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## BearerTypeTable
+## 
+[BearerTypeTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=ppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ethint
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.4
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.4
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=rawip
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=tunnelnif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.6
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.6
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=qosppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.7
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.7
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=dummynif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.8
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.8
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=hungrynif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.9
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.9
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=spud-ppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.5
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.3
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=9
+	Name=spud-rawip
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.5
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	FIELD_COUNT=7
+END_ADD
+
+##This record here is the template record for the IPProto level APs generated by CommsDat.
+ADD_SECTION
+# COMMDB_ID = 10
+	##This name is a predefined name for the template for the IPProto APs.
+	##Please don't change it!
+	Name=IPProtoDefaultTemplate
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	FIELD_COUNT=6
+END_ADD
+
+
+############################################################
+## IAP
+## 
+[IAP]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Loopback_GRPS_1
+	IAPServiceType=OutgoingGPRS
+	IAPService=1
+	IAPBearerType=ModemBearer
+	IAPBearer=1
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=Location.2
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=Loopback_GRPS_2
+	IAPServiceType=OutgoingGPRS
+	IAPService=2
+	IAPBearerType=ModemBearer
+	IAPBearer=2
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=Location.2
+	IAPAppSid=538984447
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=Loopback_GRPS_3
+	IAPServiceType=OutgoingGPRS
+	IAPService=3
+	IAPBearerType=ModemBearer
+	IAPBearer=3
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=Location.2
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=Loopback_GRPS_4
+	IAPServiceType=OutgoingGPRS
+	IAPService=4
+	IAPBearerType=ModemBearer
+	IAPBearer=4
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=Location.2
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=Loopback_GRPS_5
+	IAPServiceType=OutgoingGPRS
+	IAPService=1
+	IAPBearerType=ModemBearer
+	IAPBearer=3
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=Location.2
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## ConnectionPreferences
+## 
+[ConnectionPreferences]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-1
+	Ranking=1
+	Direction=OUTGOING
+	BearerSet=PSD
+	DialogPref=DONOTPROMPT
+	IAP=2
+	FIELD_COUNT=7
+END_ADD
+
+############################################################
+## UmtsR99QoSAndOn
+## 
+[UmtsR99QoSAndOn]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=R99Default1
+	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=29
+END_ADD
+
+############################################################
+## TierTable
+## 
+[TierTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=2048
+	TierImplUid=271064536
+	Name=Tier1
+	TierThreadName=ESock_IP
+	TierManagerName=NetworkTierManager
+	DefaultAccessPoint=Link.AccessPointTable.10000
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=271064560
+	TierImplUid=271064560
+	Name=Tier2
+	TierThreadName=ESock_IP
+	TierManagerName=ProtoTierManager
+	DefaultAccessPoint=Link.AccessPointTable.10001
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=271064565
+	TierImplUid=271064565
+	Name=Tier3
+	TierThreadName=ESock_IP
+	TierManagerName=LinkTierManager
+	##NB defaultAccessPoint not present in this layer. This is only needed here to satisfy the check
+	##on the link layer. However important that once this field has a value it has to be linked to a
+	##correct accesspoint record in the accesspoint table because this will be checked either.
+	DefaultAccessPoint=Link.AccessPointTable.1
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## MCprTable
+## 
+[MCprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=netmcpr
+	MCprUid=271009095
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipprotomcpr
+	MCprUid=271064558
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=pppmcpr
+	MCprUid=271064556
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=ethmcpr
+	MCprUid=271064572
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=rawipmcpr
+	MCprUid=271064576
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=tunnelmcpr
+	MCprUid=271064578
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=qospppmcpr
+	MCprUid=271064556
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=dummynifmcpr
+	MCprUid=271064580
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=9
+	Name=hungrynifmcpr
+	MCprUid=271064580
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Id=10
+	Name=pdpmcpr
+	MCprUid=271065840
+	FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## CprTable
+## 
+[CprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=ipcpr
+	CprUid=270561519
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipprotocpr
+	CprUid=271064531
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=agentcpr
+	CprUid=271064552
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=vanillacpr
+	CprUid=271065843
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=pdpcpr
+	CprUid=271065826
+	FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## SCprTable
+## 
+[SCprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=ipscpr
+	SCprUid=0xFFFFFFFF
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipprotoscpr
+	SCprUid=271064529
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=agentscpr
+	SCprUid=271064554
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=pdpscpr
+	SCprUid=271065824
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=pppscpr
+	SCprUid=271065852
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=vanillascpr
+	SCprUid=271065844
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=qosscpr
+	SCprUid=271065811
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=ipqosprotoscpr
+	SCprUid=271065816
+	FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## ProtocolTable
+## 
+[ProtocolTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=sapshim
+	ProtocolUid=270496898
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipshim4
+	ProtocolUid=271064118
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=ppp
+	ProtocolUid=271064143
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=ethernet
+	ProtocolUid=271064539
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=rawip
+	ProtocolUid=271064562
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=tunnel
+	ProtocolUid=271064567
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=qosppp
+	ProtocolUid=271064148
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=dummynif
+	ProtocolUid=271064123
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=9
+	Name=hungrynif
+	ProtocolUid=271064125
+	FIELD_COUNT=3
+END_ADD
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/configs/te_dedicatedsignalling1ryctx_imssi_pdpcpr.cfg	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,1041 @@
+############################################################
+## AUTO-GENERATED CONFIGURATION FILE
+## CommsDat Database Dump Utility
+## 1.1
+############################################################
+
+############################################################
+## Network
+## 
+[Network]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Intranet
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=Intranet2
+	FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## ModemBearer
+## 
+[ModemBearer]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Loopback Modem
+	TSYName=SIM
+	CSYName=PKTLOOPBACK
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=4
+	LastSocketClosedTimeout=6
+	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
+	MessageValidityPeriod=0
+	MessageDeliveryReport=FALSE
+	CommRole=0
+	Agent=NULLAGT
+	BCAStack=C32Bca
+	FIELD_COUNT=66
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Loopback_RawIP_1
+	IfName=RAWIP
+	PortName=PKTLOOPBACK::501
+	CSYName=PKTLOOPBACK
+	FIELD_COUNT=5
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=Loopback_SPUD_2
+	IfName=SPUD
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=Loopback_RawIP_3
+	IfName=RAWIP
+	PortName=PKTLOOPBACK::503
+	CSYName=PKTLOOPBACK
+	FIELD_COUNT=5
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=Loopback_SPUD_4
+	IfName=SPUD
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=WinTunnel_SPUD_5
+	IfName=SPUD
+	Agent=NULLAGT
+	FIELD_COUNT=4
+END_ADD
+
+
+############################################################
+## Location
+## 
+[Location]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Location
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=9
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Office
+	IntlPrefixCode=00
+	NatPrefixCode=0
+	NatCode=44
+	AreaCode=171
+	DialOutCode=9,
+	Mobile=FALSE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=11
+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
+
+
+############################################################
+## GlobalSettings
+## 
+[GlobalSettings]
+ADD_TEMPLATE
+	DefaultTier=Link.TierTable.2048
+	FIELD_COUNT=1
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-1
+	ConnectionAttempts=2
+	RedialAttempts=3
+	SmsReceiveMode=2
+	GPRSAttachMode=1
+	AcceptIncomingGprs=1
+	GPRSClassCBearer=GSM
+	ModemForDataAndFax=2
+	ModemForPhoneServicesAndSMS=2
+	LocationForDataAndFax=41878016
+	LocationForPhoneServicesAndSMS=41878016
+	MaxMBufHeap=41878016
+	DefaultNetwork=33489152
+	BearerAvailabilityCheckTSY=mm
+	FIELD_COUNT=15
+END_ADD
+
+
+############################################################
+## OutgoingGPRS
+## 
+[OutgoingGPRS]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Outgoing GPRS
+	APN=Test
+	PDPType=IPV4
+	ReqPrecedence=2
+	ReqDelay=4
+	ReqReliability=3
+	ReqPeakThroughput=3
+	ReqMeanThroughput=31
+	MinPrecedence=2
+	MinDelay=4
+	MinReliability=3
+	MinPeakThroughput=3
+	MinMeanThroughput=31
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=RasUser
+	AuthRetries=1
+	IpGateway=0.0.0.1
+	IpAddrFromServer=FALSE
+	IpDNSAddrFromServer=FALSE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.51
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	UmtsR99QoSAndOn=1
+	FIELD_COUNT=30
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=RawIP_Bounce_1
+	PDPType=IPV4
+	IfPromptForAuth=FALSE
+	IpNetMask=255.255.255.0
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.1.1
+	IpDNSAddrFromServer=FALSE
+	UmtsR99QoSAndOn=1
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=SPUD_Echo_2
+	PDPType=IPV4
+	IfParams=lowernif=RAWIP
+	IfPromptForAuth=FALSE
+	IpNetMask=255.255.255.0
+	IpAddrFromServer=TRUE
+	IpAddr=192.168.1.2
+	IpDNSAddrFromServer=TRUE
+	UmtsR99QoSAndOn=1
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=RawIP_Bounce_3
+	PDPType=IPV4
+	IfPromptForAuth=FALSE
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.2.3
+	IpDNSAddrFromServer=FALSE
+	UmtsR99QoSAndOn=1
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=SPUD_Echo_4
+	PDPType=IPV4
+	IfParams=lowernif=RAWIP
+	IfPromptForAuth=FALSE
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.2.4
+	IpDNSAddrFromServer=FALSE
+	UmtsR99QoSAndOn=1
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## DefaultGPRS
+## 
+[DefaultGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Dummy Default GPRS Settings
+	Usage=1
+	APN=Access point name
+	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=20
+END_ADD
+
+############################################################
+## APPrioritySelectionPolicyTable
+## 
+[APPrioritySelectionPolicyTable]
+ADD_SECTION
+# COMMDB_ID = 1
+  	Id=1
+	Name=SelectionPolicy1
+	AP1=Link.AccessPointTable.10001
+	APCOUNT=1
+	FIELD_COUNT=4
+END_ADD
+
+############################################################
+## AccessPointTable
+## 
+[AccessPointTable]
+ADD_SECTION
+# COMMDB_ID = 243
+	Id=5
+	Name=rawipMappedFromIAP5
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.3
+	CprConfig=5
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 245
+	Id=4
+	Name=spud-rawipMappedFromIAP4
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.5
+	CprConfig=4
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 247
+	Id=3
+	Name=rawipMappedFromIAP3
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.3
+	CprConfig=3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 249
+	Id=2
+	Name=spud-rawipMappedFromIAP2
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.5
+	CprConfig=2
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 251
+	Id=1
+	Name=rawipMappedFromIAP1
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.3
+	CprConfig=1
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 253
+	Id=10001
+	Name=IPProtoDefault
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	CustomSelectionPolicy=2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 254
+	Id=10000
+	Name=NetworkDefault
+	Tier=Link.TierTable.2048
+	MCpr=MCprTable.1
+	AccessPointSelectionPolicy=Link.APPrioritySelectionPolicyTable.1
+	Cpr=CprTable.1
+	SCpr=SCprTable.7
+	Protocol=ProtocolTable.1
+	FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## BearerTypeTable
+## 
+[BearerTypeTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=ppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ethint
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.4
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.4
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=rawip
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=tunnelnif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.6
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.6
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=qosppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.7
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.7
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=dummynif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.8
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.8
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=hungrynif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.9
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.9
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=spud-ppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.5
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.3
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=9
+	Name=spud-rawip
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.5
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	FIELD_COUNT=7
+END_ADD
+
+##This record here is the template record for the IPProto level APs generated by CommsDat.
+ADD_SECTION
+# COMMDB_ID = 10
+	##This name is a predefined name for the template for the IPProto APs.
+	##Please don't change it!
+	Name=IPProtoDefaultTemplate
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	FIELD_COUNT=6
+END_ADD
+
+
+############################################################
+## IAP
+## 
+[IAP]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Loopback_GRPS_1
+	IAPServiceType=OutgoingGPRS
+	IAPService=1
+	IAPBearerType=ModemBearer
+	IAPBearer=1
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=Location.2
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=Loopback_GRPS_2
+	IAPServiceType=OutgoingGPRS
+	IAPService=2
+	IAPBearerType=ModemBearer
+	IAPBearer=2
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=Location.2
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=Loopback_GRPS_3
+	IAPServiceType=OutgoingGPRS
+	IAPService=3
+	IAPBearerType=ModemBearer
+	IAPBearer=3
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=Location.2
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=Loopback_GRPS_4
+	IAPServiceType=OutgoingGPRS
+	IAPService=4
+	IAPBearerType=ModemBearer
+	IAPBearer=4
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=Location.2
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=Loopback_GRPS_5
+	IAPServiceType=OutgoingGPRS
+	IAPService=1
+	IAPBearerType=ModemBearer
+	IAPBearer=3
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=Location.2
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## ConnectionPreferences
+## 
+[ConnectionPreferences]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-1
+	Ranking=1
+	Direction=OUTGOING
+	BearerSet=PSD
+	DialogPref=DONOTPROMPT
+	IAP=2
+	FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## UmtsR99QoSAndOn
+## 
+[UmtsR99QoSAndOn]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=R99Default1
+	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=TRUE
+	SourceStatisticsDescriptor=0
+	FIELD_COUNT=29
+END_ADD
+
+############################################################
+## TierTable
+## 
+[TierTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=2048
+	TierImplUid=271064536
+	Name=Tier1
+	TierThreadName=ESock_IP
+	TierManagerName=NetworkTierManager
+	DefaultAccessPoint=Link.AccessPointTable.10000
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=271064560
+	TierImplUid=271064560
+	Name=Tier2
+	TierThreadName=ESock_IP
+	TierManagerName=ProtoTierManager
+	DefaultAccessPoint=Link.AccessPointTable.10001
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=271064565
+	TierImplUid=271064565
+	Name=Tier3
+	TierThreadName=ESock_IP
+	TierManagerName=LinkTierManager
+##NB defaultAccessPoint not present in this layer. This is only needed here to satisfy the check
+##on the link layer. However important that once this field has a value it has to be linked to a
+##correct accesspoint record in the accesspoint table because this will be checked either.
+	DefaultAccessPoint=Link.AccessPointTable.1
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## MCprTable
+## 
+[MCprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=netmcpr
+	MCprUid=271009095
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipprotomcpr
+	MCprUid=271064558
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=pppmcpr
+	MCprUid=271064556
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=ethmcpr
+	MCprUid=271064572
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=rawipmcpr
+	MCprUid=271064576
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=tunnelmcpr
+	MCprUid=271064578
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=qospppmcpr
+	MCprUid=271064556
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=dummynifmcpr
+	MCprUid=271064580
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=9
+	Name=hungrynifmcpr
+	MCprUid=271064580
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Id=10
+	Name=pdpmcpr
+	MCprUid=271065840
+	FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## CprTable
+## 
+[CprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=ipcpr
+	CprUid=270561519
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipprotocpr
+	CprUid=271064531
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=agentcpr
+	CprUid=271064552
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=vanillacpr
+	CprUid=271065843
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=pdpcpr
+	CprUid=271065826
+	FIELD_COUNT=3
+END_ADD
+
+############################################################
+## SCprTable
+## 
+[SCprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=ipscpr
+	SCprUid=0xFFFFFFFF
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipprotoscpr
+	SCprUid=271064529
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=agentscpr
+	SCprUid=271064554
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=pdpscpr
+	SCprUid=271065824
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=pppscpr
+	SCprUid=271065852
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=vanillascpr
+	SCprUid=271065844
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=qosscpr
+	SCprUid=271065811
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=ipqosprotoscpr
+	SCprUid=271065816
+	FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## ProtocolTable
+## 
+[ProtocolTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=sapshim
+	ProtocolUid=270496898
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipshim4
+	ProtocolUid=271064118
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=ppp
+	ProtocolUid=271064143
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=ethernet
+	ProtocolUid=271064539
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=rawip
+	ProtocolUid=271064562
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=tunnel
+	ProtocolUid=271064567
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=qosppp
+	ProtocolUid=271064148
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=dummynif
+	ProtocolUid=271064123
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=9
+	Name=hungrynif
+	ProtocolUid=271064125
+	FIELD_COUNT=3
+END_ADD
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/configs/te_dedicatedsignalling1ryctx_nosid_pdpcpr.cfg	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,1042 @@
+############################################################
+## AUTO-GENERATED CONFIGURATION FILE
+## CommsDat Database Dump Utility
+## 1.1
+############################################################
+
+############################################################
+## Network
+## 
+[Network]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Intranet
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=Intranet2
+	FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## ModemBearer
+## 
+[ModemBearer]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Loopback Modem
+	TSYName=SIM
+	CSYName=PKTLOOPBACK
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=4
+	LastSocketClosedTimeout=6
+	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
+	MessageValidityPeriod=0
+	MessageDeliveryReport=FALSE
+	CommRole=0
+	Agent=NULLAGT
+	BCAStack=C32Bca
+	FIELD_COUNT=66
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Loopback_RawIP_1
+	IfName=RAWIP
+	PortName=PKTLOOPBACK::501
+	CSYName=PKTLOOPBACK
+	FIELD_COUNT=5
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=Loopback_SPUD_2
+	IfName=SPUD
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=Loopback_RawIP_3
+	IfName=RAWIP
+	PortName=PKTLOOPBACK::503
+	CSYName=PKTLOOPBACK
+	FIELD_COUNT=5
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=Loopback_SPUD_4
+	IfName=SPUD
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=WinTunnel_SPUD_5
+	IfName=SPUD
+	Agent=NULLAGT
+	FIELD_COUNT=4
+END_ADD
+
+
+############################################################
+## Location
+## 
+[Location]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Location
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=9
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Office
+	IntlPrefixCode=00
+	NatPrefixCode=0
+	NatCode=44
+	AreaCode=171
+	DialOutCode=9,
+	Mobile=FALSE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=11
+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
+
+
+############################################################
+## GlobalSettings
+## 
+[GlobalSettings]
+ADD_TEMPLATE
+	DefaultTier=Link.TierTable.2048
+	FIELD_COUNT=1
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-1
+	ConnectionAttempts=2
+	RedialAttempts=3
+	SmsReceiveMode=2
+	GPRSAttachMode=1
+	AcceptIncomingGprs=1
+	GPRSClassCBearer=GSM
+	ModemForDataAndFax=2
+	ModemForPhoneServicesAndSMS=2
+	LocationForDataAndFax=41878016
+	LocationForPhoneServicesAndSMS=41878016
+	MaxMBufHeap=41878016
+	DefaultNetwork=33489152
+	BearerAvailabilityCheckTSY=mm
+	FIELD_COUNT=15
+END_ADD
+
+
+############################################################
+## OutgoingGPRS
+## 
+[OutgoingGPRS]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Outgoing GPRS
+	APN=Test
+	PDPType=IPV4
+	ReqPrecedence=2
+	ReqDelay=4
+	ReqReliability=3
+	ReqPeakThroughput=3
+	ReqMeanThroughput=31
+	MinPrecedence=2
+	MinDelay=4
+	MinReliability=3
+	MinPeakThroughput=3
+	MinMeanThroughput=31
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=RasUser
+	AuthRetries=1
+	IpGateway=0.0.0.1
+	IpAddrFromServer=FALSE
+	IpDNSAddrFromServer=FALSE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.51
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	UmtsR99QoSAndOn=1
+	FIELD_COUNT=30
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=RawIP_Bounce_1
+	PDPType=IPV4
+	IfPromptForAuth=FALSE
+	IpNetMask=255.255.255.0
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.1.1
+	IpDNSAddrFromServer=FALSE
+	UmtsR99QoSAndOn=1
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=SPUD_Echo_2
+	PDPType=IPV4
+	IfParams=lowernif=RAWIP
+	IfPromptForAuth=FALSE
+	IpNetMask=255.255.255.0
+	IpAddrFromServer=TRUE
+	IpAddr=192.168.1.2
+	IpDNSAddrFromServer=TRUE
+	UmtsR99QoSAndOn=1
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=RawIP_Bounce_3
+	PDPType=IPV4
+	IfPromptForAuth=FALSE
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.2.3
+	IpDNSAddrFromServer=FALSE
+	UmtsR99QoSAndOn=1
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=SPUD_Echo_4
+	PDPType=IPV4
+	IfParams=lowernif=RAWIP
+	IfPromptForAuth=FALSE
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.2.4
+	IpDNSAddrFromServer=FALSE
+	UmtsR99QoSAndOn=1
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## DefaultGPRS
+## 
+[DefaultGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Dummy Default GPRS Settings
+	Usage=1
+	APN=Access point name
+	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=20
+END_ADD
+
+############################################################
+## APPrioritySelectionPolicyTable
+## 
+[APPrioritySelectionPolicyTable]
+ADD_SECTION
+# COMMDB_ID = 1
+  	Id=1
+	Name=SelectionPolicy1
+	AP1=Link.AccessPointTable.10001
+	APCOUNT=1
+	FIELD_COUNT=4
+END_ADD
+
+############################################################
+## AccessPointTable
+## 
+[AccessPointTable]
+ADD_SECTION
+# COMMDB_ID = 243
+	Id=5
+	Name=rawipMappedFromIAP5
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.3
+	CprConfig=5
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 245
+	Id=4
+	Name=spud-rawipMappedFromIAP4
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.5
+	CprConfig=4
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 247
+	Id=3
+	Name=rawipMappedFromIAP3
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.3
+	CprConfig=3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 249
+	Id=2
+	Name=spud-rawipMappedFromIAP2
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.5
+	CprConfig=2
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 251
+	Id=1
+	Name=rawipMappedFromIAP1
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.3
+	CprConfig=1
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 253
+	Id=10001
+	Name=IPProtoDefault
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	CustomSelectionPolicy=2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 254
+	Id=10000
+	Name=NetworkDefault
+	Tier=Link.TierTable.2048
+	MCpr=MCprTable.1
+	AccessPointSelectionPolicy=Link.APPrioritySelectionPolicyTable.1
+	Cpr=CprTable.1
+	SCpr=SCprTable.7
+	Protocol=ProtocolTable.1
+	FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## BearerTypeTable
+## 
+[BearerTypeTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=ppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ethint
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.4
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.4
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=rawip
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=tunnelnif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.6
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.6
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=qosppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.7
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.7
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=dummynif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.8
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.8
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=hungrynif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.9
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.9
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=spud-ppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.5
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.3
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=9
+	Name=spud-rawip
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.5
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	FIELD_COUNT=7
+END_ADD
+
+##This record here is the template record for the IPProto level APs generated by CommsDat.
+ADD_SECTION
+# COMMDB_ID = 10
+	##This name is a predefined name for the template for the IPProto APs.
+	##Please don't change it!
+	Name=IPProtoDefaultTemplate
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	FIELD_COUNT=6
+END_ADD
+
+
+############################################################
+## IAP
+## 
+[IAP]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Loopback_GRPS_1
+	IAPServiceType=OutgoingGPRS
+	IAPService=1
+	IAPBearerType=ModemBearer
+	IAPBearer=1
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=Location.2
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=Loopback_GRPS_2
+	IAPServiceType=OutgoingGPRS
+	IAPService=2
+	IAPBearerType=ModemBearer
+	IAPBearer=2
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=Location.2
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=Loopback_GRPS_3
+	IAPServiceType=OutgoingGPRS
+	IAPService=3
+	IAPBearerType=ModemBearer
+	IAPBearer=3
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=Location.2
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=Loopback_GRPS_4
+	IAPServiceType=OutgoingGPRS
+	IAPService=4
+	IAPBearerType=ModemBearer
+	IAPBearer=4
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=Location.2
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=Loopback_GRPS_5
+	IAPServiceType=OutgoingGPRS
+	IAPService=1
+	IAPBearerType=ModemBearer
+	IAPBearer=3
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=Location.2
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## ConnectionPreferences
+## 
+[ConnectionPreferences]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-1
+	Ranking=1
+	Direction=OUTGOING
+	BearerSet=PSD
+	DialogPref=DONOTPROMPT
+	IAP=2
+	FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## UmtsR99QoSAndOn
+## 
+[UmtsR99QoSAndOn]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=R99Default1
+	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=29
+END_ADD
+
+
+############################################################
+## TierTable
+## 
+[TierTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=2048
+	TierImplUid=271064536
+	Name=Tier1
+	TierThreadName=ESock_IP
+	TierManagerName=NetworkTierManager
+	DefaultAccessPoint=Link.AccessPointTable.10000
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=271064560
+	TierImplUid=271064560
+	Name=Tier2
+	TierThreadName=ESock_IP
+	TierManagerName=ProtoTierManager
+	DefaultAccessPoint=Link.AccessPointTable.10001
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=271064565
+	TierImplUid=271064565
+	Name=Tier3
+	TierThreadName=ESock_IP
+	TierManagerName=LinkTierManager
+##NB defaultAccessPoint not present in this layer. This is only needed here to satisfy the check
+##on the link layer. However important that once this field has a value it has to be linked to a
+##correct accesspoint record in the accesspoint table because this will be checked either.
+	DefaultAccessPoint=Link.AccessPointTable.1
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## MCprTable
+## 
+[MCprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=netmcpr
+	MCprUid=271009095
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipprotomcpr
+	MCprUid=271064558
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=pppmcpr
+	MCprUid=271064556
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=ethmcpr
+	MCprUid=271064572
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=rawipmcpr
+	MCprUid=271064576
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=tunnelmcpr
+	MCprUid=271064578
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=qospppmcpr
+	MCprUid=271064556
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=dummynifmcpr
+	MCprUid=271064580
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=9
+	Name=hungrynifmcpr
+	MCprUid=271064580
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Id=10
+	Name=pdpmcpr
+	MCprUid=271065840
+	FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## CprTable
+## 
+[CprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=ipcpr
+	CprUid=270561519
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipprotocpr
+	CprUid=271064531
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=agentcpr
+	CprUid=271064552
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=vanillacpr
+	CprUid=271065843
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=pdpcpr
+	CprUid=271065826
+	FIELD_COUNT=3
+END_ADD
+
+############################################################
+## SCprTable
+## 
+[SCprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=ipscpr
+	SCprUid=0xFFFFFFFF
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipprotoscpr
+	SCprUid=271064529
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=agentscpr
+	SCprUid=271064554
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=pdpscpr
+	SCprUid=271065824
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=pppscpr
+	SCprUid=271065852
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=vanillascpr
+	SCprUid=271065844
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=qosscpr
+	SCprUid=271065811
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=ipqosprotoscpr
+	SCprUid=271065816
+	FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## ProtocolTable
+## 
+[ProtocolTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=sapshim
+	ProtocolUid=270496898
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipshim4
+	ProtocolUid=271064118
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=ppp
+	ProtocolUid=271064143
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=ethernet
+	ProtocolUid=271064539
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=rawip
+	ProtocolUid=271064562
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=tunnel
+	ProtocolUid=271064567
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=qosppp
+	ProtocolUid=271064148
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=dummynif
+	ProtocolUid=271064123
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=9
+	Name=hungrynif
+	ProtocolUid=271064125
+	FIELD_COUNT=3
+END_ADD
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/configs/te_dedicatedsignalling1ryctx_pdpcpr.cfg	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,1044 @@
+############################################################
+## AUTO-GENERATED CONFIGURATION FILE
+## CommsDat Database Dump Utility
+## 1.1
+############################################################
+
+############################################################
+## Network
+## 
+[Network]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Intranet
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=Intranet2
+	FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## ModemBearer
+## 
+[ModemBearer]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Loopback Modem
+	TSYName=SIM
+	CSYName=PKTLOOPBACK
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=4
+	LastSocketClosedTimeout=6
+	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
+	MessageValidityPeriod=0
+	MessageDeliveryReport=FALSE
+	CommRole=0
+	Agent=NULLAGT
+	BCAStack=C32Bca
+	FIELD_COUNT=66
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Loopback_RawIP_1
+	IfName=RAWIP
+	PortName=PKTLOOPBACK::501
+	CSYName=PKTLOOPBACK
+	FIELD_COUNT=5
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=Loopback_SPUD_2
+	IfName=SPUD
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=Loopback_RawIP_3
+	IfName=RAWIP
+	PortName=PKTLOOPBACK::503
+	CSYName=PKTLOOPBACK
+	FIELD_COUNT=5
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=Loopback_SPUD_4
+	IfName=SPUD
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=WinTunnel_SPUD_5
+	IfName=SPUD
+	Agent=NULLAGT
+	FIELD_COUNT=4
+END_ADD
+
+
+############################################################
+## Location
+## 
+[Location]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Location
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=9
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Office
+	IntlPrefixCode=00
+	NatPrefixCode=0
+	NatCode=44
+	AreaCode=171
+	DialOutCode=9,
+	Mobile=FALSE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=11
+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
+
+
+############################################################
+## GlobalSettings
+## 
+[GlobalSettings]
+ADD_TEMPLATE
+	DefaultTier=Link.TierTable.2048
+	FIELD_COUNT=1
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-1
+	ConnectionAttempts=2
+	RedialAttempts=3
+	SmsReceiveMode=2
+	GPRSAttachMode=1
+	AcceptIncomingGprs=1
+	GPRSClassCBearer=GSM
+	ModemForDataAndFax=2
+	ModemForPhoneServicesAndSMS=2
+	LocationForDataAndFax=41878016
+	LocationForPhoneServicesAndSMS=41878016
+	MaxMBufHeap=41878016
+	DefaultNetwork=33489152
+	BearerAvailabilityCheckTSY=mm
+	FIELD_COUNT=15
+END_ADD
+
+
+############################################################
+## OutgoingGPRS
+## 
+[OutgoingGPRS]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Outgoing GPRS
+	APN=Test
+	PDPType=IPV4
+	ReqPrecedence=2
+	ReqDelay=4
+	ReqReliability=3
+	ReqPeakThroughput=3
+	ReqMeanThroughput=31
+	MinPrecedence=2
+	MinDelay=4
+	MinReliability=3
+	MinPeakThroughput=3
+	MinMeanThroughput=31
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=RasUser
+	AuthRetries=1
+	IpGateway=0.0.0.1
+	IpAddrFromServer=FALSE
+	IpDNSAddrFromServer=FALSE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.51
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	UmtsR99QoSAndOn=1
+	FIELD_COUNT=30
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=RawIP_Bounce_1
+	PDPType=IPV4
+	IfPromptForAuth=FALSE
+	IpNetMask=255.255.255.0
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.1.1
+	IpDNSAddrFromServer=FALSE
+	UmtsR99QoSAndOn=1
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=SPUD_Echo_2
+	PDPType=IPV4
+	IfParams=lowernif=RAWIP
+	IfPromptForAuth=FALSE
+	IpNetMask=255.255.255.0
+	IpAddrFromServer=TRUE
+	IpAddr=192.168.1.2
+	IpDNSAddrFromServer=TRUE
+	UmtsR99QoSAndOn=1
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=RawIP_Bounce_3
+	PDPType=IPV4
+	IfPromptForAuth=FALSE
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.2.3
+	IpDNSAddrFromServer=FALSE
+	UmtsR99QoSAndOn=1
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=SPUD_Echo_4
+	PDPType=IPV4
+	IfParams=lowernif=RAWIP
+	IfPromptForAuth=FALSE
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.2.4
+	IpDNSAddrFromServer=FALSE
+	UmtsR99QoSAndOn=1
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## DefaultGPRS
+## 
+[DefaultGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Dummy Default GPRS Settings
+	Usage=1
+	APN=Access point name
+	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=20
+END_ADD
+
+############################################################
+## APPrioritySelectionPolicyTable
+## 
+[APPrioritySelectionPolicyTable]
+ADD_SECTION
+# COMMDB_ID = 1
+  	Id=1
+	Name=SelectionPolicy1
+	AP1=Link.AccessPointTable.10001
+	APCOUNT=1
+	FIELD_COUNT=4
+END_ADD
+
+############################################################
+## AccessPointTable
+## 
+[AccessPointTable]
+ADD_SECTION
+# COMMDB_ID = 243
+	Id=5
+	Name=rawipMappedFromIAP5
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.3
+	CprConfig=5
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 245
+	Id=4
+	Name=spud-rawipMappedFromIAP4
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.5
+	CprConfig=4
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 247
+	Id=3
+	Name=rawipMappedFromIAP3
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.3
+	CprConfig=3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 249
+	Id=2
+	Name=spud-rawipMappedFromIAP2
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.5
+	CprConfig=2
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 251
+	Id=1
+	Name=rawipMappedFromIAP1
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.3
+	CprConfig=1
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 253
+	Id=10001
+	Name=IPProtoDefault
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	CustomSelectionPolicy=2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 254
+	Id=10000
+	Name=NetworkDefault
+	Tier=Link.TierTable.2048
+	MCpr=MCprTable.1
+	AccessPointSelectionPolicy=Link.APPrioritySelectionPolicyTable.1
+	Cpr=CprTable.1
+	SCpr=SCprTable.7
+	Protocol=ProtocolTable.1
+	FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## BearerTypeTable
+## 
+[BearerTypeTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=ppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ethint
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.4
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.4
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=rawip
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=tunnelnif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.6
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.6
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=qosppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.7
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.7
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=dummynif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.8
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.8
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=hungrynif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.9
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.9
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=spud-ppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.5
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.3
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=9
+	Name=spud-rawip
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.5
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	FIELD_COUNT=7
+END_ADD
+
+##This record here is the template record for the IPProto level APs generated by CommsDat.
+ADD_SECTION
+# COMMDB_ID = 10
+	##This name is a predefined name for the template for the IPProto APs.
+	##Please don't change it!
+	Name=IPProtoDefaultTemplate
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	FIELD_COUNT=6
+END_ADD
+
+
+############################################################
+## IAP
+## 
+[IAP]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Loopback_GRPS_1
+	IAPServiceType=OutgoingGPRS
+	IAPService=1
+	IAPBearerType=ModemBearer
+	IAPBearer=1
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=Location.2
+	IAPAppSid=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=Loopback_GRPS_2
+	IAPServiceType=OutgoingGPRS
+	IAPService=2
+	IAPBearerType=ModemBearer
+	IAPBearer=2
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=Location.2
+	IAPAppSid=270548991
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=Loopback_GRPS_3
+	IAPServiceType=OutgoingGPRS
+	IAPService=3
+	IAPBearerType=ModemBearer
+	IAPBearer=3
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=Location.2
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=Loopback_GRPS_4
+	IAPServiceType=OutgoingGPRS
+	IAPService=4
+	IAPBearerType=ModemBearer
+	IAPBearer=4
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=Location.2
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=Loopback_GRPS_5
+	IAPServiceType=OutgoingGPRS
+	IAPService=1
+	IAPBearerType=ModemBearer
+	IAPBearer=3
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=Location.2
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## ConnectionPreferences
+## 
+[ConnectionPreferences]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-1
+	Ranking=1
+	Direction=OUTGOING
+	BearerSet=PSD
+	DialogPref=DONOTPROMPT
+	IAP=2
+	FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## UmtsR99QoSAndOn
+## 
+[UmtsR99QoSAndOn]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=R99Default1
+	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=29
+END_ADD
+
+
+############################################################
+## TierTable
+## 
+[TierTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=2048
+	TierImplUid=271064536
+	Name=Tier1
+	TierThreadName=ESock_IP
+	TierManagerName=NetworkTierManager
+	DefaultAccessPoint=Link.AccessPointTable.10000
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=271064560
+	TierImplUid=271064560
+	Name=Tier2
+	TierThreadName=ESock_IP
+	TierManagerName=ProtoTierManager
+	DefaultAccessPoint=Link.AccessPointTable.10001
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=271064565
+	TierImplUid=271064565
+	Name=Tier3
+	TierThreadName=ESock_IP
+	TierManagerName=LinkTierManager
+	##NB defaultAccessPoint not present in this layer. This is only needed here to satisfy the check
+	##on the link layer. However important that once this field has a value it has to be linked to a
+	##correct accesspoint record in the accesspoint table because this will be checked either.
+	DefaultAccessPoint=Link.AccessPointTable.1
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## MCprTable
+## 
+[MCprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=netmcpr
+	MCprUid=271009095
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipprotomcpr
+	MCprUid=271064558
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=pppmcpr
+	MCprUid=271064556
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=ethmcpr
+	MCprUid=271064572
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=rawipmcpr
+	MCprUid=271064576
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=tunnelmcpr
+	MCprUid=271064578
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=qospppmcpr
+	MCprUid=271064556
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=dummynifmcpr
+	MCprUid=271064580
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=9
+	Name=hungrynifmcpr
+	MCprUid=271064580
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Id=10
+	Name=pdpmcpr
+	MCprUid=271065840
+	FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## CprTable
+## 
+[CprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=ipcpr
+	CprUid=270561519
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipprotocpr
+	CprUid=271064531
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=agentcpr
+	CprUid=271064552
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=vanillacpr
+	CprUid=271065843
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=pdpcpr
+	CprUid=271065826
+	FIELD_COUNT=3
+END_ADD
+
+############################################################
+## SCprTable
+## 
+[SCprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=ipscpr
+	SCprUid=0xFFFFFFFF
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipprotoscpr
+	SCprUid=271064529
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=agentscpr
+	SCprUid=271064554
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=pdpscpr
+	SCprUid=271065824
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=pppscpr
+	SCprUid=271065852
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=vanillascpr
+	SCprUid=271065844
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=qosscpr
+	SCprUid=271065811
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=ipqosprotoscpr
+	SCprUid=271065816
+	FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## ProtocolTable
+## 
+[ProtocolTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=sapshim
+	ProtocolUid=270496898
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipshim4
+	ProtocolUid=271064118
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=ppp
+	ProtocolUid=271064143
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=ethernet
+	ProtocolUid=271064539
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=rawip
+	ProtocolUid=271064562
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=tunnel
+	ProtocolUid=271064567
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=qosppp
+	ProtocolUid=271064148
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=dummynif
+	ProtocolUid=271064123
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=9
+	Name=hungrynif
+	ProtocolUid=271064125
+	FIELD_COUNT=3
+END_ADD
+
--- a/networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/group/bld.inf	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/group/bld.inf	Thu Aug 19 11:25:30 2010 +0300
@@ -42,10 +42,18 @@
 ../scripts/CIT_P635_Setup_QosPolicies2.script z:/testdata/scripts/cit_p635_setup_qospolicies2.script
 ../scripts/Restore_QosPolicies.script z:/testdata/scripts/restore_qospolicies.script
 #ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
+
+#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
+../configs/te_dedicatedsignalling1ryctx_pdpcpr.cfg z:/testdata/configs/te_dedicatedsignalling1ryctx.cfg
+../configs/te_dedicatedsignalling1ryctx_changedsid_pdpcpr.cfg z:/testdata/configs/te_dedicatedsignalling1ryctx_changedsid.cfg
+../configs/te_dedicatedsignalling1ryctx_imssi_pdpcpr.cfg z:/testdata/configs/te_dedicatedsignalling1ryctx_imssi.cfg
+../configs/te_dedicatedsignalling1ryctx_nosid_pdpcpr.cfg z:/testdata/configs/te_dedicatedsignalling1ryctx_nosid.cfg
+#else
 ../configs/te_dedicatedsignalling1ryctx.cfg z:/testdata/configs/te_dedicatedsignalling1ryctx.cfg
 ../configs/te_dedicatedsignalling1ryctx_changedsid.cfg z:/testdata/configs/te_dedicatedsignalling1ryctx_changedsid.cfg
 ../configs/te_dedicatedsignalling1ryctx_imssi.cfg z:/testdata/configs/te_dedicatedsignalling1ryctx_imssi.cfg
 ../configs/te_dedicatedsignalling1ryctx_nosid.cfg z:/testdata/configs/te_dedicatedsignalling1ryctx_nosid.cfg
+#endif //#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 
 ../scripts/te_dedicatedsignalling1ryctx_post401.script z:/testdata/scripts/te_dedicatedsignalling1ryctx.script
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networkingtestandutils/networkingintegrationtest/te_Sblp/configs/te_Sblp_Mesh_pdpcpr.cfg	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,1477 @@
+############################################################
+## HAND-GENERATED CONFIGURATION FILE
+## 
+## Start at the GlobalSettings table and ConnectionPreferences table
+############################################################
+
+############################################################
+## Network
+## 
+[Network]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Intranet
+	FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## ModemBearer
+## 
+[ModemBearer]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Loopback Modem
+	IfName=PPP
+	PortName=PKTLOOPBACK::502
+	TSYName=SIM
+	CSYName=PKTLOOPBACK
+	LastSocketActivityTimeout=6
+	LastSessionClosedTimeout=180
+	LastSocketClosedTimeout=10
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=0
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=AFTERDIALUNTILANSWER
+	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
+	Agent=NULLAGT
+	FIELD_COUNT=63
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Loopback_RawIP_1
+	IfName=RAWIP
+	PortName=PKTLOOPBACK::502
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Loopback_RawIP_3
+	IfName=RAWIP
+	PortName=PKTLOOPBACK::508
+	FIELD_COUNT=3
+END_ADD
+
+
+
+############################################################
+## LANBearer
+## 
+[LANBearer]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Assabet on-board Ethernet
+	IfName=ethint
+	LDDName=not used
+	PDDName=not used
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=-1
+	LastSocketClosedTimeout=-1
+	Agent=nullagent.agt
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## Location
+## 
+[Location]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Location
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=9
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Office
+	IntlPrefixCode=00
+	NatPrefixCode=0
+	NatCode=44
+	AreaCode=171
+	DialOutCode=9,
+	Mobile=FALSE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=Office Direct Dial
+	IntlPrefixCode=00
+	NatPrefixCode=0
+	NatCode=44
+	AreaCode=171
+	Mobile=FALSE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=Home
+	IntlPrefixCode=00
+	NatPrefixCode=0
+	NatCode=44
+	AreaCode=181
+	Mobile=FALSE
+	UsePulseDial=TRUE
+	WaitForDialTone=TRUE
+	PauseAfterDialout=0
+	FIELD_COUNT=10
+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
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=Dummy Mercury Chargecard
+	AccountNumber=0500800800,,12345678
+	Pin=****
+	LocalRule=HG
+	NatRule=J,K,0FG
+	IntlRule=HEFG
+	FIELD_COUNT=7
+END_ADD
+
+############################################################
+## GlobalSettings
+## 
+## links to Tier table
+## DefaultTier = 271064536 Tier1 ESock_IP NetworkTierManager
+## No defaultSnap - therefore 399 selection chosen
+##
+[GlobalSettings]
+ADD_TEMPLATE
+	DefaultTier=Link.TierTable.2048
+	FIELD_COUNT=1
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-1
+	ConnectionAttempts=2
+	RedialAttempts=3
+	SmsBearer=0
+	SmsReceiveMode=2
+	GPRSAttachMode=1
+	AcceptIncomingGprs=1
+	GPRSClassCBearer=GSM
+	ModemForDataAndFax=1
+	ModemForPhoneServicesAndSMS=1
+	LocationForDataAndFax=1
+	LocationForPhoneServicesAndSMS=1
+	MaxMBufHeap=41877760
+	DefaultNetwork=1
+	BearerAvailabilityCheckTSY=SIM
+	FIELD_COUNT=16
+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
+	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=28
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=NT RAS
+	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
+	LoginName=RasUser
+	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
+	BearerName=ASYNCHRONOUS
+	BearerSpeed=UNSPECIFIED
+	BearerCE=UNSPECIFIED
+	BearerType=CSD
+	ChannelCoding=UNSPECIFIED
+	Aiur=0
+	RequestedTimeSlots=0
+	MaximumTimeSlots=0
+	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=44
+END_ADD
+
+
+############################################################
+## 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
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Dial In CS ISP
+	UseLoginScript=FALSE
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=10
+END_ADD
+
+
+############################################################
+## OutgoingGPRS
+## 
+[OutgoingGPRS]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Outgoing GPRS
+	APN=Test
+	PDPType=IPV4
+	ReqPrecedence=2
+	ReqDelay=4
+	ReqReliability=3
+	ReqPeakThroughput=3
+	ReqMeanThroughput=31
+	MinPrecedence=2
+	MinDelay=4
+	MinReliability=3
+	MinPeakThroughput=3
+	MinMeanThroughput=31
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=RasUser
+	AuthRetries=1
+	IpNetMask=255.255.255.0
+	IpGateway=194.72.6.1
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.1.1
+	IpDNSAddrFromServer=FALSE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.51
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	UmtsR99QoSAndOn=1
+	FIELD_COUNT=32
+END_TEMPLATE
+
+ADD_SECTION
+##
+## Links from IAP table
+## Links to
+##
+# COMMDB_ID = 1
+	Id=1
+	Name=SPUD
+	PDPType=IPV4
+	IfParams=lowernif=RawIP
+	IfPromptForAuth=FALSE
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.1.1
+	IpDNSAddrFromServer=FALSE
+	FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## IncomingGPRS
+## 
+[IncomingGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Dummy Incoming GPRS Settings
+	APN=Test
+	PDPType=IPV4
+	PDPAddress=0.0.0.0
+	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
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.1.1
+	IpDNSAddrFromServer=FALSE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.51
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	FIELD_COUNT=30
+END_ADD
+
+
+############################################################
+## DefaultGPRS
+## 
+[DefaultGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Dummy Default GPRS Settings
+	Usage=1
+	APN=Access point name
+	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=20
+END_ADD
+
+############################################################
+## CDMA2000PacketServiceTable
+## 
+[CDMA2000PacketServiceTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	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=8KBPS
+	MinRevBitrate=8KBPS
+	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
+	RlpMode=UNKNOWN
+	CDMAMobileIP=FALSE
+	CDMAMobileIPTimeout=10000000
+	FIELD_COUNT=36
+END_ADD
+
+
+############################################################
+## LANService
+## 
+[LANService]
+ADD_SECTION
+# COMMDB_ID = 1
+	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=10
+END_ADD
+
+############################################################
+## APPrioritySelectionPolicyTable
+## 
+## Links from AccessPointTable
+## Links to the next layer in the AccessPointTable
+##
+[APPrioritySelectionPolicyTable]
+ADD_SECTION
+# COMMDB_ID = 1
+  	Id=1
+	Name=SelectionPolicy1
+	AP1=Link.AccessPointTable.10001
+	APCOUNT=1
+	FIELD_COUNT=4
+END_ADD
+
+############################################################
+## AccessPointTable
+## 
+## Links from TierTable
+## When 399 selection selected in GlobalSettings this Links to APPrioritySelectionPolicyTable
+## Bearer tier links to IAP table
+##
+[AccessPointTable]
+
+ADD_SECTION
+##
+## Links to IAP table
+## Links to nodes in bearer layer
+##  Id = 1 is IAP1
+##  SelectionPolicy zero marks the end of the 399 selection process
+## Consistent with spud-rawip BearerTypeTable entry
+##
+# COMMDB_ID = 251
+	Id=1
+	Name=MappedFromIAP1
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.8
+	CprConfig=1
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+	
+ADD_SECTION
+## 
+## Links to AccessPointTable next layer
+##	SelectionPolicy AccessPointTable entry 1 and IAP table entry 1
+##
+# COMMDB_ID = 253
+	Id=10001
+	Name=IPProtoDefault
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.2
+	CprConfig=1
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CustomSelectionPolicy=1
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+##
+## Links from TierTable
+## When 399 selection selected in GlobalSettings this Links to APPrioritySelectionPolicyTable
+##	Id 10000 linked from TierTable
+##	SelectionPolicy APPrioritySelectionPolicyTable entry 1
+##
+# COMMDB_ID = 254
+	Id=10000
+	Name=NetworkDefault
+	Tier=Link.TierTable.2048
+	MCpr=MCprTable.1
+	AccessPointSelectionPolicy=APPrioritySelectionPolicyTable.1
+	Cpr=CprTable.1
+	SCpr=SCprTable.1
+	Protocol=ProtocolTable.1
+	FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## BearerTypeTable
+## 
+## Links from ModemBearer table
+## Links to the bearer layer nodes
+## Consistent with the selected AccessPointTable
+##
+##
+[BearerTypeTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=ppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ethint
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.4
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.4
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=rawip
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=tunnelnif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.6
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.6
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=qosppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.7
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.7
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=dummynif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.8
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.8
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=hungrynif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.9
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.9
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=spud-ppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.4
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.3
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+##
+## Links from ModemBearer table
+## Links to bearer layer nodes
+## Consistent with the selected AccessPointTable
+##
+# COMMDB_ID = 9
+	Id=9
+	Name=spud-rawip
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.8
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	FIELD_COUNT=7
+END_ADD
+
+##This record here is the template record for the IPProto level APs generated by CommsDat.
+ADD_SECTION
+# COMMDB_ID = 10
+	##This name is a predefined name for the template for the IPProto APs.
+	##Please don't change it!
+	Name=IPProtoDefaultTemplate
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	FIELD_COUNT=6
+END_ADD
+
+
+############################################################
+## IAP
+## 
+## Linked from ConnectionPreferences
+## Links to several tables
+## OutgoingGPRS entry SPUD
+## ModemBearer entry 1 Null Modem 115200bps
+## 
+##
+[IAP]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=GPRS
+	IAPServiceType=OutgoingGPRS
+	IAPService=1
+	IAPBearerType=ModemBearer
+	IAPBearer=1
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=Location.1
+	FIELD_COUNT=9
+END_ADD
+
+############################################################
+## Proxies
+## 
+[Proxies]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-1
+	ISP=1
+	ProxyServiceType=DialOutISP
+	UseProxyServer=TRUE
+	ProxyServerName=www.dummyproxy.com
+	ProtocolName=http
+	PortNumber=80
+	Exceptions=www.dummyproxy.com/exception
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## WAPAccessPoint
+## 
+[WAPAccessPoint]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Dial In ISP
+	CurrentBearer=WAPIPBearer
+	FIELD_COUNT=3
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Dummy WAP Settings
+	CurrentBearer=WAPIPBearer
+	StartPage=www.wapstart.com
+	FIELD_COUNT=4
+END_ADD
+
+
+############################################################
+## WAPIPBearer
+## 
+[WAPIPBearer]
+ADD_TEMPLATE
+	Id=0
+	Name=DefaultRecordName-1
+	AccessPointId=0
+	IAP=0
+	WSPOption=CONNECTIONLESS
+	Security=FALSE
+	ProxyPortNumber=0
+	FIELD_COUNT=7
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-2
+	AccessPointId=58654976
+	GatewayAddress=www.wapgateway.com
+	IAP=50266624
+	WSPOption=CONNECTIONORIENTED
+	Security=FALSE
+	ProxyPortNumber=1
+	FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## WAPSMSBearer
+## 
+[WAPSMSBearer]
+ADD_TEMPLATE
+	Id=0
+	Name=DefaultRecordName-1
+	AccessPointId=0
+	WSPOption=CONNECTIONLESS
+	Security=FALSE
+	FIELD_COUNT=5
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-2
+	AccessPointId=1
+	GatewayAddress=+4412345678901
+	ServiceCentreAddress=+442071234567
+	WSPOption=CONNECTIONORIENTED
+	Security=FALSE
+	FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## 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
+
+############################################################
+## TierTable
+## 
+## Links from GlobalSettings
+## Links to AccessPointTable
+##
+[TierTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=2048
+	TierImplUid=271064536
+	Name=Tier1
+	TierThreadName=ESock_IP
+	TierManagerName=NetworkTierManager
+	DefaultAccessPoint=Link.AccessPointTable.10000
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=271064560
+	TierImplUid=271064560
+	Name=Tier2
+	TierThreadName=ESock_IP
+	TierManagerName=ProtoTierManager
+	DefaultAccessPoint=Link.AccessPointTable.10001
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=271064565
+	TierImplUid=271064565
+	Name=Tier3
+	TierThreadName=ESock_IP
+	TierManagerName=LinkTierManager
+##NB defaultAccessPoint not present in this layer. This is only needed here to satisfy the check
+##on the link layer. However important that once this field has a value it has to be linked to a
+##correct accesspoint record in the accesspoint table because this will be checked either.
+	DefaultAccessPoint=Link.AccessPointTable.1
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## MCprTable
+## 
+[MCprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=netmcpr
+	MCprUid=271009095
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipprotomcpr
+	MCprUid=271064558
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=pppmcpr
+	MCprUid=271064556
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=ethmcpr
+	MCprUid=271064572
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=rawipmcpr
+	MCprUid=271064576
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=tunnelmcpr
+	MCprUid=271064578
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=qospppmcpr
+	MCprUid=271064556
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=dummynifmcpr
+	MCprUid=271064580
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=9
+	Name=hungrynifmcpr
+	MCprUid=271064580
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Id=10
+	Name=pdpmcpr
+	MCprUid=271065840
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+	Id=11
+	Name=sipmcpr
+	MCprUid=536887801
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 12
+	Id=12
+	Name=btgenericmcpr
+	MCprUid=271070577
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 13
+	Id=13
+	Name=panethermcpr
+	MCprUid=271070626
+	FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## CprTable
+## 
+[CprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=ipcpr
+	CprUid=270561519
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipprotocpr
+	CprUid=271064531
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=agentcpr
+	CprUid=271064552
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=vanillacpr
+	CprUid=271065843
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=sipcpr
+	CprUid=271010872
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=avctpcpr
+	CprUid=271030184
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=tunnelagentcpr
+	CprUid=271080968
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=pdpcpr
+	CprUid=271065826
+	FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## SCprTable
+## 
+[SCprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=ipscpr
+	SCprUid=271065811
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipprotoscpr
+	SCprUid=271064529
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=agentscpr
+	SCprUid=271064554
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=pdpscpr
+	SCprUid=271065824
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=pppscpr
+	SCprUid=271065852
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=vanillascpr
+	SCprUid=271065844
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=qosscpr
+	SCprUid=271065811
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=sipscpr
+	SCprUid=271010839
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=9
+	Name=avctpsaplinksmgr
+	SCprUid=271030185
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Id=10
+	Name=avctpmuxer
+	SCprUid=271030186
+	FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## ProtocolTable
+## 
+[ProtocolTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=sapshim
+	ProtocolUid=270496898
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipshim4
+	ProtocolUid=271064118
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=ppp
+	ProtocolUid=271064143
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=ethernet
+	ProtocolUid=271064539
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=rawip
+	ProtocolUid=271064562
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=tunnel
+	ProtocolUid=271064567
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=qosppp
+	ProtocolUid=271064148
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=dummynif
+	ProtocolUid=271064123
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=9
+	Name=hungrynif
+	ProtocolUid=271064125
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Id=10
+	Name=panether
+	ProtocolUid=271070627
+	FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## ConnectionPreferences
+## 
+## Links to 
+## IAP = 1 - GPRS - IAPService = SPUD - ModemBearer - Null Modem 115200bps - IAPNetwork = 1
+## BearerSet=PSD
+##
+[ConnectionPreferences]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-1
+	Ranking=0
+	Direction=INCOMING
+	BearerSet=PSD
+	DialogPref=DONOTPROMPT
+	IAP=1
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=DefaultRecordName-2
+	Ranking=1
+	Direction=OUTGOING
+	BearerSet=PSD
+	DialogPref=DONOTPROMPT
+	IAP=1
+	FIELD_COUNT=7
+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
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=SECONDARY1
+	ReqTrafficClass=4
+	MinTrafficClass=4
+	ReqDeliveryOrder=1
+	MinDeliveryOrder=1
+	ReqDeliverErroneousSDU=8
+	MinDeliverErroneousSDU=8
+	ReqMaxSDUSize=768
+	MinAcceptableMaxSDUSize=512
+	ReqMaxUplinkRate=1024
+	ReqMinUplinkRate=1024
+	ReqMaxDownlinkRate=1024
+	ReqMinDownlinkRate=1024
+	ReqBER=0
+	MaxBER=0
+	ReqSDUErrorRatio=1
+	MaxSDUErrorRatio=1
+	ReqTrafficHandlingPriority=1
+	MinTrafficHandlingPriority=1
+	ReqTransferDelay=250
+	MaxTransferDelay=250
+	ReqGuaranteedUplinkRate=1024
+	MinGuaranteedUplinkRat=1024
+	ReqGuaranteedDownlinkRate=1024
+	MinGuaranteedDownlinkRate=1024
+	SignallingIndication=FALSE
+	ImCnSignallingIndication=FALSE
+	SourceStatisticsDescriptor=0
+	FIELD_COUNT=28
+END_ADD
+
+############################################################
+## PolicySelectorTable
+## 
+[PolicySelectorTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=DefaultRecordName-1
+	PolicyId=1
+	SrcAddress=0.0.0.0
+	SrcMask=255.255.255.255
+	DstAddress=192.168.1.1
+	DstMask=255.255.255.255
+	SrcPort=0
+	DstPort=3461
+	SrcPortMax=1031
+	DstPortMax=3461
+	ProtocolId=17
+	IAPid=2
+	Priority=1
+	FIELD_COUNT=13
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=DefaultRecordName-2
+	PolicyId=2
+	SrcPort=0
+	SrcPortMax=0
+	ProtocolId=1
+	IAPid=2
+	Priority=1
+	FIELD_COUNT=7
+END_ADD
+
+
+
--- a/networkingtestandutils/networkingintegrationtest/te_Sblp/group/bld.inf	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/te_Sblp/group/bld.inf	Thu Aug 19 11:25:30 2010 +0300
@@ -17,10 +17,18 @@
 
 PRJ_TESTEXPORTS
 
+
+#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
+../configs/te_Sblp_Mesh_pdpcpr.cfg	/epoc32/release/wins/udeb/z/testdata/configs/te_sblp_mesh.cfg
+../configs/te_Sblp_Mesh_pdpcpr.cfg	/epoc32/release/wins/urel/z/testdata/configs/te_sblp_mesh.cfg
+../configs/te_Sblp_Mesh_pdpcpr.cfg	/epoc32/release/winscw/udeb/z/testdata/configs/te_sblp_mesh.cfg
+../configs/te_Sblp_Mesh_pdpcpr.cfg	/epoc32/release/winscw/urel/z/testdata/configs/te_sblp_mesh.cfg
+#else
 ../configs/te_Sblp_Mesh.cfg	/epoc32/release/wins/udeb/z/testdata/configs/te_sblp_mesh.cfg
 ../configs/te_Sblp_Mesh.cfg	/epoc32/release/wins/urel/z/testdata/configs/te_sblp_mesh.cfg
 ../configs/te_Sblp_Mesh.cfg	/epoc32/release/winscw/udeb/z/testdata/configs/te_sblp_mesh.cfg
 ../configs/te_Sblp_Mesh.cfg	/epoc32/release/winscw/urel/z/testdata/configs/te_sblp_mesh.cfg
+#endif //#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 
 ../configs/te_SblpSuite_simtsy.txt	/epoc32/release/wins/udeb/z/testdata/configs/te_sblpsuite_simtsy.txt
 ../configs/te_SblpSuite_simtsy.txt	/epoc32/release/wins/urel/z/testdata/configs/te_sblpsuite_simtsy.txt
--- a/networkingtestandutils/networkingunittest/dummynif_params/group/dummynif_params.mmp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkingtestandutils/networkingunittest/dummynif_params/group/dummynif_params.mmp	Thu Aug 19 11:25:30 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
 #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
--- a/networkingtestandutils/networkingunittest/group/DummyNifProtos.mmp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkingtestandutils/networkingunittest/group/DummyNifProtos.mmp	Thu Aug 19 11:25:30 2010 +0300
@@ -47,10 +47,10 @@
 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
--- a/networkprotocols/dnsproxy/test/group/t_dnsproxy.mmp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/dnsproxy/test/group/t_dnsproxy.mmp	Thu Aug 19 11:25:30 2010 +0300
@@ -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
--- a/networkprotocols/dnsproxy/test/src/hacked_servers.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/dnsproxy/test/src/hacked_servers.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -70,6 +70,19 @@
 	TInt BuildServerList();
 	void AddServerAddress(const TName &aInterface, const TInetAddr &aAddr);
 	void LockByAddress(const TInetAddr &aAddr, TUint32 aNid, TDnsServerFilter &aFilter);
+    inline virtual void InterfaceSuffixList(TInt aServerId, RInetSuffixList& aSuffixList)
+        {
+        //dummy implementation
+        RInetSuffixList suffixList;
+        if (aServerId)
+        	aSuffixList = suffixList;
+        }
+    inline virtual void UpdateDomain(TDnsServerFilter &aFilter) const
+        {
+        //dummy implementation
+        if (aFilter.iServerId)
+            return;
+        }
 
 private:
 	// Build and add interface entry to the list (basic operation)
--- a/networkprotocols/iphook/inhook6/group/inhook6.mmp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/iphook/inhook6/group/inhook6.mmp	Thu Aug 19 11:25:30 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
--- a/networkprotocols/iphook/inhook6/inc/res_sock.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/iphook/inhook6/inc/res_sock.h	Thu Aug 19 11:25:30 2010 +0300
@@ -119,6 +119,7 @@
 	TUint16 iSession;	//< The session ID.
 	TInt iNext;			//< Next indicator: 0, 1, 2, ... (query), or the result (on reply)
 	TUint32 iId;		//< Address domain Id
+	TInt iFlowRequestType;	//< 0 for IMPLICIT; 1 for SUBCONNECTION EXPLICIT; 2 for CONNECTION EXPLICIT
 	};
 
 // Need write access to members, and just for this, need to derive all
--- a/networkprotocols/iphook/inhook6/include/in_bind.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/iphook/inhook6/include/in_bind.h	Thu Aug 19 11:25:30 2010 +0300
@@ -371,6 +371,10 @@
 	* the name servers or gateways. Some of the information comes from the neighbor 
 	* discovery or service location protocols.
 	*
+	* TSoInetInterfaceInfoExtnDnsSuffix structure can also be used for retreiving interface
+	* information if we need values for supplementary fields like the domain search list
+	* This support is available since Symbian OS vtb92 and later
+	*
 	* @param aIndex
 	*	previous index value, use ZERO to restart scan from beginning. <b>Note</b>: This
 	*	is not same as "interface index", which identifies a interface in the system.
@@ -560,6 +564,35 @@
 	* @return 			System-wide error code
 	*/
 	virtual TInt SetOption(TUint aLevel, TUint aName, const TDesC8 &aOption, MProvdSecurityChecker &aChecker) = 0;
+	/**
+	* Enumerates domain suffix information on an interface.
+	*
+	* This function identifies the active interface enumerated for reading 
+	* by the parameter aActiveEnumInterface
+	*
+	* It then identifies the last domain suffix read on this inteface by the parameter 
+	* aDomainSuffixIndex
+	* 
+	* To start, call first with aDomainSuffixIndex=0, and after that always give the previously 
+	* returned value as a parameter. When the return value is 0, all domain suffices
+	* have been listed.
+	*
+	* The domain suffix thus read is saved to the reference TInetSuffix object passed in as argument
+	*
+	* @param aActiveEnumInterface
+	*	previously indexed interface's name saved during enumeration done using KSoInetNextInterface
+	*	Can be used to enumerate on specific interface by passing the interface name
+	* @aDomainSuffixIndex
+	*	previous domain suffix index value, use ZERO to restart scan from beginning.
+	* @retval aInfo
+	*	returns the information about the domain suffix on the interface
+	*	at next index position of the list of domain suffices for that interface
+	* @return
+	*	@li = 0, if no next domain suffix exists
+	*	@li > 0, interface index, aInfo updated to describe this domain suffix in the list
+	*	@li = KErrNotFound, if interface does not exist (or) when no domain suffix available for the interface
+	*/	
+	virtual TInt DomainSuffixInfo(TName aActiveEnumInterface, TUint aDomainSuffixIndex, TInetSuffix &aInfo) = 0;
 	};
 
 
--- a/networkprotocols/tcpipv4v6prt/inc/inet.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/inc/inet.h	Thu Aug 19 11:25:30 2010 +0300
@@ -261,6 +261,8 @@
 	TUint iHeaderIncluded:1;	// If true, user sends datagram packets with IP header
 	TUint iSynchSend:1;			// If true, block socket write to UDP socket in PENDING and HOLD states
 	TInt iProtocolId;
+	TInt iDomainSuffixIndex;	// Interface domain suffix enumeration state
+	TName iActiveEnumInterface; // Name of the interface previously enumerated with option KSoInetNextInterface
 	};
 
 class TInet6SAPIter
--- a/networkprotocols/tcpipv4v6prt/inc/tcp.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/inc/tcp.h	Thu Aug 19 11:25:30 2010 +0300
@@ -517,6 +517,10 @@
 
 	// -1=linger disabled, >=0 linger enabled with given time in seconds.
 	TInt			iLinger;
+	
+	//Introduce specifically for Browser usecase where in Normal shutdown is expected to close with in certain time.
+    //current structure is using secs. This Bit will enable calculation in Mircosecs.
+    TBool           iMicroSecCalcFlag;
 
 	// Window scaling factor for the send window, advertised by the other end.
 	TUint8			iSndWscale:4;
--- a/networkprotocols/tcpipv4v6prt/src/iface.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/src/iface.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -617,7 +617,7 @@
 
     // Wrap a packet into ICMP error reply
     void IcmpSend(RMBufChain &aPacket, const TIcmpTypeCode aIcmp, const TUint32 aParameter = 0, const TInt aMC = 0);
-
+    
 private:
 #   ifdef WEAK_ES
     TUint32 IsForMe(const TIp6Addr &aAddr, const CIp6Interface *const aSrcIf,
@@ -667,9 +667,14 @@
     //
     void RemoveInterface(CIp6Interface *aIf);
     //
-    // Modify Inet Interface information (SetOption part!)
-    //
-    TInt InetInterfaceOption(TUint aName, const TSoInet6InterfaceInfo &aInfo);
+    // Modify Inet Interface information (SetOption part!) for TSoInet6InterfaceInfo input
+    //
+    TInt InetInterfaceOption(TUint aName, const TSoInet6InterfaceInfo &aInfo, const TInetSuffix* aDomainSuffix);
+    //
+    // Modify Inet Interface information (SetOption part!) for TSoInetInterfaceInfoExtnDnsSuffix input
+    // To support supplementary interface fields i.e. domain search list for an interface
+    //
+    TInt InetInterfaceOption(TUint aName, const TSoInetInterfaceInfoExtnDnsSuffix &aInfo);
     //
     // Query Interface Information
     //
@@ -790,7 +795,10 @@
     MDestinationCache *iDestinationCache;  //< Destination cache (for transport protocol params).
     
 public: // GCC doesn't compile Linkage, if this is private! -- msa
-    RTimeout iTimeout;                  //< Hook to the timer service (MTimeoutManager)
+    RTimeout iTimeout;					//< Hook to the timer service (MTimeoutManager)
+public:
+	// Enumerate domain suffices on an interface and read suffix name to the reference object passed in
+	virtual TInt DomainSuffixInfo(TName aActiveEnumInterface, TUint aDomainSuffixIndex, TInetSuffix &aDomainSuffix);
     };
 
 //
@@ -1863,6 +1871,11 @@
 #endif //SYMBIAN_TCPIPDHCP_UPDATE
 public: // GCC doesn't compile CIp6InterfaceLinkage, if this is private! -- msa
     RTimeout iTimeout;          //< Hook to the timer service (MTimeoutManager)
+private:
+    RInetSuffixList iSuffixList;	// Container to store list of optional domain search list on the interface
+private:
+	// Process SetOpt request for updating domain suffices based on the function mode set on the structure passed in
+	void ProcessDomainSuffixL(const TInetSuffix* aSuffix);
     };
 
 //
@@ -3412,6 +3425,15 @@
         TPckgBuf<TSoIfConnectionInfo> netinfo;
         netinfo().iIAPId = iRoute->iInterface.iScope[EScopeType_IAP];
         netinfo().iNetworkId = iRoute->iInterface.iScope[EScopeType_NET];
+
+   if(iInfo.iLockType == EScopeType_IAP  && iInfo.iLockId != netinfo().iIAPId)
+            {
+                iInfo.iLockId = netinfo().iIAPId;
+	#ifdef _LOG
+                 Log::Printf(_L("\t\tFlow[%u] Connect ConnectionInfo changed: Lock_type:%d, Lock_id:%d"),this,iInfo.iLockType, iInfo.iLockId); 
+	#endif
+            }
+
         Bearer(netinfo);
         RefreshFlow();
         return;
@@ -5535,13 +5557,13 @@
 */
 TInt CIp6Interface::SetId(TIp6AddressInfo &aId, const TIp6Addr &aAddr, const TInt aPrefix, const TInt aAddressType)
     {
-    // Should this also check whether address type is same?
-    // Changing just type does not work with this code!
-    // -- msa 24.10.2003
     if (aPrefix < 0 || aPrefix > 128)
         return 0;       // Invalid length, do nothing!
     if (TIp46Addr::Cast(aAddr).IsMulticast())
         return 0;       // A multicast address cannot be my own.
+    // Should this also check whether address type is same?
+    // Changing just type does not work with this code!
+    // -- msa 24.10.2003
     if (aId.IsSet() && aPrefix == aId.iPrefix && aAddr.IsEqual(aId.iId))
         {
 		// Id has not changed but expecting some change in any of 
@@ -7282,6 +7304,7 @@
     // are wasted on destructor. Should not cause
     // any problems... -- msa
     Reset();
+    iSuffixList.Close();
     LOG(Log::Printf(_L("\tIF %u [%S] Deleted"), iScope[0], &iName));
     }
 
@@ -9412,14 +9435,17 @@
 // **************************
 /**
 // Locate the next interface after aIndex and return the
-// information and assigned interface index.
-//
+// information and assigned interface index
+// The structure being used is a legacy type for retreiving basic information
+//
+// @param aIndex    index in the interface list after which we need extract the interface information
+// @param aInfo     Structure to store interface properties for the application layer to read
 // @return
 //  @li = 0, if no next interface exists
 //  @li > 0, interface index, aInfo updated to describe this interface
 */
 TUint CIp6Manager::InterfaceInfo(TUint aIndex, TSoInetInterfaceInfo &aInfo) const
-    {
+	{
     // ..yes, this is silly O(n!) (?) algorithm for scanning the interfaces. Each time
     // this is called, it has find and count all entries that come before the specified
     // aIndex.
@@ -9571,8 +9597,44 @@
             }
         }
     return 0;
-    }
-
+	}
+
+// CIp6Manager::DomainSuffixInfo
+// *****************************
+/**
+// Locate the next domain suffix after aDomainSuffixIndex on the interface with name aActiveEnumInterface
+// and return the information and assigned domain suffix index.
+// The structure being used is a new type for retreiving extended information
+//
+// @param aActiveEnumInterface  active interface name on which enumeration is to carried out
+// @param aDomainSuffixIndex    index in the domain suffix list after which we need extract the information
+// @param aInfoStructure 		to store domain suffix properties for the application layer to read
+// @return
+//  @li = 0, if no next domain suffix exists
+//  @li > 0, interface index, aInfo updated to describe this domain suffix in the list
+//	@li = KErrNotFound, if interface does not exist (or) when no domain suffix available for the interfce
+*/
+TInt CIp6Manager::DomainSuffixInfo(TName aActiveEnumInterface, TUint aDomainSuffixIndex, TInetSuffix &aDomainSuffix)
+    {
+	CIp6Interface* iface = FindInterface(aActiveEnumInterface);
+	
+    if (iface == NULL)
+    	{
+    	return KErrNotFound;
+		}
+    	
+	TInt count = iface->iSuffixList.Count();
+	if(count == 0 || count < aDomainSuffixIndex)
+		return KErrNotFound;
+		
+	if (count == aDomainSuffixIndex)    	
+		return 0;
+		
+	aDomainSuffix.Copy(iface->iSuffixList[aDomainSuffixIndex]);
+    aDomainSuffix.iDomainSuffixFunction = EInetFunctionUndefined;
+    
+    return ++aDomainSuffixIndex;
+    }
 
 TInt CIp6Manager::GetInterfaces(TDes8& aOption) const
     {
@@ -9989,9 +10051,10 @@
 
 // CIp6Manager::InetInterfaceOption
 // ********************************
-// Modify Inet Interface information (SetOption part)
-//
-TInt CIp6Manager::InetInterfaceOption(TUint aName, const TSoInet6InterfaceInfo &aInfo)
+// Modify Inet Interface information (SetOption part!) for TSoInet6InterfaceInfo input
+// For maintaining backward compatibility
+//
+TInt CIp6Manager::InetInterfaceOption(TUint aName, const TSoInet6InterfaceInfo &aInfo, const TInetSuffix* aDomainSuffix)
     {
     #ifdef _LOG
         TBuf<39> addressStr;
@@ -10148,6 +10211,15 @@
         iface->iSMtu = iface->iRMtu = iface->iPMtu = aInfo.iMtu;
     if (aInfo.iSpeedMetric > 0)
         iface->iSpeedMetric = aInfo.iSpeedMetric;
+
+	// Copy the domain search list (if any) to the interface object
+	if (aDomainSuffix)
+		{
+		TRAPD(err, iface->ProcessDomainSuffixL(aDomainSuffix));
+		if (err != KErrNone)
+			return err;
+		}
+    	
     if (aInfo.iDoState)
         {
         if (aInfo.iState == EIfDown)
@@ -10265,6 +10337,51 @@
     return KErrNone;
     }
 
+// CIp6Manager::ProcessDomainSuffixL
+// *********************************
+// Process SetOpt calls with TSoInetInterfaceInfoExtnDnsSuffix which contains
+// domain suffix information for the interface in form of TInetSuffix structure
+// This function is responsible to perform domain suffix updates (i.e. add/delete/deleteall)
+// to the interface based on the operation mode specified in the structure
+void CIp6Interface::ProcessDomainSuffixL(const TInetSuffix* aSuffix)
+	{
+	if (aSuffix->iDomainSuffixFunction == EInetAddSuffix)
+		{
+		// Perform addition of the incoming suffix name to the list maintained by interface object
+		iSuffixList.AppendL(aSuffix->iSuffixName);
+		TSuffixName tmpBuf;
+		tmpBuf.Copy(iSuffixList[iSuffixList.Count()-1]);
+		LOG(Log::Printf( _L( "Added domain suffix to interface %S - %S"), &iName, &tmpBuf));
+		}
+	else if(aSuffix->iDomainSuffixFunction == EInetDeleteSuffix)
+		{
+		// Perform deletion of the suffix name from the list of suffices in the interface object
+		TInt pos;
+		pos = iSuffixList.Find(aSuffix->iSuffixName);
+		User::LeaveIfError(pos);
+		TSuffixName tmpBuf;
+		tmpBuf.Copy(iSuffixList[pos]);
+		iSuffixList.Remove(pos);
+		LOG(Log::Printf( _L( "Removed domain suffix from interface %S - %S"), &iName, &tmpBuf));
+		}
+	else if (aSuffix->iDomainSuffixFunction == EInetDeleteAllSuffixes)
+		{
+		// Flush out all the suffix entries in the interface
+		iSuffixList.Reset();
+		LOG(Log::Printf( _L( "Removed all domain suffix from interface %S"), &iName));
+		}
+	}
+
+// CIp6Manager::InetInterfaceOption
+// ******************************** 
+// Modify Inet Interface information (SetOption part!) for TSoInetInterfaceInfoExtnDnsSuffix input
+// To support supplementary fields i.e. domain search list on an interface
+//
+TInt CIp6Manager::InetInterfaceOption(TUint aName, const TSoInetInterfaceInfoExtnDnsSuffix &aInfo)
+    {
+    return InetInterfaceOption(aName, (TSoInet6InterfaceInfo)aInfo, &aInfo.iDomainSuffix);
+    }
+
 //
 // CIpManager::InterfaceOption
 // ***************************
@@ -10404,10 +10521,18 @@
         if (aName == KSoIpv4LinkLocal &&
                 aOption.Length() == sizeof(TSoInetIpv4LinkLocalInfo))
             return SetIpv4LinkLocalOption((TSoInetIpv4LinkLocalInfo &)ref);
-        
-        if (aOption.Length() != sizeof(TSoInet6InterfaceInfo))
+        if (aOption.Length() == sizeof(TSoInet6InterfaceInfo))
+            {
+			// if the SetOpt() requested with TSoInet6InterfaceInfo structure (legacy)
+            return InetInterfaceOption(aName, (TSoInet6InterfaceInfo &)ref, NULL);
+            }
+        else if (aOption.Length() == sizeof(TSoInetInterfaceInfoExtnDnsSuffix))
+			{
+			// if the SetOpt() requested with new TSoInetInterfaceInfoExtnDnsSuffix structure
+            return InetInterfaceOption(aName, (TSoInetInterfaceInfoExtnDnsSuffix &)ref);
+			}
+        else
             return KErrArgument;
-        return InetInterfaceOption(aName, (TSoInet6InterfaceInfo &)ref);
         }
     else if (aLevel == KSOLInterface)
         {
--- a/networkprotocols/tcpipv4v6prt/src/inet.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/src/inet.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -360,9 +360,17 @@
 		if (aName == STATIC_CAST(TUint, KSoInetEnumInterfaces))	// See *NOTE* above!
 			{
 			iInterfaceIndex = 0;
+			
 			LOG(Log::Printf(_L("SetOpt\t%S SAP[%u] KSoInetEnumInterfaces"), &ProtocolName(), (TInt)this));
 			return KErrNone;
 			}
+		if (aName == STATIC_CAST(TUint, KSoInetEnumDomainSuffix))	// See *NOTE* above!
+			{
+			iDomainSuffixIndex = 0;
+			
+			LOG(Log::Printf(_L("SetOpt\t%S SAP[%u] KSoInetEnumDomainSuffix"), &ProtocolName(), (TInt)this));
+			return KErrNone;
+			}
 		}
 	else if (aLevel == KSolInetRtCtrl)
 		{
@@ -419,11 +427,27 @@
 		(void) new (&opt) TSoInetInterfaceInfo;	// Make sure descriptors are correct.
 		aOption.SetLength(sizeof(TSoInetInterfaceInfo));
 		((CProviderInet6Base *)this)->iInterfaceIndex = iProtocol->Interfacer()->InterfaceInfo(iInterfaceIndex, opt);
+		((CProviderInet6Base *)this)->iActiveEnumInterface.Copy(opt.iName);
+		
 		if (iInterfaceIndex > 0)
 			return KErrNone;
 		else
 			return KErrNotFound;
 		}
+    else if (aLevel == KSolInetIfCtrl && aName == STATIC_CAST(TUint, KSoInetNextDomainSuffix))
+        {
+		TInetSuffix& opt = *(TInetSuffix*)aOption.Ptr();
+        if (STATIC_CAST(TUint, aOption.MaxLength()) < sizeof(TInetSuffix))
+			return KErrTooBig;
+        (void) new (&opt) TInetSuffix; // Make sure descriptors are correct.
+        aOption.SetLength(sizeof(TInetSuffix));
+        ((CProviderInet6Base *)this)->iDomainSuffixIndex = iProtocol->Interfacer()->DomainSuffixInfo(iActiveEnumInterface, iDomainSuffixIndex, opt);
+        
+        if (iDomainSuffixIndex > 0)
+            return KErrNone;
+        else
+            return KErrNotFound;
+        }
 	else if (aLevel == KSolInetRtCtrl && aName == STATIC_CAST(TUint, KSoInetNextRoute))	// See *NOTE* above!
 		{
 		TSoInetRouteInfo& opt = *(TSoInetRouteInfo*)aOption.Ptr();
--- a/networkprotocols/tcpipv4v6prt/src/res.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/src/res.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -268,6 +268,8 @@
 public:
 	void NoDndAvailable();
 	RTimeout iTimeout;
+private:
+	TInt iFlowRequestType;         //< = 0 for IMPLICIT, 1 for SUBCONNECTION EXPLICIT, 2 for EXPLICIT
 	};
 
 //	CHostResolverLinkage
@@ -1169,6 +1171,8 @@
 	// Complete the request with network id
 	//
 	iRequest.iId = iCurrentId;
+	// Set the flow request type to the DND request message
+	iRequest.iFlowRequestType = iFlowRequestType;
 #ifdef SYMBIAN_DNS_PUNYCODE
 	iRequest.iScope |= EScopeType_NET;
 #else
@@ -1216,14 +1220,18 @@
 				return KErrArgument;
 				}
 			}
-		else
-		if (aName == static_cast<TUint>(KSoGetErrorCode))
+		else if (aName == static_cast<TUint>(KSoGetErrorCode))
 			{
 			// Return a TCP/IP failure code appropriate to the last operation.
 			// Kludge - SetOption does not allow for any return value via aOption (being const), so
 			// return a positive value representing the error code.
 			return (iRequest.iType == KDnsRequestType_GetByAddress) ? -KErrDndAddrNotFound : -KErrDndNameNotFound;
 			}
+		else if (aName == KSoFlowRequestType)
+		    {
+			// Receive the flow request passed on from esock layer to the resolver
+            iFlowRequestType = *reinterpret_cast<const TInt*>(aOption.Ptr());
+		    }
       	}
 
 #else
--- a/networkprotocols/tcpipv4v6prt/src/tcp.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/src/tcp.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -92,6 +92,11 @@
 	iRecvBuf = GetIniValue(TCPIP_INI_TCP, TCPIP_INI_TCP_RECV_BUF,
 			KTcpDefaultRcvWnd, KTcpMinimumWindow, KTcpMaximumWindow, ETrue); 
 	
+#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
+	iRecvBufFromIniFile = GetIniValue(TCPIP_INI_TCP, TCPIP_INI_TCP_RECV_BUF,
+            KTcpDefaultRcvWnd, KTcpMinimumWindow, KTcpMaximumWindow, ETrue); 
+#endif //SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
+	
 	iSendBuf = GetIniValue(TCPIP_INI_TCP, TCPIP_INI_TCP_SEND_BUF,
 			KTcpDefaultSndWnd, KTcpMinimumWindow, KTcpMaximumWindow, ETrue);
 
@@ -258,6 +263,13 @@
 #ifdef _LOG
 		LogPacket('<', seg, info, info->iOffset);
 		pkt.Set(seg, info->iOffset, pkt.iHdr->HeaderLength()); // LogPacket() may have realigned the header.
+
+		if (!pkt.iHdr)
+			{
+			LOG(Log::Printf(_L("\ttcp Process() header alignment failed. Packet discarded")));
+			seg.Free();
+			return;
+			}
 #endif
 
 		// Verify TCP checksum
--- a/networkprotocols/tcpipv4v6prt/src/tcp_sap.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/src/tcp_sap.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -140,7 +140,8 @@
 //  state chart above. It would be located between CLOSED and SYN-SENT.
 //
 
-
+//The below is UID of the client(http client) using this option. We are not exposing this right now...
+const TUint32 KSoTcpLingerinMicroSec = 0x101F55F6;
 #ifdef _LOG
 const TText *CProviderTCP6::TcpState(TUint aState)
 	{
@@ -260,6 +261,13 @@
 	iRetransTimer->InitL();
 	iLingerTimer->InitL();
 	iSockInBufSize        = Protocol()->RecvBuf();
+#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
+	if(iSockInBufSize == Protocol()->RecvBufFromIniFile())
+	    iSocketStartupCase = ETrue;
+	else
+	    iSocketStartupCase = EFalse;
+#endif //SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW    	
+	
 	iSockOutBufSize       = Protocol()->SendBuf();
 	iSsthresh		= KMaxTInt32;
 	iRTO			= Protocol()->InitialRTO();
@@ -619,48 +627,137 @@
                 iSockInBufSize = KTcpMinimumWindow;
             else
                 {
-
-		        //If new TCP window is larger then the previous window, increase the 
-		        //iSockInBufSize right now. TCP recv function takes  care of
-		        //advertising a new effective TCP window. 
-		            if (intValue >= iSockInBufSize)
-		                {
-		                //Make it Zero so TCP could avoid the
-		                //TCP window shrinking processing in Recv.  
-		                iNewTcpWindow = 0;
-		                //FreeWindow has to be increased at the same time.
-		                iFreeWindow += intValue - iSockInBufSize;
-		                // Make the new TCP receive buffer change effective now.
-		                iSockInBufSize = intValue;                                                          
-		                }
-		            else
-		                {
-		                //This sets iNewTcpWindow to a non-zero value, which indicates 
-		                //to the TCP that window is shrunk and process TCP segments
-		                //which are in air before setting a new TCP receive buffer.         
-		                //TCP Receive window starts moving only when TCP hidden window
-		                //size exceeds the size of the shrunk window.
-		                   
-		                iNewTcpWindow = intValue;
-		                //Even in case of window shrink we can set the receive buffer size
-		                //immediately. This will be helpful, for processing SYN-ACK and other
-		                //receiver side processing.
-		                //For already connected sockets iNewTcpWindow will be taking care
-		                //of shrinking the window size for that TCP session.
-		                iSockInBufSize = iNewTcpWindow;
-		                if( iAdvertisedWindow > iNewTcpWindow )
-		                    {
-		                    iShrinkedWindowSize = iAdvertisedWindow - iNewTcpWindow;
-		                    }
-		                else
-		                    {
-		                    // No Need to process TCP receive window processing.
-		                    iNewTcpWindow = 0;
-		                    }
-		                }
-					
-                } 
-
+                //If its the startup case, then there should be no algorithm used to shrink
+				//or expand the window size from the default value provided in the ini file
+                //the new value should be set directly
+                if(iSocketStartupCase)
+                    {
+					//Add the extra window to free window pool
+					//if the window being set is greater than what is specified in ini file (startup case), then just overwrite the new window.
+					//Add difference to free window
+					//else set free window to zero
+					if(intValue > iSockInBufSize)
+						iFreeWindow += intValue - iSockInBufSize;
+					else
+						iFreeWindow = 0;
+					//set the buffer
+                    iSockInBufSize = intValue;
+					//disable startup flag.
+                    iSocketStartupCase = EFalse;
+                    }
+                else 
+                {
+					// Check for minimum value
+	                if (intValue < STATIC_CAST(TInt, KTcpMinimumWindow))
+	                    {
+	                    intValue = STATIC_CAST(TInt, KTcpMinimumWindow);
+	                    }
+	                // Handle the situation where the connection has been established and 
+	                // window scaling is not in use
+	                if ( InState( ETcpSynReceived | ETcpEstablished ) && !iRcvWscale )
+	                    {
+	                    // Do not allow window sizes larger than 0xFFFF
+	                    intValue = Min ( intValue, 0xFFFF );
+	                    }
+
+	                // Check whether we are increasing or decreasing window size
+	                if ( intValue >= iSockInBufSize )
+	                    {
+	                    // New window is larger than current one, check if a
+	                    // shrinking process is active
+	                    if ( !iNewTcpWindow )
+	                        {
+	                        // Mark new "space" as free, it will be updated to
+	                        // peer on next operation.
+	                        iFreeWindow += intValue - iSockInBufSize;
+	                        }
+	                    else
+	                        {
+	                        // In the middle of shrinking process.
+                      if ( iShrinkedWindowSize <= ( intValue - iSockInBufSize ))
+	                            {
+	                            // Increment to window size is enough to complete
+	                            // shrinking process. Update variables and exit
+	                            // from shrinking process.
+                          iFreeWindow = ( intValue - iSockInBufSize ) - iShrinkedWindowSize;
+	                            iShrinkedWindowSize = 0;
+	                            iNewTcpWindow = 0;
+	                            }
+	                        else
+	                            {
+	                            // Not quite there yet but closer. Less to shrink,
+	                            // update this, but do not exit from shrinking
+	                            // process
+                          iShrinkedWindowSize -= intValue - iSockInBufSize;
+	                            iNewTcpWindow = intValue;
+	                            }
+	                        }
+	                    }
+	                else
+	                    {
+	                    // Requested window is smaller than current one. Start or
+	                    // continue shrinking process. RCV window can be occupied
+	                    // for two different purpose at the moment
+	                    // 1. Client data in iSockInQ not read by application
+	                    // 2. Free window "opened" to peer (iAdvertisedWindow)
+	                    // When shrinking, we must ensure that when reopening
+	                    // the window to client there must be truly empty space
+	                    // in the window. Thus, freeze the right edge of the
+	                    // window (iRCV.NXT + iRCV.WND stays constant) until
+	                    // shrinking is completed.
+	                
+	                    if ( iNewTcpWindow )
+	                        {
+	                        // There is an ongoing shrink process, add the
+	                        // change to the amount to be shrinked
+	                        iShrinkedWindowSize += iSockInBufSize - intValue;
+	                        iNewTcpWindow = intValue;
+	                        }
+	                    else
+	                        {
+	                        // This is a new shrinking process, count how much
+	                        // needs to be shrinked
+                      iShrinkedWindowSize = iSockInQLen + iRCV.WND;
+	                        if ( iShrinkedWindowSize >= intValue )
+	                            {
+	                            // We need to shrink since the currently occupied
+	                            // window does not fit to new one
+	                            iShrinkedWindowSize -= intValue;
+	                            // There is now free space in the window
+	                            iFreeWindow = 0;
+	                            // iNewTcpWindow is used as a state variable for
+	                            // shrinking
+	                            iNewTcpWindow = intValue;
+	                            }
+	                        else
+	                            {
+	                            // No need to shrink since we can fit the current
+	                            // contents to the new window, update free window
+	                            // If TCP connection is not yet setup, the free
+	                            // window will be updated on connection setup, 
+	                            // for existing connection it will be used
+	                            // next time application reads data
+	                            if ( iFreeWindow >= ( iSockInBufSize - intValue ))
+	                                {
+	                                iFreeWindow -= iSockInBufSize - intValue;
+	                                }
+	                            else 
+	                                {
+	                                // Something wrong. Try to reevaluate...
+	                                iFreeWindow = intValue - iShrinkedWindowSize;
+	                                }
+	                            iShrinkedWindowSize = 0;
+	                            }
+	                        }
+	                    }
+	                // Even in case of window shrink we can set the receive buffer size
+	                // immediately. This will be helpful, for processing SYN-ACK and other
+	                // receiver side processing.
+	                // For already connected sockets iNewTcpWindow will be taking care
+	                // of shrinking the window size for that TCP session.
+	                iSockInBufSize = intValue;
+	                }
+	            } 
 		    }
 		    break;
 #endif //SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
@@ -695,6 +792,11 @@
 				}
 			break;
 
+		case KSoTcpLingerinMicroSec:
+            RDebug::Printf("TSoTcpLingerinMicroSec is set");
+            //Enable micro sec calculation for TCP linger timer. User (currently just exposed to browser)
+            //will specify linger time in microsecs. 
+            iMicroSecCalcFlag=ETrue;           
 		case KSoTcpLinger:
 			if (aOption.Length() < (TInt)sizeof(TSoTcpLingerOpt))
 				{
@@ -1102,7 +1204,16 @@
 			// Start linger timer. RSocket::Close() returns when timer
 			// expires or when all data has been succesfully transmitted.
 			//
-			iLingerTimer->Start(iLinger * KOneSecondInUs);
+		    if(iMicroSecCalcFlag)
+                {
+                //expecting iLinger timer to be specified in microsec.This will be set currently by browser where in
+                //it is expected to be close with in certian time
+                iLingerTimer->Start(iLinger * 1);
+                }
+            else
+                {
+                iLingerTimer->Start(iLinger * KOneSecondInUs);
+                }			
 			}
 		SchedTransmit();
 
@@ -1362,32 +1473,23 @@
 	//if This is true, then it is a case of TCP window shrink and we need 
 	//to handle it.
 	if ( iNewTcpWindow )
-		{
-	   	//Log  this message for information, that Window is shrinked
-	   	LOG(Log::Printf(_L("\ttcp SAP[%u] TCP window shrinking mode on"), (TInt)this));
-	   
-	   	//Increase the hidden free TCP receive window.
-	   	iHiddenFreeWindow += aLength;
-	   
-	   	if (iHiddenFreeWindow >= iShrinkedWindowSize)
-			{
-			//Disable window shrink processing, so that TCP could switch
-			//to the normal processing.    
-			iSockInBufSize = iNewTcpWindow;
-			
-			//Add the usable window to the free window.
-			iFreeWindow += iHiddenFreeWindow - iShrinkedWindowSize;
-			
-			//There are chances that TCP receive window might further shrink.
-			iHiddenFreeWindow = 0;
-			
-			//TCP Receive window shrink phase is over.
-			iNewTcpWindow = 0;
-			
-			//Log  this message for information, that Window is shrinked
-			LOG(Log::Printf(_L("\ttcp SAP[%u] TCP window shrinking mode off"), (TInt)this));
-			}
-		}
+	    {
+	    // Check if we can complete shrinking process
+	    if ( aLength > iShrinkedWindowSize )
+	        {
+	        // We can exit from the shrinking process. Reset variables and
+	        // update free window.
+	        iFreeWindow = aLength - iShrinkedWindowSize;
+	        iShrinkedWindowSize = 0;
+	        iNewTcpWindow = 0;
+	        }
+	    else
+	        {
+	        // Substract the needed shrinking amount by the amount of bytes client
+	        // read from the buffer
+	        iShrinkedWindowSize -= aLength;
+	        }
+	    }
 	else
 #endif //SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 	
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_edge.txt	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_edge.txt	Thu Aug 19 11:25:30 2010 +0300
@@ -14,7 +14,7 @@
 # ContextConfigGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <PdpDataCompression>, <TAnonymousAccess>, <TUseEdge>
 # ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
 # <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
-SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
+SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_gprs.txt	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_gprs.txt	Thu Aug 19 11:25:30 2010 +0300
@@ -14,7 +14,7 @@
 # ContextConfigGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <PdpDataCompression>, <TAnonymousAccess>, <TUseEdge>
 # ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
 # <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
-SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
+SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_hsdpa.txt	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_hsdpa.txt	Thu Aug 19 11:25:30 2010 +0300
@@ -14,7 +14,7 @@
 # ContextConfigGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <PdpDataCompression>, <TAnonymousAccess>, <TUseEdge>
 # ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
 # <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
-SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
+SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_umts.txt	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_umts.txt	Thu Aug 19 11:25:30 2010 +0300
@@ -14,7 +14,7 @@
 # ContextConfigGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <PdpDataCompression>, <TAnonymousAccess>, <TUseEdge>
 # ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
 # <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
-SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
+SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_edge_gprs_config.txt	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_edge_gprs_config.txt	Thu Aug 19 11:25:30 2010 +0300
@@ -14,7 +14,7 @@
 # ContextConfigGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <PdpDataCompression>, <TAnonymousAccess>, <TUseEdge>
 # ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
 # <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
-SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
+SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
@@ -167,11 +167,11 @@
 #NotifyContextStatusChange = SECONDARY1, 0, 5
 
 #Edge
-NetworkMode= 2,2
-DynamicCaps= 2,1024
+NetworkMode= 5,2
+DynamicCaps= 5,1024
 
 #Gprs
-NetworkMode= 12,2
-DynamicCaps= 2,1
+NetworkMode= 10,2
+DynamicCaps= 10,1
 # DynamicCaps= <Duration>, <DynamicCaps>
 # Note: <DynamicCaps> is a bitmap of RPacketService::TDynamicCaps flags. 
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_edge_hsdpa_config.txt	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_edge_hsdpa_config.txt	Thu Aug 19 11:25:30 2010 +0300
@@ -14,7 +14,7 @@
 # ContextConfigGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <PdpDataCompression>, <TAnonymousAccess>, <TUseEdge>
 # ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
 # <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
-SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
+SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
@@ -167,12 +167,12 @@
 #NotifyContextStatusChange = SECONDARY1, 0, 5
 
 #Edge
-NetworkMode= 2,2
-DynamicCaps= 2,1024
+NetworkMode= 5,2
+DynamicCaps= 5,1024
 
 #Hsdpa
-NetworkMode= 12,6
-DynamicCaps= 2,512
+NetworkMode= 10,6
+DynamicCaps= 10,512
 
 # DynamicCaps= <Duration>, <DynamicCaps>
 # Note: <DynamicCaps> is a bitmap of RPacketService::TDynamicCaps flags. 
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_edge_umts_config.txt	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_edge_umts_config.txt	Thu Aug 19 11:25:30 2010 +0300
@@ -14,7 +14,7 @@
 # ContextConfigGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <PdpDataCompression>, <TAnonymousAccess>, <TUseEdge>
 # ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
 # <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
-SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
+SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
@@ -167,11 +167,11 @@
 #NotifyContextStatusChange = SECONDARY1, 0, 5
 
 #Edge
-NetworkMode= 2,2
-DynamicCaps= 2,1024
+NetworkMode= 5,2
+DynamicCaps= 5,1024
 
 #Umts
-NetworkMode= 12,6
-DynamicCaps= 2,1  
+NetworkMode= 10,6
+DynamicCaps= 10,1  
 # DynamicCaps= <Duration>, <DynamicCaps>
 # Note: <DynamicCaps> is a bitmap of RPacketService::TDynamicCaps flags. 
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_gprs_edge_config.txt	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_gprs_edge_config.txt	Thu Aug 19 11:25:30 2010 +0300
@@ -14,7 +14,7 @@
 # ContextConfigGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <PdpDataCompression>, <TAnonymousAccess>, <TUseEdge>
 # ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
 # <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
-SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
+SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
@@ -167,12 +167,12 @@
 #NotifyContextStatusChange = SECONDARY1, 0, 5
 
 #Gprs
-NetworkMode= 2,2
-DynamicCaps= 2,1
+NetworkMode= 5,2
+DynamicCaps= 5,1
 
 #Edge
-NetworkMode= 12,2
-DynamicCaps= 2,1024  
+NetworkMode= 10,2
+DynamicCaps= 10,1024  
 
 # DynamicCaps= <Duration>, <DynamicCaps>
 # Note: <DynamicCaps> is a bitmap of RPacketService::TDynamicCaps flags. 
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_gprs_hsdpa_config.txt	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_gprs_hsdpa_config.txt	Thu Aug 19 11:25:30 2010 +0300
@@ -14,7 +14,7 @@
 # ContextConfigGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <PdpDataCompression>, <TAnonymousAccess>, <TUseEdge>
 # ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
 # <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
-SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
+SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
@@ -167,11 +167,11 @@
 #NotifyContextStatusChange = SECONDARY1, 0, 5
 
 #Gprs
-NetworkMode= 2,2
-DynamicCaps= 2,1
+NetworkMode= 5,2
+DynamicCaps= 5,1
 
 #Hsdpa
-NetworkMode= 12,6
-DynamicCaps= 2,512  
+NetworkMode= 10,6
+DynamicCaps= 10,512  
 # DynamicCaps= <Duration>, <DynamicCaps>
 # Note: <DynamicCaps> is a bitmap of RPacketService::TDynamicCaps flags. 
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_gprs_umts_config.txt	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_gprs_umts_config.txt	Thu Aug 19 11:25:30 2010 +0300
@@ -14,7 +14,7 @@
 # ContextConfigGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <PdpDataCompression>, <TAnonymousAccess>, <TUseEdge>
 # ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
 # <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
-SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
+SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
@@ -167,12 +167,12 @@
 #NotifyContextStatusChange = SECONDARY1, 0, 5
 
 #Gprs
-NetworkMode= 2,2
-DynamicCaps= 2,1
+NetworkMode= 5,2
+DynamicCaps= 5,1
 
 #Umts
-NetworkMode= 12,6
-DynamicCaps= 2,1 
+NetworkMode= 10,6
+DynamicCaps= 10,1 
 
 # DynamicCaps= <Duration>, <DynamicCaps>
 # Note: <DynamicCaps> is a bitmap of RPacketService::TDynamicCaps flags. 
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_hsdpa_edge_config.txt	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_hsdpa_edge_config.txt	Thu Aug 19 11:25:30 2010 +0300
@@ -14,7 +14,7 @@
 # ContextConfigGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <PdpDataCompression>, <TAnonymousAccess>, <TUseEdge>
 # ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
 # <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
-SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
+SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
@@ -167,11 +167,11 @@
 #NotifyContextStatusChange = SECONDARY1, 0, 5
 
 #Hsdpa
-NetworkMode= 2,6
-DynamicCaps= 2,512
+NetworkMode= 5,6
+DynamicCaps= 5,512
 
 #Edge
-NetworkMode= 12,2
-DynamicCaps= 2,1024
+NetworkMode= 10,2
+DynamicCaps= 10,1024
 # DynamicCaps= <Duration>, <DynamicCaps>
 # Note: <DynamicCaps> is a bitmap of RPacketService::TDynamicCaps flags. 
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_hsdpa_gprs_config.txt	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_hsdpa_gprs_config.txt	Thu Aug 19 11:25:30 2010 +0300
@@ -14,7 +14,7 @@
 # ContextConfigGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <PdpDataCompression>, <TAnonymousAccess>, <TUseEdge>
 # ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
 # <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
-SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
+SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
@@ -167,11 +167,11 @@
 #NotifyContextStatusChange = SECONDARY1, 0, 5
 
 #Hsdpa
-NetworkMode= 2,2
-DynamicCaps= 2,512
+NetworkMode= 5,2
+DynamicCaps= 5,512
 
 #Gprs
-NetworkMode= 12,2
-DynamicCaps= 2,1  
+NetworkMode= 10,2
+DynamicCaps= 10,1  
 # DynamicCaps= <Duration>, <DynamicCaps>
 # Note: <DynamicCaps> is a bitmap of RPacketService::TDynamicCaps flags. 
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_hsdpa_umts_config.txt	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_hsdpa_umts_config.txt	Thu Aug 19 11:25:30 2010 +0300
@@ -14,7 +14,7 @@
 # ContextConfigGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <PdpDataCompression>, <TAnonymousAccess>, <TUseEdge>
 # ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
 # <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
-SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
+SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
@@ -167,11 +167,11 @@
 #NotifyContextStatusChange = SECONDARY1, 0, 5
 
 #Hsdpa
-NetworkMode= 2,2
-DynamicCaps= 2,512
+NetworkMode= 5,2
+DynamicCaps= 5,512
 
 #Umts
-NetworkMode= 12,6
-DynamicCaps= 2,1
+NetworkMode= 10,6
+DynamicCaps= 10,1
 # DynamicCaps= <Duration>, <DynamicCaps>
 # Note: <DynamicCaps> is a bitmap of RPacketService::TDynamicCaps flags. 
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_umts_edge_config.txt	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_umts_edge_config.txt	Thu Aug 19 11:25:30 2010 +0300
@@ -14,7 +14,7 @@
 # ContextConfigGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <PdpDataCompression>, <TAnonymousAccess>, <TUseEdge>
 # ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
 # <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
-SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
+SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
@@ -167,12 +167,12 @@
 #NotifyContextStatusChange = SECONDARY1, 0, 5
 
 #Umts
-NetworkMode= 2,6
-DynamicCaps= 2,1
+NetworkMode= 5,6
+DynamicCaps= 5,1
 
 #Edge
-NetworkMode= 12,2
-DynamicCaps= 2,1024  
+NetworkMode= 10,2
+DynamicCaps= 10,1024  
 
 # DynamicCaps= <Duration>, <DynamicCaps>
 # Note: <DynamicCaps> is a bitmap of RPacketService::TDynamicCaps flags. 
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_umts_gprs_config.txt	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_umts_gprs_config.txt	Thu Aug 19 11:25:30 2010 +0300
@@ -14,7 +14,7 @@
 # ContextConfigGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <PdpDataCompression>, <TAnonymousAccess>, <TUseEdge>
 # ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
 # <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
-SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
+SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
@@ -167,11 +167,11 @@
 #NotifyContextStatusChange = SECONDARY1, 0, 5
 
 #Umts
-NetworkMode= 2,6
-DynamicCaps= 2,1
+NetworkMode= 5,6
+DynamicCaps= 5,1
 
 #Gprs
-NetworkMode= 12,2
-DynamicCaps= 2,1  
+NetworkMode= 10,2
+DynamicCaps= 10,1  
 # DynamicCaps= <Duration>, <DynamicCaps>
 # Note: <DynamicCaps> is a bitmap of RPacketService::TDynamicCaps flags. 
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_umts_hsdpa_config.txt	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_umts_hsdpa_config.txt	Thu Aug 19 11:25:30 2010 +0300
@@ -14,7 +14,7 @@
 # ContextConfigGPRS = <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <PdpDataCompression>, <TAnonymousAccess>, <TUseEdge>
 # ProtocolConfigOption = <Authentication Protocol>, <Username>, <Password>, <Challenge>, 
 # <Response>, <PrimaryDNS>, <SecondaryDNS>, <TUint iId>
-SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
+SetContextConfigGPRS = 0,orangeinternet,,0,2,0,1,web,web,,,192.168.20.2,192.168.10.2,1,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
@@ -167,11 +167,11 @@
 #NotifyContextStatusChange = SECONDARY1, 0, 5
 
 #Umts
-NetworkMode= 2,6
-DynamicCaps= 2,1
+NetworkMode= 5,6
+DynamicCaps= 5,1
 
 #Hsdpa
-NetworkMode= 12,6
-DynamicCaps= 2,512 
+NetworkMode= 10,6
+DynamicCaps= 10,512 
 # DynamicCaps= <Duration>, <DynamicCaps>
 # Note: <DynamicCaps> is a bitmap of RPacketService::TDynamicCaps flags. 
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_edge_gprs.script	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_edge_gprs.script	Thu Aug 19 11:25:30 2010 +0300
@@ -81,7 +81,7 @@
 //Retrieve the TCP Window size for EDGE
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketEGPRS
 
-DELAY 20000
+DELAY 7000
 
 //Retrieve the TCP Window size for GPRS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketGPRS
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_edge_gprs_user_set.script	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_edge_gprs_user_set.script	Thu Aug 19 11:25:30 2010 +0300
@@ -84,7 +84,7 @@
 //User does a SetOpt( ) with own value
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketSetOptionStep  z:\testdata\configs\te_tcpip6AdapWnd.ini UserSetOptOnSocketEGPRS
 
-DELAY 20000
+DELAY 7000
 //Bearer changing to GPRS
 PRINT Bearer changing to GPRS
 
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_edge_hsdpa.script	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_edge_hsdpa.script	Thu Aug 19 11:25:30 2010 +0300
@@ -80,7 +80,7 @@
 //Retrieve the TCP Window size for EDGE
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketEGPRS
 
-DELAY 20000
+DELAY 7000
 
 //Retrieve the TCP Window size for HSDPA
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketHSDPA
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_edge_umts.script	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_edge_umts.script	Thu Aug 19 11:25:30 2010 +0300
@@ -81,7 +81,7 @@
 //Retrieve the TCP Window size for EDGE
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketEGPRS
 
-DELAY 20000
+DELAY 7000
 
 //Retrieve the TCP Window size for UMTS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketUMTS
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_gprs_edge.script	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_gprs_edge.script	Thu Aug 19 11:25:30 2010 +0300
@@ -81,7 +81,7 @@
 //Retrieve the TCP Window size for GPRS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketGPRS
 
-DELAY 20000
+DELAY 7000
 
 //Retrieve the TCP Window size for EDGE
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketEGPRS
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_gprs_hsdpa.script	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_gprs_hsdpa.script	Thu Aug 19 11:25:30 2010 +0300
@@ -81,7 +81,7 @@
 //Retrieve the TCP Window size for GPRS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketGPRS
 
-DELAY 20000
+DELAY 7000
 
 //Retrieve the TCP Window size for HSDPA
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketHSDPA
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_gprs_umts.script	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_gprs_umts.script	Thu Aug 19 11:25:30 2010 +0300
@@ -80,7 +80,7 @@
 //Retrieve the TCP Window size for GPRS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketGPRS
 
-DELAY 20000
+DELAY 7000
 
 //Retrieve the TCP Window size for UMTS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketUMTS
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_hsdpa_edge.script	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_hsdpa_edge.script	Thu Aug 19 11:25:30 2010 +0300
@@ -81,7 +81,7 @@
 //Retrieve the TCP Window size for HSDPA
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketHSDPA
 
-DELAY 20000
+DELAY 7000
 
 //Retrieve the TCP Window size for EDGE
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketEGPRS
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_hsdpa_gprs.script	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_hsdpa_gprs.script	Thu Aug 19 11:25:30 2010 +0300
@@ -80,7 +80,7 @@
 //Retrieve the TCP Window size for HSDPA
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketHSDPA
 
-DELAY 20000
+DELAY 7000
 
 //Retrieve the TCP Window size for GPRS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketGPRS
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_hsdpa_umts.script	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_hsdpa_umts.script	Thu Aug 19 11:25:30 2010 +0300
@@ -81,7 +81,7 @@
 //Retrieve the TCP Window size for HSDPA
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketHSDPA
 
-DELAY 20000
+DELAY 7000
 
 //Retrieve the TCP Window size for UMTS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketUMTS
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_umts_edge.script	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_umts_edge.script	Thu Aug 19 11:25:30 2010 +0300
@@ -81,7 +81,7 @@
 //Retrieve the TCP Window size for UMTS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketUMTS
 
-DELAY 20000
+DELAY 7000
 
 //Retrieve the TCP Window size for EDGE
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketEGPRS
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_umts_gprs.script	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_umts_gprs.script	Thu Aug 19 11:25:30 2010 +0300
@@ -80,7 +80,7 @@
 //Retrieve the TCP Window size for UMTS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketUMTS
 
-DELAY 20000
+DELAY 7000
 
 //Retrieve the TCP Window size for GPRS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketGPRS
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_umts_hsdpa.script	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_umts_hsdpa.script	Thu Aug 19 11:25:30 2010 +0300
@@ -81,7 +81,7 @@
 //Retrieve the TCP Window size for UMTS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketUMTS
 
-DELAY 20000
+DELAY 7000
 
 //Retrieve the TCP Window size for HSDPA
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketHSDPA
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_edge_gprs.script	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_edge_gprs.script	Thu Aug 19 11:25:30 2010 +0300
@@ -81,7 +81,7 @@
 //Retrieve the TCP Window size for GPRS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketEGPRS
 
-DELAY 20000
+DELAY 7000
 
 //Retrieve the TCP Window size for EDGE
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketGPRS
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_edge_hsdpa.script	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_edge_hsdpa.script	Thu Aug 19 11:25:30 2010 +0300
@@ -81,7 +81,7 @@
 //Retrieve the TCP Window size for EDGE
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketEGPRS
 
-DELAY 20000
+DELAY 7000
 
 //Retrieve the TCP Window size for HSDPA
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketHSDPA
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_edge_umts.script	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_edge_umts.script	Thu Aug 19 11:25:30 2010 +0300
@@ -81,7 +81,7 @@
 //Retrieve the TCP Window size for Edge
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketEGPRS
 
-DELAY 20000
+DELAY 7000
 
 //Retrieve the TCP Window size for Umts
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketUMTS
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_gprs_edge.script	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_gprs_edge.script	Thu Aug 19 11:25:30 2010 +0300
@@ -81,7 +81,7 @@
 //Retrieve the TCP Window size for GPRS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketGPRS
 
-DELAY 20000
+DELAY 7000
 
 //Retrieve the TCP Window size for EDGE
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketEGPRS
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_gprs_hsdpa.script	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_gprs_hsdpa.script	Thu Aug 19 11:25:30 2010 +0300
@@ -81,7 +81,7 @@
 //Retrieve the TCP Window size for GPRS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketGPRS
 
-DELAY 20000
+DELAY 7000
 
 //Retrieve the TCP Window size for HSDPA
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketHSDPA
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_gprs_umts.script	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_gprs_umts.script	Thu Aug 19 11:25:30 2010 +0300
@@ -81,7 +81,7 @@
 //Retrieve the TCP Window size for GPRS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketGPRS
 
-DELAY 20000
+DELAY 7000
 
 //Retrieve the TCP Window size for UMTS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketUMTS
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_hsdpa_edge.script	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_hsdpa_edge.script	Thu Aug 19 11:25:30 2010 +0300
@@ -81,7 +81,7 @@
 //Retrieve the TCP Window size for HSDPA
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketHSDPA
 
-DELAY 20000
+DELAY 7000
 
 //Retrieve the TCP Window size for EDGE
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketEGPRS
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_hsdpa_gprs.script	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_hsdpa_gprs.script	Thu Aug 19 11:25:30 2010 +0300
@@ -81,7 +81,7 @@
 //Retrieve the TCP Window size for HSDPA
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketHSDPA
 
-DELAY 20000
+DELAY 7000
 
 //Retrieve the TCP Window size for GPRS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketGPRS
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_hsdpa_umts.script	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_hsdpa_umts.script	Thu Aug 19 11:25:30 2010 +0300
@@ -81,7 +81,7 @@
 //Retrieve the TCP Window size for HSDPA
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketHSDPA
 
-DELAY 20000
+DELAY 7000
 
 //Retrieve the TCP Window size for UMTS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketUMTS
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_umts_edge.script	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_umts_edge.script	Thu Aug 19 11:25:30 2010 +0300
@@ -81,7 +81,7 @@
 //Retrieve the TCP Window size for UMTS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketUMTS
 
-DELAY 20000
+DELAY 7000
 
 //Retrieve the TCP Window size for EDGE
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketEGPRS
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_umts_gprs.script	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_umts_gprs.script	Thu Aug 19 11:25:30 2010 +0300
@@ -81,7 +81,7 @@
 //Retrieve the TCP Window size for UMTS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketUMTS
 
-DELAY 20000
+DELAY 7000
 
 //Retrieve the TCP Window size for GPRS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketGPRS
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_umts_hsdpa.script	Thu Jul 15 20:25:02 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_umts_hsdpa.script	Thu Aug 19 11:25:30 2010 +0300
@@ -81,7 +81,7 @@
 //Retrieve the TCP Window size for UMTS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketUMTS
 
-DELAY 20000
+DELAY 7000
 
 //Retrieve the TCP Window size for HSDPA
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketHSDPA
--- a/networksecurity/ipsec/group/bld.inf	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/ipsec/group/bld.inf	Thu Aug 19 11:25:30 2010 +0300
@@ -21,6 +21,7 @@
 #include "../ipseccrypto/group/bld.inf"
 #include "../ipsec_itest/group/bld.inf"
 #include "../te_ipsec/group/bld.inf"
+#include "../te_ipsec_selector_confilict/group/bld.inf"
 
 PRJ_EXPORTS
 ipsec.iby		/epoc32/rom/include/ipsec.iby
--- a/networksecurity/ipsec/ipsec6/group/ipsec6.mmp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/ipsec/ipsec6/group/ipsec6.mmp	Thu Aug 19 11:25:30 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"
@@ -54,6 +54,8 @@
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 LIBRARY         euser.lib esock.lib esocksvr.lib mbufmgr.lib insock.lib inhook6.lib cryptospi.lib
+LIBRARY		featdiscovery.lib
+
 
 VENDORID	0x70000001
 CAPABILITY CommDD PowerMgmt ReadDeviceData WriteDeviceData TrustedUI ProtServ NetworkControl NetworkServices LocalServices ReadUserData WriteUserData
--- a/networksecurity/ipsec/ipsec6/inc/sa_spec.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/ipsec/ipsec6/inc/sa_spec.h	Thu Aug 19 11:25:30 2010 +0300
@@ -51,6 +51,10 @@
 // Final selector, do not look for "merge" selectors after this.
 const TUint KPolicyFilter_FINAL = 0x20;
 
+//Exception flag for policy filter. This flag will allow only exception scope traffic and drop rest
+//special usecase for UMA traffic.
+const TUint KPolicyFilter_Exception = 0x40;
+
 /**
 * Ports is present in selector.
 * The value indicates whether the content is actual port (1) or a packet
--- a/networksecurity/ipsec/ipsec6/inc/spdb.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/ipsec/ipsec6/inc/spdb.h	Thu Aug 19 11:25:30 2010 +0300
@@ -156,6 +156,9 @@
 	TUint32 iFilterData;				//< The filter definition.
 	CTransportSelector *iTS;			//< The transport selectors.
 	RPolicyActions iActions;			//< The actions, when selector matches
+
+	TInt iScope_Exception;				// UMA scope exception
+
 	};
 
 class CSecurityPolicy : public CBase
--- a/networksecurity/ipsec/ipsec6/src/sc_prt6.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/ipsec/ipsec6/src/sc_prt6.cpp	Thu Aug 19 11:25:30 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"
@@ -16,6 +16,8 @@
 // performing IPSEC checking and processing to packets.
 //
 
+#include <featdiscovery.h>
+#include <featureuids.h>
 
 #include <posthook.h>
 #include <icmp6_hdr.h>
@@ -377,6 +379,9 @@
 	void CheckPacketId(RMBufHookPacket &aPacket);
 	TInt CheckFragmentPolicy();
 
+	void CheckExceptionSelector(TBool &aException_flag) const; //To support UMA
+	void CheckFeatureSupportL(TUid aFeature); //To check a Feature is enabled or not
+
 	MAssociationManager *iAssociationManager;
 	CProtocolIpsec *iProtocolIpsec;
 	MEventService *iEventService;
@@ -398,6 +403,7 @@
 	RIpAddress iMyself[KIpsecMaxNesting];		//< Related destination adresses (outer).
 	// List of incomplete fragmented packets.
 	CIpsecFragmentInfo *iFrags;					//< Unfinished fragments.
+	TBool iIPSecGANSupported; //To check whether FF_IPSEC_UMA_SUPPORT_ENABLE is defined and UMA supported
 
 	};
 
@@ -663,6 +669,17 @@
 	default:
 		break;
 		}
+	//UMA support REQ417-40027
+	switch (aPS.iFilterData & KPolicyFilter_Exception)
+	    {
+	    case KPolicyFilter_Exception:
+	        buf.Append(_L("UMAExceptionTrafficSelector"));
+	        break;
+
+	    default:
+	        break;
+	    }
+
 	if (aPS.iInterface)
 		buf.AppendFormat(_L("if=%d "), aPS.iInterface->iInterfaceIndex);
 	for (CTransportSelector *ts = aPS.iTS; ts != NULL; ts = ts->iOr)
@@ -1098,6 +1115,23 @@
 	TInt result = EIpsec_NoSelectorMatch;
 	aTunnels = 0;
 	TInt i = 0;
+	
+	//UMA support REQ417-40027
+   TBool exception_flag = EFalse;
+   TBool exception_drop_flag = EFalse;
+   
+   
+   if (iIPSecGANSupported)
+       {
+      //Check for exception selector being loaded or not. This is required for Drop mode policy
+      //If policy is set as 
+      //                  inbound = drop
+      //                  outbound = drop
+      // then instead returning Excetion selectors should be checked.
+       CheckExceptionSelector(exception_flag);
+       }
+   
+
 	for (CPolicySelector *ps = iPolicy->iSelectors; ps != NULL; ps = ps->iNext)
 		{
 		// 1. Check filtering
@@ -1108,7 +1142,17 @@
 		if (ps->iTS == NULL || ps->iTS->Match(aKey))
 			{
 			if (ps->iFilterData & KPolicyFilter_DROP)
-				return EIpsec_NoSelectorMatch;
+                {
+                // UMA support REQ 417-40027
+                if (iIPSecGANSupported && exception_flag)
+			       {
+                    //Work around for Exceptions                
+                    exception_drop_flag = ETrue;
+                    break;	
+			       }
+
+                return EIpsec_NoSelectorMatch;
+                }
 
 			const TInt N = ps->iActions.Count();
 			for (TInt k = 0; k < N; k++)
@@ -1135,15 +1179,77 @@
 					if (aSrc)
 						aSrc[aTunnels] = aKey.iLocal;
 					aTunnels++;
-					}
-				}
-			result = i;
-			if (ps->iFilterData & KPolicyFilter_FINAL)
-				break;	// Final selector, no merge allowed!
-			aFilter.iFlags |= KPolicyFilter_MERGE;	// Mark "merge only".
-			}
-		}
-	return result;
+                    }//if action
+                }//for
+//UMA support REQ417-40027
+            if(iIPSecGANSupported)
+                {
+                    if(!exception_drop_flag)
+         	  		{
+                    //Check if drop mode is set with exception selectors...out from this result loop
+                    //and jump onto Expection selector handling.
+                    result = i;
+                    if (ps->iFilterData & KPolicyFilter_FINAL)
+                        break;  // Final selector, no merge allowed!
+                    aFilter.iFlags |= KPolicyFilter_MERGE;  // Mark "merge only".
+     				}
+                }
+            else
+                {
+            result = i;
+            if (ps->iFilterData & KPolicyFilter_FINAL)
+                break;  // Final selector, no merge allowed!
+            aFilter.iFlags |= KPolicyFilter_MERGE;  // Mark "merge only".
+                }
+            }
+          }
+	if (iIPSecGANSupported)
+	    {
+    if (result == EIpsec_NoSelectorMatch && exception_flag)
+        {
+        // No selector matches above. Check for Exception selector     
+        for (CPolicySelector *ps = iPolicy->iSelectors; ps != NULL; ps = ps->iNext)
+            {
+            if(((ps->iFilterData & KPolicyFilter_Exception) !=  KPolicyFilter_Exception))
+                {
+                //Skip till Exception selector is loaded 
+                continue;
+                }//if
+            else
+                {
+                if (ps->iInterface && ps->iInterface->iInterfaceIndex != aFilter.iIndex)
+                    {
+                    continue; ////Sanity Check;
+                    }
+                if(aFilter.iFlags & KPolicyFilter_OUTBOUND )
+                    {
+                    //Check for Scopes for packet going out. Scope should be the tunnel end networkID configured for Tunnel need Exception
+                    TIpAddress iAddr = aKey.iLocal();
+                    TInt scope = iAddr.iScope;
+                    if(scope == ps->iScope_Exception)
+                        {
+                        LOG(Log::Printf(_L("Exception outbound- \n exception scope = %d\n, packet scope = %d\n"), ps->iScope_Exception, scope));
+                        result = NULL;
+                        break;
+                        }
+                    }//outbound filter
+                if(aFilter.iFlags & KPolicyFilter_INBOUND)
+                    {
+                    //TODO comments
+                    TIpAddress iAddr = aKey.iRemote();
+                    TInt scope = iAddr.iScope;
+                    if(scope== ps->iScope_Exception)
+                        {
+                        LOG(Log::Printf(_L("Exception inbound- \n exception scope = %d\n ,packet scope = %d\n"), ps->iScope_Exception, scope));
+                        result = NULL;
+                        break;
+                        }
+                    }//INBOUND
+                }//else            
+            }//for
+            }//exception CHECK
+        }///if (iIPSecGANSupported)
+		return result;
 	}
 
 
@@ -1216,7 +1322,7 @@
 	iPktInfo.iRemote.Set(aHead.ip6.DstAddr(), aHead.iDstId);
 
 	CPolicyAction *items[KIpsecMaxNesting];		// Collected actions [0..count-1]
-
+	
 	TInt tunnels = 0;
 	LOG(LogSelectorInfo(_L("OpenL\t"), iPktInfo, filter));
 	RPolicySelectorInfo final_info = iPktInfo;
@@ -1983,6 +2089,9 @@
 			}
 		// Not an ICMP or normal ICMP, do the policy check with current info
 		}
+
+    //Check for the UMA feature support
+    CheckFeatureSupportL(NFeature::KFeatureIdFfIpsecUmaSupportEnable);
 	for (;;)
 		{
 		CPolicyAction *items[KIpsecMaxNesting];
@@ -2241,6 +2350,10 @@
 			LogPolicySelector(seq, *ps);
 			if (ps->iFilterData & KPolicyFilter_DROP)
 				Log::Printf(_L("\t\t*DROP*"));
+			//UMA support REQ417-40027
+			if(ps->iFilterData & KPolicyFilter_Exception)
+			    Log::Printf(_L("\t\t = { UMAException %d }"),ps->iScope_Exception);
+				
 			else if (N == 0)
 				Log::Printf(_L("\t\t*PASS*"));
 			else
@@ -2302,3 +2415,44 @@
 			copy.Free();
 			}
 	}
+
+void CProtocolSecpol::CheckFeatureSupportL(TUid aFeature)
+    {
+    // Check Gan support from feature manager
+    iIPSecGANSupported = CFeatureDiscovery::IsFeatureSupportedL(aFeature);
+    if(iIPSecGANSupported != (TInt)ETrue)
+		{
+		LOG(Log::Printf(_L("CProtocolSecpol::CheckFeatureSupport Error Checking Feature Support ")));
+		}
+		else
+		{
+		LOG(Log::Printf(_L("CProtocolSecpol::CheckFeatureSupport %d Feature Supported %d"),aFeature,iIPSecGANSupported));
+		}
+    }
+
+//UMA support
+//Check for exception selector being loaded or not. This is required for Drop mode policy
+ //If policy is set as 
+ //                  inbound = drop
+ //                  outbound = drop
+ // then instead returning Excetion selectors should be checked.
+void CProtocolSecpol::CheckExceptionSelector(TBool &aException_flag) const
+    {
+    aException_flag = EFalse;
+    if(iIPSecGANSupported)
+        {
+         for(CPolicySelector *policy_Exception = iPolicy->iSelectors; policy_Exception != NULL ; policy_Exception = policy_Exception->iNext)
+           {
+           if(((policy_Exception->iFilterData & KPolicyFilter_Exception) ==  KPolicyFilter_Exception))
+               {
+               aException_flag = ETrue;
+               break;
+               }//if
+           }//for
+         }//if
+    else
+        {
+         LOG(Log::Printf(_L("CProtocolSecpol::CheckExceptionSelector  Feature is not Supported")));
+        }
+    }
+
--- a/networksecurity/ipsec/ipsec6/src/spdb.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/ipsec/ipsec6/src/spdb.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -20,14 +20,16 @@
 /**
  @file spdb.cpp
 */
+#include <featdiscovery.h>
+#include <featureuids.h>
+#include <networking/pfkeyv2.h>
+#include <networking/ipsecerr.h>
+#include <e32std.h>
+
+#include "sa_spec.h"
 #include "epdb.h"
 #include "spdb.h"
-#include <networking/pfkeyv2.h>
-#include "sa_spec.h"
-#include <networking/ipsecerr.h>
-#ifdef SYMBIAN_IPSEC_VOIP_SUPPORT
-#include <e32std.h>
-#endif // SYMBIAN_IPSEC_VOIP_SUPPORT
+
 #ifndef OLD_SELECTOR_ORDERING
 /** @deprecated
 * The old syntax allowed total mixing of "filter" and "selector"
@@ -166,7 +168,10 @@
 	void SetAddressOrEndPointL(RIpAddress &aAddr, TInt aMask, TInt aError);
 	void ParseAddressL(RIpAddress &aAddr, TInt aMask, TInt aError);
 	void ParseAddressAndMaskL(RIpAddress &aAddr, RIpAddress& aMask);
+	void ParseSecurityBundleL(RPolicyActions &aBundle, CTransportSelector *aTS, CPolicySelector* aPs);//UMA support 
 	void ParseSecurityBundleL(RPolicyActions &aBundle, CTransportSelector *aTS);
+	void CheckFeatureSupportL(TUid aFeature);
+	
 #ifdef SYMBIAN_IPSEC_VOIP_SUPPORT
 	void ParseAssociationParametersL(CPolicySpec *aSpec);
 #else 
@@ -183,9 +188,12 @@
 	token_type CheckProposalCloseAndMoreProposals(TInt &aPropBraces);
 	CSecurityProposalSpec* CreateProposalL(CPropList& aPropList);
 #endif //SYMBIAN_IPSEC_VOIP_SUPPORT
+
+private:
 	TPtrC iToken;			//< The current token.
 	CSecurityPolicy *iSp;	//< The result of the parsing operation, The new policy
 	REndPoints &iEp;		//< The End Point collection to use for the named endpoints.
+	TBool iIPSecGANSupported; //To check whether FF_IPSEC_UMA_SUPPORT_ENABLE is defined and UMA supported
 	};
 
 #ifdef SYMBIAN_IPSEC_VOIP_SUPPORT
@@ -856,18 +864,140 @@
 #endif // SYMBIAN_IPSEC_VOIP_SUPPORT
 	}
 
+/**
+* Parse security actions
+* @code [ sa-name '(' [ address ] ')' ]* '}'
+* @endcode
+*
+* Parse a (possibly empty) list of references to security specifications. This will
+* be the bundle of security actions for a selector.
+*
+* @retval aActions The colleted actions
+* @param aTS The traffic selector.
+* @param aPS the policy selector
+* * This is called only when UMA/ GAN is supported.
+*/
+void TParser::ParseSecurityBundleL(RPolicyActions &aActions, CTransportSelector *aTS, CPolicySelector *aPs)
+    {
+    
+    LOG(Log::Printf(_L("TParser::ParseSecurityBundleL(RPolicyActions &aActions, CTransportSelector *aTS, CPolicySelector *aPs)")));
+          
+    if(iIPSecGANSupported)
+        {
+        LOG(Log::Printf(_L("TParser::ParseSecurityBundleL: UMA supported FF_IPSEC_UMA_SUPPORT_ENABLE defined")));
+        }
+    else
+        {
+        LOG(Log::Printf(_L("TParser::ParseSecurityBundleL:functionality not suppoted.FF_IPSEC_UMA_SUPPORT_ENABLE not defined")));
+        User::Leave(KErrNotSupported);
+        }
+    
+    _LIT(K_tunnel,  "tunnel");
+
+    token_type val;
+
+    TUint opt = 0;
+    _LIT(K_Exception,  "UMAException");//UMA exception defined
+    for (;;)
+        {
+        val = NextToken();
+        //
+        // Experimental addition, allow optional bundle items
+        // by prefixing them with '?'...
+        //
+        if (opt == 0 && val == token_question)
+            {
+            opt = 1;
+            continue;
+            }
+        else if (val != token_string)
+            break;
+        // A temporary(?) special kluge: if the keyword is 'tunnel'
+        // assume this is a plain tunnel specification, without any
+        // relation to the IPSEC. if nobody defined a "tunnel" sa
+        // specification. (should probably disallow 'tunnel' as SA
+        // spec name, to avoid confusion.. )
+        //
+        CPolicySpec *spec = iSp->FindSpec(iToken);
+
+        if(spec== NULL && !iToken.Compare(K_Exception))
+            {
+            LOG(Log::Printf(_L("Found Exception Policy identifier")));
+            //FInd Next token... Things looks hacky here. IPsec really need re-designing.
+            TInt tokenVal = (TInt)NextToken();
+            LOG(Log::Printf(_L("NextToken value is = [%d]"),tokenVal));
+            
+            TBuf8<32> buf;
+            buf.Copy(iToken);
+            TLex8 lex(buf);
+            TInt scope;
+            lex.Val(scope);
+            
+            //assiging scope to the policy. This will be policy selector with Exception scope being setalong with
+            //exception flags
+            aPs->iScope_Exception = scope;
+            LOG(Log::Printf(_L("TParser::ParseSecurityBundleL, Exception tunnel Scope is = [%d]"),scope));
+            while((val = NextToken())!= token_brace_right)
+                {
+                //do nothing 
+                }  //while    
+            break;
+            }
+
+        // A temporary(?) special kluge: if the keyword is 'tunnel'
+        // assume this is a plain tunnel specification, without any
+        // relation to the IPSEC. if nobody defined a "tunnel" sa
+        // specification. (should probably disallow 'tunnel' as SA
+        // spec name, to avoid confusion.. )
+        //
+        if (spec == NULL && iToken.Compare(K_tunnel) != 0)
+            User::Leave(EIpsec_PolicySpecNotFound);
+
+        if (NextToken() != token_par_left)
+            User::Leave(EIpsec_PolicyLeftParen);
+
+        CPolicyAction *action = new (ELeave) CPolicyAction;
+        if (aActions.Append(action) != KErrNone)
+            {
+            action->Close();
+            User::Leave(KErrNoMemory);
+            }
+        if ((action->iSpec = spec) != NULL)
+            spec->Open();
+        // Record the current selector into each action (this is to make it
+        // easier to generate the TS list into Acquire message).
+        if ((action->iTS = aTS) != NULL)
+            aTS->Open();
+        action->iOptional = opt;
+
+        if ((val = NextToken()) == token_string)
+            {
+            SetAddressOrEndPointL(action->iTunnel, 0, EIpsec_PolicyInvalidIpAddress);
+            action->iIsTunnel = 1;  // Flag a tunnel.
+            val = NextToken();
+            }
+        if (val != token_par_right)
+            User::Leave(EIpsec_PolicyRightParen);
+        opt = 0;        // Optional only affects single item at time.
+        }
+    if (val != token_brace_right)
+        User::Leave(EIpsec_PolicyCloseBraceExpected);
+    }
+
+/**
+* Parse security actions
+* @code [ sa-name '(' [ address ] ')' ]* '}'
+* @endcode
+*
+* Parse a (possibly empty) list of references to security specifications. This will
+* be the bundle of security actions for a selector.
+*
+* @retval aActions The colleted actions
+* @param aTS The traffic selector.
+* This is called in case of No UMA/ GAN support.
+*/ 
 void TParser::ParseSecurityBundleL(RPolicyActions &aActions, CTransportSelector *aTS)
-	/**
-	* Parse security actions
-	* @code [ sa-name '(' [ address ] ')' ]* '}'
-	* @endcode
-	*
-	* Parse a (possibly empty) list of references to security specifications. This will
-	* be the bundle of security actions for a selector.
-	*
-	* @retval aActions The colleted actions
-	* @param aTS The traffic selector.
-	*/
+//#endif
 	{
 	_LIT(K_tunnel,	"tunnel");
 
@@ -896,6 +1026,13 @@
 		// spec name, to avoid confusion.. )
 		//
 		CPolicySpec *spec = iSp->FindSpec(iToken);
+
+        // A temporary(?) special kluge: if the keyword is 'tunnel'
+        // assume this is a plain tunnel specification, without any
+        // relation to the IPSEC. if nobody defined a "tunnel" sa
+        // specification. (should probably disallow 'tunnel' as SA
+        // spec name, to avoid confusion.. )
+        //
 		if (spec == NULL && iToken.Compare(K_tunnel) != 0)
 			User::Leave(EIpsec_PolicySpecNotFound);
 
@@ -1142,6 +1279,7 @@
 		KEYWORD("merge"),
 		KEYWORD("outbound"),
 		KEYWORD("inbound"),
+		KEYWORD("UMAExceptionTrafficSelector"), //UMA support
 		KEYWORD("if"),
 		};
 
@@ -1151,6 +1289,7 @@
 		KEYENUM(merge),
 		KEYENUM(outbound),
 		KEYENUM(inbound),
+		KEYENUM(UMAExceptionTrafficSelector),//exception bits
 		KEYENUM(if),
 
 		KEYENUM(max_parameters)
@@ -1159,6 +1298,9 @@
 	_LIT(K_drop, "drop");
 
 	token_type val;
+
+    CheckFeatureSupportL(NFeature::KFeatureIdFfIpsecUmaSupportEnable);
+
 	//
 	aPs = new (ELeave) CPolicySelector();
 
@@ -1202,6 +1344,22 @@
 					User::Leave(EIpsec_PolicySyntaxError);	// <-- need own error code?
 				aPs->iInterface = iSp->LookupInterfaceL(iToken);
 				break;
+			case E_UMAExceptionTrafficSelector:
+                    if(iIPSecGANSupported)
+                        {
+                        //UMA support
+                        LOG(Log::Printf(_L("TParser::ParseSelectorL Setting Exception selector flag")));
+                   //The flags signifies special case for UMA/exception selectors. These selectors
+                   //will be present in case when there is no inbound and bypass filter data or selectors
+                   //are set. This selector will only allow traffic whose scope match the exception scope 
+                        aPs->iFilterData|=KPolicyFilter_Exception;
+                        aPs->iFilterMask |= KPolicyFilter_Exception;
+                        }
+                    else
+                        {
+                        LOG(Log::Printf(_L("TParser::ParseSelectorL error GAN/ UMA feature is not enabled ")));
+                        }
+	               break;				
 			default:
 				val = TransportSelectorL(aPs->iTS);
 #if OLD_SELECTOR_ORDERING
@@ -1218,7 +1376,18 @@
 	if (val != token_equal)
 		User::Leave(EIpsec_PolicySyntaxError);
 	if (NextToken() == token_brace_left)
-		ParseSecurityBundleL(aPs->iActions, aPs->iTS);
+	    {
+	  //UMA support RE417-40027
+        if(iIPSecGANSupported)
+            {
+        ParseSecurityBundleL(aPs->iActions, aPs->iTS, aPs);
+            }
+        else
+            {
+        ParseSecurityBundleL(aPs->iActions, aPs->iTS);
+
+            }
+	    }
 	else if (iToken.Compare(K_drop) == 0)
 		aPs->iFilterData |= KPolicyFilter_DROP;
 	else
@@ -1232,6 +1401,24 @@
 TParser::TParser(CSecurityPolicy *aSp, const TDesC &aPolicy, REndPoints &aEp) :
 	TLex(aPolicy), iSp(aSp), iEp(aEp)
 	{
+    
+	}
+/**
+ * To check the feature support
+ */
+void TParser::CheckFeatureSupportL(TUid aFeature)
+    {
+    // Check Gan support from feature manager
+    iIPSecGANSupported = CFeatureDiscovery::IsFeatureSupportedL(aFeature);
+    
+    if(iIPSecGANSupported != (TInt)ETrue)
+		{
+		LOG(Log::Printf(_L("TParser::CheckFeatureSupport Error Checking Feature Support")));
+		}
+		else
+		{
+		LOG(Log::Printf(_L("TParser::CheckFeatureSupport %d Feature Supported %d"),aFeature,iIPSecGANSupported));
+		}
 	}
 
 void TParser::ParseL(TUint aStartOffset)
--- a/networksecurity/ipsec/ipsecpol/group/ipsecpol.mmp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/ipsec/ipsecpol/group/ipsecpol.mmp	Thu Aug 19 11:25:30 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"
@@ -54,6 +54,9 @@
 
 LIBRARY         euser.lib efsrv.lib
 LIBRARY         ipsecpolparser.lib esock.lib insock.lib
+LIBRARY         commdb.lib
+LIBRARY         commsdat.lib
+LIBRARY		featdiscovery.lib
 
 VENDORID 0x70000001
 CAPABILITY  ProtServ NetworkControl
--- a/networksecurity/ipsec/ipsecpol/inc/ipsecpol.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/ipsec/ipsecpol/inc/ipsecpol.h	Thu Aug 19 11:25:30 2010 +0300
@@ -90,7 +90,9 @@
         EIpsecPolicyGetDebugInfo,
         EIpsecPolicyCancelDebug,
         EIpsecPolicyAvailableSelectors,
-        EIpsecPolicyEnumerateSelectors
+        EIpsecPolicyEnumerateSelectors,
+        EIpsecPolicySetOption,
+        
     };
     
 enum TAutoloadFlags 
--- a/networksecurity/ipsec/ipsecpol/inc/ipsecpolmanhandler.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/ipsec/ipsecpol/inc/ipsecpolmanhandler.h	Thu Aug 19 11:25:30 2010 +0300
@@ -27,10 +27,12 @@
 #include <f32file.h>
 #include <es_sock.h>
 #include <in_sock.h>
+#include <featdiscovery.h>
 
 #include "ipsecpolapi.h"
 #include "ipsecpol.h"
 #include "autoloadlistitem.h"
+#include "log_ipsecpol.H"
 #ifdef SYMBIAN_IPSEC_VOIP_SUPPORT
 #include "spdb.h"
 #endif // SYMBIAN_IPSEC_VOIP_SUPPORT
@@ -52,6 +54,7 @@
 const TInt KDropMode       = 0;          // Drop mode
 const TInt KInboundBypass  = (1 << 0);   // Inbound bypass mode
 const TInt KOutboundBypass = (1 << 1);   // Outbound bypass mode
+const TInt KSymmetricBypass = (KInboundBypass | KOutboundBypass ); // To allow UMA traffic
 
 //
 // Forward declarations
@@ -79,6 +82,8 @@
     TBool iActiveState;       // EFalse = loaded, not active; ETrue = active
     TInt iBypassOrDropMode;   // See flags below
     TPolicyType iPolicyType;
+    TBool iException;			// UMA exception
+	
     };
 typedef CArrayFixFlat<TActivePolicyListEntry*> CActivePolicyList;
 
@@ -184,7 +189,7 @@
     TInt DeletePolicyFromList();
 
     TInt SearchPolicyFromListAndActivate();
-    
+  
     TInt GetAvailableSelectors(const RMessage2& aMsg);
     TInt GetSelectorsCount(const RMessage2& aMsg);
 
@@ -340,6 +345,16 @@
     //determines whether the last manual autoload policy has been unloaded
     TBool IsLastManualLoadPolicy(TUint32 aPolicyHandle);
 
+    //Exception Selectors to be loaded.
+     TInt AddExceptionSelectors();
+     
+     //Check for Exception policy loading. Work around done for UMA. Need to check more. 
+     TBool CheckException();
+
+	//Method to set the SID of the application that load policy 
+	 void SetOptL(const RMessage2& aMsg);
+ 
+
 private:
     // Read the algorithms.conf file
     void ReadAlgorithmsFileL();
@@ -358,6 +373,17 @@
 
     TInt CalculatePolicyBypassDropMode(CSecurityPolicy& aSp) const;
 
+    //UMA support
+	void SearchIAPIdL( const TUint32& aNetId, TUint32& aIapId );
+    TBool CheckUMAL(TUint32 aIapId);
+	void CheckFeatureSupportL(TUid aFeature);////To check a Feature flag is enabled or not
+
+	/**
+	 *This method to check the exception.
+	 **/
+	void CheckUMAEXception(TUint32 aVpnNetId);
+
+
 public:
 
     // List containing all loaded policies
@@ -443,6 +469,13 @@
     TInetAddr iTunnel;
     
     CArrayFixFlat<TIpsecSelectorInfo>* iSelectorInfoArray;
-    };
+	
+    //UMA support
+    TBool iCurrentException;	
+    //This variable holds sid of the application that loads 
+    //exception policies
+    TUint32 iAppSid;
+    TBool iIPSecGANSupported; //To check whether FF_IPSEC_UMA_SUPPORT_ENABLE is defined and UMA supported
+	};
 
 #endif
--- a/networksecurity/ipsec/ipsecpol/src/ipsecpolmanconflict.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/ipsec/ipsecpol/src/ipsecpolmanconflict.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -106,6 +106,8 @@
 TBool
 CIPSecPolicyManagerHandler::CalculateCombinedPolicyBypassDropMode()
     {
+    LOG(Log::Printf(_L("CalculateCombinedPolicyBypassDropMode\n")));
+
     // Combined mode is 'bypass_everything_else' by default
     TInt combinedMode(KInboundBypass | KOutboundBypass);
 
@@ -147,6 +149,7 @@
     // the combined policy into IPsec protocol component
     TBool changed = (iBypassOrDropMode != combinedMode);
     iBypassOrDropMode = combinedMode;
+    LOG(Log::Printf(_L("combined policy mode %d\n"), iBypassOrDropMode));	
     return(changed);
     }
 
@@ -327,6 +330,13 @@
                 {
                 continue;
                 }
+            //UMA support REQ 417-40027  
+            //loading bypass policy with activated drop_mode policy. Above mentioned is only one way traffic.
+            if ((iIPSecGANSupported) && (iFunction & KAddDhcpBypassSelectors) 
+                && (remotePort == 68 || localPort == 67))
+                {
+                continue;
+                }	
 
             // Iterate to next selector if IKE bypass is requested and selector 
             // contains ports utilized with IKE
@@ -557,7 +567,20 @@
                                     aPolicySelector->iRemoteMask.Address(),
                                     ps->iRemote.Address(),
                                     ps->iRemoteMask.Address());
-
+        //UMA support
+       TBool flag_exception = EFalse;
+       if( iIPSecGANSupported )
+           {
+           flag_exception = CheckException();
+           LOG(Log::Printf(_L("::CompareSelectorsL, exception policy is = %d\n"), flag_exception));
+           //Not performing overlapping because UMA loads with any to any selector. Now if any to any will result in 
+           //overlapping as 0.0.0.0 0.0.0.0 will encrypt every packet, which dont leads exceptions and overlapping as concern
+           if(flag_exception ||iCurrentException )
+               {
+               continue;
+               }
+           }
+									
         if (overlappingOccurs)
             {
             err = ESelectorConflict;
--- a/networksecurity/ipsec/ipsecpol/src/ipsecpolmanhandler.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/ipsec/ipsecpol/src/ipsecpolmanhandler.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -28,11 +28,19 @@
 #include "ipsecpolparser.h"
 #include "secpolreader.h"
 
+#include <comms-infras/dbaccess.h>
+#include <commdbconnpref.h>
+#include <featureuids.h>
+#include <e32debug.h>
+
 #define FIRST_ARGUMENT  0
 #define SECOND_ARGUMENT 1
 #define THIRD_ARGUMENT  2
 #define FOURTH_ARGUMENT 3
 
+const TUint KAppSidDefault = 0xFFFFFFFF;
+const TUint32 KGANAppSid = 0x2002E241;
+
 //
 // Create IPSecPolicyManagerHandler object
 //
@@ -65,6 +73,9 @@
 
     iPreloadPolicyHandle.iHandle = 0;
 
+    CheckFeatureSupportL(NFeature::KFeatureIdFfIpsecUmaSupportEnable);
+
+    iAppSid = KAppSidDefault;
 
 #ifdef TESTFLAG
 
@@ -74,7 +85,6 @@
 
     ReadAlgorithmsFileL();
     iSelectorInfoArray = new (ELeave) CArrayFixFlat<TIpsecSelectorInfo> (2);
-
     }
 
 //
@@ -174,6 +184,24 @@
     iSelectorInfoArray = NULL;
     }
 
+/**
+ * To check the feature support
+ */
+void CIPSecPolicyManagerHandler::CheckFeatureSupportL(TUid aFeature)
+    {
+    // Check Gan support from feature manager
+    TRAPD(err,iIPSecGANSupported = CFeatureDiscovery::IsFeatureSupportedL(aFeature));
+    
+    if(KErrNone != err)
+            {
+             LOG(Log::Printf(_L("CIPSecPolicyManagerHandler::CheckFeatureSupport Error Checking Feature Support %d"),err));
+            }
+        else
+            {
+             LOG(Log::Printf(_L("CIPSecPolicyManagerHandler::CheckFeatureSupport %d Feature Supported %d"),aFeature,iIPSecGANSupported));
+            }
+    }
+
 //
 // Release resources allocated for a call
 //
@@ -272,7 +300,7 @@
         TPckg<TZoneInfoSet>pckgZoneInfoSet(zoneInfoSet);
         aMsg.ReadL(THIRD_ARGUMENT, pckgZoneInfoSet);
         }
-    iVPNNetId = 0;
+        iVPNNetId = 0;
     if (zoneInfoSet.iSelectorZone.iScope != KScopeNone)
         {
         iVPNNetId = zoneInfoSet.iSelectorZone.iId;
@@ -282,10 +310,24 @@
         {
         iGwNetId = zoneInfoSet.iEndPointZone.iId;
         }
+        
     LOG(Log::Printf(_L("LoadPolicy request VPN NetId: %d  GW NetId: %d\n"),
                     iVPNNetId, iGwNetId));
+	if(iIPSecGANSupported)
+	    {
+	    LOG(Log::Printf(_L(" iIPSecGANSupported is true \n")));
 
-
+		TRAPD( err, CheckUMAEXception((TUint32)iVPNNetId))
+		if( err != KErrNone)
+			{
+			LOG(Log::Printf(_L("NO UMA Exception \n")));
+			}
+		else 
+            {
+            LOG(Log::Printf(_L("UMA Exception is added \n")));
+            }		    
+	    }		
+		
     // Parse the policy file from string format to the ipsecpolparser
     // class object format
     ParseCurrentPolicyL();
@@ -299,19 +341,92 @@
     // the one that is attempted to be loaded. If so, return with error
 
     TInt activepolicyBypassDropMode; 
+    //UMA support REQ 417-40027
+    TBool flag_exception =EFalse;
+    // It is ok to compare with the first active policy. Every subsequent policy would have been compared against the first one
+    
+    /*                          FORMAT OF UMA POLICY
+     *   remote 0.0.0.0 0.0.0.0 = { UMA_VPN_POLICY($SGW_IP_ADDRESS) }
+     *   inbound = { }
+     *   outbound = { }
+    */
+    //Checking for exception loading. Exceptions are policies for USE CASES having conflict for loading of bypass
+    //and drop policy. UMA being an excetion should be allowed to load policy. It doesnt make sense not to start UMA.
+    if(iIPSecGANSupported)
+        {
+        flag_exception = CheckException();
+        LOG(Log::Printf(_L("Is exception policy already activated= %d\n"), flag_exception));
+        }
+    else
+        {
+        LOG(Log::Printf(_L("UMA/GAN not supported and exception policy activated status = %d\n"), flag_exception));
+        }
+
     //coverity[var_compare_op]
     //intentional null comparision if there is no policylist do nothing.
     if (iActivePolicyList && iActivePolicyList->Count())
         {
-        //coverity[var_compare_op]   
-        // It is ok to compare with the first active policy. Every subsequent policy would have been compared against the first one
-        activepolicyBypassDropMode = iActivePolicyList->At(0)->iBypassOrDropMode;
+        //UMA support REq417-40027
+        if(iIPSecGANSupported)
+            {
+  			if(flag_exception)
+  				{
+				activepolicyBypassDropMode = iBypassOrDropMode;
+			 	}
+            else
+ 			 	{
+                activepolicyBypassDropMode = iActivePolicyList->At(0)->iBypassOrDropMode;
+ 				}
+            }
+        else
+            {
+            // It is ok to compare with the first active policy. Every subsequent policy would have been compared against the first one
+            //coverity[var_compare_op]   
+            // It is ok to compare with the first active policy. Every subsequent policy would have been compared against the first one		
+            activepolicyBypassDropMode = iActivePolicyList->At(0)->iBypassOrDropMode;
+            }
+
         if((policyBypassDropMode == KDropMode && (( activepolicyBypassDropMode & KInboundBypass) || (activepolicyBypassDropMode & KOutboundBypass))) || 
                 (((policyBypassDropMode & KInboundBypass) || (policyBypassDropMode & KOutboundBypass)) && activepolicyBypassDropMode == KDropMode )) 
             {
-            ErrorHandlingL (ESelectorConflict,0);
+            if(iIPSecGANSupported)
+                {
+                //should not Allow loading drop mode policy all the time
+                //condition for allowing drop mode policy loading are 
+                //1) There should not be any other bypass policy loaded before.
+                //2) or loaded bypass policy is UMA bypass policy
+                
+                TBool allowDropLoad = ETrue;
+                for(int count = 0; count < iActivePolicyList->Count(); count++ )
+                    {
+                    if((iActivePolicyList->At(count)->iBypassOrDropMode & KSymmetricBypass) &&(!(iActivePolicyList->At(count)->iException)))
+                        {
+                        //ipsec bypass policy is already loaded.
+                        LOG(Log::Printf(_L("\n should not allow loading of drop policy \n")));
+                        allowDropLoad = EFalse;
+                        break;
+                        }//else do nothing
+                    }
+                                   
+                if(allowDropLoad && (policyBypassDropMode == KDropMode))
+                    {
+                    LOG(Log::Printf(_L("Allowing loading drop mode policy, with activated exception bypass\n")));
+                    }
+                else if((((policyBypassDropMode & KInboundBypass) || (policyBypassDropMode & KOutboundBypass)) && iCurrentException) && activepolicyBypassDropMode == KDropMode )
+                    { 
+                    LOG(Log::Printf(_L("Allowing loading exception bypass mode policy, with activated drop mode\n")));
+                    }
+                else
+                    {
+                    ErrorHandlingL (ESelectorConflict,0);
+                    }
+                }
+            else
+                {
+                ErrorHandlingL (ESelectorConflict,0);          
+                }
             }
-        } 
+        }
    
     // Add VPNNetId to CPolicySelector and GwNetId to CSecpolBundleItem objects
     UpdateSelectorsAndTunnels();
@@ -344,6 +459,7 @@
     ApiCallCompleted();
     return KErrNone;
     }
+    
 
 //
 //
@@ -389,9 +505,8 @@
         iGwNetId = zoneInfoSet.iEndPointZone.iId;
         }
 
-    LOG(Log::Printf(_L("LoadPolicy request VPN NetId: %d  GW NetId: %d\n"),
+    LOG(Log::Printf(_L("******LoadPolicy request VPN NetId: %d  GW NetId: %d****\n"),
                     iVPNNetId, iGwNetId));
-
     if (scopedLoad)
         {
         // Load BeforescopedLoadPolicies before
@@ -527,11 +642,12 @@
         {
         ErrorHandlingL(ret, 0 );
         }
-
+   LOG(Log::Printf(_L("::ActivatePolicy, request  to parse all policies\n")));
     // Parse all active policy files from string format
     // to IPSecPolParser class object formats
     ParseAllPolicyFilesL();
 
+    LOG(Log::Printf(_L("::ActivatePolicy request to calculate combined\n")));	
     // Calculate the combined policy Bypass/Drop mode
     CalculateCombinedPolicyBypassDropMode();
 
@@ -554,6 +670,24 @@
         ErrorHandlingL(ENoMemory, err);
         }
 
+	//UMA support REQ417-40027 
+    TBool flag_exception = EFalse;
+    if(iIPSecGANSupported)
+        {
+        flag_exception = CheckException();
+        if(flag_exception || iCurrentException)
+            {
+            if(iBypassOrDropMode != KSymmetricBypass)
+                {
+                err = AddExceptionSelectors();
+                if (err != KErrNone)
+                         {
+                         ErrorHandlingL(ENoMemory, err);
+                         }
+                }//if symmetry
+            }//flag_exception
+        }
+     
     // Send the algorithms table and  the string format policy file to
     // IPSec protocol component using Secpol socket
     SendAlgorithmsAndPolicyToIPSecL(_L("secpol6"));
@@ -692,6 +826,20 @@
         {
         ErrorHandlingL(ENoMemory, err);
         }
+//UMA support
+    TBool flag_exception = EFalse;
+    if(iIPSecGANSupported)
+        {
+        flag_exception = CheckException();
+        if(flag_exception)
+            {
+            LOG(Log::Printf(_L("::ProcessUnloadPolicy, Adding exception selectors")));
+            if(iBypassOrDropMode != KSymmetricBypass)
+                {
+                AddExceptionSelectors();
+                }
+            }
+     	}
 
     // Send the algorithms table and  the string format policy file to
     // IPSec protocol component using Secpol socket
@@ -734,7 +882,9 @@
 
     // Check if given policy contains 'drop_everything_else' rule
     // and add IKE, DHCP and MIPv4 bypass selectors if necessary 
-    if (aBypassDropMode == KDropMode)
+    //UMA support REQ417-40027 
+    //DHCP selectors & IKE selectors should be added even when UMA is UP
+    if (aBypassDropMode == KDropMode ||(iIPSecGANSupported && iCurrentException))
         {
         // Allow plain IKE negotiation packets. Write  the bypass
         // selectors  to the end of selector list, but they will
@@ -753,10 +903,11 @@
                 ErrorHandlingL(ENoMemory, err);
                 }
             }
-
-        // Allow plain DHCP negotiation packets. Write bypass mode
+        //UMA support REQ417-40027
+		TBool UMAFLAG = ETrue;
+		// Allow plain DHCP negotiation packets. Write bypass mode
         // selectors for DHCP ports (67, 68) to the end of selector list.
-        if (aFunction & KAddDhcpBypassSelectors)
+        if (aFunction & KAddDhcpBypassSelectors || (iIPSecGANSupported && UMAFLAG))
             {
             TInt err = BuildDhcpProtocolString(iPolBfr);
             if (err != KErrNone)
@@ -818,6 +969,11 @@
     entry->iPolicyHandle.iHandle = iCurrentPolicyHandle.iHandle;
     entry->iPolicyBuf = iPolBfr;
     entry->iPolicyType = aPolType;
+    if(iIPSecGANSupported)
+        {
+    entry->iException = iCurrentException ;
+        }
+
     iPolBfr = NULL;
     CleanupStack::PushL(entry->iPolicyBuf);
 
@@ -2163,3 +2319,163 @@
     return KErrNone;
  	}
 
+
+//Checking excetion flags 
+TBool CIPSecPolicyManagerHandler::CheckException()
+    {
+    int count_=0;
+    TBool flag_exception = EFalse;
+    while(count_ < iActivePolicyList->Count())
+        {
+        if(iActivePolicyList->At(count_)->iException)
+            {
+            LOG(Log::Printf(_L("::CheckException, Exception policy Activated")));
+            flag_exception = ETrue;
+            break;
+            }
+        else
+            {
+            LOG(Log::Printf(_L(" Exception is not presnt iActivePolicyList->At(%d)"), count_));
+            }
+    count_ ++;
+        }
+    return flag_exception;
+
+    }
+
+
+/**
+ *This method to find out the iapid from network id 
+ *@param aNetId : network id
+ *@param aIapId : iapid
+ *@return void
+ */
+
+void CIPSecPolicyManagerHandler::SearchIAPIdL( const TUint32&  aNetId,
+                                       TUint32&        aIapId )
+    {
+ 	LOG(Log::Printf(_L("CIPSecPolicyManagerHandler::SearchIAPIdL Entry\n")));
+
+    CCommsDatabase* commsDatabase = CCommsDatabase::NewL();
+    CleanupStack::PushL(commsDatabase);
+
+    // Make hidden records visible
+    commsDatabase->ShowHiddenRecords();
+
+    // Open IAP table view by matching IAP_NETWORK Id
+    CCommsDbTableView* commsDbTableView = 
+        commsDatabase->OpenViewMatchingUintLC( TPtrC( IAP ),
+                                               TPtrC( IAP_NETWORK ),
+                                               aNetId );
+
+    User::LeaveIfError( commsDbTableView->GotoFirstRecord() );
+
+    commsDbTableView->ReadUintL(TPtrC( COMMDB_ID ), aIapId );
+
+ 	LOG(Log::Printf(_L("CMPMCommsDatAccess::SearchIAPIdL - Found IAP IdId: = %d\n"),aIapId));
+
+    CleanupStack::PopAndDestroy(commsDbTableView);
+    CleanupStack::PopAndDestroy(commsDatabase);
+
+ 	LOG(Log::Printf(_L("CIPSecPolicyManagerHandler::SearchIAPIdL Exit \n")));
+    }    
+
+/**
+ *This API call is to pass the sid or any other relevent information
+ *from other components to IPSec module.
+ *
+ *@param 
+ *@param 
+ *@return
+ */
+ void CIPSecPolicyManagerHandler::SetOptL(const RMessage2& aMsg)
+	{	
+    LOG(Log::Printf(_L("CIPSecPolicyManagerHandler::SetOptL\n")));
+    //Read the option name from the RMessage 
+    TUint optionName;    
+    TPckg<TUint> optionNamePkg(optionName) ;   
+    aMsg.ReadL(FIRST_ARGUMENT, optionNamePkg);    
+    //Read the option level from the RMessage 
+    TUint optionLevel;
+    TPckg<TUint> optionLevelPkg(optionLevel) ;   
+    aMsg.ReadL(SECOND_ARGUMENT, optionLevelPkg);    
+    LOG(Log::Printf(_L("option name = %d and option level is = %d \n"), iAppSid, optionLevel));
+    //Read option value
+    HBufC8* optionValue;
+    TInt dataLen = aMsg.GetDesLength(THIRD_ARGUMENT);
+    optionValue = HBufC8::NewL(dataLen);
+    CleanupStack::PushL(optionValue);
+    TPtr8 optionValuePtr(optionValue->Des());
+    aMsg.ReadL(THIRD_ARGUMENT, optionValuePtr);
+    
+    if(optionLevel == KOptionLevelDefault)
+        {
+        if(optionName == KOptionNameSid)
+            {     
+            TLex8 lex(*optionValue);
+            TUint dataValue;
+            lex.Val(dataValue);            
+            iAppSid = dataValue;//store the appsid value.
+    	    LOG(Log::Printf(_L("Application sid value is %d \n"), iAppSid));
+			}//else donothing as of now
+        else
+            {
+            User::Leave(KErrArgument);
+    	    LOG(Log::Printf(_L(" \nwrong Name\n")));
+            }
+        }
+    else
+        {
+        User::Leave(KErrArgument);
+	    LOG(Log::Printf(_L(" Wrong option KOptionLevelDefault\n")));
+        }
+    CleanupStack::PopAndDestroy();
+    LOG(Log::Printf(_L("CIPSecPolicyManagerHandler::SetOptL\n")));
+    }
+
+/**
+ *This method to check the exception.
+ **/
+TBool CIPSecPolicyManagerHandler::CheckUMAL(TUint32 aIapId)
+	{
+	CMDBSession* cmdbSession;
+	CCDIAPRecord* ptrIapRecord1;
+	ptrIapRecord1 = static_cast<CCDIAPRecord*>(CCDRecordBase::RecordFactoryL(KCDTIdIAPRecord));
+	CleanupStack::PushL(ptrIapRecord1);
+	cmdbSession = CMDBSession::NewL(CMDBSession::LatestVersion());
+	CleanupStack::PushL(cmdbSession);
+	cmdbSession->SetAttributeMask( ECDHidden | ECDPrivate );
+	ptrIapRecord1->SetRecordId(aIapId);	
+	ptrIapRecord1->LoadL(*cmdbSession);
+
+	TUint32 secureId;
+	secureId = ptrIapRecord1->iAppSid;		
+    LOG(Log::Printf(_L("CIPSecPolicyManagerHandler::CheckUMAL Secure id is = %d\n"), secureId));
+	CleanupStack::PopAndDestroy(cmdbSession);
+	CleanupStack::PopAndDestroy(ptrIapRecord1);
+	TBool result = EFalse; 
+	if(secureId == KGANAppSid)
+		{
+        LOG(Log::Printf(_L("\n  Exception added to the selector ")));	
+		result = ETrue;
+		}
+	else
+	    {
+	    LOG(Log::Printf(_L(" No Exception added \n")));
+	    }
+	return result;
+	}
+
+/**
+ *This method to check the exception.
+ **/
+void CIPSecPolicyManagerHandler::CheckUMAEXception(TUint32 aVpnNetId)
+	{
+    LOG(Log::Printf(_L("CIPSecPolicyManagerHandler::CheckUMAEXception Entry \n")));
+	TUint32 aIapId;
+	SearchIAPIdL(aVpnNetId, aIapId);
+	iCurrentException = CheckUMAL(aIapId);
+    LOG(Log::Printf(_L("CIPSecPolicyManagerHandler::CheckUMAEXception Exit \n")));
+	}
+
+
--- a/networksecurity/ipsec/ipsecpol/src/ipsecpolmansession.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/ipsec/ipsecpol/src/ipsecpolmansession.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -192,6 +192,12 @@
         case EIpsecPolicyEnumerateSelectors:
         	Status = iServer->iIPSecPolicyManagerHandler->GetSelectorsCount(aMessage);
             break;
+			
+        case EIpsecPolicySetOption: //UMA support
+            TRAPD(err,iServer->iIPSecPolicyManagerHandler->SetOptL(aMessage));  
+			Status = err;
+			break;
+
         default:
             Status = KErrNotSupported;
             break;
--- a/networksecurity/ipsec/ipsecpol/src/ipsecpolmanutil.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/ipsec/ipsecpol/src/ipsecpolmanutil.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -265,6 +265,15 @@
     // Inbound, protocol UDP, local_port 68
     stringBuf.Append(_L8(" inbound protocol 17 local_port 68 = { }\n"));
 
+    if(iIPSecGANSupported)
+        {
+        // Outbound, protocol UDP, remote_port 67
+        stringBuf.Append(_L8(" outbound protocol 17 remote_port 68 = { }\n"));
+        // Inbound, protocol UDP, local_port 68
+        stringBuf.Append(_L8(" inbound protocol 17 local_port 67 = { }\n"));
+        }
+
+
     // Write the string to file
     err = TPolicyParser::BufferAppend(aPolBfr, stringBuf);
     return err;
@@ -428,8 +437,29 @@
             compWord |= 0x00400000;
             }
 
-        // Each selector has at least this bit set on
-        compWord |= 0x00000001;
+        //UMA support Req417-40027
+        if(iIPSecGANSupported && policySelector->iSequenceNumber==0 && policySelector->iRemote.IsUnspecified() && policySelector->iRemoteMask.IsUnspecified())
+            {
+           LOG(Log::Printf(_L("::Buildcomparision, building comparison words for any to any selector\n")));
+           
+           //building lowest comparision word for any to any selector. Any to any selector should fall at the end of 
+           //all selector list (except bypass selectors. If not then selector falling after this selector will have 
+           //no significance.
+            compWord = 0x000000001;
+            policySelector->iCompWord = compWord;
+            continue;
+            }
+
+        // Each selector has at least this bit set on.
+        if(iIPSecGANSupported)
+            {
+            //Change to accomodate any to any selector.
+            compWord |= 0x00000010;
+            }
+        else
+            {
+		compWord |= 0x00000001;
+            }
 
         // Store comparison word to the selector
         policySelector->iCompWord = compWord;
@@ -590,9 +620,38 @@
         }
     }
 
+
+//  
+// UMAExceptionTrafficSelector = {UMAException %d }
+// This occurs only if the current policies are exception policy.
+// The network ID is supplied in braces any matching scope traffic will be honoured.
+///////////////////////////////////////////////////////////////////
 //
+TInt 
+CIPSecPolicyManagerHandler::AddExceptionSelectors()
+    {
+    LOG(Log::Printf(_L("Add Exception selectors\n")));
+    TInt err(KErrNone);
+    if(iIPSecGANSupported)
+        {
+        TBuf8<128> stringBuf;
+        stringBuf.Format(_L8(" UMAExceptionTrafficSelector = {UMAException %d }\n"),iVPNNetId);
+        err = TPolicyParser::BufferAppend(iPolBfr, stringBuf);
+        return err;
+        }
+    else
+        {
+        LOG(Log::Printf(_L("UMA/GAN support is not enabled and CIPSecPolicyManagerHandler::AddExceptionSelectors not supported")));
+        return KErrNotSupported;
+        }
+    }
+
+ 
+
+///////////////////////////////////////////////////////////////////
 // This function adds the following selectors to the end of the
 // string format policy file:
+//  inbound = { }%d
 //  inbound = { }
 //  outbound = { }
 //
@@ -606,10 +665,12 @@
     {
     TBuf8<128> stringBuf;
     TInt err(KErrNone);
+    LOG(Log::Printf(_L("CIPSecPolicyManagerHandler::AddInboundOutboundSelectorPair()\n")));	
 
     // If drop mode, return immediately
     if (iBypassOrDropMode == KDropMode)
         {
+        LOG(Log::Printf(_L("CIPSecPolicyManagerHandler::AddInboundOutboundSelectorPair(), not adding selectors combined mode is drop\n")));		
         return err;
         }
 
--- a/networksecurity/ipsec/ipsecpolapi/bwins/IPSECPOLAPIU.DEF	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/ipsec/ipsecpolapi/bwins/IPSECPOLAPIU.DEF	Thu Aug 19 11:25:30 2010 +0300
@@ -14,4 +14,5 @@
 	?UnloadPolicy@RIpsecPolicyServ@@QAEXABUTPolicyHandle@@AAVTRequestStatus@@@Z @ 13 NONAME ; public: void __thiscall RIpsecPolicyServ::UnloadPolicy(struct TPolicyHandle const &,class TRequestStatus &)
 	?Version@RIpsecPolicyServ@@QBE?AVTVersion@@XZ @ 14 NONAME ; public: class TVersion  __thiscall RIpsecPolicyServ::Version(void)const 
 	?AvailableSelectors@RIpsecPolicyServ@@QAEXABVTDesC8@@PAV?$CArrayFixFlat@UTIpsecSelectorInfo@@@@AAVTRequestStatus@@@Z @ 15 NONAME ; void RIpsecPolicyServ::AvailableSelectors(class TDesC8 const &, class CArrayFixFlat<struct TIpsecSelectorInfo> *, class TRequestStatus &)
+	?SetOpt@RIpsecPolicyServ@@QAEHIIABVTDesC8@@@Z @ 16 NONAME ; int RIpsecPolicyServ::SetOpt(unsigned int, unsigned int, class TDesC8 const &)
 
--- a/networksecurity/ipsec/ipsecpolapi/eabi/ipsecpolapiU.DEF	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/ipsec/ipsecpolapi/eabi/ipsecpolapiU.DEF	Thu Aug 19 11:25:30 2010 +0300
@@ -16,4 +16,5 @@
 	_ZN16RIpsecPolicyServD2Ev @ 15 NONAME ; RIpsecPolicyServ::~RIpsecPolicyServ [not-in-charge](void)
 	_ZN16RIpsecPolicyServC2Ev @ 16 NONAME ; RIpsecPolicyServ::RIpsecPolicyServ[not-in-charge](void)
 	_ZN16RIpsecPolicyServ18AvailableSelectorsERK6TDesC8P13CArrayFixFlatI18TIpsecSelectorInfoER14TRequestStatus @ 17 NONAME
+	_ZN16RIpsecPolicyServ6SetOptEjjRK6TDesC8 @ 18 NONAME
 
--- a/networksecurity/ipsec/ipsecpolapi/inc/ipsecpolapi.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/ipsec/ipsecpolapi/inc/ipsecpolapi.h	Thu Aug 19 11:25:30 2010 +0300
@@ -156,6 +156,9 @@
 const TInt KAddIkeBypassSelectors =  (1 << 0);   //< Add IKE bypass selectors to the policy
 const TInt KAddIpsecBypassSelectors =  (1 << 1); //< Add an bypass selector for traffic identified with a TIpsecSelectorInfo structure
 const TInt KAddDhcpBypassSelectors =  (1 << 2);  //< Add DHCP bypass selectors to the policy
+
+const TInt KAddUMAExceptionSelectors = (1<<3);   ///< Add UMA information to the policy
+
 /*
  * A flag uset in GetDebugInfo call.
  *
@@ -164,6 +167,19 @@
 const TInt KParsingErrorInfo =  (1 << 1);        //< Return information about a policy parsing error
 
 /**
+ * An integer constant which identifies an option.Level
+ *
+ **/
+const TInt KOptionLevelDefault = 0x1000;
+
+
+/**
+ * An integer constant which identifies an option.
+ *
+ **/
+const TInt KOptionNameSid = 0x1020;
+
+/**
  * IPSec Policy API methods return the following error codes
  * in the TRequestStatus parameter.
  * NOTE! The error code values below MUST be kept in sync with
@@ -190,6 +206,8 @@
 
 typedef TPckg<TInetAddr> TInetAddrPckg;
 
+
+
 /**
  * RIpsecPolicyServ API is used by clients to:
  *    Users who load and unload policies
@@ -400,7 +418,22 @@
 	 *		system wide error codes.
      */ 
     IMPORT_C void AvailableSelectors(const TDesC8& aGateway, CArrayFixFlat<TIpsecSelectorInfo>* aSelectors, TRequestStatus& aStatus);
-private:
+
+	/**
+	 *Sets an option.
+	 *RIpsecPolicyServ implementations may provide options that can be set with this method.
+	 *Eg:- Seting SID of an appliction that is going to load policy file. Then that application
+	 *Can call this api with option name 'KOptionLevelDefault' and option level 'KOptionNameSid' and provide the SID value.
+	 *
+	 *@param aOptionName : An integer constant which identifies an option
+	 *@param aOptionLevel  : An integer constant which identifies level of an option 
+	 *@param aOption  : An option value as descriptor
+	 *@return TInt:	KErrNone if succsess 
+	 */
+	IMPORT_C TInt SetOpt(TUint aOptionName, TUint aOptionLevel, const TDesC8 &aOption);
+
+
+private:	
 	void EnumerateSelectors(const TDesC8& aGateway, TInt& aCount);
 
 private:
--- a/networksecurity/ipsec/ipsecpolapi/src/ipsecpolapi.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/ipsec/ipsecpolapi/src/ipsecpolapi.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -16,7 +16,6 @@
 //
 
 #include <e32math.h>
-
 #include "ipsecpol.h"
 #include "ipsecpolapi.h"
 #include "clistatic.h"
@@ -39,7 +38,7 @@
 //
 // Connect to the server attempting to start it if necessary
 //
-    {
+    {    
 	TInt retry=2;
 	for (;;)
 		{
@@ -156,3 +155,20 @@
     SendReceive(EIpsecPolicyEnumerateSelectors, TIpcArgs(&aGateway, &selectorCount));
 	}
 
+	/**
+	 *Sets an option.
+	 *RIpsecPolicyServ implementations may provide options that can be set with this method.
+	 *Eg:- Seting SID of an appliction that is going to load policy file. Then that application
+	 *Can call this api with option name - and option level - and provide the SID value.
+	 *
+	 *@param aOptionName : An integer constant which identifies an option
+	 *@param aOptionLevel  : An integer constant which identifies level of an option 
+	 *@param aOption  : An option value
+	 *@return TInt: KErrNone if succsess 
+	 */
+EXPORT_C TInt RIpsecPolicyServ::SetOpt(TUint aOptionName, TUint aOptionLevel, const TDesC8 &aOption)
+	{
+	TPckg<TUint> optionNamePkg(aOptionName);
+	TPckg<TUint> pkgOptionLevel(aOptionLevel);
+	return SendReceive(EIpsecPolicySetOption, TIpcArgs( &optionNamePkg, &pkgOptionLevel, &aOption));	
+	}
--- a/networksecurity/ipsec/lib_pfkey/include/lib_pfkey.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/ipsec/lib_pfkey/include/lib_pfkey.h	Thu Aug 19 11:25:30 2010 +0300
@@ -177,15 +177,20 @@
 class RSADB 
 	{
 public:
-
+	/** 
+	 *  Opens the handle to stack side SADB
+	 *  @param aServer
+	 *		A socketserver session to use
+	 *  @return KErrNone if successful
+	 */ 
 	IMPORT_C TInt Open(RSocketServ& aServer);
 	
 	IMPORT_C void Close();
-	
+	// Send Request	
 	IMPORT_C void SendRequest(const TDesC8& aMsg, TRequestStatus& aStatus);
 	
 	IMPORT_C void CancelSend();
-
+	// Separate Read Request
 	IMPORT_C void ReadRequest(TDes8& aMsg, TRequestStatus& aStatus);
 	
 	IMPORT_C void CancelRecv();
--- a/networksecurity/ipsec/te_ipsec/group/t_ipsec.mmp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/ipsec/te_ipsec/group/t_ipsec.mmp	Thu Aug 19 11:25:30 2010 +0300
@@ -27,12 +27,12 @@
 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
@@ -42,10 +42,10 @@
 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
--- a/networksecurity/ipsec/te_ipsec/inc/t_ipsecikev2.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/ipsec/te_ipsec/inc/t_ipsecikev2.h	Thu Aug 19 11:25:30 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
 	{
--- a/networksecurity/ipsec/te_ipsec/inc/t_ipsecmultiplesa.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/ipsec/te_ipsec/inc/t_ipsecmultiplesa.h	Thu Aug 19 11:25:30 2010 +0300
@@ -25,7 +25,7 @@
 
 
 
-#include <DataWrapper.h>
+#include <datawrapper.h>
 
 class CT_IPSecMultipleSATestWrapper : public CDataWrapper
 	{
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/group/bld.inf	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,61 @@
+// 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 the License "Symbian Foundation License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRJ_EXPORTS
+
+PRJ_TESTEXPORTS
+
+//script files
+../scripts/ns-ipsec-ike-selectorconflict_common.script z:/testdata/scripts/ns-ipsec-ike-selectorconflict_common.script
+
+../scripts/ns-ipsec-ike-selectorconflict_bbd1.script z:/testdata/scripts/ns-ipsec-ike-selectorconflict_bbd1.script
+../scripts/ns-ipsec-ike-selectorconflict_bbd2.script z:/testdata/scripts/ns-ipsec-ike-selectorconflict_bbd2.script
+../scripts/ns-ipsec-ike-selectorconflict_bbd3.script z:/testdata/scripts/ns-ipsec-ike-selectorconflict_bbd3.script
+
+
+../scripts/ns-ipsec-ike-selectorconflict_bdd1.script z:/testdata/scripts/ns-ipsec-ike-selectorconflict_bdd1.script
+../scripts/ns-ipsec-ike-selectorconflict_bdd2.script z:/testdata/scripts/ns-ipsec-ike-selectorconflict_bdd2.script
+../scripts/ns-ipsec-ike-selectorconflict_bdd3.script z:/testdata/scripts/ns-ipsec-ike-selectorconflict_bdd3.script
+
+
+../scripts/ns-ipsec-ike-selectorconflict-uma1.script z:/testdata/scripts/ns-ipsec-ike-selectorconflict-uma1.script
+../scripts/ns-ipsec-ike-selectorconflict-uma2.script z:/testdata/scripts/ns-ipsec-ike-selectorconflict-uma2.script
+../scripts/ns-ipsec-ike-selectorconflict-uma3.script z:/testdata/scripts/ns-ipsec-ike-selectorconflict-uma3.script
+../scripts/ns-ipsec-ike-selectorconflict-uma4.script z:/testdata/scripts/ns-ipsec-ike-selectorconflict-uma4.script
+../scripts/ns-ipsec-ike-selectorconflict-uma5.script z:/testdata/scripts/ns-ipsec-ike-selectorconflict-uma5.script
+../scripts/ns-ipsec-ike-selectorconflict-uma6.script z:/testdata/scripts/ns-ipsec-ike-selectorconflict-uma6.script
+
+../scripts/ns-ipsec-ike-selectorconflict_coverage.script z:/testdata/scripts/ns-ipsec-ike-selectorconflict_coverage.script
+
+//.ini file
+../scripts/ns-ipsec-ikev1test-ops.ini		z:/testdata/scripts/ns-ipsec-ikev1test-ops.ini
+
+//.ini file
+../testdata/te_2483.pin		z:/testdata/configs/te_2483.pin
+../testdata/te_2483.pol		z:/testdata/configs/te_2483.pol
+../testdata/te_2483_drop.pin    z:/testdata/configs/te_2483_drop.pin
+../testdata/te_2483_drop.pol    z:/testdata/configs/te_2483_drop.pol
+
+//.xml
+../testdata/te_ethced_2483vpn.xml	     z:/testdata/configs/te_ethced_2483vpn.xml
+../testdata/te_ethced_2483.xml		     z:/testdata/configs/te_ethced_2483.xml
+../testdata/te_ethced_2483vpn_drop.xml	     z:/testdata/configs/te_ethced_2483vpn_drop.xml
+
+./te_ipsec_selector_confilict.iby	/epoc32/rom/include/te_ipsec_selector_confilict.iby
+
+PRJ_MMPFILES
+
+PRJ_TESTMMPFILES
+te_ipsec_selector_confilict.mmp
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/group/te_ipsec_selector_confilict.iby	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,55 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef __T_IPSEC_SELECTOR_CONFLICT_IBY__
+#define __T_IPSEC_SELECTOR_CONFLICT_IBY__
+
+#include <ipsec.iby>
+#include <vpn.iby>
+#include <integrationtest.iby>
+
+file=ABI_DIR\DEBUG_DIR\te_ipsec_selector_conflict.exe		System\Libs\te_ipsec_selector_conflict.exe
+
+data=EPOCROOT##epoc32\data\Z\TestData\scripts\ns-ipsec-ikev1test-ops.ini	 testdata\scripts\ns-ipsec-ikev1test-ops.ini
+
+data=EPOCROOT##epoc32\data\Z\TestData\scripts\ns-ipsec-ike-selectorconflict_common.script	 testdata\scripts\ns-ipsec-ike-selectorconflict_common.script
+
+data=EPOCROOT##epoc32\data\Z\TestData\scripts\ns-ipsec-ike-selectorconflict_bbd1.script	 testdata\scripts\ns-ipsec-ike-selectorconflict_bbd1.script
+data=EPOCROOT##epoc32\data\Z\TestData\scripts\ns-ipsec-ike-selectorconflict_bbd2.script	 testdata\scripts\ns-ipsec-ike-selectorconflict_bbd2.script
+data=EPOCROOT##epoc32\data\Z\TestData\scripts\ns-ipsec-ike-selectorconflict_bbd3.script	 testdata\scripts\ns-ipsec-ike-selectorconflict_bbd3.script
+
+data=EPOCROOT##epoc32\data\Z\TestData\scripts\ns-ipsec-ike-selectorconflict_bdd1.script	 testdata\scripts\ns-ipsec-ike-selectorconflict_bdd1.script
+data=EPOCROOT##epoc32\data\Z\TestData\scripts\ns-ipsec-ike-selectorconflict_bdd2.script 	 testdata\scripts\ns-ipsec-ike-selectorconflict_bdd2.script
+data=EPOCROOT##epoc32\data\Z\TestData\scripts\ns-ipsec-ike-selectorconflict_bdd3.script 	 testdata\scripts\ns-ipsec-ike-selectorconflict_bdd3.script
+
+data=EPOCROOT##epoc32\data\Z\TestData\scripts\ns-ipsec-ike-selectorconflict-uma1.script 	 testdata\scripts\ns-ipsec-ike-selectorconflict-uma1.script
+data=EPOCROOT##epoc32\data\Z\TestData\scripts\ns-ipsec-ike-selectorconflict-uma2.script 	 testdata\scripts\ns-ipsec-ike-selectorconflict-uma2.script
+data=EPOCROOT##epoc32\data\Z\TestData\scripts\ns-ipsec-ike-selectorconflict-uma3.script 	 testdata\scripts\ns-ipsec-ike-selectorconflict-uma3.script
+data=EPOCROOT##epoc32\data\Z\TestData\scripts\ns-ipsec-ike-selectorconflict-uma4.script 	 testdata\scripts\ns-ipsec-ike-selectorconflict-uma4.script
+data=EPOCROOT##epoc32\data\Z\TestData\scripts\ns-ipsec-ike-selectorconflict-uma5.script 	 testdata\scripts\ns-ipsec-ike-selectorconflict-uma5.script
+data=EPOCROOT##epoc32\data\Z\TestData\scripts\ns-ipsec-ike-selectorconflict-uma6.script 	 testdata\scripts\ns-ipsec-ike-selectorconflict-uma6.script
+
+data=EPOCROOT##epoc32\data\Z\TestData\configs\te_ethced_2483.xml 	         testdata\configs\te_ethced_2483.xml
+data=EPOCROOT##epoc32\data\Z\TestData\configs\te_ethced_2483vpn.xml 	         testdata\configs\te_ethced_2483vpn.xml
+data=EPOCROOT##epoc32\data\Z\TestData\configs\te_ethced_2483vpn_drop.xml 	 testdata\configs\te_ethced_2483vpn_drop.xml
+
+data=EPOCROOT##epoc32\data\Z\TestData\configs\te_2483.pin	 	         testdata\configs\te_2483.pin	
+data=EPOCROOT##epoc32\data\Z\TestData\configs\te_2483_drop.pin	 	         testdata\configs\te_2483_drop.pin	
+data=EPOCROOT##epoc32\data\Z\TestData\configs\te_2483.pol	 	         testdata\configs\te_2483.pol	
+data=EPOCROOT##epoc32\data\Z\TestData\configs\te_2483.pin	 	         testdata\configs\te_2483_drop.pol	
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/group/te_ipsec_selector_confilict.mmp	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,52 @@
+// 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 the License "Symbian Foundation License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+TARGET          te_ipsec_selector_conflict.exe
+TARGETTYPE      exe
+UID             0x1000007A 0x10282F36
+CAPABILITY	    NetworkServices NetworkControl WriteDeviceData ReadDeviceData
+MACRO 	    DATA_CAGING
+
+SOURCEPATH  ../src
+SOURCE   te_loadpolicy_bbd.cpp 
+SOURCE   te_loadpolicy_bdd.cpp 
+SOURCE   te_loadpolicy_uma.cpp
+SOURCE   te_ipsectestserver.cpp 
+SOURCE   te_coverage_test.cpp
+
+USERINCLUDE   ../inc 
+SYSTEMINCLUDE   /epoc32/include
+SYSTEMINCLUDE   /epoc32/include/platform
+SYSTEMINCLUDE   /epoc32/include/platform/test
+SYSTEMINCLUDE   /epoc32/include/platform/ecom
+SYSTEMINCLUDE   /epoc32/include/platform/comms-infras
+SYSTEMINCLUDE   /epoc32/include/platform/networking
+///
+LIBRARY   euser.lib
+LIBRARY   esock.lib
+LIBRARY   commdb.lib
+LIBRARY   netmeta.lib
+LIBRARY   insock.lib
+LIBRARY   testexecuteutils.lib
+LIBRARY   testexecutelogclient.lib 
+LIBRARY   bafl.lib
+LIBRARY   ipsecpolapi.lib 
+LIBRARY   lib_pfkey.lib 
+LIBRARY         commdb.lib
+LIBRARY         commsdat.lib
+
+VENDORID 0x70000001
+
+SMPSAFE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_coverage_test.h	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,84 @@
+/*
+* Copyright (c) 2003 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+/**
+ * @file ts_ipsec_crypto.h header file for main test code for IPsec
+ */
+
+#if (!defined  __TEF_IPSEC_COVERAGE_TEST_H__)
+#define __TEF_IPSEC_COVERAGE_TEST_H__
+
+
+//local includes here
+
+#include "te_IPSec_Load_Policy_Base.h"
+
+#include <ipsecpolapi.h>
+#include <comms-infras\dbaccess.h>
+#include <CommDbConnPref.h>
+#include <featureuids.h>
+#include <e32Debug.h>
+
+/**
+ * This class is to test the policy loading in the order of Bypasss policy,Drop Policy, Drop Policy
+ * 
+ */
+
+class CT_CoverageTest : public CT_IPSec_Load_Policy_Base
+	{
+public:
+	CT_CoverageTest();
+	~CT_CoverageTest();
+	
+	static CT_CoverageTest* NewL();	
+	virtual TBool	DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex);
+	virtual TCleanupOperation CleanupOperation()
+		{
+		return CleanupOperation;
+		}
+		
+protected:
+	void ConstructL();
+	
+private:
+	static void CleanupOperation(TAny* aAny)
+		{
+		TInt* number = static_cast<TInt*>(aAny);
+		delete number;
+		}
+	
+	inline void DoCmdNewL(const TDesC& aEntry);
+	void DoLoadBypassModePolicy(const TDesC& aSection);
+	void DoCmdClose(const TDesC& /*aSection*/);	
+	void DoUnloadBypassPolicy(const TDesC& /*aSection*/);
+	void DoUnloadDropPolicy(const TDesC& /*aSection*/);
+	void DoLoadDropModePolicy(const TDesC& /*aSection*/);
+	void DoLoadNewBypassModePolicy(const TDesC& /*aSection*/);
+	void DoUnloadNewBypassPolicy(const TDesC& /*aSection*/);
+	
+protected:
+  
+	TZoneInfoSet           iMyZoneInfoSet;
+	RIpsecPolicyServ       iDrpPolicyServer;    
+	TPolicyHandlePckg      iDrpPolicyHandle;
+	RIpsecPolicyServ       iBypsPolicyServer;
+	TPolicyHandlePckg      iBypsPolicyHandle;
+	TPolicyHandlePckg      iNewBypsPolicyHandle;
+	};
+
+#endif //__TEF_IPSEC_COVERAGE_TEST_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_ipsec_load_policy_base.h	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,86 @@
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Symbian Foundation License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Connection Test Step Header
+// 
+//
+
+/**
+ @file 
+*/
+#ifndef __TEF_IPSEC_LOAD_POLICY_BASE__
+#define __TEF_IPSEC_LOAD_POLICY_BASE__
+
+
+//system includes here
+#include<DataWrapper.h>
+
+//local includes here
+//---------------------------------------------------------------------------
+class CT_IPSec_Load_Policy_Base : public CDataWrapper
+{
+public:
+    virtual ~CT_IPSec_Load_Policy_Base() 
+    {    
+    delete iObject;
+    iObject = NULL;
+    }
+    
+    CT_IPSec_Load_Policy_Base(): iObject(NULL)
+    {    
+    
+    }
+    
+    virtual TAny* GetObject() { return iObject; }
+    
+    virtual void SetObjectL(TAny* aObject)
+        {
+        DestroyData();
+        iObject = static_cast<TInt*> (aObject);
+        }
+    
+    virtual void    DisownObjectL()
+        {
+        iObject = NULL;
+        }
+    
+    void DestroyData()
+        {
+        delete iObject;
+        iObject=NULL;
+        }
+
+protected:
+
+	virtual void DoDelay(const TDesC& /*aSection*/) {};
+	virtual TBool DoCommandL(const TTEFFunction& /* aCommand */, const TTEFSectionName& /*aSection*/, const TInt /*aAsyncErrorIndex*/){return ETrue;}
+	
+	/*
+	*Execute the test (test case code).
+	*/
+	virtual void DoCmdTestConnection(const TDesC& /*aSection*/){};
+
+	/*
+	*Execute the test for sending data(test case code).
+	*/
+	virtual void DoCmdSendPacket(const TDesC& /*aSection*/){};
+	
+protected :	
+	TInt* iObject;
+	
+public :	
+	virtual void StopWaiting(){};
+};
+
+#endif//__TEF_IPSEC_LOAD_POLICY_BASE__
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_ipsecconst.h	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,117 @@
+/*
+* 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 the License "Symbian Foundation License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#ifndef __TEF_IPSEC_CONST_H__
+#define __TEF_IPSEC_CONST_H__
+
+#include <e32base.h> 
+#include <es_sock.h>
+#include <e32cmn.h> 
+#include <in_sock.h>
+#include <commdbconnpref.h>
+#include <comms-infras/es_parameterbundle.h>
+
+#if defined(SYMBIAN_CRYPTO)
+#include <cryptostrength.h>
+#else
+#include <cryptalg.h>
+#endif
+
+const TInt KSockBufferLength=7;
+
+//test case name use the following
+_LIT(KIPSecTestBypass, "IPSecTestByPassPolicy");
+_LIT(KIPSecTestDrop, "IPSecTestDropPolicy");
+_LIT(KIPSecTestUMA, "IPSecTestUMAPolicy");
+_LIT(KIPSecCoverageTest, "IPSecTestCoverage");
+
+_LIT(KIPSecSendPacketTest, "IPSecSendPacket");
+_LIT(KIPSecNATKeepAliveTest, "IPSecNATKeepAlive");
+_LIT(KIPSecDPDKeepAliveTest, "IPSecDPDKeepAlive");
+_LIT(KIPSecNATTimeOutTest, "IPSecConfNatTimeout");
+_LIT(KIPSecDPDTimeOutTest,"IPSecConfDPDTimeout");
+_LIT(KIPSecDelConnMgrTest,"IPSecDelConnMgrTest");
+_LIT(KIPSecNATRestartTimerTest,"IPSecNATRestartTimerTest");
+_LIT(KIPSecAddConnWatcherTest,"IPSecAddConnWatcherTest");
+_LIT(KIPSecDelConnWatcherTest,"IPSecDelConnWatcherTest");
+_LIT(KIPSecTimerTest,"IPSecTimerTest");
+
+// Commands
+_LIT(KCloseConnection,"Close");
+_LIT(KSendPackets,	"SendPacket");
+_LIT(KDelayCMD, "Delay");
+_LIT(KReportEvt, "ReportEvt");
+_LIT(KReStartEvtCMD, "ReStartEvt");
+//commands use the following 
+_LIT(KNewCMD,"New");
+_LIT(KTestLoadBypassPolicy, "LoadBypassModePolicy");
+_LIT(KTestLoadDropPolicy, "LoadDropModePolicy");
+_LIT(KLoadBypasspolicy, "LoadBypassModePolicy");
+_LIT(KTestLoadDropModePolicy, "LoadDropModePolicy");
+_LIT(KLoadNewDroppolicy, "LoadNewDropModePolicy");
+_LIT(KLoadNewBypassPolicy, "LoadNewBypassModePolicy");
+_LIT(KUnloadDropPolicy, "UnloadDropModePolicy");
+_LIT(KUnloadBypassPolicy, "UnloadBypassModePolicy");
+_LIT(KUnloadUMAPolicy, "UnloadUMAModePolicy");
+_LIT(KLOadUMAPolicy, "LOadUMAModePolicy");
+_LIT(KLoadUMAByPassPolicy, "LoadByPassModePolicy");
+_LIT(KUnloadNewBypassPolicy,"UnloadNewBypassModePolicy");
+_LIT(KUnloadNewDropPolicy,"UnloadNewDropModePolicy");
+
+
+
+_LIT(KCloseConnectionCMD,"Close");
+_LIT(KSendPacketsCMD,  "SendPacket");
+_LIT(KReportEvtCMD, "ReportEvt");
+_LIT(KAddConnWatcherCMD, "AddConnWatcher");
+_LIT(KDelConnWatcherCMD, "DelConnWatcher");
+_LIT(KDelConnMgrCMD, "DelConnMgr");
+_LIT(KIPSecSecondCon, "KIPSecSecondCon");
+
+/// Command parameters
+_LIT(KObjectValue, "object_value");
+_LIT(KTOSorTrafficClass, "TosOrTrafficClass");
+_LIT(KPort, "port");
+_LIT(KIapid, "iapid");
+_LIT(KDestAddr, "destaddr");
+_LIT(KDelay, "Delay");
+_LIT(KLocaladdr, "localaddr");
+_LIT(KIPSecNATTimeOutValDPDTest, "IPSecNATTimeOutVal1");
+_LIT(KIPSecDPDTimeOutValDPDTest,"IPSecDPDTimeOutVal1");
+_LIT(KIPSecNATRestartTimerAfter,"IPSecNATRestartTimerAfter");
+_LIT(KIPSecDelay,"IPSecDelay");
+
+//parameters use the following
+_LIT(KParamObjectValue, "object_value");
+_LIT(KParamPort, "port");
+_LIT(KParamIapid, "iapid");
+_LIT(KParamDestIPAddr, "destaddr");
+_LIT(KParamDelay, "Delay");
+_LIT(KParamLocaladdr, "localaddr");
+_LIT(KParamIPSecNATTimeOutValDPDTest, "IPSecNATTimeOutVal1");
+_LIT(KParamIPSecDPDTimeOutValDPDTest,"IPSecDPDTimeOutVal1");
+_LIT(KParamIPSecNATRestartTimerAfter,"IPSecNATRestartTimerAfter");
+_LIT(KIPSecNATTimeOutValue,"IPSecNATTimeOutVal");
+_LIT(KIPSecDPDTimeOutValue,"IPSecDPDTimeOutVal");
+_LIT(KParamIPSecDelay,"IPSecDelay");
+_LIT(KParamDestIPAddr1, "destaddr1");
+_LIT(KParamDestIPAddr2, "destaddr2");
+_LIT(KParamLocaladdr1, "localaddr1");
+_LIT(KParamLocaladdr2, "localaddr2");
+_LIT(KDrive, "drive");
+_LIT(KMsvServerPattern,	"!MsvServer*");
+
+#endif /*__TEF_IPSEC_CONST_H__*/
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_ipsectestserver.h	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,88 @@
+/*
+* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+/**
+@test
+@internalComponent
+
+This contains CT_IPSecTestServer
+*/
+
+#ifndef __TEF_IPSEC_TESTSERVER_H__
+#define __TEF_IPSEC_TESTSERVER_H__
+
+#include <test/testblockcontroller.h>
+#include <test/testserver2.h>
+#include "te_ipsecconst.h"
+#include "te_loadpolicy_bbd.h"
+#include "te_loadpolicy_bdd.h"
+#include "te_selectorconflict.h"
+#include "te_loadpolicy_uma.h"
+#include "te_coverage_test.h"
+
+
+class CT_LoadPolicyTestBlock : public CTestBlockController
+	{
+public:
+    static CT_LoadPolicyTestBlock* NewL();
+    CT_LoadPolicyTestBlock() : CTestBlockController() {}
+	~CT_LoadPolicyTestBlock() {}
+
+	CDataWrapper* CreateDataL(const TDesC& aData)
+		{	  
+		CDataWrapper* wrapper = NULL;
+		
+		if (KIPSecTestBypass() == aData)
+			{
+			wrapper = CT_LoadPolicyBBD::NewL();		
+			}
+		else if (KIPSecTestUMA() == aData)
+		    {
+		    wrapper = CT_LoadPolicyUMA::NewL();	    
+		    }		
+		else if (KIPSecTestDrop() == aData)
+            {
+            wrapper = CT_LoadPolicyBDD::NewL();
+            }
+		else if (KIPSecCoverageTest() == aData)
+		    {
+            wrapper = CT_CoverageTest::NewL();
+		    }
+		else
+			{
+			wrapper = NULL;
+			}
+		return wrapper;
+		}
+	};
+
+class CT_LoadPolicyTestServer : public CTestServer2
+	{
+public:
+    CT_LoadPolicyTestServer() {}
+	~CT_LoadPolicyTestServer() {}
+
+	static CT_LoadPolicyTestServer* NewL();
+
+	CT_LoadPolicyTestBlock*	CreateTestBlock()
+		{
+		CT_LoadPolicyTestBlock* controller = new (ELeave) CT_LoadPolicyTestBlock();
+		return controller;
+		}
+	};
+
+#endif //__TEF_IPSEC_TESTSERVER_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_loadpolicy_bbd.h	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,79 @@
+/*
+* Copyright (c) 2003 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+/**
+ * @file ts_ipsec_crypto.h header file for main test code for IPsec
+ */
+
+#if (!defined  __TEF_IPSEC_LOADPOLICY_BDD_H__)
+#define __TEF_IPSEC_LOADPOLICY_BDD_H__
+
+
+//local includes here
+#include "ipsecpolapi.h"
+#include "te_IPSec_Load_Policy_Base.h"
+
+
+/**
+ * This class is to test the policy loading in the order of Bypasss policy,Drop Policy, Drop Policy
+ * 
+ */
+
+class CT_LoadPolicyBBD : public CT_IPSec_Load_Policy_Base
+	{
+public:
+	CT_LoadPolicyBBD();
+	~CT_LoadPolicyBBD();
+	
+	static CT_LoadPolicyBBD* NewL();	
+	virtual TBool	DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex);
+	virtual TCleanupOperation CleanupOperation()
+		{
+		return CleanupOperation;
+		}
+		
+protected:
+	void ConstructL();
+	
+private:
+	static void CleanupOperation(TAny* aAny)
+		{
+		TInt* number = static_cast<TInt*>(aAny);
+		delete number;
+		}
+	
+	inline void DoCmdNewL(const TDesC& aEntry);
+	void DoLoadBypassModePolicy(const TDesC& aSection);
+	void DoCmdClose(const TDesC& /*aSection*/);	
+	void DoUnloadBypassPolicy(const TDesC& /*aSection*/);
+	void DoUnloadDropPolicy(const TDesC& /*aSection*/);
+	void DoLoadDropModePolicy(const TDesC& /*aSection*/);
+	void DoLoadNewBypassModePolicy(const TDesC& /*aSection*/);
+	void DoUnloadNewBypassPolicy(const TDesC& /*aSection*/);
+	
+protected:
+  
+	TZoneInfoSet           iMyZoneInfoSet;
+	RIpsecPolicyServ       iDrpPolicyServer;    
+	TPolicyHandlePckg      iDrpPolicyHandle;
+	RIpsecPolicyServ       iBypsPolicyServer;
+	TPolicyHandlePckg      iBypsPolicyHandle;
+	TPolicyHandlePckg      iNewBypsPolicyHandle;
+	};
+
+#endif //__TEF_IPSEC_LOADPOLICY_BDD_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_loadpolicy_bdd.h	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,74 @@
+/*
+* Copyright (c) 2003 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+/**
+ * @file ts_ipsec_crypto.h header file for main test code for IPsec
+ */
+
+#if (!defined __TEF_IPSEC_LOADPOLICYBDD_H__)
+#define __TEF_IPSEC_LOADPOLICYBDD_H_
+
+//local includes here
+#include "ipsecpolapi.h"
+#include "te_ipsec_load_policy_base.h"
+
+//forward declaration 
+class CT_SelectorConflict;
+
+class CT_LoadPolicyBDD : public CT_IPSec_Load_Policy_Base
+	{
+public:
+	CT_LoadPolicyBDD();
+	~CT_LoadPolicyBDD();
+	
+	static CT_LoadPolicyBDD* NewL();	
+	virtual TBool	DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex);
+	virtual TCleanupOperation CleanupOperation()
+		{
+		return CleanupOperation;
+		}
+		
+protected:
+	void ConstructL();
+	
+private:
+	static void CleanupOperation(TAny* aAny)
+		{
+		TInt* number = static_cast<TInt*>(aAny);
+		delete number;
+		}
+	
+	inline void DoCmdNewL(const TDesC& aEntry);
+	void DoLoadDropModePolicy(const TDesC& aSection);
+	void DoCmdClose(const TDesC& /*aSection*/);	
+	void DoLoadBypassModePolicy(const TDesC& /*aSection*/);
+	void DoLoadNewDropModePolicy(const TDesC& /*aSection*/);
+	void DoUnloadBypassPolicy(const TDesC& /*aSection*/);
+	void DoUnloadDropPolicy(const TDesC& /*aSection*/);
+	void DoUnloadNewDropModePolicy(const TDesC& /*aSection*/);
+protected:
+
+	TZoneInfoSet         iMyZoneInfoSet;
+	RIpsecPolicyServ     iDrpPolicyServer;    
+	TPolicyHandlePckg    iDrpPolicyHandle;
+	RIpsecPolicyServ     iBypsPolicyServer;
+	TPolicyHandlePckg    iBypsPolicyHandle;
+	TPolicyHandlePckg    iNewDrpPolicyHandle;
+	};
+
+#endif // __TEF_IPSEC_LOADPOLICYBDD_H_
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_loadpolicy_uma.h	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,81 @@
+/*
+* Copyright (c) 2003 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+/**
+ * @file ts_ipsec_crypto.h header file for main test code for IPsec
+ */
+
+#if (!defined  __TEF_IPSEC_LOADPOLICY_UMA_H__)
+#define __TEF_IPSEC_LOADPOLICY_UMA_H__
+
+//local includes here
+#include "te_IPSec_Load_Policy_Base.h"
+#include "ipsecpolapi.h"
+
+//forward declaration 
+class CT_SelectorConflict;
+class RIpsecPolicyServ;
+
+
+/**
+ * This class is to test the policy loading in the order of Bypasss policy,Drop Policy, Drop Policy
+ * 
+ */
+
+class CT_LoadPolicyUMA : public CT_IPSec_Load_Policy_Base
+	{
+public:
+	CT_LoadPolicyUMA();
+	~CT_LoadPolicyUMA();
+	
+	static CT_LoadPolicyUMA* NewL();	
+	virtual TBool	DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex);
+	virtual TCleanupOperation CleanupOperation()
+		{
+		return CleanupOperation;
+		}
+		
+protected:
+	void ConstructL();
+	
+private:
+	static void CleanupOperation(TAny* aAny)
+		{
+		TInt* number = static_cast<TInt*>(aAny);
+		delete number;
+		}
+	
+	inline void DoCmdNewL(const TDesC& aEntry);
+	void DoLoadUMAPolicy(const TDesC& aSection);
+	void DoCmdClose(const TDesC& /*aSection*/);	
+	void DoUnloadBypassPolicy(const TDesC& /*aSection*/);
+	void DoUnloadDropPolicy(const TDesC& /*aSection*/);
+	void DoLoadDropModePolicy(const TDesC& /*aSection*/);
+	void DoLoadBypassModePolicy(const TDesC& /*aSection*/);
+	void DoUnloadUMAPolicy(const TDesC& /*aSection*/);
+	
+protected:
+	TZoneInfoSet           iMyZoneInfoSet;
+	RIpsecPolicyServ       iDrpPolicyServer;    
+	TPolicyHandlePckg      iDrpPolicyHandle;
+	RIpsecPolicyServ       iBypsPolicyServer;
+	TPolicyHandlePckg      iBypsPolicyHandle;
+	TPolicyHandlePckg      iUMAPolicyHandle;
+    	};
+
+#endif //__TEF_IPSEC_LOADPOLICY_UMA_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_selectorconflict.h	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,68 @@
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Symbian Foundation License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Connection Test Step Header
+// 
+//
+
+/**
+ @file 
+*/
+#ifndef __TEF_IPSEC_SELECTORCONFLICT_H__
+#define __TEF_IPSEC_SELECTORCONFLICT_H__
+
+#include <es_sock.h>
+#include <e32base.h> 
+#include <testexecutestepbase.h>
+//local includes here
+#include "te_IPSec_Load_Policy_Base.h"
+
+//---------------------------------------------------------------------------
+class CT_SelectorConflict : public CTimer
+{
+public:
+	~CT_SelectorConflict();
+	static CT_SelectorConflict* NewL(int aIapId);
+	void RecvUDP();
+	void SendTcpPacketL();
+	void RecvTcpPacketL();
+	void ConnectL(TInt aPort, TPtrC16 aIpDAddr);
+	void Close();		
+	void delay(CT_IPSec_Load_Policy_Base *aBase, TInt KDelayTime);
+	TBool GetKeepAlive();	
+	void SetKeepAlive( TBool aKeepAlivetimeout);	
+	void start(int aIapId);
+
+private:
+	CT_SelectorConflict();
+	void ConstructL(int aIapId);
+
+	void RunL();
+	void DoCancel();	
+	TInt RunError(TInt /*aError*/);
+private:    
+    RSocketServ     iSs;
+    RSocket         iSock;
+    RSocket         iRecvSock;
+    RConnection     iConn;
+    TBuf8<256>      iRecvBuf;
+    TSockAddr       iSenderAddr;
+    TSockXfrLength  iBytesRead;
+	TBool iKeepalive;
+	CT_IPSec_Load_Policy_Base *iPtrKeepAlive; 
+public :
+	static CT_SelectorConflict *iSelfPtr;
+};
+
+#endif// __TEF_IPSEC_SELECTORCONFLICT_H__
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict-uma1.script	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,79 @@
+//
+// 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 the License "Symbian Foundation License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+/////////////////////////////////////////////////////////////////
+//! @file                   ns-ipsec-ike-selectorconflict_bbd1.script
+//! @SYMScriptAuthor        suresh
+//! @SYMTestSuiteName       te_ipsec_selector_conflict
+//! @SYMScriptCreationDate  thursday july 8 12:23:00 IST 2010
+/////////////////////////////////////////////////////////////////
+
+PRINT Run test case(s) for suite te_ipsec_selector_conflict
+
+// ToDo: Remember to load the relevant suite before starting any test case(s)
+LOAD_SUITE	te_ipsec_selector_conflict  -SharedData
+
+ced -i z:\testdata\configs\Te_ethced_2483.xml ced.log
+ced -i z:\testdata\configs\Te_ethced_2483VPN.xml ced.log
+
+//Create private folder
+RUN_UTILS MkDir c:\private\101f7993\
+
+//copy .pin file from data folder to private folder - one time job
+RUN_UTILS CopyFile z:\testdata\configs\te_2483.pin c:\private\101f7993\te_2483.pin
+RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483.pin
+
+//copy .pol file from data folder to private folder
+//RUN_UTILS DeleteFile c:\private\101f7993\linux_tunnel.pol
+RUN_UTILS CopyFile z:\testdata\configs\te_2483.pol c:\private\101f7993\te_2483.pol
+RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483.pol
+
+START_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA1
+//! @SYMTestCaseID          NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA1
+//! @SYMCreationDate        08-07-2010
+//! @SYMAuthor              suresh babu k
+//! @SYMTestCaseDesc        IPSec SELECTOR CONFLICT DURING POLICY LOADING
+//!                         
+//!                         DUT should act as the Initiator for Phase 1.
+//!
+//!                         
+//!                         1.Load bypass mode policy                          
+//!                         2.Make connection with secure gateway and send some packets 
+//!                         3.Load another bypass policy 
+//!                         4.Load drop mode policy
+//!     
+//!
+//!                         DH Group - 2
+//!                         
+//!                         Phase 2
+//!                         Security Protocol - ESP
+//!                         Encapsulation Mode - Tunnel
+//!                         Encryption Algorithm - AES with 128-bit keys in CBC mode
+//!                         Authentication Algorithm - AES-XCBC-MAC-96
+//! @SYMREQ                 REQ10662
+
+	
+	START_TEST_BLOCK    100     te_ipsec_selector_conflict z:\testdata\scripts\ns-ipsec-ikev1test-ops.ini
+	      CREATE_OBJECT   IPSecTestUMAPolicy   IKE-Policy-TestWrapperSection
+	      COMMAND                   IKE-Policy-TestWrapperSection   New
+	      COMMAND                   IKE-Policy-TestWrapperSection   LOadUMAModePolicy         Value1ParamSection
+	      COMMAND                   IKE-Policy-TestWrapperSection   LoadByPassModePolicy      Value1ParamSection
+              COMMAND  !Error=-5146     IKE-Policy-TestWrapperSection   LoadDropModePolicy        Value1ParamSection
+              COMMAND     	        IKE-Policy-TestWrapperSection   UnloadBypassModePolicy    Value1ParamSection
+              COMMAND     	        IKE-Policy-TestWrapperSection   UnloadUMAModePolicy       Value1ParamSection
+	      COMMAND                   IKE-Policy-TestWrapperSection   Close                     Value1ParamSection
+	END_TEST_BLOCK
+
+END_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict-uma2.script	Thu Aug 19 11:25:30 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 the License "Symbian Foundation License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+/////////////////////////////////////////////////////////////////
+//! @file                   ns-ipsec-ike-selectorconflict_bbd2.script
+//! @SYMScriptAuthor        suresh
+//! @SYMTestSuiteName       te_ipsec_selector_conflict
+//! @SYMScriptCreationDate  thursday july 08 12:23:00 IST 2010
+/////////////////////////////////////////////////////////////////
+
+PRINT Run test case(s) for suite te_ipsec_selector_conflict
+
+// ToDo: Remember to load the relevant suite before starting any test case(s)
+LOAD_SUITE	te_ipsec_selector_conflict  -SharedData
+
+ced -i z:\testdata\configs\Te_ethced_2483.xml ced.log
+ced -i z:\testdata\configs\Te_ethced_2483VPN.xml ced.log
+
+//Create private folder
+RUN_UTILS MkDir c:\private\101f7993\
+
+//copy .pin file from data folder to private folder - one time job
+RUN_UTILS CopyFile z:\testdata\configs\te_2483.pin c:\private\101f7993\te_2483.pin
+RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483.pin
+
+//copy .pol file from data folder to private folder
+//RUN_UTILS DeleteFile c:\private\101f7993\linux_tunnel.pol
+RUN_UTILS CopyFile z:\testdata\configs\te_2483.pol c:\private\101f7993\te_2483.pol
+RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483.pol
+	
+
+START_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA2
+//! @SYMTestCaseID          NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA2
+//! @SYMCreationDate        08-07-2010
+//! @SYMAuthor              suresh babu k
+//! @SYMTestCaseDesc        IPSec SELECTOR CONFLICT DURING POLICY LOADING
+//!                         
+//!                         DUT should act as the Initiator for Phase 1.
+//!
+//!                         
+//!                         1.Load bypass mode policy                          
+//!                         2.Make connection with secure gateway and send some packets 
+//!                         3.Load drop mode policy 
+//!                         4.Load another bypass mode policy
+//!     
+//!
+//!                         DH Group - 2
+//!                         
+//!                         Phase 2
+//!                         Security Protocol - ESP
+//!                         Encapsulation Mode - Tunnel
+//!                         Encryption Algorithm - AES with 128-bit keys in CBC mode
+//!                         Authentication Algorithm - AES-XCBC-MAC-96
+//! @SYMREQ                 REQ10662
+
+
+	
+	START_TEST_BLOCK    100   te_ipsec_selector_conflict   z:\testdata\scripts\ns-ipsec-ikev1test-ops.ini
+	      CREATE_OBJECT   IPSecTestUMAPolicy  IKE-Policy-TestWrapperSection
+	      COMMAND                   IKE-Policy-TestWrapperSection  New
+	      COMMAND			IKE-Policy-TestWrapperSection  LOadUMAModePolicy         Value1ParamSection
+	      COMMAND   !Error=-5146    IKE-Policy-TestWrapperSection  LoadDropModePolicy        Value1ParamSection
+              COMMAND                   IKE-Policy-TestWrapperSection  LoadByPassModePolicy      Value1ParamSection
+              COMMAND     	        IKE-Policy-TestWrapperSection  UnloadUMAModePolicy       Value1ParamSection
+	      COMMAND     	        IKE-Policy-TestWrapperSection  UnloadBypassModePolicy    Value1ParamSection
+	      COMMAND                   IKE-Policy-TestWrapperSection  Close                     Value1ParamSection            
+	END_TEST_BLOCK
+
+END_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA2    
+
+
+RUN_UTILS DeleteFile c:\Te_ethced_2483VPN.xml
+RUN_UTILS DeleteFile c:\Te_ethced_2483.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict-uma3.script	Thu Aug 19 11:25:30 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 the License "Symbian Foundation License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+/////////////////////////////////////////////////////////////////
+//! @file                   ns-ipsec-ike-selectorconflict_bbd1.script
+//! @SYMScriptAuthor        suresh
+//! @SYMTestSuiteName       te_ipsec_selector_conflict
+//! @SYMScriptCreationDate  thursday july 8 12:23:00 IST 2010
+/////////////////////////////////////////////////////////////////
+
+PRINT Run test case(s) for suite te_ipsec_selector_conflict
+
+// ToDo: Remember to load the relevant suite before starting any test case(s)
+LOAD_SUITE	te_ipsec_selector_conflict  -SharedData
+
+ced -i z:\testdata\configs\Te_ethced_2483.xml ced.log
+ced -i z:\testdata\configs\Te_ethced_2483VPN.xml ced.log
+
+
+//Create private folder
+RUN_UTILS MkDir c:\private\101f7993\
+
+//copy .pin file from data folder to private folder - one time job
+RUN_UTILS CopyFile z:\testdata\configs\te_2483.pin c:\private\101f7993\te_2483.pin
+RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483.pin
+
+//copy .pol file from data folder to private folder
+RUN_UTILS DeleteFile c:\private\101f7993\linux_tunnel.pol
+RUN_UTILS CopyFile z:\testdata\configs\te_2483.pol c:\private\101f7993\te_2483.pol
+RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483.pol
+	
+	
+
+START_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA3
+//! @SYMTestCaseID          NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA3
+//! @SYMCreationDate        08-07-2010
+//! @SYMAuthor              suresh babu k
+//! @SYMTestCaseDesc        IPSec SELECTOR CONFLICT DURING POLICY LOADING
+//!                         
+//!                         DUT should act as the Initiator for Phase 1.
+//!
+//!                         
+//!                         1.Load bypass mode policy                          
+//!                         2.Make connection with secure gateway and send some packets 
+//!                         3.Load another bypass policy 
+//!                         4.Load drop mode policy
+//!     
+//!
+//!                         DH Group - 2
+//!                         
+//!                         Phase 2
+//!                         Security Protocol - ESP
+//!                         Encapsulation Mode - Tunnel
+//!                         Encryption Algorithm - AES with 128-bit keys in CBC mode
+//!                         Authentication Algorithm - AES-XCBC-MAC-96
+//! @SYMREQ                 REQ10662
+
+	
+	START_TEST_BLOCK    100     te_ipsec_selector_conflict z:\testdata\scripts\ns-ipsec-ikev1test-ops.ini
+	      CREATE_OBJECT   IPSecTestUMAPolicy  IKE-Policy-TestWrapperSection
+	      COMMAND                   IKE-Policy-TestWrapperSection New
+	      COMMAND			IKE-Policy-TestWrapperSection LoadDropModePolicy       Value1ParamSection
+	      COMMAND    !Error=-5146	IKE-Policy-TestWrapperSection LOadUMAModePolicy        Value1ParamSection
+	      COMMAND  	!Error=-5146    IKE-Policy-TestWrapperSection LoadByPassModePolicy     Value1ParamSection
+              COMMAND       		IKE-Policy-TestWrapperSection UnloadDropModePolicy      Value1ParamSection
+	      COMMAND                   IKE-Policy-TestWrapperSection Close                    Value1ParamSection
+	END_TEST_BLOCK
+
+END_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA3
+
+
+RUN_UTILS DeleteFile c:\Te_ethced_2483VPN.xml
+RUN_UTILS DeleteFile c:\Te_ethced_2483.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict-uma4.script	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,80 @@
+//
+// 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 the License "Symbian Foundation License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+/////////////////////////////////////////////////////////////////
+//! @file                   ns-ipsec-ike-selectorconflict_ddb1.script
+//! @SYMScriptAuthor        suresh
+//! @SYMTestSuiteName       te_ipsec_selector_conflict
+//! @SYMScriptCreationDate  thursday july 08 12:23:00 IST 2010
+/////////////////////////////////////////////////////////////////
+
+PRINT Run test case(s) for suite te_ipsec_selector_conflict
+
+// ToDo: Remember to load the relevant suite before starting any test case(s)
+LOAD_SUITE	te_ipsec_selector_conflict  -SharedData
+
+ced -i z:\testdata\configs\Te_ethced_2483.xml ced.log
+ced -i z:\testdata\configs\Te_ethced_2483VPN_drop.xml ced.log
+
+//Create private folder
+RUN_UTILS MkDir c:\private\101f7993\
+
+//copy .pin file from data folder to private folder - one time job
+RUN_UTILS CopyFile z:\testdata\configs\te_2483_drop.pin c:\private\101f7993\te_2483_drop.pin
+RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483_drop.pin
+
+//copy .pol file from data folder to private folder
+RUN_UTILS CopyFile z:\testdata\configs\te_2483_drop.pol c:\private\101f7993\te_2483_drop.pol
+RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483_drop.pol	
+
+START_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA4
+//! @SYMTestCaseID          NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA4
+//! @SYMCreationDate        08-07-2010
+//! @SYMAuthor              suresh babu k
+//! @SYMTestCaseDesc        IPSec SELECTOR CONFLICT DURING POLICY LOADING
+//!                         
+//!                         DUT should act as the Initiator for Phase 1.
+//!
+//!                         
+//!                         1.Load drop mode policy                          
+//!                         2.Make connection with secure gateway and send some packets
+//!                         3.Load another drop mode policy 
+//!                         4.Load bypass mode policy
+//!                         
+//!                         DH Group - 2
+//!                         
+//!                         Phase 2
+//!                         Security Protocol - ESP
+//!                         Encapsulation Mode - Tunnel
+//!                         Encryption Algorithm - AES with 128-bit keys in CBC mode
+//!                         Authentication Algorithm - AES-XCBC-MAC-96
+//! @SYMREQ                 REQ10662
+
+	
+	START_TEST_BLOCK    100     te_ipsec_selector_conflict z:\testdata\scripts\ns-ipsec-ikev1test-ops.ini
+	        CREATE_OBJECT   IPSecTestUMAPolicy  IKE-Policy-TestWrapperSection
+	        COMMAND                   IKE-Policy-TestWrapperSection   New
+	        COMMAND                   IKE-Policy-TestWrapperSection   LoadByPassModePolicy    Value1ParamSection
+                COMMAND                   IKE-Policy-TestWrapperSection   LOadUMAModePolicy       Value1ParamSection
+		COMMAND  !Error=-5146     IKE-Policy-TestWrapperSection   LoadDropModePolicy      Value1ParamSection
+                COMMAND                   IKE-Policy-TestWrapperSection   UnloadUMAModePolicy     Value1ParamSection
+                COMMAND                   IKE-Policy-TestWrapperSection   UnloadBypassModePolicy  Value1ParamSection
+	        COMMAND                   IKE-Policy-TestWrapperSection   Close                   Value1ParamSection
+	END_TEST_BLOCK
+
+END_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA4    
+
+RUN_UTILS DeleteFile c:\Te_ethced_2483VPN_drop.xml
+RUN_UTILS DeleteFile c:\Te_ethced_2483.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict-uma5.script	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,79 @@
+//
+// 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 the License "Symbian Foundation License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+/////////////////////////////////////////////////////////////////
+//! @file                   ns-ipsec-ike-selectorconflict_ddb2.script
+//! @SYMScriptAuthor        suresh
+//! @SYMTestSuiteName       te_ipsec_selector_conflict
+//! @SYMScriptCreationDate  thursday july 08 12:23:00 IST 2010
+/////////////////////////////////////////////////////////////////
+
+PRINT Run test case(s) for suite te_ipsec_selector_conflict
+
+// ToDo: Remember to load the relevant suite before starting any test case(s)
+LOAD_SUITE	te_ipsec_selector_conflict  -SharedData
+
+ced -i z:\testdata\configs\Te_ethced_2483.xml ced.log
+ced -i z:\testdata\configs\Te_ethced_2483VPN_drop.xml ced.log
+
+//Create private folder
+RUN_UTILS MkDir c:\private\101f7993\
+
+//copy .pin file from data folder to private folder - one time job
+RUN_UTILS CopyFile z:\testdata\configs\te_2483_drop.pin c:\private\101f7993\te_2483_drop.pin
+RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483_drop.pin
+
+//copy .pol file from data folder to private folder
+RUN_UTILS CopyFile z:\testdata\configs\te_2483_drop.pol c:\private\101f7993\te_2483_drop.pol
+RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483_drop.pol
+
+START_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA5
+//! @SYMTestCaseID          NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA5
+//! @SYMCreationDate        08-07-2010
+//! @SYMAuthor              suresh babu k
+//! @SYMTestCaseDesc        IPSec SELECTOR CONFLICT DURING POLICY LOADING
+//!                         
+//!                         DUT should act as the Initiator for Phase 1.
+//!                         
+//!                         1.Load drop mode policy                          
+//!                         2.Make connection with secure gateway and send some packets
+//!                         3.Load bypass mode policy 
+//!                         4.Load another drop mode policy
+//!                         
+//!                         
+//!                         DH Group - 2
+//!                         
+//!                         Phase 2
+//!                         Security Protocol - ESP
+//!                         Encapsulation Mode - Tunnel
+//!                         Encryption Algorithm - AES with 128-bit keys in CBC mode
+//!                         Authentication Algorithm - AES-XCBC-MAC-96
+//! @SYMREQ                 REQ10662
+
+	
+	START_TEST_BLOCK    100     te_ipsec_selector_conflict z:\testdata\scripts\ns-ipsec-ikev1test-ops.ini
+	        CREATE_OBJECT   IPSecTestUMAPolicy  IKE-Policy-TestWrapperSection
+	        COMMAND                 IKE-Policy-TestWrapperSection   New
+	        COMMAND                 IKE-Policy-TestWrapperSection   LoadDropModePolicy      Value1ParamSection
+                COMMAND  !Error=-5146	IKE-Policy-TestWrapperSection   LoadByPassModePolicy    Value1ParamSection
+                COMMAND  !Error=-5146   IKE-Policy-TestWrapperSection   LOadUMAModePolicy       Value1ParamSection
+                COMMAND                 IKE-Policy-TestWrapperSection   UnloadDropModePolicy     Value1ParamSection
+	        COMMAND                 IKE-Policy-TestWrapperSection   Close                   Value1ParamSection 
+	END_TEST_BLOCK
+
+END_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA5          
+
+RUN_UTILS DeleteFile c:\Te_ethced_2483VPN_drop.xml
+RUN_UTILS DeleteFile c:\Te_ethced_2483.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict-uma6.script	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,82 @@
+//
+// 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 the License "Symbian Foundation License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+/////////////////////////////////////////////////////////////////
+//! @file                   ns-ipsec-ike-selectorconflict_ddb3.script
+//! @SYMScriptAuthor        suresh
+//! @SYMTestSuiteName       te_ipsec_selector_conflict
+//! @SYMScriptCreationDate  thursday july 08 12:23:00 IST 2010
+/////////////////////////////////////////////////////////////////
+
+PRINT Run test case(s) for suite te_ipsec_selector_conflict
+
+// ToDo: Remember to load the relevant suite before starting any test case(s)
+LOAD_SUITE	te_ipsec_selector_conflict -SharedData
+
+ced -i z:\testdata\configs\Te_ethced_2483.xml ced.log
+ced -i z:\testdata\configs\Te_ethced_2483VPN_drop.xml ced.log
+
+//Create private folder
+RUN_UTILS MkDir c:\private\101f7993\
+
+//copy .pin file from data folder to private folder - one time job
+RUN_UTILS CopyFile z:\testdata\configs\te_2483_drop.pin c:\private\101f7993\te_2483_drop.pin
+RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483_drop.pin
+
+//copy .pol file from data folder to private folder
+RUN_UTILS CopyFile z:\testdata\configs\te_2483_drop.pol c:\private\101f7993\te_2483_drop.pol
+RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483_drop.pol
+
+
+START_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA6
+//! @SYMTestCaseID          NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA6
+//! @SYMCreationDate        08-07-2010
+//! @SYMAuthor              suresh babu k
+//! @SYMTestCaseDesc        IPSec SELECTOR CONFLICT DURING POLICY LOADING
+//!                         
+//!                         DUT should act as the Initiator for Phase 1.
+//!
+//!                         
+//!                         1.Load bypass mode policy                          
+//!                         2.Load drop mode policy 
+//!                         3.Make connection with secure gateway and send some packets
+//!                         4.Load another drop mode policy
+//!     
+//!
+//!                         DH Group - 2
+//!                         
+//!                         Phase 2
+//!                         Security Protocol - ESP
+//!                         Encapsulation Mode - Tunnel
+//!                         Encryption Algorithm - AES with 128-bit keys in CBC mode
+//!                         Authentication Algorithm - AES-XCBC-MAC-96
+//! @SYMREQ                 REQ10662
+
+	
+	START_TEST_BLOCK    100     te_ipsec_selector_conflict z:\testdata\scripts\ns-ipsec-ikev1test-ops.ini
+	        CREATE_OBJECT   IPSecTestUMAPolicy  IKE-Policy-TestWrapperSection
+	        COMMAND                  IKE-Policy-TestWrapperSection   New
+	        COMMAND                  IKE-Policy-TestWrapperSection   LoadByPassModePolicy     Value1ParamSection
+                COMMAND  !Error=-5146    IKE-Policy-TestWrapperSection   LoadDropModePolicy       Value1ParamSection
+                COMMAND      		 IKE-Policy-TestWrapperSection   LOadUMAModePolicy        Value1ParamSection
+                COMMAND     	         IKE-Policy-TestWrapperSection   UnloadUMAModePolicy      Value1ParamSection
+                COMMAND     	         IKE-Policy-TestWrapperSection   UnloadBypassModePolicy   Value1ParamSection
+	        COMMAND                  IKE-Policy-TestWrapperSection   Close                    Value1ParamSection
+	END_TEST_BLOCK
+
+END_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-UMA6
+
+RUN_UTILS DeleteFile c:\Te_ethced_2483VPN_drop.xml
+RUN_UTILS DeleteFile c:\Te_ethced_2483.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_bbd1.script	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,96 @@
+//
+// 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 the License "Symbian Foundation License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+/////////////////////////////////////////////////////////////////
+//! @file                   ns-ipsec-ike-selectorconflict_bbd1.script
+//! @SYMScriptAuthor        suresh
+//! @SYMTestSuiteName       te_ipsec_selector_conflict
+//! @SYMScriptCreationDate  thursday july 8 12:23:00 IST 2010
+/////////////////////////////////////////////////////////////////
+
+PRINT Run test case(s) for suite te_ipsec_selector_conflict
+
+// ToDo: Remember to load the relevant suite before starting any test case(s)
+LOAD_SUITE	te_ipsec_selector_conflict  -SharedData
+
+RUN_UTILS CopyFile z:\testdata\configs\Te_ethced_2483.xml c:\Te_ethced_2483.xml
+RUN_UTILS MakeReadWrite c:\Te_ethced_2483.xml
+RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
+
+RUN_UTILS CopyFile z:\testdata\configs\Te_ethced_2483VPN.xml c:\Te_ethced_2483VPN.xml
+RUN_UTILS MakeReadWrite c:\Te_ethced_2483VPN.xml
+RUN_PROGRAM -1 ced c:\Te_ethced_2483VPN.xml
+
+
+//Create private folder
+RUN_UTILS MkDir c:\private\101f7993\
+
+//copy .pin file from data folder to private folder - one time job
+RUN_UTILS CopyFile z:\testdata\configs\te_2483.pin c:\private\101f7993\te_2483.pin
+RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483.pin
+
+//copy .pol file from data folder to private folder
+RUN_UTILS DeleteFile c:\private\101f7993\linux_tunnel.pol
+RUN_UTILS CopyFile z:\testdata\configs\te_2483.pol c:\private\101f7993\te_2483.pol
+RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483.pol
+	
+//run batch file to ping the linux machine. Pol file is change, so need ceding again.
+RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
+RUN_PROGRAM -1 ced c:\Te_ethced_2483VPN.xml
+	
+
+START_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BBD1
+//! @SYMTestCaseID          NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BBD1
+//! @SYMCreationDate        08-07-2010
+//! @SYMAuthor              suresh babu k
+//! @SYMTestCaseDesc        IPSec SELECTOR CONFLICT DURING POLICY LOADING
+//!                         
+//!                         DUT should act as the Initiator for Phase 1.
+//!
+//!                         
+//!                         1.Load bypass mode policy                          
+//!                         2.Make connection with secure gateway and send some packets 
+//!                         3.Load another bypass policy 
+//!                         4.Load drop mode policy
+//!     
+//!
+//!                         DH Group - 2
+//!                         
+//!                         Phase 2
+//!                         Security Protocol - ESP
+//!                         Encapsulation Mode - Tunnel
+//!                         Encryption Algorithm - AES with 128-bit keys in CBC mode
+//!                         Authentication Algorithm - AES-XCBC-MAC-96
+//! @SYMREQ                 REQ10662
+
+	
+	START_TEST_BLOCK    100     te_ipsec_selector_conflict   z:\testdata\scripts\ns-ipsec-ikev1test-ops.ini
+	      CREATE_OBJECT   IPSecTestByPassPolicy   IKE-Policy-TestWrapperSection
+	      COMMAND                   IKE-Policy-TestWrapperSection   New
+	      COMMAND                   IKE-Policy-TestWrapperSection   LoadBypassModePolicy         Value1ParamSection
+	      COMMAND                   IKE-Policy-TestWrapperSection   LoadNewBypassModePolicy      Value1ParamSection
+              COMMAND     !Error=-5146  IKE-Policy-TestWrapperSection   LoadDropModePolicy           Value1ParamSection
+              COMMAND     	        IKE-Policy-TestWrapperSection   UnloadNewBypassModePolicy    Value1ParamSection
+              COMMAND     	        IKE-Policy-TestWrapperSection   UnloadBypassModePolicy       Value1ParamSection
+	      COMMAND                   IKE-Policy-TestWrapperSection   Close                        Value1ParamSection
+	END_TEST_BLOCK
+
+END_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BBD1   
+
+//!RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
+
+
+RUN_UTILS DeleteFile c:\Te_ethced_2483VPN.xml
+RUN_UTILS DeleteFile c:\Te_ethced_2483.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_bbd2.script	Thu Aug 19 11:25:30 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 the License "Symbian Foundation License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+/////////////////////////////////////////////////////////////////
+//! @file                   ns-ipsec-ike-selectorconflict_bbd2.script
+//! @SYMScriptAuthor        suresh
+//! @SYMTestSuiteName       te_ipsec_selector_conflict
+//! @SYMScriptCreationDate  thursday july 08 12:23:00 IST 2010
+/////////////////////////////////////////////////////////////////
+
+PRINT Run test case(s) for suite te_ipsec_selector_conflict
+
+// ToDo: Remember to load the relevant suite before starting any test case(s)
+LOAD_SUITE	te_ipsec_selector_conflict  -SharedData
+
+RUN_UTILS CopyFile z:\testdata\configs\Te_ethced_2483.xml c:\Te_ethced_2483.xml
+RUN_UTILS MakeReadWrite c:\Te_ethced_2483.xml
+RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
+
+RUN_UTILS CopyFile z:\testdata\configs\Te_ethced_2483VPN.xml c:\Te_ethced_2483VPN.xml
+RUN_UTILS MakeReadWrite c:\Te_ethced_2483VPN.xml
+RUN_PROGRAM -1 ced c:\Te_ethced_2483VPN.xml
+
+
+//Create private folder
+RUN_UTILS MkDir c:\private\101f7993\
+
+//copy .pin file from data folder to private folder - one time job
+RUN_UTILS CopyFile z:\testdata\configs\te_2483.pin c:\private\101f7993\te_2483.pin
+RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483.pin
+
+//copy .pol file from data folder to private folder
+//RUN_UTILS DeleteFile c:\private\101f7993\linux_tunnel.pol
+RUN_UTILS CopyFile z:\testdata\configs\te_2483.pol c:\private\101f7993\te_2483.pol
+RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483.pol
+	
+//run batch file to ping the linux machine. Pol file is change, so need ceding again.
+RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
+RUN_PROGRAM -1 ced c:\Te_ethced_2483VPN.xml
+
+START_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BBD2
+//! @SYMTestCaseID          NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BBD2
+//! @SYMCreationDate        08-07-2010
+//! @SYMAuthor              suresh babu k
+//! @SYMTestCaseDesc        IPSec SELECTOR CONFLICT DURING POLICY LOADING
+//!                         
+//!                         DUT should act as the Initiator for Phase 1.
+//!
+//!                         
+//!                         1.Load bypass mode policy                          
+//!                         2.Make connection with secure gateway and send some packets 
+//!                         3.Load drop mode policy 
+//!                         4.Load another bypass mode policy
+//!     
+//!
+//!                         DH Group - 2
+//!                         
+//!                         Phase 2
+//!                         Security Protocol - ESP
+//!                         Encapsulation Mode - Tunnel
+//!                         Encryption Algorithm - AES with 128-bit keys in CBC mode
+//!                         Authentication Algorithm - AES-XCBC-MAC-96
+//! @SYMREQ                 REQ10662
+
+
+	
+	START_TEST_BLOCK    100   te_ipsec_selector_conflict   z:\testdata\scripts\ns-ipsec-ikev1test-ops.ini
+	      CREATE_OBJECT   IPSecTestByPassPolicy   IKE-Policy-TestWrapperSection
+	      COMMAND                   IKE-Policy-TestWrapperSection   New
+	      COMMAND                   IKE-Policy-TestWrapperSection   LoadBypassModePolicy          Value1ParamSection
+	      COMMAND     !Error=-5146  IKE-Policy-TestWrapperSection   LoadDropModePolicy            Value1ParamSection
+              COMMAND                   IKE-Policy-TestWrapperSection   LoadNewBypassModePolicy       Value1ParamSection
+              COMMAND     	        IKE-Policy-TestWrapperSection   UnloadNewBypassModePolicy     Value1ParamSection
+	      COMMAND     	        IKE-Policy-TestWrapperSection   UnloadBypassModePolicy        Value1ParamSection
+	      COMMAND                   IKE-Policy-TestWrapperSection   Close                         Value1ParamSection            
+	END_TEST_BLOCK
+
+END_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BBD2
+
+
+RUN_UTILS DeleteFile c:\Te_ethced_2483VPN.xml
+RUN_UTILS DeleteFile c:\Te_ethced_2483.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_bbd3.script	Thu Aug 19 11:25:30 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 the License "Symbian Foundation License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+/////////////////////////////////////////////////////////////////
+//! @file                   ns-ipsec-ike-selectorconflict_bbd1.script
+//! @SYMScriptAuthor        suresh
+//! @SYMTestSuiteName       te_ipsec_selector_conflict
+//! @SYMScriptCreationDate  thursday july 8 12:23:00 IST 2010
+/////////////////////////////////////////////////////////////////
+
+PRINT Run test case(s) for suite te_ipsec_selector_conflict
+
+// ToDo: Remember to load the relevant suite before starting any test case(s)
+LOAD_SUITE	te_ipsec_selector_conflict  -SharedData
+
+RUN_UTILS CopyFile z:\testdata\configs\Te_ethced_2483.xml c:\Te_ethced_2483.xml
+RUN_UTILS MakeReadWrite c:\Te_ethced_2483.xml
+RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
+
+RUN_UTILS CopyFile z:\testdata\configs\Te_ethced_2483VPN.xml c:\Te_ethced_2483VPN.xml
+RUN_UTILS MakeReadWrite c:\Te_ethced_2483VPN.xml
+RUN_PROGRAM -1 ced c:\Te_ethced_2483VPN.xml
+
+
+//Create private folder
+RUN_UTILS MkDir c:\private\101f7993\
+
+//copy .pin file from data folder to private folder - one time job
+RUN_UTILS CopyFile z:\testdata\configs\te_2483.pin c:\private\101f7993\te_2483.pin
+RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483.pin
+
+//copy .pol file from data folder to private folder
+RUN_UTILS DeleteFile c:\private\101f7993\linux_tunnel.pol
+RUN_UTILS CopyFile z:\testdata\configs\te_2483.pol c:\private\101f7993\te_2483.pol
+RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483.pol
+	
+//run batch file to ping the linux machine. Pol file is change, so need ceding again.
+RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
+RUN_PROGRAM -1 ced c:\Te_ethced_2483VPN.xml
+	
+
+START_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BBD3
+//! @SYMTestCaseID          NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BBD3
+//! @SYMCreationDate        08-07-2010
+//! @SYMAuthor              suresh babu k
+//! @SYMTestCaseDesc        IPSec SELECTOR CONFLICT DURING POLICY LOADING
+//!                         
+//!                         DUT should act as the Initiator for Phase 1.
+//!
+//!                         
+//!                         1.Load bypass mode policy                          
+//!                         2.Make connection with secure gateway and send some packets 
+//!                         3.Load another bypass policy 
+//!                         4.Load drop mode policy
+//!     
+//!
+//!                         DH Group - 2
+//!                         
+//!                         Phase 2
+//!                         Security Protocol - ESP
+//!                         Encapsulation Mode - Tunnel
+//!                         Encryption Algorithm - AES with 128-bit keys in CBC mode
+//!                         Authentication Algorithm - AES-XCBC-MAC-96
+//! @SYMREQ                 REQ10662
+
+	
+	START_TEST_BLOCK    100     te_ipsec_selector_conflict   z:\testdata\scripts\ns-ipsec-ikev1test-ops.ini
+	      CREATE_OBJECT   IPSecTestByPassPolicy   IKE-Policy-TestWrapperSection
+	      COMMAND                   IKE-Policy-TestWrapperSection New
+	      COMMAND                   IKE-Policy-TestWrapperSection LoadDropModePolicy         Value1ParamSection
+	      COMMAND  !Error=-5146     IKE-Policy-TestWrapperSection LoadBypassModePolicy       Value1ParamSection
+	      COMMAND  !Error=-5146     IKE-Policy-TestWrapperSection LoadNewBypassModePolicy    Value1ParamSection  
+              COMMAND                   IKE-Policy-TestWrapperSection UnloadDropModePolicy       Value1ParamSection
+	      COMMAND                   IKE-Policy-TestWrapperSection Close                      Value1ParamSection
+	END_TEST_BLOCK
+
+END_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BBD3
+
+
+RUN_UTILS DeleteFile c:\Te_ethced_2483VPN.xml
+RUN_UTILS DeleteFile c:\Te_ethced_2483.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_bdd1.script	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,91 @@
+//
+// 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 the License "Symbian Foundation License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+/////////////////////////////////////////////////////////////////
+//! @file                   ns-ipsec-ike-selectorconflict_ddb1.script
+//! @SYMScriptAuthor        suresh
+//! @SYMTestSuiteName       te_ipsec_selector_conflict
+//! @SYMScriptCreationDate  thursday july 08 12:23:00 IST 2010
+/////////////////////////////////////////////////////////////////
+
+PRINT Run test case(s) for suite te_ipsec_selector_conflict
+
+// ToDo: Remember to load the relevant suite before starting any test case(s)
+LOAD_SUITE	te_ipsec_selector_conflict  -SharedData
+
+RUN_UTILS CopyFile z:\testdata\configs\Te_ethced_2483.xml c:\Te_ethced_2483.xml
+RUN_UTILS MakeReadWrite c:\Te_ethced_2483.xml
+RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
+
+RUN_UTILS CopyFile z:\testdata\configs\Te_ethced_2483VPN_drop.xml c:\Te_ethced_2483VPN_drop.xml
+RUN_UTILS MakeReadWrite c:\Te_ethced_2483VPN_drop.xml
+RUN_PROGRAM -1 ced c:\Te_ethced_2483VPN_drop.xml
+
+
+//Create private folder
+RUN_UTILS MkDir c:\private\101f7993\
+
+//copy .pin file from data folder to private folder - one time job
+RUN_UTILS CopyFile z:\testdata\configs\te_2483_drop.pin c:\private\101f7993\te_2483_drop.pin
+RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483_drop.pin
+
+//copy .pol file from data folder to private folder
+RUN_UTILS CopyFile z:\testdata\configs\te_2483_drop.pol c:\private\101f7993\te_2483_drop.pol
+RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483_drop.pol
+
+	
+//run batch file to ping the linux machine. Pol file is change, so need ceding again.
+//RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
+//RUN_PROGRAM -1 ced c:\Te_ethced_2483VPN_drop.xml
+
+START_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BDD1
+//! @SYMTestCaseID          NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BDD1
+//! @SYMCreationDate        08-07-2010
+//! @SYMAuthor              suresh babu k
+//! @SYMTestCaseDesc        IPSec SELECTOR CONFLICT DURING POLICY LOADING
+//!                         
+//!                         DUT should act as the Initiator for Phase 1.
+//!
+//!                         
+//!                         1.Load drop mode policy                          
+//!                         2.Make connection with secure gateway and send some packets
+//!                         3.Load another drop mode policy 
+//!                         4.Load bypass mode policy
+//!                         
+//!                         DH Group - 2
+//!                         
+//!                         Phase 2
+//!                         Security Protocol - ESP
+//!                         Encapsulation Mode - Tunnel
+//!                         Encryption Algorithm - AES with 128-bit keys in CBC mode
+//!                         Authentication Algorithm - AES-XCBC-MAC-96
+//! @SYMREQ                 REQ10662
+
+	
+	START_TEST_BLOCK    100     te_ipsec_selector_conflict   z:\testdata\scripts\ns-ipsec-ikev1test-ops.ini
+	        CREATE_OBJECT   IPSecTestDropPolicy   IKE-Policy-TestWrapperSection
+	        COMMAND                   IKE-Policy-TestWrapperSection   New
+	        COMMAND                   IKE-Policy-TestWrapperSection   LoadDropModePolicy          Value1ParamSection
+                COMMAND                   IKE-Policy-TestWrapperSection   LoadNewDropModePolicy       Value1ParamSection
+		COMMAND     !Error=-5146  IKE-Policy-TestWrapperSection   LoadBypassModePolicy        Value1ParamSection
+                COMMAND                   IKE-Policy-TestWrapperSection   UnloadNewDropModePolicy     Value1ParamSection
+                COMMAND                   IKE-Policy-TestWrapperSection   UnloadDropModePolicy        Value1ParamSection               
+	        COMMAND                   IKE-Policy-TestWrapperSection   Close                       Value1ParamSection
+	END_TEST_BLOCK
+
+END_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BDD1         
+
+RUN_UTILS DeleteFile c:\Te_ethced_2483VPN_drop.xml
+RUN_UTILS DeleteFile c:\Te_ethced_2483.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_bdd2.script	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,91 @@
+//
+// 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 the License "Symbian Foundation License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+/////////////////////////////////////////////////////////////////
+//! @file                   ns-ipsec-ike-selectorconflict_ddb2.script
+//! @SYMScriptAuthor        suresh
+//! @SYMTestSuiteName       te_ipsec_selector_conflict
+//! @SYMScriptCreationDate  thursday july 08 12:23:00 IST 2010
+/////////////////////////////////////////////////////////////////
+
+PRINT Run test case(s) for suite te_ipsec_selector_conflict
+
+// ToDo: Remember to load the relevant suite before starting any test case(s)
+LOAD_SUITE	te_ipsec_selector_conflict  -SharedData
+
+RUN_UTILS CopyFile z:\testdata\configs\Te_ethced_2483.xml c:\Te_ethced_2483.xml
+RUN_UTILS MakeReadWrite c:\Te_ethced_2483.xml
+RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
+
+RUN_UTILS CopyFile z:\testdata\configs\Te_ethced_2483VPN_drop.xml c:\Te_ethced_2483VPN_drop.xml
+RUN_UTILS MakeReadWrite c:\Te_ethced_2483VPN_drop.xml
+RUN_PROGRAM -1 ced c:\Te_ethced_2483VPN_drop.xml
+
+
+//Create private folder
+RUN_UTILS MkDir c:\private\101f7993\
+
+//copy .pin file from data folder to private folder - one time job
+RUN_UTILS CopyFile z:\testdata\configs\te_2483_drop.pin c:\private\101f7993\te_2483_drop.pin
+RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483_drop.pin
+
+//copy .pol file from data folder to private folder
+RUN_UTILS CopyFile z:\testdata\configs\te_2483_drop.pol c:\private\101f7993\te_2483_drop.pol
+RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483_drop.pol
+
+	
+//run batch file to ping the linux machine. Pol file is change, so need ceding again.
+//RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
+//RUN_PROGRAM -1 ced c:\Te_ethced_2483VPN_drop.xml
+
+START_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BDD2
+//! @SYMTestCaseID          NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BDD2
+//! @SYMCreationDate        08-07-2010
+//! @SYMAuthor              suresh babu k
+//! @SYMTestCaseDesc        IPSec SELECTOR CONFLICT DURING POLICY LOADING
+//!                         
+//!                         DUT should act as the Initiator for Phase 1.
+//!                         
+//!                         1.Load drop mode policy                          
+//!                         2.Make connection with secure gateway and send some packets
+//!                         3.Load bypass mode policy 
+//!                         4.Load another drop mode policy
+//!                         
+//!                         
+//!                         DH Group - 2
+//!                         
+//!                         Phase 2
+//!                         Security Protocol - ESP
+//!                         Encapsulation Mode - Tunnel
+//!                         Encryption Algorithm - AES with 128-bit keys in CBC mode
+//!                         Authentication Algorithm - AES-XCBC-MAC-96
+//! @SYMREQ                 REQ10662
+
+	
+	START_TEST_BLOCK    100     te_ipsec_selector_conflict   z:\testdata\scripts\ns-ipsec-ikev1test-ops.ini
+	        CREATE_OBJECT   IPSecTestDropPolicy   IKE-Policy-TestWrapperSection
+	        COMMAND                 IKE-Policy-TestWrapperSection   New
+	        COMMAND                 IKE-Policy-TestWrapperSection   LoadDropModePolicy        Value1ParamSection
+                COMMAND    !Error=-5146 IKE-Policy-TestWrapperSection   LoadBypassModePolicy      Value1ParamSection
+                COMMAND                 IKE-Policy-TestWrapperSection   LoadNewDropModePolicy     Value1ParamSection
+                COMMAND                 IKE-Policy-TestWrapperSection   UnloadNewDropModePolicy   Value1ParamSection
+                COMMAND                 IKE-Policy-TestWrapperSection   UnloadDropModePolicy      Value1ParamSection
+	        COMMAND                 IKE-Policy-TestWrapperSection   Close                     Value1ParamSection 
+	END_TEST_BLOCK
+
+END_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BDD2
+
+RUN_UTILS DeleteFile c:\Te_ethced_2483VPN_drop.xml
+RUN_UTILS DeleteFile c:\Te_ethced_2483.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_bdd3.script	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,91 @@
+//
+// 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 the License "Symbian Foundation License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+/////////////////////////////////////////////////////////////////
+//! @file                   ns-ipsec-ike-selectorconflict_ddb3.script
+//! @SYMScriptAuthor        suresh
+//! @SYMTestSuiteName       te_ipsec_selector_conflict
+//! @SYMScriptCreationDate  thursday july 08 12:23:00 IST 2010
+/////////////////////////////////////////////////////////////////
+
+PRINT Run test case(s) for suite te_ipsec_selector_conflict
+
+// ToDo: Remember to load the relevant suite before starting any test case(s)
+LOAD_SUITE	te_ipsec_selector_conflict -SharedData
+
+RUN_UTILS CopyFile z:\testdata\configs\Te_ethced_2483.xml c:\Te_ethced_2483.xml
+RUN_UTILS MakeReadWrite c:\Te_ethced_2483.xml
+RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
+
+RUN_UTILS CopyFile z:\testdata\configs\Te_ethced_2483VPN_drop.xml c:\Te_ethced_2483VPN_drop.xml
+RUN_UTILS MakeReadWrite c:\Te_ethced_2483VPN_drop.xml
+RUN_PROGRAM -1 ced c:\Te_ethced_2483VPN_drop.xml
+
+
+//Create private folder
+RUN_UTILS MkDir c:\private\101f7993\
+
+//copy .pin file from data folder to private folder - one time job
+RUN_UTILS CopyFile z:\testdata\configs\te_2483_drop.pin c:\private\101f7993\te_2483_drop.pin
+RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483_drop.pin
+
+//copy .pol file from data folder to private folder
+RUN_UTILS CopyFile z:\testdata\configs\te_2483_drop.pol c:\private\101f7993\te_2483_drop.pol
+RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483_drop.pol
+
+	
+//run batch file to ping the linux machine. Pol file is change, so need ceding again.
+RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
+RUN_PROGRAM -1 ced c:\Te_ethced_2483VPN_drop.xml
+
+START_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BDD3
+//! @SYMTestCaseID          NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BDD3
+//! @SYMCreationDate        08-07-2010
+//! @SYMAuthor              suresh babu k
+//! @SYMTestCaseDesc        IPSec SELECTOR CONFLICT DURING POLICY LOADING
+//!                         
+//!                         DUT should act as the Initiator for Phase 1.
+//!
+//!                         
+//!                         1.Load bypass mode policy                          
+//!                         2.Load drop mode policy 
+//!                         3.Make connection with secure gateway and send some packets
+//!                         4.Load another drop mode policy
+//!     
+//!
+//!                         DH Group - 2
+//!                         
+//!                         Phase 2
+//!                         Security Protocol - ESP
+//!                         Encapsulation Mode - Tunnel
+//!                         Encryption Algorithm - AES with 128-bit keys in CBC mode
+//!                         Authentication Algorithm - AES-XCBC-MAC-96
+//! @SYMREQ                 REQ10662
+
+	
+	START_TEST_BLOCK    100     te_ipsec_selector_conflict    z:\testdata\scripts\ns-ipsec-ikev1test-ops.ini
+	        CREATE_OBJECT   IPSecTestDropPolicy    IKE-Policy-TestWrapperSection
+	        COMMAND                  IKE-Policy-TestWrapperSection   New
+	        COMMAND                  IKE-Policy-TestWrapperSection   LoadBypassModePolicy     Value1ParamSection
+                COMMAND    !Error=-5146  IKE-Policy-TestWrapperSection   LoadDropModePolicy       Value1ParamSection
+                COMMAND    !Error=-5146  IKE-Policy-TestWrapperSection   LoadNewDropModePolicy    Value1ParamSection
+                COMMAND     	         IKE-Policy-TestWrapperSection   UnloadBypassModePolicy   Value1ParamSection
+	        COMMAND                  IKE-Policy-TestWrapperSection   Close                    Value1ParamSection
+	END_TEST_BLOCK
+
+END_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BDD3
+
+RUN_UTILS DeleteFile c:\Te_ethced_2483VPN_drop.xml
+RUN_UTILS DeleteFile c:\Te_ethced_2483.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_common.script	Thu Aug 19 11:25:30 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:
+//
+
+
+LOAD_SUITE	te_ipsec_selector_conflict  -SharedData
+
+PRINT IPSec_Selector_Conflict TEF3.0 tests
+
+RUN_SCRIPT Z:\TestData\Scripts\ns-ipsec-ike-selectorconflict_bbd1.script
+RUN_SCRIPT Z:\TestData\Scripts\ns-ipsec-ike-selectorconflict_bbd2.script
+RUN_SCRIPT Z:\TestData\Scripts\ns-ipsec-ike-selectorconflict_bbd3.script
+RUN_SCRIPT Z:\TestData\Scripts\ns-ipsec-ike-selectorconflict_bdd1.script
+RUN_SCRIPT Z:\TestData\Scripts\ns-ipsec-ike-selectorconflict_bdd2.script
+RUN_SCRIPT Z:\TestData\Scripts\ns-ipsec-ike-selectorconflict_bdd3.script
+RUN_SCRIPT Z:\TestData\Scripts\ns-ipsec-ike-selectorconflict-uma1.script
+RUN_SCRIPT Z:\TestData\Scripts\ns-ipsec-ike-selectorconflict-uma2.script
+RUN_SCRIPT Z:\TestData\Scripts\ns-ipsec-ike-selectorconflict-uma3.script
+RUN_SCRIPT Z:\TestData\Scripts\ns-ipsec-ike-selectorconflict-uma4.script
+RUN_SCRIPT Z:\TestData\Scripts\ns-ipsec-ike-selectorconflict-uma5.script
+RUN_SCRIPT Z:\TestData\Scripts\ns-ipsec-ike-selectorconflict-uma6.script
+
+
+PRINT Completed_tef3_te_IPSec_Selector_Conflict
+
+
+
+PRINT Completed_tef3_t_ipsec
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_coverage.script	Thu Aug 19 11:25:30 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 the License "Symbian Foundation License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+/////////////////////////////////////////////////////////////////
+//! @file                   ns-ipsec-ike-selectorconflict_bbd1.script
+//! @SYMScriptAuthor        suresh
+//! @SYMTestSuiteName       te_ipsec_selector_conflict
+//! @SYMScriptCreationDate  thursday july 8 12:23:00 IST 2010
+/////////////////////////////////////////////////////////////////
+
+PRINT Run test case(s) for suite te_ipsec_selector_conflict
+
+// ToDo: Remember to load the relevant suite before starting any test case(s)
+LOAD_SUITE	te_ipsec_selector_conflict  -SharedData
+
+RUN_UTILS CopyFile z:\testdata\configs\Te_ethced_2483.xml c:\Te_ethced_2483.xml
+RUN_UTILS MakeReadWrite c:\Te_ethced_2483.xml
+RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
+
+RUN_UTILS CopyFile z:\testdata\configs\Te_ethced_2483VPN.xml c:\Te_ethced_2483VPN.xml
+RUN_UTILS MakeReadWrite c:\Te_ethced_2483VPN.xml
+RUN_PROGRAM -1 ced c:\Te_ethced_2483VPN.xml
+
+
+//Create private folder
+RUN_UTILS MkDir c:\private\101f7993\
+
+//copy .pin file from data folder to private folder - one time job
+RUN_UTILS CopyFile z:\testdata\configs\te_2483.pin c:\private\101f7993\te_2483.pin
+RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483.pin
+
+//copy .pol file from data folder to private folder
+RUN_UTILS DeleteFile c:\private\101f7993\linux_tunnel.pol
+RUN_UTILS CopyFile z:\testdata\configs\te_2483.pol c:\private\101f7993\te_2483.pol
+RUN_UTILS MakeReadWrite c:\private\101f7993\te_2483.pol
+	
+//run batch file to ping the linux machine. Pol file is change, so need ceding again.
+RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
+RUN_PROGRAM -1 ced c:\Te_ethced_2483VPN.xml
+	
+
+START_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BBD1
+//! @SYMTestCaseID          NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BBD1
+//! @SYMCreationDate        08-07-2010
+//! @SYMAuthor              suresh babu k
+//! @SYMTestCaseDesc        IPSec SELECTOR CONFLICT DURING POLICY LOADING
+//!                         
+//!                         DUT should act as the Initiator for Phase 1.
+//!
+//!                         
+//!                         1.Load bypass mode policy                          
+//!                         2.Make connection with secure gateway and send some packets 
+//!                         3.Load another bypass policy 
+//!                         4.Load drop mode policy
+//!     
+//!
+//!                         DH Group - 2
+//!                         
+//!                         Phase 2
+//!                         Security Protocol - ESP
+//!                         Encapsulation Mode - Tunnel
+//!                         Encryption Algorithm - AES with 128-bit keys in CBC mode
+//!                         Authentication Algorithm - AES-XCBC-MAC-96
+//! @SYMREQ                 REQ10662
+
+	
+	START_TEST_BLOCK    100     te_ipsec_selector_conflict   z:\testdata\scripts\ns-ipsec-ikev1test-ops.ini
+	      CREATE_OBJECT    IPSecTestCoverage IKE-Policy-TestWrapperSection
+	      COMMAND                   IKE-Policy-TestWrapperSection   New
+	      COMMAND                   IKE-Policy-TestWrapperSection   LoadBypassModePolicy         Value1ParamSection	      COMMAND                  
+              COMMAND     		IKE-Policy-TestWrapperSection   LoadDropModePolicy           Value1ParamSection
+              COMMAND     	        IKE-Policy-TestWrapperSection   UnloadBypassModePolicy       Value1ParamSection
+              COMMAND     	        IKE-Policy-TestWrapperSection   UnloadDropModePolicy         Value1ParamSection
+	      COMMAND                   IKE-Policy-TestWrapperSection   Close                        Value1ParamSection
+	END_TEST_BLOCK
+
+END_TESTCASE NET-IPSec-SELECTOR-POLICY-CONFLICT-SA-BBD1   
+
+//!RUN_PROGRAM -1 ced c:\Te_ethced_2483.xml
+
+
+RUN_UTILS DeleteFile c:\Te_ethced_2483VPN.xml
+RUN_UTILS DeleteFile c:\Te_ethced_2483.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ikev1test-ops.ini	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,35 @@
+
+[IKE-Policy-TestWrapperSection]
+name        	= obj0
+object_value    = 001
+
+
+[Value1ParamSection]
+#port 7000 is  used by net cat
+#port    =   7000
+port    =   8000
+iapid   =   12
+
+#destination and local ip address
+#destaddr = 192.168.1.1
+#localaddr = 192.168.1.2
+
+localaddr = 10.225.208.102
+destaddr = 10.225.208.183
+
+#for testing configuring nat timeout  value
+IPSecNATTimeOutVal = 10
+IPSecDPDTimeOutVal = 0
+
+
+#for testing configuring dpd timeout  value
+#current NAT time out value is 10 sec and dpd time out is 0 . now increase NAT time out to 30 sec 
+#and dpd time out to 21 sec that is greater than default NAT time out 
+#now dpd event should reach with in 25 sec.
+
+IPSecNATTimeOutVal1 = 30
+IPSecDPDTimeOutVal1 = 21
+
+
+[EchoClientSection]
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/src/te_coverage_test.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,526 @@
+/*
+* Copyright (c) 2003 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+** @File :- te_loadpolicy_bbd.cpp Implements loading the policy 
+*/
+
+
+/**
+ * @file ts_ipsec_polapi.cpp Implements main test code for IPsec
+ */
+
+#include "te_coverage_test.h"
+#include "te_ipsecconst.h"
+#include "te_selectorconflict.h"
+#include <ES_SOCK.H> 
+#include "lib_pfkey.h"
+#include "pfkey_ext.h"
+#include "pfkey_send.h"
+#include <commdbconnpref.h>
+#include <ipsecpolapi.h>
+
+#if defined(SYMBIAN_CRYPTO)
+#include <cryptostrength.h>
+#else
+#include <cryptalg.h>
+#endif
+
+_LIT8( KMyPolicy,  
+"SECURITY_FILE_VERSION: 3\r\n[INFO]\r\n\
+IpSec Policy LOADING\r\n\
+[POLICY]\r\n\
+sa trans_1 = {\r\n\
+esp\r\n\
+encrypt_alg 12\r\n\
+src_specific\r\n\
+}\r\n\
+outbound remote 10.225.208.183 255.255.255.255 protocol 17 = { trans_1(10.225.208.183) }\r\n\
+inbound local 10.225.208.102 255.255.255.255 protocol 17  = { trans_1(10.225.208.183) }\r\n\
+inbound = {}\r\n\
+outbound = {}\r\n" );
+
+
+_LIT8( KMyPolicy1,  
+"SECURITY_FILE_VERSION: 3\r\n[INFO]\r\n\
+IpSec Policy LOADING\r\n\
+[POLICY]\r\n\
+sa trans_2 = {\r\n\
+esp\r\n\
+encrypt_alg 12\r\n\
+src_specific\r\n\
+}\r\n\
+outbound remote 10.225.208.49 255.255.255.255 protocol 17 = { trans_2(10.225.208.49) }\r\n\
+inbound local 10.225.208.155 255.255.255.255 protocol 17  = { trans_2(10.225.208.49) }\r\n" );
+
+_LIT8( KMyPolicy2,  
+"SECURITY_FILE_VERSION: 3\r\n[INFO]\r\n\
+IpSec Policy LOADING\r\n\
+[POLICY]\r\n\
+sa trans_3 = {\r\n\
+esp\r\n\
+encrypt_alg 12\r\n\
+src_specific\r\n\
+}\r\n\
+outbound remote 192.168.1.1 255.255.255.255 protocol 17 = { trans_3() }\r\n\
+inbound local 192.168.1.2 255.255.255.255 protocol 17  = { trans_3() }\r\n\
+inbound = {}\r\n\
+outbound = {}\r\n" );
+
+
+/**
+Purpose: Constructor of CT_IPSecIKEV2TestWrapper class
+@internalComponent
+*/
+CT_CoverageTest::CT_CoverageTest()
+	{
+	}
+
+/**
+Purpose: Destructor of CT_CoverageTest class
+@internalComponent
+*/
+CT_CoverageTest::~CT_CoverageTest()
+	{
+	delete iObject;
+	iObject = NULL;
+	}
+
+/**
+Purpose: Command fuction of CT_CoverageTest class
+@internalComponent
+*/
+CT_CoverageTest* CT_CoverageTest::NewL()
+	{
+	CT_CoverageTest*	ret = new (ELeave) CT_CoverageTest();
+	CleanupStack::PushL(ret);
+	ret->ConstructL();
+	CleanupStack::Pop(ret);
+	return ret;
+	}
+	
+	
+/**
+Purpose: Command fuction for a wrapper class
+@internalComponent
+*/
+void CT_CoverageTest::ConstructL()
+	{
+    TInt errfound;
+    
+	iObject = new (ELeave) TInt;
+	errfound = iDrpPolicyServer.Connect();
+	if( errfound != KErrNone )
+	    {
+	    ERR_PRINTF2(_L("failed to connect RIpsecPolicyServ with error: %d"), errfound);
+	    SetBlockResult(EFail);
+	    return;
+	    }
+	errfound=iBypsPolicyServer.Connect();
+	if( errfound != KErrNone )
+	    {
+	    ERR_PRINTF2(_L("failed to connect RIpsecPolicyServ with error: %d"), errfound);
+	    SetBlockResult(EFail); 
+	    return;
+	    }
+
+	iMyZoneInfoSet.iSelectorZone.iScope = KScopeNetwork;
+	iMyZoneInfoSet.iSelectorZone.iId = 8;
+	iMyZoneInfoSet.iEndPointZone.iScope = KScopeNetwork;
+	iMyZoneInfoSet.iEndPointZone.iId = 7;
+	        
+	}
+
+
+/**
+Purpose: Command fuction for a wrapper class
+@internalComponent
+*/
+TBool CT_CoverageTest::DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex)
+	{
+	TBool ret = ETrue;
+
+	// Print out the parameters for debugging
+	INFO_PRINTF2( _L("<font size=2 color=990000><b>aCommand = %S</b></font>"), &aCommand );
+	INFO_PRINTF2( _L("aSection = %S"), &aSection );
+	INFO_PRINTF2( _L("aAsyncErrorIndex = %D"), aAsyncErrorIndex );
+
+	if(KNewCMD() == aCommand)
+		{
+		DoCmdNewL(aSection);
+		}
+	else if(KTestLoadBypassPolicy() == aCommand)
+		{
+	    DoLoadBypassModePolicy(aSection);
+		}
+	else if (KTestLoadDropModePolicy() == aCommand)
+	    {
+        DoLoadDropModePolicy(aSection);
+	    }
+	else if (KLoadNewBypassPolicy() == aCommand)
+        {
+        DoLoadNewBypassModePolicy(aSection);
+        }
+	else if (KUnloadDropPolicy() == aCommand)
+        {
+        DoUnloadDropPolicy(aSection);
+        }
+	else if (KUnloadBypassPolicy() == aCommand)
+        {
+        DoUnloadBypassPolicy(aSection);
+        }
+	else if (KUnloadNewBypassPolicy() == aCommand)
+	    {
+	    DoUnloadNewBypassPolicy(aSection);
+	    }	
+	else if (KCloseConnection() == aCommand)
+	    {
+	    DoCmdClose(aSection);
+	    }
+	else
+		{
+		ret = EFalse;
+		}
+
+	return ret;
+	}
+
+
+/**
+Purpose: To create a new object of the CTEFTest type through the API.
+
+Ini file options:
+	iniData - The data from the ini file at the section provided.
+
+@internalComponent
+@param  aSection Current ini file command section
+*/
+void CT_CoverageTest::DoCmdNewL(const TDesC& aSection)
+	{
+	TInt objectValue = 0;
+	TInt iapid =0;
+	if (!GetIntFromConfig(aSection, KObjectValue(), objectValue))
+		{
+		ERR_PRINTF2(_L("<font color=FF0000>No parameter %S</font>"), &KObjectValue());
+		SetBlockResult(EFail);
+		}
+	else
+	    {
+	    *iObject = objectValue;	    
+	    
+        if(!GetIntFromConfig(aSection, KIapid(), iapid))
+            {
+            ERR_PRINTF2(_L("<font color=FF0000>No parameter %S</font>"), &KObjectValue());
+            SetBlockResult(EFail);
+            }
+        else
+            {
+            }
+	    }
+	}
+
+/**
+ * Bypass policy loading for ONB scripts
+ */
+void CT_CoverageTest::DoLoadBypassModePolicy(const TDesC& /*aSection*/) 
+    {
+    
+    TInt errfound=iBypsPolicyServer.Connect();
+    if( errfound != KErrNone )
+         {
+         ERR_PRINTF2(_L("failed to connect RIpsecPolicyServ with error: %d"), errfound);
+         SetBlockResult(EFail);
+         return;
+         }
+     /***
+     * this code is to check the UMA setopt function
+     * if we call with 0 then it is considered as UMA policy
+     */
+    TInt sur = 0x2002E241;
+    _LIT8(KFormatStr,"%D");
+    TBuf8<50> sidbuf;
+    sidbuf.Format(KFormatStr,sur);
+    TLex8 lex(sidbuf);    
+    TInt intval;
+    TInt err = lex.Val(intval);
+    
+    //this test case is to cove all the conditions.
+    //in this case all the parmeters are proper
+    TInt error = iBypsPolicyServer.SetOpt(KOptionNameSid, KOptionLevelDefault, sidbuf);        
+    if ( KErrNone != error )
+        {
+        ERR_PRINTF2(_L("DoLoadUMAPolicy->LoadPolicy ERROR  in setOpt to the policy server %d"), error);
+        SetError(error);
+        SetBlockResult(EFail);
+        return ;
+        }
+        
+
+    //in this case second parm is correct
+    error = iBypsPolicyServer.SetOpt(0 , KOptionLevelDefault, sidbuf);        
+    if ( KErrArgument != error )
+        {
+        ERR_PRINTF2(_L("DoLoadUMAPolicy->LoadPolicy ERROR  in setOpt to the policy server %d"), error);
+        SetError(error);
+        SetBlockResult(EFail);
+        return ;
+        }
+
+    //in this case second parm is correct
+    error = iBypsPolicyServer.SetOpt(KOptionNameSid , 0, sidbuf);        
+    if ( KErrArgument != error )
+        {
+        ERR_PRINTF2(_L("DoLoadUMAPolicy->LoadPolicy ERROR  in setOpt to the policy server %d"), error);
+        SetError(error);
+        SetBlockResult(EFail);
+        return ;
+        }
+    
+       RSocketServ pSocketServ;
+       /** Handle to SADB socket */
+       RSADB pSADB;
+       err = pSocketServ.Connect();
+       if ( err != KErrNone)
+            {
+            ERR_PRINTF2(_L("DoLoadDropModePolicy():- Failed to connect  RSocketServ with error: %d"), err);
+            SetBlockResult(EFail);   
+            }   
+       err = pSADB.Open(pSocketServ);
+       if ( err != KErrNone)
+            {
+            ERR_PRINTF2(_L("DoLoadDropModePolicy():- Failed to open RSADB with error: %d"), err);
+            SetBlockResult(EFail);  
+            }                                   
+                  
+       HBufC8 *policyData = HBufC8::NewLC( KMyPolicy().Length() + 256); // Allow size for IP spec.
+       TPtr8 policyDataPtr(policyData->Des());
+       policyDataPtr.Append(KMyPolicy);
+       ///
+        CMDBSession *cmdbSession = CMDBSession::NewL(CMDBSession::LatestVersion());            
+        CleanupStack::PushL(cmdbSession);
+        CCDIAPRecord *iapRecord = (CCDIAPRecord*)CCDRecordBase::RecordFactoryL(KCDTIdIAPRecord);
+        CleanupStack::PushL(iapRecord);
+        iapRecord->SetRecordId(12);
+        iapRecord->LoadL(*cmdbSession);
+        iapRecord->iAppSid = 0x2002E241;
+        iapRecord->ModifyL(*cmdbSession);
+        CleanupStack::PopAndDestroy(iapRecord);
+        CleanupStack::PopAndDestroy(cmdbSession);
+       
+       //
+       TRequestStatus status;
+       iBypsPolicyServer.LoadPolicy( *policyData, iBypsPolicyHandle, status, iMyZoneInfoSet);
+       User::WaitForRequest(status);
+       TInt err1 = status.Int();
+       if(err1 == KErrNone)
+           {
+           iBypsPolicyServer.ActivatePolicy(iBypsPolicyHandle(), status );
+           User::WaitForRequest(status);
+           User::LeaveIfError(status.Int());   
+           SetBlockResult(EPass);
+           }
+       else
+           {
+           SetError(status.Int());
+           ERR_PRINTF2(_L("DoLoadDropModePolicy->LoadPolicy failed with error: %d"),err1);
+           SetBlockResult(EFail);
+           }
+       CleanupStack::PopAndDestroy(policyData);    
+       pSADB.Close();
+       pSocketServ.Close();    
+    }
+
+/*
+*Execute the test for closing the connection.
+*/
+void CT_CoverageTest::DoLoadDropModePolicy(const TDesC& /*aSection*/)
+    {       
+    RSocketServ pSocketServ;
+    /** Handle to SADB socket */
+    RSADB pSADB;
+    TInt err;
+            
+    err = pSocketServ.Connect();
+    if ( err != KErrNone)
+         {
+         ERR_PRINTF2(_L("DoLoadDropModePolicy():- Failed to connect  RSocketServ with error: %d"), err);
+         SetBlockResult(EFail);   
+         }   
+    err = pSADB.Open(pSocketServ);
+    if ( err != KErrNone)
+         {
+         ERR_PRINTF2(_L("DoLoadDropModePolicy():- Failed to open RSADB with error: %d"), err);
+         SetBlockResult(EFail);  
+         }                                   
+               
+    HBufC8 *policyData = HBufC8::NewLC( KMyPolicy1().Length() + 256); // Allow size for IP spec.
+    TPtr8 policyDataPtr(policyData->Des());
+    policyDataPtr.Append(KMyPolicy1);
+    ///
+     CMDBSession *cmdbSession = CMDBSession::NewL(CMDBSession::LatestVersion());            
+     CleanupStack::PushL(cmdbSession);
+     CCDIAPRecord *iapRecord = (CCDIAPRecord*)CCDRecordBase::RecordFactoryL(KCDTIdIAPRecord);
+     CleanupStack::PushL(iapRecord);
+     iapRecord->SetRecordId(12);
+     iapRecord->LoadL(*cmdbSession);
+     iapRecord->iAppSid = 0;
+     iapRecord->ModifyL(*cmdbSession);
+     CleanupStack::PopAndDestroy(iapRecord);
+     CleanupStack::PopAndDestroy(cmdbSession);    
+    ///
+    //storing the SID information to the policy server which
+    //is used to identify the UMA policy in ipsec policy manager handler.
+    TInt error=0 ;
+    //pPolicyServer.SetOpt(KOptionNameSid, KOptionLevelDefault, sidbuf);
+    //ERR_PRINTF2(_L("DoLoadDropModePolicy->LoadPolicy ERROR  in setOpt to the policy server %s"), sidBuffer);
+    RDebug::Printf("\n see the value \n");
+    if ( KErrNone != error )
+    {
+    ERR_PRINTF2(_L("DoLoadDropModePolicy->LoadPolicy ERROR  in setOpt to the policy server %d"), error);
+    }
+    
+    TRequestStatus status;
+    iDrpPolicyServer.LoadPolicy( *policyData, iDrpPolicyHandle, status, iMyZoneInfoSet);
+    User::WaitForRequest(status);
+    TInt err1 = status.Int();
+    if(err1 == KErrNone)
+        {
+        iDrpPolicyServer.ActivatePolicy(iDrpPolicyHandle(), status );
+        User::WaitForRequest(status);
+        User::LeaveIfError(status.Int());   
+        SetBlockResult(EPass);
+        }
+    else
+        {
+        SetError(status.Int());
+        ERR_PRINTF2(_L("DoLoadDropModePolicy->LoadPolicy failed with error: %d"),err1);
+        SetBlockResult(EFail);
+        }
+    CleanupStack::PopAndDestroy(policyData);    
+    pSADB.Close();
+    pSocketServ.Close();     
+    }
+
+
+void CT_CoverageTest::DoLoadNewBypassModePolicy(const TDesC& /*aSection*/)
+    {       
+    RSocketServ pSocketServ;
+    /** Handle to SADB socket */
+    RSADB pSADB;
+    TInt err;
+            
+    err = pSocketServ.Connect();
+    if ( err != KErrNone)
+         {
+         ERR_PRINTF2(_L("DoLoadNewBypassModePolicy():- Failed to connect  RSocketServ with error: %d"), err);
+         SetBlockResult(EFail);  
+         }   
+    err = pSADB.Open(pSocketServ);
+    if ( err != KErrNone)
+         {
+         ERR_PRINTF2(_L("DoLoadNewBypassModePolicy():- Failed to open RSADB with error: %d"), err);
+         SetBlockResult(EFail);   
+         }                                   
+                    
+    HBufC8 *policyData = HBufC8::NewLC( KMyPolicy2().Length() + 256); // Allow size for IP spec.
+    TPtr8 policyDataPtr(policyData->Des());
+    policyDataPtr.Append(KMyPolicy2);
+    
+
+    TRequestStatus status;
+    iBypsPolicyServer.LoadPolicy( *policyData, iNewBypsPolicyHandle, status, iMyZoneInfoSet);
+    User::WaitForRequest(status);
+    
+    err = status.Int();
+    if( err == KErrNone)
+        {
+        iBypsPolicyServer.ActivatePolicy( iNewBypsPolicyHandle(), status );
+        User::WaitForRequest(status);
+        User::LeaveIfError(status.Int());   
+        SetBlockResult(EPass);
+        }
+    else
+        {
+        SetError(status.Int());
+        ERR_PRINTF2(_L("DoLoadNewBypassPolicy():- LoadPolicy failed with error: %d"), err);
+        SetBlockResult(EFail);
+        }
+    CleanupStack::PopAndDestroy(policyData);
+    pSADB.Close();
+    pSocketServ.Close();     
+    }
+
+
+/*
+*Execute the test to unload the policy.
+*/
+void CT_CoverageTest::DoUnloadDropPolicy(const TDesC& /*aSection*/)
+    {      
+    TRequestStatus status;
+    iDrpPolicyServer.UnloadPolicy(iDrpPolicyHandle(),status);
+    User::WaitForRequest(status);
+    TInt err = status.Int();
+    if( err != KErrNone)
+        {
+        SetError(err);
+        ERR_PRINTF2(_L("DoUnloadDropPolicy():- UnloadPolicy failed with error: %d"), err);
+        SetBlockResult(EFail);
+        }
+    }
+
+/*
+*Execute the test to unload the policy.
+*/
+void CT_CoverageTest::DoUnloadNewBypassPolicy(const TDesC& /*aSection*/)
+    {      
+    TRequestStatus status;    
+    iBypsPolicyServer.UnloadPolicy(iNewBypsPolicyHandle(),status);
+    User::WaitForRequest(status);
+    TInt err = status.Int();
+    if( err != KErrNone)
+        {
+        SetError(err);
+        ERR_PRINTF2(_L("DoUnloadNewBypassPolicy():- UnloadPolicy failed with error: %d"), err);
+        SetBlockResult(EFail);
+        }
+    }
+
+/*
+*Execute the test to unload the policy.
+*/
+void CT_CoverageTest::DoUnloadBypassPolicy(const TDesC& /*aSection*/)
+    {      
+    TRequestStatus status;    
+    iBypsPolicyServer.UnloadPolicy(iBypsPolicyHandle(),status);
+    User::WaitForRequest(status);
+    TInt err = status.Int();
+    if( err != KErrNone)
+        {
+        SetError(err);
+        ERR_PRINTF2(_L("DoUnloadBypassPolicy():- UnloadPolicy failed with error: %d"), err);
+        SetBlockResult(EFail);
+        }
+    }
+
+
+/*
+*Execute the test for closing the connection.
+*/
+void CT_CoverageTest::DoCmdClose(const TDesC& /*aSection*/)
+    {      
+    SetBlockResult(EPass);
+    }
+    
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/src/te_ipsectestserver.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,64 @@
+/*
+* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+//local includes here
+#include "te_ipsectestserver.h"
+
+//system includes here
+
+//implementation for the classes
+CT_LoadPolicyTestServer* CT_LoadPolicyTestServer::NewL()
+	{
+	CT_LoadPolicyTestServer* server = new (ELeave) CT_LoadPolicyTestServer();
+	CleanupStack::PushL(server);
+	server->ConstructL();
+	CleanupStack::Pop(server);
+	return server;
+	}
+
+LOCAL_C void MainL()
+	{
+#if (defined __DATA_CAGING__)
+	RProcess().DataCaging(RProcess::EDataCagingOn);
+	RProcess().SecureApi(RProcess::ESecureApiOn);
+#endif
+	CActiveScheduler* sched=NULL;
+	sched=new(ELeave) CActiveScheduler;
+	CActiveScheduler::Install(sched);
+	CT_LoadPolicyTestServer* server = NULL;
+	TRAPD(err, server = CT_LoadPolicyTestServer::NewL());
+	if(!err)
+		{
+		RProcess::Rendezvous(KErrNone);
+		sched->Start();
+		}
+	delete server;
+	delete sched;
+	}
+
+GLDEF_C TInt E32Main()
+	{
+	CTrapCleanup* cleanup = CTrapCleanup::New();
+	if(cleanup == NULL)
+		{
+		return KErrNoMemory;
+		}
+	TRAP_IGNORE(MainL());
+	delete cleanup;
+	return KErrNone;
+    }
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/src/te_loadpolicy_bbd.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,466 @@
+/*
+* Copyright (c) 2003 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+** @File :- te_loadpolicy_bbd.cpp Implements loading the policy 
+*/
+
+
+/**
+ * @file ts_ipsec_polapi.cpp Implements main test code for IPsec
+ */
+
+#include "te_loadpolicy_bbd.h"
+#include "te_ipsecconst.h"
+#include "te_selectorconflict.h"
+#include <ES_SOCK.H> 
+#include "lib_pfkey.h"
+#include "pfkey_ext.h"
+#include "pfkey_send.h"
+#include <commdbconnpref.h>
+
+
+#if defined(SYMBIAN_CRYPTO)
+#include <cryptostrength.h>
+#else
+#include <cryptalg.h>
+#endif
+
+_LIT8( KMyPolicy,  
+"SECURITY_FILE_VERSION: 3\r\n[INFO]\r\n\
+IpSec Policy LOADING\r\n\
+[POLICY]\r\n\
+sa trans_1 = {\r\n\
+esp\r\n\
+encrypt_alg 12\r\n\
+src_specific\r\n\
+}\r\n\
+outbound remote 10.225.208.183 255.255.255.255 protocol 17 = { trans_1(10.225.208.183) }\r\n\
+inbound local 10.225.208.102 255.255.255.255 protocol 17  = { trans_1(10.225.208.183) }\r\n\
+inbound = {}\r\n\
+outbound = {}\r\n" );
+
+
+_LIT8( KMyPolicy1,  
+"SECURITY_FILE_VERSION: 3\r\n[INFO]\r\n\
+IpSec Policy LOADING\r\n\
+[POLICY]\r\n\
+sa trans_2 = {\r\n\
+esp\r\n\
+encrypt_alg 12\r\n\
+src_specific\r\n\
+}\r\n\
+outbound remote 10.225.208.49 255.255.255.255 protocol 17 = { trans_2(10.225.208.49) }\r\n\
+inbound local 10.225.208.155 255.255.255.255 protocol 17  = { trans_2(10.225.208.49) }\r\n" );
+
+_LIT8( KMyPolicy2,  
+"SECURITY_FILE_VERSION: 3\r\n[INFO]\r\n\
+IpSec Policy LOADING\r\n\
+[POLICY]\r\n\
+sa trans_3 = {\r\n\
+esp\r\n\
+encrypt_alg 12\r\n\
+src_specific\r\n\
+}\r\n\
+outbound remote 192.168.1.1 255.255.255.255 protocol 17 = { trans_3() }\r\n\
+inbound local 192.168.1.2 255.255.255.255 protocol 17  = { trans_3() }\r\n\
+inbound = {}\r\n\
+outbound = {}\r\n" );
+
+
+/**
+Purpose: Constructor of CT_IPSecIKEV2TestWrapper class
+@internalComponent
+*/
+CT_LoadPolicyBBD::CT_LoadPolicyBBD()
+	{
+	}
+
+/**
+Purpose: Destructor of CT_LoadPolicyBBD class
+@internalComponent
+*/
+CT_LoadPolicyBBD::~CT_LoadPolicyBBD()
+	{
+	delete iObject;
+	iObject = NULL;
+	}
+
+/**
+Purpose: Command fuction of CT_LoadPolicyBBD class
+@internalComponent
+*/
+CT_LoadPolicyBBD* CT_LoadPolicyBBD::NewL()
+	{
+	CT_LoadPolicyBBD*	ret = new (ELeave) CT_LoadPolicyBBD();
+	CleanupStack::PushL(ret);
+	ret->ConstructL();
+	CleanupStack::Pop(ret);
+	return ret;
+	}
+	
+	
+/**
+Purpose: Command fuction for a wrapper class
+@internalComponent
+*/
+void CT_LoadPolicyBBD::ConstructL()
+	{
+    TInt errfound;
+    
+	iObject = new (ELeave) TInt;
+	errfound = iDrpPolicyServer.Connect();
+	if( errfound != KErrNone )
+	    {
+	    ERR_PRINTF2(_L("failed to connect RIpsecPolicyServ with error: %d"), errfound);
+	    SetBlockResult(EFail);
+	    return;
+	    }
+	errfound=iBypsPolicyServer.Connect();
+	if( errfound != KErrNone )
+	    {
+	    ERR_PRINTF2(_L("failed to connect RIpsecPolicyServ with error: %d"), errfound);
+	    SetBlockResult(EFail); 
+	    return;
+	    }
+
+	iMyZoneInfoSet.iSelectorZone.iScope = KScopeNetwork;
+	iMyZoneInfoSet.iSelectorZone.iId = 8;
+	iMyZoneInfoSet.iEndPointZone.iScope = KScopeNetwork;
+	iMyZoneInfoSet.iEndPointZone.iId = 7;
+	        
+	}
+
+
+/**
+Purpose: Command fuction for a wrapper class
+@internalComponent
+*/
+TBool CT_LoadPolicyBBD::DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex)
+	{
+	TBool ret = ETrue;
+
+	// Print out the parameters for debugging
+	INFO_PRINTF2( _L("<font size=2 color=990000><b>aCommand = %S</b></font>"), &aCommand );
+	INFO_PRINTF2( _L("aSection = %S"), &aSection );
+	INFO_PRINTF2( _L("aAsyncErrorIndex = %D"), aAsyncErrorIndex );
+
+	if(KNewCMD() == aCommand)
+		{
+		DoCmdNewL(aSection);
+		}
+	else if(KTestLoadBypassPolicy() == aCommand)
+		{
+	    DoLoadBypassModePolicy(aSection);
+		}
+	else if (KTestLoadDropModePolicy() == aCommand)
+	    {
+        DoLoadDropModePolicy(aSection);
+	    }
+	else if (KLoadNewBypassPolicy() == aCommand)
+        {
+        DoLoadNewBypassModePolicy(aSection);
+        }
+	else if (KUnloadDropPolicy() == aCommand)
+        {
+        DoUnloadDropPolicy(aSection);
+        }
+	else if (KUnloadBypassPolicy() == aCommand)
+        {
+        DoUnloadBypassPolicy(aSection);
+        }
+	else if (KUnloadNewBypassPolicy() == aCommand)
+	    {
+	    DoUnloadNewBypassPolicy(aSection);
+	    }	
+	else if (KCloseConnection() == aCommand)
+	    {
+	    DoCmdClose(aSection);
+	    }
+	else
+		{
+		ret = EFalse;
+		}
+
+	return ret;
+	}
+
+
+/**
+Purpose: To create a new object of the CTEFTest type through the API.
+
+Ini file options:
+	iniData - The data from the ini file at the section provided.
+
+@internalComponent
+@param  aSection Current ini file command section
+*/
+void CT_LoadPolicyBBD::DoCmdNewL(const TDesC& aSection)
+	{
+	TInt objectValue = 0;
+	TInt iapid =0;
+	if (!GetIntFromConfig(aSection, KObjectValue(), objectValue))
+		{
+		ERR_PRINTF2(_L("<font color=FF0000>No parameter %S</font>"), &KObjectValue());
+		SetBlockResult(EFail);
+		}
+	else
+	    {
+	    *iObject = objectValue;	    
+	    
+        if(!GetIntFromConfig(aSection, KIapid(), iapid))
+            {
+            ERR_PRINTF2(_L("<font color=FF0000>No parameter %S</font>"), &KObjectValue());
+            SetBlockResult(EFail);
+            }
+        else
+            {
+            }
+	    }
+	}
+
+/**
+ * Bypass policy loading for ONB scripts
+ */
+void CT_LoadPolicyBBD::DoLoadBypassModePolicy(const TDesC& /*aSection*/) 
+    {
+    RSocketServ pSocketServ;
+    /** Handle to SADB socket */
+    RSADB pSADB;     
+    TInt err;
+        
+    err = pSocketServ.Connect();
+    if ( err != KErrNone)
+         {
+         ERR_PRINTF2(_L("DoLoadBypassModePolicy():- Failed to connect  RSocketServ with error: %d"), err);
+         SetBlockResult(EFail);   
+         }   
+    err = pSADB.Open(pSocketServ);
+    if ( err != KErrNone)
+         {
+         ERR_PRINTF2(_L("DoLoadBypassModePolicy():- Failed to open RSADB with error: %d"), err);
+         SetBlockResult(EFail);  
+         }                                   
+        
+    
+    HBufC8 *policyData = HBufC8::NewLC( KMyPolicy().Length() + 256); // Allow size for IP spec.
+    TPtr8 policyDataPtr(policyData->Des());
+    policyDataPtr.Append(KMyPolicy);
+    
+    TRequestStatus status;
+    iBypsPolicyServer.LoadPolicy( *policyData, iBypsPolicyHandle, status, iMyZoneInfoSet);
+    User::WaitForRequest(status);
+    
+    err = status.Int();
+    if( err == KErrNone)
+        {
+        iBypsPolicyServer.ActivatePolicy( iBypsPolicyHandle(), status );
+        User::WaitForRequest(status);
+        User::LeaveIfError(status.Int());   
+        SetBlockResult(EPass);
+        }
+    else
+        {
+        SetError(status.Int());
+        ERR_PRINTF2(_L("DoLoadNewBypassPolicy():- LoadPolicy failed with error: %d"), err);
+        SetBlockResult(EFail);
+        }
+    CleanupStack::PopAndDestroy(policyData);
+    pSADB.Close();
+    pSocketServ.Close();    
+    }
+
+/*
+*Execute the test for closing the connection.
+*/
+void CT_LoadPolicyBBD::DoLoadDropModePolicy(const TDesC& /*aSection*/)
+    {       
+    RSocketServ pSocketServ;
+    /** Handle to SADB socket */
+    RSADB pSADB;
+    TInt err;
+            
+    err = pSocketServ.Connect();
+    if ( err != KErrNone)
+         {
+         ERR_PRINTF2(_L("DoLoadDropModePolicy():- Failed to connect  RSocketServ with error: %d"), err);
+         SetBlockResult(EFail);   
+         }   
+    err = pSADB.Open(pSocketServ);
+    if ( err != KErrNone)
+         {
+         ERR_PRINTF2(_L("DoLoadDropModePolicy():- Failed to open RSADB with error: %d"), err);
+         SetBlockResult(EFail);  
+         }                                   
+               
+    HBufC8 *policyData = HBufC8::NewLC( KMyPolicy1().Length() + 256); // Allow size for IP spec.
+    TPtr8 policyDataPtr(policyData->Des());
+    policyDataPtr.Append(KMyPolicy1);
+    /***
+     * this code is to check the UMA setopt function
+     * 
+     */
+    TInt sur = 0x2002E241;
+    _LIT8(KFormatStr,"%D");
+    TBuf8<50> sidbuf;
+    sidbuf.Format(KFormatStr,sur);
+    TLex8 lex(sidbuf);    
+    TInt intval;
+    err = lex.Val(intval);
+    
+    //storing the SID information to the policy server which
+    //is used to identify the UMA policy in ipsec policy manager handler.
+    TInt error=0 ;
+    //pPolicyServer.SetOpt(KOptionNameSid, KOptionLevelDefault, sidbuf);
+    //ERR_PRINTF2(_L("DoLoadDropModePolicy->LoadPolicy ERROR  in setOpt to the policy server %s"), sidBuffer);
+    RDebug::Printf("\n see the value \n");
+    if ( KErrNone != error )
+    {
+    ERR_PRINTF2(_L("DoLoadDropModePolicy->LoadPolicy ERROR  in setOpt to the policy server %d"), error);
+    }
+    
+    TRequestStatus status;
+    iDrpPolicyServer.LoadPolicy( *policyData, iDrpPolicyHandle, status, iMyZoneInfoSet);
+    User::WaitForRequest(status);
+    TInt err1 = status.Int();
+    if(err1 == KErrNone)
+        {
+        iDrpPolicyServer.ActivatePolicy(iDrpPolicyHandle(), status );
+        User::WaitForRequest(status);
+        User::LeaveIfError(status.Int());   
+        SetBlockResult(EPass);
+        }
+    else
+        {
+        SetError(status.Int());
+        ERR_PRINTF2(_L("DoLoadDropModePolicy->LoadPolicy failed with error: %d"),err1);
+        SetBlockResult(EFail);
+        }
+    CleanupStack::PopAndDestroy(policyData);    
+    pSADB.Close();
+    pSocketServ.Close();     
+    }
+
+
+void CT_LoadPolicyBBD::DoLoadNewBypassModePolicy(const TDesC& /*aSection*/)
+    {       
+    RSocketServ pSocketServ;
+    /** Handle to SADB socket */
+    RSADB pSADB;
+    TInt err;
+            
+    err = pSocketServ.Connect();
+    if ( err != KErrNone)
+         {
+         ERR_PRINTF2(_L("DoLoadNewBypassModePolicy():- Failed to connect  RSocketServ with error: %d"), err);
+         SetBlockResult(EFail);  
+         }   
+    err = pSADB.Open(pSocketServ);
+    if ( err != KErrNone)
+         {
+         ERR_PRINTF2(_L("DoLoadNewBypassModePolicy():- Failed to open RSADB with error: %d"), err);
+         SetBlockResult(EFail);   
+         }                                   
+                    
+    HBufC8 *policyData = HBufC8::NewLC( KMyPolicy2().Length() + 256); // Allow size for IP spec.
+    TPtr8 policyDataPtr(policyData->Des());
+    policyDataPtr.Append(KMyPolicy2);
+    
+
+    TRequestStatus status;
+    iBypsPolicyServer.LoadPolicy( *policyData, iNewBypsPolicyHandle, status, iMyZoneInfoSet);
+    User::WaitForRequest(status);
+    
+    err = status.Int();
+    if( err == KErrNone)
+        {
+        iBypsPolicyServer.ActivatePolicy( iNewBypsPolicyHandle(), status );
+        User::WaitForRequest(status);
+        User::LeaveIfError(status.Int());   
+        SetBlockResult(EPass);
+        }
+    else
+        {
+        SetError(status.Int());
+        ERR_PRINTF2(_L("DoLoadNewBypassPolicy():- LoadPolicy failed with error: %d"), err);
+        SetBlockResult(EFail);
+        }
+    CleanupStack::PopAndDestroy(policyData);
+    pSADB.Close();
+    pSocketServ.Close();     
+    }
+
+
+/*
+*Execute the test to unload the policy.
+*/
+void CT_LoadPolicyBBD::DoUnloadDropPolicy(const TDesC& /*aSection*/)
+    {      
+    TRequestStatus status;
+    iDrpPolicyServer.UnloadPolicy(iDrpPolicyHandle(),status);
+    User::WaitForRequest(status);
+    TInt err = status.Int();
+    if( err != KErrNone)
+        {
+        SetError(err);
+        ERR_PRINTF2(_L("DoUnloadDropPolicy():- UnloadPolicy failed with error: %d"), err);
+        SetBlockResult(EFail);
+        }
+    }
+
+/*
+*Execute the test to unload the policy.
+*/
+void CT_LoadPolicyBBD::DoUnloadNewBypassPolicy(const TDesC& /*aSection*/)
+    {      
+    TRequestStatus status;    
+    iBypsPolicyServer.UnloadPolicy(iNewBypsPolicyHandle(),status);
+    User::WaitForRequest(status);
+    TInt err = status.Int();
+    if( err != KErrNone)
+        {
+        SetError(err);
+        ERR_PRINTF2(_L("DoUnloadNewBypassPolicy():- UnloadPolicy failed with error: %d"), err);
+        SetBlockResult(EFail);
+        }
+    }
+
+/*
+*Execute the test to unload the policy.
+*/
+void CT_LoadPolicyBBD::DoUnloadBypassPolicy(const TDesC& /*aSection*/)
+    {      
+    TRequestStatus status;    
+    iBypsPolicyServer.UnloadPolicy(iBypsPolicyHandle(),status);
+    User::WaitForRequest(status);
+    TInt err = status.Int();
+    if( err != KErrNone)
+        {
+        SetError(err);
+        ERR_PRINTF2(_L("DoUnloadBypassPolicy():- UnloadPolicy failed with error: %d"), err);
+        SetBlockResult(EFail);
+        }
+    }
+
+
+/*
+*Execute the test for closing the connection.
+*/
+void CT_LoadPolicyBBD::DoCmdClose(const TDesC& /*aSection*/)
+    {      
+    SetBlockResult(EPass);
+    }
+    
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/src/te_loadpolicy_bdd.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,442 @@
+/*
+* Copyright (c) 2003 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+/**
+ * @file ts_ipsec_polapi.cpp Implements main test code for IPsec
+ */
+
+#include "te_loadpolicy_bdd.h"
+#include "te_ipsecconst.h"
+#include "te_selectorconflict.h"
+#include "te_ipsecconst.h"
+#include <ES_SOCK.H> 
+#include "lib_pfkey.h"
+#include "pfkey_ext.h"
+#include "pfkey_send.h"
+#include "ipsecpolapi.h"
+#include <commdbconnpref.h>
+
+
+#if defined(SYMBIAN_CRYPTO)
+#include <cryptostrength.h>
+#else
+#include <cryptalg.h>
+#endif
+
+
+_LIT8( KMyPolicy,  
+"SECURITY_FILE_VERSION: 3\r\n[INFO]\r\n\
+IpSec Policy LOADING\r\n\
+[POLICY]\r\n\
+sa trans_1 = {\r\n\
+esp\r\n\
+encrypt_alg 12\r\n\
+src_specific\r\n\
+}\r\n\
+remote 10.225.208.183 255.255.255.255 = { trans_1(10.225.208.183) }\r\n" );
+
+
+_LIT8( KMyPolicy1,  
+"SECURITY_FILE_VERSION: 3\r\n[INFO]\r\n\
+IpSec Policy LOADING\r\n\
+[POLICY]\r\n\
+sa trans_2 = {\r\n\
+esp\r\n\
+encrypt_alg 12\r\n\
+src_specific\r\n\
+}\r\n\
+outbound remote 10.225.208.99 255.255.255.0 protocol 17 = { trans_2(10.225.208.99) }\r\n\
+inbound local 10.225.208.155 255.255.255.0 protocol 17  = { trans_2(10.225.208.99) }\r\n\
+inbound = {}\r\n\
+outbound = {}\r\n" );
+
+_LIT8( KMyPolicy2,  
+"SECURITY_FILE_VERSION: 3\r\n[INFO]\r\n\
+IpSec Policy LOADING\r\n\
+[POLICY]\r\n\
+sa trans_1 = {\r\n\
+esp\r\n\
+encrypt_alg 12\r\n\
+src_specific\r\n\
+}\r\n\
+remote 10.225.208.1 255.255.255.255 = { trans_1(10.225.208.1) }\r\n" );
+
+
+
+/**
+Purpose: Constructor of CT_IPSecIKEV2TestWrapper class
+@internalComponent
+*/
+CT_LoadPolicyBDD::CT_LoadPolicyBDD()
+	{
+	}
+
+
+/**
+Purpose: Destructor of CT_LoadPolicyBDD class
+@internalComponent
+*/
+CT_LoadPolicyBDD::~CT_LoadPolicyBDD()
+	{
+	delete iObject;
+	iObject = NULL;
+	}
+
+
+/**
+Purpose: Command fuction of CT_LoadPolicyBDD class
+@internalComponent
+*/
+CT_LoadPolicyBDD* CT_LoadPolicyBDD::NewL()
+	{
+	CT_LoadPolicyBDD*	ret = new (ELeave) CT_LoadPolicyBDD();
+	CleanupStack::PushL(ret);
+	ret->ConstructL();
+	CleanupStack::Pop(ret);
+	return ret;
+	}
+	
+	
+/**
+Purpose: Command fuction for a wrapper class
+@internalComponent
+*/
+void CT_LoadPolicyBDD::ConstructL()
+	{
+    TInt errfound;
+    
+	iObject = new (ELeave) TInt;	
+	errfound = iDrpPolicyServer.Connect();
+	if( errfound != KErrNone )
+	    {
+	    ERR_PRINTF2(_L("failed to connect RIpsecPolicyServ with error: %d"), errfound);
+	    SetBlockResult(EFail);
+	    return;
+	    }
+	errfound=iBypsPolicyServer.Connect();
+	if( errfound != KErrNone )
+	    {
+	    ERR_PRINTF2(_L("failed to connect RIpsecPolicyServ with error: %d"), errfound);
+	    SetBlockResult(EFail);
+	    return;
+	    }
+	
+	iMyZoneInfoSet.iSelectorZone.iScope = KScopeNetwork;
+	iMyZoneInfoSet.iSelectorZone.iId = 8;
+	iMyZoneInfoSet.iEndPointZone.iScope = KScopeNetwork;
+	iMyZoneInfoSet.iEndPointZone.iId = 7;
+	}
+
+
+/**
+Purpose: Command fuction for a wrapper class
+@internalComponent
+*/
+TBool CT_LoadPolicyBDD::DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex)
+	{
+	TBool ret = ETrue;
+
+	// Print out the parameters for debugging
+	INFO_PRINTF2( _L("<font size=2 color=990000><b>aCommand = %S</b></font>"), &aCommand );
+	INFO_PRINTF2( _L("aSection = %S"), &aSection );
+	INFO_PRINTF2( _L("aAsyncErrorIndex = %D"), aAsyncErrorIndex );
+
+	if(KNewCMD() == aCommand)
+		{
+		DoCmdNewL(aSection);
+		}
+	else if(KTestLoadDropPolicy() == aCommand)
+		 {
+	     DoLoadDropModePolicy(aSection);
+		 }
+	else if (KLoadBypasspolicy()== aCommand)
+	     {
+	     DoLoadBypassModePolicy(aSection);
+	     }
+	else if (KLoadNewDroppolicy()== aCommand)
+	     {
+	     DoLoadNewDropModePolicy(aSection);
+	     }
+	else if (KUnloadDropPolicy() == aCommand)
+	     {
+	     DoUnloadDropPolicy(aSection);
+	     }
+	else if (KUnloadBypassPolicy() == aCommand)
+	     {
+	     DoUnloadBypassPolicy(aSection);
+	     }
+	else if (KUnloadNewDropPolicy() == aCommand)
+	     {
+	     DoUnloadNewDropModePolicy(aSection);
+	     }
+	else if (KCloseConnection() == aCommand)
+	    {
+	    DoCmdClose(aSection);
+	    }
+	else
+		{
+		ret = EFalse;
+		}
+
+	return ret;
+	}
+
+
+/**
+Purpose: To create a new object of the CTEFTest type through the API.
+
+Ini file options:
+	iniData - The data from the ini file at the section provided.
+
+@internalComponent
+@param  aSection Current ini file command section
+*/
+void CT_LoadPolicyBDD::DoCmdNewL(const TDesC& aSection)
+	{
+	TInt objectValue = 0;
+	TInt iapid =0;
+	if (!GetIntFromConfig(aSection, KObjectValue(), objectValue))
+		{
+		ERR_PRINTF2(_L("<font color=FF0000>No parameter %S</font>"), &KObjectValue());
+		SetBlockResult(EFail);
+		}
+	else
+	    {
+	    *iObject = objectValue;	    
+	    
+        if(!GetIntFromConfig(aSection, KIapid(), iapid))
+            {
+            ERR_PRINTF2(_L("<font color=FF0000>No parameter %S</font>"), &KObjectValue());
+            SetBlockResult(EFail);
+            }
+        else
+            {
+       
+            }
+	    }
+	}
+
+
+void CT_LoadPolicyBDD::DoLoadDropModePolicy(const TDesC& /*aSection*/)//this will load a drop mode policy
+    {
+        RSocketServ pSocketServ;
+        /** Handle to SADB socket */
+        RSADB pSADB; 
+        TInt err;
+        
+        err = pSocketServ.Connect();
+        if ( err != KErrNone)
+            {
+            ERR_PRINTF2(_L("DoLoadDropModePolicy():- Failed to connect  RSocketServ with error: %d"), err);
+            SetBlockResult(EFail);   
+            }   
+        err = pSADB.Open(pSocketServ);
+        if ( err != KErrNone)
+            {
+            ERR_PRINTF2(_L("DoLoadDropModePolicy():- Failed to open RSADB with error: %d"), err);
+            SetBlockResult(EFail);   
+            }                  
+        HBufC8 *policyData = HBufC8::NewLC( KMyPolicy().Length() + 256); // Allow size for IP spec.
+        TPtr8 policyDataPtr(policyData->Des());
+        policyDataPtr.Append(KMyPolicy);
+        
+        TRequestStatus status;
+        iDrpPolicyServer.LoadPolicy( *policyData, iDrpPolicyHandle, status, iMyZoneInfoSet);
+        User::WaitForRequest(status);
+        
+        err = status.Int();
+        if( err == KErrNone)
+            {
+            iDrpPolicyServer.ActivatePolicy( iDrpPolicyHandle(), status );
+            User::WaitForRequest(status);
+            User::LeaveIfError(status.Int());   
+            SetBlockResult(EPass);
+            }
+        else
+            {
+            SetError(status.Int());
+            ERR_PRINTF2(_L("DoLoadDropModePolicy():- LoadPolicy failed with error: %d"), err);
+            SetBlockResult(EFail);
+            }
+        CleanupStack::PopAndDestroy(policyData);
+        pSADB.Close();
+        pSocketServ.Close();    
+
+    }
+
+void CT_LoadPolicyBDD::DoLoadBypassModePolicy(const TDesC& /*aSection*/)
+    {       
+    RSocketServ pSocketServ;
+    /** Handle to SADB socket */
+    RSADB pSADB;
+    TInt err;
+    
+    err = pSocketServ.Connect();
+    if ( err != KErrNone)
+         {
+         ERR_PRINTF2(_L("DoLoadBypassModePolicy():- Failed to connect  RSocketServ with error: %d"), err);
+         SetBlockResult(EFail);   
+         }   
+    err = pSADB.Open(pSocketServ);
+    if ( err != KErrNone)
+         {
+         ERR_PRINTF2(_L("DoLoadBypassModePolicy():- Failed to open RSADB with error: %d"), err);
+         SetBlockResult(EFail);  
+         }                                   
+    
+    HBufC8 *policyData = HBufC8::NewLC( KMyPolicy1().Length() + 256); // Allow size for IP spec.
+    TPtr8 policyDataPtr(policyData->Des());
+    policyDataPtr.Append(KMyPolicy1);
+    
+    TRequestStatus status;
+    iBypsPolicyServer.LoadPolicy( *policyData,iBypsPolicyHandle, status, iMyZoneInfoSet);
+    User::WaitForRequest(status);
+    
+    if(status.Int() == KErrNone)
+        {
+        iBypsPolicyServer.ActivatePolicy( iBypsPolicyHandle(), status );
+        User::WaitForRequest(status);
+        User::LeaveIfError(status.Int());   
+        SetBlockResult(EPass);
+        }
+    else
+        {
+        SetError(status.Int());
+        ERR_PRINTF2(_L("DoLoadBypassModePolicy():- LoadPolicy failed with error: %d"), status.Int());
+        SetBlockResult(EFail);
+        }
+    CleanupStack::PopAndDestroy(policyData);    
+    pSADB.Close();
+    pSocketServ.Close();     
+    }
+
+
+
+
+void CT_LoadPolicyBDD::DoLoadNewDropModePolicy(const TDesC& /*aSection*/)
+    {       
+    RSocketServ pSocketServ;
+    /** Handle to SADB socket */ 
+    RSADB pSADB;         
+    TInt err;
+        
+    err = pSocketServ.Connect();
+    if ( err != KErrNone)
+         {
+         ERR_PRINTF2(_L("DoLoadNewDropModePolicy():- Failed to connect  RSocketServ with error: %d"), err);
+         SetBlockResult(EFail);   
+         }   
+    err = pSADB.Open(pSocketServ);
+    if ( err != KErrNone)
+         {
+         ERR_PRINTF2(_L("DoLoadNewDropModePolicy():- Failed to open RSADB with error: %d"), err);
+         SetBlockResult(EFail);   
+         }                                   
+            
+    HBufC8 *policyData = HBufC8::NewLC( KMyPolicy2().Length() + 256); // Allow size for IP spec.
+    TPtr8 policyDataPtr(policyData->Des());
+    policyDataPtr.Append(KMyPolicy2);
+    
+
+    TRequestStatus status;   
+    iDrpPolicyServer.LoadPolicy( *policyData, iNewDrpPolicyHandle, status, iMyZoneInfoSet);
+    User::WaitForRequest(status);
+    
+    if(status.Int() == KErrNone)
+        {
+        iDrpPolicyServer.ActivatePolicy( iNewDrpPolicyHandle(), status );
+        User::WaitForRequest(status);
+        User::LeaveIfError(status.Int());   
+        SetBlockResult(EPass);
+        }
+    else
+        {
+        SetError(status.Int());
+        ERR_PRINTF2(_L("DoLoadNewDropModePolicy():- LoadPolicy failed with error: %d"), status.Int());
+        SetBlockResult(EFail);
+        }
+    CleanupStack::PopAndDestroy(policyData);    
+    pSADB.Close();
+    pSocketServ.Close();     
+    }
+
+
+/*
+*Execute the test to unload the policy.
+*/
+void CT_LoadPolicyBDD::DoUnloadDropPolicy(const TDesC& /*aSection*/)
+    {      
+    TRequestStatus status;
+    iDrpPolicyServer.UnloadPolicy(iDrpPolicyHandle(),status);
+    User::WaitForRequest(status);
+    TInt err = status.Int();
+    if( err != KErrNone)
+        {
+        SetError(err);
+        ERR_PRINTF2(_L("DoUnloadDropPolicy():- UnloadPolicy failed with error: %d"), err);
+        SetBlockResult(EFail);
+        }
+    }
+
+/*
+*Execute the test to unload the policy.
+*/
+void CT_LoadPolicyBDD::DoUnloadBypassPolicy(const TDesC& /*aSection*/)
+    {      
+    TRequestStatus status;    
+    iBypsPolicyServer.UnloadPolicy(iBypsPolicyHandle(),status);
+    User::WaitForRequest(status);
+    TInt err = status.Int();
+    if( err != KErrNone)
+        {
+        SetError(err);
+        ERR_PRINTF2(_L("DoUnloadBypassPolicy():- UnloadPolicy failed with error: %d"), err);
+        SetBlockResult(EFail);
+        }
+    }
+
+/*
+*Execute the test to unload the policy.
+*/
+void CT_LoadPolicyBDD::DoUnloadNewDropModePolicy(const TDesC& /*aSection*/)
+    {  
+
+    TRequestStatus status;
+    iDrpPolicyServer.UnloadPolicy(iNewDrpPolicyHandle(),status);
+    User::WaitForRequest(status);
+    TInt err = status.Int();
+    if( err != KErrNone)
+        {
+        SetError(err);
+        ERR_PRINTF2(_L("DoUnloadNewDropPolicy():- UnloadPolicy failed with error: %d"), err);
+        SetBlockResult(EFail);
+        }
+   
+    }
+
+
+/*
+*Execute the test for closing the connection.
+*/
+void CT_LoadPolicyBDD::DoCmdClose(const TDesC& /*aSection*/)
+    {       
+    SetBlockResult(EPass);
+    }
+    
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/src/te_loadpolicy_uma.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,507 @@
+/*
+* Copyright (c) 2003 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Symbian Foundation License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* @File :- te_loadpolicy_uma.cpp Implements loading the policy 
+*
+*/
+
+
+/**
+ * @file ts_ipsec_polapi.cpp Implements main test code for IPsec
+ */
+
+#include "te_loadpolicy_uma.h"
+#include "te_ipsecconst.h"
+#include "te_selectorconflict.h"
+#include <ES_SOCK.H> 
+#include "lib_pfkey.h"
+#include "pfkey_ext.h"
+#include "pfkey_send.h"
+#include <commdbconnpref.h>
+
+
+#if defined(SYMBIAN_CRYPTO)
+#include <cryptostrength.h>
+#else
+#include <cryptalg.h>
+#endif
+
+_LIT8( KMyPolicy,  
+"SECURITY_FILE_VERSION: 3\r\n[INFO]\r\n\
+IpSec Policy LOADING\r\n\
+[POLICY]\r\n\
+sa trans_1 = {\r\n\
+esp\r\n\
+encrypt_alg 12\r\n\
+src_specific\r\n\
+}\r\n\
+outbound remote 10.225.208.86 255.255.255.255 protocol 17 = { trans_1(10.225.208.86) }\r\n\
+inbound local 10.225.208.102 255.255.255.255 protocol 17  = { trans_1(10.225.208.86) }\r\n\
+inbound = {}\r\n\
+outbound = {}\r\n" );
+
+
+_LIT8( KMyPolicy1,  
+"SECURITY_FILE_VERSION: 3\r\n[INFO]\r\n\
+IpSec Policy LOADING\r\n\
+[POLICY]\r\n\
+sa trans_2 = {\r\n\
+esp\r\n\
+encrypt_alg 12\r\n\
+src_specific\r\n\
+}\r\n\
+outbound remote 10.225.208.49 255.255.255.255 protocol 17 = { trans_2(10.225.208.49) }\r\n\
+inbound local 10.225.208.155 255.255.255.255 protocol 17  = { trans_2(10.225.208.49) }\r\n" );
+
+_LIT8( KMyPolicy2,  
+"SECURITY_FILE_VERSION: 3\r\n[INFO]\r\n\
+IpSec Policy LOADING\r\n\
+[POLICY]\r\n\
+sa trans_3 = {\r\n\
+esp\r\n\
+encrypt_alg 12\r\n\
+src_specific\r\n\
+}\r\n\
+outbound remote 192.168.1.1 255.255.255.255 protocol 17 = { trans_3() }\r\n\
+inbound local 192.168.1.2 255.255.255.255 protocol 17  = { trans_3() }\r\n\
+inbound = {}\r\n\
+outbound = {}\r\n" );
+
+
+/**
+Purpose: Constructor of CT_IPSecIKEV2TestWrapper class
+@internalComponent
+*/
+CT_LoadPolicyUMA::CT_LoadPolicyUMA()
+	{
+	}
+/**
+Purpose: Destructor of CT_LoadPolicyUMA class
+@internalComponent
+*/
+CT_LoadPolicyUMA::~CT_LoadPolicyUMA()
+	{
+	delete iObject;
+	iObject = NULL;
+	}
+	
+/**
+Purpose: Command fuction of CT_LoadPolicyUMA class
+@internalComponent
+*/
+CT_LoadPolicyUMA* CT_LoadPolicyUMA::NewL()
+	{
+	CT_LoadPolicyUMA*	ret = new (ELeave) CT_LoadPolicyUMA();
+	CleanupStack::PushL(ret);
+	ret->ConstructL();
+	CleanupStack::Pop(ret);
+	return ret;
+	}
+		
+/**
+Purpose: Command fuction for a wrapper class
+@internalComponent
+*/
+void CT_LoadPolicyUMA::ConstructL()
+	{
+    TInt errfound;
+	iObject = new (ELeave) TInt;
+	
+	errfound = iDrpPolicyServer.Connect();
+    if( errfound != KErrNone )
+        {
+        ERR_PRINTF2(_L("failed to connect RIpsecPolicyServ with error: %d"), errfound);
+        SetBlockResult(EFail);
+        return;
+        }
+    errfound=iBypsPolicyServer.Connect();
+    if( errfound != KErrNone )
+        {
+        ERR_PRINTF2(_L("failed to connect RIpsecPolicyServ with error: %d"), errfound);
+        SetBlockResult(EFail);
+        return;
+        }
+    
+	iMyZoneInfoSet.iSelectorZone.iScope = KScopeNetwork;
+	iMyZoneInfoSet.iSelectorZone.iId = 8;
+	iMyZoneInfoSet.iEndPointZone.iScope = KScopeNetwork;
+	iMyZoneInfoSet.iEndPointZone.iId = 7;  
+	}
+
+/**
+Purpose: Command fuction for a wrapper class
+@internalComponent
+*/
+TBool CT_LoadPolicyUMA::DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex)
+	{
+	TBool ret = ETrue;
+
+	// Print out the parameters for debugging
+	INFO_PRINTF2( _L("<font size=2 color=990000><b>aCommand = %S</b></font>"), &aCommand );
+	INFO_PRINTF2( _L("aSection = %S"), &aSection );
+	INFO_PRINTF2( _L("aAsyncErrorIndex = %D"), aAsyncErrorIndex );
+
+	if(KNewCMD() == aCommand)
+		{
+		DoCmdNewL(aSection);
+		}
+	else if(KLOadUMAPolicy() == aCommand)
+		{
+	    DoLoadUMAPolicy(aSection);
+		}
+	else if (KTestLoadDropModePolicy() == aCommand)
+	    {
+        DoLoadDropModePolicy(aSection);
+	    }
+	else if (KLoadUMAByPassPolicy() == aCommand)
+        {
+        DoLoadBypassModePolicy(aSection);
+        }
+	else if (KUnloadDropPolicy() == aCommand)
+        {
+        DoUnloadDropPolicy(aSection);
+        }
+	else if (KUnloadBypassPolicy() == aCommand)
+        {
+        DoUnloadBypassPolicy(aSection);
+        }
+	else if (KUnloadUMAPolicy() == aCommand)
+	    {
+	    DoUnloadUMAPolicy(aSection);
+	    }	
+	else if (KCloseConnection() == aCommand)
+	    {
+	    DoCmdClose(aSection);
+	    }
+	else
+		{
+		ret = EFalse;
+		}
+
+	return ret;
+	}
+
+
+/**
+Purpose: To create a new object of the CTEFTest type through the API.
+
+Ini file options:
+	iniData - The data from the ini file at the section provided.
+
+@internalComponent
+@param  aSection Current ini file command section
+*/
+void CT_LoadPolicyUMA::DoCmdNewL(const TDesC& aSection)
+	{
+	TInt objectValue = 0;
+	TInt iapid =0;
+	if (!GetIntFromConfig(aSection, KObjectValue(), objectValue))
+		{
+		ERR_PRINTF2(_L("<font color=FF0000>No parameter %S</font>"), &KObjectValue());
+		SetBlockResult(EFail);
+		}
+	else
+	    {
+	    *iObject = objectValue;	    
+	    
+        if(!GetIntFromConfig(aSection, KIapid(), iapid))
+            {
+            ERR_PRINTF2(_L("<font color=FF0000>No parameter %S</font>"), &KObjectValue());
+            
+            SetBlockResult(EFail);
+            }
+        else
+            {
+            }
+	    }
+	}
+
+/**
+ * UMA policy loading for ONB scripts
+ */
+void CT_LoadPolicyUMA::DoLoadUMAPolicy(const TDesC& /*aSection*/) 
+    {
+    RSocketServ pSocketServ;
+    /** Handle to SADB socket */
+    RSADB pSADB; 
+    TInt err;
+        
+    err = pSocketServ.Connect();
+    if ( err != KErrNone)
+         {
+         ERR_PRINTF2(_L("DoLoadUMAPolicy():- Failed to connect  RSocketServ with error: %d"), err);
+         SetBlockResult(EFail);  
+         }   
+    err = pSADB.Open(pSocketServ);
+    if ( err != KErrNone)
+         {
+         ERR_PRINTF2(_L("DoLoadUMAPolicy():- Failed to open RSADB with error: %d"), err);
+         SetBlockResult(EFail);   
+         }                                   
+          
+    /***
+     * this code is to check the UMA setopt function
+     * if we call with 0 then it is considered as UMA policy
+     */
+    TInt sur = 0;
+    _LIT8(KFormatStr,"%D");
+    TBuf8<50> sidbuf;
+    sidbuf.Format(KFormatStr,sur);
+    TLex8 lex(sidbuf);    
+    TInt intval;
+    err = lex.Val(intval);
+    
+    //storing the SID information to the policy server which
+    //is used to identify the UMA policy in ipsec policy manager handler.
+    TInt error = iBypsPolicyServer.SetOpt(KOptionNameSid, KOptionLevelDefault, sidbuf);        
+    if ( KErrNone != error )
+    {
+    ERR_PRINTF2(_L("DoLoadUMAPolicy->LoadPolicy ERROR  in setOpt to the policy server %d"), error);
+    SetError(error);
+    SetBlockResult(EFail);
+    return ;
+    }
+    
+    HBufC8 *policyData = HBufC8::NewLC( KMyPolicy().Length() + 256); // Allow size for IP spec.
+    TPtr8 policyDataPtr(policyData->Des());
+    policyDataPtr.Append(KMyPolicy);
+    TRequestStatus status;      
+    iBypsPolicyServer.LoadPolicy( *policyData, iUMAPolicyHandle, status, iMyZoneInfoSet);
+    User::WaitForRequest(status);
+    err = status.Int();
+    if( err == KErrNone)
+        {      
+        iBypsPolicyServer.ActivatePolicy( iUMAPolicyHandle(), status );
+        User::WaitForRequest(status);
+        User::LeaveIfError(status.Int());   
+        SetBlockResult(EPass);
+        }
+    else
+        {
+        SetError(status.Int());
+        ERR_PRINTF2(_L("DoLoadUMAPolicy():- LoadPolicy failed with error: %d"), err);
+        SetBlockResult(EFail);
+        }
+    CleanupStack::PopAndDestroy(policyData);
+    pSADB.Close();
+    pSocketServ.Close();    
+    }
+
+/*
+*Execute the test for loading the drop mode policy.
+*/
+void CT_LoadPolicyUMA::DoLoadDropModePolicy(const TDesC& /*aSection*/)
+    {       
+    RSocketServ pSocketServ;
+    /** Handle to SADB socket */
+    RSADB pSADB; 
+    TInt err;
+        
+    err = pSocketServ.Connect();
+    if ( err != KErrNone)
+         {
+         ERR_PRINTF2(_L("DoLoadDropModePolicy():- Failed to connect  RSocketServ with error: %d"), err);
+         SetBlockResult(EFail);   
+         }   
+    err = pSADB.Open(pSocketServ);
+    if ( err != KErrNone)
+         {
+         ERR_PRINTF2(_L("DoLoadDropModePolicy():- Failed to open RSADB with error: %d"), err);
+         SetBlockResult(EFail);  
+         }                                   
+     
+
+    /***
+     * this code is to check the UMA setopt function
+     * if we call with 0 then it is considered as UMA policy
+     * in this case we are passing some other value
+     */
+    TInt sur = 0x100;
+    _LIT8(KFormatStr,"%D");
+    TBuf8<50> sidbuf;
+    sidbuf.Format(KFormatStr,sur);
+        /*  if you want to check the value un comment this part of the code
+        TLex8 lex(sidbuf);    
+        TInt intval;
+        TInt err = lex.Val(intval);
+        */
+    
+    //storing the SID information to the policy server which
+    //is used to identify the UMA policy in ipsec policy manager handler.
+    TInt error = iBypsPolicyServer.SetOpt(KOptionNameSid, KOptionLevelDefault, sidbuf);        
+    if ( KErrNone != error )
+    {
+    ERR_PRINTF2(_L("DoLoadDropModePolicy->LoadPolicy ERROR  in setOpt to the policy server %d"), error);
+    SetError(error);
+    SetBlockResult(EFail);
+    return ;
+    }
+    HBufC8 *policyData = HBufC8::NewLC( KMyPolicy1().Length() + 256); // Allow size for IP spec.
+    TPtr8 policyDataPtr(policyData->Des());
+    policyDataPtr.Append(KMyPolicy1);
+
+    TRequestStatus status;
+    iDrpPolicyServer.LoadPolicy( *policyData, iDrpPolicyHandle, status, iMyZoneInfoSet);
+    User::WaitForRequest(status);
+    TInt err1 = status.Int();
+    if(err1 == KErrNone)
+        {
+        iDrpPolicyServer.ActivatePolicy(iDrpPolicyHandle(), status );
+        User::WaitForRequest(status);
+        User::LeaveIfError(status.Int());   
+        SetBlockResult(EPass);
+        }
+    else
+        {
+        SetError(status.Int());
+        ERR_PRINTF2(_L("DoLoadDropModePolicy->LoadPolicy failed with error: %d"),err1);
+        SetBlockResult(EFail);
+        }
+    CleanupStack::PopAndDestroy(policyData);    
+    
+    pSADB.Close();
+    pSocketServ.Close();     
+    }
+
+
+void CT_LoadPolicyUMA::DoLoadBypassModePolicy(const TDesC& /*aSection*/)
+    {       
+    RSocketServ pSocketServ;
+    /** Handle to SADB socket */
+    RSADB pSADB; 
+    TInt err;
+        
+    err = pSocketServ.Connect();
+    if ( err != KErrNone)
+         {
+         ERR_PRINTF2(_L("DoLoadBypassModePolicy():- Failed to connect  RSocketServ with error: %d"), err);
+         SetBlockResult(EFail);   
+         }   
+    err = pSADB.Open(pSocketServ);
+    if ( err != KErrNone)
+         {
+         ERR_PRINTF2(_L("DoLoadBypassModePolicy():- Failed to open RSADB with error: %d"), err);
+         SetBlockResult(EFail);   
+         }                                   
+        
+    /***
+     * this code is to check the UMA setopt function
+     * if we call with 0 then it is considered as UMA policy
+     * in this case we are passing some other value
+     * 
+     * this is done becoze we don't have any value present in comms database or it could be a big bug
+     */
+    TInt sur = 0x100;
+    _LIT8(KFormatStr,"%D");
+    TBuf8<50> sidbuf;
+    sidbuf.Format(KFormatStr,sur);
+    TLex8 lex(sidbuf);    
+    TInt intval;
+    err = lex.Val(intval);
+
+    //storing the SID information to the policy server which
+    //is used to identify the UMA policy in ipsec policy manager handler.
+    TInt error = iBypsPolicyServer.SetOpt(KOptionNameSid, KOptionLevelDefault, sidbuf);        
+    if ( KErrNone != error )
+    {
+    ERR_PRINTF2(_L("DoLoadBypassModePolicy->LoadPolicy ERROR  in setOpt to the policy server %d"), error);
+    SetError(error);
+    SetBlockResult(EFail);
+    return ;
+    }   
+    HBufC8 *policyData = HBufC8::NewLC( KMyPolicy2().Length() + 256); // Allow size for IP spec.
+    TPtr8 policyDataPtr(policyData->Des());
+    policyDataPtr.Append(KMyPolicy2);
+    TRequestStatus status;
+    iBypsPolicyServer.LoadPolicy( *policyData, iBypsPolicyHandle, status, iMyZoneInfoSet);
+    User::WaitForRequest(status);
+    err = status.Int();
+    if( err == KErrNone)
+        {
+        iBypsPolicyServer.ActivatePolicy( iBypsPolicyHandle(), status );
+        User::WaitForRequest(status);
+        User::LeaveIfError(status.Int());   
+        SetBlockResult(EPass);
+        }
+    else
+        {
+        SetError(status.Int());
+        ERR_PRINTF2(_L("DoLoadBypassModePolicy():- LoadPolicy failed with error: %d"), err);
+        SetBlockResult(EFail);
+        }
+    CleanupStack::PopAndDestroy(policyData);
+    pSADB.Close();
+    pSocketServ.Close();     
+    }
+
+/*
+*Execute the test to unload the policy.
+*/
+void CT_LoadPolicyUMA::DoUnloadDropPolicy(const TDesC& /*aSection*/)
+    {      
+    TRequestStatus status;
+    iDrpPolicyServer.UnloadPolicy(iDrpPolicyHandle(),status);
+    User::WaitForRequest(status);
+    TInt err = status.Int();
+    if( err != KErrNone)
+        {
+        SetError(err);
+        ERR_PRINTF2(_L("DoUnloadDropPolicy():- UnloadPolicy failed with error: %d"), err);
+        SetBlockResult(EFail);
+        }
+    }
+
+/*
+*Execute the test to unload the policy.
+*/
+void CT_LoadPolicyUMA::DoUnloadUMAPolicy(const TDesC& /*aSection*/)
+    {      
+    TRequestStatus status;    
+    iBypsPolicyServer.UnloadPolicy(iUMAPolicyHandle(),status);
+    User::WaitForRequest(status);
+    TInt err = status.Int();
+    if( err != KErrNone)
+        {
+        SetError(err);
+        ERR_PRINTF2(_L("DoUnloadUMAPolicy():- UnloadPolicy failed with error: %d"), err);
+        SetBlockResult(EFail);
+        }
+    }
+/*
+*Execute the test for unload the policy.
+*/
+void CT_LoadPolicyUMA::DoUnloadBypassPolicy(const TDesC& /*aSection*/)
+    {      
+    TRequestStatus status;    
+    iBypsPolicyServer.UnloadPolicy(iBypsPolicyHandle(),status);
+    User::WaitForRequest(status);
+    TInt err = status.Int();
+    if( err != KErrNone)
+        {
+        SetError(err);
+        ERR_PRINTF2(_L("DoUnloadBypassPolicy():- UnloadPolicy failed with error: %d"), err);
+        SetBlockResult(EFail);
+        }
+    }
+
+/*
+*Execute the test for closing the connection.
+*/
+void CT_LoadPolicyUMA::DoCmdClose(const TDesC& /*aSection*/)
+    {      
+    SetBlockResult(EPass);
+    }
+    
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_2483.pin	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,10 @@
+[POLICYNAME]
+Symbian VPN Test Policy (2)
+[POLICYDESCRIPTION]
+Test for Symbian OS's VPN API
+[POLICYVERSION]
+1.0
+[ISSUERNAME]
+Symbian
+[CONTACTINFO]
+ahamed.rafik@nokia.com
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_2483.pol	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,60 @@
+SECURITY_FILE_VERSION: 3
+[INFO]
+VPN Policy for VPN Client
+[POLICY]
+sa symbian_esp = {
+	esp
+	encrypt_alg 	12
+	auth_alg    	3
+	identity_remote	10.225.208.183
+	src_specific
+	hard_lifetime_addtime 3600
+	hard_lifetime_usetime 3600
+}
+
+
+remote 10.225.208.183 255.255.255.255 = { symbian_esp(10.225.208.183) }
+
+inbound = { }
+outbound = { }
+
+[IKE]
+IKE_VERSION: 1
+ADDR: 10.225.208.86 255.255.255.255
+USE_MOBIKE: TRUE
+SEND_NOTIFICATION: TRUE
+GROUP_DESCRIPTION_II: MODP_1024
+USE_COMMIT: FALSE
+IPSEC_EXPIRE: FALSE
+SEND_CERT: FALSE
+INITIAL_CONTACT: FALSE
+RESPONDER_LIFETIME: FALSE
+REPLAY_STATUS: FALSE
+CRACK_LAM_TYPE: OTP
+USE_INTERNAL_ADDR: FALSE
+USE_NAT_PROBE: FALSE
+PROPOSALS: 1
+ENC_ALG: AES128-CBC
+AUTH_METHOD: PRE-SHARED
+HASH_ALG: SHA1
+GROUP_DESCRIPTION: MODP_1024
+GROUP_TYPE: DEFAULT
+LIFETIME_KBYTES: 5000
+LIFETIME_SECONDS: 3600
+PRF: NONE
+PRESHARED_KEYS:
+FORMAT: STRING_FORMAT
+KEY: 9 IPSEC_IOT
+
+[DUMMY]
+MODE: Main
+ep local_end_point_msk = { ? 0.0.0.0 }
+ep local_end_point = { ? 0.0.0.0 }
+ep local_end_point = { ? 0.0.0.0%8 }
+
+local local_end_point 0.0.0.0 = { symbian_esp(10.253.4.99) }
+remote 0.0.0.0 0.0.0.0 = { symbian_esp(10.253.4.99) }
+
+
+remote 0.0.0.0 0.0.0.0 = { symbian_esp(10.253.4.99) }
+remote 10.253.4.99%8 255.255.255.255 = { symbian_esp(sgw1) }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_2483_drop.pin	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,10 @@
+[POLICYNAME]
+Symbian VPN Test Policy (2)
+[POLICYDESCRIPTION]
+Test for Symbian OS's VPN API
+[POLICYVERSION]
+1.0
+[ISSUERNAME]
+Symbian
+[CONTACTINFO]
+ahamed.rafik@nokia.com
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_2483_drop.pol	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,57 @@
+SECURITY_FILE_VERSION: 3
+[INFO]
+VPN Policy for VPN Client
+[POLICY]
+sa symbian_esp = {
+	esp
+	encrypt_alg 	12
+	auth_alg    	3
+	identity_remote	10.225.208.183
+	src_specific
+	hard_lifetime_addtime 3600
+	hard_lifetime_usetime 3600
+}
+
+
+remote 10.225.208.183 255.255.255.255 = { symbian_esp(10.225.208.183) }
+
+[IKE]
+IKE_VERSION: 1
+ADDR: 10.225.208.183 255.255.255.255
+USE_MOBIKE: TRUE
+SEND_NOTIFICATION: TRUE
+GROUP_DESCRIPTION_II: MODP_1024
+USE_COMMIT: FALSE
+IPSEC_EXPIRE: FALSE
+SEND_CERT: FALSE
+INITIAL_CONTACT: FALSE
+RESPONDER_LIFETIME: FALSE
+REPLAY_STATUS: FALSE
+CRACK_LAM_TYPE: OTP
+USE_INTERNAL_ADDR: FALSE
+USE_NAT_PROBE: FALSE
+PROPOSALS: 1
+ENC_ALG: AES128-CBC
+AUTH_METHOD: PRE-SHARED
+HASH_ALG: SHA1
+GROUP_DESCRIPTION: MODP_1024
+GROUP_TYPE: DEFAULT
+LIFETIME_KBYTES: 5000
+LIFETIME_SECONDS: 3600
+PRF: NONE
+PRESHARED_KEYS:
+FORMAT: STRING_FORMAT
+KEY: 9 IPSEC_IOT
+
+[DUMMY]
+MODE: Main
+ep local_end_point_msk = { ? 0.0.0.0 }
+ep local_end_point = { ? 0.0.0.0 }
+ep local_end_point = { ? 0.0.0.0%8 }
+
+local local_end_point 0.0.0.0 = { symbian_esp(10.253.4.99) }
+remote 0.0.0.0 0.0.0.0 = { symbian_esp(10.253.4.99) }
+
+
+remote 0.0.0.0 0.0.0.0 = { symbian_esp(10.253.4.99) }
+remote 10.253.4.99%8 255.255.255.255 = { symbian_esp(sgw1) }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_ethced_2483.xml	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,2130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+ All rights reserved.
+ This component and the accompanying materials are made available
+ under the terms of "Eclipse Public License v1.0"
+ which accompanies this distribution, and is available
+ at the URL "http://www.eclipse.org/legal/epl-v10.html".
+
+ Initial Contributors:
+ Nokia Corporation - initial contribution.
+
+ Contributors:
+
+ Description:
+ CommDB Settings File
+ All Rights Reserved
+
+-->
+
+
+
+<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:xlink="http://www.w3.org/1999/xlink"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
+
+<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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>
+    <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable2</Name>
+        <Ranking>1</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.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>
+        <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.wapstart.com</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.wapgateway.com</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>+4412345678901</GatewayAddress>
+        <WSPOption>CONNECTIONORIENTED</WSPOption>
+        <Security>FALSE</Security>
+        <ServiceCentreAddress>+442071234567</ServiceCentreAddress>
+    </WAPSMSBearer>
+</WAPSMSBearerTable>
+
+<VirtualBearerTable>
+</VirtualBearerTable>
+
+<VpnServiceTable>
+</VpnServiceTable>
+
+
+</CommDB:Config>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_ethced_2483vpn.xml	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,1245 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+        CommDB Settings File
+        Copyright (c) 2003, Symbian Ltd.
+        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>
+    <Network operation="add">
+        <Name>Intranet</Name>
+    </Network>
+    <Network operation="add">
+       <Name>VPN</Name>
+    </Network>
+
+</NetworkTable>
+
+<IAPTable>
+    <IAP operation="add">
+        <Name>Hungry</Name>
+        <IAPService>DialOutISP.Dummy</IAPService>
+        <IAPBearer>ModemBearer.Hungry</IAPBearer>
+        <IAPNetwork>Network.Hungry</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office Direct Dial</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>
+     <IAP operation="add">
+        <Name>Default Dial In ISP</Name>
+        <IAPService>DialInISP.Dial In CS ISP</IAPService>
+        <IAPBearer>ModemBearer.Linux</IAPBearer>
+        <IAPNetwork>Network.NT RAS</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Home</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Linux</Name>
+        <IAPService>DialOutISP.Linux</IAPService>
+        <IAPBearer>ModemBearer.Linux</IAPBearer>
+        <IAPNetwork>Network.Linux</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office Direct Dial</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Dummy</Name>
+        <IAPService>DialOutISP.Dummy</IAPService>
+        <IAPBearer>ModemBearer.Dummy</IAPBearer>
+        <IAPNetwork>Network.Dummy</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office Direct Dial</LocationRef>
+    </IAP>
+    <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>Virtual Comm port</Name>
+        <IAPService>DialOutISP.Linux</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.Linux</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Bad NT RAS</Name>
+        <IAPService>DialOutISP.Bad 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>Dummy (Long Timeout)</Name>
+        <IAPService>DialOutISP.Dummy</IAPService>
+        <IAPBearer>ModemBearer.Dummy (Long Timeout)</IAPBearer>
+        <IAPNetwork>Network.Dummy (Long Timeout)</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Hungry (Long Timeout)</Name>
+        <IAPService>DialOutISP.Dummy</IAPService>
+        <IAPBearer>ModemBearer.Hungry (Long Timeout)</IAPBearer>
+        <IAPNetwork>Network.Hungry (Long Timeout)</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>VPN Test Ethernet</Name>
+	<IAPService>LANService.VPN Tests Ethernet Service</IAPService>
+	<IAPBearer>LANBearer.VPN Tests Ethernet Bearer</IAPBearer>
+	<IAPNetwork>Network.Intranet</IAPNetwork>
+	<IAPNetworkWeighting>0</IAPNetworkWeighting>
+	<LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>VPN Test IAP</Name>
+	<IAPService>VpnService.VPN Test Service</IAPService>
+	<IAPBearer>VirtualBearer.VPN Test Bearer</IAPBearer>
+	<IAPNetwork>Network.VPN</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>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>
+    <LANBearer operation="add">
+		<Name>VPN Tests Ethernet Bearer</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>
+ <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.225.208.1</IpGateway>
+        <IpAddr>10.225.208.102</IpAddr>
+        <IpAddrFromServer>FALSE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <IpNameServer1>172.30.251.128</IpNameServer1>
+        <IpNameServer2>172.30.251.130</IpNameServer2>
+        <ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
+        <ConfigDaemonName>!DhcpServ</ConfigDaemonName>
+    </LANService>
+        <LANService operation="add">
+        <Name>VPN Tests Ethernet Service</Name>
+        <IfNetworks>ip</IfNetworks>
+        <IpNetMask>255.255.254.0</IpNetMask>
+        <IpGateway>10.253.5.254</IpGateway>
+        <IpAddr>10.253.4.2</IpAddr>
+        <IpAddrFromServer>FALSE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <IpNameServer1>10.253.16.1</IpNameServer1>
+        <IpNameServer2>10.192.59.6</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>
+        <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>
+
+
+
+<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>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>Virtual</BearerSet>
+        <IAPRef>IAP.VPN Test IAP</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>
+    <VirtualBearer operation="add">
+        <Name>VPN Test Bearer</Name>
+        <Agent>vpnconnagt.agt</Agent>
+        <IfName>tunnelnif</IfName>
+        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+    </VirtualBearer>
+</VirtualBearerTable>
+
+<VpnServiceTable>
+<VpnService operation="add">
+    <Name>VPN Test Service</Name>
+	<Policy>te_2483</Policy>
+	<HomeIAP>IAP.Ethernet with Daemon Dynamic IP</HomeIAP>
+	<HomeNetwork>Network.VPN</HomeNetwork>
+    </VpnService>
+</VpnServiceTable>
+
+</CommDB:Config>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_ethced_2483vpn_drop.xml	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,1245 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+        CommDB Settings File
+        Copyright (c) 2003, Symbian Ltd.
+        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>
+    <Network operation="add">
+        <Name>Intranet</Name>
+    </Network>
+    <Network operation="add">
+       <Name>VPN</Name>
+    </Network>
+
+</NetworkTable>
+
+<IAPTable>
+    <IAP operation="add">
+        <Name>Hungry</Name>
+        <IAPService>DialOutISP.Dummy</IAPService>
+        <IAPBearer>ModemBearer.Hungry</IAPBearer>
+        <IAPNetwork>Network.Hungry</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office Direct Dial</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>
+     <IAP operation="add">
+        <Name>Default Dial In ISP</Name>
+        <IAPService>DialInISP.Dial In CS ISP</IAPService>
+        <IAPBearer>ModemBearer.Linux</IAPBearer>
+        <IAPNetwork>Network.NT RAS</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Home</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Linux</Name>
+        <IAPService>DialOutISP.Linux</IAPService>
+        <IAPBearer>ModemBearer.Linux</IAPBearer>
+        <IAPNetwork>Network.Linux</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office Direct Dial</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Dummy</Name>
+        <IAPService>DialOutISP.Dummy</IAPService>
+        <IAPBearer>ModemBearer.Dummy</IAPBearer>
+        <IAPNetwork>Network.Dummy</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office Direct Dial</LocationRef>
+    </IAP>
+    <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>Virtual Comm port</Name>
+        <IAPService>DialOutISP.Linux</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.Linux</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Bad NT RAS</Name>
+        <IAPService>DialOutISP.Bad 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>Dummy (Long Timeout)</Name>
+        <IAPService>DialOutISP.Dummy</IAPService>
+        <IAPBearer>ModemBearer.Dummy (Long Timeout)</IAPBearer>
+        <IAPNetwork>Network.Dummy (Long Timeout)</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Hungry (Long Timeout)</Name>
+        <IAPService>DialOutISP.Dummy</IAPService>
+        <IAPBearer>ModemBearer.Hungry (Long Timeout)</IAPBearer>
+        <IAPNetwork>Network.Hungry (Long Timeout)</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>VPN Test Ethernet</Name>
+	<IAPService>LANService.VPN Tests Ethernet Service</IAPService>
+	<IAPBearer>LANBearer.VPN Tests Ethernet Bearer</IAPBearer>
+	<IAPNetwork>Network.Intranet</IAPNetwork>
+	<IAPNetworkWeighting>0</IAPNetworkWeighting>
+	<LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>VPN Test IAP</Name>
+	<IAPService>VpnService.VPN Test Service</IAPService>
+	<IAPBearer>VirtualBearer.VPN Test Bearer</IAPBearer>
+	<IAPNetwork>Network.VPN</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>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>
+    <LANBearer operation="add">
+		<Name>VPN Tests Ethernet Bearer</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>
+ <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.225.208.1</IpGateway>
+        <IpAddr>10.225.208.102</IpAddr>
+        <IpAddrFromServer>FALSE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <IpNameServer1>172.30.251.128</IpNameServer1>
+        <IpNameServer2>172.30.251.130</IpNameServer2>
+        <ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
+        <ConfigDaemonName>!DhcpServ</ConfigDaemonName>
+    </LANService>
+        <LANService operation="add">
+        <Name>VPN Tests Ethernet Service</Name>
+        <IfNetworks>ip</IfNetworks>
+        <IpNetMask>255.255.254.0</IpNetMask>
+        <IpGateway>10.253.5.254</IpGateway>
+        <IpAddr>10.253.4.2</IpAddr>
+        <IpAddrFromServer>FALSE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <IpNameServer1>10.253.16.1</IpNameServer1>
+        <IpNameServer2>10.192.59.6</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>
+        <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>
+
+
+
+<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>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>Virtual</BearerSet>
+        <IAPRef>IAP.VPN Test IAP</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>
+    <VirtualBearer operation="add">
+        <Name>VPN Test Bearer</Name>
+        <Agent>vpnconnagt.agt</Agent>
+        <IfName>tunnelnif</IfName>
+        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+    </VirtualBearer>
+</VirtualBearerTable>
+
+<VpnServiceTable>
+<VpnService operation="add">
+    <Name>VPN Test Service</Name>
+	<Policy>te_2483_drop</Policy>
+	<HomeIAP>IAP.Ethernet with Daemon Dynamic IP</HomeIAP>
+	<HomeNetwork>Network.VPN</HomeNetwork>
+    </VpnService>
+</VpnServiceTable>
+
+</CommDB:Config>
\ No newline at end of file
--- a/networksecurity/tls/group/BLD.INF	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/tls/group/BLD.INF	Thu Aug 19 11:25:30 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2000-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"
@@ -89,6 +89,13 @@
 ../ts_tls/scripts/tls_oom.ini  	 	z:/testdata/configs/tls_oom.ini
 ../ts_tls/scripts/tls1.ini  	 	z:/testdata/configs/tls1.ini
 ../ts_tls/scripts/tls2.ini  	 	z:/testdata/configs/tls2.ini
+
+// ini files 39,40,41 and 42 are used for the REQ 415-8346
+../ts_tls/scripts/tls39.ini  	 	z:/testdata/configs/tls39.ini
+../ts_tls/scripts/tls40.ini  	 	z:/testdata/configs/tls40.ini
+../ts_tls/scripts/tls41.ini  	 	z:/testdata/configs/tls41.ini
+../ts_tls/scripts/tls42.ini  	 	z:/testdata/configs/tls42.ini
+
 ../ts_tls/scripts/TLS_RSA_WITH_NULL_SHA.ini						z:/testdata/configs/tls_rsa_with_null_sha.ini
 ../ts_tls/scripts/TLS_RSA_WITH_NULL_MD5.ini						z:/testdata/configs/tls_rsa_with_null_md5.ini
 ../ts_tls/scripts/TLS_SNE_SINGLE_SERVER.ini						z:/testdata/configs/tls_sne_single_server.ini
--- a/networksecurity/tls/group/SSL.MMP	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/tls/group/SSL.MMP	Thu Aug 19 11:25:30 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"
@@ -57,6 +57,7 @@
 LIBRARY		netsm.lib
 LIBRARY		netmsg.lib
 LIBRARY		crypto.lib
+LIBRARY		featdiscovery.lib
 
 
 START WINS
--- a/networksecurity/tls/group/ts_tls.iby	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/tls/group/ts_tls.iby	Thu Aug 19 11:25:30 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,10 @@
 data=EPOCROOT##epoc32\data\Z\testdata\configs\tls36.ini			testdata\configs\tls36.ini
 data=EPOCROOT##epoc32\data\Z\testdata\configs\tls37.ini			testdata\configs\tls37.ini
 data=EPOCROOT##epoc32\data\Z\testdata\configs\tls38.ini			testdata\configs\tls38.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls39.ini			testdata\configs\tls39.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls40.ini			testdata\configs\tls40.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls41.ini			testdata\configs\tls41.ini
+data=EPOCROOT##epoc32\data\Z\testdata\configs\tls42.ini			testdata\configs\tls42.ini
 data=EPOCROOT##epoc32\data\Z\testdata\configs\tls_oom.ini		testdata\configs\tls_oom.ini
 data=EPOCROOT##epoc32\data\Z\testdata\configs\tls1.ini			testdata\configs\tls1.ini
 data=EPOCROOT##epoc32\data\Z\testdata\configs\tls2.ini			testdata\configs\tls2.ini
--- a/networksecurity/tls/group/ts_tls.mmp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/tls/group/ts_tls.mmp	Thu Aug 19 11:25:30 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"
@@ -20,6 +20,8 @@
 UID           0x1000008d 0x101F52C4
 VENDORID 0x70000001
 
+MACRO HTTP_ALLOW_UNTRUSTED_CERTIFICATES
+
 SOURCEPATH	../ts_tls
 
 SOURCE		COMINIT.CPP
--- a/networksecurity/tls/protocol/tlsconnection.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/tls/protocol/tlsconnection.cpp	Thu Aug 19 11:25:30 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"
@@ -26,6 +26,8 @@
 #include "applicationdata.h"
 #include <es_sock.h>
 #include <in_sock.h>
+#include <featdiscovery.h>
+#include <featureuids.h>
 
 #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
 #include <ssl_internal.h>
@@ -154,7 +156,17 @@
 	User::LeaveIfError( SetProtocol(aProtocol) );
 	iTlsProvider->Attributes()->iCurrentCipherSuite.iLoByte = 0x00;
 	iTlsProvider->Attributes()->iCurrentCipherSuite.iHiByte = 0x00;
-	iTlsProvider->Attributes()->iDialogNonAttendedMode = EFalse;
+	TBool allowUntrustedCertificates = EFalse;
+	allowUntrustedCertificates = CFeatureDiscovery::IsFeatureSupportedL(NFeature::KFeatureIdFfHttpAllowUntrustedCertificates);
+	
+	if( allowUntrustedCertificates )
+	  {
+      iTlsProvider->Attributes()->iDialogMode = ETTLSDialogModeAllowAutomatic;
+	  }
+	else
+	  {
+	  iTlsProvider->Attributes()->iDialogNonAttendedMode = EFalse;
+	  }
 	iDialogMode = EDialogModeAttended;
 
 	iGenericSocket = new(ELeave)CGenericSecureSocket<RSocket>(aSocket);
@@ -206,7 +218,17 @@
 	User::LeaveIfError( SetProtocol(aProtocol) );
 	iTlsProvider->Attributes()->iCurrentCipherSuite.iLoByte = 0x00;
 	iTlsProvider->Attributes()->iCurrentCipherSuite.iHiByte = 0x00;
-	iTlsProvider->Attributes()->iDialogNonAttendedMode = EFalse;
+	TBool allowUntrustedCertificates = EFalse;
+	allowUntrustedCertificates = CFeatureDiscovery::IsFeatureSupportedL(NFeature::KFeatureIdFfHttpAllowUntrustedCertificates);
+
+	if( allowUntrustedCertificates )
+	  {
+	  iTlsProvider->Attributes()->iDialogMode = ETTLSDialogModeAttended;
+	  }
+	else
+	  {
+	  iTlsProvider->Attributes()->iDialogNonAttendedMode = EFalse;
+	  }
 	iDialogMode = EDialogModeAttended;
 
 	iRecordParser = new(ELeave)CRecordParser( aSocket, *iTlsProvider );
@@ -910,23 +932,56 @@
 	// TDialogMode enum or has the value EDialogModeUnattended/EDialogModeAttended. 
 	// Otherwise, it must return KErrArgument
 	TInt ret = KErrNone;
-   
-    switch(aDialogMode)
-    {
-        case EDialogModeUnattended:
-        case EDialogModeAttended:
-            iDialogMode = aDialogMode;
-        break;
-        
-        default:  //-- wrong mode
-            LOG(Log::Printf(_L("SetDialogMode() - Unknown dialog mode, default setting (Attended mode) being used"));)
-        return KErrArgument;    
-    };
+	TBool allowUntrustedCertificates = EFalse;
+	TRAP(ret, allowUntrustedCertificates = CFeatureDiscovery::IsFeatureSupportedL(NFeature::KFeatureIdFfHttpAllowUntrustedCertificates));
+	
+	if(KErrNone == ret)
+	{
+		TTLSDialogMode tlsDialogMode( ETTLSDialogModeAttended );
+		switch(aDialogMode)
+		{
+			case EDialogModeUnattended:
+				{
+				if( allowUntrustedCertificates )
+					{
+					tlsDialogMode = ETTLSDialogModeUnattended;
+					iDialogMode = aDialogMode;
+					break;        
+					}
+				}
+			case EDialogModeAttended:
+				{
+				if( allowUntrustedCertificates )
+					{
+					tlsDialogMode = ETTLSDialogModeAttended;
+					}
+				iDialogMode = aDialogMode;
+				break;
+				}
+			case EDialogModeAllowAutomatic:
+				{
+				tlsDialogMode = ETTLSDialogModeAllowAutomatic;
+				iDialogMode = aDialogMode;
+				break; 
+				}
+			
+			default:  //-- wrong mode
+				LOG(Log::Printf(_L("SetDialogMode() - Unknown dialog mode, default setting (Attended mode) being used"));)
+			return KErrArgument;    
+		};
 
-    if ( iTlsProvider )
-    {
-   	    iTlsProvider->Attributes()->iDialogNonAttendedMode = (iDialogMode == EDialogModeUnattended);
-    }	
+		if ( iTlsProvider )
+		{
+		if( allowUntrustedCertificates )
+			{
+			iTlsProvider->Attributes()->iDialogMode = tlsDialogMode;
+			}
+		else
+			{
+			iTlsProvider->Attributes()->iDialogNonAttendedMode = (iDialogMode == EDialogModeUnattended);
+			}
+		}
+	}
 
     return ret;
 }
--- a/networksecurity/tls/secsock/SecureSocketInterface.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/tls/secsock/SecureSocketInterface.h	Thu Aug 19 11:25:30 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"
@@ -64,6 +64,9 @@
 	EDialogModeAttended,
 	/** Untrusted certificates are canceled without user confirmation. */
 	EDialogModeUnattended
+	,
+	/** Untrusted certificates are automatically allowed without user confirmation. */
+	EDialogModeAllowAutomatic
 	};
 
 
--- a/networksecurity/tls/test/te_tlsunittest/group/te_tlsunittest.mmp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/tls/test/te_tlsunittest/group/te_tlsunittest.mmp	Thu Aug 19 11:25:30 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 
--- a/networksecurity/tls/ts_tls/T_Autossl_Const.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/tls/ts_tls/T_Autossl_Const.h	Thu Aug 19 11:25:30 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"
@@ -37,6 +37,11 @@
 _LIT( KCfgProtocol, "Protocol" );
 _LIT( KCfgUseGenericSocket, "UseGenericSocket");
 _LIT( KCfgEAPKeyDerivation, "EAPKeyDerivation");
+#ifdef HTTP_ALLOW_UNTRUSTED_CERTIFICATES
+_LIT( KCfgSSLDialogMode, "SSLDialogMode");
+_LIT( KCfgSSLDialogModeValue, "SSLDialogModeValue");
+_LIT( KCfgExpectedErrorCode, "ExpectedErrorCode");
+#endif // HTTP_ALLOW_UNTRUSTED_CERTIFICATES
 
 const TInt KDefCfgCipher = 0;
 const TInt KDefCfgIPPort = 0;
@@ -46,6 +51,11 @@
 const TInt KDefCfgMaxThreshold = 1000;
 const TBool KDefUseGenericSocket = EFalse;
 const TBool KDefEAPKeyDerivation = EFalse;
+#ifdef HTTP_ALLOW_UNTRUSTED_CERTIFICATES
+const TBool KDefSSLDialogMode = EFalse;
+const TInt KDefSSLDialogModeValue = 0;
+const TInt KDefErrorValue = 0;
+#endif  // HTTP_ALLOW_UNTRUSTED_CERTIFICATES
 
 _LIT( KDefCfgIPAddress, "default" );
 _LIT( KDefCfgDNSName, "www.default.com" );
--- a/networksecurity/tls/ts_tls/T_TLS_cntrl.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/tls/ts_tls/T_TLS_cntrl.cpp	Thu Aug 19 11:25:30 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"
@@ -215,6 +215,28 @@
 				iEAPKeyDerivation = KDefEAPKeyDerivation;
 				}
 			iTestStep->Log( _L("EAPKeyDerivation: %D"), iEAPKeyDerivation);
+#ifdef HTTP_ALLOW_UNTRUSTED_CERTIFICATES
+			// iTLSDialogMode;
+            if (!iTestStep->GetBoolFromConfig(KSectionName, KCfgSSLDialogMode, iTLSDialogMode ))
+                {
+                iTLSDialogMode = KDefSSLDialogMode;
+                }
+            iTestStep->Log( _L("TLSDialogMode: %D"), iTLSDialogMode);
+            
+            // iTLSDialogModeValue;
+            if (!iTestStep->GetIntFromConfig(KSectionName, KCfgSSLDialogModeValue, iTLSDialogModeValue ))
+                {
+                iTLSDialogModeValue = KDefSSLDialogModeValue;
+                }
+            iTestStep->Log( _L("TLSDialogModeValue: %D"), iTLSDialogModeValue);
+            
+            // iExpectedErrorCode (-7548: KErrSSLAlertUnknownCA)
+            if (!iTestStep->GetIntFromConfig(KSectionName, KCfgExpectedErrorCode, iExpectedErrorCode ))
+                {
+                iExpectedErrorCode = KDefErrorValue;
+                }
+            iTestStep->Log( _L("ExpectedErrorCode: %D"), iExpectedErrorCode);
+#endif  // HTTP_ALLOW_UNTRUSTED_CERTIFICATES
 
 			// On to next state 
 			iRunState = EFindFreeTest;			
@@ -253,9 +275,13 @@
 							{
 							iTestStep->Log( _L("Using test object %d"), i );
 							}
-
+#ifdef HTTP_ALLOW_UNTRUSTED_CERTIFICATES
 						iTLSTest[i]->ConnectL( iAddress, iPortNum, iPage, iCipherSuites, 
-							iCipher, iSimpleGet, iTestEndDelay, iDNSName, iProtocol, iUseGenericSocket, iEAPKeyDerivation );
+                                                    iCipher, iSimpleGet, iTestEndDelay, iDNSName, iProtocol, iUseGenericSocket, iEAPKeyDerivation, iTLSDialogMode, iTLSDialogModeValue, iExpectedErrorCode ); //ajit
+#else
+						iTLSTest[i]->ConnectL( iAddress, iPortNum, iPage, iCipherSuites, 
+						                            iCipher, iSimpleGet, iTestEndDelay, iDNSName, iProtocol, iUseGenericSocket, iEAPKeyDerivation ); //ajit
+#endif  // HTTP_ALLOW_UNTRUSTED_CERTIFICATES
 
 						iRunState = EWaitForComplete;
 						break; // break from the for loop
--- a/networksecurity/tls/ts_tls/T_TLS_cntrl.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/tls/ts_tls/T_TLS_cntrl.h	Thu Aug 19 11:25:30 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"
@@ -95,7 +95,11 @@
 	TBuf<32>	iProtocol;
 	TBool		iUseGenericSocket;
 	TBool		iEAPKeyDerivation;
-
+#ifdef HTTP_ALLOW_UNTRUSTED_CERTIFICATES
+	TBool      iTLSDialogMode;
+	TInt       iTLSDialogModeValue;
+	TInt       iExpectedErrorCode;       
+#endif  // HTTP_ALLOW_UNTRUSTED_CERTIFICATES
 	RSemaphore	iSemaphore;	
 
 	};
--- a/networksecurity/tls/ts_tls/T_TLS_test.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/tls/ts_tls/T_TLS_test.cpp	Thu Aug 19 11:25:30 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"
@@ -288,7 +288,29 @@
 			{
 			iTestStep->Log( _L("Failed to set Protocol for use: (%d)"),err );
 			}
-
+#ifdef HTTP_ALLOW_UNTRUSTED_CERTIFICATES
+		if(iTLSDialogMode) 
+		    {
+            iStatus = iTlsSocket->SetOpt(KSoDialogMode,KSolInetSSL,iTLSDialogModeValue);
+            if ( iStatus != KErrNone )
+                {
+                if(iExpectedErrorCode == iStatus.Int())
+                    {
+                    iTestStep->Log( _L("iTlsSocket->SetOpt() failed with KErrArgument because of invalid DialogModeValue "));
+                    iRunState = EConnectionClosed;
+                    iTestPassed = ETrue;
+                    }
+                else
+                    {
+                    iTestStep->Log( _L("iTlsSocket->SetOpt() failed with error: %d"), iStatus.Int());
+                    }
+                iTlsSocket->Close();                 
+                iTimer.After( iStatus, 1000000 );
+                SetActive();
+                break;
+                }
+		    }
+#endif  // HTTP_ALLOW_UNTRUSTED_CERTIFICATES
 		// Set the domain name we're connecting to...
 		iStatus = iTlsSocket->SetOpt(KSoSSLDomainName,KSolInetSSL, iDNSName);
 		if ( iStatus != KErrNone )
@@ -330,17 +352,30 @@
 
 		if ( iStatus != KErrNone )
 			{
-			TPtrC errorText = iTestStep->EpocErrorToText(iStatus.Int());
-			iTestStep->Log( _L("ESecureConnected:%S %d"),&errorText, iStatus.Int() );
-			iTestStep->Log( KStateErrReceivePage, iStatus.Int() );
-			iTestStep->Log( KStateErrReceivePage, iStatus.Int() );
-			iRunState = EConnectionClosed;
-			iTestPassed = EFalse;
-			iTlsSocket->Close();				 
-			iTimer.After( iStatus, 1000000 );
-			SetActive();
-			break;
-			}
+#ifdef HTTP_ALLOW_UNTRUSTED_CERTIFICATES
+            if(iExpectedErrorCode == iStatus.Int())
+                {
+                iTestStep->Log( _L("Received Untrusted CA"));
+                iRunState = EConnectionClosed;
+                iTestPassed = ETrue;
+                }
+            else
+                {
+#endif  // HTTP_ALLOW_UNTRUSTED_CERTIFICATES
+                TPtrC errorText = iTestStep->EpocErrorToText(iStatus.Int());
+                iTestStep->Log( _L("ESecureConnected:%S %d"),&errorText, iStatus.Int() );
+                iTestStep->Log( KStateErrReceivePage, iStatus.Int() );
+                iTestStep->Log( KStateErrReceivePage, iStatus.Int() );
+                iRunState = EConnectionClosed;
+                iTestPassed = EFalse;
+#ifdef HTTP_ALLOW_UNTRUSTED_CERTIFICATES
+                }
+#endif  // HTTP_ALLOW_UNTRUSTED_CERTIFICATES
+                iTlsSocket->Close();                 
+                iTimer.After( iStatus, 1000000 );
+                SetActive();
+                break;                
+            }
 		else
 			{
 			iTestStep->Log( _L("ESecureConnected:KErrNone %d"),iStatus.Int() );
@@ -721,7 +756,7 @@
 	// Cancel the connect
 	iSocket.CancelConnect();
 	}
-
+#ifdef HTTP_ALLOW_UNTRUSTED_CERTIFICATES
 void CTLSTest::ConnectL( const TDesC &aAddress, 
 				const TInt aPortNum, 
 				const TDesC &aPage, 
@@ -732,7 +767,23 @@
 				const TDesC8& aDNSName ,
 				const TDesC& aProtocol, 
 				TBool aUseGenericSocket, 
-				TBool aEAPKeyDerivation )
+				TBool aEAPKeyDerivation,
+				TBool aTLSDialogMode,
+				TInt aTLSDialogModeValue,
+				TInt aExpectedErrorCode )
+#else
+void CTLSTest::ConnectL( const TDesC &aAddress, 
+                const TInt aPortNum, 
+                const TDesC &aPage, 
+                const TDesC8 &aCipherSuite, 
+                const TInt aCipher, 
+                const TInt aSimpleGet, 
+                const TInt aTestEndDelay, 
+                const TDesC8& aDNSName ,
+                const TDesC& aProtocol, 
+                TBool aUseGenericSocket, 
+                TBool aEAPKeyDerivation )
+#endif  // HTTP_ALLOW_UNTRUSTED_CERTIFICATES
 	{
 #if 0
 	iRunState = EDummyConnection;
@@ -773,7 +824,11 @@
 	iTestEndDelay = aTestEndDelay;
 	iUseGenericSocket = aUseGenericSocket;
 	iEAPKeyDerivation = aEAPKeyDerivation;
-
+#ifdef HTTP_ALLOW_UNTRUSTED_CERTIFICATES
+	iTLSDialogMode = aTLSDialogMode;
+	iTLSDialogModeValue = aTLSDialogModeValue;
+	iExpectedErrorCode = aExpectedErrorCode;
+#endif  // HTTP_ALLOW_UNTRUSTED_CERTIFICATES
 	// Print info to the log
 	iTestStep->Log( _L("*****Connecting to*****") );
 	iTestStep->Log( _L("%s:%d "), iAddress.PtrZ(), iPortNum ); 
--- a/networksecurity/tls/ts_tls/T_TLS_test.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/tls/ts_tls/T_TLS_test.h	Thu Aug 19 11:25:30 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"
@@ -70,6 +70,7 @@
 	// Construct/destruct
 	static CTLSTest *NewL();
 	~CTLSTest();
+#ifdef HTTP_ALLOW_UNTRUSTED_CERTIFICATES
 	void ConnectL( const TDesC &aAddress, 
 			const TInt aPortNum, 
 			const TDesC &aPage, 
@@ -80,7 +81,23 @@
 			const TDesC8& aDNSName, 
 			const TDesC& aProtocol, 
 			TBool aUseGenericSocket, 
-			TBool aEAPKeyDerivation );	
+			TBool aEAPKeyDerivation,
+			TBool aTLSDialogMode,
+			TInt aTLSDialogModeValue,
+			TInt aExpectedErrorCode );
+#else
+	void ConnectL( const TDesC &aAddress, 
+	            const TInt aPortNum, 
+	            const TDesC &aPage, 
+	            const TDesC8 &aCipherSuite, 
+	            const TInt aCipher, 
+	            const TInt aSimpleGet, 
+	            const TInt aTestEndDelay, 
+	            const TDesC8& aDNSName, 
+	            const TDesC& aProtocol, 
+	            TBool aUseGenericSocket, 
+	            TBool aEAPKeyDerivation );
+#endif  // HTTP_ALLOW_UNTRUSTED_CERTIFICATES
 
 	void SetConsole( CTestStepTls * aTestStep );
 	TBool InUse();
@@ -119,7 +136,11 @@
 	TBool		iCiphersMatch;		// true if expected cipher was selected by the server
 	TBool		iUseGenericSocket;
 	TBool		iEAPKeyDerivation;
-	
+#ifdef HTTP_ALLOW_UNTRUSTED_CERTIFICATES
+	TBool      iTLSDialogMode;
+	TInt       iTLSDialogModeValue;
+	TInt       iExpectedErrorCode;
+#endif  // HTTP_ALLOW_UNTRUSTED_CERTIFICATES
 	TSockXfrLength iBytesRead;
 	TBuf8<5000> iRcvBuffer;
 	TBuf8<256>	iSndBuffer;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls39.ini	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,35 @@
+// 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:
+/////////////////////////////////////////////
+
+TLS39
+
+[Tlstest]
+/////////////////////////////////////////////
+IPAddress=192.168.10.11
+Protocol=tls1.0
+P_rotocol=ssl3.0
+DNSName=TLS39
+IPPort=543
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=1
+CipherSuites=01
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
+SSLDialogMode=true
+SSLDialogModeValue=0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls40.ini	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,37 @@
+// 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:
+/////////////////////////////////////////////
+
+TLS40
+
+[Tlstest]
+/////////////////////////////////////////////
+IPAddress=192.168.10.11
+Protocol=tls1.0
+P_rotocol=ssl3.0
+DNSName=TLS40
+IPPort=543
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=1
+CipherSuites=01
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
+SSLDialogMode=true
+SSLDialogModeValue=1
+ExpectedErrorCode=-7548
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/Tls41.ini	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,36 @@
+// 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:
+/////////////////////////////////////////////
+
+TLS41
+
+[Tlstest]
+/////////////////////////////////////////////
+IPAddress=192.168.10.11
+Protocol=tls1.0
+P_rotocol=ssl3.0
+DNSName=TLS41
+IPPort=543
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=1
+CipherSuites=01
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
+SSLDialogMode=true
+SSLDialogModeValue=2
+
--- a/networksecurity/tls/ts_tls/scripts/ssl_ntras_30.script	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/tls/ts_tls/scripts/ssl_ntras_30.script	Thu Aug 19 11:25:30 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"
@@ -127,6 +127,22 @@
 TEST_COMPLETE TLS_test_38
 
 RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls39.ini
+TEST_COMPLETE TLS_test_39
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls40.ini
+TEST_COMPLETE TLS_test_40
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls41.ini
+TEST_COMPLETE TLS_test_41
+
+RUN_UTILS Delete c:\t_secdlg_out.dat
+RUN_TEST_STEP 100000, TS_TLS, t_Tls, z:\testdata\configs\Tls42.ini
+TEST_COMPLETE TLS_test_42
+
+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
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/networksecurity/tls/ts_tls/scripts/tls42.ini	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,37 @@
+// 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:
+/////////////////////////////////////////////
+
+TLS42
+
+[Tlstest]
+/////////////////////////////////////////////
+IPAddress=192.168.10.11
+Protocol=tls1.0
+P_rotocol=ssl3.0
+DNSName=TLS40
+IPPort=543
+TLSMaxVersion=3.1
+TLSMinVersion=3.0
+Cipher=1
+CipherSuites=01
+Page=/index.html
+SimpleGet=0
+TestEndDelay=0
+UseGenericSocket=false
+EAPKeyDerivation=false
+SSLDialogMode=true
+SSLDialogModeValue=5
+ExpectedErrorCode=-6
+
--- a/networksecurity/tlsprovider/group/tlsprovider.mmp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/tlsprovider/group/tlsprovider.mmp	Thu Aug 19 11:25:30 2010 +0300
@@ -53,6 +53,7 @@
 LIBRARY ctfinder.lib
 LIBRARY tlscacheclient.lib
 LIBRARY bafl.lib
+LIBRARY featdiscovery.lib
 DEBUGLIBRARY            flogger.lib
 
 deffile		tlsprovider.def
--- a/networksecurity/tlsprovider/inc/tlstypedef.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/tlsprovider/inc/tlstypedef.h	Thu Aug 19 11:25:30 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* 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"
@@ -115,6 +115,11 @@
  */
 enum TTLSCompressionMethod { ENullCompression  };
 
+/**
+ * @internalAll 
+ */
+enum TTLSDialogMode { ETTLSDialogModeAttended, ETTLSDialogModeUnattended, ETTLSDialogModeAllowAutomatic };
+
 class CSubjectPublicKeyInfo;
 class CMessageDigest;
 class TTLSCipherSuiteMapping;
--- a/networksecurity/tlsprovider/inc/tlstypedef_internal.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/tlsprovider/inc/tlstypedef_internal.h	Thu Aug 19 11:25:30 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* 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"
@@ -127,8 +127,8 @@
 	TBool iClientAuthenticate;
 	TBool iDialogNonAttendedMode;  
 	TTLSSignatureAlgorithm isignatureAlgorithm; 
-	TBuf8<256> idomainName;		
-
+	TBuf8<256> idomainName;	
+	TTLSDialogMode iDialogMode;
 	TBool iAllowNullCipherSuites;
 
 	TBool iPskConfigured;
--- a/networksecurity/tlsprovider/source/tlsprovider/CTlsProvider.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/tlsprovider/source/tlsprovider/CTlsProvider.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -19,11 +19,14 @@
 #include <securitydefsconst.h>
 #include <x520ava.h>
 #include <asn1dec.h>
+#include <featdiscovery.h>
+#include <featureuids.h>
 
 #include "tlsprovider.h"
 #include "cryptostrength.h"
 
 
+
 //
 //  CTlsProviderImpl
 //
@@ -1074,7 +1077,15 @@
 			}
 		else
 			{
-			if(iTlsCryptoAttributes && iTlsCryptoAttributes->iDialogNonAttendedMode)
+			TBool allowUntrustedCertificates = EFalse;
+			allowUntrustedCertificates = CFeatureDiscovery::IsFeatureSupportedL(NFeature::KFeatureIdFfHttpAllowUntrustedCertificates);
+			
+			if ( allowUntrustedCertificates && iTlsCryptoAttributes && ETTLSDialogModeAllowAutomatic == iTlsCryptoAttributes->iDialogMode )
+				{        
+				iCurrentState = iOriginalState = ENullState;
+				User::RequestComplete(iOriginalRequestStatus,KErrNone); 
+				}
+			else if((allowUntrustedCertificates && iTlsCryptoAttributes && ETTLSDialogModeUnattended == iTlsCryptoAttributes->iDialogMode ) || (iTlsCryptoAttributes && iTlsCryptoAttributes->iDialogNonAttendedMode))
 				{	
 				TLSPROV_LOG(_L("Server Certificate validation failed but in DialogNonAttended mode"))	
 				TInt err(0);
--- a/networksecurity/tlsprovider/source/tlsprovider/tlsprovinterface.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/networksecurity/tlsprovider/source/tlsprovider/tlsprovinterface.cpp	Thu Aug 19 11:25:30 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"
@@ -16,6 +16,8 @@
 #include "Tlsprovinterface.h"
 #include "tlsprovider.h"
 #include <badesca.h>
+#include <featdiscovery.h>
+#include <featureuids.h>
 
 //
 //                                   CTlsProvider
@@ -282,6 +284,9 @@
       ((TlsSessionPtr()->Attributes())->iMasterSecretInput).iClientRandom = (Attributes()->iMasterSecretInput).iClientRandom;
    	}
 
+	TBool allowUntrustedCertificates = EFalse;
+	allowUntrustedCertificates = CFeatureDiscovery::IsFeatureSupportedL(NFeature::KFeatureIdFfHttpAllowUntrustedCertificates);
+
 	// Save old implementation object
 	CTlsProviderImpl *oldTlsProviderImpl = iTlsProviderImpl;
 	iTlsProviderImpl = NULL;	
@@ -299,7 +304,16 @@
 
 		Attributes()->iProposedProtocol = oldAttr->iProposedProtocol;
 		Attributes()->iProposedCiphers = oldAttr->iProposedCiphers;
-		Attributes()->iDialogNonAttendedMode = oldAttr->iDialogNonAttendedMode;
+		
+		if( allowUntrustedCertificates )
+			{
+			Attributes()->iDialogMode = oldAttr->iDialogMode;
+			}
+		else
+			{
+			Attributes()->iDialogNonAttendedMode = oldAttr->iDialogNonAttendedMode;
+			}
+
 		Attributes()->idomainName = oldAttr->idomainName;
 
 		// Copy NULL ciphersuite setting
@@ -338,7 +352,15 @@
 		(Attributes()->iMasterSecretInput).iClientRandom = ((TlsSessionPtr()->Attributes())->iMasterSecretInput).iClientRandom;
 		Attributes()->iProposedProtocol = (TlsSessionPtr()->Attributes())->iProposedProtocol;
 		Attributes()->iNegotiatedProtocol = (TlsSessionPtr()->Attributes())->iNegotiatedProtocol;
-		Attributes()->iDialogNonAttendedMode = (TlsSessionPtr()->Attributes())->iDialogNonAttendedMode;
+		if( allowUntrustedCertificates )
+			{
+			Attributes()->iDialogMode = (TlsSessionPtr()->Attributes())->iDialogMode;
+			}
+		else
+			{
+			Attributes()->iDialogNonAttendedMode = (TlsSessionPtr()->Attributes())->iDialogNonAttendedMode;
+			}
+
       	Attributes()->iSessionNameAndID.iServerName = (TlsSessionPtr()->Attributes())->iSessionNameAndID.iServerName;
       	Attributes()->iSessionNameAndID.iSessionId = (TlsSessionPtr()->Attributes())->iSessionNameAndID.iSessionId;
 
--- a/tcpiputils/dhcp/group/DHCPServ.iby	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dhcp/group/DHCPServ.iby	Thu Aug 19 11:25:30 2010 +0300
@@ -31,6 +31,7 @@
 #include <netmsg.iby>
 #include <netsm.iby>
 
+data=EPOCROOT##epoc32\data\z\private\101fd9c5\dhcp.ini    private\101fd9c5\dhcp.ini
 file=ABI_DIR\DEBUG_DIR\DhcpServ.exe            system\programs\DhcpServ.exe
 
 #ifdef SYMBIAN_DNS_PROXY
--- a/tcpiputils/dhcp/group/DHCPServ.mmp	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dhcp/group/DHCPServ.mmp	Thu Aug 19 11:25:30 2010 +0300
@@ -78,3 +78,4 @@
 CAPABILITY ProtServ NetworkServices NetworkControl ReadDeviceData WriteDeviceData
 
 SMPSAFE
+
--- a/tcpiputils/dhcp/group/bld.inf	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dhcp/group/bld.inf	Thu Aug 19 11:25:30 2010 +0300
@@ -30,6 +30,15 @@
 ../include/DHCPConfig.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(networking/dhcpconfig.h)
 #endif // SYMBIAN_NETWORKING_DHCP_MSG_HEADERS
 
+#ifdef __SECURE_DATA__
+dhcp.ini       /epoc32/data/z/private/101fd9c5/dhcp.ini
+dhcp.ini       /epoc32/winscw/c/private/101fd9c5/dhcp.ini
+#else
+dhcp.ini       /epoc32/data/z/system/data/dhcp.ini
+dhcp.ini       /epoc32/wins/c/system/data/dhcp.ini
+dhcp.ini       /epoc32/winscw/c/system/data/dhcp.ini
+#endif
+
 PRJ_MMPFILES
 
 DHCPServ.mmp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dhcp/group/dhcp.ini	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,19 @@
+// Portions Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// 
+
+[DHCP]
+#ExtraDhcpOptions - for setting opcode requests for server
+#Note: Value string for ExtraDhcpOptions should end with ',' 
+ExtraDhcpOptions= 119,
--- a/tcpiputils/dhcp/include/DHCPIP4Msg.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dhcp/include/DHCPIP4Msg.h	Thu Aug 19 11:25:30 2010 +0300
@@ -114,6 +114,7 @@
 	EDHCPClientID = 61,
    	EDHCPDNSUpdate = 81,
    	EDHCPAuthentication = 90,
+	EDHCPDomainSearch = 119,
 	EDHCPSIPServers = 120,
 #ifdef SYMBIAN_NETWORKING_DHCP_MSG_HEADERS
 	EDHCPOptionOverload = 52,
@@ -251,6 +252,8 @@
 #endif // SYMBIAN_NETWORKING_DHCP_MSG_HEADERS
 protected:
 	TUint32 GetValueBigEndian(TUint8 aOpCode) const;
+public:
+	TInt CopyDomainSearchL(HBufC8*& aBuf8) const; //For retreiving option data value for DHCP option 119 from server's offer packet
 	};
 
 inline COptionList::COptionList(CItemBase* aNext) : CListItem(aNext, 0)
--- a/tcpiputils/dhcp/include/DHCPIP4StateMachine.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dhcp/include/DHCPIP4StateMachine.h	Thu Aug 19 11:25:30 2010 +0300
@@ -190,6 +190,9 @@
 	TInetAddr iDHCPServerID;
 	TInetAddr iBroadcastAddress;
 	TInetAddr iSubnetMask;
+private:
+    void AppendMultipleExtraOptionsParamL(); // Retrieve extra options for dhcp server request from dhcp.ini
+    void SplitDomainSearchBufferL(HBufC8* aDomainSearchBuf); // Decryption of option data for dhcp option 119
 	};
 	
 #ifdef SYMBIAN_NETWORKING_DHCPSERVER
--- a/tcpiputils/dhcp/include/DHCPStateMachine.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dhcp/include/DHCPStateMachine.h	Thu Aug 19 11:25:30 2010 +0300
@@ -24,6 +24,7 @@
 
 #include <e32base.h>
 #include <comms-infras/statemachine.h>
+#include <es_ini.h>
 
 #include "MsgSender.h"
 #include "DHCP_Std.h"
@@ -196,7 +197,7 @@
    virtual void AssembleClientIDsL() = 0;
    void FetchHWAddress();
 
-   void ConfigureInterfaceL( const TSoInet6InterfaceInfo& aInterfaceInfo );
+   void ConfigureInterfaceL( const TSoInetInterfaceInfoExtnDnsSuffix& aInterfaceInfo );
    virtual void PrepareToSendL(CDHCPStateMachine::EAddressType aEAddressType) = 0;
 #ifdef SYMBIAN_NETWORKING_DHCPSERVER   
    	virtual void PrepareToSendServerMsgL(CDHCPStateMachine::EAddressType aEAddressType) = 0;
@@ -274,7 +275,7 @@
 	//DNS client names
 	HBufC8*   iHostName;
 	HBufC8*   iDomainName;
-
+	
 	TUint32 iRenewalTimeT1;			// number of seconds after iStartedAquisitionAt when we send a renew request
 	TUint32 iRebindTimeT2;			// number of seconds after iStartedAquisitionAt when we send a rebind request (only if any renew fails)
 	TUint32 iLeaseTime;				// number of seconds after iStartedAquisitionAt when the lease expires
@@ -299,7 +300,15 @@
 public:	
 	TBool iDhcpInformAckPending;
 	RBuf8 iSavedExtraParameters;
-#endif //SYMBIAN_NETWORKING_DHCP_MSG_HEADERS	
+#endif //SYMBIAN_NETWORKING_DHCP_MSG_HEADERS
+protected:
+	RInetSuffixList iSuffixList;  // Structure to read domain search list from option data returned by dhcp server
+	CESockIniData *iConfig; // Buffer for dhcp.ini content - part of esock framework for ini file parsing
+private:
+    TBool LoadConfigurationFile(); // Load dhcp.ini file to a buffer
+    void UnloadConfigurationFile(); // Destruct allocated space for dhcp ini content
+protected:
+    TInt IniRead(const TDesC& aOptionName, TDes8& aOptionValue); // Ini parser
 	};
 	
 #ifdef SYMBIAN_NETWORKING_DHCPSERVER
--- a/tcpiputils/dhcp/include/DHCP_Std.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dhcp/include/DHCP_Std.h	Thu Aug 19 11:25:30 2010 +0300
@@ -40,6 +40,9 @@
 
 IMPORT_C TInt E32Main();
 
+// DHCP ini file used for configuring extra options and additions configurability
+_LIT(DHCP_INI_DATA,"dhcp.ini");
+
 #ifdef EKA2
 _LIT(KDHCPServerName,"!DHCPServ");
 #else
@@ -159,7 +162,9 @@
 //    specific numbers must have KConnWriteUserDataBit/KConnReadUserDataBit set as appropriate
 const TUint KDhcpInterfaceDbgIoctl    = 0x2000;
 
-
+_LIT(KDhcpExtraOptions, "ExtraDhcpOptions");
+_LIT(KDhcpSection, "DHCP");
+const TInt KOpCodeOutOfBounds = 0x100;
 
 
 
--- a/tcpiputils/dhcp/src/DHCPIP4Control.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dhcp/src/DHCPIP4Control.cpp	Thu Aug 19 11:25:30 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>
--- a/tcpiputils/dhcp/src/DHCPIP4Msg.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dhcp/src/DHCPIP4Msg.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -368,6 +368,22 @@
 	return pNode != NULL;
 	}
 
+TBool COptionList::CopyDomainSearchL(HBufC8*& aBuf8) const
+/**
+  * Return a copy of the domain search list given in the message 
+  *
+  * @param aBuf8 A descriptor for the domain search list to be written into
+  * @return TBool If the copy was successful or not 
+  */
+    {
+    COptionNode* pNode = FindOption(EDHCPDomainSearch);
+    if (pNode)
+        {
+        pNode->CopyBodyToL(aBuf8);
+        }
+    return pNode != NULL;
+    }
+
 CDHCPMessageHeaderIP4::CDHCPMessageHeaderIP4(HBufC8*& aMsg) :
 	CDHCPMessageHeader(&iXid, 4, aMsg), //|     op (1)    |   htype (1)   |   hlen (1)    |   hops (1)    |
 		iXid(&iSecs, 4), iSecs(&iFlags, 2), iFlags(&iCiaddr, 2),
--- a/tcpiputils/dhcp/src/DHCPIP4StateMachine.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dhcp/src/DHCPIP4StateMachine.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -82,7 +82,13 @@
    CDHCPStateMachine::ConstructL();
 
 	__CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPIP4StateMachine::ConstructL")));
-	
+	if (iConfig)
+	    {
+		// Parse dhcp.ini for additional options to be requested with server
+		// and append the option codes to the parameter request list
+        TRAP_IGNORE(AppendMultipleExtraOptionsParamL());
+	    }
+
   	ReAllocL(KDhcpMaxMsgSizeIP4);
   	iDhcpMessage = new(ELeave)CDHCPMessageHeaderIP4(iFragment);
 	iMessageSender = new(ELeave)CMessageSender(this,iSocket,&iTaskStartedAt,KAfInet);
@@ -476,7 +482,9 @@
 	else
 		{
 #endif // SYMBIAN_NETWORKING_DHCP_MSG_HEADERS
-	DhcpMessage()->FinishL(iClientId);
+	// From tb92 and later, including iSavedExtraParameters for FinishL()
+	// as SYMBIAN_NETWORKING_DHCP_MSG_HEADERS is expected to be always ON
+	DhcpMessage()->FinishL(iClientId,&iSavedExtraParameters);
 #ifdef SYMBIAN_NETWORKING_DHCP_MSG_HEADERS
 		}	
 #endif // SYMBIAN_NETWORKING_DHCP_MSG_HEADERS
@@ -1506,10 +1514,24 @@
 	__CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPIP4StateMachine::ConfigureInterfaceL - KSoNoSourceAddressSelect")));
 	User::LeaveIfError(iSocket.SetOpt(KSoNoSourceAddressSelect, KSolInetIp, 0));
 
-	TSoInet6InterfaceInfo interfaceInfo;
+	// Using the new structure derived from TSoInet6InterfaceInfo
+	// to be able to set domain search list for the interface
+	TSoInetInterfaceInfoExtnDnsSuffix interfaceInfo;
 	
 	CDHCPMessageHeaderIP4* v4Msg = DhcpMessage();
 
+
+	// Read the optiond data buffer for option 119 and decrypt it
+    HBufC8* domainSearchBuf(NULL);
+    v4Msg->iOptions.CopyDomainSearchL(domainSearchBuf);
+    if (domainSearchBuf)
+    	{
+		// Perform decryption only if option data has been returned by dhcp server
+        SplitDomainSearchBufferL(domainSearchBuf);
+        delete domainSearchBuf;
+        domainSearchBuf = NULL;
+    	}
+
 	if (!IsUsingStaticAddress())
 		{
 		iCurrentAddress.SetAddress(v4Msg->GetYIAddr());
@@ -1581,8 +1603,24 @@
 	interfaceInfo.iDoState = ETrue;
 	interfaceInfo.iDoAnycast = EFalse;
 	interfaceInfo.iDoProxy = EFalse;
+	
+	// Depending on number of domain suffix(es) received from the DHCP server,
+	// we have to call CDHCPStateMachine::ConfigureInterfaceL multiple times
+	TUint suffixCount = iSuffixList.Count();
+	
+	if (suffixCount > 0)
+	    interfaceInfo.iDomainSuffix.Copy(iSuffixList[0]);
 
+	// If there is no domain suffix available for updating the interface,
+	// we end up calling ConfigureInterfaceL once
 	CDHCPStateMachine::ConfigureInterfaceL( interfaceInfo );
+
+	// Repeat ConfigureInterface call for each domain suffix returned from the server	
+	for (TUint index = 1; index < suffixCount; index++)
+	    {
+	    interfaceInfo.iDomainSuffix.Copy(iSuffixList[index]);
+        CDHCPStateMachine::ConfigureInterfaceL( interfaceInfo );
+	    }
 	}
 
 void CDHCPIP4StateMachine::CreateFqdnUpdateRequestL()
@@ -1875,4 +1913,175 @@
 	return EFalse;
 	}
 #endif //SYMBIAN_NETWORKING_ADDRESS_PROVISION
+
+/**
+  * @name AppendMultipleExtraOptionsParam
+  *			Parses dhcp.ini for extra dhcp options and adds them to
+  *  			the dhcp server's parameter request list
+  *
+  * @internalTechnology
+  */
+void CDHCPIP4StateMachine::AppendMultipleExtraOptionsParamL()
+    {
+    TBuf8<KOpCodeOutOfBounds> iniValue;
+    User::LeaveIfError(IniRead(KDhcpExtraOptions, iniValue));
+    
+    TLex8 iniLex(iniValue);
+    TChar ch;
+    
+    while((ch = iniLex.Get()) != 0)
+        {
+        TUint8 opCode(ch);
+        TPtr8 opCodePtr(&opCode,1,1);
+        
+        if (!iSavedExtraParameters.Length())
+            {
+            iSavedExtraParameters.CreateL(opCodePtr);
+            }
+        else
+            {
+            iSavedExtraParameters.ReAllocL(iSavedExtraParameters.Length()+opCodePtr.Length());
+            iSavedExtraParameters.Append(opCodePtr);
+            }
+        }
+    }
+
+/**
+  * @name SplitDomainSearchBufferL
+  *			Decrypt dhcp server option data response for option code 119
+  *			and retrieve the domain search list for configuring the interface
+  *
+  * @internalTechnology
+  */
+void CDHCPIP4StateMachine::SplitDomainSearchBufferL(HBufC8* aDomainSearchBuf)
+    {
+	typedef TBuf8<KMaxDomainSuffixLength> THostName8;
+	const TInt KMaxDomainSearchBufferLength = 4096;
+	
+	// Retrieve the total length of the option data content
+    TPtr8 ptr(aDomainSearchBuf->Des());
+    TInt totalLength = 0;
+    totalLength = aDomainSearchBuf->Length();
+    
+	// Create a buffer of a length capable 
+	// to hold domain search list from the option data
+    TLex8 primaryLex;
+    RBuf8 suffixList;
+    suffixList.CreateL(KMaxDomainSearchBufferLength);
+	
+	// To overcome specific limitations of TLex
+	// Converting all '0's to '@'s in the option data buffer
+    TInt offset = 0;
+    THostName8 tmpBuf;
+    while((offset = ptr.Locate(0)) != KErrNotFound) 
+        {
+        tmpBuf.Append(ptr.MidTPtr(0, offset));
+        tmpBuf.Append('@');
+        if (ptr.Length() > (offset +1))
+            ptr.Set(ptr.MidTPtr((offset+1)));
+        else
+            ptr.SetLength(0);
+        }
+    ptr.Set(tmpBuf.MidTPtr(0));
+    primaryLex.Assign(ptr.Ptr());
+
+
+	// Creating temporary objects for parsing the buffer
+    THostName8 domainName;
+    domainName.SetLength(0);
+    TInt noOfDomainNames = 0;
+    TChar ch;
+
+    /* Start of decryption algorithm implementation for the option data buffer
+	 * Synopsis 
+	 * 		Option data contains domain suffixes seaparated by either a '@' or a two-octet compression pointer i.e. C004 (hex)
+	 *		which points to offset 4 in the complete aggregated block of Domain Search Option data
+	 *		where another validly encoded domain name can be found to complete the name
+	 *		Each sub-domain in a domain name is defined by a digit representing number of characters following this digit
+	 */
+    for (TInt i=0; i<totalLength; i++)
+        {
+        ch = primaryLex.Peek();
+        if (ch == 64) // if the character is a '@'
+            {
+			// Marks end of a domain name in the list
+			// add the domainName constructed to a array and initialise it for next domain name parsing
+			// Inc a counter to keep track of number of domain names retrieved
+			// Maintain a continous list of the domain name as well for lookup during use of compression pointer
+            suffixList.Append(ch);
+            TBuf<KMaxDomainSuffixLength> domainName16;
+            domainName16.Copy(domainName);
+            iSuffixList.AppendL(domainName16);
+            domainName.FillZ();
+            domainName.SetLength(0);
+            primaryLex.Inc();
+            noOfDomainNames++;
+            }
+        else if (ch < 48) // if the character is a digit
+            {
+			// Marks '.' completing a sub-domain and defines the length
+			// of the next sub-domain in the option data buffer
+            if (domainName.Length() != 0)
+                {
+                suffixList.Append('.');
+                domainName.Append('.');
+                }
+            TInt domainPartLength(ch);
+            suffixList.Append(ptr.Mid(i+1,ch));
+            domainName.Append(ptr.Mid(i+1,ch));
+
+            TInt inc = (TInt)ch + 1;
+            i+=(TInt)ch;
+            primaryLex.Inc(inc);
+            }
+        else if (ch == 192) // if the character is a hex 0xC0
+            {
+			// Marks start of compression pointer
+			// Looks up to the suffixList buffer created earlier that holds
+			// the domain names read until now in contigous sequence
+			// for extracting the remainder of the sub-domains to complete the domain name
+            if (domainName.Length() != 0)
+                {
+                suffixList.Append('.');
+                domainName.Append('.');
+                }
+            i++;
+            primaryLex.Inc();
+            ch = primaryLex.Peek();
+            TInt refOffset(ch), actOffset=0;
+            THostName compressedDomain;
+            TPtr8 tmpPtr(suffixList.MidTPtr(0));
+            TLex8 tmpLex(tmpPtr);
+            TInt ind=0;
+            for (; ind < tmpPtr.Length() && actOffset < refOffset; ind++)
+                {
+                TChar ch1 = tmpLex.Peek();
+                if (ch1 != 46 && ch1 != 64)
+                    actOffset++;
+                tmpLex.Inc();
+                }
+            tmpPtr.Set(tmpPtr.MidTPtr(ind-1));
+            tmpPtr.Set(tmpPtr.MidTPtr(0,tmpPtr.Locate('@')));
+            suffixList.Append(tmpPtr);
+            domainName.Append(tmpPtr);
+            suffixList.Append('@');
+            TBuf<KMaxDomainSuffixLength> domainName16;
+            domainName16.Copy(domainName);
+            iSuffixList.AppendL(domainName16);
+            domainName.FillZ();
+            domainName.SetLength(0);
+            primaryLex.Inc();
+            noOfDomainNames++;
+            }
+        else
+        	{
+			// Marks completion of the option data buffer
+			// Free up memory allocated on the heap
+	        suffixList.Close();
+            return;
+        	}
+        }
+	// End of decryption algorithm implementation for the option data buffer
+    }
+
 #endif // SYMBIAN_NETWORKING_DHCPSERVER
--- a/tcpiputils/dhcp/src/DHCPIP6Control.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dhcp/src/DHCPIP6Control.cpp	Thu Aug 19 11:25:30 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>
--- a/tcpiputils/dhcp/src/DHCPIP6StateMachine.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dhcp/src/DHCPIP6StateMachine.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -931,7 +931,7 @@
 		User::Leave( KErrNotFound );
 		}
 
-	TSoInet6InterfaceInfo interfaceInfo;
+	TSoInetInterfaceInfoExtnDnsSuffix interfaceInfo;
    //fill interfaceInfo current address is iCurrentAddress
 	interfaceInfo.iHwAddr = iHardwareAddr;
 	interfaceInfo.iAddress = iCurrentAddress;
--- a/tcpiputils/dhcp/src/DHCPStateMachine.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dhcp/src/DHCPStateMachine.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -40,6 +40,7 @@
 	{
 	__CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPStateMachine::~CDHCPStateMachine")));
 	Cancel();
+	UnloadConfigurationFile();
 	delete iDhcpMessage;
 	delete iMessageSender;
 	delete iTimer;
@@ -66,7 +67,7 @@
   */
 	{
 	__CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPStateMachine::ConstructL")));
-	
+	LoadConfigurationFile();
 #ifdef _DEBUG
 	// let's set debug properties to something
 	//  so they can be read immediately..
@@ -445,7 +446,7 @@
 		}
 	}
 
-void CDHCPStateMachine::ConfigureInterfaceL( const TSoInet6InterfaceInfo& aInterfaceInfo )
+void CDHCPStateMachine::ConfigureInterfaceL( const TSoInetInterfaceInfoExtnDnsSuffix& aInterfaceInfo )
 /**
   * Set the interface IP address and other params
   * into the TCP/IP6 stack.
@@ -465,7 +466,7 @@
   */
 	{
 	
-	TPckgBuf<TSoInet6InterfaceInfo> configInfo(aInterfaceInfo);
+	TPckgBuf<TSoInetInterfaceInfoExtnDnsSuffix> configInfo(aInterfaceInfo);
 	
 
 	__CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPStateMachine::ConfigureInterfaceL - KSoInetConfigInterface")));
@@ -712,7 +713,77 @@
 	}
 
 
+/** 
+  * @name LoadConfigurationFile
+  *			Opens up the dhcp.ini file and reads the content on to a heap buffer
+  * @return - ETrue if the dhcp.ini is successfully parsed to the buffer, EFalse otherwise
+  *
+  * @internalTechnology
+  */
+TBool CDHCPStateMachine::LoadConfigurationFile()
+    {
+    TRAP_IGNORE(iConfig = CESockIniData::NewL(DHCP_INI_DATA));
+    return (iConfig != NULL);
+    }
 
+/**
+  * @name UnloadConfigurationFile 
+  *			Frees up memory allocated for reading dhcp.ini file
+  *
+  * @internalTechnology
+  */
+void CDHCPStateMachine::UnloadConfigurationFile()
+    {
+    if (iConfig)
+        {
+        delete iConfig;
+        iConfig = NULL;
+        }
+    }
+
+/**
+ * @name IniRead
+ *          General ini file read utility. Makes use of CESockIniData object for parsing
+ *          
+ * @param   aOptionName   Key name within ini file whose value need to be parsed
+ * @param   aOptionValue    Buffer reference to store the parsed output
+ * 
+ * @return  TInt error values as approriate from the ini parsing framework
+ *          
+ * @internalTechnology
+ */
+TInt CDHCPStateMachine::IniRead(const TDesC& aOptionName, TDes8& aOptionValue)
+    {
+    TPtrC iniValue;
+    TBool iniParsed = iConfig->FindVar(KDhcpSection, aOptionName, iniValue);
+    if (!iniParsed)
+        return KErrNotFound;
+
+    if(aOptionName.CompareF(KDhcpExtraOptions) == KErrNone)
+        {
+        TLex iniLex(iniValue);
+        TChar ch;
+        
+        while((ch = iniLex.Get()) != 0)
+            {
+            while ((ch = iniLex.Peek()) != ',')
+                iniLex.Inc();
+            TLex token(iniLex.MarkedToken());
+            
+            TUint8 opCode(0);
+            token.Val(opCode,EDecimal);
+
+            if ( (opCode > 0) && (opCode < KOpCodeOutOfBounds) )
+                aOptionValue.Append(opCode);
+            
+            iniLex.Inc();
+            iniLex.Mark();
+            }
+        return KErrNone;
+        }
+    else
+        return KErrNotFound;
+    }
 
 TDhcpRnd::TDhcpRnd():iXid(0)
 /**
--- a/tcpiputils/dhcp/te_dhcp/src/te_dhcpTestStep1.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dhcp/te_dhcp/src/te_dhcpTestStep1.cpp	Thu Aug 19 11:25:30 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()
--- a/tcpiputils/dhcp/te_unittest/dhcpservtest.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dhcp/te_unittest/dhcpservtest.cpp	Thu Aug 19 11:25:30 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
--- a/tcpiputils/dhcp/te_unittest/dhcpservtest.mmp	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dhcp/te_unittest/dhcpservtest.mmp	Thu Aug 19 11:25:30 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
 #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
 
--- a/tcpiputils/dnd/Test/Group/BLD.INF	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dnd/Test/Group/BLD.INF	Thu Aug 19 11:25:30 2010 +0300
@@ -15,4 +15,5 @@
 
 
 #include"../TE_LLMNR/group/BLD.INF"
-#include"../te_dndunittest/group/BLD.INF"
\ No newline at end of file
+#include"../te_dndunittest/group/bld.inf"
+#include "../te_dnssuffix/group/bld.inf"
--- a/tcpiputils/dnd/Test/te_dndunittest/group/te_dndunittest.mmp	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dnd/Test/te_dndunittest/group/te_dndunittest.mmp	Thu Aug 19 11:25:30 2010 +0300
@@ -15,7 +15,7 @@
 // 
 //
 
-TARGET		  te_dndServer.exe
+TARGET		  te_dndserver.exe
 TARGETTYPE	  exe
 UID		  0 0xED4DC1CD
 
Binary file tcpiputils/dnd/Test/te_dnssuffix/configs/te_dnssuffix.ini has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dnd/Test/te_dnssuffix/configs/te_dnssuffixced.xml	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,2193 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+ All rights reserved.
+ This component and the accompanying materials are made available
+ under the terms of the License "Symbian Foundation License v1.0"
+ which accompanies this distribution, and is available
+ at the URL "http://www.symbianfoundation.org/legal/sfl-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>
+    <Network operation="add">
+       <Name>VPN</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>
+    <IAP operation="add">
+    	<Name>SSL VPN IP</Name>
+    	<IAPService>VpnService.VPN Tunnel Service</IAPService>
+    	<IAPBearer>VirtualBearer.VPN Test Bearer</IAPBearer>
+    	<IAPNetwork>Network.VPN</IAPNetwork>
+    	<IAPNetworkWeighting>0</IAPNetworkWeighting>
+    	<LocationRef>Location.Office</LocationRef>
+    </IAP>
+   <IAP operation="add">
+    	<Name>VPN Test IAP</Name>
+    	<IAPService>VpnService.VPN Test Service</IAPService>
+    	<IAPBearer>VirtualBearer.VPN Test Bearer</IAPBearer>
+    	<IAPNetwork>Network.VPN</IAPNetwork>
+    	<IAPNetworkWeighting>0</IAPNetworkWeighting>
+    	<LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Virtual Tunnel with Static IP</Name>
+        <IAPService>LANService.VirtualInterface</IAPService>
+        <IAPBearer>VirtualBearer.EKA2 Emulator Virtual Interface</IAPBearer>
+        <IAPNetwork>Network.VPN</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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.225.164.1</IpGateway>
+        <IpAddr>10.225.165.7</IpAddr>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <IpNameServer1>10.225.166.20</IpNameServer1>
+        <IpNameServer2>147.253.195.7</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>10.225.162.1</IpGateway>
+        <IpAddr>10.225.162.111</IpAddr>
+        <IpAddrFromServer>FALSE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <IpNameServer1>10.225.166.20</IpNameServer1>
+        <IpNameServer2>147.253.195.7</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>
+    <LANService operation="add">
+        <Name>VirtualInterface</Name>
+        <IfNetworks>ip</IfNetworks>
+        <IpNetMask>255.255.255.0</IpNetMask>
+        <IpGateway>10.225.162.1</IpGateway>
+        <IpAddr>10.1.1.10</IpAddr>
+        <IpAddrFromServer>FALSE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <IpNameServer1>10.225.166.20</IpNameServer1>
+        <IpNameServer2>147.253.195.7</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>ConnectionPreferencesTable3</Name>
+        <Ranking>1</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>DONOTPROMPT</DialogPref>
+        <BearerSet>Virtual</BearerSet>
+        <IAPRef>IAP.Virtual Tunnel with Static IP</IAPRef>
+    </ConnectionPreferences>    
+    <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable1</Name>
+        <Ranking>2</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.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>
+        <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.wapstart.com</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.wapgateway.com</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>+4412345678901</GatewayAddress>
+        <WSPOption>CONNECTIONORIENTED</WSPOption>
+        <Security>FALSE</Security>
+        <ServiceCentreAddress>+442071234567</ServiceCentreAddress>
+    </WAPSMSBearer>
+</WAPSMSBearerTable>
+
+<VirtualBearerTable>
+    <VirtualBearer operation="add">
+        <Name>VPN Test Bearer</Name>
+        <Agent>nullagt.agt</Agent>
+        <IfName>tundriver</IfName>
+        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+    </VirtualBearer>
+    <VirtualBearer operation="add">
+	<Name>EKA2 Emulator Virtual Interface</Name>
+	<Agent>tundriveragt.agt</Agent>
+	<IfName>tundriver</IfName>
+	<LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+	<LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
+	<LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+    </VirtualBearer>
+</VirtualBearerTable>
+
+<VpnServiceTable>
+    <VpnService operation="add">
+     	<Name>VPN Tunnel Service</Name>
+    	<HomeIAP>IAP.Virtual Tunnel with Static IP</HomeIAP>
+    	<HomeNetwork>Network.Intranet</HomeNetwork>
+    </VpnService>
+    <VpnService operation="add">
+    	<Name>VPN Test Service</Name>
+    	<HomeIAP>IAP.Ethernet with Daemon Dynamic IP</HomeIAP>
+    	<HomeNetwork>Network.Intranet</HomeNetwork>
+    </VpnService>
+</VpnServiceTable>
+
+</CommDB:Config>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dnd/Test/te_dnssuffix/configs/te_dnssuffixced_basic.xml	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,2130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+ All rights reserved.
+ This component and the accompanying materials are made available
+ under the terms of "Eclipse Public License v1.0"
+ which accompanies this distribution, and is available
+ at the URL "http://www.eclipse.org/legal/epl-v10.html".
+
+ Initial Contributors:
+ Nokia Corporation - initial contribution.
+
+ Contributors:
+
+ Description:
+ CommDB Settings File
+ All Rights Reserved
+
+-->
+
+
+
+<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
+               xmlns:xlink="http://www.w3.org/1999/xlink"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
+
+<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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>
+    <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable2</Name>
+        <Ranking>1</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.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>
+        <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.wapstart.com</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.wapgateway.com</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>+4412345678901</GatewayAddress>
+        <WSPOption>CONNECTIONORIENTED</WSPOption>
+        <Security>FALSE</Security>
+        <ServiceCentreAddress>+442071234567</ServiceCentreAddress>
+    </WAPSMSBearer>
+</WAPSMSBearerTable>
+
+<VirtualBearerTable>
+</VirtualBearerTable>
+
+<VpnServiceTable>
+</VpnServiceTable>
+
+
+</CommDB:Config>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dnd/Test/te_dnssuffix/configs/te_dnssuffixcedv2.xml	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,2193 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+ All rights reserved.
+ This component and the accompanying materials are made available
+ under the terms of the License "Symbian Foundation License v1.0"
+ which accompanies this distribution, and is available
+ at the URL "http://www.symbianfoundation.org/legal/sfl-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>
+    <Network operation="add">
+       <Name>VPN</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>
+    <IAP operation="add">
+    	<Name>SSL VPN IP</Name>
+    	<IAPService>VpnService.VPN Tunnel Service</IAPService>
+    	<IAPBearer>VirtualBearer.VPN Test Bearer</IAPBearer>
+    	<IAPNetwork>Network.VPN</IAPNetwork>
+    	<IAPNetworkWeighting>0</IAPNetworkWeighting>
+    	<LocationRef>Location.Office</LocationRef>
+    </IAP>
+   <IAP operation="add">
+    	<Name>VPN Test IAP</Name>
+    	<IAPService>VpnService.VPN Test Service</IAPService>
+    	<IAPBearer>VirtualBearer.VPN Test Bearer</IAPBearer>
+    	<IAPNetwork>Network.VPN</IAPNetwork>
+    	<IAPNetworkWeighting>0</IAPNetworkWeighting>
+    	<LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Virtual Tunnel with Static IP</Name>
+        <IAPService>LANService.VirtualInterface</IAPService>
+        <IAPBearer>VirtualBearer.EKA2 Emulator Virtual Interface</IAPBearer>
+        <IAPNetwork>Network.VPN</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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>+44123456789</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.225.164.1</IpGateway>
+        <IpAddr>10.225.165.7</IpAddr>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <IpNameServer1>10.225.166.20</IpNameServer1>
+        <IpNameServer2>147.253.195.7</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>10.225.162.1</IpGateway>
+        <IpAddr>10.225.162.111</IpAddr>
+        <IpAddrFromServer>FALSE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <IpNameServer1>10.225.166.20</IpNameServer1>
+        <IpNameServer2>147.253.195.7</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>
+    <LANService operation="add">
+        <Name>VirtualInterface</Name>
+        <IfNetworks>ip</IfNetworks>
+        <IpNetMask>255.255.255.0</IpNetMask>
+        <IpGateway>10.225.162.1</IpGateway>
+        <IpAddr>10.1.1.10</IpAddr>
+        <IpAddrFromServer>FALSE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <IpNameServer1>10.225.166.20</IpNameServer1>
+        <IpNameServer2>147.253.195.7</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>ConnectionPreferencesTable3</Name>
+        <Ranking>0</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>DONOTPROMPT</DialogPref>
+        <BearerSet>Virtual</BearerSet>
+        <IAPRef>IAP.Virtual Tunnel with Static IP</IAPRef>
+    </ConnectionPreferences>    
+    <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable1</Name>
+        <Ranking>1</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.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>
+        <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.wapstart.com</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.wapgateway.com</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>+4412345678901</GatewayAddress>
+        <WSPOption>CONNECTIONORIENTED</WSPOption>
+        <Security>FALSE</Security>
+        <ServiceCentreAddress>+442071234567</ServiceCentreAddress>
+    </WAPSMSBearer>
+</WAPSMSBearerTable>
+
+<VirtualBearerTable>
+    <VirtualBearer operation="add">
+        <Name>VPN Test Bearer</Name>
+        <Agent>nullagt.agt</Agent>
+        <IfName>tundriver</IfName>
+        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+    </VirtualBearer>
+    <VirtualBearer operation="add">
+	<Name>EKA2 Emulator Virtual Interface</Name>
+	<Agent>tundriveragt.agt</Agent>
+	<IfName>tundriver</IfName>
+	<LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+	<LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
+	<LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+    </VirtualBearer>
+</VirtualBearerTable>
+
+<VpnServiceTable>
+    <VpnService operation="add">
+     	<Name>VPN Tunnel Service</Name>
+    	<HomeIAP>IAP.Virtual Tunnel with Static IP</HomeIAP>
+    	<HomeNetwork>Network.Intranet</HomeNetwork>
+    </VpnService>
+    <VpnService operation="add">
+    	<Name>VPN Test Service</Name>
+    	<HomeIAP>IAP.Ethernet with Daemon Dynamic IP</HomeIAP>
+    	<HomeNetwork>Network.Intranet</HomeNetwork>
+    </VpnService>
+</VpnServiceTable>
+
+</CommDB:Config>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dnd/Test/te_dnssuffix/group/bld.inf	Thu Aug 19 11:25:30 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:
+//
+
+
+PRJ_TESTEXPORTS
+
+te_dnssuffix.iby /epoc32/rom/include/te_dnssuffix.iby
+../configs/te_dnssuffixced.xml z:/testdata/configs/te_dnssuffixced.xml
+../configs/te_dnssuffixcedv2.xml z:/testdata/configs/te_dnssuffixcedv2.xml
+../configs/te_dnssuffix.ini z:/testdata/configs/te_dnssuffix.ini
+../scripts/te_dnssuffixsuite.script z:/testdata/scripts/te_dnssuffixsuite.script
+../configs/te_dnssuffixced_basic.xml z:/testdata/configs/te_dnssuffixced_basic.xml
+
+PRJ_TESTMMPFILES
+te_dnssuffix.mmp
+
+PRJ_MMPFILES
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dnd/Test/te_dnssuffix/group/te_dnssuffix.iby	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,29 @@
+// 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:
+//
+
+#ifndef __TE_DNSSUFFIX_IBY__
+#define __TE_DNSSUFFIX_IBY__
+
+#include <testexecute.iby>
+
+file=ABI_DIR\BUILD_DIR\te_dnssuffix.exe		System\Programs\te_dnssuffix.exe
+
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_dnssuffixsuite.script 	testdata\scripts\te_dnssuffixsuite.script
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_dnssuffixced.xml	testdata\configs\te_dnssuffixced.xml
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_dnssuffixcedv2.xml	testdata\configs\te_dnssuffixcedv2.xml
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_dnssuffix.ini	testdata\configs\te_dnssuffix.ini
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_dnssuffixced_basic.xml	testdata\configs\te_dnssuffixced_basic.xml
+
+#endif //__TE_DNSSUFFIX_IBY__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dnd/Test/te_dnssuffix/group/te_dnssuffix.mmp	Thu Aug 19 11:25:30 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:
+// te_virtualtunnel.mmp for Testing the Virtual tunnel functionality for SSL VPN.
+//
+
+
+
+/**
+ @file 
+*/
+
+TARGET          te_dnssuffix.exe
+TARGETTYPE      exe
+
+SOURCEPATH      ../src
+SOURCE          te_dnssuffixtestblock.cpp 
+SOURCE					te_dnssuffixtestwrapper.cpp 
+SOURCE					te_dnssuffixtestserver.cpp 
+SOURCE					DNSSuffixHostResolver.cpp
+
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+SYSTEMINCLUDE   /epoc32/include
+SYSTEMINCLUDE   /epoc32/include/test
+#else
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+SYSTEMINCLUDE   /epoc32/include/platform/test
+#endif
+
+USERINCLUDE     ../inc
+
+
+LIBRARY euser.lib 
+LIBRARY esock.lib 
+LIBRARY insock.lib
+LIBRARY commdb.lib
+LIBRARY efsrv.lib 
+LIBRARY commsdat.lib   
+LIBRARY testexecuteutils.lib 
+LIBRARY testexecutelogclient.lib 
+LIBRARY charconv.lib
+LIBRARY	ecom.lib
+LIBRARY	c32root.lib
+LIBRARY	netmeta.lib
+LIBRARY esocksvr.lib bafl.lib
+
+
+VENDORID 0x70000001
+
+UID 0x1000028d 0x2009D48D
+CAPABILITY All -TCB
+
+UNPAGED
+
+SMPSAFE
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dnd/Test/te_dnssuffix/inc/CallBackHandler.h	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,17 @@
+/*
+ * CallBackHandler.h
+ *
+ *  Created on: Apr 15, 2010
+ *      Author: sakpatil
+ */
+
+#ifndef CALLBACKHANDLER_H_
+#define CALLBACKHANDLER_H_
+
+class MCallBackHandler
+    {
+public:
+    virtual void HandleCallBackL(TInt aError) = 0;
+    };
+
+#endif /* CALLBACKHANDLER_H_ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dnd/Test/te_dnssuffix/inc/DNSSuffixHostResolver.h	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,73 @@
+// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// 
+ 
+
+#ifndef DNSSUFFIXHOSTRESOLVER_H
+#define DNSSUFFIXHOSTRESOLVER_H
+
+#include <e32base.h>	
+#include <e32std.h>		
+#include <es_sock.h>
+
+#include "CallBackHandler.h"
+
+// Forwared declarations
+
+
+class CDNSSuffixHostResolver : public CActive
+    {
+public:
+    // Cancel and destroy
+    ~CDNSSuffixHostResolver();
+
+    // Two-phased constructor.
+    static CDNSSuffixHostResolver* NewL(MCallBackHandler& aCallback,RSocketServ& aSockServ,RConnection& aConn);
+
+    // Two-phased constructor.
+    static CDNSSuffixHostResolver* NewLC(MCallBackHandler& aCallback,RSocketServ& aSockServ,RConnection& aConn);
+
+public:
+    // New functions
+    // Function for making the initial request
+    TInt ResolveL(const TDesC& aHostName);
+
+private:
+    // C++ constructor
+    CDNSSuffixHostResolver(MCallBackHandler& aCallback,RSocketServ& aSockServ,RConnection& aConn);
+
+    // Second-phase constructor
+    void ConstructL();
+
+private:
+    // From CActive
+    // Handle completion
+    void RunL();
+
+    // How to cancel me
+    void DoCancel();
+
+    // Override to handle leaves from RunL(). Default implementation causes
+    // the active scheduler to panic.
+    TInt RunError(TInt aError);
+
+private:
+    MCallBackHandler&   iCallBack;
+    RSocketServ&    iSockServ;
+    RConnection&    iConn;
+    RHostResolver   iResolver;
+    TNameEntry      iEntry;
+    };
+
+#endif // DNSSUFFIXHOSTRESOLVER_H
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dnd/Test/te_dnssuffix/inc/te_dnssuffixtestblock.h	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,45 @@
+// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+
+/**
+ @file
+ @internalTechnology
+*/
+
+#ifndef __TE_DNSSUFFIXTESTBLOCK_H__
+#define __TE_DNSSUFFIXTESTBLOCK_H__
+
+#include <test/testblockcontroller.h>
+#include "te_dnssuffixtestblock.h"
+
+/**
+Wrapper name
+*/
+_LIT(KDNSSuffixTestWrapper, "DNSSuffixTestWrapper");
+
+/**
+Class implements the TEF3.0 specific test block controller.
+*/
+class CVirtualTunnelTestBlock : public CTestBlockController
+	{
+public:
+    CVirtualTunnelTestBlock() : CTestBlockController() {}
+	~CVirtualTunnelTestBlock() {}
+	CDataWrapper* CreateDataL(const TDesC& aData);
+	};
+	
+#endif //__TE_DNSSUFFIXTESTBLOCK_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dnd/Test/te_dnssuffix/inc/te_dnssuffixtestserver.h	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,42 @@
+// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+
+/**
+ @file
+ @internalTechnology
+*/
+
+#ifndef __TE_DNSSUFFIXTESTSERVER_H__
+#define __TE_DNSSUFFIXTESTSERVER_H__
+
+#include <test/testserver2.h>
+#include "te_dnssuffixtestblock.h"
+
+/**
+Class implements the TEF3.0 specific test server
+*/
+class CDNSSuffixTestServer : public CTestServer2
+	{
+public:
+    CDNSSuffixTestServer() {}
+	~CDNSSuffixTestServer() {}
+	CTestBlockController* CreateTestBlock();
+	CTestBlockController* CreateTestBlockL();
+	static CDNSSuffixTestServer* NewL();
+	};
+
+#endif // __TE_DNSSUFFIXTESTSERVER_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dnd/Test/te_dnssuffix/inc/te_dnssuffixtestwrapper.h	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,120 @@
+// 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
+ @internalTechnology
+*/
+
+#ifndef __TE_DNSSUFFIXTESTWRAPPER_H__
+#define __TE_DNSSUFFIXTESTWRAPPER_H__
+
+
+#include <test/datawrapper.h>
+#include <e32base.h>
+#include <es_sock.h>
+#include <in_sock.h>
+#include <nifman.h>
+#include <commdbconnpref.h>
+#include <badesca.h>    // MDesCArray and CDesCArray
+
+#include "CallBackHandler.h"
+
+/**
+Forward declaration
+*/ 
+
+
+/**
+Class implements the CDataWrapper base class and provides the commands used by the scripts file
+*/
+class CDNSSuffixTestWrapper : public CDataWrapper,
+                              public MCallBackHandler
+                        
+	{
+public:
+	CDNSSuffixTestWrapper();
+	~CDNSSuffixTestWrapper();
+	
+	static	CDNSSuffixTestWrapper*	NewL();
+	//This function is not used currently
+	virtual TAny*	GetObject() { return this; }
+	virtual TBool	DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex);
+	
+protected:
+	void ConstructL();
+	
+public: // from MCallBackHandler
+    void HandleCallBackL(TInt aError);
+		
+private:
+    
+    // Initial configuration
+    void DoInitTestingL();    
+    
+    // Enumeration
+    void DoEnumerateInterfacesL();    
+    void GetAvaiableInterfacesL(MDesCArray* aInterfaceNamesArray);
+    
+    // Setting/Getting suffix list on/from interface.
+    void DoSetAndGetSuffixListL();    
+    TInt SetDNSSuffixListOnInterface(RSocketServ& aServ,RConnection& aConn,const TDesC& aInterfaceName,RInetSuffixList& aData);
+    
+    TInt GetDNSSuffixList(RSocketServ& aServ,const TDesC& aInterfaceName,RInetSuffixList& aData);
+    
+    
+    // Host resolve   
+    
+    void DoResolveL();    
+    void DoResolveHostWithoutDomainWithSuffixListSetL();
+    void DoResolveHostWithoutDomainWithoutSuffixListL();
+    
+    void DNSSuffixSupportTC005L();
+    void DNSSuffixSupportTC006L();
+    void DNSSuffixSupportTC007L();
+    void DNSSuffixSupportTC008L();
+    void DNSSuffixSupportTC009L();
+    void DNSSuffixSupportTC010L();
+    void DNSSuffixSupportTC011L();
+    
+    
+private: // utility or helper functions
+    
+    TInt StartConnections(RSocketServ& aSockServ, RConnection& aConn1, RConnection& aConn2);
+    TInt StartConnection(RSocketServ& aSockServ, RConnection& aConn, TUint aIapId);
+    void GetConnPrefL(TUint aIapId,TCommDbConnPref& aPref);
+    
+    TInt32 GetFirstIapId();
+    TInt32 GetSecondIapId();
+    
+    TInt GetFirstInterfaceNameL(TDes& aIfaceName);
+    TInt GetSecondInterfaceNameL(TDes& aIfaceName);    
+    TInt GetInterfaceNameL(const TDesC& aCriteria,TDes& aIfaceName);
+    
+    TInt FillSuffixList(RInetSuffixList& aSuffixList,TDesC& aData);
+    void CloseSocketSrv();
+    TInt IsSuffixListEqual(const RInetSuffixList& aSuffixList1, const RInetSuffixList& aSuffixList2);
+    
+private:    
+    RSocketServ        iSocketServ;
+    CActiveSchedulerWait iWait;
+    RInetSuffixList     iSuffixList;
+    RInetSuffixList     iSuffixList2;
+	};
+	
+
+#endif //__TE_DNSSUFFIXTESTWRAPPER_H__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dnd/Test/te_dnssuffix/scripts/te_dnssuffixsuite.script	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,342 @@
+//
+// 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:        Santosh K Patil
+//
+// Description:
+//
+//! @file
+//! @SYMTestSuiteName       
+//! @SYMScriptTestEnvironment TestExecuteFramework
+//
+
+
+//Unload esock forcefully
+//RUN_SCRIPT z:\testdata\scripts\te_esock_test_unloadesockForced.script
+
+//Configure commdb.
+//ced -i z:\testdata\configs\te_dnssuffixced.xml
+ced -i z:\testdata\configs\te_dnssuffixced_basic.xml
+
+RUN_SCRIPT z:\testdata\scripts\te_esock_test_loadesock.script
+
+//Load the Server
+LOAD_SERVER te_dnssuffix
+
+ 
+START_TESTCASE                  DNS-dnssuffix-test0a
+//! @SYMTestCaseID              DNS-dnssuffix_test0a
+//! @SYMTestCaseDesc            REQ No.
+//!                             Initialize the environment.
+//!								Required to configure the name servers on at lease one interface.
+//! @SYMTestPriority            Critical
+//! @SYMTestActions             Load te_dnssuffix test server
+//!                             Do ced
+//!								Start RConnection and close.
+//! @SYMTestExpectedResults     Connection started and stopped successfully.
+//! @SYMTestType                CIT
+//! @SYMCreationDate            1/3/2010
+//! @SYMAuthor                  Santosh K Patil
+//! @SYMTestStatus              3. Released
+
+	START_TEST_BLOCK te_dnssuffix 100 z:\testdata\configs\te_dnssuffix.ini
+		CREATE_OBJECT DNSSuffixTestWrapper dnssuffix_test000a
+		COMMAND dnssuffix_test000a InitDNSSuffixTesting dnssuffix_first_interface
+	END_TEST_BLOCK
+
+END_TESTCASE                  DNS-dnssuffix-test0a
+ 
+
+START_TESTCASE                  DNS-dnssuffix-test0b
+//! @SYMTestCaseID              DNS-dnssuffix_test0b
+//! @SYMTestCaseDesc            REQ No.
+//!                             Open socket and close.
+//! @SYMTestPriority            Critical
+//! @SYMTestActions             Load te_dnssuffix test server
+//!                             Open the socket and enumerate the available interfaces.
+//! @SYMTestExpectedResults     Socket opened successfully
+//!								Shows the list of available interfaces.
+//! @SYMTestType                CIT
+//! @SYMCreationDate            1/3/2010
+//! @SYMAuthor                  Santosh K Patil
+//! @SYMTestStatus              3. Released
+
+	START_TEST_BLOCK te_dnssuffix 100 z:\testdata\configs\te_dnssuffix.ini
+		CREATE_OBJECT DNSSuffixTestWrapper dnssuffix_test000b
+		COMMAND dnssuffix_test000b EnumerateInterface
+	END_TEST_BLOCK
+
+END_TESTCASE                  DNS-dnssuffix-test0b
+
+
+START_TESTCASE                  DNS-dnssuffix-test1
+//! @SYMTestCaseID              DNS-dnssuffix_test1
+//! @SYMTestCaseDesc            REQ No.
+//!                             Open socket and close.
+//! @SYMTestPriority            Critical
+//! @SYMTestActions             Load te_dnssuffix test server
+//!                             Open the socket and enumerate the available interfaces.
+//!								Set the suffix list on the inteface which has the corresponding name server.
+//!								Get the suffix list of each interfaces.
+//! @SYMTestExpectedResults     Setting and getting suffix list successfully.
+//! @SYMTestType                CIT
+//! @SYMCreationDate            1/3/2010
+//! @SYMAuthor                  Santosh K Patil
+//! @SYMTestStatus              3. Released
+
+	START_TEST_BLOCK te_dnssuffix 100 z:\testdata\configs\te_dnssuffix.ini
+		CREATE_OBJECT DNSSuffixTestWrapper dnssuffix_test001
+		COMMAND dnssuffix_test001 SetAndGetSuffixList
+	END_TEST_BLOCK
+
+END_TESTCASE                  DNS-dnssuffix-test1
+
+
+START_TESTCASE                  DNS-dnssuffix-test2
+//! @SYMTestCaseID              DNS-dnssuffix_test2
+//! @SYMTestCaseDesc            REQ No.
+//!                             Open socket and close.
+//! @SYMTestPriority            Critical
+//! @SYMTestActions             Load te_dnssuffix test server
+//!                             Open the socket and enumerate the available interfaces.
+//!								Set the suffix list on the inteface which has the corresponding name server.
+//!								Get the suffix list of each interfaces.
+//! @SYMTestExpectedResults     Setting and getting suffix list successfully.
+//! @SYMTestType                CIT
+//! @SYMCreationDate            1/3/2010
+//! @SYMAuthor                  Santosh K Patil
+//! @SYMTestStatus              3. Released
+
+	START_TEST_BLOCK te_dnssuffix 100 z:\testdata\configs\te_dnssuffix.ini
+		CREATE_OBJECT DNSSuffixTestWrapper dnssuffix_test002
+		COMMAND dnssuffix_test002 DoResolve
+	END_TEST_BLOCK
+
+END_TESTCASE                  DNS-dnssuffix-test2
+
+
+START_TESTCASE                  DNS-dnssuffix-test3
+//! @SYMTestCaseID              DNS-dnssuffix_test3
+//! @SYMTestCaseDesc            REQ No.
+//!                             Open socket and close.
+//! @SYMTestPriority            Critical
+//! @SYMTestActions             Load te_dnssuffix test server
+//!                             Open the socket and enumerate the available interfaces.
+//!								Set the suffix list on the inteface which has the corresponding name server.
+//!								Get the suffix list of each interfaces.
+//! @SYMTestExpectedResults     Setting and getting suffix list successfully.
+//! @SYMTestType                CIT
+//! @SYMCreationDate            1/3/2010
+//! @SYMAuthor                  Santosh K Patil
+//! @SYMTestStatus              3. Released
+
+	START_TEST_BLOCK te_dnssuffix 100 z:\testdata\configs\te_dnssuffix.ini
+		CREATE_OBJECT DNSSuffixTestWrapper dnssuffix_test003
+		COMMAND dnssuffix_test003 DoResolveHostWithoutDomainWithSuffix
+	END_TEST_BLOCK
+
+END_TESTCASE                  DNS-dnssuffix-test3
+
+
+START_TESTCASE                  DNS-dnssuffix-test4
+//! @SYMTestCaseID              DNS-dnssuffix_test4
+//! @SYMTestCaseDesc            REQ No.
+//!                             Open socket and close.
+//! @SYMTestPriority            Critical
+//! @SYMTestActions             Load te_dnssuffix test server
+//!                             Open the socket and enumerate the available interfaces.
+//!								Set the suffix list on the inteface which has the corresponding name server.
+//!								Get the suffix list of each interfaces.
+//! @SYMTestExpectedResults     Setting and getting suffix list successfully.
+//! @SYMTestType                CIT
+//! @SYMCreationDate            1/3/2010
+//! @SYMAuthor                  Santosh K Patil
+//! @SYMTestStatus              3. Released
+
+	START_TEST_BLOCK te_dnssuffix 100 z:\testdata\configs\te_dnssuffix.ini
+		CREATE_OBJECT DNSSuffixTestWrapper dnssuffix_test004
+		COMMAND dnssuffix_test004 DoResolveHostWithoutDomainWithoutSuffix
+	END_TEST_BLOCK
+
+END_TESTCASE                  DNS-dnssuffix-test4
+
+
+START_TESTCASE                  DNS-dnssuffix-test5
+//! @SYMTestCaseID              DNS-dnssuffix_test5
+//! @SYMTestCaseDesc            REQ No.
+//!                             Open socket and close.
+//! @SYMTestPriority            Critical
+//! @SYMTestActions             Load te_dnssuffix test server
+//!                             Open the socket and enumerate the available interfaces.
+//!								Set the suffix list on the inteface which has the corresponding name server.
+//!								Get the suffix list of each interfaces.
+//! @SYMTestExpectedResults     Setting and getting suffix list successfully.
+//! @SYMTestType                CIT
+//! @SYMCreationDate            1/3/2010
+//! @SYMAuthor                  Santosh K Patil
+//! @SYMTestStatus              3. Released
+
+	START_TEST_BLOCK te_dnssuffix 100 z:\testdata\configs\te_dnssuffix.ini
+		CREATE_OBJECT DNSSuffixTestWrapper dnssuffix_test005
+		COMMAND dnssuffix_test005 DNSSuffixSupportTC005
+	END_TEST_BLOCK
+
+END_TESTCASE                  	DNS-dnssuffix-test5
+
+
+START_TESTCASE                  DNS-dnssuffix-test6
+//! @SYMTestCaseID              DNS-dnssuffix_test6
+//! @SYMTestCaseDesc            REQ No.
+//!                             Open socket and close.
+//! @SYMTestPriority            Critical
+//! @SYMTestActions             Load te_dnssuffix test server
+//!                             Open the socket and enumerate the available interfaces.
+//!								Set the suffix list on the inteface which has the corresponding name server.
+//!								Get the suffix list of each interfaces.
+//! @SYMTestExpectedResults     Setting and getting suffix list successfully.
+//! @SYMTestType                CIT
+//! @SYMCreationDate            1/3/2010
+//! @SYMAuthor                  Santosh K Patil
+//! @SYMTestStatus              3. Released
+
+	START_TEST_BLOCK te_dnssuffix 100 z:\testdata\configs\te_dnssuffix.ini
+		CREATE_OBJECT DNSSuffixTestWrapper dnssuffix_test006
+		COMMAND dnssuffix_test006 DNSSuffixSupportTC006
+	END_TEST_BLOCK
+
+END_TESTCASE                  DNS-dnssuffix-test6
+
+
+//Configure commdb.
+//ced -i z:\testdata\configs\te_dnssuffixcedv2.xml
+
+START_TESTCASE                  DNS-dnssuffix-test7
+//! @SYMTestCaseID              DNS-dnssuffix_test7
+//! @SYMTestCaseDesc            REQ No.
+//!                             Open socket and close.
+//! @SYMTestPriority            Critical
+//! @SYMTestActions             Load te_dnssuffix test server
+//!                             Open the socket and enumerate the available interfaces.
+//!								Set the suffix list on the inteface which has the corresponding name server.
+//!								Get the suffix list of each interfaces.
+//! @SYMTestExpectedResults     Setting and getting suffix list successfully.
+//! @SYMTestType                CIT
+//! @SYMCreationDate            1/3/2010
+//! @SYMAuthor                  Santosh K Patil
+//! @SYMTestStatus              3. Released
+
+	START_TEST_BLOCK te_dnssuffix 100 z:\testdata\configs\te_dnssuffix.ini
+		CREATE_OBJECT DNSSuffixTestWrapper dnssuffix_test007
+		COMMAND dnssuffix_test007 DNSSuffixSupportTC007
+	END_TEST_BLOCK
+
+END_TESTCASE                  DNS-dnssuffix-test7
+
+
+START_TESTCASE                  DNS-dnssuffix-test8
+//! @SYMTestCaseID              DNS-dnssuffix_test8
+//! @SYMTestCaseDesc            REQ No.
+//!                             Open socket and close.
+//! @SYMTestPriority            Critical
+//! @SYMTestActions             Load te_dnssuffix test server
+//!                             Open the socket and enumerate the available interfaces.
+//!								Set the suffix list on the inteface which has the corresponding name server.
+//!								Get the suffix list of each interfaces.
+//! @SYMTestExpectedResults     Setting and getting suffix list successfully.
+//! @SYMTestType                CIT
+//! @SYMCreationDate            1/3/2010
+//! @SYMAuthor                  Santosh K Patil
+//! @SYMTestStatus              3. Released
+
+	START_TEST_BLOCK te_dnssuffix 100 z:\testdata\configs\te_dnssuffix.ini
+		CREATE_OBJECT DNSSuffixTestWrapper dnssuffix_test008
+		COMMAND dnssuffix_test008 DNSSuffixSupportTC008
+	END_TEST_BLOCK
+
+END_TESTCASE                  DNS-dnssuffix-test8
+
+
+START_TESTCASE                  DNS-dnssuffix-test9
+//! @SYMTestCaseID              DNS-dnssuffix_test9
+//! @SYMTestCaseDesc            REQ No.
+//!                             Open socket and close.
+//! @SYMTestPriority            Critical
+//! @SYMTestActions             Load te_dnssuffix test server
+//!                             Open the socket and enumerate the available interfaces.
+//!								Set the suffix list on the inteface which has the corresponding name server.
+//!								Get the suffix list of each interfaces.
+//! @SYMTestExpectedResults     Setting and getting suffix list successfully.
+//! @SYMTestType                CIT
+//! @SYMCreationDate            1/3/2010
+//! @SYMAuthor                  Santosh K Patil
+//! @SYMTestStatus              3. Released
+
+	START_TEST_BLOCK te_dnssuffix 100 z:\testdata\configs\te_dnssuffix.ini
+		CREATE_OBJECT DNSSuffixTestWrapper dnssuffix_test009
+		COMMAND dnssuffix_test009 DNSSuffixSupportTC009
+	END_TEST_BLOCK
+
+END_TESTCASE                  DNS-dnssuffix-test9
+
+
+START_TESTCASE                  DNS-dnssuffix-test10
+//! @SYMTestCaseID              DNS-dnssuffix_test10
+//! @SYMTestCaseDesc            REQ No.
+//!                             Open socket and close.
+//! @SYMTestPriority            Critical
+//! @SYMTestActions             Load te_dnssuffix test server
+//!                             Open the socket and enumerate the available interfaces.
+//!								Set the suffix list on the inteface which has the corresponding name server.
+//!								Get the suffix list of each interfaces.
+//! @SYMTestExpectedResults     Setting and getting suffix list successfully.
+//! @SYMTestType                CIT
+//! @SYMCreationDate            1/3/2010
+//! @SYMAuthor                  Santosh K Patil
+//! @SYMTestStatus              3. Released
+
+	START_TEST_BLOCK te_dnssuffix 100 z:\testdata\configs\te_dnssuffix.ini
+		CREATE_OBJECT DNSSuffixTestWrapper dnssuffix_test010
+		COMMAND dnssuffix_test010 DNSSuffixSupportTC010
+	END_TEST_BLOCK
+
+END_TESTCASE                  DNS-dnssuffix-test10
+
+//Configure commdb.
+//ced -i z:\testdata\configs\te_dnssuffixced.xml
+
+START_TESTCASE                  DNS-dnssuffix-test11
+//! @SYMTestCaseID              DNS-dnssuffix_test11
+//! @SYMTestCaseDesc            REQ No.
+//!                             Open socket and close.
+//! @SYMTestPriority            Critical
+//! @SYMTestActions             Make vTun as default interface
+//! 							Set suffix on ethernet
+//!   							Open implicit resolver (assumed that it is opened on vTun)
+//!  							Request for name resolution (Async one)
+//!  							Stop the connection and observe the behaviour. 
+//! 							 
+//! @SYMTestExpectedResults     Host resolution should fail gracefully with appropriate error code.
+//! @SYMTestType                CIT
+//! @SYMCreationDate            1/3/2010
+//! @SYMAuthor                  Santosh K Patil
+//! @SYMTestStatus              3. Released
+
+	START_TEST_BLOCK te_dnssuffix 100 z:\testdata\configs\te_dnssuffix.ini
+		CREATE_OBJECT DNSSuffixTestWrapper dnssuffix_test011
+		COMMAND dnssuffix_test011 DNSSuffixSupportTC011
+	END_TEST_BLOCK
+
+END_TESTCASE                  DNS-dnssuffix-test11
+
+
+//RUN_SCRIPT z:\TestData\scripts\te_esock_test_stopallinterfaces.script
+//RUN_SCRIPT z:\testdata\scripts\te_esock_test_unloadesockForced.script
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dnd/Test/te_dnssuffix/src/DNSSuffixHostResolver.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,93 @@
+// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// 
+ 
+
+#include "DNSSuffixHostResolver.h"
+
+
+#include <in_sock.h>
+
+
+CDNSSuffixHostResolver::CDNSSuffixHostResolver(MCallBackHandler& aCallback,RSocketServ& aSockServ,RConnection& aConn) :
+    CActive(EPriorityStandard), iCallBack(aCallback),iSockServ(aSockServ), iConn(aConn)
+    {
+    }
+
+CDNSSuffixHostResolver* CDNSSuffixHostResolver::NewLC(MCallBackHandler& aCallback,RSocketServ& aSockServ,RConnection& aConn)
+    {
+    CDNSSuffixHostResolver* self = new (ELeave) CDNSSuffixHostResolver(aCallback,aSockServ,aConn);
+    CleanupStack::PushL(self);
+    self->ConstructL();
+    return self;
+    }
+
+CDNSSuffixHostResolver* CDNSSuffixHostResolver::NewL(MCallBackHandler& aCallback,RSocketServ& aSockServ,RConnection& aConn)
+    {
+    CDNSSuffixHostResolver* self = CDNSSuffixHostResolver::NewLC(aCallback,aSockServ,aConn);
+    CleanupStack::Pop(); // self;
+    return self;
+    }
+
+void CDNSSuffixHostResolver::ConstructL()
+    {
+    CActiveScheduler::Add(this); // Add to scheduler
+    
+    if (iConn.SubSessionHandle() != 0)
+        {
+        // Explicit resolver
+        iResolver.Open(iSockServ,KAfInet, KProtocolInetUdp, iConn);    
+        }
+    else
+        {
+        // Implicit resolver
+        iResolver.Open(iSockServ,KAfInet, KProtocolInetUdp);
+        }    
+    }
+
+
+CDNSSuffixHostResolver::~CDNSSuffixHostResolver()
+    {
+    Cancel(); // Cancel any request, if outstanding
+    
+    if (iResolver.SubSessionHandle())
+        iResolver.Close();
+    }
+
+void CDNSSuffixHostResolver::DoCancel()
+    {
+    iResolver.Cancel();
+    }
+
+TInt CDNSSuffixHostResolver::ResolveL(const TDesC& aHostName)
+    { 
+    iResolver.GetByName(aHostName,iEntry,iStatus);
+    SetActive();
+    return KErrNone;
+    }
+
+
+void CDNSSuffixHostResolver::RunL()
+    {
+    if (&iCallBack)
+        iCallBack.HandleCallBackL(iStatus.Int());
+    }
+
+
+TInt CDNSSuffixHostResolver::RunError(TInt aError)
+    {
+    return aError;
+    }
+
+// End of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dnd/Test/te_dnssuffix/src/te_dnssuffixtestblock.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,44 @@
+// 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:
+// Contains the implementation of TEF3.0 respective test block
+//
+
+
+
+/**
+ @file
+ @internalTechnology
+*/
+
+#include "te_dnssuffixtestblock.h" 
+#include "te_dnssuffixtestwrapper.h"
+/**
+Function to manage the wrapper object instantiation. As part of this test suite, 
+only one wrapper is used.
+
+This function is called by the TestEngine while parsing the CREATE_OBJECT command
+in the script file.
+
+@return Returns the wrapper instance pointer
+@param aData Name of the wrapper has to be instantiated.
+*/
+CDataWrapper* CVirtualTunnelTestBlock::CreateDataL(const TDesC& aData)
+	{
+	CDataWrapper* wrapper = NULL;
+	if (KDNSSuffixTestWrapper() == aData)
+		{
+		wrapper = CDNSSuffixTestWrapper::NewL();
+		}
+	return wrapper;
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dnd/Test/te_dnssuffix/src/te_dnssuffixtestserver.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,119 @@
+// 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:
+// Contains the implementation of TEF3.0 respective test server
+//
+
+
+
+/**
+ @file
+ @internalTechnology
+*/
+  
+#include "te_dnssuffixtestserver.h"
+
+/**
+Function to instantiate TestServer.
+
+@return Returns the TestServer instance pointer.
+
+@internalTechnology
+*/
+CDNSSuffixTestServer* CDNSSuffixTestServer::NewL()
+	{
+	CDNSSuffixTestServer* server = new (ELeave) CDNSSuffixTestServer();
+	CleanupStack::PushL(server);
+	server->ConstructL();
+	CleanupStack::Pop(server);
+	return server;
+	}
+
+/**
+Function to instantiate TestBlock.
+
+This function is invoked by the TestEngine while parsing START_TEST_BLOCK command in the
+script file. 
+
+@return Returns the TestBlock instance pointer.
+
+@internalTechnology
+*/
+CTestBlockController* CDNSSuffixTestServer::CreateTestBlock()
+	{
+	CTestBlockController* testBlockController=NULL;
+	TRAPD(err, testBlockController = CreateTestBlockL());
+	if(err == KErrNone)
+		{
+		return testBlockController;
+		}
+	else
+		{
+		return NULL;
+		}
+	}
+
+/**
+Function to instantiate TestBlock.
+
+@internalTechnology
+*/
+CTestBlockController* CDNSSuffixTestServer::CreateTestBlockL()
+	{
+	return new (ELeave) CVirtualTunnelTestBlock();
+	}
+
+/**
+Function to kick start the TestServer.
+
+@internalTechnology
+*/
+LOCAL_C void MainL()
+	{
+#if (defined __DATA_CAGING__)
+	RProcess().DataCaging(RProcess::EDataCagingOn);
+	RProcess().SecureApi(RProcess::ESecureApiOn);
+#endif
+	CActiveScheduler* sched=NULL;
+	sched=new(ELeave) CActiveScheduler;
+	CActiveScheduler::Install(sched);
+	CDNSSuffixTestServer* server = NULL;
+	TRAPD(err, server = CDNSSuffixTestServer::NewL());
+	if(!err)
+		{
+		RProcess::Rendezvous(KErrNone);
+		sched->Start();
+		}
+	delete server;
+	delete sched;
+	}
+/**
+TestServer entry point.
+
+@return Returns KErrNone upon successfull completion, KErrNoMemory in low memory conditions.
+
+@internalTechnology
+*/
+GLDEF_C TInt E32Main()
+	{
+	__UHEAP_MARK;
+	CTrapCleanup* cleanup = CTrapCleanup::New();
+	if(cleanup == NULL)
+		{
+		return KErrNoMemory;
+		}
+	TRAP_IGNORE(MainL());
+	delete cleanup;
+	__UHEAP_MARKEND;
+	return KErrNone;
+    }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tcpiputils/dnd/Test/te_dnssuffix/src/te_dnssuffixtestwrapper.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -0,0 +1,2599 @@
+// 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:
+// Contains the implementation of all the commands, which is used by the script file.
+//
+
+/**
+ @file
+ @internalTechnology
+ */
+
+#include "te_dnssuffixtestwrapper.h"
+#include "DNSSuffixHostResolver.h"
+
+
+#include <e32base.h>
+#include <in_sock.h>
+#include <es_sock.h>
+#include <commdbconnpref.h>
+#include <commdb.h>
+
+/*
+ * TODO: 1. Try to test with end to end real scenario. Means resolving over real tunnel.
+ * 
+ * 
+ */
+#define KIPAddrLen 39
+
+#define DISABLE_TUNDRIVER
+
+// Used for handle the multiple hosts in same test cases. @See TC006
+#define KMaxHosts 8
+
+// Commands
+_LIT(KInitDNSSuffixTesting, "InitDNSSuffixTesting");
+_LIT(KEnumerateInterface,   "EnumerateInterface");
+_LIT(KSetAndGetSuffixList,  "SetAndGetSuffixList");
+_LIT(KDoResolve,            "DoResolve");
+_LIT(KDoResolveHostWithoutDomainWithSuffix,     "DoResolveHostWithoutDomainWithSuffix");
+_LIT(KDoResolveHostWithoutDomainWithoutSuffix,  "DoResolveHostWithoutDomainWithoutSuffix");
+
+_LIT(KDNSSuffixSupportTC005,    "DNSSuffixSupportTC005");
+_LIT(KDNSSuffixSupportTC006,    "DNSSuffixSupportTC006");
+_LIT(KDNSSuffixSupportTC007,    "DNSSuffixSupportTC007");
+_LIT(KDNSSuffixSupportTC008,    "DNSSuffixSupportTC008");
+_LIT(KDNSSuffixSupportTC009,    "DNSSuffixSupportTC009");
+_LIT(KDNSSuffixSupportTC010,    "DNSSuffixSupportTC010");
+_LIT(KDNSSuffixSupportTC011,    "DNSSuffixSupportTC011");
+
+
+//Test code
+_LIT(KCommand, 			    "aCommand = %S");
+_LIT(KSection, 			    "aSection = %S");
+_LIT(KAsyncErrorIndex, 	    "aAsyncErrorIndex = %D");
+
+_LIT(KKeyDNSSuffixTestSuffixList,   "suffixlist");
+_LIT(KKeyDNSSuffixTestSuffixList1,   "suffixlist1");
+_LIT(KKeyDNSSuffixTestSuffixList2,   "suffixlist2");
+_LIT(KKeyDNSSuffixTestSuffixList3,   "suffixlist3");
+
+_LIT(KKeyDNSSuffixTestHostname,     "hostname");
+
+_LIT(KSectionDNSSuffixTest001,      "dnssuffix_test001");
+_LIT(KSectionDNSSuffixTest002,      "dnssuffix_test002");
+_LIT(KSectionDNSSuffixTest003,      "dnssuffix_test003");
+_LIT(KSectionDNSSuffixTest004,      "dnssuffix_test004");
+_LIT(KSectionDNSSuffixTest005,      "dnssuffix_test005");
+
+_LIT(KSectionDNSSuffixTest006,          "dnssuffix_test006");
+_LIT(KKeyDNSSuffixTest006NoOfHostname,  "noofhosts");
+_LIT(KKeyDNSSuffixTest006Hostname,      "hostname%D");
+
+_LIT(KSectionDNSSuffixTest007,              "dnssuffix_test007");
+_LIT(KKeyDNSSuffixTest007ValidHostname,     "validhostname");
+_LIT(KKeyDNSSuffixTest007InValidHostname,   "invalidhostname");
+
+_LIT(KSectionDNSSuffixTest008,      "dnssuffix_test008");
+_LIT(KKeyDNSSuffixTestHostname1,    "hostname1");
+_LIT(KKeyDNSSuffixTestHostname2,    "hostname2");
+
+_LIT(KSectionDNSSuffixTest009,      "dnssuffix_test009");
+
+_LIT(KSectionDNSSuffixTest010,      "dnssuffix_test010");
+
+_LIT(KSectionDNSSuffixTest011,      "dnssuffix_test011");
+
+_LIT(KSectionDNSSuffixFirstInterface, "dnssuffix_first_interface");
+_LIT(KSectionDNSSuffixSecondInterface, "dnssuffix_second_interface");
+_LIT(KKeyDNSSuffixIAPId,"iapid");
+_LIT(KKeyInterfaceName,                "interfacename");
+
+/*
+ * @author: Santosh K Patil
+ * TODO: Needs to verify the interfaces used to resolve the hosts in each test case.
+ * It is required to verify wheather test executed as desired or not. 
+ * In other words to confirm the new solution is working as expected we need to get 
+ * and verify the inteface name used to resolve the host.
+ * @See Test spec for more details.
+ * 
+ * TODO: Check all config sections
+ */
+
+
+/**
+Constructor.
+
+@internalTechnology
+ */
+CDNSSuffixTestWrapper::CDNSSuffixTestWrapper()
+    {
+    }
+
+/**
+Destructor.
+
+@internalTechnology
+ */
+CDNSSuffixTestWrapper::~CDNSSuffixTestWrapper()
+    {  
+    
+    }
+
+/**
+Function to instantiate TestWrapper.
+@return Returns constructed TestWrapper instance pointer
+@internalTechnology
+ */
+CDNSSuffixTestWrapper* CDNSSuffixTestWrapper::NewL()
+    {
+    CDNSSuffixTestWrapper*	ret = new (ELeave) CDNSSuffixTestWrapper();
+    CleanupStack::PushL(ret);
+    ret->ConstructL();
+    CleanupStack::Pop(ret);
+    return ret;	
+    }
+
+/**
+Second level constructor, constructs TestWrapper instance.
+@internalTechnology
+ */
+void CDNSSuffixTestWrapper::ConstructL()
+    {    
+    }
+
+
+/*
+ * @HandleCallBackL Called by the CDNSSuffixHostResolver::RunL
+ * 
+ */
+void CDNSSuffixTestWrapper::HandleCallBackL(TInt aError)
+    {
+    INFO_PRINTF1(_L("HandleCallBackL - Entry"));    
+    INFO_PRINTF2(_L("Error code: %D"),aError);
+    
+    if (KErrNone != aError)
+        SetError(KErrNone);
+    else
+        SetError(KErrGeneral);
+    
+    if (iWait.IsStarted())
+        {
+        INFO_PRINTF1(_L("Stoping waiter"));
+        iWait.AsyncStop();
+        }
+    INFO_PRINTF1(_L("HandleCallBackL - Exit"));
+    }
+
+/**
+Function to map the input command to respective function.
+
+@return - True Upon successfull command to Function name mapping otherwise False
+@param aCommand Function name has to be called
+@param aSection INI file paramenter section name
+@param aAsyncErrorIndex Error index
+@see Refer the script file COMMAND section.
+
+@internalTechnology
+ */
+TBool CDNSSuffixTestWrapper::DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex)
+    {
+    TBool ret = ETrue;
+
+    // Print out the parameters for debugging
+    INFO_PRINTF2( KCommand, &aCommand );
+    INFO_PRINTF2( KSection, &aSection );
+    INFO_PRINTF2( KAsyncErrorIndex, aAsyncErrorIndex );
+    
+    if(KInitDNSSuffixTesting() == aCommand)
+        {
+        DoInitTestingL();
+        }
+    else if(KEnumerateInterface() == aCommand)
+        {
+        DoEnumerateInterfacesL();
+        }
+    else if (KSetAndGetSuffixList() == aCommand)
+        {
+        DoSetAndGetSuffixListL();
+        }
+    else if( KDoResolve() == aCommand)
+        {
+        DoResolveL();
+        }
+    else if( KDoResolveHostWithoutDomainWithSuffix() == aCommand)
+        {
+        DoResolveHostWithoutDomainWithSuffixListSetL();
+        }    
+    else if( KDoResolveHostWithoutDomainWithoutSuffix() == aCommand)
+        {
+        DoResolveHostWithoutDomainWithoutSuffixListL();
+        }
+    else if( KDNSSuffixSupportTC005() == aCommand)
+        {
+        DNSSuffixSupportTC005L();
+        }
+    else if( KDNSSuffixSupportTC006() == aCommand)
+        {
+        DNSSuffixSupportTC006L();
+        }
+    else if( KDNSSuffixSupportTC007() == aCommand)
+        {
+        DNSSuffixSupportTC007L();
+        }
+    else if( KDNSSuffixSupportTC008() == aCommand)
+        {
+        DNSSuffixSupportTC008L();
+        }
+    else if( KDNSSuffixSupportTC009() == aCommand)
+        {
+        DNSSuffixSupportTC009L();
+        }
+    else if( KDNSSuffixSupportTC010() == aCommand)
+       {
+       DNSSuffixSupportTC010L();
+       }
+    else if( KDNSSuffixSupportTC011() == aCommand)
+       {
+       DNSSuffixSupportTC011L();
+       }    
+    else
+        {        
+        ret = EFalse;
+        User::LeaveIfError(KErrNone); // just to suppress LeaveScan warning
+        }
+    
+    return ret;
+    }
+
+
+TInt CDNSSuffixTestWrapper::StartConnections(RSocketServ& aSockServ, RConnection& aConn1, RConnection& aConn2)
+    {
+    INFO_PRINTF1(_L("StartConnections - Entry"));
+    
+    TUint iapId = GetFirstIapId();
+    
+    if ((TInt)iapId == KErrNotFound)
+        return KErrNotFound;
+    
+    TInt err = StartConnection(aSockServ,aConn1,iapId);
+        
+    if (err != KErrNone)
+        {
+        ERR_PRINTF1(_L("Failed to start first connection"));
+        SetError(err);
+        return err;
+        }
+        
+    INFO_PRINTF2(_L("First connection started successfully - IAP: %D"),iapId);        
+    
+#ifndef DISABLE_TUNDRIVER
+    iapId = GetSecondIapId();
+             
+    if ((TInt)iapId == KErrNotFound)
+        {       
+        aConn1.Close();
+        return KErrNotFound;
+        }
+        
+    err = StartConnection(iSocketServ,aConn2,iapId);
+        
+    if (err != KErrNone)
+        {
+        ERR_PRINTF1(_L("Failed to start second connection"));
+        aConn1.Close();
+        return err;
+        }
+        
+    INFO_PRINTF2(_L("Second connection started successfully - IAP: %D"),iapId);
+#endif
+            
+    INFO_PRINTF1(_L("StartConnections - Exit"));
+    return KErrNone;
+    }
+
+
+
+TInt CDNSSuffixTestWrapper::StartConnection(RSocketServ& aSockServ, RConnection& aConn, TUint aIapId)
+    {
+    INFO_PRINTF1(_L("StartConnection - Entry"));
+    
+    TInt err(KErrNone);
+    
+    TCommDbConnPref connPref;
+    INFO_PRINTF1(_L("Getting conn preference"));
+    
+    TRAP(err, GetConnPrefL(aIapId,connPref));
+    
+    if (KErrNone != err)
+        {
+        ERR_PRINTF1(_L("Failed to read conn preference"));
+        return err;
+        }
+    
+    INFO_PRINTF1(_L("Got conn preference"));
+    
+    if((err = aConn.Open(aSockServ, KAfInet)) != KErrNone )
+        {
+        ERR_PRINTF2(_L("Failed to open Connection: %D"),err);
+        return err;
+        }
+        
+    INFO_PRINTF1(_L("Connection opened"));
+    
+    INFO_PRINTF1(_L("Starting Connection"));
+    err = aConn.Start(connPref);
+    
+    if (KErrNone != err)
+        {
+        ERR_PRINTF2(_L("Failed starting Connection: %D"),err);
+        aConn.Close();
+        return err;
+        }
+    
+    INFO_PRINTF1(_L("Connection Started"));
+    
+    INFO_PRINTF1(_L("StartConnection - Exit"));
+    
+    return KErrNone;    
+    }
+
+   
+
+void CDNSSuffixTestWrapper::GetConnPrefL(TUint aIapId,TCommDbConnPref& aPref)
+    {
+    INFO_PRINTF1(_L("GetConnPrefL - Entry"));
+    
+    INFO_PRINTF1(_L("Instantiating CCommsDatabase"));
+    CCommsDatabase* commsDb = CCommsDatabase::NewL();
+    CleanupStack::PushL(commsDb);
+    
+    INFO_PRINTF1(_L("Calling OpenConnectionPrefTableLC"));
+    CCommsDbConnectionPrefTableView* commsDbView = commsDb->OpenConnectionPrefTableLC();
+    
+    INFO_PRINTF1(_L("Going to first record"));
+    User::LeaveIfError(commsDbView->GotoFirstRecord());
+    
+    TInt isFound(KErrNotFound);
+    do
+        {
+        CCommsDbConnectionPrefTableView::TCommDbIapConnectionPref pref;
+        INFO_PRINTF1(_L("Reading conn preferecne."));
+        commsDbView->ReadConnectionPreferenceL(pref);
+        
+        if (pref.iBearer.iIapId == aIapId)
+            {
+            INFO_PRINTF1(_L("Match found"));
+            aPref.SetIapId(aIapId);
+            aPref.SetBearerSet(pref.iBearer.iBearerSet);
+            aPref.SetDirection(pref.iDirection);
+            aPref.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
+            isFound = KErrNone;
+            break;
+            }
+        } while(!commsDbView->GotoNextRecord());    
+    
+    INFO_PRINTF1(_L("Cleanup resources"));
+    CleanupStack::PopAndDestroy(2, commsDb); // commsDbView, commsDb
+    
+    User::LeaveIfError(isFound);
+    
+    INFO_PRINTF1(_L("GetConnPrefL - Exit"));    
+    }
+
+
+
+TInt32 CDNSSuffixTestWrapper::GetFirstIapId()
+    {
+    INFO_PRINTF1(_L("GetFirstIapId - Entry"));
+    
+    TInt iapId(KErrNotFound);
+    
+    if (!GetIntFromConfig(KSectionDNSSuffixFirstInterface,KKeyDNSSuffixIAPId,iapId))
+         {
+         ERR_PRINTF1(_L("Failed to read the First IAP id"));
+         }
+      else
+         {
+         INFO_PRINTF2(_L("Got the IAP: %D"),iapId);
+         }
+    
+    INFO_PRINTF1(_L("GetFirstIapId - Exit"));
+    return iapId;
+    }
+
+
+TInt32 CDNSSuffixTestWrapper::GetSecondIapId()
+   {
+   INFO_PRINTF1(_L("GetSecondIapId - Entry"));
+   
+   TInt iapId(KErrNotFound);
+   
+   if (!GetIntFromConfig(KSectionDNSSuffixSecondInterface,KKeyDNSSuffixIAPId,iapId))
+        {
+        ERR_PRINTF1(_L("Failed to read second IAP id"));
+        }
+     else
+        {
+        INFO_PRINTF2(_L("Got the IAP: %D"),iapId);
+        }
+   
+   INFO_PRINTF1(_L("GetSecondIapId - Exit"));
+   return iapId;
+   }
+ 
+
+TInt CDNSSuffixTestWrapper::GetFirstInterfaceNameL(TDes& aIfaceName)
+    {
+    INFO_PRINTF1(_L("GetFirstInterfaceNameL - Entry"));
+    TInt err(KErrNone);    
+    
+    TPtrC interfaceName;
+    if (!GetStringFromConfig(KSectionDNSSuffixFirstInterface,KKeyInterfaceName,interfaceName))
+        {
+        ERR_PRINTF1(_L("Failed to read the interface name from config"));
+        err = KErrNotFound;
+        SetError(err);
+        return err;
+        }
+        
+    err = GetInterfaceNameL(interfaceName,aIfaceName);
+    
+    INFO_PRINTF1(_L("GetFirstInterfaceNameL - Exit"));
+    return err;
+    }
+    
+
+TInt CDNSSuffixTestWrapper::GetSecondInterfaceNameL(TDes& aIfaceName)
+    {    
+    INFO_PRINTF1(_L("GetSecondInterfaceNameL - Entry"));
+    TInt err(KErrNone);    
+    
+    TPtrC interfaceName;
+    if (!GetStringFromConfig(KSectionDNSSuffixSecondInterface,KKeyInterfaceName,interfaceName))
+        {
+        ERR_PRINTF1(_L("Failed to read the interface name from config"));
+        err = KErrNotFound;
+        SetError(err);
+        return err;
+        }    
+    
+    err = GetInterfaceNameL(interfaceName,aIfaceName);
+    
+    INFO_PRINTF1(_L("GetSecondInterfaceNameL - Exit"));
+    return err;    
+    }
+
+    
+TInt CDNSSuffixTestWrapper::GetInterfaceNameL(const TDesC& aCriteria,TDes& aIfaceName)
+    {
+    INFO_PRINTF1(_L("GetInterfaceNameL - Entry"));
+
+    TInt err = KErrNone;
+    CDesCArray* interfaceNameArray = new(ELeave) CDesCArrayFlat(4);
+    CleanupStack::PushL(interfaceNameArray);
+    TRAP(err,GetAvaiableInterfacesL(interfaceNameArray));
+    
+    if (KErrNone != err)
+        {       
+        ERR_PRINTF2(_L("Failed to enumeate the interfaces with error: %D"),err);
+        return err;
+        }
+    
+    INFO_PRINTF2(_L("No of interfaces: %D"),interfaceNameArray->Count());
+    
+    if (interfaceNameArray->Count() <= 0)
+       {
+       INFO_PRINTF1(_L("No interfaces available:"));
+       CleanupStack::PopAndDestroy(interfaceNameArray);
+       err = KErrNotFound;
+       SetError(err);
+       return err;
+       }
+    
+    TBool isInterfaceFound(EFalse);
+    TInt index = -1;
+   
+    for (TInt a=0; a<interfaceNameArray->Count();a++)
+       {
+       HBufC* interfaceNameBuf = (*interfaceNameArray)[a].AllocL();
+       
+       TInt pos = interfaceNameBuf->FindF(aCriteria);
+       
+       delete interfaceNameBuf;
+       
+       if ( KErrNotFound != pos)
+           {
+           isInterfaceFound = ETrue;
+           index = a;
+           break;
+           }
+       }
+    
+    if (!isInterfaceFound)
+        {
+        ERR_PRINTF1(_L("Interface not found"));
+        CleanupStack::PopAndDestroy(interfaceNameArray);
+        err = KErrNotFound;
+        SetError(err);
+        return err;
+        }    
+    
+    aIfaceName.Copy((*interfaceNameArray)[index]);
+    
+    CleanupStack::PopAndDestroy(interfaceNameArray);
+    
+    TPtr tempName((TUint16*)aIfaceName.Ptr(),aIfaceName.Length(),aIfaceName.Length());
+    INFO_PRINTF2(_L("Found Interface and name is: %S"),&tempName);
+    
+    INFO_PRINTF1(_L("GetInterfaceNameL - Exit"));
+    return KErrNone;
+    }
+
+/**
+ * DoInitTestingL. Configures the initial connections. 
+ * Function to start the connection to configure the named server on one interface. 
+ */
+void CDNSSuffixTestWrapper::DoInitTestingL()
+    {
+    INFO_PRINTF1(_L("********************************************"));
+    INFO_PRINTF1(_L("DoInitTestingL"));
+    INFO_PRINTF1(_L("********************************************"));
+
+    /*@Note, We need to configure the named servers on vTunnel and ethernet interfaces.
+     * So, Configuring them by starting connections on both interfaces. 
+     * 
+     */
+    TInt err = KErrNone;
+    
+    if((err = iSocketServ.Connect()) == KErrNone )
+        INFO_PRINTF1(_L("Socket Server Opened."));
+    else
+        {
+        ERR_PRINTF2(_L("Error Opening Socket Server: %d"), err);
+        SetError(err);
+        return;
+        }
+    
+    ERR_PRINTF2(_L("Error Opening Socket Server: %d"), err);
+    
+    RConnection firstConn; 
+    RConnection vTunConn; // Usef for virtual Tunnel interface
+    
+    err = StartConnections(iSocketServ,firstConn, vTunConn);
+    
+    if (KErrNone != err)
+        {
+        ERR_PRINTF2(_L("Failed to start the Connections: %D"),err);
+        CloseSocketSrv();
+        SetError(err);
+        return;
+        }
+    INFO_PRINTF1(_L("Started the connections successfully"));
+    
+    INFO_PRINTF1(_L("Close the connections"));
+   
+#ifndef DISABLE_TUNDRIVER
+    if (vTunConn.SubSessionHandle())
+        vTunConn.Close();
+#endif
+
+    if (firstConn.SubSessionHandle())
+        firstConn.Close();
+    
+    SetError(err);      
+    CloseSocketSrv();    
+    }
+
+/**
+ * @DoEnumerateInterfacesL. Enumerates the all available interfaces.
+ */
+void CDNSSuffixTestWrapper::DoEnumerateInterfacesL()
+    {
+    INFO_PRINTF1(_L("********************************************"));
+    INFO_PRINTF1(_L("DoEnumerateInterfacesL"));
+    INFO_PRINTF1(_L("********************************************"));
+    
+    CDesCArray* interfaceNameArray = new(ELeave) CDesCArrayFlat(4);
+    CleanupStack::PushL(interfaceNameArray);
+    TRAPD(err,GetAvaiableInterfacesL(interfaceNameArray));
+   
+    if (KErrNone == err)
+        {
+        // Print the interface names        
+        INFO_PRINTF2(_L("Found %D interfaces"),interfaceNameArray->Count());
+        
+        for(TInt a=0;a<interfaceNameArray->Count();a++)
+            {
+            TPtrC interfaceName = (*interfaceNameArray)[a];
+            INFO_PRINTF2(_L("Interface: %S"),&interfaceName);
+            }
+        }
+    else
+        {
+        ERR_PRINTF2(_L("Failed to enumeate the interfaces with error: %D"),err);
+        }
+    
+    CleanupStack::PopAndDestroy(interfaceNameArray);
+    
+    SetError(err);
+    }
+
+/*
+ * GetAvaiableInterfacesL. Function to get the names of all available names of  all interfaces.
+ * @arg aInterfaceNamesArray (out param), Array of interface names owned by caller. 
+ */
+void CDNSSuffixTestWrapper::GetAvaiableInterfacesL(MDesCArray* aInterfaceNamesArray)
+    {
+    INFO_PRINTF1(_L("GetAvaiableInterfacesL - Entry"));
+    
+    CDesCArray* interfacesArray = static_cast<CDesCArray*>(aInterfaceNamesArray);
+    interfacesArray->Reset();
+    
+    TInt err = KErrNone;
+    RSocketServ socketSrv;
+    
+    if ( (err = socketSrv.Connect()) != KErrNone)
+        {
+        ERR_PRINTF2(_L("Failed Connecting to Socet server error: %D"),err);
+        SetError(err);
+        return;
+        }
+    INFO_PRINTF1( _L("Connected to Socket server"));
+    
+    INFO_PRINTF1(_L("Opening socket..."));
+    
+    RSocket socket;
+    err = socket.Open(socketSrv,KAfInet, KSockDatagram, KProtocolInetUdp);
+    
+    if (KErrNone != err)
+        {
+        INFO_PRINTF2(_L("Failed Opening socket with error: %D"),err);
+        SetError(err);
+        socketSrv.Close();
+        return;
+        }
+    
+    INFO_PRINTF1(_L("Socket opened"));
+    
+    err = socket.SetOpt(KSoInetEnumInterfaces,KSolInetIfCtrl);
+  
+    if (KErrNone != err)
+        {
+        INFO_PRINTF2(_L("Failed enumerating interfaces with error: %D"),err);
+        SetError(err);
+        socket.Close();
+        socketSrv.Close();
+        return;
+        }
+    
+    TSoInetInterfaceInfo info;
+    TPckg<TSoInetInterfaceInfo> opt(info);
+    
+    while(socket.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, opt) == KErrNone)
+        {
+       // INFO_PRINTF2(_L("Interface Name %S"),&opt().iName);
+        interfacesArray->AppendL(opt().iName);
+        }
+    
+    INFO_PRINTF1(_L("Finished"));
+    
+    INFO_PRINTF1(_L("Closing connections"));
+    socket.Close();
+    socketSrv.Close();
+    SetError(KErrNone);
+    INFO_PRINTF1(_L("GetAvaiableInterfacesL - Exit"));
+    }
+
+
+/**
+Function test the setting of suffix list and getting suffix list on interface.
+*/
+void CDNSSuffixTestWrapper::DoSetAndGetSuffixListL()
+    {
+    INFO_PRINTF1(_L("************************************************************"));
+    INFO_PRINTF1(_L("DoSetAndGetSuffixListL - DNS_Suffix_Support_TC001"));
+    INFO_PRINTF1(_L("************************************************************"));
+        
+    TInt err(KErrNone);
+    
+    TName interfaceName;
+    
+    TRAP(err, err = GetFirstInterfaceNameL(interfaceName));
+        
+    if (err != KErrNone )
+        {
+        ERR_PRINTF2(_L("Failed to get the interface error: %D"),err);
+        SetError(err);
+        return;
+        }
+    
+    TPtrC suffixList;
+    iSuffixList.Reset();
+    
+    if (!GetStringFromConfig(KSectionDNSSuffixTest001,KKeyDNSSuffixTestSuffixList,suffixList))
+        {
+        ERR_PRINTF1(_L("Failed to read suffix lists from config"));    
+        SetError(KErrNotFound);
+        return;
+        }
+    else
+        {
+        INFO_PRINTF2(_L("Suffix list: %S"),&suffixList);
+        FillSuffixList(iSuffixList,suffixList);
+        }
+            
+    err = iSocketServ.Connect();
+           
+    if(KErrNone != err)
+       {
+       ERR_PRINTF1(_L("Failed to connect socket Server"));
+       SetError(err);
+       return;
+       }
+    
+    INFO_PRINTF1(_L("Connected to socket Server"));
+    
+    TUint iapId = GetFirstIapId();
+    
+    if (KErrNotFound == (TInt)iapId)
+       {
+       ERR_PRINTF2(_L("Failed to get the iap id: %D"),err);
+       SetError(err);
+       CloseSocketSrv();
+       return;
+       }
+    
+    RConnection firstConn; 
+    err = StartConnection(iSocketServ,firstConn,iapId);
+    
+    if (KErrNone != err)
+      {
+      ERR_PRINTF2(_L("Failed to start the Connections: %D"),err);
+      CloseSocketSrv();
+      SetError(err);
+      return;
+      }
+    
+    INFO_PRINTF1(_L("Started the connections successfully"));
+    
+    
+    err = SetDNSSuffixListOnInterface(iSocketServ,firstConn,interfaceName,iSuffixList);
+    
+    if (KErrNone != err)
+        {
+        ERR_PRINTF2(_L("Failed Setting the suffix list with errror : %D"),err);
+        SetError(err);  
+        firstConn.Close();
+        CloseSocketSrv();
+        return;
+        }
+    
+    INFO_PRINTF1(_L("Getting the suffix list on interface:"));
+    
+    iSuffixList2.Reset();
+    
+    err = GetDNSSuffixList(iSocketServ,interfaceName,iSuffixList2);
+        
+    if (KErrNone != err)
+        {
+        ERR_PRINTF2(_L("Failed to get the suffix list with errror : %D"),err);
+        }
+    
+    
+    if (err == KErrNone)
+        {        
+        if ( (err = IsSuffixListEqual(iSuffixList,iSuffixList2)) == KErrNone)
+            {
+            INFO_PRINTF1(_L("Suffix list are same and Test is successfull"));
+            }
+        else
+            {
+            ERR_PRINTF1(_L("Suffix list are not same and Test failed"));
+            }
+        }
+    
+    SetError(err);
+    
+    firstConn.Close();
+    CloseSocketSrv();
+    
+    INFO_PRINTF1(_L("Set and Get Suffix list Test - Finished"));
+    }
+
+
+
+TInt CDNSSuffixTestWrapper::SetDNSSuffixListOnInterface(RSocketServ& aServ,RConnection& /*aConn*/,const TDesC& aInterfaceName,RInetSuffixList& aData)
+    {
+    INFO_PRINTF1(_L("SetDNSSuffixListOnInterfaceL - Entry"));
+    
+    INFO_PRINTF1(_L("Opening socket..."));    
+       
+    RSocket socket;
+    TInt err = socket.Open(aServ,KAfInet, KSockDatagram, KProtocolInetUdp);    
+    
+    if (KErrNone != err)
+        {
+        INFO_PRINTF2(_L("Failed Opening socket with error: %D"),err);
+        SetError(err);
+        return err;
+        }
+  
+    INFO_PRINTF1(_L("Socket opened"));
+    
+    err = socket.SetOpt(KSoInetEnumInterfaces,KSolInetIfCtrl);
+    
+    if (KErrNone != err)
+        {
+        INFO_PRINTF2(_L("Failed enumerating interfaces with error: %D"),err);
+        SetError(err);        
+        socket.Close();
+        return err;
+        }
+    
+	TSoInetInterfaceInfo getOpt;
+    TPckg<TSoInetInterfaceInfo> opt_out(getOpt);
+    
+    TBool isSuffixListSet(EFalse);
+    
+    while(socket.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, opt_out)== KErrNone)        
+        {    
+        
+        INFO_PRINTF2(_L("Interface Name: %S"),&opt_out().iName);        
+        INFO_PRINTF2(_L("Name Server: %D"),!opt_out().iNameSer1.IsUnspecified());
+        
+        TBuf<KIPAddrLen> ipBuf;
+        opt_out().iAddress.Output(ipBuf);
+        INFO_PRINTF2(_L("IP Address: %S"),&ipBuf);
+
+        TBuf<KIPAddrLen> nameserBuf;
+        opt_out().iNameSer1.Output(nameserBuf);
+        INFO_PRINTF2(_L("Name Server IP: %S"),&nameserBuf);
+
+        if( (opt_out().iName.Length()>0) /*&& !(opt_out().iNameSer1.IsUnspecified())*/ && (aInterfaceName.CompareF(opt_out().iName)==0) )       
+            {
+            INFO_PRINTF2(_L("Setting suffix list on Interface: %S"),&opt_out().iName);
+            INFO_PRINTF2(_L("MTU on the interface is : %d"), opt_out().iMtu);
+
+            TSoInetInterfaceInfoExtnDnsSuffix setOpt;
+            (TSoInetInterfaceInfo &)setOpt = opt_out();
+            TPckg<TSoInetInterfaceInfoExtnDnsSuffix> opt_in(setOpt);
+            /*opt_in().iName = opt_out().iName;
+            opt_in().iAddress = opt_out().iAddress;
+            opt_in().iNetMask = opt_out().iNetMask;*/
+            opt_in().iDoId = ETrue;
+            opt_in().iDelete = EFalse;
+            opt_in().iDomainSuffix.DeleteAll();
+            
+            err = socket.SetOpt(KSoInetConfigInterface,KSolInetIfCtrl,opt_in);
+            
+            if (err != KErrNone)
+                {
+                ERR_PRINTF2(_L("Failed to reset suffix list on the interface: %D"),err);
+                break;
+                }
+            else
+	            INFO_PRINTF1(_L("Interface domain suffix list reset successful"));
+            	
+            if (aData.Count() == 0) // We plan to set empty record, so only reset is sufficient
+                isSuffixListSet = ETrue;
+            
+            for(TInt a=0;a<aData.Count();a++)
+                {
+                opt_in().iDomainSuffix.Copy(aData[a]);
+                err = socket.SetOpt(KSoInetConfigInterface,KSolInetIfCtrl,opt_in);
+                if (err != KErrNone)
+                	{
+                	ERR_PRINTF2(_L("Failed to set suffix list: %D"),err);
+                	break;
+            		}
+                else
+                	{
+	                INFO_PRINTF1(_L("Suffix list added successfully"));
+                	isSuffixListSet = ETrue;
+            		}
+                }
+            break;
+            }
+        }
+    
+    if (!isSuffixListSet)
+        {
+        err = KErrNotFound;
+        ERR_PRINTF2(_L("Failed to set suffix list with error: %D"),err);       
+        }
+        
+    SetError(err);
+    
+    INFO_PRINTF1(_L("Closing socket"));
+    
+    socket.Close();
+    INFO_PRINTF1(_L("SetDNSSuffixListOnInterfaceL - Exit"));
+    return err;
+    }
+
+
+
+/**
+ * GetDNSSuffixList. Gets the suffix list set on an interface.
+ * 
+ * @arg  aServ, session handle to a socket server. 
+ * @arg  aData (in/out param) Data having the suffix list. Packed buffer of type TInetSuffixList
+ *
+ */
+TInt CDNSSuffixTestWrapper::GetDNSSuffixList(RSocketServ& aServ,const TDesC& aInterfaceName,RInetSuffixList& aData)
+    {
+    INFO_PRINTF1(_L("GetDNSSuffixList - Entry"));
+    
+    INFO_PRINTF1(_L("Opening socket..."));
+    RSocket socket;
+    TInt err = socket.Open(aServ,KAfInet, KSockDatagram, KProtocolInetUdp);
+    
+    if (KErrNone != err)
+       {
+       INFO_PRINTF2(_L("Failed Opening socket with error: %D"),err);
+       SetError(err);
+       return err;
+       }
+    
+    INFO_PRINTF1(_L("Socket opened"));
+    
+    err = socket.SetOpt(KSoInetEnumInterfaces,KSolInetIfCtrl);
+    
+    if (KErrNone != err)
+       {
+       INFO_PRINTF2(_L("Failed enumerating interfaces with error: %D"),err);
+       SetError(err);
+       socket.Close();
+       return err;
+       }
+
+	TSoInetInterfaceInfo getOpt;
+    TPckg<TSoInetInterfaceInfo> opt(getOpt);
+       
+    while(socket.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, opt) == KErrNone)
+		{
+		if (aInterfaceName.CompareF(opt().iName) == KErrNone)
+			{
+			INFO_PRINTF2(_L("Reading suffix list from interface: %S"),&opt().iName);     
+
+			TBuf<KIPAddrLen> tempIp;
+			opt().iAddress.Output(tempIp);
+			INFO_PRINTF2(_L("IP: %S"),&tempIp);
+
+			TInetSuffix domainSuffix;
+			TPckg<TInetSuffix> dom_opt(domainSuffix);
+			if (err = socket.SetOpt(KSoInetEnumDomainSuffix, KSolInetIfCtrl) != KErrNone)
+				return err; 
+			while( socket.GetOpt(KSoInetNextDomainSuffix, KSolInetIfCtrl, dom_opt) == KErrNone)
+				{
+                aData.AppendL(dom_opt().iSuffixName);
+				}
+			break;
+			}
+		}
+    
+    INFO_PRINTF1(_L("Closing socket"));
+    socket.Close();
+
+    INFO_PRINTF1(_L("GetDNSSuffixList - Exit"));
+    return KErrNone;
+    }
+
+
+
+/**
+ * FillSuffixListL, Function to fill the suffix names in the TInetSuffixList object. 
+ * @arg aSuffixList, out param, on return has the suffix list set in it.
+ * @arg aData, has the list of domain suffix names in the form of abc.xyz.com;efg.xyz.com
+ */
+TInt CDNSSuffixTestWrapper::FillSuffixList(RInetSuffixList& aSuffixList,TDesC& aData)
+    {
+    INFO_PRINTF1(_L("FillSuffixList - Entry"));
+    
+    INFO_PRINTF2(_L("Processing Suffix list: %S"),&aData);
+    
+    TPtr data((TUint16*)aData.Ptr(),aData.Length(),aData.Length());
+    data.TrimAll();
+    
+    TInt pos = KErrNone;
+    while( (pos = data.Find(_L(";"))) != KErrNotFound)
+        {
+        TPtr suffixItem((TUint16*)data.Left(pos).Ptr(),pos,pos);
+        INFO_PRINTF3(_L("Processing %D suffix name: %S"),/*sListBuf()*/iSuffixList.Count()+1,&suffixItem);
+        
+        TSuffixName tmpBuf;
+        tmpBuf.Copy(suffixItem);
+        aSuffixList.AppendL(tmpBuf);
+        data.Copy(data.Mid(pos+1));
+        }
+    data.TrimAll();
+    INFO_PRINTF3(_L("Processing %D suffix name: %S"),/*sListBuf()*/iSuffixList.Count()+1,&data);
+    INFO_PRINTF2(_L("Data Len: %D"),data.Length());
+    
+    TSuffixName tmpBuf;
+    tmpBuf.Copy(data);
+    aSuffixList.AppendL(tmpBuf);
+    
+    INFO_PRINTF1(_L("FillSuffixList - Exit"));
+    
+    return aSuffixList.Count() == 0 ? KErrNotFound : KErrNone;
+    }
+
+
+void CDNSSuffixTestWrapper::CloseSocketSrv()
+    {
+    INFO_PRINTF1(_L("Closing socket server"));
+    
+    if (iSocketServ.Handle())
+        {
+        iSocketServ.Close();
+        INFO_PRINTF1(_L("Closed Sock Srv successfully"));
+        }
+    else
+        {
+        INFO_PRINTF1(_L("Inavild Sock Srv handle"));
+        }
+    }
+
+/* 
+ * IsSuffixListEqual, Utility function, compares the two suffix list structures. 
+ * @arg aSuffixList1 First structure holding the suffix list
+ * @arg aSuffixList2 second structure holding the suffix list
+ * 
+ * @return KErrNone if both suffix list strucures same otherwise KErrArgument.  
+ * 
+ */
+TInt CDNSSuffixTestWrapper::IsSuffixListEqual(const RInetSuffixList& aSuffixList1, const RInetSuffixList& aSuffixList2)
+    {
+    INFO_PRINTF1(_L("IsSuffixListEqual - Entry"));
+    
+    if (aSuffixList1.Count() != aSuffixList2.Count())
+        {
+        return KErrArgument;
+        }
+    
+    for (TInt a=0; a<aSuffixList1.Count();a++)
+        {
+        if (aSuffixList1[a].CompareF(aSuffixList2[a]) != KErrNone)
+            {
+            return KErrArgument;
+            }
+        }
+    INFO_PRINTF1(_L("IsSuffixListEqual - Exit"));
+    return KErrNone;
+    }
+
+
+/*
+ * Prerequisite: Two interfaces required to be up and running (virtual Tunnel and ethernet).
+ * 
+ * DoResolveL. Resolves the domain name
+ * 
+ * 
+ */
+void CDNSSuffixTestWrapper::DoResolveL()
+    {
+    INFO_PRINTF1(_L("********************************************"));
+    INFO_PRINTF1(_L("DoResolveL  - DNS_Suffix_Support_TC002"));
+    INFO_PRINTF1(_L("********************************************"));
+    
+    TPtrC hostname;
+    
+    if (!GetStringFromConfig(KSectionDNSSuffixTest002,KKeyDNSSuffixTestHostname,hostname))
+        {
+        ERR_PRINTF1(_L("Failed to read the host name value"));    
+        SetError(KErrNotFound);
+        return;
+        }
+    else
+        {
+        INFO_PRINTF2(_L("Host name: %S"),&hostname);       
+        }
+
+	TInt err = KErrNone;
+    TName interfaceName;
+    
+    TRAP(err, err = GetFirstInterfaceNameL(interfaceName));
+        
+    if (err != KErrNone )
+        {
+        ERR_PRINTF2(_L("Failed to get the interface error: %D"),err);
+        SetError(err);
+        return;
+        }
+        
+    TPtrC suffixList;
+    iSuffixList.Reset();
+    
+    if (!GetStringFromConfig(KSectionDNSSuffixTest002,KKeyDNSSuffixTestSuffixList,suffixList))
+        {
+        ERR_PRINTF1(_L("Failed to read suffix lists from config"));    
+        SetError(KErrNotFound);
+        return;
+        }
+    else
+        {
+        INFO_PRINTF2(_L("Suffix list: %S"),&suffixList);
+        FillSuffixList(iSuffixList,suffixList);
+        }
+
+    if ( (err = iSocketServ.Connect()) != KErrNone)
+        {
+        ERR_PRINTF1(_L("Failed Connecting to socket server"));
+        SetError(err);
+        return;
+        }
+    
+    INFO_PRINTF1(_L("Connected to socket server successfully"));
+    
+    /*
+     * @Note: Start more than one interface. 
+     * Here starting vitual tunnel nif interface as a default. @see ethernet ced.xml file in which I have made 
+     * vTun as default in pref table.
+     */ 
+    RConnection vTunConn; // used for vTunnel
+    RConnection firstConn; 
+    
+    err = StartConnections(iSocketServ,firstConn, vTunConn);
+   
+    if (err != KErrNone)
+        {
+        ERR_PRINTF1(_L("Failed to start connections"));
+        CloseSocketSrv();
+        SetError(err);
+        return;
+        }
+    
+    INFO_PRINTF1(_L("Connections started successfully"));
+   
+    err = SetDNSSuffixListOnInterface(iSocketServ,firstConn,interfaceName,iSuffixList);
+    
+    if (KErrNone != err)
+        {
+        ERR_PRINTF2(_L("Failed Setting the suffix list with errror : %D"),err);
+        SetError(err);  
+        firstConn.Close();
+        CloseSocketSrv();
+        return;
+        }
+
+    // Open implicit resolver.
+    RHostResolver resolver;
+    
+    if ( (err = resolver.Open(iSocketServ,KAfInet,KProtocolInetUdp)) != KErrNone)
+        {
+        ERR_PRINTF2(_L("Failed Connecting to Host resolver with error: %D"),err);
+        firstConn.Close();
+        vTunConn.Close();
+        CloseSocketSrv();
+        SetError(err);        
+        return;
+        }       
+    
+    INFO_PRINTF1(_L("Connected to Host resolver successfully"));
+               
+    TNameEntry nameEntry;
+    
+    INFO_PRINTF2(_L("Requesting to resolve hostname: %S"),&hostname);
+    
+    if ( (err = resolver.GetByName(hostname,nameEntry)) != KErrNone)
+      {
+      ERR_PRINTF3(_L("Failed host resolution for %S with error: %D"),&hostname,err);       
+      }
+    else
+      {
+      TInetAddr& netAddress = TInetAddr::Cast(nameEntry().iAddr);
+      
+      if (netAddress.IsUnspecified())
+          {
+          ERR_PRINTF1(_L("Invalid host address"));
+          err = KErrArgument;
+          }
+      else
+          {
+          TBuf<KIPAddrLen> address;
+          netAddress.Output(address);
+          INFO_PRINTF1(_L("Got valid IP address:"));
+          INFO_PRINTF2(_L("Host name: %S"),&nameEntry().iName);
+          INFO_PRINTF2(_L("Host address: %S"),&address);
+          }
+      }
+    
+    INFO_PRINTF1(_L("Closing host resolver"));
+    resolver.Close();
+
+    SetError(err);
+    
+    INFO_PRINTF1(_L("Closing connections and socket serv session"));
+    firstConn.Close();
+    vTunConn.Close();
+    CloseSocketSrv();           
+    }
+
+
+
+void CDNSSuffixTestWrapper::DoResolveHostWithoutDomainWithSuffixListSetL()
+    {
+    INFO_PRINTF1(_L("******************************************************"));
+    INFO_PRINTF1(_L("DoResolveHostWithoutDomainL with Domain suffix Set"));
+    INFO_PRINTF1(_L(" - DNS_Suffix_Support_TC003"));
+    INFO_PRINTF1(_L("******************************************************"));
+    
+    TPtrC hostname;
+    
+    if (!GetStringFromConfig(KSectionDNSSuffixTest003,KKeyDNSSuffixTestHostname,hostname))
+        {
+        ERR_PRINTF1(_L("Failed to read the host name value"));    
+        SetError(KErrNotFound);
+        return;
+        }
+    else
+        {
+        INFO_PRINTF2(_L("Host name: %S"),&hostname);       
+        }
+    
+    TInt err = KErrNone;
+    
+    if ( (err = iSocketServ.Connect()) != KErrNone)
+        {
+        ERR_PRINTF1(_L("Failed Connecting to socket server"));
+        SetError(err);
+        return;
+        }
+    
+    INFO_PRINTF1(_L("Connected to socket server successfully"));
+        
+    RConnection vTunConn; // used for vTunnel
+    RConnection firstConn; 
+    
+    err = StartConnections(iSocketServ,firstConn, vTunConn);
+    
+    if (err != KErrNone)
+       {
+       ERR_PRINTF1(_L("Failed to start connections"));
+       CloseSocketSrv();
+       SetError(err);
+       return;
+       }
+
+   INFO_PRINTF1(_L("Connections started successfully"));
+       
+    // Open explicit resolver with ethernet
+    RHostResolver resolver;
+    if ( (err = resolver.Open(iSocketServ,KAfInet,KProtocolInetUdp,firstConn)) != KErrNone)
+        {
+        ERR_PRINTF2(_L("Failed Connecting to Host resolver with error: %D"),err);
+        firstConn.Close();
+        vTunConn.Close();
+        CloseSocketSrv();
+        SetError(err);
+        return;
+        }       
+    
+    INFO_PRINTF1(_L("Connected to Host resolver successfully"));
+               
+    TNameEntry nameEntry;
+    
+    if ( (err = resolver.GetByName(hostname,nameEntry)) != KErrNone)
+      {
+      ERR_PRINTF3(_L("Failed host resolution for %S with error: %D"),&hostname,err);
+      INFO_PRINTF1(_L("Test success"));
+      SetError(err);
+      }
+    else
+      {
+      TInetAddr address = nameEntry().iAddr;
+      
+      if (address.IsUnspecified())
+          {
+          ERR_PRINTF1(_L("Invalid host address"));
+          err = KErrArgument;
+          }
+      else
+          {
+          TBuf<KIPAddrLen> ipAddr;
+          address.Output(ipAddr);
+          INFO_PRINTF1(_L("Got valid IP address:"));
+          INFO_PRINTF2(_L("Host name: %S"),&nameEntry().iName);
+          INFO_PRINTF2(_L("Host address: %S"),&ipAddr);
+          }
+      SetError(err);
+      }
+    
+    INFO_PRINTF1(_L("Closing host resolver"));
+    resolver.Close();
+    firstConn.Close();
+    vTunConn.Close();   
+    CloseSocketSrv();           
+    }
+
+
+void CDNSSuffixTestWrapper::DoResolveHostWithoutDomainWithoutSuffixListL()
+    {
+    INFO_PRINTF1(_L("******************************************************"));
+    INFO_PRINTF1(_L("DoResolveHostWithoutDomainL  With no Suffix list"));
+    INFO_PRINTF1(_L("DNS_Suffix_Support_TC004"));
+    INFO_PRINTF1(_L("******************************************************"));
+    
+    TPtrC hostname;
+    
+    if (!GetStringFromConfig(KSectionDNSSuffixTest004,KKeyDNSSuffixTestHostname,hostname))
+        {
+        ERR_PRINTF1(_L("Failed to read the host name value"));    
+        SetError(KErrNotFound);
+        return;
+        }
+    else
+        {
+        INFO_PRINTF2(_L("Host name: %S"),&hostname);       
+        }
+    
+    TInt err(KErrNone);
+    // Note: Remove the suffix list set on Ethernet interface.
+  
+    TName interfaceName;
+    err = GetFirstInterfaceNameL(interfaceName);   
+   
+    if ( (err = iSocketServ.Connect()) != KErrNone)
+        {
+        ERR_PRINTF1(_L("Failed Connecting to socket server"));
+        SetError(err);
+        return;
+        }
+    
+    INFO_PRINTF1(_L("Connected to socket server successfully"));
+        
+    RConnection vTunConn; // used for vTunnel
+    RConnection firstConn;
+    
+    err = StartConnections(iSocketServ,firstConn, vTunConn);
+    
+    if (err != KErrNone)
+      {
+      ERR_PRINTF1(_L("Failed to start connections"));
+      CloseSocketSrv();
+      SetError(err);
+      return;
+      }
+    
+    /*
+    * @Note: Remove the suffix list (which we set in TC001) set on the interface by just setting empty list on it.
+    */
+    INFO_PRINTF1(_L("Setting empty suffix list on interface:"));
+    iSuffixList.Reset();
+    err = SetDNSSuffixListOnInterface(iSocketServ,firstConn,interfaceName,iSuffixList);
+    
+    if (err != KErrNone)
+        {
+        ERR_PRINTF2(_L("Failed to remove the suffix list set on interface with error: %D"),err);
+        SetError(err);
+        firstConn.Close();
+        vTunConn.Close();
+        CloseSocketSrv();
+        return;
+        }
+    
+    INFO_PRINTF1(_L("Removed suffix list from interface:"));
+    
+    // Open explicit resolver with ethernet
+    RHostResolver resolver;
+    if ( (err = resolver.Open(iSocketServ,KAfInet,KProtocolInetUdp,firstConn)) != KErrNone)
+        {
+        ERR_PRINTF2(_L("Failed Connecting to Host resolver with error: %D"),err);
+        firstConn.Close();
+        vTunConn.Close();
+        CloseSocketSrv();
+        SetError(err);
+        return;
+        }       
+    
+    INFO_PRINTF1(_L("Connected to Host resolver successfully"));
+               
+    TNameEntry nameEntry;
+    
+    if ( (err = resolver.GetByName(hostname,nameEntry)) != KErrNone)
+      {
+      ERR_PRINTF3(_L("Failed host resolution for %S with error: %D"),&hostname,err);
+      INFO_PRINTF1(_L("Test success"));
+      SetError(EPass);
+      }
+    else
+      {
+      TInetAddr address = nameEntry().iAddr;
+      
+      if (address.IsUnspecified())
+          {
+          ERR_PRINTF1(_L("Invalid host address"));
+          err = KErrArgument;
+          }
+      else
+          {
+          TBuf<KIPAddrLen> ipAddr;
+          address.Output(ipAddr);
+          INFO_PRINTF1(_L("Got valid IP address:"));
+          INFO_PRINTF2(_L("Host name: %S"),&nameEntry().iName);
+          INFO_PRINTF2(_L("Host address: %S"),&ipAddr);
+          }
+      SetError(EFail);
+      }
+    
+    INFO_PRINTF1(_L("Closing host resolver"));
+    resolver.Close();
+    firstConn.Close();
+    vTunConn.Close();   
+    CloseSocketSrv();      
+    INFO_PRINTF1(_L("DoResolveHostWithoutDomainWithoutSuffixListL - Exit"));
+    }
+
+
+
+void CDNSSuffixTestWrapper::DNSSuffixSupportTC005L()
+    {
+    INFO_PRINTF1(_L("****************************************************"));
+    INFO_PRINTF1(_L("DNSSuffixSupportTC005L - DNS_Suffix_Support_TC005"));
+    INFO_PRINTF1(_L("****************************************************"));
+    
+    TPtrC hostname;
+    
+    if (!GetStringFromConfig(KSectionDNSSuffixTest005,KKeyDNSSuffixTestHostname,hostname))
+        {
+        ERR_PRINTF1(_L("Failed to read the host name value"));    
+        SetError(KErrNotFound);
+        return;
+        }
+    else
+        {
+        INFO_PRINTF2(_L("Host name: %S"),&hostname);       
+        }
+    
+    TInt err(KErrNone);
+        
+    TFileName interfaceName;
+    
+    TRAP(err, err = GetFirstInterfaceNameL(interfaceName));
+    
+    if (err != KErrNone )
+        {
+        ERR_PRINTF2(_L("Failed to get the interface error: %D"),err);
+        SetError(err);
+        return;
+        }
+    
+    TPtrC suffixList;    
+    iSuffixList.Reset();
+    
+    if (!GetStringFromConfig(KSectionDNSSuffixTest005,KKeyDNSSuffixTestSuffixList,suffixList))
+        {
+        ERR_PRINTF1(_L("Failed to read suffix lists from config"));    
+        SetError(KErrNotFound);
+        return;
+        }
+    else
+        {
+        INFO_PRINTF2(_L("Suffix list: %S"),&suffixList);
+        FillSuffixList(iSuffixList,suffixList);
+        }
+     
+    if ( (err = iSocketServ.Connect()) != KErrNone)
+        {
+        ERR_PRINTF1(_L("Failed Connecting to socket server"));
+        SetError(err);
+        return;
+        }
+    
+    INFO_PRINTF1(_L("Connected to socket server successfully"));
+    
+    RConnection vTunConn; // used for vTunnel
+    RConnection firstConn; 
+    
+    err = StartConnections(iSocketServ,firstConn, vTunConn);
+    
+    if (err != KErrNone)
+       {
+       ERR_PRINTF1(_L("Failed to start connections"));
+       CloseSocketSrv();
+       SetError(err);
+       return;
+       }
+    
+    INFO_PRINTF1(_L("Connections started successfully"));
+    
+    INFO_PRINTF2(_L("Setting suffix list on : %S"),&interfaceName);
+    err = SetDNSSuffixListOnInterface(iSocketServ,firstConn,interfaceName,iSuffixList);    
+        
+    if (KErrNone != err)
+        {
+        ERR_PRINTF2(_L("Failed Setting the suffix list with errror : %D"),err);
+        SetError(err);    
+        firstConn.Close();
+        vTunConn.Close();
+        CloseSocketSrv();
+        return;
+        }
+    
+    INFO_PRINTF1(_L("Suffix list set successfully"));
+    
+    INFO_PRINTF1(_L("Creating explicit host resolver"));
+    
+    // Open explicit resolver
+    RHostResolver resolver;
+    if ( (err = resolver.Open(iSocketServ,KAfInet,KProtocolInetUdp,firstConn)) != KErrNone)
+        {
+        ERR_PRINTF2(_L("Failed Connecting to Host resolver with error: %D"),err);
+        firstConn.Close();
+        vTunConn.Close();
+        CloseSocketSrv();
+        SetError(err);
+        return;
+        }       
+    
+    INFO_PRINTF1(_L("Connected to Host resolver successfully"));
+               
+    TNameEntry nameEntry;
+    
+    if ( (err = resolver.GetByName(hostname,nameEntry)) != KErrNone)
+        {
+        INFO_PRINTF3(_L("Host resolution for %S with error: %D"),&hostname,err);
+        INFO_PRINTF1(_L("Test success"));
+        err = KErrNone;
+        }    
+    else
+        {
+        err = KErrArgument;
+        ERR_PRINTF1(_L("Test failed: Expected no resolution, but resolved"));
+        }
+    
+    SetError(err);
+    INFO_PRINTF1(_L("Closing host resolver, connections and Sock Srv session"));
+    resolver.Close();
+    firstConn.Close();
+    vTunConn.Close();    
+    CloseSocketSrv();
+    INFO_PRINTF1(_L("CDNSSuffixTestWrapper::DNSSuffixSupportTC005L - Exit"));
+    }
+
+
+void CDNSSuffixTestWrapper::DNSSuffixSupportTC006L()
+    {
+    INFO_PRINTF1(_L("****************************************************"));
+    INFO_PRINTF1(_L("DNSSuffixSupportTC006L - DNS_Suffix_Support_TC006"));
+    INFO_PRINTF1(_L("****************************************************"));
+    
+    TInt numberOfHosts(0);
+    
+    if (!GetIntFromConfig(KSectionDNSSuffixTest006,KKeyDNSSuffixTest006NoOfHostname,numberOfHosts))
+        {
+        ERR_PRINTF1(_L("Failed to read the no of hosts from config"));    
+        SetError(KErrNotFound);
+        return;
+        }
+    else
+        {
+        INFO_PRINTF2(_L("No of hosts: %D"),numberOfHosts);       
+        }       
+
+    TPtrC hostnames[KMaxHosts];
+    
+    for (TInt b=0;b<numberOfHosts;b++)
+        {
+        TFileName keyName;
+        keyName.Format(KKeyDNSSuffixTest006Hostname,b+1);
+        
+        if (!GetStringFromConfig(KSectionDNSSuffixTest006,keyName,hostnames[b]))
+            {
+            ERR_PRINTF1(_L("Failed to read the 1st host name value"));    
+            SetError(KErrNotFound);
+            return;
+            }
+        else
+            {
+            INFO_PRINTF3(_L("Host name%D: %S"),b,&hostnames[b]);       
+            }        
+        }
+        
+    TInt err(KErrNone);
+        
+    TName interfaceName;
+    
+    TRAP(err, err = GetFirstInterfaceNameL(interfaceName));
+    
+    if (err != KErrNone )
+        {
+        ERR_PRINTF2(_L("Failed to get the interface error: %D"),err);
+        SetError(err);
+        return;
+        }
+    
+    TPtrC suffixList;
+    iSuffixList.Reset();
+    
+    if (!GetStringFromConfig(KSectionDNSSuffixTest006,KKeyDNSSuffixTestSuffixList,suffixList))
+        {
+        ERR_PRINTF1(_L("Failed to read suffix lists from config"));    
+        SetError(KErrNotFound);
+        return;
+        }
+    else
+        {
+        INFO_PRINTF2(_L("Suffix list: %S"),&suffixList);
+        FillSuffixList(iSuffixList,suffixList);
+        }
+     
+    if ( (err = iSocketServ.Connect()) != KErrNone)
+        {
+        ERR_PRINTF1(_L("Failed Connecting to socket server"));
+        SetError(err);
+        return;
+        }
+    
+    INFO_PRINTF1(_L("Connected to socket server successfully"));
+    
+    RConnection vTunConn; // used for vTunnel
+    RConnection firstConn; 
+    
+    err = StartConnections(iSocketServ,firstConn, vTunConn);
+    
+    if (err != KErrNone)
+      {
+      ERR_PRINTF1(_L("Failed to start connections"));
+      CloseSocketSrv();
+      SetError(err);
+      return;
+      }
+    
+    INFO_PRINTF1(_L("Connections started successfully"));
+    
+    err = SetDNSSuffixListOnInterface(iSocketServ,firstConn,interfaceName,iSuffixList);
+       
+    if (KErrNone != err)
+        {
+        ERR_PRINTF2(_L("Failed Setting the suffix list with errror : %D"),err);
+        SetError(err);
+        firstConn.Close();
+        vTunConn.Close();
+        CloseSocketSrv();
+        return;
+        }
+
+    INFO_PRINTF1(_L("Set suffix list on interface successfully"));
+    
+    RHostResolver resolver;
+    if ( (err = resolver.Open(iSocketServ,KAfInet,KProtocolInetUdp,firstConn)) != KErrNone)
+        {
+        ERR_PRINTF2(_L("Failed Connecting to Host resolver with error: %D"),err);
+        firstConn.Close();
+        vTunConn.Close();
+        CloseSocketSrv();
+        SetError(err);
+        return;
+        }       
+    
+    INFO_PRINTF1(_L("Connected to Host resolver successfully"));
+               
+    TNameEntry nameEntry[KMaxHosts];
+    
+    // Resolve all three hosts
+    for (TInt a=0;a<numberOfHosts;a++)
+        {
+        INFO_PRINTF2(_L("Resolving host: %S"),&hostnames[a]);
+        
+        if ( (err = resolver.GetByName(hostnames[a],nameEntry[a])) != KErrNone)
+            {
+            INFO_PRINTF3(_L("Host resolution for %S failed with error: %D"),&hostnames[a],err);
+            INFO_PRINTF1(_L("Test Failed"));
+            SetError(err);
+            break;
+            }
+        }
+    
+    if (err == KErrNone)
+        {
+        for (TInt a=0;a<numberOfHosts;a++)
+            {
+            TInetAddr address = nameEntry[a]().iAddr;
+            
+            if (address.IsUnspecified())
+                {
+                ERR_PRINTF1(_L("Invalid host address"));
+                err = KErrArgument;
+                }
+            else
+                {
+                TBuf<KIPAddrLen> ipAddr;
+                address.Output(ipAddr);
+                INFO_PRINTF1(_L("Got valid IP address:"));
+                INFO_PRINTF2(_L("Host name: %S"),&nameEntry[a]().iName);
+                INFO_PRINTF2(_L("Host address: %S"),&ipAddr);
+                }            
+            }       
+        }
+    
+    SetError(err);
+    INFO_PRINTF1(_L("Closing host resolver, connections and Sock Srv session"));
+    resolver.Close();
+    firstConn.Close();
+    vTunConn.Close();    
+    CloseSocketSrv();
+    INFO_PRINTF1(_L("CDNSSuffixTestWrapper::DNSSuffixSupportTC006L - Exit"));
+    }
+
+
+/*
+ * TODO: Needs to find the way to change the ranking IAP's programatically. 
+ * Note: Before running this test case make ethernet iap as default
+ * by changing its ranking to one(1). 
+ * @ See te_dnssuffixcedv2.xml
+ * @See te_dnssuffixsuite.script for below line
+ * ced -i z:\testdata\configs\te_dnssuffixcedv2.xml 
+ *
+ */
+void CDNSSuffixTestWrapper::DNSSuffixSupportTC007L()
+    {
+    INFO_PRINTF1(_L("**********************************************************************"));
+    INFO_PRINTF1(_L("DNS_Suffix_Test007L - DNS_Suffix_Support_007"));
+    INFO_PRINTF1(_L("**********************************************************************"));
+    
+    TPtrC validHostname;
+    TPtrC inValidHostname;
+    
+    if (!GetStringFromConfig(KSectionDNSSuffixTest007,KKeyDNSSuffixTest007ValidHostname,validHostname))
+        {
+        ERR_PRINTF1(_L("Failed to read the valid host name from config"));    
+        SetError(KErrNotFound);
+        return;
+        }
+    else
+        {
+        INFO_PRINTF2(_L("Valid Host name: %S"),&validHostname);       
+        }
+    
+    if (!GetStringFromConfig(KSectionDNSSuffixTest007,KKeyDNSSuffixTest007InValidHostname,inValidHostname))
+        {
+        ERR_PRINTF1(_L("Failed to read the invalid host name from config"));    
+        SetError(KErrNotFound);
+        return;
+        }
+    else
+        {
+        INFO_PRINTF2(_L("Invalid Host name: %S"),&inValidHostname);       
+        }   
+   
+    // @Santosh K Patil
+    // Note: Remove the suffix lists from the interfaces set by previous test cases, if any.    
+    // Note: start multiple interfaces
+    
+    TFileName interfaceName;
+    TInt err = KErrNone;
+    err = GetFirstInterfaceNameL(interfaceName);
+    
+    /*
+     * @Note: Remove the suffix list set on the interface (which we set in earlier test cases) 
+     *  by just setting empty list on it.
+     */
+    INFO_PRINTF1(_L("Setting empty suffix list on interface:"));
+    iSuffixList.Reset();
+    
+    if ( (err = iSocketServ.Connect()) != KErrNone)
+       {
+       ERR_PRINTF1(_L("Failed Connecting to socket server"));
+       SetError(err);
+       return;
+       }
+    
+    INFO_PRINTF1(_L("Connected to socket server successfully"));
+    
+    RConnection vTunConn; // used for vTunnel
+    RConnection firstConn; 
+    
+    err = StartConnections(iSocketServ,firstConn, vTunConn);
+    
+    if (err != KErrNone)
+      {
+      ERR_PRINTF1(_L("Failed to start connections"));
+      CloseSocketSrv();
+      SetError(err);
+      return;
+      }
+    
+    INFO_PRINTF1(_L("Connections started successfully"));
+    
+    err = SetDNSSuffixListOnInterface(iSocketServ,firstConn,interfaceName,iSuffixList);
+           
+    if (KErrNone != err)
+        {
+        ERR_PRINTF2(_L("Failed Setting the suffix list with errror : %D"),err);
+        SetError(err);
+        firstConn.Close();
+        vTunConn.Close();
+        CloseSocketSrv();
+        return;
+        }
+    
+    INFO_PRINTF1(_L("Removed suffix list from interface:"));
+
+    INFO_PRINTF1(_L("Opening implicit resolver"));
+    // Open implicit resolver.
+    RHostResolver resolver;
+    
+    if ( (err = resolver.Open(iSocketServ,KAfInet,KProtocolInetUdp)) != KErrNone)
+        {
+        ERR_PRINTF2(_L("Failed Connecting to Host resolver with error: %D"),err);
+        firstConn.Close();
+        vTunConn.Close();
+        CloseSocketSrv();
+        SetError(err);        
+        return;
+        }       
+    
+    INFO_PRINTF1(_L("Connected to Host resolver successfully"));
+               
+    TNameEntry nameEntry;
+    
+    INFO_PRINTF2(_L("Requesting to resolve valid hostname: %S"),&validHostname);
+    
+    if ( (err = resolver.GetByName(validHostname,nameEntry)) != KErrNone)
+      {
+      ERR_PRINTF3(_L("Host resolution failed for %S with error: %D"),&validHostname,err);       
+      }
+    else
+      {
+      TInetAddr& netAddress = TInetAddr::Cast(nameEntry().iAddr);
+      
+      if (netAddress.IsUnspecified())
+          {
+          ERR_PRINTF1(_L("Invalid host address"));
+          err = KErrArgument;
+          }
+      else
+          {
+          TBuf<KIPAddrLen> address;
+          netAddress.Output(address);
+          INFO_PRINTF1(_L("Got valid IP address:"));
+          INFO_PRINTF2(_L("Host name: %S"),&nameEntry().iName);
+          INFO_PRINTF2(_L("Host address: %S"),&address);
+          }
+      }    
+    
+    if (err == KErrNone)
+        {
+        TNameEntry nameEntry2;
+        
+        INFO_PRINTF2(_L("Requesting to resolve invalid hostname: %S"),&inValidHostname);
+        
+        if ( (err = resolver.GetByName(inValidHostname,nameEntry2)) != KErrNone)
+          {
+          INFO_PRINTF3(_L("Host resolution failed for %S with error: %D"),&inValidHostname,err);
+          INFO_PRINTF1(_L("Test scenario passed"));
+          err = KErrNone;
+          }
+        else
+          {
+          err = KErrArgument;
+          INFO_PRINTF1(_L("Error: Seems host is resolvable"));
+          }        
+        }
+    
+    SetError(err);
+    
+    INFO_PRINTF1(_L("Closing host resolver"));
+    resolver.Close();    
+    
+    INFO_PRINTF1(_L("Closing connections and socket serv session"));
+    firstConn.Close();
+    vTunConn.Close();
+    CloseSocketSrv();           
+    INFO_PRINTF1(_L("CDNSSuffixTestWrapper::DNSSuffixSupportTC007L - Exit"));
+    }
+
+
+void CDNSSuffixTestWrapper::DNSSuffixSupportTC008L()
+    {
+    INFO_PRINTF1(_L("**********************************************************************"));
+    INFO_PRINTF1(_L("DNS_Suffix_Test008L - DNS_Suffix_Support_008"));
+    INFO_PRINTF1(_L("**********************************************************************"));
+    
+    TPtrC hostname1;
+    TPtrC hostname2;
+    
+    if (!GetStringFromConfig(KSectionDNSSuffixTest008,KKeyDNSSuffixTestHostname1,hostname1))
+        {
+        ERR_PRINTF1(_L("Failed to read the 1 host name from config"));    
+        SetError(KErrNotFound);
+        return;
+        }
+    else
+        {
+        INFO_PRINTF2(_L("Host name1: %S"),&hostname1);       
+        }
+    
+    if (!GetStringFromConfig(KSectionDNSSuffixTest008,KKeyDNSSuffixTestHostname2,hostname2))
+        {
+        ERR_PRINTF1(_L("Failed to read the 2 host name from config"));    
+        SetError(KErrNotFound);
+        return;
+        }
+    else
+        {
+        INFO_PRINTF2(_L("Host name2: %S"),&hostname2);       
+        }   
+   
+    // @Santosh K Patil
+    // @note: Set suffix lists on both interfaces (eth and vtun)    
+    // @note: start multiple interfaces
+    
+    TName ethernetInterface;
+    TName vTunInterface;
+    TInt err = KErrNone;
+    err = GetFirstInterfaceNameL(ethernetInterface);
+    
+    if (KErrNone != err)
+        { 
+        ERR_PRINTF1(_L("Failed get the name of the interface (ethernet)"));    
+        SetError(KErrNotFound);
+        return;
+        }
+    
+#ifndef DISABLE_TUNDRIVER
+    err = GetSecondInterfaceNameL(vTunInterface);
+    
+    if (KErrNone != err)
+        { 
+        ERR_PRINTF1(_L("Failed get the name of the interface (vTun)"));    
+        SetError(KErrNotFound);
+        return;
+        }
+#endif
+   
+    INFO_PRINTF1(_L("Setting suffix list on interface:"));
+    
+    iSuffixList2.Reset();
+    
+    TPtrC suffixList;
+    if (!GetStringFromConfig(KSectionDNSSuffixTest008,KKeyDNSSuffixTestSuffixList,suffixList))
+        {
+        ERR_PRINTF1(_L("Failed to read suffix lists from config"));    
+        SetError(KErrNotFound);
+        return;
+        }
+    else
+        {
+        INFO_PRINTF2(_L("Suffix list: %S"),&suffixList);
+        FillSuffixList(iSuffixList2,suffixList);
+        }   
+    
+    if ( (err = iSocketServ.Connect()) != KErrNone)
+       {
+       ERR_PRINTF1(_L("Failed Connecting to socket server"));
+       SetError(err);
+       return;
+       }
+    
+    INFO_PRINTF1(_L("Connected to socket server successfully"));
+    
+    RConnection vTunConn; // used for vTunnel
+    RConnection firstConn; 
+    
+    err = StartConnections(iSocketServ,firstConn, vTunConn);
+    
+    if (err != KErrNone)
+      {
+      ERR_PRINTF1(_L("Failed to start connections"));
+      CloseSocketSrv();
+      SetError(err);
+      return;
+      }
+    
+    INFO_PRINTF1(_L("Connections started successfully"));
+    
+    err = SetDNSSuffixListOnInterface(iSocketServ,firstConn,ethernetInterface,iSuffixList2);
+             
+    if (KErrNone != err)
+        {
+        ERR_PRINTF3(_L("Failed Setting the suffix list on %S with errror : %D"),&ethernetInterface,err);
+        SetError(err);
+        firstConn.Close();
+        vTunConn.Close();
+        CloseSocketSrv();
+        return;
+        }
+    
+    INFO_PRINTF2(_L("Set suffix list on %S successfully"),&ethernetInterface);
+    
+#ifndef DISABLE_TUNDRIVER
+    err = SetDNSSuffixListOnInterface(iSocketServ,vTunConn,vTunInterface,iSuffixList2);
+               
+    if (KErrNone != err)
+        {
+        ERR_PRINTF3(_L("Failed Setting the suffix list on %S with errror : %D"),&vTunInterface,err);
+        SetError(err);
+        firstConn.Close();
+        vTunConn.Close();
+        CloseSocketSrv();
+        return;
+        }
+    
+    INFO_PRINTF2(_L("Set suffix list on %S successfully"),&vTunInterface);        
+#endif
+    
+    INFO_PRINTF1(_L("Opening implicit resolver"));
+    // Open implicit resolver.
+    RHostResolver resolver;
+    INFO_PRINTF1(_L("Creating implicit resolver"));
+    if ( (err = resolver.Open(iSocketServ,KAfInet,KProtocolInetUdp)) != KErrNone)
+        {
+        ERR_PRINTF2(_L("Failed Connecting to Host resolver with error: %D"),err);
+        firstConn.Close();
+        vTunConn.Close();
+        CloseSocketSrv();
+        SetError(err);        
+        return;
+        }       
+    
+    INFO_PRINTF1(_L("Connected to implicit Host resolver successfully"));
+               
+    TNameEntry nameEntry;
+    
+    INFO_PRINTF2(_L("Requesting to resolve hostname: %S"),&hostname1);
+    
+    if ( (err = resolver.GetByName(hostname1,nameEntry)) != KErrNone)
+      {
+      ERR_PRINTF3(_L("Failed to resolve the host %S with error: %D"),&hostname1,err);       
+      }
+    else
+      {
+      TInetAddr& netAddress = TInetAddr::Cast(nameEntry().iAddr);
+      
+      if (netAddress.IsUnspecified())
+          {
+          ERR_PRINTF1(_L("Invalid host address"));
+          err = KErrArgument;
+          }
+      else
+          {
+          TBuf<KIPAddrLen> address;
+          netAddress.Output(address);
+          INFO_PRINTF1(_L("Got valid IP address:"));
+          INFO_PRINTF2(_L("Host name: %S"),&nameEntry().iName);
+          INFO_PRINTF2(_L("Host address: %S"),&address);
+          }
+      }    
+    
+    INFO_PRINTF1(_L("Closing implicit host resolver"));
+    resolver.Close(); 
+        
+#ifndef DISABLE_TUNDRIVER
+    if (err == KErrNone)
+        {
+        // Open explicit resolver.
+        RHostResolver resolver2;
+        INFO_PRINTF1(_L("Creating explicit resolver"));
+        if ( (err = resolver2.Open(iSocketServ,KAfInet,KProtocolInetUdp,vTunConn)) != KErrNone)
+            {
+            ERR_PRINTF2(_L("Failed Connecting to explicit Host resolver with error: %D"),err);
+            firstConn.Close();
+            vTunConn.Close();
+            CloseSocketSrv();
+            SetError(err);        
+            return;
+            }       
+        
+        INFO_PRINTF1(_L("Connected to explicit Host resolver successfully"));
+        
+        
+        TNameEntry nameEntry2;        
+        INFO_PRINTF2(_L("Requesting to resolve hostname: %S"),&hostname2);
+        
+        if ( (err = resolver2.GetByName(hostname2,nameEntry2)) != KErrNone)
+          {
+          INFO_PRINTF3(_L("Host resolution failed for %S with error: %D"),&hostname2,err);
+          INFO_PRINTF1(_L("Test scenario passed"));
+          err = KErrNone;
+          }
+        else
+          {
+          err = KErrArgument;
+          INFO_PRINTF1(_L("Error: Seems host is resolvable"));
+          }      
+        
+        INFO_PRINTF1(_L("Closing explicit host resolver"));
+        resolver2.Close();    
+        }
+#endif
+    
+    SetError(err);
+    
+    INFO_PRINTF1(_L("Closing connections and socket serv session"));
+    firstConn.Close();
+    vTunConn.Close();
+    CloseSocketSrv();           
+    INFO_PRINTF1(_L("CDNSSuffixTestWrapper::DNSSuffixSupportTC008L - Exit"));
+    }
+
+
+// TODO: Cross check the correct ness of the implementation.
+void CDNSSuffixTestWrapper::DNSSuffixSupportTC009L()
+    {
+    INFO_PRINTF1(_L("**********************************************************************"));
+    INFO_PRINTF1(_L("DNSSuffixSupportTC009L - DNS_Suffix_Support_009"));
+    INFO_PRINTF1(_L("**********************************************************************"));
+    
+    TPtrC hostname1;
+    TPtrC hostname2;
+    
+    if (!GetStringFromConfig(KSectionDNSSuffixTest009,KKeyDNSSuffixTestHostname1,hostname1))
+        {
+        ERR_PRINTF1(_L("Failed to read the 1 host name from config"));    
+        SetError(KErrNotFound);
+        return;
+        }
+    else
+        {
+        INFO_PRINTF2(_L("Host name1: %S"),&hostname1);       
+        }
+    
+    if (!GetStringFromConfig(KSectionDNSSuffixTest009,KKeyDNSSuffixTestHostname2,hostname2))
+        {
+        ERR_PRINTF1(_L("Failed to read the 2 host name from config"));    
+        SetError(KErrNotFound);
+        return;
+        }
+    else
+        {
+        INFO_PRINTF2(_L("Host name2: %S"),&hostname2);       
+        }
+    
+    /*
+     * @Santosh K Patil        
+     * @note: start multiple interfaces
+     * Set suffix lists on vTunnel interface    
+     * Open explicit connection on other interface
+     */
+     TInt err = KErrNone;
+#ifndef DISABLE_TUNDRIVER
+    TFileName vTunInterface;
+    err = GetSecondInterfaceNameL(vTunInterface);
+    
+    if (KErrNone != err)
+        { 
+        ERR_PRINTF1(_L("Failed get the name of the interface (vTun)"));    
+        SetError(KErrNotFound);
+        return;
+        }    
+   
+    INFO_PRINTF1(_L("Setting suffix list on vTun interface:"));
+    
+    iSuffixList.Reset();
+    
+    TPtrC suffixList;
+    if (!GetStringFromConfig(KSectionDNSSuffixTest009,KKeyDNSSuffixTestSuffixList,suffixList))
+        {
+        ERR_PRINTF1(_L("Failed to read suffix lists from config"));    
+        SetError(KErrNotFound);
+        return;
+        }
+    else
+        {
+        INFO_PRINTF2(_L("Suffix list: %S"),&suffixList);
+        FillSuffixList(iSuffixList,suffixList);
+        }
+#endif
+
+    if ( (err = iSocketServ.Connect()) != KErrNone)
+       {
+       ERR_PRINTF1(_L("Failed Connecting to socket server"));
+       SetError(err);
+       return;
+       }
+    
+    INFO_PRINTF1(_L("Connected to socket server successfully"));
+    
+    RConnection vTunConn; // used for vTunnel
+    RConnection firstConn; 
+    
+    err = StartConnections(iSocketServ,firstConn, vTunConn);
+    
+    if (err != KErrNone)
+      {
+      ERR_PRINTF1(_L("Failed to start connections"));
+      CloseSocketSrv();
+      SetError(err);
+      return;
+      }
+    
+    INFO_PRINTF1(_L("Connections started successfully"));
+    
+#ifndef DISABLE_TUNDRIVER
+    err = SetDNSSuffixListOnInterface(iSocketServ,vTunConn,vTunInterface,iSuffixList);
+                   
+    if (KErrNone != err)
+        {
+        ERR_PRINTF3(_L("Failed Setting the suffix list on %S with errror : %D"),&vTunInterface,err);
+        SetError(err);
+        firstConn.Close();
+        vTunConn.Close();
+        CloseSocketSrv();
+        return;
+        }
+    
+    INFO_PRINTF2(_L("Set suffix list on %S successfully"),&vTunInterface);  
+#endif
+
+    INFO_PRINTF1(_L("Opening explicit resolver"));
+    // Open implicit resolver.
+    RHostResolver resolver;
+    INFO_PRINTF1(_L("Creating explicit resolver"));
+    if ( (err = resolver.Open(iSocketServ,KAfInet,KProtocolInetUdp,firstConn)) != KErrNone)
+        {
+        ERR_PRINTF2(_L("Failed Connecting to Host resolver with error: %D"),err);
+        firstConn.Close();
+        vTunConn.Close();
+        CloseSocketSrv();
+        SetError(err);        
+        return;
+        }       
+    
+    INFO_PRINTF1(_L("Connected to explicit Host resolver successfully"));
+               
+    TNameEntry nameEntry;
+    
+    INFO_PRINTF2(_L("Requesting to resolve hostname: %S"),&hostname1);
+    
+    if ( (err = resolver.GetByName(hostname1,nameEntry)) != KErrNone)
+      {
+      ERR_PRINTF3(_L("Failed to resolve the host %S with error: %D"),&hostname1,err);       
+      }
+    else
+      {
+      TInetAddr& netAddress = TInetAddr::Cast(nameEntry().iAddr);
+      
+      if (netAddress.IsUnspecified())
+          {
+          ERR_PRINTF1(_L("Invalid host address"));
+          err = KErrArgument;
+          }
+      else
+          {
+          TBuf<KIPAddrLen> address;
+          netAddress.Output(address);
+          INFO_PRINTF1(_L("Got valid IP address:"));
+          INFO_PRINTF2(_L("Host name: %S"),&nameEntry().iName);
+          INFO_PRINTF2(_L("Host address: %S"),&address);
+          }
+      }
+        
+    if (err == KErrNone)
+        { 
+        TNameEntry nameEntry2;        
+        INFO_PRINTF2(_L("Requesting to resolve hostname: %S"),&hostname2);
+        
+        if ( (err = resolver.GetByName(hostname2,nameEntry2)) != KErrNone)
+          {
+          INFO_PRINTF3(_L("Host resolution failed for %S with error: %D"),&hostname2,err);
+          INFO_PRINTF1(_L("Test scenario passed"));
+          err = KErrNone;
+          }
+        else
+          {
+          // TODO: We have to change this once we come up with end to end setup for VTun err = KErrArgument;
+          INFO_PRINTF1(_L("We assumed that host is resolved through explicit connection and hence test is pass."));
+          INFO_PRINTF1(_L("We have to change this once we come up with end to end setup for VTun."));
+          err = KErrNone;
+         // INFO_PRINTF1(_L("Error: Seems host is resolvable"));
+          } 
+        }   
+    
+    SetError(err);
+
+    INFO_PRINTF1(_L("Closing host resolver"));
+    resolver.Close(); 
+    
+    INFO_PRINTF1(_L("Closing connections and socket serv session"));
+    firstConn.Close();
+    vTunConn.Close();
+    CloseSocketSrv();           
+    INFO_PRINTF1(_L("CDNSSuffixTestWrapper::DNSSuffixSupportTC009L - Exit"));
+    }
+
+
+// TODO: If I set suffix list name of length with max size then client panic's.
+void CDNSSuffixTestWrapper::DNSSuffixSupportTC010L()
+    {
+    INFO_PRINTF1(_L("**********************************************************************"));
+    INFO_PRINTF1(_L("DNSSuffixSupportTC010L - DNS_Suffix_Support_010"));
+    INFO_PRINTF1(_L("**********************************************************************"));
+    
+    TPtrC hostname;
+    
+    if (!GetStringFromConfig(KSectionDNSSuffixTest010,KKeyDNSSuffixTestHostname,hostname))
+        {
+        ERR_PRINTF1(_L("Failed to read the host name from config"));    
+        SetError(KErrNotFound);
+        return;
+        }
+    else
+        {
+        INFO_PRINTF2(_L("Host name1: %S"),&hostname);       
+        }
+    
+    // @Santosh K Patil     
+    // @note: start multiple interfaces
+    // @note: Set long suffix lists on both interface  
+    // @note: Create explicit resolver and set the suffixlist with max size.
+    
+    TFileName ethernetInterface;
+    TInt err = KErrNone;
+    err = GetFirstInterfaceNameL(ethernetInterface);
+    
+    if (KErrNone != err)
+        { 
+        ERR_PRINTF1(_L("Failed get the name of the interface (ethernet)"));    
+        SetError(KErrNotFound);
+        return;
+        }
+  
+    INFO_PRINTF1(_L("Setting suffix list on interface:"));
+    iSuffixList.Reset();
+    
+    
+    // @Ganesh - Constructing suffix list for FillSuffixList with 3 separate suffix name entries in ini
+    // @Ganesh - as the names are too long for the parser to parse and add it in one GetStringFromConfig call 
+    TPtrC suffixName;
+    TBuf<1024> suffixList;
+    if (!GetStringFromConfig(KSectionDNSSuffixTest010,KKeyDNSSuffixTestSuffixList1,suffixName))
+        {
+        ERR_PRINTF1(_L("Failed to read suffix lists from config"));    
+        SetError(KErrNotFound);
+        return;
+        }
+    else
+        {
+        INFO_PRINTF1(_L("Suffix name:"));
+        INFO_PRINTF2(_L("%S"),&suffixName);
+        suffixList.Append(suffixName);
+        suffixList.Append(_L(";"));
+        }
+
+    if (!GetStringFromConfig(KSectionDNSSuffixTest010,KKeyDNSSuffixTestSuffixList2,suffixName))
+        {
+        ERR_PRINTF1(_L("Failed to read suffix lists from config"));    
+        SetError(KErrNotFound);
+        return;
+        }
+    else
+        {
+        INFO_PRINTF1(_L("Suffix name:"));
+        INFO_PRINTF2(_L("%S"),&suffixName);
+        suffixList.Append(suffixName);
+        suffixList.Append(_L(";"));
+        }
+    
+    if (!GetStringFromConfig(KSectionDNSSuffixTest010,KKeyDNSSuffixTestSuffixList3,suffixName))
+        {
+        ERR_PRINTF1(_L("Failed to read suffix lists from config"));    
+        SetError(KErrNotFound);
+        return;
+        }
+    else
+        {
+        INFO_PRINTF1(_L("Suffix name:"));
+        INFO_PRINTF2(_L("%S"),&suffixName);
+        suffixList.Append(suffixName);
+        }
+    FillSuffixList(iSuffixList,suffixList);
+    
+    if ( (err = iSocketServ.Connect()) != KErrNone)
+       {
+       ERR_PRINTF1(_L("Failed Connecting to socket server"));
+       SetError(err);
+       return;
+       }
+    
+    INFO_PRINTF1(_L("Connected to socket server successfully"));
+    
+    RConnection vTunConn; // used for vTunnel
+    RConnection firstConn; 
+    
+    err = StartConnections(iSocketServ,firstConn, vTunConn);
+    
+    if (err != KErrNone)
+      {
+      ERR_PRINTF1(_L("Failed to start connections"));
+      CloseSocketSrv();
+      SetError(err);
+      return;
+      }
+    
+    INFO_PRINTF1(_L("Connections started successfully"));
+    
+    err = SetDNSSuffixListOnInterface(iSocketServ,firstConn,ethernetInterface,iSuffixList);
+                  
+    if (KErrNone != err)
+        {
+        ERR_PRINTF3(_L("Failed Setting the suffix list on %S with errror : %D"),&ethernetInterface,err);
+        SetError(err);
+        firstConn.Close();
+        vTunConn.Close();
+        CloseSocketSrv();
+        return;
+        }
+    
+    INFO_PRINTF2(_L("Set suffix list on %S successfully"),&ethernetInterface);  
+    
+    INFO_PRINTF1(_L("Opening explicit resolver"));
+    
+    RHostResolver resolver;
+    INFO_PRINTF1(_L("Creating explicit resolver"));
+    if ( (err = resolver.Open(iSocketServ,KAfInet,KProtocolInetUdp,firstConn)) != KErrNone)
+        {
+        ERR_PRINTF2(_L("Failed Connecting to Host resolver with error: %D"),err);
+        firstConn.Close();
+        vTunConn.Close();
+        CloseSocketSrv();
+        SetError(err);        
+        return;
+        }       
+    
+    INFO_PRINTF1(_L("Connected to explicit Host resolver successfully"));
+               
+    TNameEntry nameEntry;
+    
+    INFO_PRINTF2(_L("Requesting to resolve hostname: %S"),&hostname);
+    
+    if ( (err = resolver.GetByName(hostname,nameEntry)) != KErrNone)
+      {
+      INFO_PRINTF3(_L("Failed to resolve the host %S with error: %D"),&hostname,err);   
+      INFO_PRINTF1(_L("Test Pass"));
+      err = KErrNone;
+      }
+    else
+      {
+      err = KErrArgument;
+      INFO_PRINTF1(_L("Host seems to be resolvable"));
+      }    
+    
+    SetError(err);
+    
+    INFO_PRINTF1(_L("Closing host resolver"));
+    resolver.Close();  
+    
+    INFO_PRINTF1(_L("Closing connections and socket serv session"));
+    firstConn.Close();
+    vTunConn.Close();
+    CloseSocketSrv();           
+    INFO_PRINTF1(_L("CDNSSuffixTestWrapper::DNSSuffixSupportTC010L - Exit"));
+    }
+
+
+/*
+ * @Test: Connection dissconnection test
+ * 
+ * Make vTun as default interface
+ * Set suffix on ethernet
+ * Open implicit resolver (assumed that it is opened on vTun)
+ * Request for name resolution (Async one)
+ * Stop the connection and observe the behaviour.(Expected, resolution should fail gracefully)
+ * With appropriate error code.
+ * 
+ */
+void CDNSSuffixTestWrapper::DNSSuffixSupportTC011L()
+    {
+    INFO_PRINTF1(_L("**********************************************************************"));
+    INFO_PRINTF1(_L("DNSSuffixSupportTC011L - DNS_Suffix_Support_011"));
+    INFO_PRINTF1(_L("**********************************************************************"));
+    
+    TPtrC hostname;
+    
+    if (!GetStringFromConfig(KSectionDNSSuffixTest011,KKeyDNSSuffixTestHostname,hostname))
+        {
+        ERR_PRINTF1(_L("Failed to read the host name from config"));    
+        SetError(KErrNotFound);
+        return;
+        }
+    else
+        {
+        INFO_PRINTF2(_L("Host name1: %S"),&hostname);       
+        }
+    
+    TFileName ethernetInterface;
+    TInt err = KErrNone;
+    err = GetFirstInterfaceNameL(ethernetInterface);
+    
+    if (KErrNone != err)
+        { 
+        ERR_PRINTF1(_L("Failed get the name of the interface (ethernet)"));    
+        SetError(KErrNotFound);
+        return;
+        }
+  
+    INFO_PRINTF1(_L("Setting suffix list on interface:"));
+    iSuffixList.Reset();
+        
+    
+    TPtrC suffixList;
+    if (!GetStringFromConfig(KSectionDNSSuffixTest011,KKeyDNSSuffixTestSuffixList,suffixList))
+        {
+        ERR_PRINTF1(_L("Failed to read suffix lists from config"));    
+        SetError(KErrNotFound);
+        return;
+        }
+    else
+        {
+        INFO_PRINTF1(_L("Suffix list:"));
+        INFO_PRINTF2(_L("%S"),&suffixList);
+        FillSuffixList(iSuffixList,suffixList);
+        }   
+    
+    if ( (err = iSocketServ.Connect()) != KErrNone)
+       {
+       ERR_PRINTF1(_L("Failed Connecting to socket server"));
+       SetError(err);
+       return;
+       }
+    
+    INFO_PRINTF1(_L("Connected to socket server successfully"));
+    
+    RConnection vTunConn; // used for vTunnel
+    RConnection firstConn; 
+    
+    err = StartConnections(iSocketServ,firstConn, vTunConn);
+    
+    if (err != KErrNone)
+      {
+      ERR_PRINTF1(_L("Failed to start connections"));
+      CloseSocketSrv();
+      SetError(err);
+      return;
+      }
+    
+    INFO_PRINTF1(_L("Connections started successfully"));
+    
+    err = SetDNSSuffixListOnInterface(iSocketServ,firstConn,ethernetInterface,iSuffixList);
+                     
+    if (KErrNone != err)
+        {
+        ERR_PRINTF3(_L("Failed Setting the suffix list on %S with errror : %D"),&ethernetInterface,err);
+        SetError(err);
+        firstConn.Close();
+        vTunConn.Close();
+        CloseSocketSrv();
+        return;
+        }
+    
+    INFO_PRINTF2(_L("Set suffix list on %S successfully"),&ethernetInterface);  
+
+    
+    // Open explcit resolver. using CDNSSuffixHostResolver    
+    CDNSSuffixHostResolver* resolver = CDNSSuffixHostResolver::NewLC(*this,iSocketServ,firstConn);
+    
+    INFO_PRINTF2(_L("Request to resolve host(async): %S"),&hostname);
+    err = resolver->ResolveL(hostname);
+    
+    INFO_PRINTF1(_L("Stoping the connection"));
+    
+    err = firstConn.Stop();
+    
+    // Note: we have to stop the wait loop in HandleCallBackL
+    iWait.Start();
+    
+    CleanupStack::PopAndDestroy();
+    
+    INFO_PRINTF1(_L("Closing connections and socket serv session"));
+    firstConn.Close();
+    vTunConn.Close();
+    CloseSocketSrv();           
+    INFO_PRINTF1(_L("CDNSSuffixTestWrapper::DNSSuffixSupportTC011L - Exit"));
+    }
+
+
+// End of file
--- a/tcpiputils/dnd/data/resolver.ini	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dnd/data/resolver.ini	Thu Aug 19 11:25:30 2010 +0300
@@ -17,6 +17,7 @@
 hostname= localhost
 
 [resolver]
+enablesuffixsupport= 1
 retries= 3
 mintime= 1
 maxtime= 30
--- a/tcpiputils/dnd/group/bld.inf	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dnd/group/bld.inf	Thu Aug 19 11:25:30 2010 +0300
@@ -65,3 +65,5 @@
 // or "support" is specified.
 
 // dndapp.mmp
+
+#include "../Test/Group/BLD.INF"
--- a/tcpiputils/dnd/inc/dnd_ini.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dnd/inc/dnd_ini.h	Thu Aug 19 11:25:30 2010 +0300
@@ -112,4 +112,6 @@
 _LIT(KLlmnrIni_Ipv4Addr, "224.0.0.251");
 _LIT(KLlmnrIni_Ipv6Addr, "ff02::fb");
 #endif
+_LIT(DND_INI_SUFFIXSUPPORT, "enablesuffixsupport"); //< enabler for new suffix support
+
 #endif
--- a/tcpiputils/dnd/inc/dns.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dnd/inc/dns.h	Thu Aug 19 11:25:30 2010 +0300
@@ -51,7 +51,7 @@
 	//
 	// MDnsSession API (methods callable by resolver)
 	// (documented in the mixin class)
-	virtual TInt NewQuery(const TDnsMessage &aQuery, TDnsServerScope aServerScope, TUint32 aFlags);
+	virtual TInt NewQuery(const TDnsMessage &aQuery, TDnsServerScope aServerScope, TUint32 aFlags, TBool aSuffixSupportEnabled);
 	virtual void CancelQuery();
 	virtual TInt DoQueryL(const TTime &aRequestTime, const EDnsQType aQType);
 	virtual TInt DoNext(TDnsMessageBuf &aReply, TInt aNext) const;
@@ -118,7 +118,14 @@
 	// "Owner" source
 	CDndDnsclient *iOwner;	//< Actual owner of the request data
 
-	TUint iNetworkId;      //< NetworkId from the request message.	
+	TUint iNetworkId;      //< NetworkId from the request message.
+	RInetSuffixList iSuffixList;	//< Container to store the domain search list on the interface where the query is sent
+	TBool iIsIncompleteHostName;	//< Flag sent on the query to identify queries that need to retried on suffixes
+	TBool iCanResolveIncompleteName;	//< Flag to confirm incomplete name without domain suffix tried for resolution as it is
+	THostName iActualQueryName;		//< To store actual query name while domain suffixes are being applied
+	TBool iPendingSuffixExist;		//< Flag set when suffixes are exhausted
+	TInt iFlowReqType;				//< Differentiates IMPLICIT/EXPLICIT
+	TBool iSuffixSupportEnabled;	//< Flag to switch ON/OFF the suffix support
 	};
 
 class TInetAddressInfo;
--- a/tcpiputils/dnd/inc/dns_sock.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dnd/inc/dns_sock.h	Thu Aug 19 11:25:30 2010 +0300
@@ -117,9 +117,13 @@
 	If the request is not already queued, action defaults to
 	normal Queue().
 	
+	Exceptionally, the request assigns new ID when an incomplete query name
+	is iterated to apply multiple domain suffices on the interface being used for sending requests
+	
 	@param aRequest to be queued
+	@param aRetryWithSuffix	flag set to identify retry requests on incomplete query names. Defaulted to FALSE
 	*/
-	void ReSend(TDnsRequest &aRequest);
+	void ReSend(TDnsRequest &aRequest, TBool aRetryWithSuffix = EFalse);
 
 	/**
 	Received a Query or unmatched Reply packet
--- a/tcpiputils/dnd/inc/engine.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dnd/inc/engine.h	Thu Aug 19 11:25:30 2010 +0300
@@ -59,6 +59,7 @@
 	TIp6Addr iLlmnrIpv6;	//< The IPv6 multicast address
 #endif
 	TUint iEDNS0;			//< Enable EDNS0, if >= KDnsMaxMessage, value is receive payload size.
+	TBool iSuffixSupportEnabled;	//< Flag to switch ON/OFF the domain suffix based name resolution
 	};
 
 class MTimeoutManager;
--- a/tcpiputils/dnd/inc/listener.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dnd/inc/listener.h	Thu Aug 19 11:25:30 2010 +0300
@@ -414,12 +414,14 @@
 	//	are going to be used.
 	// @param aFlags
 	//	modify the query operation. See KDnsModifier_* symbols.
+	// @aSuffixSupportEnabled
+	//	switch on/off the domain suffix based name resolution support
 	//
 	// @returns
 	// @li	< 0, if load failed (bad query information)
 	// @li	= 0, if query initialized (KErrNone)
 	*/
-	virtual TInt NewQuery(const TDnsMessage &aQuery, TDnsServerScope aServerScope, TUint32 aFlags) = 0;
+	virtual TInt NewQuery(const TDnsMessage &aQuery, TDnsServerScope aServerScope, TUint32 aFlags, TBool aSuffixSupportEnabled) = 0;
 	/**
 	// Cancel query activity
 	//
--- a/tcpiputils/dnd/inc/servers.h	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dnd/inc/servers.h	Thu Aug 19 11:25:30 2010 +0300
@@ -59,6 +59,7 @@
 	TUint32 iLockId;				//< Eligible severs must be from "locked" scope
 	TUint8 iLockType;				//< Locked scope level [1,,16]
 	TDnsServerScope iServerScope:8;	//< Server scope and type
+	THostName  iDomainName;         //< Domain name of the query for interface selection
 	};
 
 class MDnsServerListNotify
@@ -173,6 +174,19 @@
 	// @param	aFilter	the server filter to modify
 	*/
 	virtual void LockByAddress(const TInetAddr &aAddr, TUint32 aNid, TDnsServerFilter &aFilter) = 0;
+
+	/**
+	// @brief	Retrieves the domain suffix list set on the interface associated with the connection
+	// @param	aServerId	The id of the server associated with the connection
+	// @param	aSuffixList reference to array for reading the interface specific domain suffices
+	*/
+	virtual void InterfaceSuffixList(TInt aServerId, RInetSuffixList& aSuffixList) = 0;
+	/**
+	// @brief	Modifies the outbound query properties so that the interface associated
+	//				with the query supports the domain name of the query
+	// @param	aFilter	Reference to server properties associated with the query
+	*/
+	virtual void UpdateDomain(TDnsServerFilter &aFilter) const = 0;
 	};
 
 class CDndEngine;
--- a/tcpiputils/dnd/src/dns.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dnd/src/dns.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -285,7 +285,19 @@
 	TBool ret = FALSE;
 
 	if (iCurrentServer == 0)
+	    {
 		ret = iOwner->iServerManager.OpenList(iFilter, this) > 0;
+		// if suffix support is enabled in the resolver.ini
+		// and query request had been initiated from a implicitly connected host resolver
+		// Perform checks to find appropriate interface that can support the domain name
+		// and update the server filter for the network id it should forward its request to
+		if (iSuffixSupportEnabled && iFlowReqType == 0)
+			iOwner->iServerManager.UpdateDomain(iFilter);
+#ifdef _LOG
+		if (iNetworkId != iFilter.iLockId)
+			Log::Printf(_L("\t\tDNS session [%u] domain suffix match resulted in change of net id from %d to %d"), (TInt)this, iNetworkId, iFilter.iLockId);
+#endif
+	    }
 	iOwner->iCache->GetServerAddress(iOwner->iServerManager.NameSpace(iFilter, iCurrentServer), tmp);
 	iFilter.iServerId = iOwner->iServerManager.ServerId(tmp);
 	iCurrentServer = iOwner->iServerManager.Next(iFilter, 0);
@@ -410,7 +422,7 @@
 
 // TDndReqData::NewQuery
 // ***********************
-TInt TDndReqData::NewQuery(const TDnsMessage &aQuery, TDnsServerScope aServerScope, TUint32 aFlags)
+TInt TDndReqData::NewQuery(const TDnsMessage &aQuery, TDnsServerScope aServerScope, TUint32 aFlags, TBool aSuffixSupportEnabled)
 	{
 	iIsReqPending = FALSE;
 	iIsNewQuery = TRUE;
@@ -419,7 +431,14 @@
 	iFlags = aFlags;
 	iFilter.iServerScope = aServerScope;
 	iFilter.iServerId = 0;
-	iNetworkId = aQuery.iId;  // Get the networkId information from the Query.
+	iNetworkId = aQuery.iId;  			// Get the networkId information from the Query.
+	iFlowReqType = aQuery.iFlowRequestType; // Get the IMPLICIT/EXPLICIT differentiation from the Query
+	iSuffixSupportEnabled = aSuffixSupportEnabled; // Whether suffix support enabled in the resolver.ini
+	iIsIncompleteHostName = FALSE;		// Whether the query name is not fully qualified name
+	iCanResolveIncompleteName = TRUE;	// Flag to confirm incomplete name without domain suffix tried for resolution as it is
+	iPendingSuffixExist = FALSE;		// Identifies whether all of the available suffixes has been tried out
+	iFilter.iDomainName.FillZ();
+	iFilter.iDomainName.SetLength(0);
 
 #ifdef SYMBIAN_DNS_PUNYCODE
 	if( (aQuery.iScope & 0x80) == 0x80 )
@@ -443,16 +462,28 @@
 
 			if (aQuery.iType == KDnsRequestType_GetByName)
 				{
+				THostName queryName(query.iName);
+	
+				// if the query is a qualified name, pick the domain name from the query
+				// and update the server filter for the performing interface selection
+				TInt posOfDomainNameStart = queryName.Locate('.');
+			    if (posOfDomainNameStart != KErrNotFound)
+			        {
+			        iFilter.iDomainName = queryName.Mid(posOfDomainNameStart+1);
+			        }
+			        
 				iFilter.iLockId = aQuery.iId;
 				iFilter.iLockType = KIp6AddrScopeNetwork;
 #ifdef SYMBIAN_DNS_PUNYCODE
-				TInt err = iQuestion.SetName(query.iName);
+				TInt err = iQuestion.SetName(queryName);
 				if( err != KErrNone)
 					{
 					return err;
 					}
+				iActualQueryName.Copy(queryName);
 #else
-				iQuestion.SetName(query.iName);
+				iQuestion.SetName(queryName);
+				iActualQueryName.Copy(queryName);
 #endif // SYMBIAN_DNS_PUNYCODE
 				}
 			else
@@ -656,6 +687,10 @@
 	iQuestion.SetQType(aQType);
 	// -- only IN class queries are supported
 	iQuestion.SetQClass(EDnsQClass_IN);
+	// Possible that the there is a different interface (other than the default)
+	// that can resolve the domain name we are interested at.
+	// By this time, we would have updated the netid in the filter, if at all
+	iNetworkId = iFilter.iLockId;
 
 	if (iRecord)
 		{
@@ -687,7 +722,22 @@
 		SendResponse(KErrDndServerUnusable);
 		return 0;
 		}
-				
+
+
+	// Check to see if the query is not fully qualified
+    THostName queryName;
+    iQuestion.GetName(queryName);
+    if (queryName.Locate('.') == KErrNotFound)
+        {
+		// If query is not fully qualified, set flags to mark this for further processing
+        iIsIncompleteHostName = TRUE;
+		// Pick the domain suffix list on the interface
+	    iOwner->iServerManager.InterfaceSuffixList(iCurrentServer, iSuffixList);
+		// If count of suffices is 0, mark this, so that we do not have to perform any special processing
+        if (iSuffixList.Count() > 0)
+            iPendingSuffixExist = TRUE;
+        }
+
 	// Check in the cache first. If the record does not exist
 	// in the cache, it will be created now (empty with KErrNotFound).
 	iRecord = iOwner->iCache->FindL(
@@ -934,7 +984,10 @@
 		case EDnsRcode_FORMAT_ERROR:
 			return KErrDndFormat;
 		case EDnsRcode_SERVER_FAILURE:
-			return KErrDndServerFailure;
+			/*
+			In case the server returns the server failure, we just ignore the error code and treat it as server unusable. so that the query is sent to the other available servers for resolution. Need more reasonable solution ???-- 
+			return KErrDndServerFailure;  */
+			return KErrDndServerUnusable;
 		case EDnsRcode_NAME_ERROR:
 			return KErrDndBadName;
 		case EDnsRcode_NOT_IMPLEMENTED:
@@ -1064,6 +1117,90 @@
 		return 0;
 	ASSERT(aServer.Port() != 0);
 
+	// If the query us incomplete and we have pending domain suffix that can be applied
+	// lets try to update the query name and forward it to the next level
+    if ( iIsIncompleteHostName )
+        {
+		if ( iPendingSuffixExist )
+			{
+	        THostName queryName;
+	        iQuestion.GetName(queryName);
+	        
+	        if ( queryName.Locate('.') == KErrNotFound )
+	            {
+				// If the query does not have a '.', we understand that the query has not tried 
+				// any of the suffixes. So, lets apply the first domain suffix from the interface
+	            TInt newLength = queryName.Length() + iSuffixList[0].Length();
+	            THostName qName(queryName);
+	            qName.Append(_L("."));
+	            
+	            // If the query name + suffix name exceeds allowed limit for length (256)
+	            // truncate the suffix name while appending to the min possible length
+	            // this automagically skips from getting resolved as the buffer does not have 
+	            // enough space to append configuration msg along with it
+	            if (newLength < KMaxHostNameLength)
+	                qName.Append(iSuffixList[0]);
+	            else
+	                qName.Append(iSuffixList[0].Mid(0, KMaxHostNameLength - qName.Length()));
+	            
+	            iQuestion.SetName(qName);
+	            
+	            if ( iSuffixList.Count() == 1 )
+	                iPendingSuffixExist = FALSE;
+	                
+	            LOG(Log::Printf(_L("\t\t Query name after appending suffix = %S"), &qName));
+	            }
+	        else
+	            {
+				// As we dont have a '.', we understand that there is some domain suffix already tried
+				// and we have reached here because, we were not able to resolve with that domain suffix
+				// Now, lets figure out in sequence, as to which one was applied previously
+				// so that we shall apply the next one in the list and forward it for resolution
+	            for (TInt index=0; /*iPendingSuffixExist*/ ; index++ )
+	                {
+	                // Crop the leadng query name and '.' from the previous query and check to see
+	                // which suffix in the list was earlier applied
+
+	                TSuffixName queryNameSuffix( queryName.Mid( iActualQueryName.Length()+1 ) );
+	                TSuffixName domainSuffix(iSuffixList[index]);
+	                TInt suffixLength = domainSuffix.Length();
+	                TInt completeLength = suffixLength + iActualQueryName.Length() + 1;
+	                
+	                if (completeLength > KMaxHostNameLength)
+	                	suffixLength = KMaxHostNameLength - (iActualQueryName.Length() + 1);
+	                	
+	                if ( queryNameSuffix.Compare( domainSuffix.Mid( 0, suffixLength ) ) != KErrNone )
+	                    continue;
+	                
+                    index++;
+                    TInt newLength = iActualQueryName.Length() + iSuffixList[index].Length();
+                    THostName qName(iActualQueryName);
+                    qName.Append(_L("."));
+                    
+                    if (newLength < KMaxHostNameLength)
+                        qName.Append(iSuffixList[index]);
+                    else
+                        qName.Append(iSuffixList[index].Mid(0, KMaxHostNameLength - qName.Length()));
+                    
+                    iQuestion.SetName(qName);
+                    
+                    if ( iSuffixList.Count() == index+1 )
+                        iPendingSuffixExist = FALSE;
+
+                    LOG(Log::Printf(_L("\t\t Query name after appending suffix = %S"), &qName));
+                    break;
+	                }
+	            }
+	        }
+	    else /* if ( iCanResolveIncompleteName )*/
+	        {
+	        iQuestion.SetName(iActualQueryName);
+	        LOG(Log::Printf(_L("\t\t Query name after appending suffix = %S"), &iActualQueryName));
+	        iCanResolveIncompleteName = FALSE;
+	        }
+		}
+
+    
 	aMsg.SetLength(sizeof(TDndHeader));
 	TDndHeader &hdr = (TDndHeader &)aMsg.Header();
 	if (aServer.IsMulticast())
@@ -1175,6 +1312,17 @@
 		// If cannot use the TCP, then just use the trunctated
 		// answer as is...
 		}
+		
+	// If a incomplete query has failed to resolve after application of a domain suffix
+	// and we know that we still have some pending suffix that can be applied
+	// let us retry with the available suffices
+	LOG(Log::Printf(_L("Error from name resolution is %d"),err));
+    if( err == KErrDndBadName && iIsIncompleteHostName && (iPendingSuffixExist || iCanResolveIncompleteName))
+        {
+        iOwner->ReSend(*this, ETrue); // Set the retryWithSuffix flag to TRUE so that a new request ID is assigned
+        return 1;
+        }
+
 	//
 	// UpdateCacheData updates data in cache only, if err is KErrNone, or
 	// updates error status for some specific err codes,
--- a/tcpiputils/dnd/src/dns_sock.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dnd/src/dns_sock.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -1248,11 +1248,17 @@
 // If a request is not currently queued, this does an implicit
 // Queue. (a new id is generated).
 //
+// Exceptionally, the request assigns new ID when an incomplete query name
+// is iterated to apply multiple domain suffices on
+// the interface being used for sending requests
+//
 // @param aRequest	the request to be resent.
+// @param aRetryWithSuffix	flag set to identify retry requests 
+//							on incomplete query names. Defaulted to FALSE
 */
-void CDnsSocket::ReSend(TDnsRequest &aRequest)
+void CDnsSocket::ReSend(TDnsRequest &aRequest, TBool aRetryWithSuffix)
 	{
-	Queue(aRequest, aRequest.IsQueued() ? aRequest.Id() : -1);
+	Queue(aRequest, (!aRetryWithSuffix && aRequest.IsQueued()) ? aRequest.Id() : -1);
 	}
 
 /**
--- a/tcpiputils/dnd/src/engine.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dnd/src/engine.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -146,6 +146,8 @@
 	//
 	// Setup Configuration Parameters
 	//
+	if (!FindVar(DND_INI_RESOLVER, DND_INI_SUFFIXSUPPORT, iParams.iSuffixSupportEnabled))
+	    iParams.iSuffixSupportEnabled = TRUE;
 	iParams.iRetries = GetIniValue(DND_INI_RESOLVER, DND_INI_RETRIES, KDndIni_Retries, 1, 255);
 	iParams.iMinTime = GetIniValue(DND_INI_RESOLVER, DND_INI_MINTIME, KDndIni_MinTime, 1, KMaxTInt);
 	iParams.iMaxTime = GetIniValue(DND_INI_RESOLVER, DND_INI_MAXTIME, KDndIni_MaxTime, 1, KMaxTInt);
--- a/tcpiputils/dnd/src/resolver.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dnd/src/resolver.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -328,6 +328,7 @@
 	TUint8 iQueryStepRetries;		//< Additional retries after the primary attempt
 	TInt iSourceCount;				//< Remaining number of sources.
 	TInt iNext;						//< Non-zero, if executing Next operation
+	TBool iSuffixSupportEnabled;	//< Flag to switch on/off the domain suffix list support in name resolution
 
 	// Specify Current Query state
 
@@ -841,7 +842,7 @@
 			iId, (TInt)iCurrentQuery().iSession, (TInt)iProbe.iQType, &iProbe.iName, (TInt)iProbe.iSession->Instance())); 
 		// Use the current query as a probe starting point
 		//(void)iProbe.iSession->NewQuery(*iSession[0].iSession);
-		(void)iProbe.iSession->NewQuery(iCurrentQuery(),iSourceNow,iQueryFlags | KDnsModifier_PQ);
+		(void)iProbe.iSession->NewQuery(iCurrentQuery(),iSourceNow,iQueryFlags | KDnsModifier_PQ, iSuffixSupportEnabled);
 		
 		// initialize server (which is not tried)
 		(void)iProbe.iSession->PickDefaultServer();
@@ -1111,6 +1112,7 @@
 	ASSERT(iQueryDoneWait == 0);
 	
 	iBuffer = aMsg;
+	iSuffixSupportEnabled = cf.iSuffixSupportEnabled;
 	//
 	// A new command/query from the application
 	//
@@ -1381,7 +1383,7 @@
 			iResolver->iId, iResolver->iCurrentQuery().iSession, (TInt)iQType, &iName, (TInt)iSession->Instance()));
 		// ..if NewQuery returns an error, it will be the result of the query. Otherwise
 		// use the KErrEof as initial value.
-		iStatus = iSession->NewQuery(iResolver->iCurrentQuery(), iResolver->iSourceNow, iResolver->iQueryFlags);
+		iStatus = iSession->NewQuery(iResolver->iCurrentQuery(), iResolver->iSourceNow, iResolver->iQueryFlags, iResolver->iSuffixSupportEnabled);
 		if (iStatus == KErrNone)
 			iStatus = KErrEof;	// No content yet.
 #ifdef SYMBIAN_DNS_PUNYCODE
@@ -1628,7 +1630,7 @@
 		// queries if the filter iLockId cannot be determined due to
 		// missing interfaces. And only happens if query address was
 		// without scope id.
-		(void)iSession->NewQuery(iResolver->iCurrentQuery(), iResolver->iSourceNow, iResolver->iQueryFlags);
+		(void)iSession->NewQuery(iResolver->iCurrentQuery(), iResolver->iSourceNow, iResolver->iQueryFlags, iResolver->iSuffixSupportEnabled);
 		SendDnsQuery();
 		return;
 		}
--- a/tcpiputils/dnd/src/servers.cpp	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/dnd/src/servers.cpp	Thu Aug 19 11:25:30 2010 +0300
@@ -1,4 +1,3 @@
-// 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"
@@ -36,6 +35,7 @@
 public:
 	TName iName;				//< Name of the interface
 	TUint32 iScope[16];			//< The scope vector
+	RInetSuffixList iSuffixList;//< Structure to hold the interface specific domain search list
 	};
 
 // Item of the configured servers list
@@ -70,6 +70,10 @@
 	TInt BuildServerList();
 	void AddServerAddress(const TName &aInterface, const TInetAddr &aAddr);
 	void LockByAddress(const TInetAddr &aAddr, TUint32 aNid, TDnsServerFilter &aFilter);
+	// Retrieves the domain search list configured on the interface associated with the nominated name server
+	void InterfaceSuffixList(TInt aServerId, RInetSuffixList& aSuffixList);
+	// Performs the network id selection for the query based on the domain name on the query
+	void UpdateDomain(TDnsServerFilter &aFilter) const;
 
 private:
 	// Build and add interface entry to the list (basic operation)
@@ -93,6 +97,9 @@
 	CArrayFixFlat<TDnsServerData> *iServerList;	//< Current list of servers
 	CArrayFixFlat<TDnsInterfaceData> *iInterfaceList; //< Current list of interfaces
 	CArrayFixFlat<TDnsConfiguredServer> *iConfiguredList; //< Current list of configured servers
+	
+private:
+	TInt AddInterfaceEntry(const TSoInetIfQuery &aInfo, RSocket& aSocket);
 	};
 
 
@@ -140,18 +147,44 @@
 	delete iConfiguredList;
 	}
 
-// CDnsServerManager::AddInterfaceData
-TInt CDnsServerManager::AddInterfaceEntry(const TSoInetIfQuery &aInfo)
+// CDnsServerManager::AddInterfaceEntry
+TInt CDnsServerManager::AddInterfaceEntry(const TSoInetIfQuery &aInfo, RSocket& aSocket)
 	{
-	TRAPD(err,
-		TDnsInterfaceData &ifd = iInterfaceList->ExtendL();
-		ifd.iName = aInfo.iName;
-		for (TInt i = sizeof(ifd.iScope) / sizeof(ifd.iScope[0]); --i >= 0; )
-			ifd.iScope[i] = aInfo.iZone[i];
+    TRAPD(err,
+	TDnsInterfaceData &ifd = iInterfaceList->ExtendL();
+
+    ifd.iName = aInfo.iName;
+    for (TInt i = sizeof(ifd.iScope) / sizeof(ifd.iScope[0]); --i >= 0; )
+        ifd.iScope[i] = aInfo.iZone[i];
+    
+    if (aSocket.SetOpt(KSoInetEnumDomainSuffix, KSolInetIfCtrl) == KErrNone)
+        {
+        ifd.iSuffixList.Reset();
+        TInetSuffix data;
+        TPckg<TInetSuffix> opt(data);
+        while (aSocket.GetOpt(KSoInetNextDomainSuffix, KSolInetIfCtrl, opt) == KErrNone)
+            {
+            TSuffixName tmpBuf;
+            tmpBuf.Copy(opt().iSuffixName);
+            ifd.iSuffixList.AppendL(tmpBuf);
+            }
+        }
 		);
+		
 	return err < 0 ? err : iInterfaceList->Count() - 1;
 	}
 
+TInt CDnsServerManager::AddInterfaceEntry(const TSoInetIfQuery &aInfo)
+    {
+    TRAPD(err,
+        TDnsInterfaceData &ifd = iInterfaceList->ExtendL();
+        ifd.iName = aInfo.iName;
+        for (TInt i = sizeof(ifd.iScope) / sizeof(ifd.iScope[0]); --i >= 0; )
+            ifd.iScope[i] = aInfo.iZone[i];
+        );
+    return err < 0 ? err : iInterfaceList->Count() - 1;
+    }
+
 // CDnsServerManager::AddToInterfaceList
 // *************************************
 /**
@@ -178,13 +211,14 @@
 		if (data.iName.Compare(aInfo.iName) == 0)
 			return i;	// Interface already present in the list
 		}
+
 	//
 	// A new interface, get the scope vector
 	//
 	TPckgBuf<TSoInetIfQuery> opt;
 	opt().iName = aInfo.iName;
 	const TInt err = aSocket.GetOpt(KSoInetIfQueryByName, KSolInetIfQuery, opt);
-	return err < 0 ? err : AddInterfaceEntry(opt());
+	return err < 0 ? err : AddInterfaceEntry(opt(), aSocket);
 	}
 
 // CDnsServerManager::FindInterface
@@ -445,6 +479,32 @@
 	return 	TRUE;
 	}
 
+/**
+// @name	UpdateDomain
+// @param   aFilter the server filter
+// @param   aServer to be tested against the filter
+*/
+void CDnsServerManager::UpdateDomain(TDnsServerFilter &aFilter) const
+    {
+	LOG(Log::Printf(_L("CDnsServerManager -- RHostResolver opened on implicit connection")));
+    if ( aFilter.iDomainName.Length() )
+        {
+        TBool updatedDomain(FALSE);
+        for (TInt i = iInterfaceList->Count(); --i >= 0 && !updatedDomain; )
+            {
+            TDnsInterfaceData &id = iInterfaceList->At(i);
+            for (TInt i=0; i<id.iSuffixList.Count();i++)
+                {
+                if (aFilter.iDomainName.Find(id.iSuffixList[i]) != KErrNotFound)
+                    {
+                    aFilter.iLockId = id.iScope[aFilter.iLockType-1];
+                    updatedDomain = TRUE;
+                    break;
+                    }
+                }
+            }
+        }
+    }
 
 //
 // MDnsServerManager API
@@ -681,3 +741,22 @@
 			}
 		}
 	}
+
+/**
+// @name 	InterfaceSuffixList
+// @param	aServerId	Id of the server used for name resolution
+// @param	aSuffixList	reference to array for reading the interface specific domain suffices
+*/
+void CDnsServerManager::InterfaceSuffixList(TInt aServerId, RInetSuffixList& aSuffixList)
+    {
+    const TInt N = iServerList->Count();
+    for (TInt i = 0; i < N; ++i)
+        {
+        const TDnsServerData &server =  iServerList->At(i);
+        if (server.iServerId == aServerId)
+            {
+            aSuffixList = iInterfaceList->At(server.iInterface).iSuffixList;
+            break;
+            }
+        }
+    }
--- a/tcpiputils/networkaddressandporttranslation/te_unittest/group/te_naptunittest.mmp	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/networkaddressandporttranslation/te_unittest/group/te_naptunittest.mmp	Thu Aug 19 11:25:30 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 
--- a/tcpiputils/punycodeconv/te_punycodeconverter/group/te_punycodeconverter.mmp	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/punycodeconv/te_punycodeconverter/group/te_punycodeconverter.mmp	Thu Aug 19 11:25:30 2010 +0300
@@ -23,7 +23,7 @@
 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
@@ -31,10 +31,10 @@
 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 
--- a/tcpiputils/punycodeconv/te_unittest/group/te_unittestidna.mmp	Thu Jul 15 20:25:02 2010 +0300
+++ b/tcpiputils/punycodeconv/te_unittest/group/te_unittestidna.mmp	Thu Aug 19 11:25:30 2010 +0300
@@ -23,7 +23,7 @@
 TARGET          testidnserver.exe
 TARGETTYPE      exe
 
-SOURCEPATH      ..\src
+SOURCEPATH      ../src
 SOURCE 	    te_unittestidna.cpp
 SOURCE	    te_unittestidnaserver.cpp
 SOURCE	    te_unittestidnastepbase.cpp
@@ -33,7 +33,7 @@
 SYSTEMINCLUDE   \epoc32\include\test
 #else
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-SYSTEMINCLUDE   \epoc32\include\platform\test
+SYSTEMINCLUDE   /epoc32/include/platform/test
 #endif
 
 LIBRARY         euser.lib