# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1286975847 -10800
# Node ID c1029e558ef5fad88198e059a89c64e883941f68
# Parent  bb2423252ea3cd596490c33808f5e8f4b1adacef
Revision: 201041
Kit: 201041

diff -r bb2423252ea3 -r c1029e558ef5 esockapiextensions/internetsockets/inc/in_sock.h
--- a/esockapiextensions/internetsockets/inc/in_sock.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/esockapiextensions/internetsockets/inc/in_sock.h	Wed Oct 13 16:17:27 2010 +0300
@@ -32,71 +32,6 @@
 #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
 *
@@ -804,42 +739,6 @@
 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.
@@ -1159,27 +1058,7 @@
 	*/
 	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
@@ -1292,12 +1171,6 @@
 	*/
 	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.
@@ -1966,17 +1839,6 @@
 * @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.
 * 
diff -r bb2423252ea3 -r c1029e558ef5 linklayercontrol/networkinterfacemgr/agentprcore/inc/agentscpr.h
--- a/linklayercontrol/networkinterfacemgr/agentprcore/inc/agentscpr.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/agentprcore/inc/agentscpr.h	Wed Oct 13 16:17:27 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;
diff -r bb2423252ea3 -r c1029e558ef5 linklayercontrol/networkinterfacemgr/agentprcore/src/CAgentAdapter.cpp
--- a/linklayercontrol/networkinterfacemgr/agentprcore/src/CAgentAdapter.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/agentprcore/src/CAgentAdapter.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -148,7 +148,7 @@
 void CAgentAdapter::DisconnectAgent(TInt aReason)
     {
     if (iAgentState == EConnecting)
-        {    
+        {
         iAgent->CancelConnect();
         }
     else if (iAgentState == EReconnecting)
diff -r bb2423252ea3 -r c1029e558ef5 linklayercontrol/networkinterfacemgr/agentprcore/src/agentscpr.cpp
--- a/linklayercontrol/networkinterfacemgr/agentprcore/src/agentscpr.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/agentprcore/src/agentscpr.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -88,38 +88,48 @@
 */
 EXPORT_C CAgentSubConnectionProvider::~CAgentSubConnectionProvider()
     {
+	//check for provisioning info
 	CleanupProvisioningInfo();
-    LOG_NODE_DESTROY(KAgentSCprTag, CAgentSubConnectionProvider);
+    
 	}
 
 
 EXPORT_C void CAgentSubConnectionProvider::CleanupProvisioningInfo()
     {
-    if (iAuthenticateInProgress && AgentProvisionInfo()->AgentAdapter())
-	   {
-	   iAuthenticateInProgress = EFalse;
-	   AgentProvisionInfo()->AgentAdapter()->CancelAuthenticate();
-	   }
-
-	CAgentAdapter* agentAdapter(AgentProvisionInfo()->AgentAdapter());
-	const_cast<CAgentProvisionInfo*>(AgentProvisionInfo())->SetAgentAdapter(NULL);
-	delete agentAdapter;
-
-	// Remove ourselves from the notification handler, or delete it entirely if we own it
-	CAgentNotificationHandler* handler = AgentProvisionInfo()->AgentNotificationHandler();
-	if (handler)
-	    {
-	    if (iScprOwnedNotificationHandler)
-	        {
-	        const_cast<CAgentProvisionInfo*>(AgentProvisionInfo())->SetAgentNotificationHandler(NULL);
-	        delete handler;
-	        }
-        else
+    //The case for constructL failure is not handled here. Trivial but very important change. If node has 
+    //not received any Provision config message, then there is no point, cleaning it up. Case ID for this is ou1cimx1#508527
+    const CAgentProvisionInfo* agentProvisionInfo = AgentProvisionInfo();
+    
+    if(agentProvisionInfo)
+        {
+        if (iAuthenticateInProgress && AgentProvisionInfo()->AgentAdapter())
+           {
+           iAuthenticateInProgress = EFalse;
+           AgentProvisionInfo()->AgentAdapter()->CancelAuthenticate();
+           }
+    
+        CAgentAdapter* agentAdapter(AgentProvisionInfo()->AgentAdapter());
+        const_cast<CAgentProvisionInfo*>(AgentProvisionInfo())->SetAgentAdapter(NULL);
+        delete agentAdapter;
+    
+        // Remove ourselves from the notification handler, or delete it entirely if we own it
+        CAgentNotificationHandler* handler = AgentProvisionInfo()->AgentNotificationHandler();
+        if (handler)
             {
-            handler->Initialise(NULL);
+            if (iScprOwnedNotificationHandler)
+                {
+                const_cast<CAgentProvisionInfo*>(AgentProvisionInfo())->SetAgentNotificationHandler(NULL);
+                delete handler;
+                }
+            else
+                {
+                handler->Initialise(NULL);
+                }
             }
-	    }
-    }
+        //log node destruction, destroy in the case of perfect construction.
+        LOG_NODE_DESTROY(KAgentSCprTag, CAgentSubConnectionProvider);
+        }
+     }
 
 /**
 Mesh machine message entry point
@@ -156,7 +166,7 @@
 EXPORT_C const CAgentProvisionInfo* CAgentSubConnectionProvider::AgentProvisionInfo() const
     {
     const CAgentProvisionInfo* agentProvisionInfo = static_cast<const CAgentProvisionInfo*>(AccessPointConfig().FindExtension(CAgentProvisionInfo::TypeId()));
-	__ASSERT_DEBUG(agentProvisionInfo, User::Panic(KSpecAssert_NifManAgtPrCgnts, 1));
+	//In case of agent constructL failure there will not be any provision config, thus return NULL.
     return agentProvisionInfo;
     }
 
diff -r bb2423252ea3 -r c1029e558ef5 linklayercontrol/nullagt/TS_AgentAdapter/inc/CsdAgentTestSuite.h
--- a/linklayercontrol/nullagt/TS_AgentAdapter/inc/CsdAgentTestSuite.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/inc/CsdAgentTestSuite.h	Wed Oct 13 16:17:27 2010 +0300
@@ -26,7 +26,7 @@
 		public:
 			void InitialiseL(void);
 			CTestSuiteCsdAgt::~CTestSuiteCsdAgt() {};		  	
-		    TPtrC GetVersion(void);
+		  TPtrC GetVersion(void);
 		private:		  		
 	};
 	
diff -r bb2423252ea3 -r c1029e558ef5 linklayercontrol/tundriveragt/group/bld.inf
--- a/linklayercontrol/tundriveragt/group/bld.inf	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/**
-*   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:
-*   tundriver agent build configuration file.
-* 
-*
-*/
-
-/**
- @file bld.inf
- @internalTechnology
-*/
-
-
-
-PRJ_PLATFORMS
-
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/tundriveragtprog.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(networking/tundriveragtprog.h)
-tundriveragt.iby /epoc32/rom/include/tundriveragt.iby
-
-PRJ_TESTEXPORTS
-
-
-PRJ_MMPFILES
-
-tundriveragt.mmp
-
-
-
diff -r bb2423252ea3 -r c1029e558ef5 linklayercontrol/tundriveragt/group/networking_tundriveragt.mrp
--- a/linklayercontrol/tundriveragt/group/networking_tundriveragt.mrp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-#
-# 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: 
-#
-
-component	networking_tundriveragt
-source	\sf\os\networkingsrv\linklayercontrol\tundriveragt
-binary	\sf\os\networkingsrv\linklayercontrol\tundriveragt\group	all
-exports	\sf\os\networkingsrv\linklayercontrol\tundriveragt\group
-notes_source	\component_defs\release.src
-
-ipr E 
diff -r bb2423252ea3 -r c1029e558ef5 linklayercontrol/tundriveragt/group/tundriveragt.iby
--- a/linklayercontrol/tundriveragt/group/tundriveragt.iby	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/**
-*   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:
-*   tundriver agent iby file for ROM Builds
-* 
-*
-*/
-
-/**
- @file tundriveragt.iby
- @internalTechnology
-*/
-
-#ifndef __TUNDRIVERAGT_IBY__
-#define __TUNDRIVERAGT_IBY__
-
-#include <commdb.iby>
-
-file=ABI_DIR\DEBUG_DIR\tundriveragt.agt		System\Libs\tundriveragt.agt
-
-#endif
-
diff -r bb2423252ea3 -r c1029e558ef5 linklayercontrol/tundriveragt/group/tundriveragt.mmp
--- a/linklayercontrol/tundriveragt/group/tundriveragt.mmp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/**
-*   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:
-*   tundriver agent Build Configuration file.
-* 
-*
-*/
-
-/**
- @file tundriveragt.mmp
- @internalTechnology
-*/
-TARGET			tundriveragt.agt
-TARGETTYPE		DLL
-UID			0x10003d39 0x10008b69
-VENDORID 0x70000001
-TARGETPATH    		/system/libs
-
-NOEXPORTLIBRARY  /* Ensures that DEF file can be safely shared 
-                    for RVCT builds                            */
-                    
-SOURCEPATH		../src
-SOURCE			tundriveragent.cpp
-
-USERINCLUDE		../inc
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY			euser.lib nifman.lib 
-
-#if defined(WINS)
-deffile    /epoc32/release/wins/agent.def
-#elif defined(GCC32)
-deffile    /epoc32/release/marm/agent.def
-#else
-deffile    /epoc32/include/def/eabi/agent.def
-#endif
-START WINS
-BASEADDRESS		0x47900000
-END
-
-CAPABILITY CommDD PowerMgmt ReadDeviceData WriteDeviceData TrustedUI ProtServ NetworkControl NetworkServices LocalServices ReadUserData WriteUserData
-
-UNPAGED
-
-SMPSAFE
diff -r bb2423252ea3 -r c1029e558ef5 linklayercontrol/tundriveragt/inc/tundriveragent.h
--- a/linklayercontrol/tundriveragt/inc/tundriveragent.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-/**
-*   Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-*   All rights reserved.
-*   This component and the accompanying materials are made available
-*   under the terms of "Eclipse Public License v1.0"
-*   which accompanies this distribution, and is available
-*   at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*   
-*   Initial Contributors:
-*   Nokia Corporation - initial contribution.
-*   
-*   Contributors:
-*
-*   Description:
-*   Header file TunDriver Agent
-* 
-*
-*/
-
-/**
- @file tundriveragent.h
- @internalTechnology
-*/
-
-
-#if !defined __TUNDRIVERAGT_H__
-#define __TUNDRIVERAGT_H__
-
-#include <comms-infras/cagentbase.h>
-#include <comms-infras/agentmessages.h>
-#include "tundriveragtprog.h"
-
-#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
-#include <comms-infras/nifprvar_internal.h>
-#include <nifman_internal.h>
-#endif
-
-const TInt KMajorVersionNumber=1; //< TunDriver Agent MajorVersionNumber
-const TInt KMinorVersionNumber=0; //< TunDriver Agent MinorVersionNumber
-const TInt KBuildVersionNumber=1; //< TunDriver Agent BuildVersionNumber
-
-_LIT(KTunDriverAgentName,"tundriveragt"); //< Name of the TunDriver Agent
-
-
-class CTunDriverAgentFactory : public CNifAgentFactory
-/**
-A Factory for creating a TunDriverAgent
-
-@internalComponent  
-*/
-	{
-protected:
-	void InstallL();
-	CNifAgentBase *NewAgentL(const TDesC& aName);
-	TInt Info(TNifAgentInfo& aInfo, TInt aIndex) const;
-	};
-
-class CTunDriverAgent : public CAgentBase
-/**
-The CTunDriverAgent class owns a CAsyncCallback , which is used to control the asynchronous 
-ServiceStarted() and DisconnectComplete() call from the Agent to Nifman.
-
-@internalComponent
-*/
-	{
-public:
-	static CTunDriverAgent* NewL();
-	virtual ~CTunDriverAgent();
-protected:
-	void ConstructL();
-	CTunDriverAgent();
-public:
-
-	// from CNifAgentBase
-	void Info(TNifAgentInfo& aInfo) const;
-	void Connect(TAgentConnectType aType);
-	void Connect(TAgentConnectType aType, CStoreableOverrideSettings* aOverrideSettings);
-	void CancelConnect();
-	void Disconnect(TInt aReason);
-	void ServiceStarted(TInt aError);
-	void ConnectionComplete(TInt aError);
-	void DisconnectionComplete();
-
-	TInt GetExcessData(TDes8& aBuffer);
-	TInt Notification(TNifToAgentEventType aEvent, TAny* aInfo);
-	void GetLastError(TInt& aError);
-	TBool IsReconnect() const {return (ETrue);};
-
-	TInt IncomingConnectionReceived();
-	
-private:
-	static TInt ServiceStartedCb(TAny* aThisPtr);
-	static TInt ConnectCompleteCb(TAny* aThisPtr);
-	static TInt DisconnectCompleteCb(TAny* aThisPtr);
-
-private:
-	CAsyncCallBack iServiceStartedCallback;
-	CAsyncCallBack iConnectCompleteCallback;
-	CAsyncCallBack iDisconnectCallback;
-	TBool iConnected;
-	TBool iCancelled;
-	
-	/** An integer to keep last error code in memory. */
-	TInt  iLastErrorCode;
-	    
-	/** Boolean to define wether disconnecting operation is ongoing */
-	TBool iDisconnecting;
-	TTunDriverAgentProgress iAgentProgress;
-	};
-
-#endif // _TUNDRIVERAGT_H
diff -r bb2423252ea3 -r c1029e558ef5 linklayercontrol/tundriveragt/inc/tundriveragtprog.h
--- a/linklayercontrol/tundriveragt/inc/tundriveragtprog.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/**
-*   Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-*   All rights reserved.
-*   This component and the accompanying materials are made available
-*   under the terms of "Eclipse Public License v1.0"
-*   which accompanies this distribution, and is available
-*   at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*   
-*   Initial Contributors:
-*   Nokia Corporation - initial contribution.
-*   
-*   Contributors:
-*
-*   Description:
-*   Header file for tundriver agent
-* 
-*
-*/
-
-/**
- @file tundriveragtprog.h
- @internalTechnology
-*/
-
-#if !defined (__TUNDRIVERAGTPROG_H__)
-#define __TUNDRIVERAGTPROG_H__
-
-#include <nifvar.h>
-
-/**
-TunDriver Agent Progress
-*/
-enum TTunDriverAgentProgress
-	{
-	ETunDriverAgtIdle             = KMinAgtProgress,
-	ETunDriverAgtConnecting,      // for future reference
-	ETunDriverAgtConnected        = KConnectionOpen,
-	ETunDriverAgtDisconnecting    = KConnectionStartingClose,
-	ETunDriverAgtDisconnected     = KConnectionClosed
-	 
-	};
-#endif // __TUNDRIVERAGTPROG_H__
diff -r bb2423252ea3 -r c1029e558ef5 linklayercontrol/tundriveragt/src/tundriveragent.cpp
--- a/linklayercontrol/tundriveragt/src/tundriveragent.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,321 +0,0 @@
-/**
-*   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:
-*   Source file for tundriver agent.
-* 
-*
-*/
-
-/**
- @file tundriveragent.cpp
- @internalTechnology
-*/
-
-#include "tundriveragent.h"
-extern "C" EXPORT_C CNifAgentFactory* NewAgentFactoryL()
-/**
-Agent Factory
-First ordinal export
-
-@internalComponent
-@return an object to class CTunAgentFactory,which Perform Agent initialisation.
-*/
-	{	
-	return new(ELeave) CTunDriverAgentFactory;
-	}
-
-void CTunDriverAgentFactory::InstallL() 
-/**
-Performs a new Agent initialisation
-*/
-	{}
- 
-CNifAgentBase* CTunDriverAgentFactory::NewAgentL(const TDesC& /*aName*/)
-/**
-Creates a new TunDriverAgent to TunDriver
-
-@param aName , name of the TunDriverAgent
-@return a new instance of class TunDriverAgent
-*/
-	{
-	return CTunDriverAgent::NewL();
-	}
-
-TInt CTunDriverAgentFactory::Info(TNifAgentInfo& aInfo, TInt /*aIndex*/) const
-/**
-Retrieves information about the Agent
-
-@param aInfo,a reference of class TNifAgentInfo which contains information about TunDriverAgent
-@return KErrNone if information retrieved successfully.
-*/
-	{
-	aInfo.iName = KTunDriverAgentName;
-	aInfo.iVersion = TVersion(KMajorVersionNumber,KMinorVersionNumber,KBuildVersionNumber);
-	return KErrNone;
-	}
-
-CTunDriverAgent::CTunDriverAgent() :	iServiceStartedCallback(CActive::EPriorityStandard),
-							iConnectCompleteCallback(CActive::EPriorityStandard), 
-							iDisconnectCallback(CActive::EPriorityStandard)
-/**
-Default Constructor
-*/
-	{
-	TCallBack serviceStartedCallback(ServiceStartedCb, this);
-	iServiceStartedCallback.Set(serviceStartedCallback);
-	
-	TCallBack connectionCompleteCallback(ConnectCompleteCb, this);
-	iConnectCompleteCallback.Set(connectionCompleteCallback);
-
-	TCallBack disconnectionCompleteCallback(DisconnectCompleteCb, this);
-	iDisconnectCallback.Set(disconnectionCompleteCallback);
-	}
- 
-CTunDriverAgent::~CTunDriverAgent()
-/**
-Destructor
-*/
-	{
-	iServiceStartedCallback.Cancel();
-	iConnectCompleteCallback.Cancel();
-	iDisconnectCallback.Cancel();
-	}
-
-
-CTunDriverAgent* CTunDriverAgent::NewL()
-/**
-Static NewL function constructing an object of class CTunDriverAgent
-
-@return self,pointer to class TunDriverAgent,that owns a CAsyncCallback used to 
-control the asynchronous ServiceStarted() and DisconnectComplete() call from the Agent to TunDriver. 
-*/
-	{
-	CTunDriverAgent* self = new (ELeave) CTunDriverAgent();
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	CleanupStack::Pop();
-	return self;
-	}
-
-void CTunDriverAgent::ConstructL()
-/**
-2nd Phase Constructor
-Calls CAgentBase::ConstructL()
-construct the database and dialog processor
-*/
-	{
-	CAgentBase::ConstructL();
-	iCancelled = EFalse;
-	iAgentProgress = ETunDriverAgtIdle;
-	}
-
-void CTunDriverAgent::Info(TNifAgentInfo& aInfo) const
-/**
-Information about this Agent
-
-@param aInfo on return contains information about the agent
-*/
-	{
-	aInfo.iName = KTunDriverAgentName;
-	aInfo.iName.AppendFormat(_L("-AgentFactory[0x%08x]"), this);
-	aInfo.iVersion = TVersion(KMajorVersionNumber,KMinorVersionNumber,KBuildVersionNumber);
-	}
-
-void CTunDriverAgent::Connect(TAgentConnectType aType)
-/**
-Connects this TunDriverAgent to TunDriver
-
-@internalComponent  
-@param aType, a variable of enum TAgentConnectType describing connection types.
-*/
-	{
-	if (EAgentReconnect == aType)
-		{
-		iConnectCompleteCallback.CallBack();
-		}
-	else
-		{
-		iCancelled = EFalse;
-		iServiceStartedCallback.CallBack();		
-		}
-	}
-
-void CTunDriverAgent::Connect(TAgentConnectType aType, CStoreableOverrideSettings* /*aOverrideSettings*/)
-/**
-Connects this TunDriverAgent to TunDriver with store and retrieve commDB override sets to and from both
-streams and buffers.
-
-@param aType,a variable of enum TAgentConnectType describing connection types.
-@param aOverrideSettings, a pointer to class CStoreableOverrideSettings which store CommDB overrides.
-*/
-	{
-	Connect(aType);
-	}
-
-void CTunDriverAgent::CancelConnect()
-/**
-Cancels Connection of the TunDriverAgent to TunDriver 
-*/
-	{
-	iServiceStartedCallback.Cancel();
-	iConnectCompleteCallback.Cancel();
-	iConnected = EFalse;
-	iCancelled = ETrue;
-	}
-
-void CTunDriverAgent::Disconnect(TInt aReason)
-/**
-Disconnects from the TunDriverAgent to TunDriver with reason 
-
-@param aReason, reason for disconnection to the agent.
-*/
-	{	   
-	iLastErrorCode = aReason;
-	iDisconnectCallback.CallBack();
-	}
-
-void CTunDriverAgent::ServiceStarted(TInt /*aError*/)
-/**
-ConnectionComplete from TunDriverAgent to TunDriver
-This function is calling CallBack() function if connect is not cancelled
-
-@param aError, error number for which service needs to be started.
-*/
-	{
-	iAgentProgress = ETunDriverAgtConnecting;
-	iNotify->AgentProgress(iAgentProgress, KErrNone);
-	iNotify->ServiceStarted();
-	
-	/* if the connect has been cancelled during ServiceStarted() then we need to avoid 
-	 * calling ConnectComplete() - done in this next callback - otherwise we get a panic */
-	if (!iCancelled)
-		iConnectCompleteCallback.CallBack();
-	}
-
-void CTunDriverAgent::ConnectionComplete(TInt aError)
-/**
-Second phase of completing connection of TunDriveragent to TunDriver
-
-@param aError,error number for which connection is complete.
-*/
-    {
-    if(aError==KErrNone)
-	    {
-        iAgentProgress = ETunDriverAgtConnected;
-        iNotify->AgentProgress(ETunDriverAgtConnected, aError);
-        iNotify->ConnectComplete(aError);
-        iConnected = ETrue;
-        return;
-	    }
-	iNotify->AgentProgress(iAgentProgress,aError);
-	iNotify->ConnectComplete(aError);
-	iConnected = EFalse;
-    }
-
-void CTunDriverAgent::DisconnectionComplete()
-/**
-Completes the disconnection of TunDriveragent from TunDriver
-*/
-	{
-	
-	if ( iDisconnecting )
-	        {
-            iNotify->AgentProgress(iAgentProgress, KErrNone);
-	        }
-	    else
-	        {
-            iAgentProgress = ETunDriverAgtDisconnected;
-            iDisconnecting = ETrue;
-	        iNotify->AgentProgress(iAgentProgress, KErrNone);
-	        iNotify->DisconnectComplete();
-	        iConnected = EFalse;
-	        }
-	}
-
-TInt CTunDriverAgent::GetExcessData(TDes8& /*aBuffer*/)
-/**
-Gets excessData from TunDriveragent to TunDriver
-
-@param aBuffer, variable containing the name of TunDriveragent
-@return KErrNotSupported,error code if it does not get excess data from TunDriveragent.
-*/
-	{
-	return KErrNotSupported;
-	}
-
-
-TInt CTunDriverAgent::Notification(TNifToAgentEventType /*aEvent*/, TAny* /*aInfo*/)
- /*
-Establishes the Notification types from Nif to Agent for the TunDriveragent
-
-@param aEvent,a variable of enum TNifToAgentEventType, which contains Notification types from TunDriver to TunDriverAgent
-@param aInfo, information about the agent
-@return KErrNotSupported,error code if the notification type does not exist.
-*/
-	{
-	return KErrNone;		
-	}
-
-void CTunDriverAgent::GetLastError(TInt& aError)
-/**
-Gets the LastError
-*/
-	{
-	aError = iLastErrorCode;
-	}
-
-
-
-TInt CTunDriverAgent::IncomingConnectionReceived()
-/**
-IncomingConnectionReceived
-
-@return KErrNotSupported, error code if incoming connection is not received.
-*/
-	{
-	return KErrNotSupported;
-	}
-
-TInt CTunDriverAgent::ServiceStartedCb(TAny* aThisPtr)
-/**
- * Connection Callback static function 
- *
- */
-	{
-	CTunDriverAgent* self = (CTunDriverAgent*)aThisPtr;
-	self->ServiceStarted(KErrNone);
-	return KErrNone;
-	}
-
-TInt CTunDriverAgent::ConnectCompleteCb(TAny* aThisPtr)
-/**
- * Second callback used during connection creation
- *
- */
-    {
-	CTunDriverAgent* self = (CTunDriverAgent*) aThisPtr;
-	self->ConnectionComplete(KErrNone);
-	return KErrNone;
-    }
-
-TInt CTunDriverAgent::DisconnectCompleteCb(TAny* aThisPtr)
-/**
- * Disconnection callback static function
- *
- */
-    {
-	CTunDriverAgent* self = (CTunDriverAgent*) aThisPtr;
-	self->DisconnectionComplete();
-	return KErrNone;
-    }
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/ethernetnif/EtherPkt/CardCtl.cpp
--- a/linklayerprotocols/ethernetnif/EtherPkt/CardCtl.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/linklayerprotocols/ethernetnif/EtherPkt/CardCtl.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -328,9 +328,8 @@
 	
 	User::LeaveIfError(fileSrv.Connect());
 	User::LeaveIfError(macFile.Open(fileSrv,KEtherMacFileName,EFileRead));
-	CleanupClosePushL(macFile);
 	User::LeaveIfError(macFile.Read(macAddress,12));
-	CleanupStack::PopAndDestroy(&macFile);
+	macFile.Close();
 	fileSrv.Close();
 	controlBuf.SetLength(8);	
 	controlBuf[0] = KEthSpeed10BaseT;
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/group/MON.dat
Binary file linklayerprotocols/tundriver/group/MON.dat has changed
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/group/bld.inf
--- a/linklayerprotocols/tundriver/group/bld.inf	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/**
-*   Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-*   All rights reserved.
-*   This component and the accompanying materials are made available
-*   under the terms of "Eclipse Public License v1.0"
-*   which accompanies this distribution, and is available
-*   at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*   
-*   Initial Contributors:
-*   Nokia Corporation - initial contribution.
-*   
-*   Contributors:
-*
-*   Description:
-*   Header file for the Ip4 and Ip6 Binder Configuration.
-* 
-*
-*/
-
-/**
- @file bld.inf
- @internalTechnology
-*/
-
-
-PRJ_PLATFORMS
-
-DEFAULT
-
-PRJ_EXPORTS
-tundriver.iby                    /epoc32/rom/include/tundriver.iby
-
-
-
-
-
-PRJ_MMPFILES
-
-tundriver.mmp
-
-#include "../te_tundriver/group/bld.inf"
-
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/group/networking_tundriver.mrp
--- a/linklayerprotocols/tundriver/group/networking_tundriver.mrp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-#
-# 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: 
-#
-
-component	networking_tundriver
-source	\sf\os\networkingsrv\linklayerprotocols\tundriver
-binary	\sf\os\networkingsrv\linklayerprotocols\tundriver\group	all
-exports	\sf\os\networkingsrv\linklayerprotocols\tundriver\group
-notes_source	\component_defs\release.src
-
-ipr E 
-ipr T \sf\os\networkingsrv\linklayerprotocols\tundriver\te_tundriver
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/group/tundriver.iby
--- a/linklayerprotocols/tundriver/group/tundriver.iby	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-// 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 __TUNDRIVER_IBY__
-#define __TUNDRIVER_IBY__
-
-#include <tundriveragt.iby>
-#include <tun.iby>
-
-ECOM_PLUGIN(tundriver.dll,20027F3D.rss)
-
-#endif //__TUNDRIVER_IBY__
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/group/tundriver.mmp
--- a/linklayerprotocols/tundriver/group/tundriver.mmp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/**
-*   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:
-*   Plugin for tundriver.
-* 
-*
-*/
-
-/**
- @file tundriver.mmp
- @internalTechnology
-*/
-
-TARGET          tundriver.dll
-TARGETTYPE      PLUGIN
-UID 0x10009D8D 0x20027F3D
-VENDORID	    0x70000001                   
-                                                
-#include	    <comms-infras/commsdebugutility.mmh>
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-
-
-USERINCLUDE     ../inc
-
-SYSTEMINCLUDE   /epoc32/include
-SYSTEMINCLUDE   /epoc32/include/ecom
-SYSTEMINCLUDE   /epoc32/include/comms-infras
-SYSTEMINCLUDE   /epoc32/include/platform/comms-infras
-
-LIBRARY         euser.lib esock.lib esocksvr.lib
-LIBRARY         serverden.lib
-LIBRARY         netmeta.lib insock.lib inhook6.lib
-LIBRARY			commsfw.lib mbufmgr.lib
-LIBRARY 		agentprcore.lib
-LIBRARY 		coreproviders.lib
-LIBRARY 		commsdat.lib
-LIBRARY         simpleselectorbase.lib
-LIBRARY			nodemessages.lib
-LIBRARY			meshmachine.lib
-LIBRARY			netinterfaces.lib
-LIBRARY         factories.lib
-
-DEBUGLIBRARY		flogger.lib
-
-CAPABILITY CommDD PowerMgmt ReadDeviceData WriteDeviceData TrustedUI ProtServ NetworkControl NetworkServices LocalServices ReadUserData WriteUserData
-
-SMPSAFE
-SOURCEPATH ../src
-SOURCE tundriverflow.cpp tundriverprovision.cpp tundriverbinder.cpp tundrivermcpr.cpp tundrivermcprfactory.cpp ecom_impl.cpp
-
-START RESOURCE 0x20027F3D.rss
-	TARGET tundriver.rsc
-END
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/inc/tundriverbinder.h
--- a/linklayerprotocols/tundriver/inc/tundriverbinder.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-/**
-*   Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-*   All rights reserved.
-*   This component and the accompanying materials are made available
-*   under the terms of "Eclipse Public License v1.0"
-*   which accompanies this distribution, and is available
-*   at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*   
-*   Initial Contributors:
-*   Nokia Corporation - initial contribution.
-*   
-*   Contributors:
-*
-*   Description:
-*   Header file for the Ip4 and Ip6 Binder Configuration.
-* 
-*
-*/
-
-/**
- @file tundriverbinder.h
- @internalTechnology
-*/
-
-#ifndef _TUNDRIVERBINDER_H
-#define _TUNDRIVERBINDER_H
-
-#include <ip4_hdr.h>
-#include <ip6_hdr.h>
-#include <udp_hdr.h>
-#include <comms-infras/ss_protflow.h>
-#include <comms-infras/ss_flowbinders.h>
-#include <comms-infras/commsdebugutility.h>
-#include <nifmbuf.h>
-#include "es_protbinder.h"
-#include "tundriverflow.h"
-
-const TInt KMTU = 1500;
-
-const TInt KSpeedMetric = 0;
-
-const TUint KTUNDriverTos      = 192; // 0xC0; uses the UNUSED 7,8 MSB of Differentiated Services
-
-class CTunDriverSubConnectionFlow;
-
-class CTunDriverBinder : public CBase, public ESock::MLowerDataSender, public ESock::MLowerControl
-/**
-Common Binder for the tunnel driver binder. This binder will be inherited by IPv4 or IPv6 Binder classes.
-*/
-    {
-public:
-    virtual MLowerDataSender* Bind(ESock::MUpperDataReceiver& aUpperReceiver , ESock::MUpperControl& aUpperControl);
-    virtual void Unbind (ESock::MUpperDataReceiver& aUpperReceiver, ESock::MUpperControl& aUpperControl);
-    virtual TBool MatchesUpperControl(ESock::MUpperControl* aUpperControl) const;
-    virtual TInt Control(TUint, TUint, TDes8&);
-    void SetPort(TUint aPort);
-    TUint GetPort();
-protected:
-    CTunDriverBinder(CTunDriverSubConnectionFlow& aTunDriverSubConnectionFlow);
-protected:
-    __FLOG_DECLARATION_MEMBER;
-private:
-    CTunDriverSubConnectionFlow& iTunDriverSubConnectionFlow;
-    TUint iPort;
-    };
-
-class CTunDriverBinder4 : public CTunDriverBinder
-    {
-public:
-    static CTunDriverBinder4* NewL(CTunDriverSubConnectionFlow& aLink);
-    ~CTunDriverBinder4();
-    // from MLowerDataSender
-    virtual TInt GetName(TDes& aName);
-    virtual TInt GetConfig(TBinderConfig& aConfig);
-    MLowerDataSender* Bind(ESock::MUpperDataReceiver& aUpperReceiver , ESock::MUpperControl& aUpperControl);
-    void Unbind (ESock::MUpperDataReceiver& aUpperReceiver, ESock::MUpperControl& aUpperControl);
-    TBool MatchesUpperControl(ESock::MUpperControl* aUpperControl) const;
-    ESock::MLowerDataSender::TSendResult Send(RMBufChain& aData);
-    void StartSending();
-private:
-    CTunDriverBinder4(CTunDriverSubConnectionFlow& aLink);
-    void ConstructL();
-    void TunnelProcessing(RMBufPacket& aPacket, RMBufPacket& aRecv);
-    inline CTunDriverSubConnectionFlow* Flow();
-    virtual void DoSend();
-    virtual void DoProcess();
-    static TInt RecvCallBack(TAny* aCProtocol);
-    static TInt SendCallBack(TAny* aCProtocol);
-private:
-    TInetAddr iLocalAddress;
-    CTunDriverSubConnectionFlow& iTunDriverSubConnectionFlow;
-    ESock::MUpperDataReceiver* iUpperReceiver;
-    ESock::MUpperControl* iUpperControl;
-    RMBufPktQ iSendQ;
-    RMBufPktQ iRecvQ;
-    CAsyncCallBack* iSendCallBack;
-    CAsyncCallBack* iRecvCallBack;
-    };
-
-CTunDriverSubConnectionFlow* CTunDriverBinder4::Flow()
-    {
-    return &iTunDriverSubConnectionFlow;
-    }
-
-#ifdef IPV6SUPPORT
-class CTunDriverBinder6 : public CTunDriverBinder
-    {
-public:
-    static CTunDriverBinder6* NewL(CTunDriverSubConnectionFlow& aLink);
-    ~CTunDriverBinder6();
-    // from MLowerDataSender
-    virtual TInt GetName(TDes& aName);
-    virtual TInt GetConfig(TBinderConfig& aConfig);
-    MLowerDataSender* Bind(ESock::MUpperDataReceiver& aUpperReceiver , ESock::MUpperControl& aUpperControl);
-    void Unbind (ESock::MUpperDataReceiver& aUpperReceiver, ESock::MUpperControl& aUpperControl);
-    TBool MatchesUpperControl(ESock::MUpperControl* aUpperControl) const;
-    ESock::MLowerDataSender::TSendResult Send(RMBufChain& aData);
-    void StartSending();
-private:
-    CTunDriverBinder6(CTunDriverSubConnectionFlow& aLink);
-    void ConstructL();
-    void TunnelProcessing(RMBufPacket& aPacket, RMBufPacket& aRecv);
-    inline CTunDriverSubConnectionFlow* Flow();
-    virtual void DoSend();
-    virtual void DoProcess();
-    static TInt RecvCallBack(TAny* aCProtocol);
-    static TInt SendCallBack(TAny* aCProtocol);
-private:
-    TInetAddr iLocalAddress;
-    CTunDriverSubConnectionFlow& iTunDriverSubConnectionFlow;
-    ESock::MUpperDataReceiver* iUpperReceiver;
-    ESock::MUpperControl* iUpperControl;
-    RMBufPktQ iSendQ;
-    RMBufPktQ iRecvQ;
-    CAsyncCallBack* iSendCallBack;
-    CAsyncCallBack* iRecvCallBack;
-    };
-#endif 
-#endif // _TUNDRIVERBINDER_H
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/inc/tundriverflow.h
--- a/linklayerprotocols/tundriver/inc/tundriverflow.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-/**
-*   Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-*   All rights reserved.
-*   This component and the accompanying materials are made available
-*   under the terms of "Eclipse Public License v1.0"
-*   which accompanies this distribution, and is available
-*   at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*   
-*   Initial Contributors:
-*   Nokia Corporation - initial contribution.
-*   
-*   Contributors:
-*
-*   Description:
-*   Header file for the Default SubConnection Flow
-* 
-*
-*/
-
-
-
-/**
- @file tundriverflow.h
- @internalTechnology
-*/
-
-#ifndef TUNDRIVERFLOW_H
-#define TUNDRIVERFLOW_H
-
-#include <e32base.h>
-#include <e32std.h>
-#include <comms-infras/ss_subconnflow.h>
-#include <comms-infras/nifif.h>
-#include "tundriverbinder.h"
-#include "tundriverprovision.h"
-
-/**
-Tun Driver SubConnFlow Implementation UID
-*/
-const TInt KTunDriverFlowImplementationUid = 0x10281C3C;
-
-// String literals for protocol name used during flow binding
-_LIT8(KProtocol4, "ip");
-#ifdef IPV6SUPPORT
-_LIT8(KProtocol6, "ip6");
-#endif
-
-class CTunDriverSubConnectionFlowFactory : public ESock::CSubConnectionFlowFactoryBase
-/**
-*/
-    {
-public:
-    static CTunDriverSubConnectionFlowFactory* NewL(TAny* aConstructionParameters);
-    virtual ESock::CSubConnectionFlowBase* DoCreateFlowL(ESock::CProtocolIntfBase* aProtocolIntf, ESock::TFactoryQueryBase& aQuery);
-protected:
-    CTunDriverSubConnectionFlowFactory(TUid aFactoryId, ESock::CSubConnectionFlowFactoryContainer& aParentContainer);
-    };
-
-class CTunDriverBinder4;
-#ifdef IPV6SUPPORT
-class CTunDriverBinder6;
-#endif
-class CTunDriverSubConnectionFlow : public ESock::CSubConnectionFlowBase, public ESock::MFlowBinderControl
-/**
-*/
-    {
-public:
-    static CTunDriverSubConnectionFlow* NewL(ESock::CSubConnectionFlowFactoryBase& aFactory, const Messages::TNodeId& aSubConnId, ESock::CProtocolIntfBase* aProtocolIntf);
-
-    // from Messages::ANode (via CSubConnectionFlowBase)
-    virtual void ReceivedL(const Messages::TRuntimeCtxId& aSender, const Messages::TNodeId& aRecipient, Messages::TSignatureBase& aMessage);
-
-    // Methods called from Binders
-    void FlowDown(TInt aError, TInt aAction = MNifIfNotify::EDisconnect);
-    void Progress(TInt aStage, TInt aError);
-    const TTunDriverIp4Provision* Ip4Provision() const;
-#ifdef IPV6SUPPORT
-    const TTunDriverIp6Provision* Ip6Provision() const;
-#endif
-
-    // Functions for dealing with SCPR messages
-    void StartFlowL();
-    void CancelFlow(TInt aError);
-    void StopFlow(TInt aError);
-    void Destroy();
-    void SubConnectionGoingDown();
-    void SubConnectionError(TInt aError);
-
-    // from MFlowBinderControl
-    virtual ESock::MLowerControl* GetControlL(const TDesC8& aProtocol);
-    virtual ESock::MLowerDataSender* BindL(const TDesC8& aProtocol, ESock::MUpperDataReceiver* aReceiver, ESock::MUpperControl* aControl);
-    virtual void Unbind(ESock::MUpperDataReceiver* aReceiver, ESock::MUpperControl* aControl);
-    virtual ESock::CSubConnectionFlowBase* Flow();
-
-protected:
-    CTunDriverSubConnectionFlow(ESock::CSubConnectionFlowFactoryBase& aFactory, const Messages::TNodeId& aSubConnId, ESock::CProtocolIntfBase* aProtocolIntf);
-    virtual ~CTunDriverSubConnectionFlow();
-
-    // CSubConnectionFlowBase
-    virtual ESock::MFlowBinderControl* DoGetBinderControlL();
-
-    // Utilities for posting SCPR messages
-    void PostProgressMessage(TInt aStage, TInt aError);
-    void PostDataClientStartedMessage();
-    void PostFlowDownMessage(TInt aError, TInt aAction = MNifIfNotify::EDisconnect);
-    void MaybePostDataClientIdle();
-
-private:
-    void ProvisionConfig(const ESock::RMetaExtensionContainerC& aConfigData);
-
-private:
-    CTunDriverBinder4* iBinder4;
-#ifdef IPV6SUPPORT
-    CTunDriverBinder6* iBinder6;
-#endif
-    const CTunDriverProtoProvision* iProvision;      // cached pointer to provisioning structure in SCPR (in control side memory)
-    TInt iSavedError;                           // errors during processing of ProvisionConfig message
-    enum TMeshMachineFlowState
-            {
-            EStopped,
-            EStarting,
-            EStarted,
-            EStopping,
-            };
-    TMeshMachineFlowState iMMState;
-    __FLOG_DECLARATION_MEMBER;
-public:
-    };
-
-#endif // TUNDRIVERFLOW_H
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/inc/tundrivermcpr.h
--- a/linklayerprotocols/tundriver/inc/tundrivermcpr.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/**
-*   Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-*   All rights reserved.
-*   This component and the accompanying materials are made available
-*   under the terms of "Eclipse Public License v1.0"
-*   which accompanies this distribution, and is available
-*   at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*   
-*   Initial Contributors:
-*   Nokia Corporation - initial contribution.
-*   
-*   Contributors:
-*
-*   Description:
-*   Header file for the tun driver Mcpr configuration.
-* 
-*
-*/
-
-/**
- @file tundrivermcpr.h
- @internalTechnology
-*/
-
-#ifndef TUNDRIVERMCPR_H
-#define TUNDRIVERMCPR_H
-
-#include <comms-infras/ss_mcprnodemessages.h>
-#include "agentmcpr.h"
-#include "tundrivermcprfactory.h"
-
-
-namespace TunDriverMCprStates
-    {
-	class TSendProvision;
-    }
-
-class CTunDriverMetaConnectionProvider : public CAgentMetaConnectionProvider
-   {
-    friend class TunDriverMCprStates::TSendProvision;
-public:
-    typedef CTunDriverMetaConnectionProviderFactory FactoryType;
-
-	static CTunDriverMetaConnectionProvider* NewL(ESock::CMetaConnectionProviderFactoryBase& aFactory, const ESock::TProviderInfo& aProviderInfo);
-	virtual ~CTunDriverMetaConnectionProvider();
-
-protected:
-    CTunDriverMetaConnectionProvider(ESock::CMetaConnectionProviderFactoryBase& aFactory, const ESock::TProviderInfo& aProviderInfo);
-    void SetAccessPointConfigFromDbL();
-
-protected:
-	virtual void ReceivedL(const Messages::TRuntimeCtxId& aSender, const Messages::TNodeId& aRecipient, Messages::TSignatureBase& aMessage);
-	void ConstructL();
-    };
-
-#endif //TUNDRIVERMCPR_H
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/inc/tundrivermcprfactory.h
--- a/linklayerprotocols/tundriver/inc/tundrivermcprfactory.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/**
-*   Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-*   All rights reserved.
-*   This component and the accompanying materials are made available
-*   under the terms of "Eclipse Public License v1.0"
-*   which accompanies this distribution, and is available
-*   at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*   
-*   Initial Contributors:
-*   Nokia Corporation - initial contribution.
-*   
-*   Contributors:
-*
-*   Description:
-*   Header file for the tunnel driver mcpr factory configuration.
-* 
-*
-*/
-
-/**
- @file tundrivermcprfactory.h
- @internalTechnology
-*/
-
-#ifndef _TUNDRIVERMCPR_FACTORY_H
-#define _TUNDRIVERMCPR_FACTORY_H
-
-#include <comms-infras/ss_metaconnprov.h>
-
-class CTunDriverMetaConnectionProviderFactory : public ESock::CMetaConnectionProviderFactoryBase
-	{
-public:
-    enum { iUid = 0x10281E05 };
-	static CTunDriverMetaConnectionProviderFactory* NewL(TAny* aParentContainer);
-
-protected:
-    CTunDriverMetaConnectionProviderFactory(TUid aFactoryId, ESock::CMetaConnectionFactoryContainer& aParentContainer);
-	ESock::ACommsFactoryNodeId* DoCreateObjectL(ESock::TFactoryQueryBase& aQuery);
-	};
-
-#endif
-//_TUNDRIVERMCPR_FACTORY_H
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/inc/tundriverprovision.h
--- a/linklayerprotocols/tundriver/inc/tundriverprovision.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,185 +0,0 @@
-/**
-*   Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-*   All rights reserved.
-*   This component and the accompanying materials are made available
-*   under the terms of "Eclipse Public License v1.0"
-*   which accompanies this distribution, and is available
-*   at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*   
-*   Initial Contributors:
-*   Nokia Corporation - initial contribution.
-*   
-*   Contributors:
-*
-*   Description:
-*   Header file for tundriver binder provision.
-* 
-*
-*/
-
-
-
-/**
- @file
- @internalTechnology
-*/
-
-#ifndef TUNDRIVERPROVISION_H_
-#define TUNDRIVERPROVISION_H_
-
-#include <comms-infras/metadata.h>
-#include <in_sock.h>			
-#include <metadatabase.h>		
-
-namespace ESock
-	{
-	class CCommsDatIapView;
-	}
-
-class TTunDriverIp4Provision
-    {
-public:
-    inline TInetAddr LocalAddr() const;
-    inline TInetAddr NetMask() const;
-    inline TInetAddr BroadcastAddr() const;
-    inline TInetAddr DefGateway() const;
-    inline TInetAddr PrimaryDns() const;
-    inline TInetAddr SecondaryDns() const;
-    inline TUint32 Order() const;
-
-    inline void SetLocalAddr(TInetAddr);
-    inline void SetNetMask(TInetAddr);
-    inline void SetBroadcastAddr(TInetAddr);
-    inline void SetDefGateway(TInetAddr);
-    inline void SetPrimaryDns(TInetAddr);
-    inline void SetSecondaryDns(TInetAddr);
-    inline void SetOrder(TUint32);
-    
-private:
-    TInetAddr iLocalAddr;
-    TInetAddr iNetMask;
-    TInetAddr iBroadcastAddr;
-    TInetAddr iDefGateway;
-    TInetAddr iPrimaryDns;
-    TInetAddr iSecondaryDns;
-    TUint32 iOrder;
-    };
-
-
-inline TInetAddr TTunDriverIp4Provision::LocalAddr() const { return iLocalAddr; }
-    
-inline TInetAddr TTunDriverIp4Provision::NetMask() const { return iNetMask; }
-    
-inline TInetAddr TTunDriverIp4Provision::BroadcastAddr() const { return iBroadcastAddr; }
-    
-inline TInetAddr TTunDriverIp4Provision::DefGateway() const { return iDefGateway; }
-    
-inline TInetAddr TTunDriverIp4Provision::PrimaryDns() const { return iPrimaryDns; }
-    
-inline TInetAddr TTunDriverIp4Provision::SecondaryDns() const { return iSecondaryDns; }
-
-inline TUint32 TTunDriverIp4Provision::Order() const { return iOrder; }
-
-inline void TTunDriverIp4Provision::SetLocalAddr(TInetAddr aLocalAddr) { iLocalAddr = aLocalAddr;}
-    
-inline void TTunDriverIp4Provision::SetNetMask(TInetAddr aNetMask) { iNetMask = aNetMask;   }
-    
-inline void TTunDriverIp4Provision::SetBroadcastAddr(TInetAddr aBroadcastAddr) { iBroadcastAddr = aBroadcastAddr;   }
-    
-inline void TTunDriverIp4Provision::SetDefGateway(TInetAddr aDefGateway) { iDefGateway = aDefGateway; }
-    
-inline void TTunDriverIp4Provision::SetPrimaryDns(TInetAddr aPrimaryDns) { iPrimaryDns = aPrimaryDns; }
-    
-inline void TTunDriverIp4Provision::SetSecondaryDns(TInetAddr aSecondaryDns) { iSecondaryDns = aSecondaryDns; }
-
-inline void TTunDriverIp4Provision::SetOrder(const TUint32 aOrder) {  iOrder = aOrder; }
-
-#ifdef IPV6SUPPORT
-class TTunDriverIp6Provision
-    {
-public:
-    inline TInetAddr LocalAddr() const;
-    inline TInetAddr NetMask() const;
-    inline TInetAddr BroadcastAddr() const;
-    inline TInetAddr DefGateway() const;
-    inline TInetAddr PrimaryDns() const;
-    inline TInetAddr SecondaryDns() const;
-    inline TUint32 Order() const;
-
-    inline void SetLocalAddr(TInetAddr);
-    inline void SetNetMask(TInetAddr);
-    inline void SetBroadcastAddr(TInetAddr);
-    inline void SetDefGateway(TInetAddr);
-    inline void SetPrimaryDns(TInetAddr);
-    inline void SetSecondaryDns(TInetAddr);
-    inline void SetOrder(TUint32);
-    
-private:
-    TInetAddr iLocalAddr;
-    TInetAddr iNetMask;
-    TInetAddr iBroadcastAddr;
-    TInetAddr iDefGateway;
-    TInetAddr iPrimaryDns;
-    TInetAddr iSecondaryDns;
-    TUint32 iOrder;
-    };
-
-
-inline TInetAddr TTunDriverIp6Provision::LocalAddr() const { return iLocalAddr; }
-    
-inline TInetAddr TTunDriverIp6Provision::NetMask() const { return iNetMask; }
-    
-inline TInetAddr TTunDriverIp6Provision::BroadcastAddr() const { return iBroadcastAddr; }
-    
-inline TInetAddr TTunDriverIp6Provision::DefGateway() const { return iDefGateway; }
-    
-inline TInetAddr TTunDriverIp6Provision::PrimaryDns() const { return iPrimaryDns; }
-    
-inline TInetAddr TTunDriverIp6Provision::SecondaryDns() const { return iSecondaryDns; }
-
-inline TUint32 TTunDriverIp6Provision::Order() const { return iOrder; }
-
-inline void TTunDriverIp6Provision::SetLocalAddr(TInetAddr aLocalAddr) { iLocalAddr = aLocalAddr;}
-    
-inline void TTunDriverIp6Provision::SetNetMask(TInetAddr aNetMask) { iNetMask = aNetMask;   }
-    
-inline void TTunDriverIp6Provision::SetBroadcastAddr(TInetAddr aBroadcastAddr) { iBroadcastAddr = aBroadcastAddr;   }
-    
-inline void TTunDriverIp6Provision::SetDefGateway(TInetAddr aDefGateway) { iDefGateway = aDefGateway; }
-    
-inline void TTunDriverIp6Provision::SetPrimaryDns(TInetAddr aPrimaryDns) { iPrimaryDns = aPrimaryDns; }
-    
-inline void TTunDriverIp6Provision::SetSecondaryDns(TInetAddr aSecondaryDns) { iSecondaryDns = aSecondaryDns; }
-
-inline void TTunDriverIp6Provision::SetOrder(const TUint32 aOrder) {  iOrder = aOrder; }
-#endif
-
-class CTunDriverProtoProvision : public CBase, public Meta::SMetaData
-/**
-Main provisioning info class that aggregates specific provisioning classes.
-*/
-    {
-public:
-    enum 
-        {
-        EUid = 0x10281C3C,          
-        ETypeId = 1
-        };
-
-public:
-    void InitialiseConfigL(ESock::CCommsDatIapView* aIapView);
-    void ProvisionNetworkConfigL(ESock::CCommsDatIapView* aIapView);
-    void ProvisionIp4ConfigL(ESock::CCommsDatIapView* aIapView, TUint32 aOrder);
-#ifdef IPV6SUPPORT
-    void ProvisionIp6ConfigL(ESock::CCommsDatIapView* aIapView, TUint32 aOrder);
-#endif
-
-public:
-    TTunDriverIp4Provision iIp4Provision;
-#ifdef IPV6SUPPORT
-    TTunDriverIp6Provision iIp6Provision;
-#endif
-    
-    DATA_VTABLE
-    };
-#endif // TUNDRIVERPROVISION_H_
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/src/0x20027F3D.rss
--- a/linklayerprotocols/tundriver/src/0x20027F3D.rss	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/**
-*   Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-*   All rights reserved.
-*   This component and the accompanying materials are made available
-*   under the terms of "Eclipse Public License v1.0"
-*   which accompanies this distribution, and is available
-*   at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*   
-*   Initial Contributors:
-*   Nokia Corporation - initial contribution.
-*   
-*   Contributors:
-*
-*   Description:
-*   Header file for tundriver binder provision.
-* 
-*
-*/
-/**
- * Registry info for Tunnel Driver CFProtocol modules
- @file 0x20027F3D.RSS
- @internalComponent
-*/
-
-#include "ecom/registryinfo.rh"
-
-RESOURCE REGISTRY_INFO theInfo
-{
-dll_uid = 0x20027F3D;
-interfaces = 
-    {
-    INTERFACE_INFO
-        {
-        interface_uid = 0x10281C33;
-        implementations = 
-            {
-           	IMPLEMENTATION_INFO
-                {
-                implementation_uid = 0x10281C3C;
-                version_no = 1;
-                display_name = "tun driver Flow Factory";
-                default_data = "tundriver";
-                opaque_data = "";
-                }
-            };
-		},
-	INTERFACE_INFO
-        {
-        interface_uid =  0x10274546;
-        implementations = 
-            {
-           IMPLEMENTATION_INFO
-                {
-                implementation_uid = 0x10281E05;
-                version_no = 1;
-                display_name = "tunnel driver Meta Connection Provider Factory";
-                default_data = "tundriverMCprFactory";
-                opaque_data = "";
-                }
-            };
-        }
-    };
-}
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/src/ecom_impl.cpp
--- a/linklayerprotocols/tundriver/src/ecom_impl.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/**
-*   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:
-*   ECOM implementation for the Tunnel Driver protocol provider factories
-* 
-*
-*/
-/**
- @file ecom_impl.cpp
- @internalTechnology
-*/
-
-
-#include <ecom/implementationproxy.h>
-#include <ecom/ecom.h>
-
-#include "tundriverflow.h"
-#include "tundrivermcprfactory.h"
-
-//
-// ECOM Implementation
-//
-
-const TImplementationProxy ImplementationTable[] =
-	{   
-	IMPLEMENTATION_PROXY_ENTRY(KTunDriverFlowImplementationUid, CTunDriverSubConnectionFlowFactory::NewL),
-	IMPLEMENTATION_PROXY_ENTRY(CTunDriverMetaConnectionProviderFactory::iUid, CTunDriverMetaConnectionProviderFactory::NewL),
-   	};
-
-
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
-   {
-   aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-   return ImplementationTable;
-   }
-
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/src/tundriverbinder.cpp
--- a/linklayerprotocols/tundriver/src/tundriverbinder.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,729 +0,0 @@
-/**
-*   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:
-*   Ipv4 and Ipv6 Binder configuration source file.
-* 
-*
-*/
-
-/**
- @file tundriverbinder.cpp
- @internalTechnology
- */
-
-#include <e32std.h>
-#include <eui_addr.h>
-#include <ip4_hdr.h>
-#include <udp_hdr.h>
-#include <in_chk.h>
-#include <in_iface.h>
-#include <comms-infras/nifif.h>
-#include <in_sock.h>
-#include <flow.h>
-#include "tundriverbinder.h"
-#include "tundriverprovision.h"
-
-using namespace ESock;
-
-#ifdef _DEBUG
-_LIT8(KNif,"TunDriver");
-_LIT8(KBinder4,"Binder4");
-#ifdef IPV6SUPPORT
-_LIT8(KBinder6,"Binder6");
-#endif
-#endif
-
-//////////////////////
-// CTunDriverBinder //
-//////////////////////
-
-CTunDriverBinder::CTunDriverBinder(CTunDriverSubConnectionFlow& aTunDriverSubConnectionFlow) : iTunDriverSubConnectionFlow(aTunDriverSubConnectionFlow)
-/*
-* Default constructor for Binder Base Class.
-*/
-        {
-        }
-
-MLowerDataSender* CTunDriverBinder::Bind(MUpperDataReceiver& /*aUpperReceiver*/, MUpperControl& /*aUpperControl*/)
-/**
-* Virtual Function, Implementation is binder specific (IPv4 or IPv6)
-* If This Bind function is called, then there is an error in binding.
-* @param Not used here
-* @return NULL.
-*/
-    {
-    return NULL;
-    }
-
-void CTunDriverBinder::Unbind(MUpperDataReceiver& /*aUpperReceiver*/, MUpperControl& /*aUpperControl*/)
-/**
-* Virtual Function, Implementation is binder specific (IPv4 or IPv6)
-* @param Not used here
-*/
-    {
-    }
-
-void CTunDriverBinder::SetPort(TUint aPort)
-/**
-* CTunDriverBinder::SetPort is used to set port common for Ip4Binder and Ip6Binder
-* @param aPort
-* @return
-*/
-    {
-    iPort = aPort;
-    }
-
-TUint CTunDriverBinder::GetPort()
-/**
-* CTunDriverBinder::GetPort is used to obtain port common for Ip4Binder and Ip6Binder
-* @param Not used here
-* @return iPort
-*/
-    {
-    return iPort;
-    }
-
-TBool CTunDriverBinder::MatchesUpperControl(ESock::MUpperControl* /*aUpperControl*/) const
-/**
-* Virtual Function, Implementation is binder specific (IPv4 or IPv6)
-* If This MatchesUpperControl function is called, then there is an error in binding.
-* @param Not used here
-* @return EFalse.
-*/
-    {
-    return EFalse;
-    }
-
-CTunDriverBinder4* CTunDriverBinder4::NewL(CTunDriverSubConnectionFlow& aTunDriverSubConnectionFlow)
-/**
-* CTunDriverBinder4::NewL
-* This function is invoked by the flow. This CTunDriverBinder4 is IPv4 specific.
-* @param CTunDriverSubConnectionFlow
-* @return CTunDriverSubConnectionFlow.
-*/
-    {
-    CTunDriverBinder4* self = new (ELeave)CTunDriverBinder4(aTunDriverSubConnectionFlow);
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop(self);
-    return self;
-    }
-
-void CTunDriverBinder4::ConstructL()
-/**
-* CTunDriverBinder4::ConstructL is the second-phase constructor.
-* This function is invoked by NewL.
-* This function initializes the asynchronous callback functions for sending and receiving packets.
-* @param 
-* @return.
-*/
-    {
-    TCallBack scb(SendCallBack, this);
-    iSendCallBack = new(ELeave) CAsyncCallBack(scb, EPriorityNormal);
-
-    TCallBack rcb(RecvCallBack, this);
-    iRecvCallBack = new(ELeave) CAsyncCallBack(rcb, EPriorityNormal);
-    }
-
-CTunDriverBinder4::CTunDriverBinder4(CTunDriverSubConnectionFlow& aTunDriverSubConnectionFlow) : CTunDriverBinder(aTunDriverSubConnectionFlow),iTunDriverSubConnectionFlow(aTunDriverSubConnectionFlow)
-/**
-* CTunDriverBinder4::CTunDriverBinder4 is the default constructor.
-* This function is invoked by NewL.
-* This function initializes localaddress to 0.0.0.0.
-* @param 
-* @return.
-*/
-        {
-        __FLOG_OPEN(KNif, KBinder4);
-        iLocalAddress = KInetAddrNone;
-        __FLOG_3(_L8("CTunDriverBinder4 %08x:\tCTunDriverBinder4(CTunDriverSubConnectionFlow& %08x): iLocalAddress %08x"), this, &aTunDriverSubConnectionFlow, iLocalAddress.Address());
-        }
-
-CTunDriverBinder4::~CTunDriverBinder4()
-/**
-* CTunDriverBinder4::CTunDriverBinder4 is the default destructor.
-* This function frees the RMBufPkt queues and 
-* deletes the asynchrounous call back pointers initialized at the time of construction.
-* @param 
-* @return.
-*/
-    {
-    __FLOG_1(_L8("CTunDriverBinder4 %08x:\t~CTunDriverBinder4()"), this);
-    iRecvQ.Free();
-    iSendQ.Free();
-    delete iRecvCallBack;
-    delete iSendCallBack;
-    }
-
-MLowerDataSender* CTunDriverBinder4::Bind(MUpperDataReceiver& aUpperReceiver, MUpperControl& aUpperControl)
-/**
-* CTunDriverBinder4::Bind Binds upper CommsFramwork Protocol to this CommsFramwork Protocol.
-* @param aUpperReceiver A pointer to Upper layer Receive class
-* @param aUpperControl A pointer to Upper layer control class
-* @return this.
-*/
-    {
-    __FLOG_3(_L8("CTunDriverBinder4 %08x:\tBind(aUpperReceiver %08x, aUpperControl %08x)"), this, &aUpperReceiver, &aUpperControl);
-    iUpperReceiver = &aUpperReceiver;
-    iUpperControl = &aUpperControl;
-    return this;
-    }
-
-void CTunDriverBinder4::Unbind(MUpperDataReceiver& /*aUpperReceiver*/, MUpperControl& /*aUpperControl*/)
-/**
-* CTunDriverBinder4::UnBind UnBinds the assocication of CommsFramwork Protocol from this CommsFramwork Protocol.
-* @param aUpperReceiver A pointer to Upper layer Receive class
-* @param aUpperControl A pointer to Upper layer control class
-* @return.
-*/
-    {
-    __FLOG_1(_L8("CTunDriverBinder4 %08x:\tUnbind()"), this);
-    iUpperReceiver = NULL;
-    iUpperControl = NULL;
-    }
-
-void CTunDriverBinder4::StartSending()
-/**
-* CTunDriverBinder4::StartSending is signaled to the upperlayer that Binder is ready to send packets.
-* This function will be called only once when the interface is started.
-* @param 
-* @return.
-*/
-    {
-    __FLOG_1(_L8("CTunDriverBinder4 %08x:\tBinderReady()"), this);
-    iUpperControl->StartSending();
-    }
-
-TBool CTunDriverBinder4::MatchesUpperControl(ESock::MUpperControl* aUpperControl) const
-/**
-* CTunDriverBinder4::MatchesUpperControl returns whether this binder is associated with the
-* MUpperControl object passed as argument.
-* This function will be called while Unbinding the flow.
-* @param aUpperControl upper layer to match against
-* @return ETrue on a match else EFalse.
-*/
-    {
-    return (aUpperControl == iUpperControl);
-    }
-
-MLowerDataSender::TSendResult CTunDriverBinder4::Send(RMBufChain& aData)
-/**
-* CTunDriverBinder4::Send places the stack packet in SendQueue and breaks the call.
-* Then asynchrounous callback function is invoked.
-* @param aData MBuf chain containing data to send
-* @return ESendAccepted.
-*/
-    {
-    iSendQ.Append(aData);
-    iSendCallBack->CallBack();
-    return ESendAccepted;
-    }
-
-TInt CTunDriverBinder4::GetConfig(TBinderConfig& aConfig)
-/**
-* CTunDriverBinder4::GetConfig populates the interface IPv4 configuration information.
-* This function is invoked by the upperlayer
-* @param aConfig structure.
-* @return KErrNone if IPv4 binderconfiguration exists.
-* @return KErrNotSupported otherwise. 
-*/ 
-    {
-    TBinderConfig4* config = TBinderConfig::Cast<TBinderConfig4>(aConfig);
-
-    if(config == NULL)
-        {
-        return KErrNotSupported;
-        }
-    const TTunDriverIp4Provision* ip4Provision = Flow()->Ip4Provision();
-    // Setup config
-    iLocalAddress = ip4Provision->LocalAddr();
-    config->iInfo.iFeatures = KIfCanBroadcast | KIfCanMulticast;
-    config->iInfo.iMtu = KMTU;
-    config->iInfo.iRMtu = KMTU;
-    config->iInfo.iSpeedMetric = KSpeedMetric;
-    config->iFamily = KAfInet;
-
-    __FLOG_2(_L8("CTunDriverBinder4 %08x:\tGetConfig(): iLocalAddress %08x"), this, iLocalAddress.Address());
-    config->iAddress.SetAddress(iLocalAddress.Address());
-
-
-    TInetAddr address = ip4Provision->DefGateway();
-    config->iDefGate.SetAddress(address.Address());
-    // primary DNS, just make same as default gateway
-    address = ip4Provision->PrimaryDns();
-    config->iNameSer1.SetAddress(address.Address());
-    // secondary DNS
-    address = ip4Provision->SecondaryDns();
-    config->iNameSer2.SetAddress(address.Address());
-    return KErrNone;
-    }
-
-TInt CTunDriverBinder::Control(TUint aLevel, TUint aName, TDes8& aOption)
-/**
-* CTunDriverBinder::Control is to check wether the packet is intended for tundriver or not.
-* Called from the upperlayer to identify the special control functionality.
-* Also the sets the port number.
-* @param aLevel
-* @param aName
-* @param aOption
-* @return KErrNone if packet is intended for Ipv4 tundriver.
-* @return KErrNotSupported otherwise. 
-*/ 
-    {
-    __FLOG_3(_L("CTunDriverBinder %08x:\tControl(aLevel %x, aName %x)"), this, aLevel, aName);
-    if((aLevel == KSolInetIp) && (aName == KSoTunnelPort))
-        {
-        TInetAddr& localAddress = *(TInetAddr*) aOption.Ptr();
-        SetPort(localAddress.Port());
-        return KErrNone;
-        }
-    return KErrNotSupported;
-    }
-
-TInt CTunDriverBinder4::GetName(TDes& aName)
-/**
-* CTunDriverBinder4::GetName is to retreive the Binder4 Name.
-* Called from the upperlayer. aName is filled with Binder4 Name. 
-* @param aName
-* @return KErrNone if packet is intended for Ipv4 tundriver.
-* @return KErrNotSupported otherwise. 
-*/
-    {
-    aName.Format(_L("TunDriver4[0x%08x]"), this);
-    __FLOG_2(_L("CTunDriverBinder4 %08x:\tGetName(): %S"), this, &aName);
-    return KErrNone;
-    }
-
-TInt CTunDriverBinder4::RecvCallBack(TAny* aCProtocol)
-/**
-* CTunDriverBinder4::RecvCallBack is asynchronous callback function to send the packets to IP Layer.
-* Will be invoked whenever there is a packet in the RMBufPkt Receive Buffer.
-* @param aCProtocol contains the this object.
-* @return KErrNone 
-*/
-    {
-    ((CTunDriverBinder4*)aCProtocol)->DoProcess();
-    return KErrNone;
-    }
-
-TInt CTunDriverBinder4::SendCallBack(TAny* aCProtocol)
-/**
-* CTunDriverBinder4::SendCallBack is asynchronous callback function to send the packets to IP Layer.
-* Will be invoked whenever there is a packet in the RMBufPkt Send Buffer.
-* DoSend will process the packets if required and place the packet in the RMBufPkt Receive Queue 
-* @param aCProtocol contains the this object.
-* @return KErrNone 
-*/
-    {
-    ((CTunDriverBinder4*)aCProtocol)->DoSend();
-    return KErrNone;
-    }
-
-void CTunDriverBinder4::DoSend()
-/**
-* CTunDriverBinder4::DoSend will retreive the packet from RMBufPkt Send Buffer.
-* Process the packets if required and puts the packet back in Receive Buffer.
-* Will be invoked by CTunDriverBinder4::SendCallback
-* @param 
-* @return  
-*/
-    {
-    RMBufPacket send;
-    RMBufPacket recv;
-    while (iSendQ.Remove(send))
-        {
-        TunnelProcessing(send,recv);
-        iRecvQ.Append(recv);
-        iRecvCallBack->CallBack();
-        send.Free();
-        }
-    }
-
-void CTunDriverBinder4::DoProcess()
-/**
-* CTunDriverBinder4::DoProcess will retreive the packet from RMBufPkt Receive Buffer.
-* send the packet to IP Layer for processing the packet.
-* Will be invoked by CTunDriverBinder4::ReceiveCallback
-* @param 
-* @return  
-*/
-    {
-    RMBufPacket packet;
-    while (iRecvQ.Remove(packet))
-        {
-        iUpperReceiver->Process(packet);
-        }
-    }
-
-void CTunDriverBinder4::TunnelProcessing(RMBufPacket& aPacket, RMBufPacket& aRecv )
-/**
-* CTunDriverBinder4::TunnelProcessing will encapsulate with IPv4 Header if the packet is to be tunneled.
-* IP Number and port number will be configure by TUN Client.
-* If the IPPacket contains TOS Option set with 192, Packet is encapsulated else packet will be send as is.
-* Will be invoked by CTunDriverBinder4::DoSend
-* @param aPacket contains the raw packet.
-* @param aRecv will contain the payload and the encapsulated IPv4 Header.
-* @return  
-*/
-    {
-    TInt  ret;
-    TUint origPktLen;
-
-    TInet6HeaderIP4* lip4 = (TInet6HeaderIP4*) aPacket.First()->Next()->Ptr();
-    TInt outerHdrLen = TInet6HeaderIP4::MinHeaderLength()
-                       + TInet6HeaderUDP::MinHeaderLength();
-    
-    if((lip4->TOS() & KTUNDriverTos) == KTUNDriverTos)
-        {
-        RMBufChain outerHdr;
-        aRecv.Assign(aPacket);
-        RMBufPktInfo *info = aRecv.Unpack();
-        aRecv.SetInfo(info);
-        
-        origPktLen = aRecv.Length();
-        TRAP(ret, outerHdr.AllocL(outerHdrLen));
-        if (ret != KErrNone)
-            {
-            RDebug::Printf("\nVirtual tunnel nif: tunnel processing: Error in Allocating the outer IP header.");
-            aRecv.Free();
-            }
-
-        aRecv.Prepend(outerHdr);
-        info->iLength += outerHdrLen;
-
-        TInet6Checksum<TInet6HeaderUDP> outerUdp(aRecv, 20);
-        if (outerUdp.iHdr == NULL)
-            {
-            RDebug::Printf("\nVirtual tunnel nif: tunnel processing: Error in Allocating the outer UDP header.");
-            aRecv.Free();
-            }
-
-        outerUdp.iHdr->SetSrcPort(GetPort());
-        outerUdp.iHdr->SetDstPort(GetPort());
-        outerUdp.iHdr->SetLength(origPktLen + TInet6HeaderUDP::MinHeaderLength());
-        outerUdp.iHdr->SetChecksum(0);       // Compute checksum
-
-        TInet6Checksum<TInet6HeaderIP4> outerIP(aRecv);
-        outerIP.iHdr->Init();
-        outerIP.iHdr->SetHeaderLength(TInet6HeaderIP4::MinHeaderLength());
-        outerIP.iHdr->SetTotalLength(origPktLen + outerHdrLen);
-        outerIP.iHdr->SetTOS(1);
-        outerIP.iHdr->SetProtocol(KProtocolInetUdp);
-        outerIP.iHdr->SetSrcAddr(iLocalAddress.Address()) ;
-        outerIP.iHdr->SetDstAddr(iLocalAddress.Address());
-        outerIP.ComputeChecksum();
-        aRecv.Pack();
-        }
-    }
-#ifdef IPV6SUPPORT
-CTunDriverBinder6* CTunDriverBinder6::NewL(CTunDriverSubConnectionFlow& aTunDriverSubConnectionFlow)
-/**
-* CTunDriverBinder6::NewL
-* This function is invoked by the flow. This CTunDriverBinder4 is IPv4 specific.
-* @param CTunDriverSubConnectionFlow
-* @return CTunDriverSubConnectionFlow.
-*/
-    {
-    CTunDriverBinder6* self = new (ELeave)CTunDriverBinder6(aTunDriverSubConnectionFlow);
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop(self);
-    return self;
-    }
-
-void CTunDriverBinder6::ConstructL()
-/**
-* CTunDriverBinder4::ConstructL is the second-phase constructor.
-* This function is invoked by NewL.
-* This function initializes the asynchronous callback functions for sending and receiving packets.
-* @param 
-* @return.
-*/
-    {
-    TCallBack scb(SendCallBack, this);
-    iSendCallBack = new(ELeave) CAsyncCallBack(scb, EPriorityNormal);
-
-    TCallBack rcb(RecvCallBack, this);
-    iRecvCallBack = new(ELeave) CAsyncCallBack(rcb, EPriorityNormal);
-    }
-
-CTunDriverBinder6::CTunDriverBinder6(CTunDriverSubConnectionFlow& aTunDriverSubConnectionFlow) : CTunDriverBinder(aTunDriverSubConnectionFlow),iTunDriverSubConnectionFlow(aTunDriverSubConnectionFlow)
-/**
-* CTunDriverBinder4::CTunDriverBinder4 is the default constructor.
-* This function is invoked by NewL.
-* This function initializes localaddress to 0.0.0.0.
-* @param 
-* @return.
-*/        
-    {
-    __FLOG_OPEN(KNif, KBinder6);
-    iLocalAddress.SetAddress(KInet6AddrNone);
-    __FLOG_3(_L8("CTunDriverBinder6 %08x:\tCTunDriverBinder6(CTunDriverSubConnectionFlow& %08x): iLocalAddress %08x"), this, &aTunDriverSubConnectionFlow, iLocalAddress.Address());
-    }
-
-CTunDriverBinder6::~CTunDriverBinder6()
-/**
-* CTunDriverBinder4::CTunDriverBinder4 is the default destructor.
-* This function frees the RMBufPkt queues and 
-* deletes the asynchrounous call back pointers initialized at the time of construction.
-* @param 
-* @return.
-*/
-    {
-    __FLOG_1(_L8("CTunDriverBinder6 %08x:\t~CTunDriverBinder6()"), this);
-    iRecvQ.Free();
-    iSendQ.Free();
-    delete iRecvCallBack;
-    delete iSendCallBack;
-    }
-
-MLowerDataSender* CTunDriverBinder6::Bind(MUpperDataReceiver& aUpperReceiver, MUpperControl& aUpperControl)
-/**
-* CTunDriverBinder4::Bind Binds upper CommsFramwork Protocol to this CommsFramwork Protocol.
-* @param aUpperReceiver A pointer to Upper layer Receive class
-* @param aUpperControl A pointer to Upper layer control class
-* @return this.
-*/
-    {
-    __FLOG_3(_L8("CTunDriverBinder6 %08x:\tBind(aUpperReceiver %08x, aUpperControl %08x)"), this, &aUpperReceiver, &aUpperControl);
-    iUpperReceiver = &aUpperReceiver;
-    iUpperControl = &aUpperControl;
-    return this;
-    }
-
-void CTunDriverBinder6::Unbind(MUpperDataReceiver& /*aUpperReceiver*/, MUpperControl& /*aUpperControl*/)
-/**
-* CTunDriverBinder4::UnBind UnBinds the assocication of CommsFramwork Protocol from this CommsFramwork Protocol.
-* @param aUpperReceiver A pointer to Upper layer Receive class
-* @param aUpperControl A pointer to Upper layer control class
-* @return.
-*/
-    {
-    __FLOG_1(_L8("CTunDriverBinder6 %08x:\tUnbind()"), this);
-    iUpperReceiver = NULL;
-    iUpperControl = NULL;
-    }
-
-void CTunDriverBinder6::StartSending()
-/**
-* CTunDriverBinder4::StartSending is signaled to the upperlayer that Binder is ready to send packets.
-* This function will be called only once when the interface is started.
-* @param 
-* @return.
-*/
-    {
-    __FLOG_1(_L8("CTunDriverBinder6 %08x:\tBinderReady()"), this);
-    iUpperControl->StartSending();
-    }
-
-TBool CTunDriverBinder6::MatchesUpperControl(ESock::MUpperControl* aUpperControl) const
-/**
-* CTunDriverBinder4::MatchesUpperControl returns whether this binder is associated with the
-* MUpperControl object passed as argument.
-* This function will be called while Unbinding the flow.
-* @param aUpperControl upper layer to match against
-* @return ETrue on a match else EFalse.
-*/
-    {
-    return (aUpperControl == iUpperControl);
-    }
-
-MLowerDataSender::TSendResult CTunDriverBinder6::Send(RMBufChain& aData)
-/**
-* CTunDriverBinder4::Send places the stack packet in SendQueue and breaks the call.
-* Then asynchrounous callback function is invoked.
-* @param aData MBuf chain containing data to send
-* @return ESendAccepted.
-*/
-    {
-    iSendQ.Append(aData);
-    iSendCallBack->CallBack();
-    return ESendAccepted;
-    }
-
-TInt CTunDriverBinder6::GetConfig(TBinderConfig& aConfig)
-/**
-* CTunDriverBinder4::GetConfig populates the interface IPv4 configuration information.
-* This function is invoked by the upperlayer
-* @param aConfig structure.
-* @return KErrNone if IPv4 binderconfiguration exists.
-* @return KErrNotSupported otherwise. 
-*/
-    {
-    TBinderConfig6* config = TBinderConfig::Cast<TBinderConfig6>(aConfig);
-
-    if(config == NULL)
-        {
-        return KErrNotSupported;
-        }
-    const TTunDriverIp6Provision* ip6Provision = Flow()->Ip6Provision();
-    // Setup config
-    iLocalAddress = ip6Provision->LocalAddr();
-    config->iInfo.iFeatures = KIfCanBroadcast | KIfCanMulticast;
-    config->iInfo.iMtu = KMTU;
-    config->iInfo.iRMtu = KMTU;
-    config->iInfo.iSpeedMetric = KSpeedMetric;
-    config->iFamily = KAfInet6;
-
-    __FLOG_2(_L8("CTunDriverBinder6 %08x:\tGetConfig(): iLocalAddress %08x"), this, iLocalAddress.Address());
-
-    // primary DNS, just make same as default gateway
-    TInetAddr address = ip6Provision->PrimaryDns();
-    config->iNameSer1 = address;
-    // secondary DNS
-    address = ip6Provision->SecondaryDns();
-    config->iNameSer2 = address;
-    return KErrNone;
-    }
-
-TInt CTunDriverBinder6::GetName(TDes& aName)
-/**
-* CTunDriverBinder4::GetName is to retreive the Binder4 Name.
-* Called from the upperlayer. aName is filled with Binder4 Name. 
-* @param aName
-* @return KErrNone if packet is intended for Ipv4 tundriver.
-* @return KErrNotSupported otherwise. 
-*/
-    {
-    aName.Format(_L("TunDriver6[0x%08x]"), this);
-    __FLOG_2(_L("CTunDriverBinder6 %08x:\tGetName(): %S"), this, &aName);
-    return KErrNone;
-    }
-
-TInt CTunDriverBinder6::RecvCallBack(TAny* aCProtocol)
-/**
-* CTunDriverBinder4::RecvCallBack is asynchronous callback function to send the packets to IP Layer.
-* Will be invoked whenever there is a packet in the RMBufPkt Receive Buffer.
-* @param aCProtocol contains the this object.
-* @return KErrNone 
-*/
-    {
-    ((CTunDriverBinder6*)aCProtocol)->DoProcess();
-    return KErrNone;
-    }
-
-TInt CTunDriverBinder6::SendCallBack(TAny* aCProtocol)
-/**
-* CTunDriverBinder4::SendCallBack is asynchronous callback function to send the packets to IP Layer.
-* Will be invoked whenever there is a packet in the RMBufPkt Send Buffer.
-* DoSend will process the packets if required and place the packet in the RMBufPkt Receive Queue 
-* @param aCProtocol contains the this object.
-* @return KErrNone 
-*/
-    {
-    ((CTunDriverBinder6*)aCProtocol)->DoSend();
-    return KErrNone;
-    }
-
-void CTunDriverBinder6::DoSend()
-/**
-* CTunDriverBinder4::DoSend will retreive the packet from RMBufPkt Send Buffer.
-* Process the packets if required and puts the packet back in Receive Buffer.
-* Will be invoked by CTunDriverBinder4::SendCallback
-* @param 
-* @return  
-*/
-    {
-    RMBufPacket send;
-    RMBufPacket recv;
-    while (iSendQ.Remove(send))
-        {
-        TunnelProcessing(send,recv);
-        iRecvQ.Append(recv);
-        iRecvCallBack->CallBack();
-        send.Free();
-        }
-    }
-
-void CTunDriverBinder6::DoProcess()
-/**
-* CTunDriverBinder4::DoProcess will retreive the packet from RMBufPkt Receive Buffer.
-* send the packet to IP Layer for processing the packet.
-* Will be invoked by CTunDriverBinder4::ReceiveCallback
-* @param 
-* @return  
-*/
-    {
-    RMBufPacket packet;
-    while (iRecvQ.Remove(packet))
-        {
-        iUpperReceiver->Process(packet);
-        }
-    }
-
-void CTunDriverBinder6::TunnelProcessing(RMBufPacket& aPacket, RMBufPacket& aRecv )
-/**
-* CTunDriverBinder4::TunnelProcessing will encapsulate with IPv4 Header if the packet is to be tunneled.
-* IP Number and port number will be configure by TUN Client.
-* If the IPPacket contains TOS Option set with 192, Packet is encapsulated else packet will be send as is.
-* Will be invoked by CTunDriverBinder4::DoSend
-* @param aPacket contains the raw packet.
-* @param aRecv will contain the payload and the encapsulated IPv4 Header.
-* @return  
-*/
-    {
-    TInt  ret;
-    TUint origPktLen;
-
-    TInet6HeaderIP* lip6 = (TInet6HeaderIP*) aPacket.First()->Next()->Ptr();
-    TInt outerHdrLen = TInet6HeaderIP4::MinHeaderLength()
-                       + TInet6HeaderUDP::MinHeaderLength();
-    
-    if((lip6->HopLimit() & KTUNDriverTos) == KTUNDriverTos)        
-        {
-        RMBufChain outerHdr;
-        aRecv.Assign(aPacket);
-        RMBufPktInfo *info = aRecv.Unpack();
-        aRecv.SetInfo(info);
-        
-        origPktLen = aRecv.Length();
-        TRAP(ret, outerHdr.AllocL(outerHdrLen));
-        if (ret != KErrNone)
-            {
-            RDebug::Printf("\nVirtual tunnel nif: tunnel processing: Error in Allocating the outer IP header.");
-            aRecv.Free();
-            }
-
-        TInet6HeaderIP *hdrBuf = (TInet6HeaderIP*) outerHdr.First()->Buffer();
-        aRecv.Prepend(outerHdr);
-        info->iLength += outerHdrLen;
-
-        TInet6Checksum<TInet6HeaderUDP> outerUdp(aRecv, 20);
-        if (outerUdp.iHdr == NULL)
-            {
-            RDebug::Printf("\nVirtual tunnel nif: tunnel processing: Error in Allocating the outer UDP header.");
-            aRecv.Free();
-            }
-
-        outerUdp.iHdr->SetSrcPort(GetPort());
-        outerUdp.iHdr->SetDstPort(GetPort());
-        outerUdp.iHdr->SetLength(origPktLen + TInet6HeaderUDP::MinHeaderLength());
-        outerUdp.iHdr->SetChecksum(0);
-
-        TInet6Checksum<TInet6HeaderIP> outerIP(aRecv);
-        outerIP.iHdr->Init();
-        outerIP.iHdr->SetHopLimit(1);
-        outerIP.iHdr->SetNextHeader(KProtocolInetUdp);
-        outerIP.iHdr->SetSrcAddr(iLocalAddress.Ip6Address());
-        outerIP.iHdr->SetDstAddr(iLocalAddress.Ip6Address());
-        aRecv.Pack();
-        }
-    }
-    
-CTunDriverSubConnectionFlow* CTunDriverBinder6::Flow()
-    {
-    return &iTunDriverSubConnectionFlow;
-    }
-
-#endif
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/src/tundriverflow.cpp
--- a/linklayerprotocols/tundriver/src/tundriverflow.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,510 +0,0 @@
-/**
-*   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:
-*   Flow implementation for data path for tunnel driver.
-* 
-*
-*/
-
-/**
- @file tundriverflow.cpp
- @internalTechnology
-*/
-
-#include <e32std.h>
-#include <ecom/ecom.h>
-#include <ecom/implementationproxy.h>
-#include <elements/nm_messages_base.h>
-#include <elements/nm_messages_child.h>
-
-#include "ss_subconnflow.h"
-#include <comms-infras/ss_log.h>
-#include "tundriverflow.h"
-#include "tundriverbinder.h"
-#include "tundriverprovision.h"
-
-using namespace Messages;
-using namespace MeshMachine;
-using namespace ESock;
-
-#ifdef SYMBIAN_TRACE_ENABLE
-_LIT8(KNif,"tundriver");
-#endif
-
-CTunDriverSubConnectionFlowFactory* CTunDriverSubConnectionFlowFactory::NewL(TAny* aConstructionParameters)
-/**
-* CTunDriverSubConnectionFlowFactory::NewL constructs a Default SubConnection Flow Factory
-* @param aConstructionParameters construction data passed by ECOM
-* @returns pointer to a constructed factory object.
-*/
-    {
-    CTunDriverSubConnectionFlowFactory* ptr = new (ELeave) CTunDriverSubConnectionFlowFactory(TUid::Uid(KTunDriverFlowImplementationUid), *(reinterpret_cast<CSubConnectionFlowFactoryContainer*>(aConstructionParameters)));
-    return ptr;
-    }
-
-
-CTunDriverSubConnectionFlowFactory::CTunDriverSubConnectionFlowFactory(TUid aFactoryId, CSubConnectionFlowFactoryContainer& aParentContainer)
-:   CSubConnectionFlowFactoryBase(aFactoryId, aParentContainer)
-/**
-* CTunDriverSubConnectionFlowFactory::CTunDriverSubConnectionFlowFactory is a Default SubConnection Flow Factory
-* @param aFactoryId ECOM Implementation Id
-* @param aParentContainer Object Owner
-*/
-    {
-    }
-
-CSubConnectionFlowBase* CTunDriverSubConnectionFlowFactory::DoCreateFlowL(CProtocolIntfBase* aProtocolIntf, TFactoryQueryBase& aQuery)
-/**
-* CTunDriverSubConnectionFlowFactory::DoCreateFlowL will create SubConnection Flow.
-* @param aFactoryId ECOM Implementation Id
-* @param aParentContainer Object Owner
-*/
-    {
-    const TDefaultFlowFactoryQuery& query = static_cast<const TDefaultFlowFactoryQuery&>(aQuery);
-    return CTunDriverSubConnectionFlow::NewL(*this, query.iSCprId, aProtocolIntf);
-    }
-
-CTunDriverSubConnectionFlow::CTunDriverSubConnectionFlow(CSubConnectionFlowFactoryBase& aFactory, const TNodeId& aSubConnId, CProtocolIntfBase* aProtocolIntf)
-:   CSubConnectionFlowBase(aFactory, aSubConnId, aProtocolIntf)
-/**
-* CTunDriverSubConnectionFlow::CTunDriverSubConnectionFlow is a Default Constructor
-* @param aFactoryId ECOM Implementation Id
-* @param aParentContainer Object Owner
-*/
-    {
-    __FLOG_OPEN(KCFNodeTag, KNif);
-    LOG_NODE_CREATE(KNif, CTunDriverSubConnectionFlow);
-    }
-
-CTunDriverSubConnectionFlow::~CTunDriverSubConnectionFlow()
-/**
-* CTunDriverSubConnectionFlowFactory::~CTunDriverSubConnectionFlow is a Default destructor
-* @param aFactoryId ECOM Implementation Id
-* @param aParentContainer Object Owner
-*/
-    {
-    delete iBinder4;
-    iBinder4 = NULL;
-#ifdef IPV6SUPPORT
-    delete iBinder6;
-    iBinder6 = NULL;
-#endif
-    LOG_NODE_DESTROY(KNif, CTunDriverSubConnectionFlow);
-    __FLOG_CLOSE;
-    }
-
-CTunDriverSubConnectionFlow* CTunDriverSubConnectionFlow::NewL(CSubConnectionFlowFactoryBase& aFactory, const TNodeId& aSubConnId, CProtocolIntfBase* aProtocolIntf)
-/**
-* CTunDriverSubConnectionFlowFactory::NewL is a first phase Constructor.
-* @param aFactoryId ECOM Implementation Id
-* @param aParentContainer Object Owner
-*/
-    {
-    CTunDriverSubConnectionFlow* flow = new (ELeave) CTunDriverSubConnectionFlow(aFactory, aSubConnId, aProtocolIntf);
-    return flow;
-    }
-
-void CTunDriverSubConnectionFlow::FlowDown(TInt aError, TInt aAction /*= MNifIfNotify::EDisconnect*/)
-/**
-* CTunDriverSubConnectionFlowFactory::FlowDown will post the message.
-* @param aError obtained from the upper CF Layer.
-* @param aAction and the action message for aError.
-*/
-    {
-    PostFlowDownMessage(aError, aAction);
-    }
-
-void CTunDriverSubConnectionFlow::Progress(TInt aStage, TInt aError)
-/**
-* CTunDriverSubConnectionFlowFactory::Progress Binder requesting a Progress() message be sent to SCPR
-* @param aStage and the action message for aError.
-* @param aError obtained from the upper CF Layer.
-*/
-    {
-    PostProgressMessage(aStage, aError);
-    }
-
-const TTunDriverIp4Provision* CTunDriverSubConnectionFlow::Ip4Provision() const
-/**
-* CTunDriverSubConnectionFlowFactory::Ip4Provision
-* @param 
-* @return iIp4Provision.
-*/
-    {
-    ASSERT(iProvision);
-    return &iProvision->iIp4Provision;
-    }
-
-#ifdef IPV6SUPPORT
-const TTunDriverIp6Provision* CTunDriverSubConnectionFlow::Ip6Provision() const
-/**
-* CTunDriverSubConnectionFlowFactory::Ip6Provision
-* @param 
-* @return iIp6Provision.
-*/
-    {
-    ASSERT(iProvision);
-    return &iProvision->iIp6Provision;
-    }
-#endif
-
-//-=========================================================
-// Messages::ANode methods
-//-=========================================================
-
-#define __FRAMEWORK_PRODUCTION_ERRORHANDLING(c,p) (void)((c)||(p,0))
-void CTunDriverSubConnectionFlow::ReceivedL(const TRuntimeCtxId& aSender, const TNodeId& aRecipient, TSignatureBase& aMessage)
-/**
-* CTunDriverSubConnectionFlowFactory::ReceivedL called on incoming SCPR Messages.
-* CTunDriverSubConnectionFlow functions will be called Based on message type
-* @param aCFMessage message base
-*/
-    {
-    #ifdef __FLOG_ACTIVE
-        TAny* senderAddr = NULL;
-        const TNodeId* senderNodeId = address_cast<TNodeId>(&aSender);
-        __ASSERT_DEBUG(senderNodeId!=NULL,User::LeaveIfError(KErrCorrupt));
-        senderAddr = senderNodeId->Ptr();
-        __FLOG_4(_L8("CTunDriverSubConnectionFlow(%x):\tReceivedL() Sender Id: %x, Msg Realm: %X, Msg ID: %d"), this, senderAddr, aMessage.MessageId().Realm(), aMessage.MessageId().MessageId());
-    #endif
-
-    CSubConnectionFlowBase::ReceivedL(aSender, aRecipient, aMessage);
-    if (aMessage.IsMessage<TEBase::TError>())
-        {
-        SubConnectionError(static_cast<TEBase::TError&>(aMessage).iValue);
-        }
-    else if (TEChild::ERealmId == aMessage.MessageId().Realm())
-        {
-        switch (aMessage.MessageId().MessageId())
-            {
-        case TEChild::TCancel::EId:
-            CancelFlow(KErrCancel);
-        case TEChild::TDestroy::EId :
-            Destroy();
-            break;
-        default:
-            ASSERT(EFalse);
-            }
-        }
-    else if (TCFDataClient::ERealmId == aMessage.MessageId().Realm())
-        {
-        switch (aMessage.MessageId().MessageId())
-            {
-        case TCFDataClient::TStart::EId :
-            StartFlowL();
-            break;
-        case TCFDataClient::TStop::EId :
-            StopFlow(static_cast<TCFDataClient::TStop&>(aMessage).iValue);
-            break;
-        case TCFDataClient::TProvisionConfig::EId:
-            ProvisionConfig(static_cast<TCFDataClient::TProvisionConfig&>(aMessage).iConfig);
-            break;
-        case TCFDataClient::TBindTo::EId:
-            {
-            TCFDataClient::TBindTo& bindToReq = message_cast<TCFDataClient::TBindTo>(aMessage);
-            __FRAMEWORK_PRODUCTION_ERRORHANDLING(bindToReq.iNodeId.IsNull(),User::LeaveIfError(KErrNotSupported));
-            RClientInterface::OpenPostMessageClose(Id(), aSender, TCFDataClient::TBindToComplete().CRef());
-            }
-            break;
-        default:
-            ASSERT(EFalse);
-            }
-        }
-    else
-        {
-        User::Leave(KErrNotSupported);
-        }
-    }
-
-void CTunDriverSubConnectionFlow::StartFlowL()
-/**
-* CTunDriverSubConnectionFlowFactory::StartFlowL starts the flow on receiving the message TStart.
-* This function is called from CTunDriverSubConnectionFlowFactory::ReceivedL 
-*/
-    {
-    __FLOG(_L8("CTunDriverSubConnectionFlow:\tStartFlowL()"));
-    
-    if(iMMState == EStarted)
-        {
-        //Flow can be started multiple times.
-        //For example a start may fail on an upper layer in which case the upper layer will not be able
-        //to stop our layer and we need to accept start again.
-        PostProgressMessage(KLinkLayerOpen, KErrNone);
-        PostDataClientStartedMessage();
-        return;
-        }
-    iMMState = EStarted;
-
-    // If the processing of the ProvisionConfig message failed earlier, send the error response
-    // here to the StartFlow message as there is no response to ProvisionConfig.
-    User::LeaveIfError(iSavedError);
-
-    PostProgressMessage(KLinkLayerOpen, KErrNone);
-    PostDataClientStartedMessage();
-    iBinder4->StartSending();
-#ifdef IPV6SUPPORT
-    if(iBinder6)
-        {
-        iBinder6->StartSending();
-        }
-#endif
-    }
-
-void CTunDriverSubConnectionFlow::CancelFlow(TInt aError)
-/**
-* CTunDriverSubConnectionFlowFactory::CancelFlow cancels the flow on receiving the message TCancel.
-* It will post the message as KErrCancel.
-* This function is called from CTunDriverSubConnectionFlowFactory::ReceivedL 
-*/
-    {
-    __FLOG_1(_L8("CTunDriverSubConnectionFlow:\tCancelFlow(%d)"), aError);
-
-    if(iMMState == EStarted)
-        {
-        PostFlowDownMessage(aError);
-        }
-    }
-
-void CTunDriverSubConnectionFlow::StopFlow(TInt aError)
-/**
-* CTunDriverSubConnectionFlowFactory::StopFlow stops the flow on receiving the message TStop.
-* It will post the message as KLinkLayerClosed and KErrCancel.
-* This function is called from CTunDriverSubConnectionFlowFactory::ReceivedL 
-*/
-    {
-    __FLOG_1(_L8("CTunDriverSubConnectionFlow:\tStopFlow(%d)"), aError);
-
-    PostProgressMessage(KLinkLayerClosed, aError);
-    iMMState = EStopped;
-    PostFlowDownMessage(aError);
-    }
-
-void CTunDriverSubConnectionFlow::ProvisionConfig(const ESock::RMetaExtensionContainerC& aConfigData)
-/**
-* CTunDriverSubConnectionFlowFactory::Provisionconfig on receipt of the ProvisionConfig message, the pointer contained within it is stored
-* in iAccessPointConfig and the information contained within the iAccessPointConfig  array is validated:
-* CTunDriverProtoProvision must be present.  It is added by the TunDriverMCPr and populated from CommsDat.
-* It is a 'C' class to take advantage of zero initialisation.
-* Any errors are saved in iSavedError - there is no response to ProvisionConfig, 
-* so an error response is sent later to StartFlow message.
-*
-* on receipt of TCFDataClient::TStart:
-* iSavedError is checked and, if non-zero, an Error message is sent to the SCPr
-* TunDriverAgentProvision must be present.  It is added by the TunDriverAgentHandler and populated via calls
-* to the Agent.  It is a 'T' class because it requires no zero initialisation.  If missing,
-* an Error message is signalled to the SCPr.
-* This function is called from CTunDriverSubConnectionFlowFactory::ReceivedL
-* @param aData pointer to provisioning structure 
-*/
-    {
-    __FLOG_0(_L8("CTunDriverSubConnectionFlow:\tProvisionConfig message received"));
-    iSavedError = KErrNone;
-    iAccessPointConfig.Close();
-    iAccessPointConfig.Open(aConfigData);
-
-    const CTunDriverProtoProvision* provision = static_cast<const CTunDriverProtoProvision*>(AccessPointConfig().FindExtension(
-            STypeId::CreateSTypeId(CTunDriverProtoProvision::EUid, CTunDriverProtoProvision::ETypeId)));
-    __FRAMEWORK_PRODUCTION_ERRORHANDLING(provision!=NULL,iSavedError = KErrCorrupt);
-    
-    iProvision = provision;
-    }
-
-void CTunDriverSubConnectionFlow::Destroy()
-/**
-* CTunDriverSubConnectionFlowFactory::Destroy
-* Request from SCPR to destroy
-* This function is called from CTunDriverSubConnectionFlowFactory::ReceivedL 
-*/
-    {
-    DeleteThisFlow();
-    }
-
-void CTunDriverSubConnectionFlow::SubConnectionGoingDown()
-/**
-* CTunDriverSubConnectionFlowFactory::SubConnectionGoingDown
-* Request from Agemt SCPR
-*/
-    {
-    __FLOG(_L8("CTunDriverSubConnectionFlow:\tSubConnectionGoingDown"));
-    }
-
-void CTunDriverSubConnectionFlow::SubConnectionError(TInt /*aError*/)
-/**
-* CTunDriverSubConnectionFlowFactory::SubConnectionError
-* Request from Agemt SCPR
-*/
-    {
-    __FLOG(_L8("CTunDriverSubConnectionFlow:\tSubConnectionError"));
-    }
-
-MFlowBinderControl* CTunDriverSubConnectionFlow::DoGetBinderControlL()
-/**
-* CTunDriverSubConnectionFlowFactory::DoGetBinderControlL Called by upper layer for binding
-* Request from Agemt SCPR
-* @return MFlowBinderControl instance
-*/
-    {
-    __FLOG(_L8("CTunDriverSubConnectionFlow::DoGetBinderControlL"));
-    return this;
-    }
-
-//-=========================================================
-// MFlowBinderControl methods
-//
-
-MLowerControl* CTunDriverSubConnectionFlow::GetControlL(const TDesC8& aProtocol)
-/**
-* CTunDriverSubConnectionFlow::GetControlL
-* Create and return an MLowerControl instance of the specified binder type.
-* Called from upper layer during binding procedure.
-* @param aProtocol Protocol type of the binder
-* @return MLowerControl instance of the protocol type
-*/
-    {
-    MLowerControl* lowerControl = NULL;
-    __FLOG(_L8("CTunDriverSubConnectionFlow:\tGetLowerControlL(KProtocol4)"));
-    if(aProtocol.Compare(KProtocol4()) == 0)
-    		{
-    		iBinder4 = CTunDriverBinder4::NewL(*this);
-    		lowerControl = iBinder4;
-    		}
-#ifdef IPV6SUPPORT
-    else
-    if (aProtocol.CompareF(KProtocol6()) == 0)
-        {
-        __FLOG(_L8("CTunDriverSubConnectionFlow::GetLowerControlL(KProtocol6)- Should Return KErrNotSupported"));
-        iBinder6 = CTunDriverBinder6::NewL(*this);
-        lowerControl = iBinder6;        
-        }
-#endif
-    return lowerControl;
-    }
-
-MLowerDataSender* CTunDriverSubConnectionFlow::BindL(const TDesC8& aProtocol, MUpperDataReceiver* aReceiver, MUpperControl* aControl)
-/**
-* CTunDriverSubConnectionFlow::BindL Create and return an MLowerDataSender instance of the specified protocol type.
-* This is bound to the specified upper layer objects.
-* Called from upper layer to bind to this layer.
-* @param aProtocol Protocol type of the binder (same as in GetControlL())
-* @param aReceiver upper layer's MUpperDataReceiver instance for this binder to associate with
-* @param aControl upper layer's MUpperControl instance for this binder to associate with
-* @return MLowerDataSender instance
-*/
-    {
-    __FLOG(_L8("CTunDriverSubConnectionFlow:\tBindL()"));
-
-    MLowerDataSender* lowerDataSender = NULL;
-
-    if(aProtocol.CompareF(KProtocol4()) == 0)
-    		{
-    		lowerDataSender = iBinder4->Bind(*aReceiver, *aControl);
-    		}
-#ifdef IPV6SUPPORT
-    else
-    if (aProtocol.CompareF(KProtocol6()) == 0)
-        {
-        lowerDataSender = iBinder6->Bind(*aReceiver, *aControl);
-        }
-#endif
-    if(lowerDataSender != NULL)
-        {
-        iSubConnectionProvider.PostMessage(Id(), TCFControlProvider::TActive().CRef());
-        }
-    return lowerDataSender;
-    }
-
-void CTunDriverSubConnectionFlow::Unbind(MUpperDataReceiver* aReceiver, MUpperControl* aControl)
-/**
-* CTunDriverSubConnectionFlow::Unbind will Unbind from the upper layer.
-* Called from the upper layer during unbinding.
-* @param aReceiver
-* @param aControl
-*/
-    {
-    __FLOG(_L8("CTunDriverSubConnectionFlow:\tUnbind()"));
-    if (iBinder4 && iBinder4->MatchesUpperControl(aControl))
-            {
-            iBinder4->Unbind(*aReceiver, *aControl);
-            delete iBinder4;
-            iBinder4 = NULL;
-            }
-#ifdef IPV6SUPPORT
-    if (iBinder6 && iBinder6->MatchesUpperControl(aControl))
-            {
-            iBinder6->Unbind(*aReceiver, *aControl);
-            delete iBinder6;
-            iBinder6 = NULL;
-            }
-#endif
-    iSubConnectionProvider.PostMessage(Id(), TCFControlProvider::TIdle().CRef());
-    }
-
-ESock::CSubConnectionFlowBase* CTunDriverSubConnectionFlow::Flow()
-/**
-* CTunDriverSubConnectionFlow::Flow will Return the flow object corresponding to the MFlowBinderControl
-* Called from the UpperLayer get the instance of the flow.
-*/
-    {
-    return this;
-    }
-
-void CTunDriverSubConnectionFlow::PostProgressMessage(TInt aStage, TInt aError)
-/*
-* CTunDriverSubConnectionFlow::PostProgressMessage will send the state change message with the param values.
-* 
-*/
-    {
-    iSubConnectionProvider.PostMessage(Id(), TCFMessage::TStateChange(Elements::TStateChange(aStage, aError)).CRef());
-    }
-
-void CTunDriverSubConnectionFlow::PostDataClientStartedMessage()
-/*
-* CTunDriverSubConnectionFlow::PostDataClientStartedMessage will send the started message with the param values.
-*/
-    {
-    iLastRequestOriginator.ReplyTo(Id(), TCFDataClient::TStarted().CRef());
-    }
-
-void CTunDriverSubConnectionFlow::PostFlowDownMessage(TInt aError, TInt aAction /*= MNifIfNotify::EDisconnect*/)
-/*
-* CTunDriverSubConnectionFlow::PostFlowDownMessage will send the DataClient Down message with the param values.
-*/
-    {
-    if (iMMState == EStarted)
-        {
-        iMMState = EStopped;
-        iSubConnectionProvider.PostMessage(Id(), TCFControlProvider::TDataClientGoneDown(aError, aAction).CRef());
-        }
-    else
-        {
-        iLastRequestOriginator.ReplyTo(Id(), TCFDataClient::TStopped(aError).CRef());
-        }
-    }
-
-void CTunDriverSubConnectionFlow::MaybePostDataClientIdle()
-/*
-* CTunDriverSubConnectionFlow::MaybePostDataClientIdle will send the Idle message with the param values.
-*/
-    {
-    // Can only send DataClientIdle when the upper layer has unbound and the flow is stopped
-    if( iBinder4 == NULL
-#ifdef IPV6SUPPORT
-        || iBinder6 == NULL
-#endif
-      )
-        {
-        iSubConnectionProvider.PostMessage(Id(), TCFControlProvider::TIdle().CRef());
-        }
-    }
-
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/src/tundrivermcpr.cpp
--- a/linklayerprotocols/tundriver/src/tundrivermcpr.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,163 +0,0 @@
-/**
-*   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:
-*   mcpr binding from agent mcpr for tunneldriver.
-* 
-*
-*/
-
-/**
- @file tundrivermcpr.cpp
- @internalComponent
-*/
-
-#include <comms-infras/ss_log.h>
-#include <in_sock.h>
-#include <comms-infras/metadata.h>
-#include <comms-infras/coremcpractivities.h>
-#include <comms-infras/agentmcpractivities.h>
-#include <comms-infras/ss_tiermanagerutils.h>
-#include "tundrivermcpr.h"
-#include "tundriverprovision.h"
-#include <comms-infras/ss_msgintercept.h>
-
-using namespace Messages;
-using namespace MeshMachine;
-using namespace ESock;
-using namespace MCprActivities;
-using namespace TunDriverMCprStates;
-
-// No Bearer Activity
-namespace TunDriverMCPRNoBearerActivity
-{
-DECLARE_DEFINE_NODEACTIVITY(ECFActivityNoBearer, TunDriverMCPRNoBearer, TCFControlProvider::TNoBearer)
-	NODEACTIVITY_ENTRY(KNoTag, CoreNetStates::TSendBearer, CoreNetStates::TAwaitingNoBearer, MeshMachine::TNoTag)	
-NODEACTIVITY_END()
-}
-
-
-// Activity Map
-namespace TunDriverMCprStates
-{
-DECLARE_DEFINE_ACTIVITY_MAP(stateMap)
-   ACTIVITY_MAP_ENTRY(TunDriverMCPRNoBearerActivity, TunDriverMCPRNoBearer)
-ACTIVITY_MAP_END_BASE(AgentMCprActivities, agentMCprActivities)
-} // namespace TunDriverMCprStates
-
-
-#if defined __CFLOG_ACTIVE || defined SYMBIAN_TRACE_ENABLE
-    _LIT8(KTunDriverMCprSubTag, "tunmcpr");
-#endif
-
-CTunDriverMetaConnectionProvider* CTunDriverMetaConnectionProvider::NewL(ESock::CMetaConnectionProviderFactoryBase& aFactory, const ESock::TProviderInfo& aProviderInfo)
-/**
-* CTunDriverMetaConnectionProvider::NewL constructs a Default TunDriver MCPR
-* @param aFactory
-* @param aProviderInfo
-* @returns pointer to a constructed mcpr object.
-*/
-    {
-    CTunDriverMetaConnectionProvider* self = new (ELeave) CTunDriverMetaConnectionProvider(aFactory, aProviderInfo);
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop(self);
-    return self;
-    }
-
-
-CTunDriverMetaConnectionProvider::CTunDriverMetaConnectionProvider(CMetaConnectionProviderFactoryBase& aFactory, const ESock::TProviderInfo& aProviderInfo)
-:	CAgentMetaConnectionProvider(aFactory, aProviderInfo, TunDriverMCprStates::stateMap::Self())
-/**
-* CTunDriverMetaConnectionProvider::CTunDriverMetaConnectionProvider is a default constructor
-* @param aFactory
-* @param aProviderInfo
-* @returns pointer to a constructed mcpr object.
-*/ 	
-	{
-	LOG_NODE_CREATE(KTunDriverMCprSubTag, CTunDriverMetaConnectionProvider);
-	}
-
-CTunDriverMetaConnectionProvider::~CTunDriverMetaConnectionProvider()
-/**
-* CTunDriverMetaConnectionProvider::CTunDriverMetaConnectionProvider is a default destructor
-*/
-	{
-    SetAgentNotificationHandlerL(NULL);
-	LOG_NODE_DESTROY(KTunDriverMCprSubTag, CTunDriverMetaConnectionProvider);
-	}
-
-
-void CTunDriverMetaConnectionProvider::ConstructL()
-/**
-* CTunDriverMetaConnectionProvider::ConstructL is a second-phase constructor
-* Will set the accesspoint from Comms database.
-* @param
-* @returns 
-*/
-    {
-    CAgentMetaConnectionProvider::ConstructL();
-	SetAccessPointConfigFromDbL();
-	}
-
-
-void CTunDriverMetaConnectionProvider::ReceivedL(const TRuntimeCtxId& aSender, const TNodeId& aRecipient, TSignatureBase& aMessage)
-/**
-* CTunDriverMetaConnectionProvider::ReceivedL called on incoming MCPR Messages.
-* @param
-* @returns 
-*/
-    {
-	__CFLOG_VAR((KTunDriverMCprTag, KTunDriverMCprSubTag, _L8("CTunDriverMetaConnectionProvider [this=%08x]::ReceivedL() aMessage=%d"),
-	   this, aMessage.MessageId()));
-
-	ESOCK_DEBUG_MESSAGE_INTERCEPT(aSender, aMessage, aRecipient);
-
-	TNodeContext<CTunDriverMetaConnectionProvider> ctx(*this, aMessage, aSender, aRecipient);
-    CCoreMetaConnectionProvider::Received(ctx);
-    User::LeaveIfError(ctx.iReturn);
-	}
-
-void CTunDriverMetaConnectionProvider::SetAccessPointConfigFromDbL()
-/**
-* CTunDriverMetaConnectionProvider::SetAccessPointConfigFromDbL will initialize the tundriver with 
-* the configuration set in comms database.
-* @param
-* @returns 
-*/
-    {
-	RMetaExtensionContainer mec;
-	mec.Open(AccessPointConfig());
-	CleanupClosePushL(mec);
-
-    // Add provisioning information.
-   	CCommsDatIapView* iapView = OpenIapViewLC();
-	CTunDriverProtoProvision* provision = new (ELeave) CTunDriverProtoProvision();
-	CleanupStack::PushL(provision);
-	provision->InitialiseConfigL(iapView);
-
-	// Presumptions:
-	// - none of the extensions can already exist in the AccessPointConfig array.  AppendExtensionL()
-	//   is presumed to panic if adding the same extension a second time.
-	// - if we have added several extensions to the AccessPointConfig array before getting a failure
-	//   and leaving, it is presumed that the MCPr will be destroyed and AccessPointConfig destructor
-	//   will clean up the extensions immediately afterwards.
-
-	mec.AppendExtensionL(provision);
-	CleanupStack::Pop(provision);          // ownership (including cleanup) transferred to AccessPointConfig()
-	CleanupStack::PopAndDestroy();			// CloseIapView()
-	
-	AccessPointConfig().Close();
-	AccessPointConfig().Open(mec);
-	CleanupStack::PopAndDestroy(&mec);
-    }
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/src/tundrivermcprfactory.cpp
--- a/linklayerprotocols/tundriver/src/tundrivermcprfactory.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/**
-*   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:
-*   Factory implementation for tunnel driver mcpr.
-* 
-*
-*/
-
-/**
- @file tundrivermcprfactory.cpp
- @internalTechnology
-*/
-
-#include <ecom/implementationproxy.h>
-#include "tundrivermcprfactory.h"
-#include "tundrivermcpr.h"
-#include <comms-infras/ss_log.h>
-#include <ss_glob.h>
-#include <ecom/ecom.h>
-
-#include <comms-infras/ss_msgintercept.h>
-
-using namespace ESock;
-
-CTunDriverMetaConnectionProviderFactory* CTunDriverMetaConnectionProviderFactory::NewL(TAny* aParentContainer)
-/**
-* CTunDriverMetaConnectionProviderFactory::NewL constructs a Default MCPR Flow Factory
-* @param aParentContainer construction data passed by ECOM
-* @returns pointer to a constructed factory object.
-*/
-	{
- 	return new (ELeave) CTunDriverMetaConnectionProviderFactory(TUid::Uid(CTunDriverMetaConnectionProviderFactory::iUid), *(reinterpret_cast<CMetaConnectionFactoryContainer*>(aParentContainer)));
-	}
-
-CTunDriverMetaConnectionProviderFactory::CTunDriverMetaConnectionProviderFactory(TUid aFactoryId, CMetaConnectionFactoryContainer& aParentContainer)
-	: CMetaConnectionProviderFactoryBase(aFactoryId, aParentContainer)
-/**
-* CTunDriverMetaConnectionProviderFactory::CTunDriverMetaConnectionProviderFactory is a default constructor.
-* @return
-*/
-	{
-	}
-
-ESock::ACommsFactoryNodeId* CTunDriverMetaConnectionProviderFactory::DoCreateObjectL(ESock::TFactoryQueryBase& aQuery)
-/**
-* CTunDriverMetaConnectionProviderFactory::DoCreateObjectL is called from UpperlLayer.
-* @return
-*/
-	{
-	const TMetaConnectionFactoryQuery& query = static_cast<const TMetaConnectionFactoryQuery&>(aQuery);
-	CMetaConnectionProviderBase* provider = CTunDriverMetaConnectionProvider::NewL(*this, query.iProviderInfo);
-	
-	ESOCK_DEBUG_REGISTER_GENERAL_NODE(iUid, provider);
-
-	return provider;
-	}
-
-
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/src/tundriverprovision.cpp
--- a/linklayerprotocols/tundriver/src/tundriverprovision.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,310 +0,0 @@
-/**
-*   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:
-*   Provision implemtation for Ipv4 and Ipv6 binders for tundriver.
-* 
-*
-*/
-
-/**
- @file tundriverprovision.cpp
- @internalTechnology
-*/
-
-#include <comms-infras/ss_log.h>
-#include <in_sock.h>
-#include <comms-infras/metadata.h>
-#include <comms-infras/coremcpractivities.h>
-#include <comms-infras/ss_tiermanagerutils.h>
-#include "tundrivermcpr.h"
-#include "tundriverprovision.h"
-
-using namespace ESock;
-
-void CTunDriverProtoProvision::InitialiseConfigL(CCommsDatIapView* aIapView)
-/**
-* CTunDriverProtoProvision::InitialiseConfigL is called from TunDriver MCPR to initialze
-* tundriver with values from comms database.
-* @param aIapView
-* @returns 
-*/ 
-	{
-	ProvisionNetworkConfigL(aIapView);
-	}
-
-void CTunDriverProtoProvision::ProvisionNetworkConfigL(CCommsDatIapView* aIapView)
-/**
-* CTunDriverProtoProvision::ProvisionNetworkConfigL is called from TunDriver MCPR to identify 
-* tundriver is associated with protocol IPv4 or IPv6
-* @param aIapView
-* @returns 
-*/
-    {
-    HBufC* buf = NULL;
-    aIapView->GetTextL(KCDTIdLANIfNetworks, buf);
-    CleanupStack::PushL(buf);
-    if (buf->Length() == 0)
-        {
-        User::Leave(KErrCorrupt);
-        }
-
-    TPtrC16 networks;
-    networks.Set(*buf);
-    TPtrC16 current;
-    TUint32 order = 0;
-    TInt commaPos = 0;
-    while (commaPos != KErrNotFound)
-        {
-        commaPos = networks.LocateF(',');
-        if (commaPos == KErrNotFound)
-            {
-            // take all of string
-            current.Set(networks);
-            }
-        else
-            {
-            current.Set(networks.Ptr(), commaPos);
-            }
-
-        if (current.CompareF(_L("ip")) == KErrNone)
-            {
-            ProvisionIp4ConfigL(aIapView, order);
-            }
-#ifdef IPV6SUPPORT
-        else if (current.CompareF(_L("ip6")) == KErrNone)
-            {
-            ProvisionIp6ConfigL(aIapView, order);
-            }
-#endif
-        else
-            {
-            User::Leave(KErrCorrupt);
-            }
-
-        order++;
-        networks.Set(networks.Mid(commaPos+1));
-        }
-
-    CleanupStack::PopAndDestroy(buf);
-    }
-
-
-void CTunDriverProtoProvision::ProvisionIp4ConfigL(CCommsDatIapView* aIapView, TUint32 aOrder)
-/**
-* CTunDriverProtoProvision::ProvisionIp4ConfigL will initialize with IPv4 Header values
-* for tundriver IPv4 configuration. like IPaddress, NetMask, Gateway and DNS Address. 
-* @param aIapView
-* @returns 
-*/
-    {
-    iIp4Provision.SetOrder(aOrder);
-
-    // Read IP address configuration parameters
-    TBool serverRequired;
-    aIapView->GetBoolL(KCDTIdLANIpAddrFromServer, serverRequired);
-
-    TUint32 addr;
-    TInt err; 
-
-    iIp4Provision.SetLocalAddr(KInetAddrNone);
-    iIp4Provision.SetNetMask(KInetAddrNone);
-    iIp4Provision.SetDefGateway(KInetAddrNone);
-    iIp4Provision.SetPrimaryDns(KInetAddrNone);
-    iIp4Provision.SetSecondaryDns(KInetAddrNone);
-    if (!serverRequired)
-        {
-        CAgentMetaConnectionProvider::GetIp4AddrL(aIapView, KCDTIdLANIpAddr, addr);
-        TInetAddr v4MappedAddr;
-        v4MappedAddr.SetV4MappedAddress(addr);
-        iIp4Provision.SetLocalAddr(v4MappedAddr);
-        err = CAgentMetaConnectionProvider::GetIp4Addr(aIapView, KCDTIdLANIpNetMask, addr);
-        if (err == KErrNone)
-            {
-            v4MappedAddr.SetV4MappedAddress(addr);
-            iIp4Provision.SetNetMask(v4MappedAddr);
-            }
-
-        err = CAgentMetaConnectionProvider::GetIp4Addr(aIapView, KCDTIdLANIpGateway, addr);
-        if (err == KErrNone)
-            {
-            v4MappedAddr.SetV4MappedAddress(addr);
-            iIp4Provision.SetDefGateway(v4MappedAddr);
-            }
-        else if (err == KErrNotFound || err == KErrArgument)
-            {
-            iIp4Provision.SetDefGateway(iIp4Provision.LocalAddr());
-            }
-        else
-            {
-            User::Leave(err);
-            }
-
-        // Because CommDB doesn't define a Broadcast Address field, we must
-        // calculate the broadcast address. This is based on the localAddr
-        // and the netMask.
-
-        TInetAddr localAddr;
-        localAddr.SetV4MappedAddress(iIp4Provision.LocalAddr().Address());
-        localAddr.SetPort(0);
-        TInetAddr netMask;
-        netMask.SetV4MappedAddress(iIp4Provision.NetMask().Address());
-        netMask.SetPort(0);
-        TInetAddr broadcast;
-        broadcast.SubNetBroadcast(localAddr, netMask);
-        iIp4Provision.SetBroadcastAddr(broadcast.Address());
-        }
-
-    aIapView->GetBoolL(KCDTIdLANIpDNSAddrFromServer, serverRequired);
-    if (!serverRequired)
-        {
-        err = CAgentMetaConnectionProvider::GetIp4Addr(aIapView, KCDTIdLANIpNameServer1, addr);
-        if (err == KErrNone)
-            {
-            TInetAddr primaryDns;
-            primaryDns.SetV4MappedAddress(addr);
-            iIp4Provision.SetPrimaryDns(primaryDns);
-            err = CAgentMetaConnectionProvider::GetIp4Addr(aIapView, KCDTIdLANIpNameServer2, addr);
-            if (err == KErrNone)
-                {
-                TInetAddr secondaryDns;
-                secondaryDns.SetV4MappedAddress(addr);
-                iIp4Provision.SetSecondaryDns(secondaryDns);
-                }
-            }
-
-        if (err != KErrNone && err != KErrNotFound && err != KErrArgument)
-            {
-            User::Leave(err);
-            }
-        }
-    }
-
-#ifdef IPV6SUPPORT
-void CTunDriverProtoProvision::ProvisionIp6ConfigL(CCommsDatIapView* aIapView, TUint32 aOrder)
-/**
-* CTunDriverProtoProvision::ProvisionIp6ConfigL will initialize with IPv4 Header values
-* for tundriver IPv6 configuration. like IPaddress, NetMask, Gateway and DNS Address. 
-* @param aIapView
-* @returns 
-*/
-    {
-    iIp6Provision.SetOrder(aOrder);
-
-    // Read IP address configuration parameters
-    TBool serverRequired;
-    aIapView->GetBoolL(KCDTIdLANIpAddrFromServer, serverRequired);
-
-    TIp6Addr addr;
-    TInetAddr inetAddress;
-    TInt err; 
-
-    iIp6Provision.SetLocalAddr(KInetAddrNone);
-    iIp6Provision.SetNetMask(KInetAddrNone);
-    iIp6Provision.SetDefGateway(KInetAddrNone);
-    iIp6Provision.SetPrimaryDns(KInetAddrNone);
-    iIp6Provision.SetSecondaryDns(KInetAddrNone);
-    if (!serverRequired)
-        {
-        CAgentMetaConnectionProvider::GetIp6AddrL(aIapView, KCDTIdLANIpAddr, addr);
-        inetAddress.SetAddress(addr);
-        iIp6Provision.SetLocalAddr(inetAddress);
-        err = CAgentMetaConnectionProvider::GetIp6Addr(aIapView, KCDTIdLANIpNetMask, addr);
-        if (err == KErrNone)
-            {
-            inetAddress.SetAddress(addr);
-            iIp6Provision.SetNetMask(inetAddress);
-            }
-        err = CAgentMetaConnectionProvider::GetIp6Addr(aIapView, KCDTIdLANIpGateway, addr);
-        if (err == KErrNone)
-            {
-            inetAddress.SetAddress(addr);
-            iIp6Provision.SetDefGateway(inetAddress);
-            }
-        else if (err == KErrNotFound || err == KErrArgument)
-            {
-            iIp6Provision.SetDefGateway(iIp6Provision.LocalAddr());
-            }
-        else
-            {
-            User::Leave(err);
-            }
-        err = CAgentMetaConnectionProvider::GetIp6Addr(aIapView, KCDTIdLANIpNameServer1, addr);
-        if(err == KErrNone)
-            {
-            inetAddress.SetAddress(addr);
-            iIp6Provision.SetPrimaryDns(inetAddress);
-            }
-        else
-            {
-            User::LeaveIfError(err);
-            }
-        err = CAgentMetaConnectionProvider::GetIp6Addr(aIapView, KCDTIdLANIpNameServer2, addr);
-        if(err == KErrNone)
-            {
-            inetAddress.SetAddress(addr);
-            iIp6Provision.SetSecondaryDns(inetAddress);
-            }
-        else
-            {
-            User::LeaveIfError(err);
-            }
-        // Because CommDB doesn't define a Broadcast Address field, we must
-        // calculate the broadcast address. This is based on the localAddr
-        // and the netMask.
-
-        TInetAddr localAddr;
-        localAddr = iIp6Provision.LocalAddr();
-        localAddr.SetPort(0);
-        TInetAddr netMask;
-        netMask = iIp6Provision.NetMask();
-        netMask.SetPort(0);
-        TInetAddr broadcast;
-        broadcast.SubNetBroadcast(localAddr, netMask);
-        iIp6Provision.SetBroadcastAddr(broadcast);
-        }
-
-    iIp6Provision.SetPrimaryDns(KInetAddrNone);
-    iIp6Provision.SetSecondaryDns(KInetAddrNone);
-
-    aIapView->GetBoolL(KCDTIdLANIpDNSAddrFromServer, serverRequired);
-    if (!serverRequired)
-        {
-        err = CAgentMetaConnectionProvider::GetIp6Addr(aIapView, KCDTIdLANIpNameServer1, addr);
-        if (err == KErrNone)
-            {
-            inetAddress.SetAddress(addr);
-            iIp6Provision.SetPrimaryDns(inetAddress);
-            err = CAgentMetaConnectionProvider::GetIp6Addr(aIapView, KCDTIdLANIpNameServer2, addr);
-            if (err == KErrNone)
-                {
-                inetAddress.SetAddress(addr);
-                iIp6Provision.SetSecondaryDns(inetAddress);
-                }
-            }
-
-        if (err != KErrNone && err != KErrNotFound && err != KErrArgument)
-            {
-            User::Leave(err);
-            }
-        }
-    }
-#endif
-
-//
-// Attribute table for provisioning structures passed to CFProtocol
-//
-
-START_ATTRIBUTE_TABLE(CTunDriverProtoProvision, CTunDriverProtoProvision::EUid, CTunDriverProtoProvision::ETypeId)
-// no attributes defined as no serialisation takes place.
-END_ATTRIBUTE_TABLE()
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/Dummy3rdPartyApp/group/Dummy3rdPartyApp.iby
--- a/linklayerprotocols/tundriver/te_tundriver/Dummy3rdPartyApp/group/Dummy3rdPartyApp.iby	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-// 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_DUMMY_3RDPARTYAPP_IBY__
-#define __TE_DUMMY_3RDPARTYAPP_IBY__
-
-#include <testexecute.iby>
-data=ABI_DIR\DEBUG_DIR\Dummy3rdPartyApp.exe		System\bin\Dummy3rdPartyApp.exe
-
-#endif //__TE_DUMMY_3RDPARTYAPP_IBY__
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/Dummy3rdPartyApp/group/Dummy3rdPartyApp.mmp
--- a/linklayerprotocols/tundriver/te_tundriver/Dummy3rdPartyApp/group/Dummy3rdPartyApp.mmp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-============================================================================
- Name	  	 : Dummy3rdPartyApp.mmp
- Author	     : Gurpreet Singh Nagi
- Copyright   : Your copyright notice
- Description : This is the project specification file for Dummy3rdPartyApp.
-============================================================================
-*/
-
-TARGET		  dummy3rdpartyapp.exe
-TARGETTYPE	  exe
-UID			  0 0xEB1F90BF
-
-USERINCLUDE	    ../inc
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-SYSTEMINCLUDE   /epoc32/include
-SYSTEMINCLUDE   /epoc32/include/ssm
-SYSTEMINCLUDE   /epoc32/include/comms-infras
-
-SOURCEPATH	  ../src
-SOURCE		  Dummy3rdPartyApp.cpp
-
-
-LIBRARY		 euser.lib esock.lib insock.lib ecom.lib commdb.lib
-CAPABILITY   All -Tcb
-#ifdef ENABLE_ABIV2_MODE
-  DEBUGGABLE_UDEBONLY
-#endif
-
-SMPSAFE
-
-
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/Dummy3rdPartyApp/group/bld.inf
--- a/linklayerprotocols/tundriver/te_tundriver/Dummy3rdPartyApp/group/bld.inf	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-/*
-============================================================================
- Name		 : bld.inf
- Author	     : Gurpreet Singh Nagi
- Copyright   : Your copyright notice
- Description : This file provides the information required for building the
-				whole of a Dummy3rdPartyApp.
-============================================================================
-*/
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_TESTEXPORTS
-Dummy3rdPartyApp.iby                    /epoc32/rom/include/dummy3rdpartyapp.iby
-
-
-PRJ_TESTMMPFILES
-Dummy3rdPartyApp.mmp
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/Dummy3rdPartyApp/inc/Dummy3rdPartyApp.h
--- a/linklayerprotocols/tundriver/te_tundriver/Dummy3rdPartyApp/inc/Dummy3rdPartyApp.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
- ============================================================================
- Name		 : Dummy3rdPartyApp.h
- Author	     : Gurpreet Singh Nagi
- Copyright   : Your copyright notice
- Description : Exe header file
- ============================================================================
- */
-
-#ifndef __DUMMY3RDPARTYAPP_H__
-#define __DUMMY3RDPARTYAPP_H__
-
-//  Include Files
-
-#include <e32base.h>
-#include <es_sock.h>
-#include <commdbconnpref.h>
-#include <in_sock.h>
-
-//  Function Prototypes
-
-GLDEF_C TInt E32Main();
-
-//functions:
-
-class Dummy3rdPartyApp
-    {
-public:
-    Dummy3rdPartyApp::Dummy3rdPartyApp()
-        {
-
-        }
-
-    Dummy3rdPartyApp::~Dummy3rdPartyApp()
-        {
-
-        }
-    void InitConn();
-    void StartConn();
-    void ProcessData();
-    void CloseConn();
-
-    TRequestStatus iStatus;
-    TInetAddr iVirtAddr, iRealAddr;
-    RSocketServ iVirtSocketServ, iRealSocketServ, iHookSocketServ;
-    RSocket iVirtSocket, iRealSocket, iHookSocket;
-    RConnection iVirtConnection, iRealConnection;
-    TBuf8<2048> iSendBuf, iRecvBuf;
-
-    TCommDbConnPref iVirtCommDbPref, iRealCommDbPref;
-    };
-
-
-
-#endif  // __DUMMY3RDPARTYAPP_H__
-
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/Dummy3rdPartyApp/sis/Dummy3rdPartyApp_EKA2.pkg
--- a/linklayerprotocols/tundriver/te_tundriver/Dummy3rdPartyApp/sis/Dummy3rdPartyApp_EKA2.pkg	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-; Installation file for Symbian OS 9.x for generic console application
-; Installation file for Dummy3rdPartyApp EXE
-;
-; This is an auto-generated PKG file by Carbide.
-; This file uses variables specific to Carbide builds that will not work
-; on command-line builds. If you want to use this generated PKG file from the
-; command-line tools you will need to modify the variables with the appropriate
-; values: $(EPOCROOT), $(PLATFORM), $(TARGET)
-;
-
-;
-; UID is the exe's UID
-;
-#{"Dummy3rdPartyApp EXE"},(0xEB1F90BF),1,0,0
-
-
-;Localised Vendor name
-%{"Vendor-EN"}
-
-;Unique Vendor name
-:"Vendor"
-
-"$(EPOCROOT)Epoc32\release\$(PLATFORM)\$(TARGET)\Dummy3rdPartyApp.exe"		  -"!:\sys\bin\Dummy3rdPartyApp.exe"
-
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/Dummy3rdPartyApp/src/Dummy3rdPartyApp.cpp
--- a/linklayerprotocols/tundriver/te_tundriver/Dummy3rdPartyApp/src/Dummy3rdPartyApp.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,242 +0,0 @@
-/*
- ============================================================================
- Name		 : Dummy3rdPartyApp.cpp
- Author	     : Gurpreet Singh Nagi
- Copyright   : Your copyright notice
- Description : Exe source file
- ============================================================================
- */
-
-//  Include Files  
-
-#include "Dummy3rdPartyApp.h"
-#include <e32base.h>
-#include <e32std.h>
-#include <e32cons.h>			// Console
-
-//  Constants
-_LIT(KTextConsoleTitle, "Dummy3rdPartyApp");
-_LIT(KTextFailed, " failed, leave code = %d");
-_LIT(KTextPressAnyKey, " [press any key]\n");
-
-#define BUF_SIZE 2048
-//  Global Variables
-LOCAL_D CConsoleBase* console; // write all messages to this
-
-
-//  Local Functions
-void Dummy3rdPartyApp::InitConn()
-    {
-    if((iStatus = iVirtSocketServ.Connect()) == KErrNone )
-        console->Printf(_L("Opening Socket Server on Virtual Interface.\n"));
-
-    if((iStatus = iRealSocketServ.Connect()) == KErrNone )
-        console->Printf(_L("Opening Socket Server on Real Interface.\n"));
-    
-    if((iStatus = iHookSocketServ.Connect()) == KErrNone )
-            console->Printf(_L("Opening Socket Server for Hook.\n"));
-
-    if((iStatus = iVirtConnection.Open(iVirtSocketServ, KAfInet)) == KErrNone )
-        console->Printf(_L("\nOpening Virtual Connection."));
-
-    if((iStatus = iRealConnection.Open(iRealSocketServ, KAfInet)) == KErrNone )
-        console->Printf(_L("\nOpening Real Connection.\n"));
-    
-    iHookSocket.Open(iHookSocketServ,_L("tun"));
-    
-    }
-
-void Dummy3rdPartyApp::StartConn()
-    {
-    iVirtCommDbPref.SetIapId(14);             // Dummy Interface
-    iVirtCommDbPref.SetBearerSet(KCommDbBearerVirtual);
-    iVirtCommDbPref.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-
-    TInt err = KErrNone;
-    iVirtConnection.Start(iVirtCommDbPref, iStatus);
-    User::WaitForRequest(iStatus);
-    err = iStatus.Int();
-    if(iStatus == KErrNone)
-        console->Printf(_L("Connection Started on Virtual Interface.\n"));
-    User::LeaveIfError(err);
-    err = KErrNone;
-    //open socket on Virtual interface.
-    iStatus = iVirtSocket.Open(iVirtSocketServ, KAfInet, KSockDatagram, KProtocolInetUdp, iVirtConnection);
-    //if((iStatus = iVirtSocket.Open(iVirtSocketServ, KAfInet, KSockDatagram, KProtocolInetUdp, iVirtConnection)) == KErrNone )
-    if(iStatus == KErrNone)
-        console->Printf(_L("Socket Opened on Virtual Interface.\n"));
-
-    iRealCommDbPref.SetIapId(9);            //Real Interface i.e. ethernet
-    iRealCommDbPref.SetBearerSet(KCommDbBearerLAN);
-    iRealCommDbPref.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-
-    iRealConnection.Start(iRealCommDbPref, iStatus);
-    User::WaitForRequest(iStatus);
-    if(iStatus == KErrNone)
-        console->Printf(_L("Connection Started on Real Interface.\n"));
-    err = iStatus.Int();
-    //open socket on real interface
-    if((iStatus = iRealSocket.Open(iRealSocketServ, KAfInet, KSockDatagram, KProtocolInetUdp, iRealConnection)) == KErrNone )
-        console->Printf(_L("Socket Opened on Real Interface.\n"));
-    User::LeaveIfError(err);
-
-    //set destination port and IP ie. OpenVPN gateway address
-    iRealAddr.SetV4MappedAddress(INET_ADDR(10,225,171,71));        
-    iRealAddr.SetPort(1194);
-    err = KErrNone;
-    //bind local port to socket
-    // To Get any available port from the kernel
-    
-    TInetAddr inetAddrBind;
-    inetAddrBind.SetPort(KInetPortAny);
-    inetAddrBind.SetAddress(KInetAddrAny);
-    iVirtSocket.Bind(inetAddrBind);
-    TUint port1  = iVirtSocket.LocalPort();
-      
-    TPckgC <TUint> portPckg (port1);
-    iHookSocket.SetOpt(KSolInetIp,KSoTunnelPort,portPckg);
-
-    console->Printf(_L("Socket bound on Virtual Interface.\n"), err);
-
-    err = iRealSocket.SetLocalPort(1194); 
-    console->Printf(_L("Socket bound on Real Interface.\n"), err);
-     
-    }
-
-
-void Dummy3rdPartyApp::ProcessData()
-    {
-    //Receive data from client on virtual interface
-    iVirtSocket.RecvFrom(iSendBuf, iVirtAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);
-
-    if(iStatus == KErrNone)
-        {
-        console->Printf(_L("\nData Received from Virtual Interface:  "));
-        //copy received data to temp buffer and print it
-        //TBuf<BUF_SIZE> buf;
-        //buf.Copy(iSendBuf);
-        //console->Printf(buf);
-        }
-    else
-        console->Printf(_L("\nData receive failed on Virtual Interface."));     
-
-    //Send data on real interface to OpenVPN Gateway.
-    iRealSocket.SendTo(iSendBuf, iRealAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);  
-
-    if( iStatus == KErrNone)
-        {
-        console->Printf(_L("\nData Sent on Real interface : "));
-
-        //display sent data
-        //TBuf<BUF_SIZE> buf;
-        //buf.Copy(iSendBuf);
-        //console->Printf(buf);
-        }
-    else
-        console->Printf(_L("\nData send failed on Real Interface"));   
-
-    //Receive data from from real interface
-    iRealSocket.RecvFrom(iRecvBuf, iRealAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);
-
-    if(iStatus == KErrNone)
-        {
-        console->Printf(_L("\nData Received from Real Interface:  "));
-        //copy received data to temp buffer and print it
-        //TBuf<BUF_SIZE> buf;
-        //buf.Copy(iRecvBuf);
-        //console->Printf(buf);
-        }
-    else
-        console->Printf(_L("\nData receive failed on Real Interface"));     
-
-    //Send data to virtual interface.
-    iVirtSocket.SendTo(iRecvBuf, iVirtAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);  
-
-    if( iStatus == KErrNone)
-        {
-        console->Printf(_L("\nData Sent on Virtual interface : "));
-
-        //display sent data
-        //TBuf<BUF_SIZE> buf;
-        //buf.Copy(iRecvBuf);
-        //console->Printf(buf);
-        }
-    else
-        console->Printf(_L("\nData send failed on Virtual Interface"));   
-    }
-
-void Dummy3rdPartyApp::CloseConn()
-    {
-    //Close all handles.
-    iVirtSocket.Close();
-    iRealSocket.Close();
-    iHookSocket.Close();
-
-    iVirtConnection.Close();
-    iRealConnection.Close();
-    iVirtSocketServ.Close();
-    iRealSocketServ.Close();
-    iHookSocketServ.Close();
-    }
-
-LOCAL_C void MainL()
-    {
-    Dummy3rdPartyApp obj;
-
-    //intializing connection and socket
-    obj.InitConn();
-    //start the connection
-    obj.StartConn();
-
-    while(1)
-        {
-        obj.ProcessData();
-        }
-    //close connection, subconnection, socket
-    //TODO: how to explicitly close the loop? 
-    // One possible solution is running a timer.
-    obj.CloseConn();
-    }
-
-LOCAL_C void DoStartL()
-    {
-    // Create active scheduler (to run active objects)
-    CActiveScheduler* scheduler = new (ELeave) CActiveScheduler();
-    CleanupStack::PushL(scheduler);
-    CActiveScheduler::Install(scheduler);
-
-    MainL();
-    // Delete active scheduler
-    CleanupStack::PopAndDestroy(scheduler);
-    }
-
-//  Global Functions
-
-GLDEF_C TInt E32Main()
-    {
-    // Create cleanup stack
-    __UHEAP_MARK;
-    CTrapCleanup* cleanup = CTrapCleanup::New();
-
-    // Create output console
-    TRAPD(createError, console = Console::NewL(KTextConsoleTitle, TSize(
-            KConsFullScreen, KConsFullScreen)));
-    if (createError)
-        return createError;
-
-    // Run application code inside TRAP harness, wait keypress when terminated
-    TRAPD(mainError, DoStartL());
-    if (mainError)
-        console->Printf(KTextFailed, mainError);
-    console->Printf(KTextPressAnyKey);
-    console->Getch();
-
-    delete console;
-    delete cleanup;
-    __UHEAP_MARKEND;
-    return KErrNone;
-    }
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/configs/meshpreface1.cfg
--- a/linklayerprotocols/tundriver/te_tundriver/configs/meshpreface1.cfg	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,638 +0,0 @@
-##
-##	Purpose of this file is to provide default configuration options for the new,
-##	access point aware code for all legacy configuration files which do not have
-##	it on their own.
-##	According to its purpose this file is being used only(!) ever (!) with legacy,
-##	non access point aware (or as it is also called in CommsDat: non mesh compatible)
-##	configurations.
-##	This means that for these configurations the only preferences used for selection
-##	are the link layer ones (IAP + connection preference ranking on implicit).
-##	None of the new preferences will ever make any sense on any system that does not
-##	provide the new configuration and will always be rejected!
-##
-
-############################################################
-## GlobalSettings
-##
-## 	A new setting has been added to indicate the default Tier that should be referred to 
-##	whenever a Tier setting is required but has not been specified.
-##	The deprecated global settings "DefaultSnap" and "PromptForSnap" are now held in the 
-##	default tier record not in the global settings table itself 
-##
-##
-
-[GlobalSettings]
-ADD_TEMPLATE
-	DefaultTier=Link.TierTable.2048
-	FIELD_COUNT=1
-END_TEMPLATE
-
-
-############################################################
-## AccessPointTable
-##
-##	Generally all of our (Symbian's) network layer providers (tier id == 2048)
-##	interpret their selection policy ids as records in the APPrioritySelectionPolicyTable.
-##	However, in this particular case below (and when using this file) we are always
-##	dealing with a legacy, link layer preferences and selection (please also see
-##	the comment above).
-##	Since none of the link preferences can ever be understood by the network layer
-##	selector, they always override the provider's own selection policy (as specified
-##	in the network layer access point, i.e. in the "NetworkDefault" record below this text).
-##	This is why the default network layer access point below does not need to have
-##	a APPrioritySelectionPolicyTable entry orresponding to its selection poincy id
-##	(this really is only an excepti on from the rule, it can never happen on a system
-##	configured to be access point aware!!!).
-##
-
-[AccessPointTable]
-ADD_SECTION
-# COMMDB_ID = 254
-	Id=10000
-	Name=NetworkDefault
-	Tier=Link.TierTable.2048
-	MCpr=MCprTable.1
-	AccessPointSelectionPolicy=Link.APPrioritySelectionPolicyTable.20000
-	Cpr=CprTable.1
-	SCpr=SCprTable.7
-	Protocol=ProtocolTable.1
-	FIELD_COUNT=8
-END_ADD
-
-##This record here is the default record for the IPProto level APs generated by 
-##CommsDat. This record used as it is if the config file, which is processed
-## after this config file, doesn't contain any ConnectionPreferences or 
-##IAPPrioritySelectionPolicy tables.
-ADD_SECTION
-# COMMDB_ID = 253
-	Id=10001
-	Name=IPProtoDefault
-	Tier=Link.TierTable.271064560
-	MCpr=MCprTable.2
-	AccessPointSelectionPolicy=0
-	Cpr=CprTable.2
-	SCpr=SCprTable.2
-	Protocol=ProtocolTable.2
-	##this field value here is an indication that the config file doesn't have
-	##any generated IPProto APs which means that there is no ConnPref or 
-	##IAPPrioritySelPol records.
-	CustomSelectionPolicy=-1
-	FIELD_COUNT=9
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 252
-	Id=10002
-	Name=SIPDefault
-	Tier=Link.TierTable.536887799
-	MCpr=MCprTable.11
-	AccessPointSelectionPolicy=0
-	Cpr=CprTable.5
-	SCpr=SCprTable.8
-	Protocol=ProtocolTable.2
-	FIELD_COUNT=8
-END_ADD
-
-
-############################################################
-## APPrioritySelectionPolicyTable
-## 
-
-[APPrioritySelectionPolicyTable]
-ADD_SECTION
-# COMMDB_ID = 254
-	Id=20000
-	Name=APSelPolNetworkDefault
-	##This will be modified by CommsDat to point to the correct IPProto level APs
-    ##in the ranking order of IAPs in the ConnectionPreferences table, if there
-    ##is any.
-	AP1=Link.AccessPointTable.10001
-	APCOUNT=1
-	FIELD_COUNT=4
-END_ADD
-
-
-############################################################
-## TierTable
-##
-
-[TierTable]
-
-## Id=0x10281DD8 == 271064536
-
-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
-
-## Id=0x10281DF0 == 271064560
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Id=271064560
-	TierImplUid=271064560
-	Name=Tier2
-	TierThreadName= ESock_IP
-	TierManagerName= ProtoTierManager
-	##By default this is linked to the default AP on the IPProto layer
-	DefaultAccessPoint=Link.AccessPointTable.10001
-	PromptUser=0
-	FIELD_COUNT=7
-END_ADD
-
-## Id=0x10281DF5 == 271064565
-
-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.10000
-	PromptUser=0
-	FIELD_COUNT=7
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Id=536887799
-	TierImplUid=536887799
-	Name=Tier4
-	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=0x10274547
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=ipprotomcpr
-	MCprUid=0x10281DEE
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=pppmcpr
-	MCprUid=0x10281DEC
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=ethmcpr
-	MCprUid=0x10281DFC
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=rawipmcpr
-	MCprUid=0x10281E00
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=tunnelmcpr
-	MCprUid=0x10281E02
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=qospppmcpr
-	MCprUid=0x10281DEC
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=dummynifmcpr
-	MCprUid=0x10281E04
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 9
-	Name=hungrynifmcpr
-	MCprUid=0x10281E04
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 10
-	Name=pdpmcpr
-	MCprUid=0x102822F0
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 11
-	Name=sipmcpr
-	MCprUid=0x200041F9
-	FIELD_COUNT=2
-END_ADD
-
-## PAN Ether MCpr Uid = 271070626 (0x102835A2)
-ADD_SECTION
-# COMMDB_ID = 13
-	Name=panethermcpr
-	MCprUid=271070626
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 14
-	Name=tundrivermcpr
-	MCprUid=0x10281E05
-	FIELD_COUNT=2
-END_ADD
-
-############################################################
-## CprTable
-## 
-[CprTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=ipcpr
-	CprUid=0x102070EF
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=ipprotocpr
-	CprUid=0x10281DD3
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=agentcpr
-	CprUid=0x10281DE8
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=vanillacpr
-	CprUid=0x102822F3
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=sipcpr
-	CprUid=0x10274C38
-	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=0x102822E2
-	FIELD_COUNT=2
-END_ADD
-############################################################
-## SCprTable
-## 
-[SCprTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=qosipscpr
-	SCprUid=0x10204308
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=ipprotoscpr
-	SCprUid=0x10281DD1
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=agentscpr
-	SCprUid=0x10281DEA
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=pdpscpr
-	SCprUid=0x102822E0
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=pppscpr
-	SCprUid=0x102822FC
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=vanillascpr
-	SCprUid=0x102822F4
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=qosscpr
-	SCprUid=0x102822D3
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=sipscpr
-	SCprUid=0x10274C17
-	FIELD_COUNT=2
-END_ADD
-
-############################################################
-## ProtocolTable
-## 
-[ProtocolTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=sapshim
-	ProtocolUid=0x101F7482
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=ipshim4
-	ProtocolUid=0x10281C36
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=ppp
-	ProtocolUid=0x10281C4F
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=ethernet
-	ProtocolUid=0x10281DDB
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=rawip
-	ProtocolUid=0x10281DF2
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=tunnel
-	ProtocolUid=0x10281DF7
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=qosppp
-	ProtocolUid=0x10281C54
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=dummynif
-	ProtocolUid=0x10281C3B
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 9
-	Name=hungrynif
-	ProtocolUid=0x10281C3D
-	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=0x10286AF8
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 14
-	Name=tundriverprotocol
-	ProtocolUid=0x10281C3C
-	FIELD_COUNT=2
-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
-
-##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
-
-##This record here is the template record for the Network level AP generated by CommsDat.
-##It's used when processing SNAP config files
-ADD_SECTION
-# COMMDB_ID = 11
-    ##This name is a predefined name for the template for the Network APs.
-	##Please don't change it!
-	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
-
-ADD_SECTION
-# COMMDB_ID = 14
-	Name=tundriver
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.14
-	Cpr=CprTable.3
-	SCpr=SCprTable.3
-	Protocol=ProtocolTable.14
-	FIELD_COUNT=6
-END_ADD
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/configs/te_tundriver.ini
Binary file linklayerprotocols/tundriver/te_tundriver/configs/te_tundriver.ini has changed
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/configs/te_tundriverced.xml
--- a/linklayerprotocols/tundriver/te_tundriver/configs/te_tundriverced.xml	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
- All rights reserved.
- This component and the accompanying materials are made available
- under the terms of 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.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.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.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 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>TRUE</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>TRUE</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>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>
-    <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>
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/configs/te_tundriverced_cov20.xml
--- a/linklayerprotocols/tundriver/te_tundriver/configs/te_tundriverced_cov20.xml	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
- All rights reserved.
- This component and the accompanying materials are made available
- under the terms of 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.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.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.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 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>TRUE</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></IpNetMask>
-        <IpGateway></IpGateway>
-        <IpAddr>10.1.1.10</IpAddr>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpNameServer2></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>
-    <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>
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/configs/te_tundriverced_cov21.xml
--- a/linklayerprotocols/tundriver/te_tundriver/configs/te_tundriverced_cov21.xml	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
- All rights reserved.
- This component and the accompanying materials are made available
- under the terms of 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.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.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.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 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>TRUE</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></IpNetMask>
-        <IpGateway></IpGateway>
-        <IpAddr>10.1.1.10</IpAddr>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpNameServer1>194.72.6.51</IpNameServer1>
-        <IpNameServer2>194.72.6.52</IpNameServer2>
-    </LANService>
-</LANServiceTable>
-
-<DialInISPTable>
-    <DialInISP operation="template">
-        <Name>Default Dial In ISP</Name>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <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>
-    <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>
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/configs/te_tundriverced_cov22.xml
--- a/linklayerprotocols/tundriver/te_tundriver/configs/te_tundriverced_cov22.xml	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
- All rights reserved.
- This component and the accompanying materials are made available
- under the terms of 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.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.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.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 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>TRUE</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>10.32.194.254</IpNetMask>
-        <IpGateway>10.32.194.251</IpGateway>
-        <IpAddr>10.1.1.10</IpAddr>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpNameServer1>194.72.6.51</IpNameServer1>
-        <IpNameServer2>194.72.6.52</IpNameServer2>
-    </LANService>
-</LANServiceTable>
-
-<DialInISPTable>
-    <DialInISP operation="template">
-        <Name>Default Dial In ISP</Name>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <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>
-    <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>
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/configs/te_tundriverced_cov23.xml
--- a/linklayerprotocols/tundriver/te_tundriver/configs/te_tundriverced_cov23.xml	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
- All rights reserved.
- This component and the accompanying materials are made available
- under the terms of 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.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.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.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 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>TRUE</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></IpNetMask>
-        <IpGateway></IpGateway>
-        <IpAddr>10.1.1.10</IpAddr>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpNameServer1></IpNameServer1>
-        <IpNameServer2></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>
-    <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>
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/configs/te_tundriverced_cov24.xml
--- a/linklayerprotocols/tundriver/te_tundriver/configs/te_tundriverced_cov24.xml	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
- All rights reserved.
- This component and the accompanying materials are made available
- under the terms of 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.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.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.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 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>TRUE</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>ip6,ip</IfNetworks>
-        <IpNetMask></IpNetMask>
-        <IpGateway>10.225.162.1</IpGateway>
-        <IpAddr>10.1.1.10</IpAddr>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDINSAddrFromServer>FALSE</IpDINSAddrFromServer>
-        <IpNameServer2></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>
-    <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>
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/configs/te_tundriverced_cov25.xml
--- a/linklayerprotocols/tundriver/te_tundriver/configs/te_tundriverced_cov25.xml	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
- All rights reserved.
- This component and the accompanying materials are made available
- under the terms of 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.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.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.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 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>TRUE</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></IpNetMask>
-        <IpGateway></IpGateway>
-        <IpAddr>10.1.1.10</IpAddr>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpNameServer1>10.225.166.20</IpNameServer1>
-        <IpNameServer2></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>
-    <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>
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/configs/te_tundriverced_cov26.xml
--- a/linklayerprotocols/tundriver/te_tundriver/configs/te_tundriverced_cov26.xml	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
- All rights reserved.
- This component and the accompanying materials are made available
- under the terms of 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.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.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.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 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>TRUE</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></IpNetMask>
-        <IpAddr>10.1.1.10</IpAddr>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpNameServer1>10.225.166.20</IpNameServer1>
-        <IpNameServer2></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>
-    <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>
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/configs/te_tundriverced_cov27.xml
--- a/linklayerprotocols/tundriver/te_tundriver/configs/te_tundriverced_cov27.xml	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
- All rights reserved.
- This component and the accompanying materials are made available
- under the terms of 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.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.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.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 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>TRUE</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></IpNetMask>
-        <IpAddr>10.1.1.10</IpAddr>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpNameServer2></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>
-    <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>
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/configs/te_tundriverced_cov28.xml
--- a/linklayerprotocols/tundriver/te_tundriver/configs/te_tundriverced_cov28.xml	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
- All rights reserved.
- This component and the accompanying materials are made available
- under the terms of 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.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.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.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 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>TRUE</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></IpNetMask>
-        <IpGateway></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>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>
-    <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>
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/configs/te_tundriverced_cov29.xml
--- a/linklayerprotocols/tundriver/te_tundriver/configs/te_tundriverced_cov29.xml	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
- All rights reserved.
- This component and the accompanying materials are made available
- under the terms of 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.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.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.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 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>TRUE</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>12.12.1.2</IpNetMask>
-        <IpGateway>23.23.23.2</IpGateway>
-        <IpAddr>10.1.1.10</IpAddr>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpNameServer1>10.2.1.2</IpNameServer1>
-        <IpNameServer2>12.3.4.4</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>
-    <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>
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/configs/te_tundriverced_cov30.xml
--- a/linklayerprotocols/tundriver/te_tundriver/configs/te_tundriverced_cov30.xml	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
- All rights reserved.
- This component and the accompanying materials are made available
- under the terms of 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.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.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.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 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>TRUE</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>12.12.1.2</IpNetMask>
-        <ItGateway>23.23.23.2</ItGateway>
-        <IpAddr>10.1.1.10</IpAddr>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <IpNameServer1>10.2.1.2</IpNameServer1>
-        <IpNameServer2>12.3.4.4</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>
-    <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>
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/configs/te_tundriverced_cov31.xml
--- a/linklayerprotocols/tundriver/te_tundriver/configs/te_tundriverced_cov31.xml	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
- All rights reserved.
- This component and the accompanying materials are made available
- under the terms of 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.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.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.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 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>TRUE</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>12.12.1.2</IpNetMask>
-        <ItGateway>23.23.23.2</ItGateway>
-        <IpAddr>10.1.1.10</IpAddr>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpNameServer1>10.2.1.2</IpNameServer1>
-        <IpNameServer2>12.3.4.4</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>
-    <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>
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/configs/te_tundriverced_cov32.xml
--- a/linklayerprotocols/tundriver/te_tundriver/configs/te_tundriverced_cov32.xml	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
- All rights reserved.
- This component and the accompanying materials are made available
- under the terms of 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.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.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.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 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>TRUE</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></IpNetMask>
-        <IpGateway></IpGateway>
-        <IpAddr>10.1.1.10</IpAddr>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <IpNameServer2></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>
-    <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>
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/configs/te_tundriverced_cov33.xml
--- a/linklayerprotocols/tundriver/te_tundriver/configs/te_tundriverced_cov33.xml	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
- All rights reserved.
- This component and the accompanying materials are made available
- under the terms of 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.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.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.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 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>TRUE</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>ry</IfNetworks>
-        <IpNetMask></IpNetMask>
-        <IpGateway></IpGateway>
-        <IpAddr>10.1.1.10</IpAddr>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpNameServer1></IpNameServer1>
-        <IpNameServer2></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>
-    <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>
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/configs/te_tundrivercedip6.xml
--- a/linklayerprotocols/tundriver/te_tundriver/configs/te_tundrivercedip6.xml	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
- All rights reserved.
- This component and the accompanying materials are made available
- under the terms of 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.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>ip6</IfNetworks>
-        <IpGateway>ff02::1:ff8a:c0eb</IpGateway>
-        <IpAddr>fe80::19:5bff:fe8a:c0eb</IpAddr>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpNameServer1>ff02::1:ff8a:c0eb</IpNameServer1>
-        <IpNameServer2>2001:5c0:92cf::c0a8:1</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.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 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>TRUE</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>ip6</IfNetworks>
-        <IpGateway>ff02::1:ff8a:c0eb</IpGateway>
-        <IpAddr>fe80::19:5bff:fe8a:c0eb</IpAddr>
-        <IpAddrFromServer>FALSE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpNameServer1>ff02::1:ff8a:c0eb</IpNameServer1>
-        <IpNameServer2>2001:5c0:92cf::c0a8:1</IpNameServer2>
-        <ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
-        <ConfigDaemonName>!DhcpServ</ConfigDaemonName>
-    </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>
-    <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>
-
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/group/bld.inf
--- a/linklayerprotocols/tundriver/te_tundriver/group/bld.inf	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-// 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_tundriver.iby                    /epoc32/rom/include/te_tundriver.iby
-
-../configs/te_tundriverced.xml	        z:/testdata/configs/te_tundriverced.xml
-../configs/te_tundrivercedip6.xml	z:/testdata/configs/te_tundrivercedip6.xml
-../configs/te_tundriverced_cov20.xml    z:/testdata/configs/te_tundriverced_cov20.xml
-../configs/te_tundriverced_cov21.xml    z:/testdata/configs/te_tundriverced_cov21.xml
-../configs/te_tundriverced_cov22.xml    z:/testdata/configs/te_tundriverced_cov22.xml
-../configs/te_tundriverced_cov23.xml	z:/testdata/configs/te_tundriverced_cov23.xml
-../configs/te_tundriverced_cov24.xml	z:/testdata/configs/te_tundriverced_cov24.xml
-../configs/te_tundriverced_cov25.xml	z:/testdata/configs/te_tundriverced_cov25.xml
-../configs/te_tundriverced_cov26.xml	z:/testdata/configs/te_tundriverced_cov26.xml
-../configs/te_tundriverced_cov27.xml	z:/testdata/configs/te_tundriverced_cov27.xml
-../configs/te_tundriverced_cov28.xml	z:/testdata/configs/te_tundriverced_cov28.xml
-../configs/te_tundriverced_cov29.xml	z:/testdata/configs/te_tundriverced_cov29.xml
-../configs/te_tundriverced_cov30.xml	z:/testdata/configs/te_tundriverced_cov30.xml
-../configs/te_tundriverced_cov31.xml	z:/testdata/configs/te_tundriverced_cov31.xml
-../configs/te_tundriverced_cov32.xml	z:/testdata/configs/te_tundriverced_cov32.xml
-../configs/te_tundriverced_cov33.xml	z:/testdata/configs/te_tundriverced_cov33.xml
-../configs/te_tundriver.ini	        z:/testdata/configs/te_tundriver.ini
-../scripts/te_tundriver.script 	        z:/testdata/scripts/te_tundriver.script
-
-../inc/te_TcpSslTestEngine.h	/epoc32/include/te_tcpssltestengine.h
-
-PRJ_TESTMMPFILES
-./te_tundriver.mmp
-
-#include "../Dummy3rdPartyApp/group/bld.inf"
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/group/te_tundriver.iby
--- a/linklayerprotocols/tundriver/te_tundriver/group/te_tundriver.iby	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-// 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_TUNDRIVER_IBY__
-#define __TE_TUNDRIVER_IBY__
-
-#include <testexecute.iby>
-#include <Dummy3rdPartyApp.iby>
-#include <tundriver.iby>
-
-data=ABI_DIR\DEBUG_DIR\te_tundriver.exe		System\bin\te_tundriver.exe
-
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_tundriver.script 	testdata\scripts\te_tundriver.script
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_tundriverced.xml	testdata\configs\te_tundriverced.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_tundriverced_cov20.xml	testdata\configs\te_tundriverced_cov20.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_tundriverced_cov21.xml	testdata\configs\te_tundriverced_cov21.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_tundriverced_cov22.xml	testdata\configs\te_tundriverced_cov22.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_tundriverced_cov23.xml	testdata\configs\te_tundriverced_cov23.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_tundriverced_cov24.xml	testdata\configs\te_tundriverced_cov24.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_tundriverced_cov25.xml	testdata\configs\te_tundriverced_cov25.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_tundriverced_cov26.xml	testdata\configs\te_tundriverced_cov26.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_tundriverced_cov27.xml	testdata\configs\te_tundriverced_cov27.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_tundriverced_cov28.xml	testdata\configs\te_tundriverced_cov28.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_tundriverced_cov29.xml	testdata\configs\te_tundriverced_cov29.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_tundriverced_cov30.xml	testdata\configs\te_tundriverced_cov30.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_tundriverced_cov31.xml	testdata\configs\te_tundriverced_cov31.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_tundriverced_cov32.xml	testdata\configs\te_tundriverced_cov32.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_tundriverced_cov33.xml	testdata\configs\te_tundriverced_cov33.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_tundrivercedip6.xml	testdata\configs\te_tundrivercedip6.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_tundriver.ini	testdata\configs\te_tundriver.ini
-
-#endif //__TE_TUNDRIVER_IBY__
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/group/te_tundriver.mmp
--- a/linklayerprotocols/tundriver/te_tundriver/group/te_tundriver.mmp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-// 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_tundriver.mmp for Testing the Virtual tunnel functionality for SSL VPN.
-//
-
-
-
-/**
- @file te_tundriver.mmp
-*/
-
-TARGET          te_tundriver.exe
-TARGETTYPE      exe
-
-SOURCEPATH      ../src
-SOURCE		    te_tundrivertestserver.cpp 
-SOURCE          te_tundrivertestblock.cpp 
-SOURCE          te_tundrivertestwrapper.cpp
-SOURCE          te_TcpSslTestEngine.cpp
-
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE   /epoc32/include
-SYSTEMINCLUDE	/epoc32/include/libc
-SYSTEMINCLUDE   /epoc32/include/test
-#else
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-SYSTEMINCLUDE	/epoc32/include/libc
-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
-
-
-VENDORID 0x70000001
-
-UID 0x1000028d 0x2009D48D
-CAPABILITY All -TCB
-
-UNPAGED
-
-SMPSAFE
-
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/inc/te_TcpSslTestEngine.h
--- a/linklayerprotocols/tundriver/te_tundriver/inc/te_TcpSslTestEngine.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,193 +0,0 @@
-/*
- * TcpTestEngine.h
- *
- *  Created on: Jan 28, 2010
- *      Author: GUNAGI
- */
-
-#ifndef TE_TCPSSLTESTENGINE_H_
-#define TE_TCPSSLTESTENGINE_H_
-
-#include <e32cons.h>
-#include <c32comm.h>
-#include <in_sock.h>
-#include <es_sock.h> 
-#include <f32file.h> 
-#include <commdbconnpref.h>
-
-/** Number of chars allowed for address & page settings */
-const TInt KSettingFieldWidth = 128;
-
-/** Global variables */
-// File system sesion path
-// IP file where the system IP is mentioned
-//_LIT8(hostIpAddress, "10.225.164.117");
-//const TInt KPortNum = 80;
-
-_LIT8(hostIpAddress, "10.1.1.1");
-const TInt KPortNum = 80;
-
-/** Connection settings to access a server  */
-struct TConnectSettings
-    {
-    /** Server address (as text) */
-    TBuf<KSettingFieldWidth> iAddress;
-    /** Server port */
-    TInt iPortNum;
-    /** Web page to get from the server */
-    TBuf8<KSettingFieldWidth> iPage;
-    };
-
-/**
-    Manages connection to a SSL web server.
-*/
-class CTcpSslTestEngine : public CActive
-    {
-public:
-/**
-Allocates and constructs a new engine.
-@return New object
-*/
-    static CTcpSslTestEngine *NewL();
-/**
-Destructor.
-*/
-    ~CTcpSslTestEngine();
-/**
-Initiates the connection to a server and the transaction
-
-    @param aAddress Server address (e.g. www.symbian.com or dotted decimal format)
-
-    @param aPortNum Server port for secure web (e.g. 443)
-
-    @param aPage Web page to get from the server. The leading `/` should be included, e.g. /webpage.html.
-
-    @param aCipherSuite Cipher suites that client will tell server it supports (decimal). This 
-    should be in decimal, with 2 characters, ie for suites 3,7,8,9, this field would be 03070809.
-    By entering a single `0` for this field, the SSL default cipher suites will be passed.
-
-    @param aCipher Cipher suite that server is expected to use (decimal). This is compared with 
-    actual cipher for pass/fail. If this field is 0, no comparisons with the actual cipher 
-    suite used will be made.
-
-*/
-    void ConnectL( const TConnectSettings& aConnectSettings );
-/**
-Sets the console to write messages to
-
-@param aConsole The console
-*/
-    void SetConsole( CConsoleBase& aConsole );
-
-/**
-Sets the (opened) file to write server response to
-
-@param aOutputFile The file
-*/
-    void SetOutputFile( RFile& aOutputFile );
-
-
-    void Initialize();
-    
-    /**
-Tests if the connection is in progress.
-
-@return True if in progress else false
-*/
-    TBool InUse();
-
-    
-private:
-    /** Engine states */
-    enum TStates  
-        {
-        /** IP connection initiated */
-        ESocketConnected,
-        /** Setting the ciphers for a secure connection */
-        ESettingCiphers,
-        /** Secure socket request initiated */
-        ESecureConnected,
-        /** Send get page request to server */
-        EGetRequestSent,
-        /** Server has responded to request */
-        EDataReceived,
-        /** Connection closed down */
-        EConnectionClosed
-        };
-    
-private:
-    /** Constructor. */
-    CTcpSslTestEngine();    
-    /** Second phase constructor. */
-    void ConstructL();
-
-    // Methods from CActive
-    /** Previous state has completed. */
-    void RunL();
-    /** Cancel request */
-    void DoCancel();
-    /** Handles a leave occurring in RunL(). */
-    TInt RunError( TInt aError );
-    
-    // Handle particular engine states
-    /** Attempts secure connection. */
-    void MakeConnectionL();
-    /** Sends page request to server */ 
-    void MakePageRequestL();
-    /** Start getting server's response to the request */
-    void GetServerResponseL();
-    /** Finish getting server's response */
-    void ReadServerResponseL();
-    /** Handle connection completed */
-    void ConnectionClosed();
-
-private:
-    // Sockets objects
-    /** The socket server */
-    RSocketServ iSocketServ;
-    /** Socket to make connection on */
-    RSocket iSocket;
-    /** For resolving DNS addresses */
-    RHostResolver iHostResolver;
-    /** Server address */
-    TInetAddr iInetAddr;
-
-    // Connection parameters
-    const TConnectSettings* iConnectSettings;
-
-    // Transfer buffers and counters
-    /** Data sent buffer */
-    TPtr8 iSndBuffer;
-    /** #bytes sent */
-    TSockXfrLength iBytesSent;
-    /** Data received buffer */
-    TPtr8 iRcvBuffer;
-    /** #bytes received */
-    TInt iTotalBytesRead;
-
-    /** For retries, after a delay */
-    RTimer iTimer;
-
-    /** Output console */
-    CConsoleBase *iConsole;
-    /** Output file */
-    RFile* iOutputFile;
-
-    // Flags and state
-    /** True if the transation completed successfully */
-    TBool       iSuccess;
-    /** True if success on first attempt */
-    TBool   iFirstRunFlag;
-    /** True if connection is in progress */
-    TBool   iInUse;
-    /** Engine state (a TStates value) */
-    TInt    iRunState;
-    
-    /** Counter for stopping making connections */
-    TInt iCounter;
-    
-    RFs iFs;
-    };
-
-
-#endif /* TE_TCPSSLTESTENGINE_H_ */
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/inc/te_tundrivertestblock.h
--- a/linklayerprotocols/tundriver/te_tundriver/inc/te_tundrivertestblock.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-
-/**
- @file te_tundrivertestblock.h
- @internalTechnology
-*/
-
-#ifndef TE_TUNDRIVERTESTBLOCK_H
-#define TE_TUNDRIVERTESTBLOCK_H
-
-#include <test/testblockcontroller.h>
-#include "te_tundrivertestwrapper.h"
-
-/**
-Wrapper name
-*/
-_LIT(KTunDriverTestWrapper, "TunDriverTestWrapper");
-
-/**
-Class implements the TEF3.0 specific test block controller.
-*/
-class CTunDriverTestBlock : public CTestBlockController
-	{
-public:
-    CTunDriverTestBlock() : CTestBlockController() {}
-	~CTunDriverTestBlock() {}
-	CDataWrapper* CreateDataL(const TDesC& aData);
-	};
-	
-#endif //TE_TUNDRIVERTESTBLOCK_H
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/inc/te_tundrivertestserver.h
--- a/linklayerprotocols/tundriver/te_tundriver/inc/te_tundrivertestserver.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-
-/**
- @file te_tundrivertestserver.h
- @internalTechnology
-*/
-
-#ifndef TE_TUNDRIVERTESTSERVER_H
-#define TE_TUNDRIVERTESTSERVER_H
-
-#include <test/testserver2.h>
-#include "te_tundrivertestblock.h"
-
-/**
-Class implements the TEF3.0 specific test server
-*/
-class CTunDriverTestServer : public CTestServer2
-	{
-public:
-    CTunDriverTestServer() {}
-	~CTunDriverTestServer() {}
-	CTestBlockController* CreateTestBlock();
-	CTestBlockController* CreateTestBlockL();
-	static CTunDriverTestServer* NewL();
-	};
-
-#endif // TE_TUNDRIVERTESTSERVER_H
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/inc/te_tundrivertestwrapper.h
--- a/linklayerprotocols/tundriver/te_tundriver/inc/te_tundrivertestwrapper.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-// 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 te_tundrivertestwrapper.h
- @internalTechnology
-*/
-
-#ifndef TE_TUNDRIVERTESTWRAPPER_H
-#define TE_TUNDRIVERTESTWRAPPER_H
-
-
-#include <test/datawrapper.h>
-#include <e32base.h>
-#include <e32std.h>
-#include <e32cons.h>            // Console
-#include <es_sock.h>
-#include <in_sock.h>
-#include <nifman.h>
-#include <commdbconnpref.h>
-#include <metadatabase.h> 
-#include "te_TcpSslTestEngine.h"
-
-_LIT(KDummy3rdPartyApp,"Dummy3rdpartyApp.exe");
-_LIT(KArg,"NULL");
-
-/**
-Forward declaration
-*/ 
-
-class RSocketServ;
-
-/**
-Class implements the CDataWrapper base class and provides the commands used by the scripts file
-*/
-class CTunDriverTestWrapper : public CDataWrapper
-	{
-public:
-	CTunDriverTestWrapper();
-	~CTunDriverTestWrapper();
-	
-	static	CTunDriverTestWrapper*	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();
-		
-private:
-    TInt StartD3PApp();
-    void StopD3PApp();
-    void StartConn();
-    void DoRConnTest1_1();
-    void DoRConnTest1_2();
-    void DoRConnTest1_3(const TDesC& aSection);
-    void DoRConnTest1_4(const TDesC& aSection);
-    void DoRConnTest1_5(const TDesC& aSection);
-    void DoRConnTest1_6(const TDesC& aSection);
-    void DoRConnTest1_7(const TDesC& aSection);
-    void DoRConnTest1_8(const TDesC& aSection);
-    void DoRConnTest1_9(const TDesC& aSection);
-    void DoRConnTest1_10(const TDesC& aSection);
-    void DoRConnTest1_11();
-    void DoRConnTest1_12();
-    void DoRConnTest1_13(const TDesC& aSection);
-    void DoRConnTest1_14(const TDesC& aSection);
-    void DoRConnTest1_15();
-    void DoRConnTest1_16(const TDesC& aSection);
-    void DoRConnTest1_17(const TDesC& aSection);
-    void DoRConnTest1_20();
-    void DoRConnTest1_21();
-    void DoRConnTest1_22();    
-    void DoRConnTest1_23();
-    void DoRConnTest1_24();
-    void DoRConnTest1_25();
-    void DoRConnTest1_26();
-    void DoRConnTest1_27();
-    void DoRConnTest1_28();
-    void DoRConnTest1_29();
-    void DoRConnTest1_30();
-    void DoRConnTest1_31();
-	void DoRConnTest1_32();
-	void DoRConnTest1_33();
-    TBool FindInterface(TPckgBuf<TSoInet6InterfaceInfo> &info);
-
-private:
-	TBuf<128>          iNextTestCaseInput;
-		
-    TRequestStatus     iStatus;
-    TInt               iVTunError;
-    TUint              iInitNumOfInterfaces, iCurNumOfInterfaces;  
-    TInetAddr          iDestAddr, iRealDestAddr;
-    TInt               iDestPort, iRealDestPort; 
-    RSocketServ        iSocketServ, iSocketServ1, iSocketServ2;
-    RSocket            iSocket, iSocket1, iSocket2;
-    RConnection        iConnection, iConnection1, iConnection2;
-    
-    RConnection        *pConn, *pConn1, *pConn2;
-    RProcess           p;
-    TBuf8<128>         iSendBuf, iRecvBuf;
-    
-    TCommDbConnPref    iCommDbPref, iCommDbPref1, iCommDbPref2;
-    
-	};
-	
-
-#endif //TE_TUNDRIVERTESTWRAPPER_H
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/scripts/te_tundriver.script
--- a/linklayerprotocols/tundriver/te_tundriver/scripts/te_tundriver.script	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,383 +0,0 @@
-//
-// 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:        Gurpreet Singh Nagi
-//
-// Description:
-//
-//! @file
-//! @SYMTestSuiteName       
-//! @SYMScriptTestEnvironment TestExecuteFramework
-//
-//Unload esock forcefully
-//RUN_SCRIPT z:\testdata\scripts\te_esock_test_unloadesockForced.script
-
-
-RUN_SCRIPT z:\testdata\scripts\te_esock_test_loadesock.script
-
-//Load the Server
-LOAD_SERVER te_tundriver
-
-//Configure commdb.
-ced -i z:\testdata\configs\te_tundriverced.xml
-
-START_TESTCASE                  SSLVPN-tundriver-test7
-
-	START_TEST_BLOCK te_tundriver 600 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test7
-		COMMAND tundriver_test7 RConnTest1_7		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test7
-
-START_TESTCASE                  SSLVPN-tundriver-test1
-
-	START_TEST_BLOCK te_tundriver 100 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test1
-		COMMAND tundriver_test1 RConnTest1_1		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test1
-
-
-START_TESTCASE                  SSLVPN-tundriver-test2
-
-	START_TEST_BLOCK te_tundriver 100 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test2
-		COMMAND tundriver_test2 RConnTest1_2		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test2
-
-
-START_TESTCASE                  SSLVPN-tundriver-test3
-
-	START_TEST_BLOCK te_tundriver 100 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test3
-		COMMAND tundriver_test3 RConnTest1_3		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test3
-
-
-START_TESTCASE                  SSLVPN-tundriver-test4
-
-	START_TEST_BLOCK te_tundriver 100 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test4
-		COMMAND tundriver_test4 RConnTest1_4		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test4
-
-
-START_TESTCASE                  SSLVPN-tundriver-test5
-
-	START_TEST_BLOCK te_tundriver 300 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test5
-		COMMAND tundriver_test5 RConnTest1_5		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test5
-
-START_TESTCASE                  SSLVPN-tundriver-test6
-
-	START_TEST_BLOCK te_tundriver 300 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test6
-		COMMAND tundriver_test6 RConnTest1_6		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test6
-
-START_TESTCASE                  SSLVPN-tundriver-test8
-
-	START_TEST_BLOCK te_tundriver 300 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test8
-		COMMAND tundriver_test8 RConnTest1_8		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test8
-
-
-START_TESTCASE                  SSLVPN-tundriver-test9
-
-	START_TEST_BLOCK te_tundriver 300 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test9
-		COMMAND tundriver_test9 RConnTest1_9		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test9
-
-
-START_TESTCASE                  SSLVPN-tundriver-test10
-
-	START_TEST_BLOCK te_tundriver 500 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test10
-		COMMAND tundriver_test10 RConnTest1_10		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test10
-
-START_TESTCASE                  SSLVPN-tundriver-test11
-
-	START_TEST_BLOCK te_tundriver 300 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test11
-		COMMAND tundriver_test11 RConnTest1_11		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test11
-
-
-START_TESTCASE                  SSLVPN-tundriver-test14
-
-	START_TEST_BLOCK te_tundriver 300 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test14
-		COMMAND tundriver_test14 RConnTest1_14		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test14
-
-
-START_TESTCASE                  SSLVPN-tundriver-test15
-
-	START_TEST_BLOCK te_tundriver 500 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test15
-		COMMAND tundriver_test15 RConnTest1_15		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test15
-
-START_TESTCASE                  SSLVPN-tundriver-test16
-
-	START_TEST_BLOCK te_tundriver 5000 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test16
-		COMMAND tundriver_test16 RConnTest1_16		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test16
-
-
-START_TESTCASE                  SSLVPN-tundriver-test17
-
-	START_TEST_BLOCK te_tundriver 300 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test17
-		COMMAND tundriver_test17 RConnTest1_17		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test17
-
-DELAY 5000
-
-START_TESTCASE                  SSLVPN-tundriver-test13
-
-	START_TEST_BLOCK te_tundriver 300 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test13
-		COMMAND tundriver_test13 RConnTest1_13		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test13
-
-DELAY 5000
-
-START_TESTCASE                  SSLVPN-tundriver-test12
-
-	START_TEST_BLOCK te_tundriver 300 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test12
-		COMMAND tundriver_test12 RConnTest1_12		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test12
-
-DELAY 5000
-
-ced -i z:\testdata\configs\te_tundriverced_cov20.xml
-
-START_TESTCASE                  SSLVPN-tundriver-test20
-
-	START_TEST_BLOCK te_tundriver 200 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test20
-		COMMAND tundriver_test20 RConnTest1_20		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test20
-
-DELAY 5000
-
-ced -i z:\testdata\configs\te_tundriverced_cov21.xml
-
-START_TESTCASE                  SSLVPN-tundriver-test21
-
-	START_TEST_BLOCK te_tundriver 200 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test21
-		COMMAND tundriver_test21 RConnTest1_21		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test21
-
-DELAY 5000
-
-ced -i z:\testdata\configs\te_tundriverced_cov22.xml
-
-START_TESTCASE                  SSLVPN-tundriver-test22
-
-	START_TEST_BLOCK te_tundriver 200 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test22
-		COMMAND tundriver_test22 RConnTest1_22		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test22
-
-DELAY 5000
-
-
-ced -i z:\testdata\configs\te_tundriverced_cov23.xml
-
-START_TESTCASE                  SSLVPN-tundriver-test23
-
-	START_TEST_BLOCK te_tundriver 200 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test23
-		COMMAND tundriver_test23 RConnTest1_23		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test23
-
-DELAY 5000
-
-ced -i z:\testdata\configs\te_tundriverced_cov24.xml
-
-START_TESTCASE                  SSLVPN-tundriver-test24
-
-	START_TEST_BLOCK te_tundriver 200 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test24
-		COMMAND !Error=-20 tundriver_test24 RConnTest1_24		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test24
-
-DELAY 5000
-
-ced -i z:\testdata\configs\te_tundriverced_cov25.xml
-
-START_TESTCASE                  SSLVPN-tundriver-test25
-
-	START_TEST_BLOCK te_tundriver 200 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test25
-		COMMAND tundriver_test25 RConnTest1_25		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test25
-
-DELAY 5000
-
-ced -i z:\testdata\configs\te_tundriverced_cov26.xml
-
-START_TESTCASE                  SSLVPN-tundriver-test26
-
-	START_TEST_BLOCK te_tundriver 200 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test26
-		COMMAND tundriver_test26 RConnTest1_26		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test26
-
-DELAY 5000
-
-ced -i z:\testdata\configs\te_tundriverced_cov27.xml
-
-START_TESTCASE                  SSLVPN-tundriver-test27
-
-	START_TEST_BLOCK te_tundriver 200 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test27
-		COMMAND tundriver_test27 RConnTest1_27		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test27
-
-DELAY 5000
-
-ced -i z:\testdata\configs\te_tundriverced_cov28.xml
-
-START_TESTCASE                  SSLVPN-tundriver-test28
-
-	START_TEST_BLOCK te_tundriver 200 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test28
-		COMMAND tundriver_test28 RConnTest1_28		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test28
-
-DELAY 5000
-
-ced -i z:\testdata\configs\te_tundriverced_cov29.xml
-
-START_TESTCASE                  SSLVPN-tundriver-test29
-
-	START_TEST_BLOCK te_tundriver 200 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test29
-		COMMAND tundriver_test29 RConnTest1_29		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test29
-
-DELAY 5000
-
-ced -i z:\testdata\configs\te_tundriverced_cov30.xml
-
-START_TESTCASE                  SSLVPN-tundriver-test30
-
-	START_TEST_BLOCK te_tundriver 200 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test30
-		COMMAND tundriver_test30 RConnTest1_30		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test30
-
-DELAY 5000
-
-ced -i z:\testdata\configs\te_tundriverced_cov31.xml
-
-START_TESTCASE                  SSLVPN-tundriver-test31
-
-	START_TEST_BLOCK te_tundriver 200 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test31
-		COMMAND tundriver_test31 RConnTest1_31		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test31
-
-DELAY 5000
-
-ced -i z:\testdata\configs\te_tundriverced_cov32.xml
-
-START_TESTCASE                  SSLVPN-tundriver-test32
-
-	START_TEST_BLOCK te_tundriver 200 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test32
-		COMMAND tundriver_test32 RConnTest1_32		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test32
-
-DELAY 5000
-
-ced -i z:\testdata\configs\te_tundriverced_cov33.xml
-
-START_TESTCASE                  SSLVPN-tundriver-test33
-
-	START_TEST_BLOCK te_tundriver 200 z:\testdata\configs\te_tundriver.ini
-		CREATE_OBJECT TunDriverTestWrapper tundriver_test33
-		COMMAND !Error=-20 tundriver_test33 RConnTest1_33		
-	END_TEST_BLOCK
-
-END_TESTCASE                  SSLVPN-tundriver-test33
-
-//RUN_SCRIPT z:\TestData\scripts\te_esock_test_stopallinterfaces.script
-//RUN_SCRIPT z:\testdata\scripts\te_esock_test_unloadesockForced.script
-
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/src/te_TcpSslTestEngine.cpp
--- a/linklayerprotocols/tundriver/te_tundriver/src/te_TcpSslTestEngine.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,428 +0,0 @@
-/*
- * te_TcpSslTestEngine.cpp
- *
- *  Created on: Jan 28, 2010
- *      Author: GUNAGI
- */
-
-
-#include "te_TcpSslTestEngine.h"
-#include <commdbconnpref.h>
-
-// Send buffer size
-const TInt KSendBufferSize = 512;
-// Receive buffer size
-const TInt KReceiveBufferSize = 256;
-// Maximum number of connection attempts
-const TInt KMaxAttempts = 200;
-// KYes Size
-const TInt KYesSize = 3;
-// KMessage Size
-const TInt KMessageSize = 35;
-// KNullDesC Size
-const TInt KNullDesCSize = 0;
-// Key header
-const TInt KeyHeader = 0x400;
-//const TInt KeyHeader = 0x04;
-// Delay
-const TInt KDelay = 100000;
-
-_LIT(KYes,"Yes");
-_LIT(KInputFile, "C:\\t_secdlg_in.dat");
-_LIT(KOutputFile, "C:\\t_secdlg_out.dat");
-_LIT(KMessage, "Passphrase of the imported key file");
-//_LIT(KMessage, "1234");
-
-// HTTP messages
-_LIT8(KSimpleGet, "GET ");
-_LIT8(KNewLine, "\r\n"); 
-_LIT8(KHeader, "Connection: close\r\nUser-Agent: SSL_TEST\r\nAccept-Encoding:\r\nAccept: */*");
-
-// Progress messages
-_LIT(KConnnectedMessage, "\nConnecting to %S:%d%S\n");
-_LIT(KSecureConnnectingMessage, "\nMaking secure connection");
-_LIT(KGettingPageMessage, "\nRequesting web page");
-_LIT(KReceivingMessage,"\nReceiving server response");
-_LIT(KCipherSuiteInUseMessage,"\nCipher suite in use: %S");
-_LIT(KProtocolMessage, "\nProtocol used in connection: %S");
-_LIT(KReceivedMessage,"\nReceived server response\n");
-_LIT(KCompleteMessage,"\nTransaction complete: bytes recieved %d");
-_LIT(KFileErrorMessage,"\nError in writing data to file");
-_LIT(KCancelledMessage,"\nConnection closed");
-_LIT(KFailSocketMessage,"\nFailed to open socket: %d");
-
-// State reporting messages
-_LIT( KStateErrESocketConnected1, "\nError in state connecting socket: %d\n" );
-_LIT( KStateErrESocketConnected, "\nError in state ESocketConnected: %d\n" );
-_LIT( KStateErrESettingCiphers, "\nError in state ESettingCiphers: %d\n" );
-_LIT( KStateErrSecureConnected, "\nError in state ESecureConnected: %d\n" );
-_LIT( KStateErrGetRequestSent, "\nError in state EGetRequestSent: %d\n" );
-_LIT( KStateErrEDataReceived, "\nError in state EDataReceived: %d\n" );
-
-// Panic code
-_LIT( KTcpSslEnginePanic, "TCPSSL-ENGINE");
-
-//
-// CTcpSslTestEngine
-//
-
-CTcpSslTestEngine* CTcpSslTestEngine::NewL()
-    {
-    CTcpSslTestEngine* self = new(ELeave) CTcpSslTestEngine;
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop();        
-    return self;
-    }
-
-// Constructor should also call the parent constructor to set the priority
-// of the active object.
-CTcpSslTestEngine::CTcpSslTestEngine() 
-: CActive(0), iSndBuffer(0,0), iRcvBuffer(0,0)
-            {
-            }
-
-CTcpSslTestEngine::~CTcpSslTestEngine()
-    {
-    // Cancel any outstanding request- this cleans up
-    // resources created during a connection
-    //Cancel(); 
-    ConnectionClosed();
-    // Clean up engine's permanent resources
-    delete (void*)iSndBuffer.Ptr();
-    delete (void*)iRcvBuffer.Ptr();
-    iTimer.Close();
-    iSocketServ.Close();
-    }
-
-void CTcpSslTestEngine::ConstructL()
-    {
-    iSndBuffer.Set((TUint8*)User::AllocL(KSendBufferSize),0,KSendBufferSize);
-    iRcvBuffer.Set((TUint8*)User::AllocL(KReceiveBufferSize),0,KReceiveBufferSize);
-    // Connect the socket server
-    User::LeaveIfError( iSocketServ.Connect()); 
-    // Create a local timer
-    User::LeaveIfError( iTimer.CreateLocal());
-    // Set initial state
-    iRunState = ESocketConnected;
-    iInUse = EFalse;
-
-    CActiveScheduler::Add( this );
-
-    }
-
-void CTcpSslTestEngine::ConnectL(const TConnectSettings& aConnectSettings)
-    {
-    iConnectSettings = &aConnectSettings;
-
-    // Set initial values for flags & buffers
-    iSuccess = ETrue;
-    iInUse = ETrue;
-    iRunState = ESocketConnected;
-    iSndBuffer.SetLength( 0 );
-    iRcvBuffer.SetLength( 0 );
-    iTotalBytesRead = 0;
-
-    TRequestStatus status;
-    RConnection rCon;
-    TInt ret = rCon.Open(iSocketServ);
-    iConsole->Printf(_L("Connection open with = %d\n"), ret);
-
-    TCommDbConnPref commDbPref;
-    commDbPref.SetIapId(12);
-    commDbPref.SetBearerSet(KCommDbBearerVirtual);
-    commDbPref.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-
-    rCon.Start(commDbPref, status);
-    User::WaitForRequest(status);
-
-    // Interpret server address
-    if (iInetAddr.Input(iConnectSettings->iAddress) != KErrNone)
-        // Success if already in dotted-decimal format
-        {
-        // Connect to a host resolver (for DNS resolution) - happens sychronously
-        //User::LeaveIfError( iHostResolver.Open( iSocketServ, KAfInet, KProtocolInetTcp, rCon ));
-        // Try to resolve symbolic name
-        //TNameEntry nameEntry;
-        //User::LeaveIfError (iHostResolver.GetByName( iConnectSettings->iAddress, nameEntry ));
-        //TSockAddr sockAddr = nameEntry().iAddr;
-        //iInetAddr = iInetAddr.Cast( sockAddr );
-        //iHostResolver.Close();
-        }
-
-    // Store other connection parameters
-    iInetAddr.SetPort( iConnectSettings->iPortNum );
-
-    /*   RSocketServ SockServ;
-     SockServ.Connect();
-
-     TInt err(0);
-     TInt ret = rCon.Open(SockServ);
-     iConsole->Printf(_L("Connection open with = %d\n"), ret);*/
-
-
-    // Open a TCP socket
-    ret = iSocket.Open( iSocketServ, KAfInet, KSockStream, KProtocolInetTcp, rCon );
-
-    if(ret != KErrNone)
-        {
-        iConsole->Printf(KStateErrESocketConnected1, ret);  
-        }
-    else
-        {
-
-        User::LeaveIfError(ret);
-        }
-
-
-    // Connect to the server, asynchronously
-    iSocket.Connect( iInetAddr, iStatus );  
-    SetActive();
-    CActiveScheduler::Start();
-
-    // Print status
-    iConsole->Printf(KConnnectedMessage, 
-            &iConnectSettings->iAddress, 
-            iConnectSettings->iPortNum, 
-            &iConnectSettings->iPage ); 
-    }
-
-void CTcpSslTestEngine::SetConsole( CConsoleBase& aConsole )
-    {
-    iConsole = &aConsole;
-    }
-
-void CTcpSslTestEngine::SetOutputFile( RFile& aOutputFile )
-    {
-    iOutputFile = &aOutputFile;
-    }
-
-void CTcpSslTestEngine::Initialize()
-    {
-
-    }
-TBool CTcpSslTestEngine::InUse()
-    {
-    return iInUse;
-    }
-
-void CTcpSslTestEngine::RunL()
-    {
-    //The Test App that uses the tls module should check the status prior to continuing.
-    //Detailed error checking need to be added in the Test App.
-    if (iStatus.Int() != KErrNone ) 
-        {
-        switch ( iStatus.Int() )
-            {
-            case KErrCouldNotConnect:
-                {
-                _LIT( errmsg, "Failed to connect. error code : %d" );
-                iConsole->Printf(errmsg, iStatus.Int());
-                //User::Panic(KTcpSslEnginePanic,iStatus.Int());
-                break;
-                }
-            default:
-                {
-                iRunState =  EConnectionClosed;
-                _LIT( errmsg, "Error encountered. error code : %d" );
-                iConsole->Printf(errmsg, iStatus.Int());
-                break;
-                }
-            }
-        }
-
-    switch ( iRunState )
-        {
-        case ESocketConnected:
-            MakePageRequestL();
-            break;
-
-        case EGetRequestSent:
-            GetServerResponseL();
-            break;
-
-        case EDataReceived:
-            ReadServerResponseL();
-            break;
-
-        case EConnectionClosed:
-            ConnectionClosed();
-            break;
-
-        default:
-            break;
-        } // end switch
-    }
-
-TInt CTcpSslTestEngine::RunError( TInt aError )
-    {
-    // Panic prevents looping
-    __ASSERT_ALWAYS(iRunState != EConnectionClosed, 
-            User::Panic(KTcpSslEnginePanic,0));
-
-    // do a switch on the state to get the right err message
-    switch (iRunState)
-        {
-        case ESocketConnected:
-            iConsole->Printf(KStateErrESocketConnected, aError );
-            break;
-        case ESettingCiphers:
-            iConsole->Printf(KStateErrESettingCiphers, aError );
-            break;
-        case ESecureConnected:
-            iConsole->Printf(KStateErrSecureConnected, aError);
-            break;
-        case EGetRequestSent:
-            iConsole->Printf(KStateErrGetRequestSent, aError);
-            break;
-        case EDataReceived:
-            iConsole->Printf(KStateErrEDataReceived, aError);
-            break;
-        default:
-            break;
-        }
-
-    iRunState = EConnectionClosed;
-    iSuccess = EFalse;
-    iTimer.After( iStatus, KDelay );
-    SetActive();
-
-    return KErrNone;
-    }
-
-void CTcpSslTestEngine::DoCancel()
-    {
-    iConsole->Printf(KCancelledMessage);
-    ConnectionClosed();
-    }
-
-void CTcpSslTestEngine::MakePageRequestL()
-    {
-
-    // if connection failed, reconnect
-    if(iStatus.Int() != KErrNone)
-        {
-        if(++iCounter >= KMaxAttempts)
-            {
-            User::Leave(iStatus.Int());
-            }
-
-        iRunState = ESocketConnected;
-        iSocket.CancelAll();
-        iSocket.Close();
-
-        RConnection rCon;
-        TInt ret = rCon.Open(iSocketServ);
-        iConsole->Printf(_L("Connection open with = %d\n"), ret);
-
-        TRequestStatus status;
-
-        TCommDbConnPref commDbPref;
-        commDbPref.SetIapId(12);
-        commDbPref.SetBearerSet(KCommDbBearerVirtual);
-        commDbPref.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-
-        rCon.Start(commDbPref, status);
-        User::WaitForRequest(status);
-        // Open a TCP socket
-        ret = iSocket.Open( iSocketServ, KAfInet, KSockStream, KProtocolInetTcp, rCon );
-
-        while(KErrNone != ret)
-            {       
-            iConsole->Printf(KFailSocketMessage, ret);          
-            ret = iSocket.Open( iSocketServ, KAfInet, KSockStream, KProtocolInetTcp, rCon );
-            }
-
-
-        // Connect to the server, asynchronously
-        iSocket.Connect( iInetAddr, iStatus );  
-        SetActive();
-
-        // Print status
-        iConsole->Printf(KConnnectedMessage, 
-                &iConnectSettings->iAddress, 
-                iConnectSettings->iPortNum, 
-                &iConnectSettings->iPage ); 
-
-        return;
-        }
-
-    iCounter = 0;
-    iConsole->Printf(KGettingPageMessage);
-
-    // Create a GET request 
-    _LIT8(KUrl1, "https://");
-    _LIT8(KUrl2, ":443/index.html HTTP/1.0\r\n");
-    iSndBuffer+=KSimpleGet;
-    iSndBuffer+=KUrl1;
-    iSndBuffer+=hostIpAddress;
-    iSndBuffer+=KUrl2;
-    iSndBuffer+=KNewLine;   
-    iSndBuffer+=KHeader;
-
-    // Send the request
-    iRunState = EGetRequestSent;
-    iSocket.Send( iSndBuffer, NULL, iStatus, iBytesSent );
-    SetActive();
-    }
-
-void CTcpSslTestEngine::GetServerResponseL()       
-    {
-    // The get request has been sent, can now try and receive the data
-    User::LeaveIfError(iStatus.Int());
-    iConsole->Printf(KReceivingMessage);
-
-    // Read asynchonously-returns when buffer full
-    iRunState = EDataReceived;
-    iSocket.RecvOneOrMore( iRcvBuffer, NULL, iStatus );
-    SetActive();
-    }
-
-void CTcpSslTestEngine::ReadServerResponseL()
-    {
-    // Any error other than KErrEof means the test is a failure
-    if (iStatus!=KErrEof) User::LeaveIfError(iStatus.Int());
-    iConsole->Printf(KReceivedMessage);
-    TBuf<512> temp;
-    temp.Copy(iRcvBuffer);
-    iConsole->Printf(temp);
-
-    // Put the received data in the output file & reset the receive buffer
-    iTotalBytesRead += iRcvBuffer.Length();
-
-    // Case 1: error is KErrEof (message complete) or no data received, so stop
-    if ( ( iStatus==KErrEof ) || ( iRcvBuffer.Length() == 0 ) )
-        {
-        iConsole->Printf(KCompleteMessage, iTotalBytesRead);
-        // Close the socket neatly
-        iRunState = EConnectionClosed;
-        iTimer.After( iStatus, KDelay );
-        SetActive();
-        return; 
-        }
-
-    // Case 2: there's more data to get from the server
-    iRcvBuffer.SetLength( 0 );
-    iRunState = EDataReceived;
-    iSocket.RecvOneOrMore( iRcvBuffer, NULL, iStatus );
-    SetActive(); 
-    }
-
-void CTcpSslTestEngine::ConnectionClosed()
-    {
-    if (!iInUse) return;
-    // Clean up
-    //iHostResolver.Close();
-    iSocket.CancelAll();
-    iSocket.Close();
-
-    // Close the output file
-    //iOutputFile->Close();
-
-    // Wait here for an unload of the ssl.dll to make sure that a session is not
-    // reconnected next time. 
-    User::After( KDelay );
-    iInUse = EFalse;
-    SetActive();
-    CActiveScheduler::Stop();
-    }
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/src/te_tundrivertestblock.cpp
--- a/linklayerprotocols/tundriver/te_tundriver/src/te_tundrivertestblock.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Contains the implementation of TEF3.0 respective test block
-//
-
-
-
-/**
- @file te_tundrivertestblock.cpp
- @internalTechnology
-*/
-
-#include "te_tundrivertestblock.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* CTunDriverTestBlock::CreateDataL(const TDesC& aData)
-	{
-	CDataWrapper* wrapper = NULL;
-	if (KTunDriverTestWrapper() == aData)
-		{
-		wrapper = CTunDriverTestWrapper::NewL();
-		}
-	return wrapper;
-	}
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/src/te_tundrivertestserver.cpp
--- a/linklayerprotocols/tundriver/te_tundriver/src/te_tundrivertestserver.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-// 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 te_tundrivertestserver.h
- @internalTechnology
-*/
-  
-#include "te_tundrivertestserver.h"
-
-/**
-Function to instantiate TestServer.
-
-@return Returns the TestServer instance pointer.
-
-@internalTechnology
-*/
-CTunDriverTestServer* CTunDriverTestServer::NewL()
-	{
-	CTunDriverTestServer* server = new (ELeave) CTunDriverTestServer();
-	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* CTunDriverTestServer::CreateTestBlock()
-	{
-	CTestBlockController* testBlockController=NULL;
-	TRAPD(err, testBlockController = CreateTestBlockL());
-	if(err == KErrNone)
-		{
-		return testBlockController;
-		}
-	else
-		{
-		return NULL;
-		}
-	}
-
-/**
-Function to instantiate TestBlock.
-
-@internalTechnology
-*/
-CTestBlockController* CTunDriverTestServer::CreateTestBlockL()
-	{
-	return new (ELeave) CTunDriverTestBlock();
-	}
-
-/**
-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);
-	CTunDriverTestServer* server = NULL;
-	TRAPD(err, server = CTunDriverTestServer::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;
-    }
diff -r bb2423252ea3 -r c1029e558ef5 linklayerprotocols/tundriver/te_tundriver/src/te_tundrivertestwrapper.cpp
--- a/linklayerprotocols/tundriver/te_tundriver/src/te_tundrivertestwrapper.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3153 +0,0 @@
-// 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 te_tundrivertestwrapper.h
- @internalTechnology
- */
-
-#include "te_tundrivertestwrapper.h"
-#include <e32base.h>
-#include <utf.h>
-#include <in_sock.h>
-#include <es_sock.h>
-
-#include <metadatabase.h> 
-#include <commsdattypesv1_1.h> 
-#include <commsdat.h>
-#include <commsdattypesv1_1_partner.h>
-#include <commsdattypeinfov1_1_internal.h>
-#include <commdb.h>
-#include <commdbconnpref.h>
-
-//Virtual Interface 
-
-// Commands
-
-_LIT(KRConnTest1_1,         "RConnTest1_1");
-_LIT(KRConnTest1_2,         "RConnTest1_2");
-_LIT(KRConnTest1_3,         "RConnTest1_3");
-_LIT(KRConnTest1_4,         "RConnTest1_4");
-_LIT(KRConnTest1_5,         "RConnTest1_5");
-_LIT(KRConnTest1_6,         "RConnTest1_6");
-_LIT(KRConnTest1_7,         "RConnTest1_7");
-_LIT(KRConnTest1_8,         "RConnTest1_8");
-_LIT(KRConnTest1_9,         "RConnTest1_9");
-_LIT(KRConnTest1_10,        "RConnTest1_10");
-_LIT(KRConnTest1_11,        "RConnTest1_11");
-_LIT(KRConnTest1_12,        "RConnTest1_12");
-_LIT(KRConnTest1_13,        "RConnTest1_13");
-_LIT(KRConnTest1_14,        "RConnTest1_14");
-_LIT(KRConnTest1_15,        "RConnTest1_15");
-_LIT(KRConnTest1_16,        "RConnTest1_16");
-_LIT(KRConnTest1_17,        "RConnTest1_17");
-_LIT(KRConnTest1_18,        "RConnTest1_18");
-_LIT(KRConnTest1_19,        "RConnTest1_19");
-_LIT(KRConnTest1_20,        "RConnTest1_20");
-_LIT(KRConnTest1_21,        "RConnTest1_21");
-_LIT(KRConnTest1_22,        "RConnTest1_22");
-_LIT(KRConnTest1_23,        "RConnTest1_23");
-_LIT(KRConnTest1_24,        "RConnTest1_24");
-_LIT(KRConnTest1_25,        "RConnTest1_25");
-_LIT(KRConnTest1_26,        "RConnTest1_26");
-_LIT(KRConnTest1_27,        "RConnTest1_27");
-_LIT(KRConnTest1_28,        "RConnTest1_28");
-_LIT(KRConnTest1_29,        "RConnTest1_29");
-_LIT(KRConnTest1_30,        "RConnTest1_30");
-_LIT(KRConnTest1_31,        "RConnTest1_31");
-_LIT(KRConnTest1_32,        "RConnTest1_32");
-_LIT(KRConnTest1_33,        "RConnTest1_33");
-
-// Config file
-_LIT(KNameDefault, 	    	"default");
-_LIT(KIpAddr,               "IpAddr");
-_LIT(KGatewayAddr,          "GatewayAddr");
-_LIT(KDestAddr, 		    "DestAddr");
-_LIT(KLocalAddr,            "LocalAddr");
-_LIT(KLocalPort,            "LocalPort");
-_LIT(KDestPort,             "DestPort");
-_LIT(KTcpDestPort,          "TcpDestPort");
-_LIT(KRealDestAddr,         "RealDestAddr");
-_LIT(KRealDestPort,         "RealDestPort");
-
-//Test code
-_LIT(KCommand, 			    "aCommand = %S");
-_LIT(KSection, 			    "aSection = %S");
-
-//Test code error
-_LIT(KInetInputFail,         "TInetAddr Input failed with error: %d");
-
-#define TUNDRIVER_IAP   14
-#define REAL_IAP    9
-#define LOCAL_PORT 7777
-
-// public
-//LOCAL_D CConsoleBase* console; 
-
-
-/**
-Constructor.
-
-@internalTechnology
- */
-CTunDriverTestWrapper::CTunDriverTestWrapper()
-    {
-    }
-
-/**
-Destructor.
-
-@internalTechnology
- */
-CTunDriverTestWrapper::~CTunDriverTestWrapper()
-    {
-    }
-
-/**
-Function to instantiate TestWrapper.
-@return Returns constructed TestWrapper instance pointer
-@internalTechnology
- */
-CTunDriverTestWrapper* CTunDriverTestWrapper::NewL()
-    {
-    CTunDriverTestWrapper*	ret = new (ELeave) CTunDriverTestWrapper();
-    CleanupStack::PushL(ret);
-    ret->ConstructL();
-    CleanupStack::Pop(ret);
-    return ret;	
-    }
-
-/**
-Second level constructor, constructs TestWrapper instance.
-@internalTechnology
- */
-void CTunDriverTestWrapper::ConstructL()
-    {
-    iInitNumOfInterfaces    = 0;
-    iCurNumOfInterfaces     = 0;
-    iDestPort               = 0;
-
-    }
-
-/**
-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 CTunDriverTestWrapper::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 );
-
-    //RConnection Testcases
-    if(KRConnTest1_1() == aCommand)
-        {
-        DoRConnTest1_1();
-        }
-    else if(KRConnTest1_2() == aCommand)
-        {
-        DoRConnTest1_2();
-        }
-    else if(KRConnTest1_3() == aCommand)
-        {
-        DoRConnTest1_3(aSection);
-        }
-    else if(KRConnTest1_4() == aCommand)
-        {
-        DoRConnTest1_4(aSection);
-        }
-    else if(KRConnTest1_5() == aCommand)
-        {
-        DoRConnTest1_5(aSection);
-        }
-    else if(KRConnTest1_6() == aCommand)
-        {
-        DoRConnTest1_6(aSection);
-        }
-    else if(KRConnTest1_7() == aCommand)
-        {
-        DoRConnTest1_7(aSection);
-        }
-    else if(KRConnTest1_8() == aCommand)
-        {
-        DoRConnTest1_8(aSection);
-        }
-    else if(KRConnTest1_9() == aCommand)
-        {
-        DoRConnTest1_9(aSection);
-        }
-    else if(KRConnTest1_10() == aCommand)
-        {
-        DoRConnTest1_10(aSection);
-        }
-    else if(KRConnTest1_11() == aCommand)
-        {
-        DoRConnTest1_11();
-        }
-    else if(KRConnTest1_12() == aCommand)
-        {
-        DoRConnTest1_12();
-        }
-    else if(KRConnTest1_13() == aCommand)
-        {
-        DoRConnTest1_13(aSection);
-        }
-    else if(KRConnTest1_14() == aCommand)
-        {
-        DoRConnTest1_14(aSection);
-        }
-    else if(KRConnTest1_15() == aCommand)
-        {
-        DoRConnTest1_15();
-        }
-    else if(KRConnTest1_16() == aCommand)
-        {
-        DoRConnTest1_16(aSection);
-        }
-    else if(KRConnTest1_17() == aCommand)
-        {
-        DoRConnTest1_17(aSection);
-        }
-    else if(KRConnTest1_18() == aCommand)
-        {
-        
-        }
-    else if(KRConnTest1_19() == aCommand)
-        {
-    
-        }
-    else if(KRConnTest1_20() == aCommand)
-        {
-        DoRConnTest1_20();
-        }
-    else if(KRConnTest1_21() == aCommand)
-        {
-        DoRConnTest1_21();
-        }
-    else if(KRConnTest1_22() == aCommand)
-        {
-        DoRConnTest1_22();
-        }
-    else if(KRConnTest1_23() == aCommand)
-        {
-        DoRConnTest1_23();
-        }
-    else if(KRConnTest1_24() == aCommand)
-        {
-        DoRConnTest1_24();
-        }
-    else if(KRConnTest1_25() == aCommand)
-        {
-        DoRConnTest1_25();
-        }
-    else if(KRConnTest1_26() == aCommand)
-        {
-        DoRConnTest1_26();
-        }
-    else if(KRConnTest1_27() == aCommand)
-        {
-        DoRConnTest1_27();
-        }
-    else if(KRConnTest1_28() == aCommand)
-        {
-        DoRConnTest1_28();
-        }
-    else if(KRConnTest1_29() == aCommand)
-        {
-        DoRConnTest1_29();
-        }
-    else if(KRConnTest1_30() == aCommand)
-        {
-        DoRConnTest1_30();
-        }
-	else if(KRConnTest1_31() == aCommand)
-        {
-        DoRConnTest1_31();
-        }
-	else if(KRConnTest1_32() == aCommand)
-        {
-        DoRConnTest1_32();
-        }
-    else if(KRConnTest1_33() == aCommand)
-        {
-        DoRConnTest1_33();
-        }	
-    else
-        {
-        ret = EFalse;
-        User::LeaveIfError(KErrNone); // just to suppress LeaveScan warning
-        }
-    return ret;
-    }
-
-/**
-Function to open Virtual Socket.
-@internalTechnology
- */
-
-TBool CTunDriverTestWrapper::FindInterface(TPckgBuf<TSoInet6InterfaceInfo> &info)
-    {
-    TBool success = FALSE;
-    if((iStatus = iSocketServ.Connect()) == KErrNone )
-        INFO_PRINTF1(_L("Socket Server Opened.\n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Socket Server: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-
-        return success;
-        }
-
-    if((iStatus = iConnection1.Open(iSocketServ)) == KErrNone )
-        INFO_PRINTF1(_L("Connection1 opened. \n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Connection1: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-
-        return success;
-        }
-
-    iCommDbPref.SetIapId(TUNDRIVER_IAP);             // Virtual Interface
-    iCommDbPref.SetBearerSet(KCommDbBearerVirtual);
-    iCommDbPref.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-
-    iConnection1.Start(iCommDbPref, iStatus);
-
-
-    //open socket on interface. 
-    if((iStatus = iSocket1.Open(iSocketServ, KAfInet, KSockDatagram, KProtocolInetUdp, iConnection1)) == KErrNone )
-        INFO_PRINTF1(_L("Socket Opened!\n "));
-
-    User::LeaveIfError( iSocket1.SetOpt( KSoInetEnumInterfaces, KSolInetIfCtrl ) );
-
-    TProtocolDesc in;
-    User::LeaveIfError( iSocket1.Info( in ) );
-    TInt res = iSocket1.GetOpt( KSoInetNextInterface, KSolInetIfCtrl, info );
-    if (res != KErrNone)
-        {
-        User::Leave( res );
-        }
-    
-    TPckgBuf<TSoInet6InterfaceInfo> next;
-
-
-    while (res == KErrNone)
-        {
-        res = iSocket1.GetOpt( KSoInetNextInterface, KSolInetIfCtrl, next );
-        if (res == KErrNone)
-            info = next;
-        //Compare the string with interface name
-        if (info().iName.Mid(1,4).Compare(_L("TunDriver")))
-            //if (info().iName == KIfName)
-            {
-            success = TRUE;
-            break;
-
-            }
-        else
-            {
-            continue;
-            }
-        }
-
-    return success;
-
-
-    }
-
-TInt CTunDriverTestWrapper::StartD3PApp()
-    {
-    TInt err(0);
-    if ((err = p.Create(KDummy3rdPartyApp,KArg)) == KErrNone)
-        {
-        p.Resume();
-        }
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Dummy3rdPartyApp: %d"), iVTunError);
-        SetError(err);
-        return(err);        
-        }
-    //Wait for Dummy3rdPartyApp to be up and running!
-    User::After(10000000);   //10 Sec
-    return(err);
-    }
-
-void CTunDriverTestWrapper::StopD3PApp()
-    {
-    p.Kill(NULL);   //Kill Dummy3rdPartyApp.       
-    }
-
-//Gurpreet: RConnection Testcases
-
-void CTunDriverTestWrapper::DoRConnTest1_1()
-    {
-    INFO_PRINTF1(_L("********************************************"));
-    INFO_PRINTF1(_L("           Test: DoRConnTest1_1             "));
-    INFO_PRINTF1(_L("********************************************"));
-
-    if((iStatus = iSocketServ.Connect()) == KErrNone )
-        INFO_PRINTF1(_L("Socket Server Opened.\n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Socket Server: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        return;
-        }
-
-    if((iStatus = iConnection.Open(iSocketServ /*, KAfInet*/)) == KErrNone )
-        INFO_PRINTF1(_L("Connection opened. \n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Connection: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        return;
-        }
-
-    iCommDbPref.SetIapId(TUNDRIVER_IAP);             // Virtual Interface
-    iCommDbPref.SetBearerSet(KCommDbBearerVirtual);
-    iCommDbPref.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-
-    iVTunError = iConnection.Start(iCommDbPref);
-    //User::WaitForRequest(iStatus);
-    INFO_PRINTF2(_L("Starting Connection %d.\n"), iVTunError);
-
-    if(iVTunError!= KErrNone)
-        {
-        SetError(iVTunError);
-        }
-    iConnection.Close();
-    iSocketServ.Close();    
-    }
-
-void CTunDriverTestWrapper::DoRConnTest1_2()
-    {
-    INFO_PRINTF1(_L("********************************************"));
-    INFO_PRINTF1(_L("           Test: DoRConnTest1_2             "));
-    INFO_PRINTF1(_L("********************************************"));
-
-    if((iStatus = iSocketServ.Connect()) == KErrNone )
-        INFO_PRINTF1(_L("Socket Server Opened.\n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Socket Server: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        return;
-        }
-
-    if((iStatus = iConnection.Open(iSocketServ /*, KAfInet*/)) == KErrNone )
-        INFO_PRINTF1(_L("Connection opened. \n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Connection: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        return;
-        }
-
-    iCommDbPref.SetIapId(TUNDRIVER_IAP);             // Virtual Interface
-    iCommDbPref.SetBearerSet(KCommDbBearerVirtual);
-    iCommDbPref.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-
-    iConnection.Start(iCommDbPref, iStatus);
-    User::WaitForRequest(iStatus);
-    INFO_PRINTF2(_L("Starting Connection %d.\n"), iStatus.Int());
-
-    iConnection.Close();
-    iSocketServ.Close();    
-    }
-
-void CTunDriverTestWrapper::DoRConnTest1_3(const TDesC& aSection)
-    {
-    INFO_PRINTF1(_L("*********************************************"));
-    INFO_PRINTF1(_L("           Test: DoRConnTest1_3             "));
-    INFO_PRINTF1(_L("********************************************"));
-
-    //start the dummy3rdpartyapp
-    if ((iVTunError = StartD3PApp()) != KErrNone)
-        {
-        return;
-        }
-
-    if((iStatus = iSocketServ.Connect()) == KErrNone )
-        INFO_PRINTF1(_L("Socket Server Opened.\n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Socket Server: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        StopD3PApp();
-        return;
-        }
-
-    if((iStatus = iConnection.Open(iSocketServ)) == KErrNone )
-        INFO_PRINTF1(_L("Connection opened. \n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Connection: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        StopD3PApp();
-        return;
-        }
-
-    iCommDbPref.SetIapId(TUNDRIVER_IAP);             // Virtual Interface
-    iCommDbPref.SetBearerSet(KCommDbBearerVirtual);
-    iCommDbPref.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-
-    iConnection.Start(iCommDbPref, iStatus);
-		User::WaitForRequest(iStatus);
-		if (iStatus.Int() != KErrNone)
-			{
-			ERR_PRINTF2(_L("Error starting connection: %d"), iStatus.Int());	
-			SetError(iStatus.Int());
-			StopD3PApp();
-			return;
-			}
-	INFO_PRINTF1(_L("Connection started!\n "));
-
-    //open socket on interface. 
-    if((iStatus = iSocket.Open(iSocketServ, KAfInet, KSockDatagram, KProtocolInetUdp, iConnection)) == KErrNone )
-        INFO_PRINTF1(_L("Socket Opened!\n "));
-    else   // (iStatus!=KErrNone)
-        {
-        ERR_PRINTF2(_L("Error Opening Socket: %d"), iStatus.Int());    
-        SetError(iStatus.Int());
-        StopD3PApp();
-        return;
-        }
-
-    iSendBuf.Zero();
-    iSendBuf = (TText8*)"Nokia sues Apple!";
-
-    // Get destination address from config file   
-    TPtrC ptrToReadFromConfig(KNameDefault);
-    TBool returnValue = GetStringFromConfig(aSection, KDestAddr, ptrToReadFromConfig);
-    if (!returnValue)
-        {
-        ERR_PRINTF1(_L("Reading config file failed, while reading DestAddr"));   
-        SetError(KErrUnknown);
-        StopD3PApp();
-        return;
-        }
-    //set destination IP ie. server
-    TInt err = iDestAddr.Input(ptrToReadFromConfig);   
-    if(err != KErrNone)
-        {
-        INFO_PRINTF2(KInetInputFail, err);
-        SetError(err);
-        StopD3PApp();
-        return;
-        }
-
-    returnValue = GetIntFromConfig(aSection, KDestPort, iDestPort);
-    iDestAddr.SetPort(iDestPort);
-
-    //bind local port to socket
-    err = iSocket.SetLocalPort(7776);
-
-    //send data to server
-    iSocket.SendTo(iSendBuf, iDestAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);
-    if( iStatus == KErrNone)
-        INFO_PRINTF1(_L("\nData Sent"));
-    else
-	   {
-        ERR_PRINTF1(_L("\nData sending failed"));
-        SetError(iStatus.Int());
-        iSocket.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-  	    }
-
-    iRecvBuf.Zero();
-    iSocket.RecvFrom(iRecvBuf, iDestAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);
-    TBuf<128> temp;
-    if( iStatus == KErrNone)
-        {
-        INFO_PRINTF1(_L("\nData Received : "));
-        temp.Copy(iRecvBuf);
-        INFO_PRINTF1(temp);
-        INFO_PRINTF1(_L("\n"));
-        }
-    else
-        {
-        ERR_PRINTF1(_L("\nData receive failed"));  
-        SetError(iStatus.Int());
-        }
-    iSocket.Close();
-    iSocketServ.Close();
-    
-    StopD3PApp();
-    
-    }
-
-void CTunDriverTestWrapper::DoRConnTest1_4(const TDesC& aSection)
-    {
-    INFO_PRINTF1(_L("*********************************************"));
-    INFO_PRINTF1(_L("           Test: DoRConnTest1_4             "));
-    INFO_PRINTF1(_L("********************************************"));
-
-		//start the dummy3rdpartyapp
-    if ((iVTunError = StartD3PApp()) != KErrNone)
-        {
-        return;
-        }
-
-    if((iStatus = iSocketServ.Connect()) == KErrNone )
-        INFO_PRINTF1(_L("Socket Server Opened.\n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Socket Server: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        return;
-        }
-
-    if((iStatus = iConnection.Open(iSocketServ)) == KErrNone )
-        INFO_PRINTF1(_L("Connection opened. \n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Connection: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        return;
-        }
-
-    iCommDbPref.SetIapId(TUNDRIVER_IAP);             // Virtual Interface
-    iCommDbPref.SetBearerSet(KCommDbBearerVirtual);
-    iCommDbPref.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-
-    iConnection.Start(iCommDbPref, iStatus);
-    User::WaitForRequest(iStatus);
-    if (iStatus.Int() != KErrNone)
-		{
-		ERR_PRINTF2(_L("Error starting connection: %d"), iStatus.Int());	
-		SetError(iStatus.Int());
-		iSocketServ.Close();
-		StopD3PApp();
-		return;
-		}
-    INFO_PRINTF2(_L("Starting Connection %d.\n"), iStatus.Int());
-
-    //open socket on interface. 
-
-    if((iStatus = iSocket.Open(iSocketServ, KAfInet, KSockDatagram, KProtocolInetUdp, iConnection)) == KErrNone )
-        INFO_PRINTF1(_L("Socket Opened!\n "));
-    else   // (iStatus!=KErrNone)
-        {
-        ERR_PRINTF2(_L("Error Opening Socket: %d"), iStatus.Int());    
-        SetError(iStatus.Int());
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-        }
-
-    iSendBuf.Zero();
-    iSendBuf = (TText8*)"Nokia sues Apple!";
-
-    // Get destination address from config file  
-    TPtrC ptrToReadFromConfig(KNameDefault);
-    TBool returnValue = GetStringFromConfig(aSection, KDestAddr, ptrToReadFromConfig);
-    if (!returnValue)
-        {
-        ERR_PRINTF1(_L("Reading config file failed, while reading DestAddr"));   
-        SetError(KErrUnknown);
-        iSocket.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-        }
-    //set destination IP ie. server
-    TInt err = iDestAddr.Input(ptrToReadFromConfig);   
-    if(err != KErrNone)
-        {
-        INFO_PRINTF2(KInetInputFail, err);
-        SetError(err);
-        iSocket.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-        }
-
-    returnValue = GetIntFromConfig(aSection, KDestPort, iDestPort);
-    iDestAddr.SetPort(iDestPort);
-
-    //bind local port to socket
-    err = iSocket.SetLocalPort(LOCAL_PORT);
-
-    //send data to server
-    iSocket.SendTo(iSendBuf, iDestAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);
-    if( iStatus == KErrNone)
-        INFO_PRINTF1(_L("\nData Sent"));
-    else
-	   {
-        ERR_PRINTF1(_L("\nData sending failed"));
-        SetError(iStatus.Int());
-        iSocket.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-  	    }
-
-    iRecvBuf.Zero();
-    iSocket.RecvFrom(iRecvBuf, iDestAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);
-    TBuf<128> temp;
-    if( iStatus == KErrNone)
-        {
-        INFO_PRINTF1(_L("\nData Received : "));
-        temp.Copy(iRecvBuf);
-        INFO_PRINTF1(temp);
-        INFO_PRINTF1(_L("\n"));
-        }
-    else
-        {
-        ERR_PRINTF1(_L("\nData receive failed"));
-        SetError(iStatus.Int());
-        }
-    iSocket.Close();
-    iConnection.Close();
-    iSocketServ.Close();    
-
-    StopD3PApp();
-    
-    }
-
-void CTunDriverTestWrapper::DoRConnTest1_5(const TDesC& aSection)
-    {
-    INFO_PRINTF1(_L("*********************************************"));
-    INFO_PRINTF1(_L("           Test: DoRConnTest1_5             "));
-    INFO_PRINTF1(_L("********************************************"));
-
-    //start the dummy3rdpartyapp
-    if ((iVTunError = StartD3PApp()) != KErrNone)
-        {
-        return;
-        }
-
-    if((iStatus = iSocketServ.Connect()) == KErrNone )
-        INFO_PRINTF1(_L("Socket Server Opened.\n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Socket Server: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        StopD3PApp();
-        return;
-        }
-    if((iStatus = iConnection.Open(iSocketServ)) == KErrNone )
-        INFO_PRINTF1(_L("Connection opened. \n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Connection: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        StopD3PApp();
-        return;
-        }
-
-    iCommDbPref.SetIapId(TUNDRIVER_IAP);             // Virtual Interface
-    iCommDbPref.SetBearerSet(KCommDbBearerVirtual);
-    iCommDbPref.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-
-    iConnection.Start(iCommDbPref, iStatus);
-    User::WaitForRequest(iStatus);
-    if (iStatus.Int() != KErrNone)
-		{
-		ERR_PRINTF2(_L("Error starting connection: %d"), iStatus.Int());	
-		SetError(iStatus.Int());
-		iSocketServ.Close();
-		StopD3PApp();
-		return;
-		}
-    INFO_PRINTF2(_L("Starting Connection %d.\n"), iStatus.Int());
-
-    //open socket on interface. 
-    if((iStatus = iSocket1.Open(iSocketServ, KAfInet, KSockDatagram, KProtocolInetUdp, iConnection)) == KErrNone )
-        INFO_PRINTF1(_L("Socket1 Opened!\n "));
-    else   // (iStatus!=KErrNone)
-        {
-        ERR_PRINTF2(_L("Error Opening Socket1: %d"), iStatus.Int());    
-        SetError(iStatus.Int());
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-        }
-
-    if((iStatus = iSocket2.Open(iSocketServ, KAfInet, KSockDatagram, KProtocolInetUdp, iConnection)) == KErrNone )
-        INFO_PRINTF1(_L("Socket2 Opened!\n "));
-    else   // (iStatus!=KErrNone)
-        {
-        ERR_PRINTF2(_L("Error Opening Socket2: %d"), iStatus.Int());    
-        SetError(iStatus.Int());
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-        }
-
-    // Get destination address from config file 
-    TPtrC ptrToReadFromConfig(KNameDefault);
-    TBool returnValue = GetStringFromConfig(aSection, KDestAddr, ptrToReadFromConfig);
-    if (!returnValue)
-        {
-        ERR_PRINTF1(_L("Reading config file failed, while reading DestAddr"));   
-        SetError(KErrUnknown);
-        iSocket1.Close();
-        iSocket2.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-        }
-    //set destination IP ie. server
-    TInt err = iDestAddr.Input(ptrToReadFromConfig);   
-    if(err != KErrNone)
-        {
-        INFO_PRINTF2(KInetInputFail, err);
-        SetError(err);
-        iSocket1.Close();
-        iSocket2.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-        }
-
-    returnValue = GetIntFromConfig(aSection, KDestPort, iDestPort);
-    iDestAddr.SetPort(iDestPort);
-
-    //bind local port to socket
-    err = iSocket1.SetLocalPort(LOCAL_PORT);
-    if(err != KErrNone)
-    	{
-        ERR_PRINTF2(_L("Error Binding Socket1: %d"), err);    
-        SetError(err);
-        iSocket1.Close();
-        iSocket2.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-      	}
-    //bind local port to socket
-    err = iSocket2.SetLocalPort(LOCAL_PORT + 1);
-    if(err != KErrNone)
-    	{
-        ERR_PRINTF2(_L("Error Binding Socket2: %d"), err);
-        SetError(err);
-        iSocket1.Close();
-        iSocket2.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-      	}
-
-    iSendBuf.Zero();
-    iSendBuf = (TText8*)"Nokia sues Apple!";//"Sending Data through Socket1!";
-
-    //send data to server
-    iSocket1.SendTo(iSendBuf, iDestAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);
-
-    if( iStatus == KErrNone)
-        INFO_PRINTF1(_L("\nData Sent thru socket1"));
-    else
-    	{
-        ERR_PRINTF1(_L("\nData sending failed"));
-        SetError(iStatus.Int());
-        iSocket1.Close();
-        iSocket2.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-      	}
-
-    iRecvBuf.Zero();
-    iSocket1.RecvFrom(iRecvBuf, iDestAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);
-    TBuf<128> temp;
-    if( iStatus == KErrNone)
-        {
-        INFO_PRINTF1(_L("\nData Received from Socket1 : "));
-        temp.Copy(iRecvBuf);
-        INFO_PRINTF1(temp);
-        INFO_PRINTF1(_L("\n"));
-        }
-    else
-    	{
-        ERR_PRINTF1(_L("\nData receive failed on Socket1"));  
-        SetError(iStatus.Int());
-        iSocket1.Close();
-        iSocket2.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-      	}
-
-    iSendBuf.Zero();
-    iSendBuf = (TText8*)" Socket2:Nokia sues Apple!";
-    iSocket2.SendTo(iSendBuf, iDestAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);
-
-    if( iStatus == KErrNone)
-        INFO_PRINTF1(_L("\nData Sent thru socket2"));
-    else
-	    {
-		ERR_PRINTF1(_L("\nData sending failed"));
-	    SetError(iStatus.Int());
-	    iSocket1.Close();
-	    iSocket2.Close();
-	    iConnection.Close();
-	    iSocketServ.Close();
-	    StopD3PApp();
-	    }
-
-    iRecvBuf.Zero();
-    iSocket2.RecvFrom(iRecvBuf, iDestAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);
-    temp.Zero();
-    if( iStatus == KErrNone)
-        {
-        INFO_PRINTF1(_L("\nData Received from Socket2: "));
-        temp.Copy(iRecvBuf);
-        INFO_PRINTF1(temp);
-        INFO_PRINTF1(_L("\n"));
-        }
-    else
-        {
-        ERR_PRINTF1(_L("\nData receive failed on Socket2"));
-        SetError(iStatus.Int());
-        }
-    iSocket1.Close();
-    iSocket2.Close();
-    iConnection.Close();
-    iSocketServ.Close();
-    
-    StopD3PApp();
-    
-    }
-
-void CTunDriverTestWrapper::DoRConnTest1_6(const TDesC& aSection)
-    {
-
-    INFO_PRINTF1(_L("*********************************************"));
-    INFO_PRINTF1(_L("           Test: DoRConnTest1_6              "));
-    INFO_PRINTF1(_L("*********************************************"));
-
-    //start the dummy3rdpartyapp
-    if ((iVTunError = StartD3PApp()) != KErrNone)
-        {
-        return;
-        }
-
-    if((iStatus = iSocketServ.Connect()) == KErrNone )
-        INFO_PRINTF1(_L("Socket Server Opened.\n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Socket Server: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        StopD3PApp();
-        return;
-        }
-    if((iStatus = iConnection1.Open(iSocketServ /*, KAfInet*/)) == KErrNone )
-        INFO_PRINTF1(_L("Connection1 opened. \n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Connection1: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        StopD3PApp();
-        return;
-        }
-
-    if((iStatus = iConnection2.Open(iSocketServ /*, KAfInet*/)) == KErrNone )
-        INFO_PRINTF1(_L("Connection2 opened. \n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Connection2: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        StopD3PApp();
-        return;
-        }
-
-    iCommDbPref.SetIapId(TUNDRIVER_IAP);             // Virtual Interface
-    iCommDbPref.SetBearerSet(KCommDbBearerVirtual);
-    iCommDbPref.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-
-    iConnection1.Start(iCommDbPref, iStatus);
-    User::WaitForRequest(iStatus);
-   	
-    if(iStatus.Int()!=KErrNone)
-	   	{
-	   	ERR_PRINTF2(_L("Error starting connection1: %d"), iStatus.Int());	
-		SetError(iStatus.Int());
-		iSocketServ.Close();
-		StopD3PApp();
-		return;
-	    }
-	    INFO_PRINTF2(_L("Starting Connection1 %d.\n"), iStatus.Int());
-        	
-
-    iConnection2.Start(iCommDbPref, iStatus);
-    User::WaitForRequest(iStatus);
-    if(iStatus.Int()!=KErrNone)
-	    {
-	    ERR_PRINTF2(_L("Error starting connection2: %d"), iStatus.Int());	
-		SetError(iStatus.Int());
-		iConnection1.Close();
-		iSocketServ.Close();
-		StopD3PApp();
-		return;
-	    }
-
-    INFO_PRINTF2(_L("Starting Connection2 %d.\n"), iStatus.Int());
-
-    //open socket on interface. 
-    if((iStatus = iSocket1.Open(iSocketServ, KAfInet, KSockDatagram, KProtocolInetUdp, iConnection1)) == KErrNone )
-        INFO_PRINTF1(_L("Socket1 Opened!\n "));
-    else   // (iStatus!=KErrNone)
-        {
-        ERR_PRINTF2(_L("Error Opening Socket1: %d"), iStatus.Int());    
-        SetError(iStatus.Int());
-        iConnection1.Close();
-        iConnection2.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-        }
-    if((iStatus = iSocket2.Open(iSocketServ, KAfInet, KSockDatagram, KProtocolInetUdp, iConnection2)) == KErrNone )
-        INFO_PRINTF1(_L("Socket2 Opened!\n "));
-    else   // (iStatus!=KErrNone)
-        {
-        ERR_PRINTF2(_L("Error Opening Socket2: %d"), iStatus.Int());    
-        SetError(iStatus.Int());
-        iSocket1.Close();
-        iConnection1.Close();
-        iConnection2.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-        }
-
-    iSendBuf.Zero();
-    iSendBuf = (TText8*)"Socket1: Nokia sues Apple!";
-
-    // Get destination address from config file    
-    TPtrC ptrToReadFromConfig(KNameDefault);
-    TBool returnValue = GetStringFromConfig(aSection, KDestAddr, ptrToReadFromConfig);
-    if (!returnValue)
-        {
-        ERR_PRINTF1(_L("Reading config file failed, while reading DestAddr"));   
-        SetError(KErrUnknown);
-        iSocket1.Close();
-        iSocket2.Close();
-        iConnection1.Close();
-        iConnection2.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-        }
-    //set destination IP ie. server
-    TInt err = iDestAddr.Input(ptrToReadFromConfig);   
-    if(err != KErrNone)
-        {
-        INFO_PRINTF2(KInetInputFail, err);
-        SetError(err);
-        iSocket1.Close();
-        iSocket2.Close();
-        iConnection1.Close();
-        iConnection2.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-        }
-
-    returnValue = GetIntFromConfig(aSection, KDestPort, iDestPort);
-    iDestAddr.SetPort(iDestPort);
-    //bind local port to socket
-    err = iSocket1.SetLocalPort(LOCAL_PORT);
-    if(err != KErrNone)
-		{
-	    ERR_PRINTF1(_L("Error in setting local port to socket1"));
-	    SetError(err);
-	    iSocket1.Close();
-	    iSocket2.Close();
-	    iConnection1.Close();
-	    iConnection2.Close();
-	    iSocketServ.Close();
-	    StopD3PApp();
-	    return;
-	    }
-
-    err = iSocket2.SetLocalPort(LOCAL_PORT+1);
-    if(err != KErrNone)
-	    {
-		ERR_PRINTF1(_L("Error in setting local port to socket1"));
-	    SetError(err);
-		iSocket1.Close();
-	    iSocket2.Close();
-	    iConnection1.Close();
-	    iConnection2.Close();
-	    iSocketServ.Close();
-	    StopD3PApp();
-	    return;
-	    }
-	    //send data to server
-    iSocket1.SendTo(iSendBuf, iDestAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);
-	  if( iStatus == KErrNone)
-        INFO_PRINTF1(_L("\nData Sent for socket1"));
-    else
-	    {
-	    ERR_PRINTF1(_L("\nData sending failed for socket1"));
-		SetError(iStatus.Int());
-		iSocket1.Close();
-	    iSocket2.Close();
-	    iConnection1.Close();
-	    iConnection2.Close();
-	    iSocketServ.Close();
-	    StopD3PApp();
-	    return;
-	    }
-
-
-    iSendBuf.Zero();
-    iSendBuf = (TText8*)"Socket2: Nokia sues Apple!";
-    iSocket2.SendTo(iSendBuf, iDestAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);
-    if( iStatus == KErrNone)
-        INFO_PRINTF1(_L("\nData Sent for socket2"));
-    else
-	    {
-	    ERR_PRINTF1(_L("\nData sending failed for socket2"));
-		SetError(iStatus.Int());
-		iSocket1.Close();
-	    iSocket2.Close();
-	    iConnection1.Close();
-	    iConnection2.Close();
-	    iSocketServ.Close();
-	    StopD3PApp();
-      	return;
-     	}
-
-    iRecvBuf.Zero();
-    iSocket1.RecvFrom(iRecvBuf, iDestAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);
-    TBuf<128> temp;
-    if( iStatus == KErrNone)
-        {
-        INFO_PRINTF1(_L("\nData Received from Socket1 : "));
-        temp.Copy(iRecvBuf);
-        INFO_PRINTF1(temp);
-        INFO_PRINTF1(_L("\n"));
-        }
-    else
-	    {
-  	    ERR_PRINTF1(_L("\nData receive failed on Socket1"));
-		SetError(iStatus.Int());
-		iSocket1.Close();
-	    iSocket2.Close();
-  	    iConnection1.Close();
-    	iConnection2.Close();
-      	iSocketServ.Close();
-	    StopD3PApp();
-  	    return;
-    	}
-
-
-    iSendBuf.Zero();
-    iSendBuf = (TText8*)"Sending Data through Socket2!";
-    iSocket2.SendTo(iSendBuf, iDestAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);
-    if( iStatus == KErrNone)
-        INFO_PRINTF1(_L("\nData Sent thru socket2"));
-    else
-	    {
-        ERR_PRINTF1(_L("\nData sending failed through socket2"));
-		SetError(iStatus.Int());
-		iSocket1.Close();
-	    iSocket2.Close();
-  	    iConnection1.Close();
-    	iConnection2.Close();
-      	iSocketServ.Close();
-	    StopD3PApp();
-  	    return;
-    	}
-
-
-    iRecvBuf.Zero();
-    iSocket2.RecvFrom(iRecvBuf, iDestAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);
-    temp.Zero();
-    if( iStatus == KErrNone)
-        {
-        INFO_PRINTF1(_L("\nData Received from Socket2: "));
-        temp.Copy(iRecvBuf);
-        INFO_PRINTF1(temp);
-        INFO_PRINTF1(_L("\n"));
-        }
-    else
-        {
-        ERR_PRINTF1(_L("\nData receive failed on Socket2"));
-        SetError(iStatus.Int());
-        }
-    iSocket1.Close();
-    iSocket2.Close();
-    iConnection1.Close();
-    iConnection2.Close();
-    iSocketServ.Close();
-    StopD3PApp();
-    }
-
-//Sockets sending concurrently over same interface but from different socket servers
-//(Connection explicitly created)
-void CTunDriverTestWrapper::DoRConnTest1_7(const TDesC& aSection)
-    {
-    INFO_PRINTF1(_L("*********************************************"));
-    INFO_PRINTF1(_L("           Test: DoRConnTest1_7              "));
-    INFO_PRINTF1(_L("*********************************************"));
-
-	  //start the dummy3rdpartyapp
-    if ((iVTunError = StartD3PApp()) != KErrNone)
-        {
-        return;
-        }
-
-    if((iStatus = iSocketServ1.Connect()) == KErrNone )
-        INFO_PRINTF1(_L("Socket Server1 Opened.\n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Socket Server1: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        return;
-        }
-
-    if((iStatus = iSocketServ2.Connect()) == KErrNone )
-        INFO_PRINTF1(_L("Socket Server2 Opened.\n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Socket Server2: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        iSocketServ1.Close();
-        StopD3PApp();
-        return;
-        }
-    if((iStatus = iConnection1.Open(iSocketServ1 /*, KAfInet*/)) == KErrNone )
-        INFO_PRINTF1(_L("Connection1 opened. \n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Connection1: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        iSocketServ1.Close();
-        iSocketServ2.Close();
-        StopD3PApp();
-        return;
-        }
-
-    if((iStatus = iConnection2.Open(iSocketServ2 /*, KAfInet*/)) == KErrNone )
-        INFO_PRINTF1(_L("Connection2 opened. \n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Connection2: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        iSocketServ1.Close();
-        iSocketServ2.Close();
-        StopD3PApp();
-        return;
-        }
-
-    iCommDbPref.SetIapId(TUNDRIVER_IAP);             // Virtual Interface
-    iCommDbPref.SetBearerSet(KCommDbBearerVirtual);
-    iCommDbPref.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-
-    iConnection1.Start(iCommDbPref, iStatus);
-    User::WaitForRequest(iStatus);
-	if(iStatus.Int()!=KErrNone)
-	    {
-	    ERR_PRINTF2(_L("Error starting connection1: %d"), iStatus.Int());	
-		SetError(iStatus.Int());
-		iSocketServ1.Close();
-		iSocketServ2.Close();
-		StopD3PApp();
-		return;
-	    }
-    INFO_PRINTF2(_L("Starting Connection1 %d.\n"), iStatus.Int());
-
-    iConnection2.Start(iCommDbPref, iStatus);
-    User::WaitForRequest(iStatus);
-	if(iStatus.Int()!=KErrNone)
-		{
-	    ERR_PRINTF2(_L("Error starting connection2: %d"), iStatus.Int());	
-		SetError(iStatus.Int());
-		iConnection1.Close();
-		iSocketServ1.Close();
-		iSocketServ2.Close();
-		StopD3PApp();
-		return;
-	    }
-    INFO_PRINTF2(_L("Starting Connection2 %d.\n"), iStatus.Int());
-
-    //Enumerate the number of interfaces
-    iConnection1.EnumerateConnections(iInitNumOfInterfaces);
-    INFO_PRINTF2(_L("Number of Interfaces: %d!\n "), iInitNumOfInterfaces);
-
-    //open socket on interface. 
-    if((iStatus = iSocket1.Open(iSocketServ1, KAfInet, KSockDatagram, KProtocolInetUdp, iConnection1)) == KErrNone )
-        INFO_PRINTF1(_L("Socket1 Opened!\n "));
-    else   // (iStatus!=KErrNone)
-        {
-        ERR_PRINTF2(_L("Error Opening Socket1: %d"), iStatus.Int());    
-        SetError(iStatus.Int());
-        iConnection1.Close();
-        iConnection2.Close();
-        iSocketServ1.Close();
-        iSocketServ2.Close();
-        StopD3PApp();
-        return;
-        }
-    if((iStatus = iSocket2.Open(iSocketServ2, KAfInet, KSockDatagram, KProtocolInetUdp, iConnection2)) == KErrNone )
-        INFO_PRINTF1(_L("Socket2 Opened!\n "));
-    else   // (iStatus!=KErrNone)
-        {
-        ERR_PRINTF2(_L("Error Opening Socket2: %d"), iStatus.Int());    
-        SetError(iStatus.Int());
-        iSocket1.Close();
-        iConnection1.Close();
-        iConnection2.Close();
-        iSocketServ1.Close();
-        iSocketServ2.Close();
-        StopD3PApp();
-        return;
-        }
-
-    iSendBuf.Zero();
-    iSendBuf = (TText8*)"Socket1: Nokia sues Apple!";
-
-    // Get destination address from config file   
-    TPtrC ptrToReadFromConfig(KNameDefault);
-    TBool returnValue = GetStringFromConfig(aSection, KDestAddr, ptrToReadFromConfig);
-    if (!returnValue)
-        {
-        ERR_PRINTF1(_L("Reading config file failed, while reading DestAddr"));   
-        SetError(KErrUnknown);
-        iSocket1.Close();
-        iSocket2.Close();
-        iConnection1.Close();
-        iConnection2.Close();
-        iSocketServ1.Close();
-        iSocketServ2.Close();
-        StopD3PApp();
-        return;
-        }
-    //set destination IP ie. server
-    TInt err = iDestAddr.Input(ptrToReadFromConfig);   
-    if(err != KErrNone)
-        {
-        INFO_PRINTF2(KInetInputFail, err);
-        SetError(err);
-        iSocket1.Close();
-        iSocket2.Close();
-        iConnection1.Close();
-        iConnection2.Close();
-        iSocketServ1.Close();        
-        iSocketServ2.Close();
-        StopD3PApp();
-        return;
-        }
-
-    returnValue = GetIntFromConfig(aSection, KDestPort, iDestPort);
-    if (!returnValue)
-        {
-        ERR_PRINTF1(_L("Reading config file failed, while reading DestPort"));   
-        SetError(KErrUnknown);
-        iSocket1.Close();
-        iSocket2.Close();
-        iConnection1.Close();
-        iConnection2.Close();
-        iSocketServ1.Close();
-        iSocketServ2.Close();
-        StopD3PApp();
-        return;
-        }    
-    iDestAddr.SetPort(iDestPort);
-    //bind local port to socket
-    err = iSocket1.SetLocalPort(LOCAL_PORT);
-
-    if(err != KErrNone)
-		{
-	    ERR_PRINTF1(_L("Error in setting local port to socket1"));
-	    SetError(err);
-	    iSocket1.Close();
-	    iSocket2.Close();
-	    iConnection1.Close();
-	    iConnection2.Close();
-	    iSocketServ1.Close();
-	    iSocketServ2.Close();
-	    StopD3PApp();
-	    return;
-	    }
-
-    err = iSocket2.SetLocalPort(LOCAL_PORT+1);
-    if(err != KErrNone)
-		{
-		ERR_PRINTF1(_L("Error in setting local port to socket1"));
-	    SetError(err);
-		iSocket1.Close();
-	    iSocket2.Close();
-	    iConnection1.Close();
-	    iConnection2.Close();
-	    iSocketServ1.Close();
-	    iSocketServ2.Close();
-	    StopD3PApp();
-	    return;
-	    }
-    //send data to server
-    iSocket1.SendTo(iSendBuf, iDestAddr, NULL, iStatus);
-		User::WaitForRequest(iStatus);
-	  if( iStatus == KErrNone)
-        INFO_PRINTF1(_L("\nData Sent for socket1"));
-    else
-	    {
-	    ERR_PRINTF1(_L("\nData sending failed for socket1"));
-		SetError(iStatus.Int());
-		iSocket1.Close();
-	    iSocket2.Close();
-	    iConnection1.Close();
-	    iConnection2.Close();
-	    iSocketServ1.Close();
-	    iSocketServ2.Close();
-	    StopD3PApp();
-	    return;
-	    }
-    iRecvBuf.Zero();
-    iSocket1.RecvFrom(iRecvBuf, iDestAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);
-    TBuf<128> temp;
-    if( iStatus == KErrNone)
-        {
-        INFO_PRINTF1(_L("\nData Received from Socket1 : "));
-        temp.Copy(iRecvBuf);
-        INFO_PRINTF1(temp);
-        INFO_PRINTF1(_L("\n"));
-        }
-    else
-    	{
-        ERR_PRINTF1(_L("\nData receive failed on Socket1"));
-        SetError(iStatus.Int());
-        iSocket1.Close();
-        iSocket2.Close();
-        iConnection1.Close();
-        iConnection2.Close();
-        iSocketServ1.Close();
-        iSocketServ2.Close();
-        StopD3PApp();
-        return;
-      	}
-
-    iSendBuf.Zero();
-    iSendBuf = (TText8*)"Socket2: Nokia sues Apple!";
-    iSocket2.SendTo(iSendBuf, iDestAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);
-    if( iStatus == KErrNone)
-        INFO_PRINTF1(_L("\nData Sent for socket2"));
-    else
-    	{
-        ERR_PRINTF1(_L("\nData sending failed for socket2"));
-        SetError(iStatus.Int());
-        iSocket1.Close();
-        iSocket2.Close();
-        iConnection1.Close();
-        iConnection2.Close();
-        iSocketServ1.Close();
-        iSocketServ2.Close();
-        StopD3PApp();
-        return;        
-      	}
-
-
-    iRecvBuf.Zero();
-    User::After(30000);
-    iSocket2.RecvFrom(iRecvBuf, iDestAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);
-    temp.Zero();
-    if( iStatus == KErrNone)
-        {
-        INFO_PRINTF1(_L("\nData Received from Socket2: "));
-        temp.Copy(iRecvBuf);
-        INFO_PRINTF1(temp);
-        INFO_PRINTF1(_L("\n"));
-        }
-    else
-        {
-        ERR_PRINTF1(_L("\nData receive failed on Socket2"));
-        SetError(iStatus.Int());
-        }
-
-    iSocket1.Close();
-    iSocket2.Close();
-    iConnection1.Close();
-    iConnection2.Close();
-    iSocketServ1.Close();      
-    iSocketServ2.Close();
-    StopD3PApp();
-    }
-
-
-//Sockets sending from within different socket servers over different interfaces
-//(Connection explicitly created)
-void CTunDriverTestWrapper::DoRConnTest1_8(const TDesC& aSection)
-    {
-    INFO_PRINTF1(_L("*********************************************"));
-    INFO_PRINTF1(_L("           Test: DoRConnTest1_8             "));
-    INFO_PRINTF1(_L("*********************************************"));
-
-    //start the dummy3rdpartyapp
-    if ((iVTunError = StartD3PApp()) != KErrNone)
-        {
-        return;
-        }
-
-    if((iStatus = iSocketServ1.Connect()) == KErrNone )
-        INFO_PRINTF1(_L("Socket Server1 Opened.\n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Socket Server1: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        StopD3PApp();
-        return;
-        }
-
-    if((iStatus = iSocketServ2.Connect()) == KErrNone )
-        INFO_PRINTF1(_L("Socket Server2 Opened.\n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Socket Server2: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        StopD3PApp();
-        return;
-        }
-    if((iStatus = iConnection1.Open(iSocketServ1)) == KErrNone )
-        INFO_PRINTF1(_L("Connection1 opened. \n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Connection1: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        StopD3PApp();
-        return;
-        }
-
-    if((iStatus = iConnection2.Open(iSocketServ2)) == KErrNone )
-        INFO_PRINTF1(_L("Connection2 opened. \n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Connection2: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        StopD3PApp();
-        return;
-        }
-
-    iCommDbPref1.SetIapId(TUNDRIVER_IAP);             // Virtual Interface
-    iCommDbPref1.SetBearerSet(KCommDbBearerVirtual);
-    iCommDbPref1.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-
-    iConnection1.Start(iCommDbPref1, iStatus);
-    User::WaitForRequest(iStatus);
-	if(iStatus.Int()!=KErrNone)
-		{
-	    ERR_PRINTF2(_L("Error starting connection1: %d"), iStatus.Int());	
-		SetError(iStatus.Int());
-		iSocketServ1.Close();
-		iSocketServ2.Close();
-		StopD3PApp();
-		return;
-	    }
-    INFO_PRINTF2(_L("Starting Connection1 %d.\n"), iStatus.Int());
-
-    iCommDbPref2.SetIapId(REAL_IAP);             // Ethernet Interface
-    iCommDbPref2.SetBearerSet(KCommDbBearerLAN);
-    iCommDbPref2.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-
-    iConnection2.Start(iCommDbPref2, iStatus);
-    User::WaitForRequest(iStatus);
-	if(iStatus.Int()!=KErrNone)
-		{
-		ERR_PRINTF2(_L("Error starting connection2: %d"), iStatus.Int());	
-		SetError(iStatus.Int());
-		iSocketServ1.Close();
-		iSocketServ2.Close();
-		StopD3PApp();
-		return;
-	    }
-
-    INFO_PRINTF2(_L("Starting Connection2 %d.\n"), iStatus.Int());
-
-    //open socket on interface. 
-    if((iStatus = iSocket1.Open(iSocketServ1, KAfInet, KSockDatagram, KProtocolInetUdp, iConnection1)) == KErrNone )
-        INFO_PRINTF1(_L("Socket1 Opened!\n "));
-    else   // (iStatus!=KErrNone)
-        {
-        ERR_PRINTF2(_L("Error Opening Socket1: %d"), iStatus.Int());    
-        SetError(iStatus.Int());
-        iConnection1.Close();
-        iConnection2.Close();
-        iSocketServ1.Close();
-        iSocketServ2.Close();
-        StopD3PApp();
-        return;
-        }
-    if((iStatus = iSocket2.Open(iSocketServ2, KAfInet, KSockDatagram, KProtocolInetUdp, iConnection2)) == KErrNone )
-        INFO_PRINTF1(_L("Socket1 Opened!\n "));
-    else   // (iStatus!=KErrNone)
-        {
-        ERR_PRINTF2(_L("Error Opening Socket2: %d"), iStatus.Int());    
-        SetError(iStatus.Int());
-        iSocket1.Close();
-				iConnection1.Close();
-        iConnection2.Close();
-        iSocketServ1.Close();
-        iSocketServ2.Close();
-        StopD3PApp();
-        return;
-        }
-
-    iSendBuf.Zero();
-    iSendBuf = (TText8*)"Socket1: Nokia sues Apple!";
-
-    // Get destination address from config file   
-    TPtrC ptrToReadFromConfig(KNameDefault);
-    TBool returnValue = GetStringFromConfig(aSection, KDestAddr, ptrToReadFromConfig);
-    if (!returnValue)
-        {
-        ERR_PRINTF1(_L("Reading config file failed, while reading DestAddr"));   
-        SetError(KErrUnknown);
-		iSocket1.Close();
-		iSocket2.Close();
-		iConnection1.Close();
-        iConnection2.Close();
-        iSocketServ1.Close();
-        iSocketServ2.Close();
-        StopD3PApp();
-        return;
-        }
-    //set destination IP ie. server
-    TInt err = iDestAddr.Input(ptrToReadFromConfig);   
-    if(err != KErrNone)
-        {
-        INFO_PRINTF2(KInetInputFail, err);
-        SetError(err);
-        StopD3PApp();
-        return;
-        }
-
-    returnValue = GetIntFromConfig(aSection, KDestPort, iDestPort);
-    iDestAddr.SetPort(iDestPort);
-    //bind local port to socket
-    err = iSocket1.SetLocalPort(LOCAL_PORT);
-    if(err != KErrNone)
-	    {
-		ERR_PRINTF1(_L("Error in setting local port to socket1"));
-	    SetError(err);
-		iSocket1.Close();
-	    iSocket2.Close();
-	    iConnection1.Close();
-	    iConnection2.Close();
-	    iSocketServ1.Close();
-	    iSocketServ2.Close();
-	    StopD3PApp();
-	    return;
-	    }
-
-    //read Real interface ip addr and port from config file
-    returnValue = GetStringFromConfig(aSection, KRealDestAddr, ptrToReadFromConfig);
-    if (!returnValue)
-        {
-        ERR_PRINTF1(_L("Reading config file failed, while reading RealDestAddr"));   
-        SetError(KErrUnknown);
-		iSocket1.Close();
-	    iSocket2.Close();
-	    iConnection1.Close();
-	    iConnection2.Close();
-	    iSocketServ1.Close();
-	    iSocketServ2.Close();
-        StopD3PApp();
-        return;
-        }
-    //set destination IP ie. server
-    err = iRealDestAddr.Input(ptrToReadFromConfig);   
-    if(err != KErrNone)
-        {
-        INFO_PRINTF2(KInetInputFail, err);
-        SetError(err);
-				iSocket1.Close();
-	      iSocket2.Close();
-	      iConnection1.Close();
-	      iConnection2.Close();
-	      iSocketServ1.Close();
-	      iSocketServ2.Close();
-        StopD3PApp();
-        return;
-        }
-
-    returnValue = GetIntFromConfig(aSection, KRealDestPort, iRealDestPort);
-    if (!returnValue)
-        {
-        ERR_PRINTF1(_L("Reading config file failed, while reading RealDestAddr"));   
-        SetError(KErrUnknown);
-				iSocket1.Close();
-	      iSocket2.Close();
-	      iConnection1.Close();
-	      iConnection2.Close();
-	      iSocketServ1.Close();
-	      iSocketServ2.Close();
-        StopD3PApp();
-        return;
-        }
-    iRealDestAddr.SetPort(iRealDestPort);
-    //bind local port to socket
-    //err = iSocket2.SetLocalPort(LOCAL_PORT);
-    //send data to server
-    iSocket1.SendTo(iSendBuf, iDestAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);
-    if( iStatus == KErrNone)
-        INFO_PRINTF1(_L("\nData Sent thru virtual interface"));
-    else
-    		{
-        ERR_PRINTF1(_L("\nData sending failed through virtual interface"));
-				SetError(iStatus.Int());
-				iSocket1.Close();
-	      iSocket2.Close();
-	      iConnection1.Close();
-	      iConnection2.Close();
-	      iSocketServ1.Close();
-	      iSocketServ2.Close();
-        StopD3PApp();
-        return;
-      	}
-
-    iRecvBuf.Zero();
-    iSocket1.RecvFrom(iRecvBuf, iDestAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);
-    TBuf<128> temp;
-    if( iStatus == KErrNone)
-        {
-        INFO_PRINTF1(_L("\nData Received from Socket1 : "));
-        temp.Copy(iRecvBuf);
-        INFO_PRINTF1(temp);
-        INFO_PRINTF1(_L("\n"));
-        }
-    else
-        {
-        ERR_PRINTF1(_L("\nData receive failed on Socket1"));
-        SetError(iStatus.Int());
-				iSocket1.Close();
-	      iSocket2.Close();
-	      iConnection1.Close();
-	      iConnection2.Close();
-	      iSocketServ1.Close();
-	      iSocketServ2.Close();
-        StopD3PApp();
-        return;
-        }
-
-    iSendBuf.Zero();
-    iSendBuf = (TText8*)"Socket2: Nokia sues Apple!";
-    iSocket2.SendTo(iSendBuf, iRealDestAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);
-    if( iStatus == KErrNone)
-        INFO_PRINTF1(_L("\nData Sent thru real interface"));
-    else
-    		{
-        ERR_PRINTF1(_L("\nData sending failed through real interface"));
-        SetError(iStatus.Int());
-				iSocket1.Close();
-	      iSocket2.Close();
-	      iConnection1.Close();
-	      iConnection2.Close();
-	      iSocketServ1.Close();
-	      iSocketServ2.Close();
-        StopD3PApp();
-        return;
-
-				}
-    iRecvBuf.Zero();
-    iSocket2.RecvFrom(iRecvBuf, iRealDestAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);
-    temp.Zero();
-    if( iStatus == KErrNone)
-        {
-        INFO_PRINTF1(_L("\nData Received from Socket2: "));
-        temp.Copy(iRecvBuf);
-        INFO_PRINTF1(temp);
-        INFO_PRINTF1(_L("\n"));
-        }
-    else
-        {
-        ERR_PRINTF1(_L("\nData receive failed on Socket2"));
-        SetError(iStatus.Int());
-        }
-
-    iSocket1.Close();
-    iSocket2.Close();
-    iConnection1.Close();
-    iConnection2.Close();
-    iSocketServ1.Close();      
-    iSocketServ2.Close();
-    StopD3PApp();
-    }
-
-void CTunDriverTestWrapper::DoRConnTest1_9(const TDesC& aSection)
-    {
-    INFO_PRINTF1(_L("*********************************************"));
-        INFO_PRINTF1(_L("           Test: DoRConnTest1_9             "));
-        INFO_PRINTF1(_L("********************************************"));
-#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-    CMDBSession *cmdbSession = CMDBSession::NewL(KCDVersion1_2);
-#else
-    CMDBSession *cmdbSession = CMDBSession::NewL(KCDVersion1_1);
-#endif
-    CleanupStack::PushL(cmdbSession); 
-
-    CCDIAPRecord *iapRecord = (CCDIAPRecord*)CCDRecordBase::RecordFactoryL(KCDTIdIAPRecord);
-    CleanupStack::PushL(iapRecord);
-
-    iapRecord->SetRecordId(14);
-
-    iapRecord->LoadL(*cmdbSession);
-
-    //iapRecord->iServiceType;
-    TUint recid = iapRecord->iService;
-    CCDLANServiceRecord *lanRecord = (CCDLANServiceRecord*)CCDRecordBase::RecordFactoryL(KCDTIdLANServiceRecord);
-    CleanupStack::PushL(lanRecord);
-
-    lanRecord->SetRecordId(recid);
-
-    lanRecord->LoadL(*cmdbSession);
-
-    // Get gateway address from config file  
-    TPtrC ptrToReadFromConfig(KNameDefault);
-    TBool returnValue = GetStringFromConfig(aSection, KGatewayAddr, ptrToReadFromConfig);
-    if (!returnValue)
-        {
-        ERR_PRINTF1(_L("Reading config file failed, while reading DestAddr"));   
-        SetError(KErrUnknown);
-        return;
-        }
-
-    // Create address
-    TInetAddr gwAddr;
-    TInt err = gwAddr.Input(ptrToReadFromConfig);   
-    if(err != KErrNone)
-        {
-        INFO_PRINTF2(KInetInputFail, err);
-        SetError(err);
-        return;
-        }
-    TPtrC displayIpAddr(lanRecord->iIpAddr);
-    //INFO_PRINTF2(_L("lanRecord ipAddr is %S"), &displayIpAddr); 
-
-    TPtrC ipGateway(_L("10.1.1.100"));
-    //TPtrC ipGateway(ptrToReadFromConfig);
-    lanRecord->iIpGateway.SetMaxLengthL(ipGateway.Length());
-    lanRecord->iIpGateway = ipGateway;
-
-
-    // Get gateway address from config file         
-    returnValue = GetStringFromConfig(aSection, KIpAddr, ptrToReadFromConfig);
-    if (!returnValue)
-        {
-        ERR_PRINTF1(_L("Reading config file failed, while reading DestAddr"));   
-        SetError(KErrUnknown);
-        return;
-        }
-    //TPtrC ipAddr(_L("10.1.1.100"));
-    TPtrC ipAddr(ptrToReadFromConfig);
-    lanRecord->iIpAddr.SetMaxLengthL(ipAddr.Length());
-    lanRecord->iIpAddr = ipAddr;
-
-    TRAPD(modifyErr, lanRecord->ModifyL(*cmdbSession));
-    INFO_PRINTF2(_L("lanRecord ModifyL result was %d.  Should be 0"), modifyErr);
-
-    TPtrC displayIpAddr2(lanRecord->iIpAddr);
-    INFO_PRINTF2(_L("lanRecord ipAddr is %S"), &displayIpAddr2);    
-    CleanupStack::PopAndDestroy(lanRecord);
-    CleanupStack::PopAndDestroy(iapRecord);
-    CleanupStack::PopAndDestroy(cmdbSession);
-
-
-    }
-
-//Ensure that Close() effectively pulls down the interface
-//when no other subsessions are associated with it.
-void CTunDriverTestWrapper::DoRConnTest1_10(const TDesC& aSection)
-    {
-    INFO_PRINTF1(_L("*********************************************"));
-    INFO_PRINTF1(_L("           Test: DoRConnTest1_10             "));
-    INFO_PRINTF1(_L("********************************************"));
-
-    //start the dummy3rdpartyapp
-    if ((iVTunError = StartD3PApp()) != KErrNone)
-        {
-        return;
-        }
-
-    if((iStatus = iSocketServ.Connect()) == KErrNone )
-        INFO_PRINTF1(_L("Socket Server Opened.\n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Socket Server: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        StopD3PApp();
-        return;
-        }
-    if((iStatus = iConnection.Open(iSocketServ /*, KAfInet*/)) == KErrNone )
-        INFO_PRINTF1(_L("Connection opened. \n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Connection: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        StopD3PApp();
-        return;
-        }
-
-    iCommDbPref.SetIapId(TUNDRIVER_IAP);             // Virtual Interface
-    iCommDbPref.SetBearerSet(KCommDbBearerVirtual);
-    iCommDbPref.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-
-    iConnection.Start(iCommDbPref, iStatus);
-    User::WaitForRequest(iStatus);
-    if (iStatus.Int() != KErrNone)
-				{
-				ERR_PRINTF2(_L("Error starting connection: %d"), iStatus.Int());	
-				SetError(iStatus.Int());
-				iSocketServ.Close();
-				StopD3PApp();
-				return;
-				}
-    INFO_PRINTF2(_L("Starting Connection %d.\n"), iStatus.Int());
-
-    //Enumerate the number of interfaces
-    iConnection.EnumerateConnections(iInitNumOfInterfaces);
-    INFO_PRINTF2(_L("Number of Interfaces: %d!\n "), iInitNumOfInterfaces);
-
-    //open socket on interface. 
-    if((iStatus = iSocket.Open(iSocketServ, KAfInet, KSockDatagram, KProtocolInetUdp, iConnection)) == KErrNone )
-        INFO_PRINTF1(_L("Socket Opened!\n "));
-    else   // (iStatus!=KErrNone)
-        {
-        ERR_PRINTF2(_L("Error Opening Socket: %d"), iStatus.Int());    
-        SetError(iStatus.Int());
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-        }
-
-    iSendBuf.Zero();
-    iSendBuf = (TText8*)"Nokia sues Apple!";
-
-    // Get destination address from config file  
-    TPtrC ptrToReadFromConfig(KNameDefault);
-    TBool returnValue = GetStringFromConfig(aSection, KDestAddr, ptrToReadFromConfig);
-    if (!returnValue)
-        {
-        ERR_PRINTF1(_L("Reading config file failed, while reading DestAddr"));   
-        SetError(KErrUnknown);
-        iSocket.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-        }
-    //set destination IP ie. server
-    TInt err = iDestAddr.Input(ptrToReadFromConfig);   
-    if(err != KErrNone)
-        {
-        INFO_PRINTF2(KInetInputFail, err);
-        SetError(err);
-        iSocket.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-        }
-
-    returnValue = GetIntFromConfig(aSection, KDestPort, iDestPort);
-    if (!returnValue)
-        {
-        ERR_PRINTF1(_L("Reading config file failed, while reading DestAddr"));   
-        SetError(KErrUnknown);
-        iSocket.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-        }
-
-    iDestAddr.SetPort(iDestPort);
-    //bind local port to socket
-    err = iSocket.SetLocalPort(LOCAL_PORT);
-    if (err != KErrNone)
-        {
-        ERR_PRINTF1(_L("Error setting local port"));   
-        SetError(err);
-        iSocket.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-        }
-
-    //send data to server
-    iSocket.SendTo(iSendBuf, iDestAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);
-    if( iStatus == KErrNone)
-        INFO_PRINTF1(_L("\nData Sent"));
-    else
-    		{
-        ERR_PRINTF1(_L("\nData sending failed"));
-        SetError(iStatus.Int());
-        iSocket.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-				}
-    
-    iRecvBuf.Zero();
-    iSocket.RecvFrom(iRecvBuf, iDestAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);
-    TBuf<128> temp;
-    if( iStatus == KErrNone)
-        {
-        INFO_PRINTF1(_L("\nData Received : "));
-        temp.Copy(iRecvBuf);
-        INFO_PRINTF1(temp);
-        INFO_PRINTF1(_L("\n"));
-        }
-    else
-        {
-        ERR_PRINTF1(_L("\nData receive failed."));
-        SetError(iStatus.Int());
-        }  
-
-    iSocket.Close();
-    iConnection.Close();
-    iSocketServ.Close();
-    
-    StopD3PApp();
-    
-    }
-
-//Ensure that Close() does not pull down the interface when there are other 
-//connections associated with it.
-void CTunDriverTestWrapper::DoRConnTest1_11()
-    {
-    INFO_PRINTF1(_L("*********************************************"));
-    INFO_PRINTF1(_L("           Test: DoRConnTest1_11             "));
-    INFO_PRINTF1(_L("*********************************************"));
-
-    if((iStatus = iSocketServ.Connect()) == KErrNone )
-        INFO_PRINTF1(_L("Socket Server Opened.\n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Socket Server: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        return;
-        }
-
-    if((iStatus = iConnection1.Open(iSocketServ /*, KAfInet*/)) == KErrNone )
-        INFO_PRINTF1(_L("Connection1 opened. \n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Connection1: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        return;
-        }
-
-    if((iStatus = iConnection2.Open(iSocketServ /*, KAfInet*/)) == KErrNone )
-        INFO_PRINTF1(_L("Connection2 opened. \n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Connection2: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        return;
-        }
-
-    iCommDbPref.SetIapId(TUNDRIVER_IAP);             // Virtual Interface
-    iCommDbPref.SetBearerSet(KCommDbBearerVirtual);
-    iCommDbPref.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-
-    iConnection1.Start(iCommDbPref, iStatus);
-    User::WaitForRequest(iStatus);
-		if(iStatus.Int()!=KErrNone)
-	    	{
-	    	ERR_PRINTF2(_L("Error starting connection1: %d"), iStatus.Int());	
-				SetError(iStatus.Int());
-				iSocketServ.Close();
-				return;
-	    	}
-    INFO_PRINTF2(_L("Starting Connection1 %d.\n"), iStatus.Int());
-    iConnection2.Start(iCommDbPref, iStatus);
-    User::WaitForRequest(iStatus);
-		if(iStatus.Int()!=KErrNone)
-	    	{
-	    	ERR_PRINTF2(_L("Error starting connection2: %d"), iStatus.Int());	
-				SetError(iStatus.Int());
-				iSocketServ.Close();
-				return;
-	    	}
-    INFO_PRINTF2(_L("Starting Connection2 %d.\n"), iStatus.Int());
-
-    //Enumerate the number of interfaces
-    iConnection2.EnumerateConnections(iInitNumOfInterfaces);
-    INFO_PRINTF2(_L("Number of Interfaces: %d!\n "), iInitNumOfInterfaces);
-
-    iConnection1.Close();
-    User::After(30000);
-
-    iConnection2.EnumerateConnections(iCurNumOfInterfaces);
-    INFO_PRINTF2(_L("Number of Interfaces after closing 1st Connection: %d!\n "), iCurNumOfInterfaces);
-    if(iCurNumOfInterfaces == iInitNumOfInterfaces)
-    		INFO_PRINTF1(_L("Number of interfaces before and after closing the connection is same"));
- 		else
-        {
-        ERR_PRINTF1(_L("ERROR: More Number of Interfaces than expected."));    
-        SetError(KErrGeneral);
-        return;
-        }
-    iConnection2.Stop();
-    User::After(30000);
-    iSocketServ.Close();      
-    }
-
-//Ensure that Stop() pulls down the interface when there are no subsessions
-//other than the connection associated with it.
-void CTunDriverTestWrapper::DoRConnTest1_12()
-    {
-
-    INFO_PRINTF1(_L("*********************************************"));
-    INFO_PRINTF1(_L("           Test: DoRConnTest1_12             "));
-    INFO_PRINTF1(_L("*********************************************"));
-
-    if((iStatus = iSocketServ.Connect()) == KErrNone )
-        INFO_PRINTF1(_L("Socket Server Opened.\n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Socket Server: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        return;
-        }
-
-    if((iStatus = iConnection.Open(iSocketServ /*, KAfInet*/)) == KErrNone )
-        INFO_PRINTF1(_L("Connection opened. \n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Connection: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        return;
-        }
-
-		iCommDbPref1.SetIapId(REAL_IAP);             // Virtual Interface
-    iCommDbPref1.SetBearerSet(KCommDbBearerLAN);
-    iCommDbPref1.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-    
-    iConnection.Start(iCommDbPref1,iStatus);
-    User::WaitForRequest(iStatus);
-		if(iStatus.Int()!=KErrNone)
-	    	{
-	    	ERR_PRINTF2(_L("Error starting connection: %d"), iStatus.Int());	
-				SetError(iStatus.Int());
-				iSocketServ.Close();
-				return;
-	    	}
-    INFO_PRINTF2(_L("Starting Connection %d.\n"), iStatus.Int());
-
-    //Enumerate the number of interfaces
-    iConnection.EnumerateConnections(iInitNumOfInterfaces);
-    INFO_PRINTF2(_L("Number of initial Interfaces: %d!\n "), iInitNumOfInterfaces);
-
-    TInt MyErr = iConnection.Stop();
-    User::After(30000);
-    iConnection.EnumerateConnections(iCurNumOfInterfaces);
-    INFO_PRINTF2(_L("Number of Interfaces after stopping the connection: %d!\n "), iCurNumOfInterfaces);
-    if(iCurNumOfInterfaces>=iInitNumOfInterfaces)
-        {
-        ERR_PRINTF1(_L("ERROR: More Number of Interfaces than expected."));    
-        SetError(KErrGeneral);
-        return;
-        }
-    iSocketServ.Close();      
-    }
-
-//Ensure that Stop() pulls down the interface when 
-//there are sockets associated with it.
-void CTunDriverTestWrapper::DoRConnTest1_13(const TDesC& aSection)
-    {
-    INFO_PRINTF1(_L("*********************************************"));
-    INFO_PRINTF1(_L("           Test: DoRConnTest1_13             "));
-    INFO_PRINTF1(_L("*********************************************"));
-
-    //start the dummy3rdpartyapp
-    if ((iVTunError = StartD3PApp()) != KErrNone)
-        {
-        return;
-        }
-
-    if((iStatus = iSocketServ.Connect()) == KErrNone )
-        INFO_PRINTF1(_L("Socket Server Opened.\n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Socket Server: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        StopD3PApp();
-        return;
-        }
-
-    if((iStatus = iConnection.Open(iSocketServ /*, KAfInet*/)) == KErrNone )
-        INFO_PRINTF1(_L("Connection opened. \n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Connection: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        StopD3PApp();
-        return;
-        }
-
-    iCommDbPref.SetIapId(TUNDRIVER_IAP);             // Virtual Interface
-    iCommDbPref.SetBearerSet(KCommDbBearerVirtual);
-    iCommDbPref.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-    iConnection.Start(iCommDbPref, iStatus);
-    User::WaitForRequest(iStatus);
-		if(iStatus.Int()!=KErrNone)
-	    	{
-	    	ERR_PRINTF2(_L("Error starting connection: %d"), iStatus.Int());	
-				SetError(iStatus.Int());
-				iSocketServ.Close();
-				StopD3PApp();
-				return;
-	    	}
-    INFO_PRINTF2(_L("Starting Connection %d.\n"), iStatus.Int());
-
-    //open socket on interface. 
-    if((iStatus = iSocket.Open(iSocketServ, KAfInet, KSockDatagram, KProtocolInetUdp, iConnection)) == KErrNone )
-        INFO_PRINTF1(_L("Socket Opened!\n "));
-    else   // (iStatus!=KErrNone)
-        {
-        ERR_PRINTF2(_L("Error Opening Socket: %d"), iStatus.Int());    
-        SetError(iStatus.Int());
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-        }
-
-    iSendBuf.Zero();
-    iSendBuf = (TText8*)"Sending Data through Socket!";
-
-    // Get destination address from config file   
-    TPtrC ptrToReadFromConfig(KNameDefault);
-    TBool returnValue = GetStringFromConfig(aSection, KDestAddr, ptrToReadFromConfig);
-    if (!returnValue)
-        {
-        ERR_PRINTF1(_L("Reading config file failed, while reading DestAddr"));   
-        SetError(KErrUnknown);
-        iSocket.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-        }
-    //set destination IP ie. server
-    TInt err = iDestAddr.Input(ptrToReadFromConfig);   
-    if(err != KErrNone)
-        {
-        INFO_PRINTF2(KInetInputFail, err);
-        SetError(err);
-        iSocket.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-        }
-
-    returnValue = GetIntFromConfig(aSection, KDestPort, iDestPort);
-    if (!returnValue)
-        {
-        ERR_PRINTF1(_L("Reading config file failed, while reading DestAddr"));   
-        SetError(KErrUnknown);
-        iSocket.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-        }
-
-    iDestAddr.SetPort(iDestPort);
-    //bind local port to socket
-    err = iSocket.SetLocalPort(LOCAL_PORT);
-    if (err != KErrNone)
-        {
-        ERR_PRINTF1(_L("Reading config file failed, while reading DestAddr"));   
-        SetError(err);
-        iSocket.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-        }
-
-    //send data to server
-    iSocket.SendTo(iSendBuf, iDestAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);
-    if( iStatus == KErrNone)
-        INFO_PRINTF1(_L("\nData Sent"));
-    else
-    		{
-        ERR_PRINTF1(_L("\nData sending failed"));
-        SetError(iStatus.Int());
-        iSocket.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;        
-      	}
-
-    iRecvBuf.Zero();
-    iSocket.RecvFrom(iRecvBuf, iDestAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);
-    TBuf<128> temp;
-    if( iStatus == KErrNone)
-        {
-        INFO_PRINTF1(_L("\nData Received from Socket : "));
-        temp.Copy(iRecvBuf);
-        INFO_PRINTF1(temp);
-        INFO_PRINTF1(_L("\n"));
-        }
-    else
-        {
-        ERR_PRINTF1(_L("\nData receive failed on Socket"));
-        SetError(iStatus.Int());
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;        
-        }  
-
-
-    //Enumerate the number of interfaces
-    iConnection.EnumerateConnections(iInitNumOfInterfaces);
-    INFO_PRINTF2(_L("Number of Init Interfaces: %d!\n "), iInitNumOfInterfaces);
-
-    iConnection.Stop();
-    User::After(30000);
-    iConnection.EnumerateConnections(iCurNumOfInterfaces);
-    INFO_PRINTF2(_L("Number of Interfaces after Stopping the interface: %d!\n "), iCurNumOfInterfaces);
-    if(iCurNumOfInterfaces>=iInitNumOfInterfaces)
-        {
-        ERR_PRINTF1(_L("ERROR: More Number of Interfaces than expected."));    
-        SetError(KErrGeneral);
-        }
-    iSocket.Close();
-    iSocketServ.Close();    
-    StopD3PApp();
-    }
-
-//Stop() a connection and ensure that other connections over 
-//other interfaces are unaffected. 
-void CTunDriverTestWrapper::DoRConnTest1_14(const TDesC& aSection)
-    {
-
-    INFO_PRINTF1(_L("*********************************************"));
-    INFO_PRINTF1(_L("           Test: DoRConnTest1_14             "));
-    INFO_PRINTF1(_L("*********************************************"));
-
-    if((iStatus = iSocketServ.Connect()) == KErrNone )
-        INFO_PRINTF1(_L("Socket Server Opened.\n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Socket Server: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        
-        return;
-        }
-
-    if((iStatus = iConnection1.Open(iSocketServ /*, KAfInet*/)) == KErrNone )
-        INFO_PRINTF1(_L("Connection1 opened. \n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Connection1: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        
-        return;
-        }
-    iCommDbPref1.SetIapId(TUNDRIVER_IAP);             // Virtual Interface
-    iCommDbPref1.SetBearerSet(KCommDbBearerVirtual);
-    iCommDbPref1.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-    iConnection1.Start(iCommDbPref1,iStatus);
-    User::WaitForRequest(iStatus);
-		if(iStatus.Int()!=KErrNone)
-	    	{
-	    	ERR_PRINTF2(_L("Error starting connection1: %d"), iStatus.Int());	
-				SetError(iStatus.Int());
-				iSocketServ.Close();
-				return;
-	    	}
-    INFO_PRINTF2(_L("Starting Connection1 %d.\n"), iStatus.Int());
-
-    if((iStatus = iConnection2.Open(iSocketServ /*, KAfInet*/)) == KErrNone )
-        INFO_PRINTF1(_L("Connection2 opened. \n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Connection2: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        iSocketServ.Close();
-        return;
-        }
-    iCommDbPref2.SetIapId(REAL_IAP);             // Virtual Interface
-    iCommDbPref2.SetBearerSet(KCommDbBearerLAN);
-    iCommDbPref2.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-    iConnection2.Start(iCommDbPref2, iStatus);
-    User::WaitForRequest(iStatus);
-		if(iStatus.Int()!=KErrNone)
-	    	{
-	    	ERR_PRINTF2(_L("Error starting connection2: %d"), iStatus.Int());	
-				SetError(iStatus.Int());
-				iConnection1.Close();
-				iSocketServ.Close();
-				return;
-	    	}
-    INFO_PRINTF2(_L("Starting Connection2 %d.\n"), iStatus.Int());
-    //enumnerate the interfaces
-    iConnection1.EnumerateConnections(iInitNumOfInterfaces);
-    INFO_PRINTF2(_L("Number of Initial Interfaces: %d!\n "), iInitNumOfInterfaces);
-
-    //Shutdown the first connection.
-    iConnection1.Stop();
- 
-    //enumnerate the interfaces again.
-    iConnection2.EnumerateConnections(iCurNumOfInterfaces);
-    INFO_PRINTF2(_L("Number of Interfaces after Stopping the VTun Interface: %d!\n "), iCurNumOfInterfaces);
-    if(iCurNumOfInterfaces>iInitNumOfInterfaces)
-        {
-        ERR_PRINTF1(_L("ERROR: More Number of Interfaces than expected."));    
-        SetError(KErrGeneral);
-        iConnection2.Close();
-        iSocketServ.Close();
-        return;
-        }
-    //open udp socket over second connection and send data over it.
-
-    if((iStatus = iSocket.Open(iSocketServ, KAfInet, KSockDatagram, KProtocolInetUdp, iConnection2)) == KErrNone )
-        INFO_PRINTF1(_L("Socket Opened!\n "));
-    else   // (iStatus!=KErrNone)
-        {
-        ERR_PRINTF2(_L("Error Opening Socket: %d"), iStatus.Int());    
-        SetError(iStatus.Int());
-        iConnection2.Close();
-        iSocketServ.Close();
-        return;
-        }
-
-    iSendBuf.Zero();
-    iSendBuf = (TText8*)"Sending Data through Socket!";
-
-    // Get destination address from config file     
-    TPtrC ptrToReadFromConfig(KNameDefault);
-    TBool returnValue = GetStringFromConfig(aSection, KRealDestAddr, ptrToReadFromConfig);
-    if (!returnValue)
-        {
-        ERR_PRINTF1(_L("Reading config file failed, while reading DestAddr"));   
-        SetError(KErrUnknown);
-        iSocket.Close();
-        iConnection2.Close();
-        iSocketServ.Close();
-        return;
-        }
-    //set destination IP ie. server
-    TInt err = iRealDestAddr.Input(ptrToReadFromConfig);   
-    if(err != KErrNone)
-        {
-        INFO_PRINTF2(KInetInputFail, err);
-        SetError(err);
-        iConnection2.Close();
-        iSocketServ.Close();       
-        return;
-        }
-
-    returnValue = GetIntFromConfig(aSection, KRealDestPort, iRealDestPort);
-    iRealDestAddr.SetPort(iRealDestPort);
-    //bind local port to socket
-    err = iSocket.SetLocalPort(LOCAL_PORT);
-
-    //send data to server
-    iSocket.SendTo(iSendBuf, iRealDestAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);
-    if( iStatus == KErrNone)
-        INFO_PRINTF1(_L("\nData Sent"));
-    else
-    		{
-      	ERR_PRINTF2(_L("\nData sending failed: %d"), iStatus.Int());
-      	SetError(iStatus.Int());
-      	iSocket.Close();
-      	iConnection2.Close();
-      	iSocketServ.Close();
-      	return;
-      	}
-
-    iRecvBuf.Zero();
-    iSocket.RecvFrom(iRecvBuf, iDestAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);
-    TBuf<128> temp;
-    if( iStatus == KErrNone )
-        {
-        INFO_PRINTF1(_L("\nData Received from Socket : "));
-        temp.Copy(iRecvBuf);
-        INFO_PRINTF1(temp);
-        INFO_PRINTF1(_L("\n"));
-        }
-    else
-        {
-        ERR_PRINTF1(_L("\nData receive failed on Socket"));
-        SetError(iStatus.Int());
-        }  
-
-    iSocket.Close();
-    iConnection2.Close();
-    iSocketServ.Close();
-        
-    }
-
-void CTunDriverTestWrapper::DoRConnTest1_15()
-    {
-    INFO_PRINTF1(_L("*********************************************"));
-    INFO_PRINTF1(_L("           Test: DoRConnTest1_15             "));
-    INFO_PRINTF1(_L("********************************************"));
-
-    if((iStatus = iSocketServ.Connect()) == KErrNone )
-        INFO_PRINTF1(_L("Socket Server Opened.\n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Socket Server: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        return;
-        }
-
-    iSocket.Open(iSocketServ,_L("tun"));
-
-    TUint localPort = 6789;
-    TPckgC <TUint> portPckg (localPort);
-
-    //Positive case
-
-    if((iStatus = iSocket.SetOpt(KSolInetIp,KSoTunnelPort,portPckg)) == KErrNone )
-        INFO_PRINTF1(_L("Socket SetOpt Positive scenario succesful Opened.\n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error in Socket SetOpt: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        iSocket.Close();
-        iSocketServ.Close();
-        return;
-        }
-
-    //Negative Case #1
-    if((iStatus = iSocket.SetOpt(KSolInetUdp,KSoTunnelPort,portPckg)) == KErrNotSupported )
-        INFO_PRINTF1(_L("Socket SetOpt Negative scenario #1 succesful Opened.\n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error in Socket SetOpt: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        iSocket.Close();
-        iSocketServ.Close();
-        return;
-        }
-
-    //Negative Case #2 
-    if((iStatus = iSocket.SetOpt(KSolInetUdp,KSoNoSourceAddressSelect,portPckg)) == KErrNotSupported )
-        INFO_PRINTF1(_L("Socket SetOpt Negative scenario #2 succesful Opened.\n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error in Socket SetOpt: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        }
-
-    iSocket.Close();
-    iSocketServ.Close();
-   }
-
-void CTunDriverTestWrapper::DoRConnTest1_16(const TDesC& aSection)
-    {
-    INFO_PRINTF1(_L("*********************************************"));
-    INFO_PRINTF1(_L("           Test: DoRConnTest1_16            "));
-    INFO_PRINTF1(_L("********************************************"));
-
-
-    if((iStatus = iSocketServ.Connect()) == KErrNone )
-        INFO_PRINTF1(_L("Socket Server Opened.\n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Socket Server: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        return;
-        }
-    if((iStatus = iConnection.Open(iSocketServ)) == KErrNone )
-        INFO_PRINTF1(_L("Connection opened. \n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Connection: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        iSocketServ.Close();
-        return;
-        }
-
-    iCommDbPref.SetIapId(TUNDRIVER_IAP);             // Virtual Interface
-    iCommDbPref.SetBearerSet(KCommDbBearerVirtual);
-    iCommDbPref.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-
-    iConnection.Start(iCommDbPref, iStatus);
-    User::WaitForRequest(iStatus);
-		if(iStatus.Int()!=KErrNone)
-	    	{
-	    	ERR_PRINTF2(_L("Error starting connection: %d"), iStatus.Int());	
-				SetError(iStatus.Int());
-				iSocketServ.Close();
-				return;
-	    	}
-    INFO_PRINTF2(_L("Starting Connection %d.\n"), iStatus.Int());
-
-    iSocket.Open(iSocketServ,_L("tun"));
-
-    TUint localPort = 6789;
-    TPckgC <TUint> portPckg (localPort);
-
-    //Setting the Port Number into the Stack
-    if((iStatus = iSocket.SetOpt(KSolInetIp,KSoTunnelPort,portPckg)) == KErrNone )
-        INFO_PRINTF1(_L("Socket SetOpt Positive scenario succesful Opened.\n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error in Socket SetOpt: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        iConnection.Close();
-        iSocketServ.Close();
-        return;
-        }
-
-    // Get destination address from config file 
-    TPtrC ptrToReadFromConfig(KNameDefault);
-    TBool returnValue = GetStringFromConfig(aSection, KDestAddr, ptrToReadFromConfig);
-    if (!returnValue)
-        {
-        ERR_PRINTF1(_L("Reading config file failed, while reading DestAddr"));   
-        SetError(KErrUnknown);
-				iSocket.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        return;
-        }
-    
-    //set destination IP 
-    TInt err = iDestAddr.Input(ptrToReadFromConfig);   
-    if(err != KErrNone)
-        {
-        INFO_PRINTF2(KInetInputFail, err);
-        SetError(err);
-				iSocket.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        return;
-        }
-
-    //set the destination port
-    returnValue = GetIntFromConfig(aSection, KDestPort, iDestPort);
-    if (!returnValue)
-        {
-        ERR_PRINTF1(_L("Reading config file failed, while reading DestAddr"));   
-        SetError(KErrUnknown);
-				iSocket.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        return;
-        }
-    
-    iDestAddr.SetPort(iDestPort);
-
-    //retrieve the local address
-    TInetAddr iLocalAddr;
-    returnValue = GetStringFromConfig(aSection, KLocalAddr, ptrToReadFromConfig);
-    if (!returnValue)
-        {
-        ERR_PRINTF1(_L("Reading config file failed, while reading LocalAddr"));   
-        SetError(KErrUnknown);
-				iSocket.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        return;
-        }
-    
-    err = iLocalAddr.Input(ptrToReadFromConfig);   
-    if(err != KErrNone)
-        {
-        INFO_PRINTF2(KInetInputFail, err);
-        SetError(err);
-				iSocket.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        return;
-        }
-
-    iLocalAddr.SetPort(LOCAL_PORT);
-
-    //open socket on interface.
-    if((iStatus = iSocket1.Open(iSocketServ, KAfInet, KSockDatagram, KProtocolInetUdp,iConnection)) == KErrNone )
-        INFO_PRINTF1(_L("Socket1 Opened!\n "));
-    else   // (iStatus!=KErrNone)
-        {
-        ERR_PRINTF2(_L("Error Opening Socket1: %d"), iStatus.Int());    
-        SetError(iStatus.Int());
-				iSocket.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        return;
-        }
-
-    //open socket on interface.
-    if((iStatus = iSocket2.Open(iSocketServ, KAfInet, KSockDatagram, KProtocolInetIcmp,iConnection)) == KErrNone )
-        INFO_PRINTF1(_L("Socket2 Opened!\n "));
-    else   // (iStatus!=KErrNone)
-        {
-        ERR_PRINTF2(_L("Error Opening Socket2: %d"), iStatus.Int());    
-        SetError(iStatus.Int());
-				iSocket.Close();
-				iSocket1.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        return;
-        }
-
-    err = iSocket1.Bind(iLocalAddr);
-    if(err != KErrNone)
-    		{
-        ERR_PRINTF2(_L("Error Binding Socket1: %d"), err);    
-        SetError(iStatus.Int());
- 				iSocket.Close();
- 				iSocket1.Close();
- 				iSocket2.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-				return;
-				}
-
-    TInt iLocalPort;
-    returnValue = GetIntFromConfig(aSection, KLocalPort, iLocalPort);
-    iLocalAddr.SetPort(iLocalPort);
-
-    err = iSocket2.Bind(iLocalAddr);
-    if(err != KErrNone)
-				{
-        ERR_PRINTF2(_L("Error Binding Socket2: %d"), err);
-        SetError(iStatus.Int());
- 				iSocket.Close();
- 				iSocket1.Close();
- 				iSocket2.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-				return;
-				}
-
-    iSendBuf.Zero();
-    iSendBuf = (TText8*)"Test Message";
-
-    //send data to server using the local port = LOCAL_PORT (7777)
-    iSocket1.SendTo(iSendBuf, iDestAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);
-
-    if( iStatus == KErrNone)
-        INFO_PRINTF1(_L("\nData Sent thru socket1"));
-    else
-				{
-        ERR_PRINTF1(_L("\nData sending failed"));
-        SetError(iStatus.Int());
- 				iSocket.Close();
- 				iSocket1.Close();
- 				iSocket2.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-				return;
-				}
-				
-    //send data to server using the local port configured in ini file 
-    iSocket2.SendTo(iSendBuf, iDestAddr, NULL, iStatus);
-    User::WaitForRequest(iStatus);
-
-    if( iStatus == KErrNone)
-        INFO_PRINTF1(_L("\nData Sent thru socket2"));
-    else
-    		{
-        ERR_PRINTF1(_L("\nData sending failed"));
-        SetError(iStatus.Int());
-      	}
-		iSocket.Close();
-    iSocket1.Close();
-    iSocket2.Close();
-    iConnection.Close();
-    iSocketServ.Close();
-    }
-
-//Simple TCP data transfer.
-void CTunDriverTestWrapper::DoRConnTest1_17(const TDesC& aSection)
-    {
-    INFO_PRINTF1(_L("*********************************************"));
-    INFO_PRINTF1(_L("           Test: DoRConnTest1_17             "));
-    INFO_PRINTF1(_L("*********************************************"));
-
-    //start the dummy3rdpartyapp
-    if ((iVTunError = StartD3PApp()) != KErrNone)
-        {
-        return;
-        }
-
-    if((iStatus = iSocketServ.Connect()) == KErrNone )
-        INFO_PRINTF1(_L("Socket Server Opened.\n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Socket Server: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        StopD3PApp();
-        return;
-        }
-
-    if((iStatus = iConnection.Open(iSocketServ /*, KAfInet*/)) == KErrNone )
-        INFO_PRINTF1(_L("Connection opened. \n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Connection: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-        }
-
-    iCommDbPref.SetIapId(TUNDRIVER_IAP);             // Virtual Interface
-    iCommDbPref.SetBearerSet(KCommDbBearerVirtual);
-    iCommDbPref.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-    iConnection.Start(iCommDbPref, iStatus);
-    User::WaitForRequest(iStatus);
-		if(iStatus.Int()!=KErrNone)
-	    	{
-	    	ERR_PRINTF2(_L("Error starting connection: %d"), iStatus.Int());	
-				SetError(iStatus.Int());
-				iSocketServ.Close();
-				return;
-	    	}
-    INFO_PRINTF2(_L("Starting Connection %d.\n"), iStatus.Int());
-
-    //open socket on interface. 
-    if((iStatus = iSocket.Open(iSocketServ, KAfInet, KSockStream, KProtocolInetTcp, iConnection)) == KErrNone )
-        INFO_PRINTF1(_L("Socket Opened!\n "));
-    else   // (iStatus!=KErrNone)
-        {
-        ERR_PRINTF1(_L("Error Opening Socket!"));    
-        SetError(iStatus.Int());
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-        }
-
-    // Get destination address from config file    
-    TPtrC ptrToReadFromConfig(KNameDefault);
-    TBool returnValue = GetStringFromConfig(aSection, KDestAddr, ptrToReadFromConfig);
-    if (!returnValue)
-        {
-        ERR_PRINTF1(_L("Reading config file failed, while reading DestAddr"));   
-        SetError(KErrUnknown);
-				iSocket.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-        }
-    //set destination IP ie. server
-    TInt err = iDestAddr.Input(ptrToReadFromConfig);   
-    if(err != KErrNone)
-        {
-        INFO_PRINTF2(KInetInputFail, err);
-        SetError(err);
-				iSocket.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-        }
-
-    returnValue = GetIntFromConfig(aSection, KTcpDestPort, iDestPort);
-    if (!returnValue)
-        {
-        ERR_PRINTF1(_L("Reading config file failed, while reading DestPort"));   
-        SetError(KErrUnknown);
-				iSocket.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-        }
-    iDestAddr.SetPort(iDestPort);
-    //bind local port to socket
-    err = iSocket.SetLocalPort(7776);
-    if (err != KErrNone)
-        {
-        ERR_PRINTF1(_L("Error Setting local port"));   
-        SetError(err);
-				iSocket.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-        }
-
-    iSocket.Connect(iDestAddr,iStatus);
-    User::WaitForRequest(iStatus);
-    if (iStatus != KErrNone)
-        {
-        ERR_PRINTF1(_L("Error Connecting to Server!"));    
-        SetError(iStatus.Int());
-				iSocket.Close();
-        iConnection.Close();
-        iSocketServ.Close();
-        StopD3PApp();
-        return;
-        }
-    else
-        {
-        INFO_PRINTF2(_L("tcp Start with = %d\n"), iStatus.Int());
-        }
- 	  TBuf8<128> receiveBuffer;
-    TBuf<128>  temp;
-
-    do
-        {
-        TSockXfrLength aLen = 0;
-        iRecvBuf.FillZ();
-        iSocket.RecvOneOrMore(receiveBuffer,0,iStatus,aLen);
-        User::WaitForRequest(iStatus);
-        temp.Copy(receiveBuffer);
-
-        INFO_PRINTF1(_L("\nData Received from Socket : "));
-        INFO_PRINTF1(temp);
-        INFO_PRINTF1(_L("\n"));
-
-        }while(iStatus == KErrNone);      
-
-    //Close the Connection,Socket and socket server.
-    iSocket.Close();
-    iConnection.Stop();
-    iSocketServ.Close();
-    StopD3PApp();
-    }
-
-
-//For Code Coverage.
-
-void CTunDriverTestWrapper::DoRConnTest1_20()
-{
-    INFO_PRINTF1(_L("*********************************************"));
-    INFO_PRINTF1(_L("           Test: DoRConnTest1_20             "));
-    INFO_PRINTF1(_L("*********************************************"));
-
-    StartConn();
-    }
-
-void CTunDriverTestWrapper::DoRConnTest1_21()
-    {
-    INFO_PRINTF1(_L("*********************************************"));
-    INFO_PRINTF1(_L("           Test: DoRConnTest1_21             "));
-    INFO_PRINTF1(_L("*********************************************"));
-
-    StartConn();
-    }
-
-void CTunDriverTestWrapper::DoRConnTest1_22()
-    {
-    INFO_PRINTF1(_L("*********************************************"));
-    INFO_PRINTF1(_L("           Test: DoRConnTest1_22             "));
-    INFO_PRINTF1(_L("*********************************************"));
-
-    StartConn();
-    }
-
-void CTunDriverTestWrapper::DoRConnTest1_23()
-    {
-
-    INFO_PRINTF1(_L("*********************************************"));
-    INFO_PRINTF1(_L("           Test: DoRConnTest1_23             "));
-    INFO_PRINTF1(_L("*********************************************"));
-
-    StartConn();
-    }
-
-
-void CTunDriverTestWrapper::DoRConnTest1_24()
-    {
-    INFO_PRINTF1(_L("*********************************************"));
-    INFO_PRINTF1(_L("           Test: DoRConnTest1_24             "));
-    INFO_PRINTF1(_L("********************************************"));
-
-		StartConn(); 
-
-
-
-      
-        
-    }
-
-void CTunDriverTestWrapper::DoRConnTest1_25()
-    {
-    INFO_PRINTF1(_L("*********************************************"));
-    INFO_PRINTF1(_L("           Test: DoRConnTest1_25             "));
-    INFO_PRINTF1(_L("********************************************"));
-
-
-    StartConn();    
-    }
-
-void CTunDriverTestWrapper::DoRConnTest1_26()
-    {
-    INFO_PRINTF1(_L("*********************************************"));
-    INFO_PRINTF1(_L("           Test: DoRConnTest1_26             "));
-    INFO_PRINTF1(_L("********************************************"));
-
-
-    StartConn();
-    }
-
-
-void CTunDriverTestWrapper::DoRConnTest1_27()
-    {
-    INFO_PRINTF1(_L("*********************************************"));
-    INFO_PRINTF1(_L("           Test: DoRConnTest1_27             "));
-    INFO_PRINTF1(_L("********************************************"));
-
-    StartConn();
-    }
-
-
-void CTunDriverTestWrapper::DoRConnTest1_28()
-    {
-    INFO_PRINTF1(_L("*********************************************"));
-    INFO_PRINTF1(_L("           Test: DoRConnTest1_28             "));
-    INFO_PRINTF1(_L("********************************************"));
-
-    StartConn();
-    }
-
-void CTunDriverTestWrapper::DoRConnTest1_29()
-    {
-    INFO_PRINTF1(_L("*********************************************"));
-    INFO_PRINTF1(_L("           Test: DoRConnTest1_29             "));
-    INFO_PRINTF1(_L("*********************************************"));
-
-    StartConn();
-    }
-
-void CTunDriverTestWrapper::DoRConnTest1_30()
-    {
-    INFO_PRINTF1(_L("*********************************************"));
-    INFO_PRINTF1(_L("           Test: DoRConnTest1_30             "));
-    INFO_PRINTF1(_L("*********************************************"));
-
-    StartConn();
-    }
-
-void CTunDriverTestWrapper::DoRConnTest1_31()
-    {
-    INFO_PRINTF1(_L("*********************************************"));
-    INFO_PRINTF1(_L("           Test: DoRConnTest1_31             "));
-    INFO_PRINTF1(_L("*********************************************"));
-
-    StartConn();
-    }
-
-
-void CTunDriverTestWrapper::DoRConnTest1_32()
-    {
-    INFO_PRINTF1(_L("*********************************************"));
-    INFO_PRINTF1(_L("           Test: DoRConnTest1_32             "));
-    INFO_PRINTF1(_L("*********************************************"));
-
-    StartConn();
-    }
-
-void CTunDriverTestWrapper::DoRConnTest1_33()
-    {
-    INFO_PRINTF1(_L("*********************************************"));
-    INFO_PRINTF1(_L("           Test: DoRConnTest1_33             "));
-    INFO_PRINTF1(_L("*********************************************"));
-
-    StartConn();
-    }
-
-
-void CTunDriverTestWrapper::StartConn()
-    {
-    if((iStatus = iSocketServ.Connect()) == KErrNone )
-        INFO_PRINTF1(_L("Socket Server Opened.\n"));
-    else
-        {
-        ERR_PRINTF2(_L("Error Opening Socket Server: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-             return;
-        }
-
-		if((iStatus = iConnection.Open(iSocketServ)) == KErrNone )
-    		INFO_PRINTF1(_L("Connection opened. \n"));
-		else
-    		{
-        ERR_PRINTF2(_L("Error Opening Connection: %d"), iStatus.Int());
-        SetError(iStatus.Int());
-        iSocketServ.Close();
-        return;
-        }
-           
-		iCommDbPref.SetIapId(TUNDRIVER_IAP);             // Virtual Interface
-    iCommDbPref.SetBearerSet(KCommDbBearerVirtual);
-    iCommDbPref.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-    iConnection.Start(iCommDbPref, iStatus);
-    User::WaitForRequest(iStatus);
-    if(iStatus.Int()!=KErrNone)
-	    	{
-	    	ERR_PRINTF2(_L("Error starting connection: %d"), iStatus.Int());	
-				SetError(iStatus.Int());
-				iSocketServ.Close();
-				return;
-	    	}
-    INFO_PRINTF2(_L("Starting Connection %d.\n"), iStatus.Int());
-
-    iConnection.Stop();
-    iSocketServ.Close();
-    }
diff -r bb2423252ea3 -r c1029e558ef5 networkcontrol/ipnetworklayer/inc/IPProtoMCpr.h
--- a/networkcontrol/ipnetworklayer/inc/IPProtoMCpr.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkcontrol/ipnetworklayer/inc/IPProtoMCpr.h	Wed Oct 13 16:17:27 2010 +0300
@@ -57,7 +57,6 @@
 
 public:
 	TBool iIapLocked;
-	TUint32 iLockedIapsid;
     };
 
 namespace IPProtoMCprActivities
diff -r bb2423252ea3 -r c1029e558ef5 networkcontrol/ipnetworklayer/inc/IPProtoSCPRStates.h
--- a/networkcontrol/ipnetworklayer/inc/IPProtoSCPRStates.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkcontrol/ipnetworklayer/inc/IPProtoSCPRStates.h	Wed Oct 13 16:17:27 2010 +0300
@@ -19,7 +19,7 @@
 #define IPPROTOSCPRSTATES_H_DEFINED
 
 #include <comms-infras/corescprstates.h>
-#include "IPProtoMessages.h"
+#include "ipprotomessages.h"
 
 class CIPQoSProtoSubConnectionProviderBase;
 
diff -r bb2423252ea3 -r c1029e558ef5 networkcontrol/ipnetworklayer/inc/ipprotodeftscprstates.h
--- a/networkcontrol/ipnetworklayer/inc/ipprotodeftscprstates.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkcontrol/ipnetworklayer/inc/ipprotodeftscprstates.h	Wed Oct 13 16:17:27 2010 +0300
@@ -19,7 +19,7 @@
 #define IPPROTODEFTSCPRSTATES_H_DEFINED
 
 #include <comms-infras/corescprstates.h>
-#include "IPProtoMessages.h"
+#include "ipprotomessages.h"
 
 class CIPProtoSubConnectionProviderBase;
 
diff -r bb2423252ea3 -r c1029e558ef5 networkcontrol/ipnetworklayer/src/IPProtoCPR.cpp
--- a/networkcontrol/ipnetworklayer/src/IPProtoCPR.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkcontrol/ipnetworklayer/src/IPProtoCPR.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -37,6 +37,7 @@
 #include "IPProtoMCpr.h"
 #include "IPProtoMessages.h"
 #include "linkcprextensionapi.h"
+#include "IPProtoCPRFactory.h"
 
 #include <comms-infras/ss_nodemessages_factory.h>
 #include <comms-infras/ss_msgintercept.h>
diff -r bb2423252ea3 -r c1029e558ef5 networkcontrol/ipnetworklayer/src/IPProtoCPRFactory.cpp
--- a/networkcontrol/ipnetworklayer/src/IPProtoCPRFactory.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkcontrol/ipnetworklayer/src/IPProtoCPRFactory.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -126,9 +126,3 @@
 
 	return provider;
     }
-
-
-
-
-
-
diff -r bb2423252ea3 -r c1029e558ef5 networkcontrol/ipnetworklayer/src/IPProtoMCpr.cpp
--- a/networkcontrol/ipnetworklayer/src/IPProtoMCpr.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkcontrol/ipnetworklayer/src/IPProtoMCpr.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -63,7 +63,7 @@
 CIPProtoMetaConnectionProvider::CIPProtoMetaConnectionProvider(CMetaConnectionProviderFactoryBase& aFactory,
                                                                const TProviderInfo& aProviderInfo,
                                                                const MeshMachine::TNodeActivityMap& aActivityMap)
-	:	CCoreMetaConnectionProvider(aFactory,aProviderInfo,aActivityMap), iIapLocked(EFalse) , iLockedIapsid(0)
+	:	CCoreMetaConnectionProvider(aFactory,aProviderInfo,aActivityMap), iIapLocked(EFalse)
 	{
 	LOG_NODE_CREATE(KIPProtoMCprTag, CIPProtoMetaConnectionProvider);
 	}
diff -r bb2423252ea3 -r c1029e558ef5 networkcontrol/ipnetworklayer/src/IPProtoSCPRFactory.cpp
--- a/networkcontrol/ipnetworklayer/src/IPProtoSCPRFactory.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkcontrol/ipnetworklayer/src/IPProtoSCPRFactory.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -21,7 +21,7 @@
  @internalComponent
 */
 
-#include "IPProtoMessages.h"
+#include "ipprotomessages.h"
 #include "IPProtoSCPRFactory.h"
 #include "ipprotodeftscpr.h"
 #include "IPProtoSCPR.h"
diff -r bb2423252ea3 -r c1029e558ef5 networkcontrol/ipnetworklayer/src/IPProtoTierManagerSelector.cpp
--- a/networkcontrol/ipnetworklayer/src/IPProtoTierManagerSelector.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkcontrol/ipnetworklayer/src/IPProtoTierManagerSelector.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -106,26 +106,21 @@
 	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)
 			{
-            if (ipprotomcpr->iIapLocked && sid.iId!=ipprotomcpr->iLockedIapsid)
-                User::Leave(KErrPermissionDenied);
+			CCommsDatIapView* iapView = CCommsDatIapView::NewLC(aIapToFind);
 
-            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);
+			TUint32 iapsid;
+			iapView->GetIntL(KCDTIdIAPAppSid, iapsid);
+
+			if (sid.iId == iapsid && iapsid != 0)
+				ipprotomcpr->iIapLocked = ETrue;
+			CleanupStack::PopAndDestroy(iapView);
 			}
 		}
 	provider->IncrementBlockingDestroy();
diff -r bb2423252ea3 -r c1029e558ef5 networkcontrol/ipnetworklayer/src/ipprotodeftscpr.cpp
--- a/networkcontrol/ipnetworklayer/src/ipprotodeftscpr.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkcontrol/ipnetworklayer/src/ipprotodeftscpr.cpp	Wed Oct 13 16:17:27 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"
@@ -203,7 +203,6 @@
        }
 	if (iControl)
 		iControl->AsyncDelete();
-	
 	//incase registration is successful and Network is configured. 
 	if (iNotify)
 	    {
diff -r bb2423252ea3 -r c1029e558ef5 networkcontrol/iptransportlayer/inc/ipcpr_states.h
--- a/networkcontrol/iptransportlayer/inc/ipcpr_states.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkcontrol/iptransportlayer/inc/ipcpr_states.h	Wed Oct 13 16:17:27 2010 +0300
@@ -108,6 +108,9 @@
 	virtual void DoL();
 DECLARE_SMELEMENT_FOOTER( TProcessSubConnDataTransferred)
 
+
+
+
 DECLARE_SMELEMENT_HEADER( TSendInitialSubConnectionOpenedEvent, MeshMachine::TStateTransition<TContext>, NetStateMachine::MStateTransition, TContext)
 	virtual void DoL();
 DECLARE_SMELEMENT_FOOTER( TSendInitialSubConnectionOpenedEvent)
diff -r bb2423252ea3 -r c1029e558ef5 networkcontrol/iptransportlayer/src/ipcpr_activities.cpp
--- a/networkcontrol/iptransportlayer/src/ipcpr_activities.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkcontrol/iptransportlayer/src/ipcpr_activities.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -109,20 +109,18 @@
 DECLARE_DEFINE_CUSTOM_NODEACTIVITY(ECFActivityNoBearer, IpCprNoBearer, TCFControlProvider::TNoBearer, PRActivities::CNoBearer::NewL)
 	FIRST_NODEACTIVITY_ENTRY(CoreNetStates::TAwaitingNoBearer, PRActivities::CNoBearer::TNoTagOrBearerPresentBlockedByNoBearer)
 	NODEACTIVITY_ENTRY(KNoTag, CoreNetStates::TSendNoBearer, MeshMachine::TAwaitingMessageState<TCFControlProvider::TBearer>, MeshMachine::TNoTagOrErrorTag)
-      NODEACTIVITY_ENTRY(KNoTag, CoreNetStates::TStartServiceProviderRetry, CoreNetStates::TAwaitingStarted, MeshMachine::TNoTag)
-    
 
 	NODEACTIVITY_ENTRY(CoreNetStates::KBearerPresent, PRActivities::CNoBearer::TRequestCommsBinderRetry, CoreNetStates::TAwaitingBinderResponse, MeshMachine::TTag<CoreNetStates::KBearerPresent>)
 	NODEACTIVITY_ENTRY(CoreNetStates::KBearerPresent, CoreNetStates::TSendBindTo, CoreNetStates::TAwaitingBindToComplete, MeshMachine::TTag<CoreNetStates::KBearerPresent>)
-    THROUGH_NODEACTIVITY_ENTRY(CoreNetStates::KBearerPresent,CoreActivities::ABindingActivity::TSendBindToComplete, PRActivities::CNoBearer::TNoTagOrBearerPresentForAutostart) 
+	THROUGH_NODEACTIVITY_ENTRY(CoreNetStates::KBearerPresent,CoreActivities::ABindingActivity::TSendBindToComplete, MeshMachine::TNoTag) 
 
-	NODEACTIVITY_ENTRY(CoreNetStates::KBearerPresent, CoreNetStates::TStartServiceProviderRetry, CoreNetStates::TAwaitingStarted, MeshMachine::TNoTag)
+	NODEACTIVITY_ENTRY(KNoTag, CoreNetStates::TStartServiceProviderRetry, CoreNetStates::TAwaitingStarted, MeshMachine::TNoTag)
 	
 #ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 	//Request for bearer type from lower layer
 	NODEACTIVITY_ENTRY(KNoTag, IpCprStates::TInitialiseParamsAndSendToSelf, CoreNetStates::TAwaitingParamResponse, MeshMachine::TNoTag)
 	//MCPR is updated with the bearer type
-	THROUGH_NODEACTIVITY_ENTRY(KNoTag, IpCprStates::TUpdateProvisionConfigAtStartup, MeshMachine::TNoTag)
+	THROUGH_NODEACTIVITY_ENTRY(KNoTag, IpCprStates::TUpdateProvisionConfigAtStartup, TNoTag)
 	//Throughnode activity which will send the TCP receive window size to the data clients
 	THROUGH_NODEACTIVITY_ENTRY(KNoTag, IpCprStates::TSendTransportNotificationToDataClients, MeshMachine::TNoTag)
 #endif //SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
diff -r bb2423252ea3 -r c1029e558ef5 networkcontrol/iptransportlayer/src/ipdeftbasescpr.cpp
--- a/networkcontrol/iptransportlayer/src/ipdeftbasescpr.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkcontrol/iptransportlayer/src/ipdeftbasescpr.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -240,7 +240,7 @@
     	}
 #ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 	iContext.iNodeActivity->PostRequestTo(*iContext.Node().ServiceProvider(),
-		TCFScpr::TSetParamsRequest(RCFParameterFamilyBundleC()).CRef());
+		TCFScpr::TGetParamsRequest(RCFParameterFamilyBundleC()).CRef());
 #else
  	iContext.iNodeActivity->PostRequestTo(*iContext.Node().ServiceProvider(),
 		TCFScpr::TParamsRequest(RCFParameterFamilyBundleC()).CRef());
@@ -254,9 +254,7 @@
 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, MeshMachine::TNoTag)
-	THROUGH_NODEACTIVITY_ENTRY(KNoTag, PRStates::TStoreParams, CoreNetStates::TNoTagOrNoDataClients)
+	NODEACTIVITY_ENTRY(KNoTag, IPDeftBaseSCprDataClientStartActivity::TGetParams, CoreNetStates::TAwaitingParamResponse, CoreNetStates::TNoTagOrNoDataClients)
 #else
 	NODEACTIVITY_ENTRY(KNoTag, IPDeftBaseSCprDataClientStartActivity::TGetParams, CoreNetStates::TAwaitingParamResponse, MeshMachine::TNoTag)
 	THROUGH_NODEACTIVITY_ENTRY(KNoTag, SCprStates::TStoreParams, CoreNetStates::TNoTagOrNoDataClients)
diff -r bb2423252ea3 -r c1029e558ef5 networkcontrol/iptransportlayer/src/netmcpr.cpp
--- a/networkcontrol/iptransportlayer/src/netmcpr.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkcontrol/iptransportlayer/src/netmcpr.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -33,8 +33,6 @@
 
 #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>
 
@@ -479,11 +477,8 @@
    	//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,KBearerDefaultWinSize);
+   	iBearerInfoMap.Insert(KDefaultBearer,KBearerWlanWinSize);
 	}
 
 void CDfltTCPReceiveWindowSize::SetTcpWin(TUint aBearerType)
@@ -491,20 +486,8 @@
  * Set TCP receive window 
  */
 	{
-    // 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 TCP Receive Window.
+	iWinSize = *static_cast<TUint*>(iBearerInfoMap.Find(aBearerType));
 	  
 	//Set the Max TCP receive Window.
 	SetMaxWinSize(aBearerType);
@@ -528,16 +511,12 @@
 		//
 			iMaxWinSize = KBearerHsdpaWinSize; 
 			break; 
-		case KNetMcprWlanBearer:
-			iMaxWinSize = KBearerWlanWinSize;
+		case KEthernetBearer:
+			iMaxWinSize = KEthernetMaxWinSize;
 			break;
    
-        case KEthernetBearer:
-            iMaxWinSize = KEthernetMaxWinSize;
-            break;
-			
 		default:
-			iMaxWinSize = KBearerDefaultMaxWinSize;
+			iMaxWinSize = KEthernetMaxWinSize;
 			break;
 		}
 	}
diff -r bb2423252ea3 -r c1029e558ef5 networkcontrol/qosfwconfig/qostest/te_qos/configs/te_QoSSuite_Mesh_pdpcpr.cfg
--- a/networkcontrol/qosfwconfig/qostest/te_qos/configs/te_QoSSuite_Mesh_pdpcpr.cfg	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1477 +0,0 @@
-############################################################
-## 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
-
-
-
diff -r bb2423252ea3 -r c1029e558ef5 networkcontrol/qosfwconfig/qostest/te_qos/group/bld.inf
--- a/networkcontrol/qosfwconfig/qostest/te_qos/group/bld.inf	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkcontrol/qosfwconfig/qostest/te_qos/group/bld.inf	Wed Oct 13 16:17:27 2010 +0300
@@ -17,11 +17,7 @@
 
 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
 
diff -r bb2423252ea3 -r c1029e558ef5 networkcontrol/qosipscpr/inc/ip_subconparams.h
--- a/networkcontrol/qosipscpr/inc/ip_subconparams.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkcontrol/qosipscpr/inc/ip_subconparams.h	Wed Oct 13 16:17:27 2010 +0300
@@ -27,6 +27,8 @@
 #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;
diff -r bb2423252ea3 -r c1029e558ef5 networkingsrv_info/networkingrom/group/NetworkTest.iby
--- a/networkingsrv_info/networkingrom/group/NetworkTest.iby	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkingsrv_info/networkingrom/group/NetworkTest.iby	Wed Oct 13 16:17:27 2010 +0300
@@ -310,9 +310,4 @@
 #include <t_dnsproxy.iby>
 #endif 
 
-#ifdef NW_TEST_ROM_1
-#include <te_tundriver.iby>
-#include <te_dnssuffix.iby>
 #endif
-
-#endif
diff -r bb2423252ea3 -r c1029e558ef5 networkingsrv_info/networkingrom/group/network.iby
--- a/networkingsrv_info/networkingrom/group/network.iby	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkingsrv_info/networkingrom/group/network.iby	Wed Oct 13 16:17:27 2010 +0300
@@ -170,9 +170,5 @@
 #include <networking_dnsproxy.iby>
 #endif 
 
-REM --- Tun Driver IBYS
-#include <tun.iby>
-#include <tundriveragt.iby>
-#include <tundriver.iby>
 
 #endif // __NETWORK_IBY__
diff -r bb2423252ea3 -r c1029e558ef5 networkingtestandutils/exampleinternetutilities/PING/PING.CPP
--- a/networkingtestandutils/exampleinternetutilities/PING/PING.CPP	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkingtestandutils/exampleinternetutilities/PING/PING.CPP	Wed Oct 13 16:17:27 2010 +0300
@@ -15,7 +15,7 @@
 // 
 //
 
-#include <PINGENG.H>
+#include <pingeng.h>
 #include <e32cons.h>
 #include <c32comm.h>
 #include <nifman.h>
diff -r bb2423252ea3 -r c1029e558ef5 networkingtestandutils/exampleinternetutilities/PINGENG/PINGENG.CPP
--- a/networkingtestandutils/exampleinternetutilities/PINGENG/PINGENG.CPP	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkingtestandutils/exampleinternetutilities/PINGENG/PINGENG.CPP	Wed Oct 13 16:17:27 2010 +0300
@@ -13,7 +13,7 @@
 // Description:
 //
 
-#include <PINGENG.H>
+#include <pingeng.h>
 #include <e32hal.h>
 #include <icmp6_hdr.h>
 #include <in_chk.h>
diff -r bb2423252ea3 -r c1029e558ef5 networkingtestandutils/exampleinternetutilities/TFTP/TFTP.CPP
--- a/networkingtestandutils/exampleinternetutilities/TFTP/TFTP.CPP	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkingtestandutils/exampleinternetutilities/TFTP/TFTP.CPP	Wed Oct 13 16:17:27 2010 +0300
@@ -17,7 +17,7 @@
 #include <c32comm.h>
 #include <e32base.h>
 #include <es_sock.h>
-#include <TFTPENG.H>
+#include <tftpeng.h>
 #include <nifman.h>
 
 // Device driver names
diff -r bb2423252ea3 -r c1029e558ef5 networkingtestandutils/exampleinternetutilities/TFTPENG/TFTPENG.CPP
--- a/networkingtestandutils/exampleinternetutilities/TFTPENG/TFTPENG.CPP	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkingtestandutils/exampleinternetutilities/TFTPENG/TFTPENG.CPP	Wed Oct 13 16:17:27 2010 +0300
@@ -16,7 +16,7 @@
 // 
 //
 
-#include <TFTPENG.H>
+#include <tftpeng.h>
 
 EXPORT_C CTftpEngine::~CTftpEngine()
     {
diff -r bb2423252ea3 -r c1029e558ef5 networkingtestandutils/exampleinternetutilities/TRACERT/TRACERT.CPP
--- a/networkingtestandutils/exampleinternetutilities/TRACERT/TRACERT.CPP	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkingtestandutils/exampleinternetutilities/TRACERT/TRACERT.CPP	Wed Oct 13 16:17:27 2010 +0300
@@ -16,7 +16,7 @@
 // 
 //
 
-#include <TRENG.H>
+#include <treng.h>
 #include <e32cons.h>
 #include <c32comm.h>
 #include <nifman.h>
diff -r bb2423252ea3 -r c1029e558ef5 networkingtestandutils/exampleinternetutilities/TRENG/TRENG.CPP
--- a/networkingtestandutils/exampleinternetutilities/TRENG/TRENG.CPP	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkingtestandutils/exampleinternetutilities/TRENG/TRENG.CPP	Wed Oct 13 16:17:27 2010 +0300
@@ -13,7 +13,7 @@
 // Description:
 //
 
-#include <TRENG.H>
+#include <treng.h>
 #include <e32hal.h>
 #include <icmp6_hdr.h>
 #include <in_chk.h>
diff -r bb2423252ea3 -r c1029e558ef5 networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/configs/te_dedicatedsignalling1ryctx_changedsid_pdpcpr.cfg
--- a/networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/configs/te_dedicatedsignalling1ryctx_changedsid_pdpcpr.cfg	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1043 +0,0 @@
-############################################################
-## 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
-
diff -r bb2423252ea3 -r c1029e558ef5 networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/configs/te_dedicatedsignalling1ryctx_imssi_pdpcpr.cfg
--- a/networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/configs/te_dedicatedsignalling1ryctx_imssi_pdpcpr.cfg	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1041 +0,0 @@
-############################################################
-## 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
-
diff -r bb2423252ea3 -r c1029e558ef5 networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/configs/te_dedicatedsignalling1ryctx_nosid_pdpcpr.cfg
--- a/networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/configs/te_dedicatedsignalling1ryctx_nosid_pdpcpr.cfg	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1042 +0,0 @@
-############################################################
-## 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
-
diff -r bb2423252ea3 -r c1029e558ef5 networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/configs/te_dedicatedsignalling1ryctx_pdpcpr.cfg
--- a/networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/configs/te_dedicatedsignalling1ryctx_pdpcpr.cfg	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1044 +0,0 @@
-############################################################
-## 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
-
diff -r bb2423252ea3 -r c1029e558ef5 networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/group/bld.inf
--- a/networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/group/bld.inf	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/te_DedicatedSignalling1ryCtx/group/bld.inf	Wed Oct 13 16:17:27 2010 +0300
@@ -42,18 +42,10 @@
 ../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
 
diff -r bb2423252ea3 -r c1029e558ef5 networkingtestandutils/networkingintegrationtest/te_Sblp/configs/te_Sblp_Mesh_pdpcpr.cfg
--- a/networkingtestandutils/networkingintegrationtest/te_Sblp/configs/te_Sblp_Mesh_pdpcpr.cfg	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1477 +0,0 @@
-############################################################
-## 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
-
-
-
diff -r bb2423252ea3 -r c1029e558ef5 networkingtestandutils/networkingintegrationtest/te_Sblp/group/bld.inf
--- a/networkingtestandutils/networkingintegrationtest/te_Sblp/group/bld.inf	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/te_Sblp/group/bld.inf	Wed Oct 13 16:17:27 2010 +0300
@@ -17,18 +17,10 @@
 
 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
diff -r bb2423252ea3 -r c1029e558ef5 networkingtestandutils/networkingunittest/dummynif_params/group/dummynif_params.mmp
--- a/networkingtestandutils/networkingunittest/dummynif_params/group/dummynif_params.mmp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkingtestandutils/networkingunittest/dummynif_params/group/dummynif_params.mmp	Wed Oct 13 16:17:27 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
diff -r bb2423252ea3 -r c1029e558ef5 networkingtestandutils/networkingunittest/group/DummyNifProtos.mmp
--- a/networkingtestandutils/networkingunittest/group/DummyNifProtos.mmp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkingtestandutils/networkingunittest/group/DummyNifProtos.mmp	Wed Oct 13 16:17:27 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
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/dnsproxy/test/group/t_dnsproxy.mmp
--- a/networkprotocols/dnsproxy/test/group/t_dnsproxy.mmp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/dnsproxy/test/group/t_dnsproxy.mmp	Wed Oct 13 16:17:27 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
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/dnsproxy/test/src/hacked_servers.cpp
--- a/networkprotocols/dnsproxy/test/src/hacked_servers.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/dnsproxy/test/src/hacked_servers.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -70,19 +70,6 @@
 	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)
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/iphook/inhook6/group/inhook6.mmp
--- a/networkprotocols/iphook/inhook6/group/inhook6.mmp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/iphook/inhook6/group/inhook6.mmp	Wed Oct 13 16:17:27 2010 +0300
@@ -38,9 +38,9 @@
 LIBRARY		euser.lib esock.lib esocksvr.lib mbufmgr.lib insock.lib
 
 #ifdef SYMBIAN_TCPIPDHCP_UPDATE
-deffile			inhook6.def
+deffile			inhook6.DEF
 #else
-deffile			inhook6_v1.def
+deffile			inhook6_v1.DEF
 #endif //SYMBIAN_TCPIPDHCP_UPDATE
 
 SOURCEPATH 			../data
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/iphook/inhook6/inc/res_sock.h
--- a/networkprotocols/iphook/inhook6/inc/res_sock.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/iphook/inhook6/inc/res_sock.h	Wed Oct 13 16:17:27 2010 +0300
@@ -119,7 +119,6 @@
 	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
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/iphook/inhook6/include/in_bind.h
--- a/networkprotocols/iphook/inhook6/include/in_bind.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/iphook/inhook6/include/in_bind.h	Wed Oct 13 16:17:27 2010 +0300
@@ -371,10 +371,6 @@
 	* 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.
@@ -564,35 +560,6 @@
 	* @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;
 	};
 
 
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/iphook/inhook6/src/in_pkt.cpp
--- a/networkprotocols/iphook/inhook6/src/in_pkt.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/iphook/inhook6/src/in_pkt.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -85,7 +85,7 @@
 			if (len < aMin)
 				return NULL;
 			iLength = len;
-			return p->Buffer() ? (p->Buffer()+ offset): NULL;
+			return p->Buffer() + offset;
 			}
 		// The requested alignment value is not
 		// satisfied!
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/inc/inet.h
--- a/networkprotocols/tcpipv4v6prt/inc/inet.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/inc/inet.h	Wed Oct 13 16:17:27 2010 +0300
@@ -261,8 +261,6 @@
 	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
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/inc/tcp.h
--- a/networkprotocols/tcpipv4v6prt/inc/tcp.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/inc/tcp.h	Wed Oct 13 16:17:27 2010 +0300
@@ -519,9 +519,8 @@
 	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;
-
+	//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;
 
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/src/iface.cpp
--- a/networkprotocols/tcpipv4v6prt/src/iface.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/src/iface.cpp	Wed Oct 13 16:17:27 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,14 +667,9 @@
     //
     void RemoveInterface(CIp6Interface *aIf);
     //
-    // 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);
+    // Modify Inet Interface information (SetOption part!)
+    //
+    TInt InetInterfaceOption(TUint aName, const TSoInet6InterfaceInfo &aInfo);
     //
     // Query Interface Information
     //
@@ -795,10 +790,7 @@
     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)
-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);
+    RTimeout iTimeout;                  //< Hook to the timer service (MTimeoutManager)
     };
 
 //
@@ -1871,11 +1863,6 @@
 #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);
     };
 
 //
@@ -3426,7 +3413,6 @@
         netinfo().iIAPId = iRoute->iInterface.iScope[EScopeType_IAP];
         netinfo().iNetworkId = iRoute->iInterface.iScope[EScopeType_NET];
 
-
         Bearer(netinfo);
         RefreshFlow();
         return;
@@ -5550,13 +5536,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 
@@ -7297,7 +7283,6 @@
     // are wasted on destructor. Should not cause
     // any problems... -- msa
     Reset();
-    iSuffixList.Close();
     LOG(Log::Printf(_L("\tIF %u [%S] Deleted"), iScope[0], &iName));
     }
 
@@ -9428,17 +9413,14 @@
 // **************************
 /**
 // Locate the next interface after aIndex and return the
-// 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
+// information and assigned interface index.
+//
 // @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.
@@ -9590,44 +9572,8 @@
             }
         }
     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
     {
@@ -10044,10 +9990,9 @@
 
 // CIp6Manager::InetInterfaceOption
 // ********************************
-// Modify Inet Interface information (SetOption part!) for TSoInet6InterfaceInfo input
-// For maintaining backward compatibility
-//
-TInt CIp6Manager::InetInterfaceOption(TUint aName, const TSoInet6InterfaceInfo &aInfo, const TInetSuffix* aDomainSuffix)
+// Modify Inet Interface information (SetOption part)
+//
+TInt CIp6Manager::InetInterfaceOption(TUint aName, const TSoInet6InterfaceInfo &aInfo)
     {
     #ifdef _LOG
         TBuf<39> addressStr;
@@ -10204,15 +10149,6 @@
         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)
@@ -10330,51 +10266,6 @@
     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
 // ***************************
@@ -10514,18 +10405,10 @@
         if (aName == KSoIpv4LinkLocal &&
                 aOption.Length() == sizeof(TSoInetIpv4LinkLocalInfo))
             return SetIpv4LinkLocalOption((TSoInetIpv4LinkLocalInfo &)ref);
-        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
+        
+        if (aOption.Length() != sizeof(TSoInet6InterfaceInfo))
             return KErrArgument;
+        return InetInterfaceOption(aName, (TSoInet6InterfaceInfo &)ref);
         }
     else if (aLevel == KSOLInterface)
         {
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/src/inet.cpp
--- a/networkprotocols/tcpipv4v6prt/src/inet.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/src/inet.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -360,17 +360,9 @@
 		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)
 		{
@@ -427,27 +419,11 @@
 		(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();
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/src/res.cpp
--- a/networkprotocols/tcpipv4v6prt/src/res.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/src/res.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -268,8 +268,6 @@
 public:
 	void NoDndAvailable();
 	RTimeout iTimeout;
-private:
-	TInt iFlowRequestType;         //< = 0 for IMPLICIT, 1 for SUBCONNECTION EXPLICIT, 2 for EXPLICIT
 	};
 
 //	CHostResolverLinkage
@@ -1171,8 +1169,6 @@
 	// 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
@@ -1220,18 +1216,14 @@
 				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
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/src/tcp.cpp
--- a/networkprotocols/tcpipv4v6prt/src/tcp.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/src/tcp.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -92,11 +92,6 @@
 	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);
 
@@ -263,13 +258,6 @@
 #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
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/src/tcp_sap.cpp
--- a/networkprotocols/tcpipv4v6prt/src/tcp_sap.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/src/tcp_sap.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -141,7 +141,7 @@
 //
 
 //The below is UID of the client(http client) using this option. We are not exposing this right now...
-const TUint32 KSoTcpLingerinMicroSec = 0x101F55F6;
+const TUint32 TSoTcpLingerinMicroSec = 0x101F55F6;
 #ifdef _LOG
 const TText *CProviderTCP6::TcpState(TUint aState)
 	{
@@ -261,13 +261,6 @@
 	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();
@@ -627,137 +620,48 @@
                 iSockInBufSize = KTcpMinimumWindow;
             else
                 {
-                //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;
-	                }
-	            } 
+
+		        //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;
+		                    }
+		                }
+					
+                } 
+
 		    }
 		    break;
 #endif //SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
@@ -792,11 +696,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 TSoTcpLingerinMicroSec:
+		    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))
 				{
@@ -1200,11 +1104,9 @@
 			}
 		else
 			{
-			//
-			// Start linger timer. RSocket::Close() returns when timer
-			// expires or when all data has been succesfully transmitted.
-			//
-		    if(iMicroSecCalcFlag)
+		    // Start linger timer. RSocket::Close() returns when timer
+            // expires or when all data has been succesfully transmitted.
+            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
@@ -1213,7 +1115,7 @@
             else
                 {
                 iLingerTimer->Start(iLinger * KOneSecondInUs);
-                }			
+                }
 			}
 		SchedTransmit();
 
@@ -1473,23 +1375,32 @@
 	//if This is true, then it is a case of TCP window shrink and we need 
 	//to handle it.
 	if ( iNewTcpWindow )
-	    {
-	    // 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;
-	        }
-	    }
+		{
+	   	//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));
+			}
+		}
 	else
 #endif //SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 	
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_edge.txt
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_edge.txt	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_edge.txt	Wed Oct 13 16:17:27 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,1,web,web,,,192.168.20.2,192.168.10.2,1,0
+SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_gprs.txt
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_gprs.txt	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_gprs.txt	Wed Oct 13 16:17:27 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,1,web,web,,,192.168.20.2,192.168.10.2,1,0
+SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_hsdpa.txt
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_hsdpa.txt	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_hsdpa.txt	Wed Oct 13 16:17:27 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,1,web,web,,,192.168.20.2,192.168.10.2,1,0
+SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_umts.txt
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_umts.txt	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/tcpip6adapwnd_config_umts.txt	Wed Oct 13 16:17:27 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,1,web,web,,,192.168.20.2,192.168.10.2,1,0
+SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_edge_gprs_config.txt
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_edge_gprs_config.txt	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_edge_gprs_config.txt	Wed Oct 13 16:17:27 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,1,web,web,,,192.168.20.2,192.168.10.2,1,0
+SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
@@ -167,11 +167,11 @@
 #NotifyContextStatusChange = SECONDARY1, 0, 5
 
 #Edge
-NetworkMode= 5,2
-DynamicCaps= 5,1024
+NetworkMode= 2,2
+DynamicCaps= 2,1024
 
 #Gprs
-NetworkMode= 10,2
-DynamicCaps= 10,1
+NetworkMode= 12,2
+DynamicCaps= 2,1
 # DynamicCaps= <Duration>, <DynamicCaps>
 # Note: <DynamicCaps> is a bitmap of RPacketService::TDynamicCaps flags. 
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_edge_hsdpa_config.txt
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_edge_hsdpa_config.txt	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_edge_hsdpa_config.txt	Wed Oct 13 16:17:27 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,1,web,web,,,192.168.20.2,192.168.10.2,1,0
+SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
@@ -167,12 +167,12 @@
 #NotifyContextStatusChange = SECONDARY1, 0, 5
 
 #Edge
-NetworkMode= 5,2
-DynamicCaps= 5,1024
+NetworkMode= 2,2
+DynamicCaps= 2,1024
 
 #Hsdpa
-NetworkMode= 10,6
-DynamicCaps= 10,512
+NetworkMode= 12,6
+DynamicCaps= 2,512
 
 # DynamicCaps= <Duration>, <DynamicCaps>
 # Note: <DynamicCaps> is a bitmap of RPacketService::TDynamicCaps flags. 
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_edge_umts_config.txt
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_edge_umts_config.txt	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_edge_umts_config.txt	Wed Oct 13 16:17:27 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,1,web,web,,,192.168.20.2,192.168.10.2,1,0
+SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
@@ -167,11 +167,11 @@
 #NotifyContextStatusChange = SECONDARY1, 0, 5
 
 #Edge
-NetworkMode= 5,2
-DynamicCaps= 5,1024
+NetworkMode= 2,2
+DynamicCaps= 2,1024
 
 #Umts
-NetworkMode= 10,6
-DynamicCaps= 10,1  
+NetworkMode= 12,6
+DynamicCaps= 2,1  
 # DynamicCaps= <Duration>, <DynamicCaps>
 # Note: <DynamicCaps> is a bitmap of RPacketService::TDynamicCaps flags. 
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_gprs_edge_config.txt
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_gprs_edge_config.txt	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_gprs_edge_config.txt	Wed Oct 13 16:17:27 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,1,web,web,,,192.168.20.2,192.168.10.2,1,0
+SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
@@ -167,12 +167,12 @@
 #NotifyContextStatusChange = SECONDARY1, 0, 5
 
 #Gprs
-NetworkMode= 5,2
-DynamicCaps= 5,1
+NetworkMode= 2,2
+DynamicCaps= 2,1
 
 #Edge
-NetworkMode= 10,2
-DynamicCaps= 10,1024  
+NetworkMode= 12,2
+DynamicCaps= 2,1024  
 
 # DynamicCaps= <Duration>, <DynamicCaps>
 # Note: <DynamicCaps> is a bitmap of RPacketService::TDynamicCaps flags. 
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_gprs_hsdpa_config.txt
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_gprs_hsdpa_config.txt	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_gprs_hsdpa_config.txt	Wed Oct 13 16:17:27 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,1,web,web,,,192.168.20.2,192.168.10.2,1,0
+SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
@@ -167,11 +167,11 @@
 #NotifyContextStatusChange = SECONDARY1, 0, 5
 
 #Gprs
-NetworkMode= 5,2
-DynamicCaps= 5,1
+NetworkMode= 2,2
+DynamicCaps= 2,1
 
 #Hsdpa
-NetworkMode= 10,6
-DynamicCaps= 10,512  
+NetworkMode= 12,6
+DynamicCaps= 2,512  
 # DynamicCaps= <Duration>, <DynamicCaps>
 # Note: <DynamicCaps> is a bitmap of RPacketService::TDynamicCaps flags. 
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_gprs_umts_config.txt
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_gprs_umts_config.txt	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_gprs_umts_config.txt	Wed Oct 13 16:17:27 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,1,web,web,,,192.168.20.2,192.168.10.2,1,0
+SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
@@ -167,12 +167,12 @@
 #NotifyContextStatusChange = SECONDARY1, 0, 5
 
 #Gprs
-NetworkMode= 5,2
-DynamicCaps= 5,1
+NetworkMode= 2,2
+DynamicCaps= 2,1
 
 #Umts
-NetworkMode= 10,6
-DynamicCaps= 10,1 
+NetworkMode= 12,6
+DynamicCaps= 2,1 
 
 # DynamicCaps= <Duration>, <DynamicCaps>
 # Note: <DynamicCaps> is a bitmap of RPacketService::TDynamicCaps flags. 
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_hsdpa_edge_config.txt
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_hsdpa_edge_config.txt	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_hsdpa_edge_config.txt	Wed Oct 13 16:17:27 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,1,web,web,,,192.168.20.2,192.168.10.2,1,0
+SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
@@ -167,11 +167,11 @@
 #NotifyContextStatusChange = SECONDARY1, 0, 5
 
 #Hsdpa
-NetworkMode= 5,6
-DynamicCaps= 5,512
+NetworkMode= 2,6
+DynamicCaps= 2,512
 
 #Edge
-NetworkMode= 10,2
-DynamicCaps= 10,1024
+NetworkMode= 12,2
+DynamicCaps= 2,1024
 # DynamicCaps= <Duration>, <DynamicCaps>
 # Note: <DynamicCaps> is a bitmap of RPacketService::TDynamicCaps flags. 
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_hsdpa_gprs_config.txt
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_hsdpa_gprs_config.txt	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_hsdpa_gprs_config.txt	Wed Oct 13 16:17:27 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,1,web,web,,,192.168.20.2,192.168.10.2,1,0
+SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
@@ -167,11 +167,11 @@
 #NotifyContextStatusChange = SECONDARY1, 0, 5
 
 #Hsdpa
-NetworkMode= 5,2
-DynamicCaps= 5,512
+NetworkMode= 2,2
+DynamicCaps= 2,512
 
 #Gprs
-NetworkMode= 10,2
-DynamicCaps= 10,1  
+NetworkMode= 12,2
+DynamicCaps= 2,1  
 # DynamicCaps= <Duration>, <DynamicCaps>
 # Note: <DynamicCaps> is a bitmap of RPacketService::TDynamicCaps flags. 
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_hsdpa_umts_config.txt
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_hsdpa_umts_config.txt	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_hsdpa_umts_config.txt	Wed Oct 13 16:17:27 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,1,web,web,,,192.168.20.2,192.168.10.2,1,0
+SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
@@ -167,11 +167,11 @@
 #NotifyContextStatusChange = SECONDARY1, 0, 5
 
 #Hsdpa
-NetworkMode= 5,2
-DynamicCaps= 5,512
+NetworkMode= 2,2
+DynamicCaps= 2,512
 
 #Umts
-NetworkMode= 10,6
-DynamicCaps= 10,1
+NetworkMode= 12,6
+DynamicCaps= 2,1
 # DynamicCaps= <Duration>, <DynamicCaps>
 # Note: <DynamicCaps> is a bitmap of RPacketService::TDynamicCaps flags. 
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_umts_edge_config.txt
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_umts_edge_config.txt	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_umts_edge_config.txt	Wed Oct 13 16:17:27 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,1,web,web,,,192.168.20.2,192.168.10.2,1,0
+SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
@@ -167,12 +167,12 @@
 #NotifyContextStatusChange = SECONDARY1, 0, 5
 
 #Umts
-NetworkMode= 5,6
-DynamicCaps= 5,1
+NetworkMode= 2,6
+DynamicCaps= 2,1
 
 #Edge
-NetworkMode= 10,2
-DynamicCaps= 10,1024  
+NetworkMode= 12,2
+DynamicCaps= 2,1024  
 
 # DynamicCaps= <Duration>, <DynamicCaps>
 # Note: <DynamicCaps> is a bitmap of RPacketService::TDynamicCaps flags. 
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_umts_gprs_config.txt
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_umts_gprs_config.txt	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_umts_gprs_config.txt	Wed Oct 13 16:17:27 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,1,web,web,,,192.168.20.2,192.168.10.2,1,0
+SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
@@ -167,11 +167,11 @@
 #NotifyContextStatusChange = SECONDARY1, 0, 5
 
 #Umts
-NetworkMode= 5,6
-DynamicCaps= 5,1
+NetworkMode= 2,6
+DynamicCaps= 2,1
 
 #Gprs
-NetworkMode= 10,2
-DynamicCaps= 10,1  
+NetworkMode= 12,2
+DynamicCaps= 2,1  
 # DynamicCaps= <Duration>, <DynamicCaps>
 # Note: <DynamicCaps> is a bitmap of RPacketService::TDynamicCaps flags. 
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_umts_hsdpa_config.txt
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_umts_hsdpa_config.txt	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/configs/te_tcpip6adapwnd_modulation_umts_hsdpa_config.txt	Wed Oct 13 16:17:27 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,1,web,web,,,192.168.20.2,192.168.10.2,1,0
+SetContextConfigGPRS= 0,orangeinternet,,0, 2, 0, 0,web,web,,,192.168.20.2,192.168.10.2,0,0
 
 
 #SetContextConfigR5= <TProtocolType>, <TGSNAddress>, <TProtocolAddress>, <TUseEdge>, <Authentication Protocol>, <Username>, <Password>, <Challenge>,
@@ -167,11 +167,11 @@
 #NotifyContextStatusChange = SECONDARY1, 0, 5
 
 #Umts
-NetworkMode= 5,6
-DynamicCaps= 5,1
+NetworkMode= 2,6
+DynamicCaps= 2,1
 
 #Hsdpa
-NetworkMode= 10,6
-DynamicCaps= 10,512 
+NetworkMode= 12,6
+DynamicCaps= 2,512 
 # DynamicCaps= <Duration>, <DynamicCaps>
 # Note: <DynamicCaps> is a bitmap of RPacketService::TDynamicCaps flags. 
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_edge_gprs.script
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_edge_gprs.script	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_edge_gprs.script	Wed Oct 13 16:17:27 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 7000
+DELAY 20000
 
 //Retrieve the TCP Window size for GPRS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketGPRS
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_edge_gprs_user_set.script
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_edge_gprs_user_set.script	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_edge_gprs_user_set.script	Wed Oct 13 16:17:27 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 7000
+DELAY 20000
 //Bearer changing to GPRS
 PRINT Bearer changing to GPRS
 
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_edge_hsdpa.script
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_edge_hsdpa.script	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_edge_hsdpa.script	Wed Oct 13 16:17:27 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 7000
+DELAY 20000
 
 //Retrieve the TCP Window size for HSDPA
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketHSDPA
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_edge_umts.script
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_edge_umts.script	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_edge_umts.script	Wed Oct 13 16:17:27 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 7000
+DELAY 20000
 
 //Retrieve the TCP Window size for UMTS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketUMTS
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_gprs_edge.script
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_gprs_edge.script	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_gprs_edge.script	Wed Oct 13 16:17:27 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 7000
+DELAY 20000
 
 //Retrieve the TCP Window size for EDGE
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketEGPRS
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_gprs_hsdpa.script
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_gprs_hsdpa.script	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_gprs_hsdpa.script	Wed Oct 13 16:17:27 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 7000
+DELAY 20000
 
 //Retrieve the TCP Window size for HSDPA
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketHSDPA
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_gprs_umts.script
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_gprs_umts.script	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_gprs_umts.script	Wed Oct 13 16:17:27 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 7000
+DELAY 20000
 
 //Retrieve the TCP Window size for UMTS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketUMTS
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_hsdpa_edge.script
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_hsdpa_edge.script	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_hsdpa_edge.script	Wed Oct 13 16:17:27 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 7000
+DELAY 20000
 
 //Retrieve the TCP Window size for EDGE
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketEGPRS
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_hsdpa_gprs.script
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_hsdpa_gprs.script	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_hsdpa_gprs.script	Wed Oct 13 16:17:27 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 7000
+DELAY 20000
 
 //Retrieve the TCP Window size for GPRS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketGPRS
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_hsdpa_umts.script
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_hsdpa_umts.script	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_hsdpa_umts.script	Wed Oct 13 16:17:27 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 7000
+DELAY 20000
 
 //Retrieve the TCP Window size for UMTS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketUMTS
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_umts_edge.script
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_umts_edge.script	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_umts_edge.script	Wed Oct 13 16:17:27 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 7000
+DELAY 20000
 
 //Retrieve the TCP Window size for EDGE
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketEGPRS
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_umts_gprs.script
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_umts_gprs.script	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_umts_gprs.script	Wed Oct 13 16:17:27 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 7000
+DELAY 20000
 
 //Retrieve the TCP Window size for GPRS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketGPRS
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_umts_hsdpa.script
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_umts_hsdpa.script	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_modulation_umts_hsdpa.script	Wed Oct 13 16:17:27 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 7000
+DELAY 20000
 
 //Retrieve the TCP Window size for HSDPA
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketHSDPA
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_edge_gprs.script
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_edge_gprs.script	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_edge_gprs.script	Wed Oct 13 16:17:27 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 7000
+DELAY 20000
 
 //Retrieve the TCP Window size for EDGE
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketGPRS
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_edge_hsdpa.script
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_edge_hsdpa.script	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_edge_hsdpa.script	Wed Oct 13 16:17:27 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 7000
+DELAY 20000
 
 //Retrieve the TCP Window size for HSDPA
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketHSDPA
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_edge_umts.script
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_edge_umts.script	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_edge_umts.script	Wed Oct 13 16:17:27 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 7000
+DELAY 20000
 
 //Retrieve the TCP Window size for Umts
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketUMTS
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_gprs_edge.script
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_gprs_edge.script	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_gprs_edge.script	Wed Oct 13 16:17:27 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 7000
+DELAY 20000
 
 //Retrieve the TCP Window size for EDGE
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketEGPRS
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_gprs_hsdpa.script
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_gprs_hsdpa.script	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_gprs_hsdpa.script	Wed Oct 13 16:17:27 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 7000
+DELAY 20000
 
 //Retrieve the TCP Window size for HSDPA
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketHSDPA
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_gprs_umts.script
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_gprs_umts.script	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_gprs_umts.script	Wed Oct 13 16:17:27 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 7000
+DELAY 20000
 
 //Retrieve the TCP Window size for UMTS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketUMTS
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_hsdpa_edge.script
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_hsdpa_edge.script	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_hsdpa_edge.script	Wed Oct 13 16:17:27 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 7000
+DELAY 20000
 
 //Retrieve the TCP Window size for EDGE
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketEGPRS
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_hsdpa_gprs.script
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_hsdpa_gprs.script	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_hsdpa_gprs.script	Wed Oct 13 16:17:27 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 7000
+DELAY 20000
 
 //Retrieve the TCP Window size for GPRS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketGPRS
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_hsdpa_umts.script
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_hsdpa_umts.script	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_hsdpa_umts.script	Wed Oct 13 16:17:27 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 7000
+DELAY 20000
 
 //Retrieve the TCP Window size for UMTS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketUMTS
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_umts_edge.script
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_umts_edge.script	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_umts_edge.script	Wed Oct 13 16:17:27 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 7000
+DELAY 20000
 
 //Retrieve the TCP Window size for EDGE
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketEGPRS
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_umts_gprs.script
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_umts_gprs.script	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_umts_gprs.script	Wed Oct 13 16:17:27 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 7000
+DELAY 20000
 
 //Retrieve the TCP Window size for GPRS
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketGPRS
diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_umts_hsdpa.script
--- a/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_umts_hsdpa.script	Wed Sep 15 13:53:10 2010 +0300
+++ b/networkprotocols/tcpipv4v6prt/te_tcpip6/scripts/te_tcpip6adapwnd_vpnmodulation_umts_hsdpa.script	Wed Oct 13 16:17:27 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 7000
+DELAY 20000
 
 //Retrieve the TCP Window size for HSDPA
 RUN_TEST_STEP 150 te_esockteststepsSuite SocketGetOptionStep z:\testdata\configs\te_tcpip6AdapWnd.ini GetOptOnSocketHSDPA
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/group/bld.inf
--- a/networksecurity/ipsec/group/bld.inf	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/ipsec/group/bld.inf	Wed Oct 13 16:17:27 2010 +0300
@@ -21,7 +21,6 @@
 #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
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/ipsec6/group/ipsec6.mmp
--- a/networksecurity/ipsec/ipsec6/group/ipsec6.mmp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/ipsec/ipsec6/group/ipsec6.mmp	Wed Oct 13 16:17:27 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -54,8 +54,6 @@
 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
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/ipsec6/inc/sa_spec.h
--- a/networksecurity/ipsec/ipsec6/inc/sa_spec.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/ipsec/ipsec6/inc/sa_spec.h	Wed Oct 13 16:17:27 2010 +0300
@@ -51,10 +51,6 @@
 // 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
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/ipsec6/inc/spdb.h
--- a/networksecurity/ipsec/ipsec6/inc/spdb.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/ipsec/ipsec6/inc/spdb.h	Wed Oct 13 16:17:27 2010 +0300
@@ -156,9 +156,6 @@
 	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
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/ipsec6/src/sc_prt6.cpp
--- a/networksecurity/ipsec/ipsec6/src/sc_prt6.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/ipsec/ipsec6/src/sc_prt6.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -16,8 +16,6 @@
 // performing IPSEC checking and processing to packets.
 //
 
-#include <featdiscovery.h>
-#include <featureuids.h>
 
 #include <posthook.h>
 #include <icmp6_hdr.h>
@@ -379,9 +377,6 @@
 	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;
@@ -403,7 +398,6 @@
 	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
 
 	};
 
@@ -669,17 +663,6 @@
 	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)
@@ -1115,23 +1098,6 @@
 	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
@@ -1142,17 +1108,7 @@
 		if (ps->iTS == NULL || ps->iTS->Match(aKey))
 			{
 			if (ps->iFilterData & KPolicyFilter_DROP)
-                {
-                // UMA support REQ 417-40027
-                if (iIPSecGANSupported && exception_flag)
-			       {
-                    //Work around for Exceptions                
-                    exception_drop_flag = ETrue;
-                    break;	
-			       }
-
-                return EIpsec_NoSelectorMatch;
-                }
+				return EIpsec_NoSelectorMatch;
 
 			const TInt N = ps->iActions.Count();
 			for (TInt k = 0; k < N; k++)
@@ -1179,77 +1135,15 @@
 					if (aSrc)
 						aSrc[aTunnels] = aKey.iLocal;
 					aTunnels++;
-                    }//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;
+					}
+				}
+			result = i;
+			if (ps->iFilterData & KPolicyFilter_FINAL)
+				break;	// Final selector, no merge allowed!
+			aFilter.iFlags |= KPolicyFilter_MERGE;	// Mark "merge only".
+			}
+		}
+	return result;
 	}
 
 
@@ -1322,7 +1216,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;
@@ -2089,9 +1983,6 @@
 			}
 		// 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];
@@ -2350,10 +2241,6 @@
 			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
@@ -2415,44 +2302,3 @@
 			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")));
-        }
-    }
-
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/ipsec6/src/spdb.cpp
--- a/networksecurity/ipsec/ipsec6/src/spdb.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/ipsec/ipsec6/src/spdb.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -20,16 +20,14 @@
 /**
  @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"
@@ -168,10 +166,7 @@
 	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 
@@ -188,12 +183,9 @@
 	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
@@ -864,140 +856,18 @@
 #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)
-//#endif
+	/**
+	* 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.
+	*/
 	{
 	_LIT(K_tunnel,	"tunnel");
 
@@ -1026,13 +896,6 @@
 		// 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);
 
@@ -1279,7 +1142,6 @@
 		KEYWORD("merge"),
 		KEYWORD("outbound"),
 		KEYWORD("inbound"),
-		KEYWORD("UMAExceptionTrafficSelector"), //UMA support
 		KEYWORD("if"),
 		};
 
@@ -1289,7 +1151,6 @@
 		KEYENUM(merge),
 		KEYENUM(outbound),
 		KEYENUM(inbound),
-		KEYENUM(UMAExceptionTrafficSelector),//exception bits
 		KEYENUM(if),
 
 		KEYENUM(max_parameters)
@@ -1298,9 +1159,6 @@
 	_LIT(K_drop, "drop");
 
 	token_type val;
-
-    CheckFeatureSupportL(NFeature::KFeatureIdFfIpsecUmaSupportEnable);
-
 	//
 	aPs = new (ELeave) CPolicySelector();
 
@@ -1344,22 +1202,6 @@
 					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
@@ -1376,18 +1218,7 @@
 	if (val != token_equal)
 		User::Leave(EIpsec_PolicySyntaxError);
 	if (NextToken() == token_brace_left)
-	    {
-	  //UMA support RE417-40027
-        if(iIPSecGANSupported)
-            {
-        ParseSecurityBundleL(aPs->iActions, aPs->iTS, aPs);
-            }
-        else
-            {
-        ParseSecurityBundleL(aPs->iActions, aPs->iTS);
-
-            }
-	    }
+		ParseSecurityBundleL(aPs->iActions, aPs->iTS);
 	else if (iToken.Compare(K_drop) == 0)
 		aPs->iFilterData |= KPolicyFilter_DROP;
 	else
@@ -1401,24 +1232,6 @@
 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)
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/ipsecpol/group/ipsecpol.mmp
--- a/networksecurity/ipsec/ipsecpol/group/ipsecpol.mmp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/ipsec/ipsecpol/group/ipsecpol.mmp	Wed Oct 13 16:17:27 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -54,9 +54,6 @@
 
 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
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/ipsecpol/inc/ipsecpol.h
--- a/networksecurity/ipsec/ipsecpol/inc/ipsecpol.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/ipsec/ipsecpol/inc/ipsecpol.h	Wed Oct 13 16:17:27 2010 +0300
@@ -90,9 +90,7 @@
         EIpsecPolicyGetDebugInfo,
         EIpsecPolicyCancelDebug,
         EIpsecPolicyAvailableSelectors,
-        EIpsecPolicyEnumerateSelectors,
-        EIpsecPolicySetOption,
-        
+        EIpsecPolicyEnumerateSelectors
     };
     
 enum TAutoloadFlags 
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/ipsecpol/inc/ipsecpolmanhandler.h
--- a/networksecurity/ipsec/ipsecpol/inc/ipsecpolmanhandler.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/ipsec/ipsecpol/inc/ipsecpolmanhandler.h	Wed Oct 13 16:17:27 2010 +0300
@@ -27,12 +27,10 @@
 #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
@@ -54,7 +52,6 @@
 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
@@ -82,8 +79,6 @@
     TBool iActiveState;       // EFalse = loaded, not active; ETrue = active
     TInt iBypassOrDropMode;   // See flags below
     TPolicyType iPolicyType;
-    TBool iException;			// UMA exception
-	
     };
 typedef CArrayFixFlat<TActivePolicyListEntry*> CActivePolicyList;
 
@@ -189,7 +184,7 @@
     TInt DeletePolicyFromList();
 
     TInt SearchPolicyFromListAndActivate();
-  
+    
     TInt GetAvailableSelectors(const RMessage2& aMsg);
     TInt GetSelectorsCount(const RMessage2& aMsg);
 
@@ -345,16 +340,6 @@
     //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();
@@ -373,17 +358,6 @@
 
     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
@@ -469,13 +443,6 @@
     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
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/ipsecpol/src/ipsecpolmanconflict.cpp
--- a/networksecurity/ipsec/ipsecpol/src/ipsecpolmanconflict.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/ipsec/ipsecpol/src/ipsecpolmanconflict.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -106,8 +106,6 @@
 TBool
 CIPSecPolicyManagerHandler::CalculateCombinedPolicyBypassDropMode()
     {
-    LOG(Log::Printf(_L("CalculateCombinedPolicyBypassDropMode\n")));
-
     // Combined mode is 'bypass_everything_else' by default
     TInt combinedMode(KInboundBypass | KOutboundBypass);
 
@@ -149,7 +147,6 @@
     // 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);
     }
 
@@ -330,13 +327,6 @@
                 {
                 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
@@ -567,20 +557,7 @@
                                     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;
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/ipsecpol/src/ipsecpolmanhandler.cpp
--- a/networksecurity/ipsec/ipsecpol/src/ipsecpolmanhandler.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/ipsec/ipsecpol/src/ipsecpolmanhandler.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -28,19 +28,11 @@
 #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
 //
@@ -73,9 +65,6 @@
 
     iPreloadPolicyHandle.iHandle = 0;
 
-    CheckFeatureSupportL(NFeature::KFeatureIdFfIpsecUmaSupportEnable);
-
-    iAppSid = KAppSidDefault;
 
 #ifdef TESTFLAG
 
@@ -85,6 +74,7 @@
 
     ReadAlgorithmsFileL();
     iSelectorInfoArray = new (ELeave) CArrayFixFlat<TIpsecSelectorInfo> (2);
+
     }
 
 //
@@ -184,24 +174,6 @@
     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
 //
@@ -300,7 +272,7 @@
         TPckg<TZoneInfoSet>pckgZoneInfoSet(zoneInfoSet);
         aMsg.ReadL(THIRD_ARGUMENT, pckgZoneInfoSet);
         }
-        iVPNNetId = 0;
+    iVPNNetId = 0;
     if (zoneInfoSet.iSelectorZone.iScope != KScopeNone)
         {
         iVPNNetId = zoneInfoSet.iSelectorZone.iId;
@@ -310,24 +282,10 @@
         {
         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();
@@ -341,92 +299,19 @@
     // 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())
         {
-        //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;
-            }
-
+        //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 )) 
             {
-            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);          
-                }
+            ErrorHandlingL (ESelectorConflict,0);
             }
-        }
+        } 
    
     // Add VPNNetId to CPolicySelector and GwNetId to CSecpolBundleItem objects
     UpdateSelectorsAndTunnels();
@@ -459,7 +344,6 @@
     ApiCallCompleted();
     return KErrNone;
     }
-    
 
 //
 //
@@ -505,8 +389,9 @@
         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
@@ -642,12 +527,11 @@
         {
         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();
 
@@ -670,24 +554,6 @@
         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"));
@@ -826,20 +692,6 @@
         {
         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
@@ -882,9 +734,7 @@
 
     // Check if given policy contains 'drop_everything_else' rule
     // and add IKE, DHCP and MIPv4 bypass selectors if necessary 
-    //UMA support REQ417-40027 
-    //DHCP selectors & IKE selectors should be added even when UMA is UP
-    if (aBypassDropMode == KDropMode ||(iIPSecGANSupported && iCurrentException))
+    if (aBypassDropMode == KDropMode)
         {
         // Allow plain IKE negotiation packets. Write  the bypass
         // selectors  to the end of selector list, but they will
@@ -903,11 +753,10 @@
                 ErrorHandlingL(ENoMemory, err);
                 }
             }
-        //UMA support REQ417-40027
-		TBool UMAFLAG = ETrue;
-		// Allow plain DHCP negotiation packets. Write bypass mode
+
+        // Allow plain DHCP negotiation packets. Write bypass mode
         // selectors for DHCP ports (67, 68) to the end of selector list.
-        if (aFunction & KAddDhcpBypassSelectors || (iIPSecGANSupported && UMAFLAG))
+        if (aFunction & KAddDhcpBypassSelectors)
             {
             TInt err = BuildDhcpProtocolString(iPolBfr);
             if (err != KErrNone)
@@ -969,11 +818,6 @@
     entry->iPolicyHandle.iHandle = iCurrentPolicyHandle.iHandle;
     entry->iPolicyBuf = iPolBfr;
     entry->iPolicyType = aPolType;
-    if(iIPSecGANSupported)
-        {
-    entry->iException = iCurrentException ;
-        }
-
     iPolBfr = NULL;
     CleanupStack::PushL(entry->iPolicyBuf);
 
@@ -2319,163 +2163,3 @@
     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")));
-	}
-
-
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/ipsecpol/src/ipsecpolmansession.cpp
--- a/networksecurity/ipsec/ipsecpol/src/ipsecpolmansession.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/ipsec/ipsecpol/src/ipsecpolmansession.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -192,12 +192,6 @@
         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;
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/ipsecpol/src/ipsecpolmanutil.cpp
--- a/networksecurity/ipsec/ipsecpol/src/ipsecpolmanutil.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/ipsec/ipsecpol/src/ipsecpolmanutil.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -265,15 +265,6 @@
     // 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;
@@ -437,29 +428,8 @@
             compWord |= 0x00400000;
             }
 
-        //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;
-            }
+        // Each selector has at least this bit set on
+        compWord |= 0x00000001;
 
         // Store comparison word to the selector
         policySelector->iCompWord = compWord;
@@ -620,38 +590,9 @@
         }
     }
 
-
-//  
-// 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 = { }
 //
@@ -665,12 +606,10 @@
     {
     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;
         }
 
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/ipsecpolapi/bwins/IPSECPOLAPIU.DEF
--- a/networksecurity/ipsec/ipsecpolapi/bwins/IPSECPOLAPIU.DEF	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/ipsec/ipsecpolapi/bwins/IPSECPOLAPIU.DEF	Wed Oct 13 16:17:27 2010 +0300
@@ -14,5 +14,4 @@
 	?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 &)
 
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/ipsecpolapi/eabi/ipsecpolapiU.DEF
--- a/networksecurity/ipsec/ipsecpolapi/eabi/ipsecpolapiU.DEF	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/ipsec/ipsecpolapi/eabi/ipsecpolapiU.DEF	Wed Oct 13 16:17:27 2010 +0300
@@ -16,5 +16,4 @@
 	_ZN16RIpsecPolicyServD2Ev @ 15 NONAME ; RIpsecPolicyServ::~RIpsecPolicyServ [not-in-charge](void)
 	_ZN16RIpsecPolicyServC2Ev @ 16 NONAME ; RIpsecPolicyServ::RIpsecPolicyServ[not-in-charge](void)
 	_ZN16RIpsecPolicyServ18AvailableSelectorsERK6TDesC8P13CArrayFixFlatI18TIpsecSelectorInfoER14TRequestStatus @ 17 NONAME
-	_ZN16RIpsecPolicyServ6SetOptEjjRK6TDesC8 @ 18 NONAME
 
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/ipsecpolapi/inc/ipsecpolapi.h
--- a/networksecurity/ipsec/ipsecpolapi/inc/ipsecpolapi.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/ipsec/ipsecpolapi/inc/ipsecpolapi.h	Wed Oct 13 16:17:27 2010 +0300
@@ -156,9 +156,6 @@
 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.
  *
@@ -167,19 +164,6 @@
 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
@@ -206,8 +190,6 @@
 
 typedef TPckg<TInetAddr> TInetAddrPckg;
 
-
-
 /**
  * RIpsecPolicyServ API is used by clients to:
  *    Users who load and unload policies
@@ -418,22 +400,7 @@
 	 *		system wide error codes.
      */ 
     IMPORT_C void AvailableSelectors(const TDesC8& aGateway, CArrayFixFlat<TIpsecSelectorInfo>* aSelectors, TRequestStatus& aStatus);
-
-	/**
-	 *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:	
+private:
 	void EnumerateSelectors(const TDesC8& aGateway, TInt& aCount);
 
 private:
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/ipsecpolapi/src/ipsecpolapi.cpp
--- a/networksecurity/ipsec/ipsecpolapi/src/ipsecpolapi.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/ipsec/ipsecpolapi/src/ipsecpolapi.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -16,6 +16,7 @@
 //
 
 #include <e32math.h>
+
 #include "ipsecpol.h"
 #include "ipsecpolapi.h"
 #include "clistatic.h"
@@ -38,7 +39,7 @@
 //
 // Connect to the server attempting to start it if necessary
 //
-    {    
+    {
 	TInt retry=2;
 	for (;;)
 		{
@@ -155,20 +156,3 @@
     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));	
-	}
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/lib_pfkey/include/lib_pfkey.h
--- a/networksecurity/ipsec/lib_pfkey/include/lib_pfkey.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/ipsec/lib_pfkey/include/lib_pfkey.h	Wed Oct 13 16:17:27 2010 +0300
@@ -177,20 +177,15 @@
 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();
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec/group/t_ipsec.mmp
--- a/networksecurity/ipsec/te_ipsec/group/t_ipsec.mmp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/ipsec/te_ipsec/group/t_ipsec.mmp	Wed Oct 13 16:17:27 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
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec/inc/t_ipsecikev2.h
--- a/networksecurity/ipsec/te_ipsec/inc/t_ipsecikev2.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/ipsec/te_ipsec/inc/t_ipsecikev2.h	Wed Oct 13 16:17:27 2010 +0300
@@ -23,7 +23,7 @@
 #if (!defined __TEF_IPSEC_IKEV2_TEST_WRAPPER_H__)
 #define __TEF_IPSEC_IKEV2_TEST_WRAPPER_H__
 
-#include <datawrapper.h>
+#include <DataWrapper.h>
 
 class CT_IPSecIKEv2TestWrapper : public CDataWrapper
 	{
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec/inc/t_ipsecmultiplesa.h
--- a/networksecurity/ipsec/te_ipsec/inc/t_ipsecmultiplesa.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/ipsec/te_ipsec/inc/t_ipsecmultiplesa.h	Wed Oct 13 16:17:27 2010 +0300
@@ -25,7 +25,7 @@
 
 
 
-#include <datawrapper.h>
+#include <DataWrapper.h>
 
 class CT_IPSecMultipleSATestWrapper : public CDataWrapper
 	{
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/group/bld.inf
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/group/bld.inf	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-// 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
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/group/te_ipsec_selector_confilict.iby
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/group/te_ipsec_selector_confilict.iby	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef __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
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/group/te_ipsec_selector_confilict.mmp
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/group/te_ipsec_selector_confilict.mmp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-// 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
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_coverage_test.h
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_coverage_test.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/*
-* 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__
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_ipsec_load_policy_base.h
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_ipsec_load_policy_base.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of 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__
-
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_ipsecconst.h
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_ipsecconst.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of 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__*/
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_ipsectestserver.h
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_ipsectestserver.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-/*
-* 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__
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_loadpolicy_bbd.h
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_loadpolicy_bbd.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/*
-* 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__
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_loadpolicy_bdd.h
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_loadpolicy_bdd.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-/*
-* 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_
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_loadpolicy_uma.h
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_loadpolicy_uma.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*
-* 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__
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_selectorconflict.h
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/inc/te_selectorconflict.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of 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__
-
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict-uma1.script
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict-uma1.script	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-//
-// 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
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict-uma2.script
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict-uma2.script	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-//
-// 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
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict-uma3.script
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict-uma3.script	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-//
-// 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
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict-uma4.script
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict-uma4.script	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-//
-// 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
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict-uma5.script
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict-uma5.script	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-//
-// 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
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict-uma6.script
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict-uma6.script	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-//
-// 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
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_bbd1.script
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_bbd1.script	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-//
-// 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
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_bbd2.script
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_bbd2.script	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-//
-// 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
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_bbd3.script
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_bbd3.script	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-//
-// 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
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_bdd1.script
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_bdd1.script	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-//
-// 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
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_bdd2.script
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_bdd2.script	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-//
-// 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
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_bdd3.script
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_bdd3.script	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-//
-// 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
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_common.script
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_common.script	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-//
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-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
-
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_coverage.script
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ike-selectorconflict_coverage.script	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-//
-// 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
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ikev1test-ops.ini
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/scripts/ns-ipsec-ikev1test-ops.ini	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-
-[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]
-
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/src/te_coverage_test.cpp
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/src/te_coverage_test.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,526 +0,0 @@
-/*
-* 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);
-    }
-    
-
-
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/src/te_ipsectestserver.cpp
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/src/te_ipsectestserver.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-/*
-* 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;
-    }
- 
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/src/te_loadpolicy_bbd.cpp
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/src/te_loadpolicy_bbd.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,466 +0,0 @@
-/*
-* 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);
-    }
-    
-
-
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/src/te_loadpolicy_bdd.cpp
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/src/te_loadpolicy_bdd.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,442 +0,0 @@
-/*
-* 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);
-    }
-    
-
-
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/src/te_loadpolicy_uma.cpp
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/src/te_loadpolicy_uma.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,507 +0,0 @@
-/*
-* 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);
-    }
-    
-
-
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_2483.pin
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_2483.pin	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-[POLICYNAME]
-Symbian VPN Test Policy (2)
-[POLICYDESCRIPTION]
-Test for Symbian OS's VPN API
-[POLICYVERSION]
-1.0
-[ISSUERNAME]
-Symbian
-[CONTACTINFO]
-ahamed.rafik@nokia.com
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_2483.pol
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_2483.pol	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-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) }
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_2483_drop.pin
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_2483_drop.pin	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-[POLICYNAME]
-Symbian VPN Test Policy (2)
-[POLICYDESCRIPTION]
-Test for Symbian OS's VPN API
-[POLICYVERSION]
-1.0
-[ISSUERNAME]
-Symbian
-[CONTACTINFO]
-ahamed.rafik@nokia.com
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_2483_drop.pol
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_2483_drop.pol	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-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) }
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_ethced_2483.xml
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_ethced_2483.xml	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
- All rights reserved.
- This component and the accompanying materials are made available
- under the terms of "Eclipse Public License v1.0"
- which accompanies this distribution, and is available
- at the URL "http://www.eclipse.org/legal/epl-v10.html".
-
- Initial Contributors:
- Nokia Corporation - initial contribution.
-
- Contributors:
-
- Description:
- CommDB Settings File
- All Rights Reserved
-
--->
-
-
-
-<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:xlink="http://www.w3.org/1999/xlink"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
-
-<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>
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_ethced_2483vpn.xml
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_ethced_2483vpn.xml	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1245 +0,0 @@
-<?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
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_ethced_2483vpn_drop.xml
--- a/networksecurity/ipsec/te_ipsec_selector_confilict/testdata/te_ethced_2483vpn_drop.xml	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1245 +0,0 @@
-<?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
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/tls/group/BLD.INF
--- a/networksecurity/tls/group/BLD.INF	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/tls/group/BLD.INF	Wed Oct 13 16:17:27 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2000-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -89,13 +89,6 @@
 ../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
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/tls/group/SSL.MMP
--- a/networksecurity/tls/group/SSL.MMP	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/tls/group/SSL.MMP	Wed Oct 13 16:17:27 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -57,7 +57,6 @@
 LIBRARY		netsm.lib
 LIBRARY		netmsg.lib
 LIBRARY		crypto.lib
-LIBRARY		featdiscovery.lib
 
 
 START WINS
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/tls/group/ts_tls.iby
--- a/networksecurity/tls/group/ts_tls.iby	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/tls/group/ts_tls.iby	Wed Oct 13 16:17:27 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -70,10 +70,6 @@
 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
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/tls/group/ts_tls.mmp
--- a/networksecurity/tls/group/ts_tls.mmp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/tls/group/ts_tls.mmp	Wed Oct 13 16:17:27 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -20,8 +20,6 @@
 UID           0x1000008d 0x101F52C4
 VENDORID 0x70000001
 
-MACRO HTTP_ALLOW_UNTRUSTED_CERTIFICATES
-
 SOURCEPATH	../ts_tls
 
 SOURCE		COMINIT.CPP
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/tls/protocol/applicationdata.cpp
--- a/networksecurity/tls/protocol/applicationdata.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/tls/protocol/applicationdata.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -35,7 +35,7 @@
   	LOG(Log::Printf(_L("self %x - %x"), self, (TUint)self + sizeof( CSendAppData ));)
 	CleanupStack::PushL( self );
 	self->ConstructL( aRecordComposer );
-	CleanupStack::Pop(self);
+	CleanupStack::Pop();
 	return self;
 }
 
@@ -167,7 +167,7 @@
   	LOG(Log::Printf(_L("self %x - %x"), self, (TUint)self + sizeof( CRecvAppData ));)
 	CleanupStack::PushL( self );
 	self->ConstructL( aTlsConnection );
-	CleanupStack::Pop(self);
+	CleanupStack::Pop();
 	return self;
 }
 
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/tls/protocol/handshakereceiveevents.cpp
--- a/networksecurity/tls/protocol/handshakereceiveevents.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/tls/protocol/handshakereceiveevents.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -448,7 +448,7 @@
       HBufC8* buf = listPtr.AllocL();
    	CleanupStack::PushL(buf);
 		User::LeaveIfError(cryptoAttributes.iDistinguishedCANames.Append(buf) );
-   	CleanupStack::Pop(buf);
+   	CleanupStack::Pop();
 		listNode = listNode->Next();
 	}
    iTlsProvider->Attributes()->iClientAuthenticate = ETrue;
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/tls/protocol/recordprotocolevents.cpp
--- a/networksecurity/tls/protocol/recordprotocolevents.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/tls/protocol/recordprotocolevents.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -234,12 +234,7 @@
 	    {
 		iActiveTlsSession->CancelRequest();
 		}
-
-    TRAPD(ret, ReConstructL());
-    if ( ret != KErrNone )
-        {
-        LOG(Log::Printf(_L("ReConstructL() returned the error %d"), ret);)
-        }
+	ReConstructL();
 }
 
 void CRecordParser::DispatchData()
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/tls/protocol/tlsconnection.cpp
--- a/networksecurity/tls/protocol/tlsconnection.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/tls/protocol/tlsconnection.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -26,8 +26,6 @@
 #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>
@@ -55,7 +53,7 @@
 
 	CleanupStack::PushL(self);
 	self->ConstructL(aSocket, aProtocol);
-	CleanupStack::Pop(self);
+	CleanupStack::Pop();
 	return self;
 }
 
@@ -80,7 +78,7 @@
 
 	CleanupStack::PushL(self);
 	self->ConstructL(aSocket, aProtocol);
-	CleanupStack::Pop(self);
+	CleanupStack::Pop();
 	return self;
 }
 
@@ -156,17 +154,7 @@
 	User::LeaveIfError( SetProtocol(aProtocol) );
 	iTlsProvider->Attributes()->iCurrentCipherSuite.iLoByte = 0x00;
 	iTlsProvider->Attributes()->iCurrentCipherSuite.iHiByte = 0x00;
-	TBool allowUntrustedCertificates = EFalse;
-	allowUntrustedCertificates = CFeatureDiscovery::IsFeatureSupportedL(NFeature::KFeatureIdFfHttpAllowUntrustedCertificates);
-	
-	if( allowUntrustedCertificates )
-	  {
-      iTlsProvider->Attributes()->iDialogMode = ETTLSDialogModeAllowAutomatic;
-	  }
-	else
-	  {
-	  iTlsProvider->Attributes()->iDialogNonAttendedMode = EFalse;
-	  }
+	iTlsProvider->Attributes()->iDialogNonAttendedMode = EFalse;
 	iDialogMode = EDialogModeAttended;
 
 	iGenericSocket = new(ELeave)CGenericSecureSocket<RSocket>(aSocket);
@@ -218,17 +206,7 @@
 	User::LeaveIfError( SetProtocol(aProtocol) );
 	iTlsProvider->Attributes()->iCurrentCipherSuite.iLoByte = 0x00;
 	iTlsProvider->Attributes()->iCurrentCipherSuite.iHiByte = 0x00;
-	TBool allowUntrustedCertificates = EFalse;
-	allowUntrustedCertificates = CFeatureDiscovery::IsFeatureSupportedL(NFeature::KFeatureIdFfHttpAllowUntrustedCertificates);
-
-	if( allowUntrustedCertificates )
-	  {
-	  iTlsProvider->Attributes()->iDialogMode = ETTLSDialogModeAttended;
-	  }
-	else
-	  {
-	  iTlsProvider->Attributes()->iDialogNonAttendedMode = EFalse;
-	  }
+	iTlsProvider->Attributes()->iDialogNonAttendedMode = EFalse;
 	iDialogMode = EDialogModeAttended;
 
 	iRecordParser = new(ELeave)CRecordParser( aSocket, *iTlsProvider );
@@ -932,56 +910,23 @@
 	// TDialogMode enum or has the value EDialogModeUnattended/EDialogModeAttended. 
 	// Otherwise, it must return KErrArgument
 	TInt ret = KErrNone;
-	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;    
-		};
+   
+    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;    
+    };
 
-		if ( iTlsProvider )
-		{
-		if( allowUntrustedCertificates )
-			{
-			iTlsProvider->Attributes()->iDialogMode = tlsDialogMode;
-			}
-		else
-			{
-			iTlsProvider->Attributes()->iDialogNonAttendedMode = (iDialogMode == EDialogModeUnattended);
-			}
-		}
-	}
+    if ( iTlsProvider )
+    {
+   	    iTlsProvider->Attributes()->iDialogNonAttendedMode = (iDialogMode == EDialogModeUnattended);
+    }	
 
     return ret;
 }
@@ -1244,19 +1189,12 @@
 		   return EFalse;
 	      }
       else
-         {
-		 //We came here since tls handshake failed for some reasons.
-         //Attempting to delete the application data state machines here,
-         //leads to sending incorrect status to the caller application.
-         //Allow the cleanup of handshake statemachine to continue here.
-         //Let the application data state machines be cleaned up by the 
-         //tlsconnection desctructor function.
-         
-         //delete iSendAppData;
-         //iSendAppData = NULL;
-         //delete iRecvAppData;
-         //iRecvAppData = NULL;
-         //ResetCryptoAttributes();
+         {//delete data path in case it's re-negotiation what's failed
+         delete iSendAppData;
+         iSendAppData = NULL;
+         delete iRecvAppData;
+         iRecvAppData = NULL;
+         ResetCryptoAttributes();
          }
    }
    else
@@ -1370,7 +1308,7 @@
 	else
 	{	
 		iRecordComposer->SetUserData( (TDesC8*)&aDesc );
-		iRecordComposer->ResetCurrentPos();
+   	iRecordComposer->ResetCurrentPos();
 		iSendAppData->Start( &aStatus, this );
 	}
 	
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/tls/protocol/tlshandshake.cpp
--- a/networksecurity/tls/protocol/tlshandshake.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/tls/protocol/tlshandshake.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -55,7 +55,7 @@
   	LOG(Log::Printf(_L("self %x - %x"), self, (TUint)self + sizeof( CHandshake ));)
 	CleanupStack::PushL(self);
 	self->ConstructL(aTlsConnection);
-	CleanupStack::Pop(self);
+	CleanupStack::Pop();
 	return self;
 }
 
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/tls/secsock/SecureSocketInterface.h
--- a/networksecurity/tls/secsock/SecureSocketInterface.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/tls/secsock/SecureSocketInterface.h	Wed Oct 13 16:17:27 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -64,9 +64,6 @@
 	EDialogModeAttended,
 	/** Untrusted certificates are canceled without user confirmation. */
 	EDialogModeUnattended
-	,
-	/** Untrusted certificates are automatically allowed without user confirmation. */
-	EDialogModeAllowAutomatic
 	};
 
 
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/tls/test/te_tlsunittest/group/te_tlsunittest.mmp
--- a/networksecurity/tls/test/te_tlsunittest/group/te_tlsunittest.mmp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/tls/test/te_tlsunittest/group/te_tlsunittest.mmp	Wed Oct 13 16:17:27 2010 +0300
@@ -23,16 +23,16 @@
 TARGET          te_tlsunittest.exe
 TARGETTYPE      exe
 
-USERINCLUDE	../../../inc
+USERINCLUDE	..\..\..\inc
 
-SOURCEPATH      ../src
+SOURCEPATH      ..\src
 SOURCE		te_tlsunittestblock.cpp te_tlsunittestserver.cpp te_tlsunittestwrapper.cpp
 
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 
-USERINCLUDE     ../inc
+USERINCLUDE     ..\inc
 
 LIBRARY 	efsrv.lib 
 LIBRARY		euser.lib 
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/tls/ts_tls/T_Autossl_Const.h
--- a/networksecurity/tls/ts_tls/T_Autossl_Const.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/tls/ts_tls/T_Autossl_Const.h	Wed Oct 13 16:17:27 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -37,11 +37,6 @@
 _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;
@@ -51,11 +46,6 @@
 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" );
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/tls/ts_tls/T_TLS_cntrl.cpp
--- a/networksecurity/tls/ts_tls/T_TLS_cntrl.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/tls/ts_tls/T_TLS_cntrl.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -215,28 +215,6 @@
 				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;			
@@ -275,13 +253,9 @@
 							{
 							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, 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
+							iCipher, iSimpleGet, iTestEndDelay, iDNSName, iProtocol, iUseGenericSocket, iEAPKeyDerivation );
 
 						iRunState = EWaitForComplete;
 						break; // break from the for loop
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/tls/ts_tls/T_TLS_cntrl.h
--- a/networksecurity/tls/ts_tls/T_TLS_cntrl.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/tls/ts_tls/T_TLS_cntrl.h	Wed Oct 13 16:17:27 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -95,11 +95,7 @@
 	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;	
 
 	};
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/tls/ts_tls/T_TLS_test.cpp
--- a/networksecurity/tls/ts_tls/T_TLS_test.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/tls/ts_tls/T_TLS_test.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -288,29 +288,7 @@
 			{
 			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 )
@@ -352,30 +330,17 @@
 
 		if ( iStatus != KErrNone )
 			{
-#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;                
-            }
+			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;
+			}
 		else
 			{
 			iTestStep->Log( _L("ESecureConnected:KErrNone %d"),iStatus.Int() );
@@ -756,7 +721,7 @@
 	// Cancel the connect
 	iSocket.CancelConnect();
 	}
-#ifdef HTTP_ALLOW_UNTRUSTED_CERTIFICATES
+
 void CTLSTest::ConnectL( const TDesC &aAddress, 
 				const TInt aPortNum, 
 				const TDesC &aPage, 
@@ -767,23 +732,7 @@
 				const TDesC8& aDNSName ,
 				const TDesC& aProtocol, 
 				TBool aUseGenericSocket, 
-				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
+				TBool aEAPKeyDerivation )
 	{
 #if 0
 	iRunState = EDummyConnection;
@@ -824,11 +773,7 @@
 	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 ); 
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/tls/ts_tls/T_TLS_test.h
--- a/networksecurity/tls/ts_tls/T_TLS_test.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/tls/ts_tls/T_TLS_test.h	Wed Oct 13 16:17:27 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -70,7 +70,6 @@
 	// Construct/destruct
 	static CTLSTest *NewL();
 	~CTLSTest();
-#ifdef HTTP_ALLOW_UNTRUSTED_CERTIFICATES
 	void ConnectL( const TDesC &aAddress, 
 			const TInt aPortNum, 
 			const TDesC &aPage, 
@@ -81,23 +80,7 @@
 			const TDesC8& aDNSName, 
 			const TDesC& aProtocol, 
 			TBool aUseGenericSocket, 
-			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
+			TBool aEAPKeyDerivation );	
 
 	void SetConsole( CTestStepTls * aTestStep );
 	TBool InUse();
@@ -136,11 +119,7 @@
 	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;
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/tls/ts_tls/scripts/Tls39.ini
--- a/networksecurity/tls/ts_tls/scripts/Tls39.ini	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-// 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
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/tls/ts_tls/scripts/Tls40.ini
--- a/networksecurity/tls/ts_tls/scripts/Tls40.ini	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-// 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
-
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/tls/ts_tls/scripts/Tls41.ini
--- a/networksecurity/tls/ts_tls/scripts/Tls41.ini	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-// 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
-
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/tls/ts_tls/scripts/ssl_ntras_30.script
--- a/networksecurity/tls/ts_tls/scripts/ssl_ntras_30.script	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/tls/ts_tls/scripts/ssl_ntras_30.script	Wed Oct 13 16:17:27 2010 +0300
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -127,22 +127,6 @@
 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
 
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/tls/ts_tls/scripts/tls42.ini
--- a/networksecurity/tls/ts_tls/scripts/tls42.ini	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-// 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
-
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/tlsprovider/group/tlsprovider.mmp
--- a/networksecurity/tlsprovider/group/tlsprovider.mmp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/tlsprovider/group/tlsprovider.mmp	Wed Oct 13 16:17:27 2010 +0300
@@ -53,7 +53,6 @@
 LIBRARY ctfinder.lib
 LIBRARY tlscacheclient.lib
 LIBRARY bafl.lib
-LIBRARY featdiscovery.lib
 DEBUGLIBRARY            flogger.lib
 
 deffile		tlsprovider.def
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/tlsprovider/inc/tlstypedef.h
--- a/networksecurity/tlsprovider/inc/tlstypedef.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/tlsprovider/inc/tlstypedef.h	Wed Oct 13 16:17:27 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -115,11 +115,6 @@
  */
 enum TTLSCompressionMethod { ENullCompression  };
 
-/**
- * @internalAll 
- */
-enum TTLSDialogMode { ETTLSDialogModeAttended, ETTLSDialogModeUnattended, ETTLSDialogModeAllowAutomatic };
-
 class CSubjectPublicKeyInfo;
 class CMessageDigest;
 class TTLSCipherSuiteMapping;
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/tlsprovider/inc/tlstypedef_internal.h
--- a/networksecurity/tlsprovider/inc/tlstypedef_internal.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/tlsprovider/inc/tlstypedef_internal.h	Wed Oct 13 16:17:27 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -127,8 +127,8 @@
 	TBool iClientAuthenticate;
 	TBool iDialogNonAttendedMode;  
 	TTLSSignatureAlgorithm isignatureAlgorithm; 
-	TBuf8<256> idomainName;	
-	TTLSDialogMode iDialogMode;
+	TBuf8<256> idomainName;		
+
 	TBool iAllowNullCipherSuites;
 
 	TBool iPskConfigured;
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/tlsprovider/source/tlsprovider/CTlsProvider.cpp
--- a/networksecurity/tlsprovider/source/tlsprovider/CTlsProvider.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/tlsprovider/source/tlsprovider/CTlsProvider.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -19,14 +19,11 @@
 #include <securitydefsconst.h>
 #include <x520ava.h>
 #include <asn1dec.h>
-#include <featdiscovery.h>
-#include <featureuids.h>
 
 #include "tlsprovider.h"
 #include "cryptostrength.h"
 
 
-
 //
 //  CTlsProviderImpl
 //
@@ -140,7 +137,7 @@
 	CTlsCryptoAttributes* tPtr = new (ELeave)CTlsCryptoAttributes;
 	CleanupStack::PushL(tPtr);
 	tPtr->iPublicKeyParams = new (ELeave)CTLSPublicKeyParams;
-	CleanupStack::Pop(tPtr);
+	CleanupStack::Pop();
 	return tPtr;
 	}
 
@@ -1077,15 +1074,7 @@
 			}
 		else
 			{
-			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))
+			if(iTlsCryptoAttributes && iTlsCryptoAttributes->iDialogNonAttendedMode)
 				{	
 				TLSPROV_LOG(_L("Server Certificate validation failed but in DialogNonAttended mode"))	
 				TInt err(0);
@@ -1317,10 +1306,9 @@
 	
 	case EGetSessionInterface:
 		{
-		if (iPtrTokenSearch)
-		    iPtrTokenSearch->CancelRequest();
+		iPtrTokenSearch->CancelRequest();
+		break;
 		}
-		break;
 	case EGetCiphers:
 		{
 		if(iListAllTokensAndTypes[iCurrentTokentype].iProviderInterface)
@@ -1372,8 +1360,7 @@
 #ifdef _USESECDLGSV_
 		iDialogServ.Cancel();
 #else
-		if (iSecurityDialog)
-		    iSecurityDialog->Cancel();
+		iSecurityDialog->Cancel();
 #endif
 		}
 		break;
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/tlsprovider/source/tlsprovider/Ctlsbrowsetoken.cpp
--- a/networksecurity/tlsprovider/source/tlsprovider/Ctlsbrowsetoken.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/tlsprovider/source/tlsprovider/Ctlsbrowsetoken.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -183,10 +183,7 @@
       if ( !tempObj || iListAllTokensAndTypes->Append(*tempObj) != KErrNone )
          {
    		delete tempObj;
-   		if (iTokenHandle)
-   		    {
-   		    iTokenHandle->Release();
-   		    }
+         iTokenHandle->Release();
          iTokenHandle = NULL;
          User::Leave( KErrNoMemory );
          }
@@ -195,10 +192,7 @@
       Tokens.iTokenInfo = new CTokenInfo;
       if ( !Tokens.iTokenInfo  )
          {
-          if (iTokenHandle)
-              {
-              iTokenHandle->Release();
-              }
+         iTokenHandle->Release();
          iTokenHandle = NULL;
          User::Leave( KErrNoMemory );
          }
@@ -313,39 +307,24 @@
 	switch (iCurrentState)
 		{
 	case EGetTokenList:
-        {
-	    if (iPtrTokenType)
-	        iPtrTokenType->CancelList();
-        }
+		iPtrTokenType->CancelList();
 		break;
 		
 	case EOpenToken:
-	    {
-	    if (iPtrTokenType)
-	        iPtrTokenType->CancelOpenToken();
-	    }
+		iPtrTokenType->CancelOpenToken();
 		break;
 		
 	case EGetProviderInterface:
-	    {
-	    if (iTokenHandle)
-	        iTokenHandle->CancelGetInterface();
-	    }
+		iTokenHandle->CancelGetInterface();
 		break;
 	
 	case EGetSessionInterface:
-	    {
-	    if (iTokenProvider)
-	        (iTokenProvider->Token()).CancelGetInterface();
-	    }
+		(iTokenProvider->Token()).CancelGetInterface();
 		break;		
 
 	case EGetCiphers:
-	    if (iTokenInterface)
-	        {
-	        MTLSTokenProvider* provider = static_cast<MTLSTokenProvider*>(iTokenInterface);
-	        provider->CancelCryptoCapabilities();
-	        }
+		MTLSTokenProvider* provider = static_cast<MTLSTokenProvider*>(iTokenInterface);
+		provider->CancelCryptoCapabilities();
 		break;
 
 		}
@@ -356,7 +335,7 @@
 
 CTlsBrowseToken::~CTlsBrowseToken()
 	{
-	if (iPtrTokenType)
+	if(iPtrTokenType)
 		{
 		iPtrTokenType->Release();
 		}
diff -r bb2423252ea3 -r c1029e558ef5 networksecurity/tlsprovider/source/tlsprovider/tlsprovinterface.cpp
--- a/networksecurity/tlsprovider/source/tlsprovider/tlsprovinterface.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/networksecurity/tlsprovider/source/tlsprovider/tlsprovinterface.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -16,8 +16,6 @@
 #include "Tlsprovinterface.h"
 #include "tlsprovider.h"
 #include <badesca.h>
-#include <featdiscovery.h>
-#include <featureuids.h>
 
 //
 //                                   CTlsProvider
@@ -251,8 +249,7 @@
 */
 EXPORT_C void CTLSProvider::CancelRequest()
 	{
-    if (iTlsProviderImpl)
-        iTlsProviderImpl->CancelRequest();
+	iTlsProviderImpl->CancelRequest();
 	}
 
 
@@ -285,9 +282,6 @@
       ((TlsSessionPtr()->Attributes())->iMasterSecretInput).iClientRandom = (Attributes()->iMasterSecretInput).iClientRandom;
    	}
 
-	TBool allowUntrustedCertificates = EFalse;
-	allowUntrustedCertificates = CFeatureDiscovery::IsFeatureSupportedL(NFeature::KFeatureIdFfHttpAllowUntrustedCertificates);
-
 	// Save old implementation object
 	CTlsProviderImpl *oldTlsProviderImpl = iTlsProviderImpl;
 	iTlsProviderImpl = NULL;	
@@ -305,16 +299,7 @@
 
 		Attributes()->iProposedProtocol = oldAttr->iProposedProtocol;
 		Attributes()->iProposedCiphers = oldAttr->iProposedCiphers;
-		
-		if( allowUntrustedCertificates )
-			{
-			Attributes()->iDialogMode = oldAttr->iDialogMode;
-			}
-		else
-			{
-			Attributes()->iDialogNonAttendedMode = oldAttr->iDialogNonAttendedMode;
-			}
-
+		Attributes()->iDialogNonAttendedMode = oldAttr->iDialogNonAttendedMode;
 		Attributes()->idomainName = oldAttr->idomainName;
 
 		// Copy NULL ciphersuite setting
@@ -353,15 +338,7 @@
 		(Attributes()->iMasterSecretInput).iClientRandom = ((TlsSessionPtr()->Attributes())->iMasterSecretInput).iClientRandom;
 		Attributes()->iProposedProtocol = (TlsSessionPtr()->Attributes())->iProposedProtocol;
 		Attributes()->iNegotiatedProtocol = (TlsSessionPtr()->Attributes())->iNegotiatedProtocol;
-		if( allowUntrustedCertificates )
-			{
-			Attributes()->iDialogMode = (TlsSessionPtr()->Attributes())->iDialogMode;
-			}
-		else
-			{
-			Attributes()->iDialogNonAttendedMode = (TlsSessionPtr()->Attributes())->iDialogNonAttendedMode;
-			}
-
+		Attributes()->iDialogNonAttendedMode = (TlsSessionPtr()->Attributes())->iDialogNonAttendedMode;
       	Attributes()->iSessionNameAndID.iServerName = (TlsSessionPtr()->Attributes())->iSessionNameAndID.iServerName;
       	Attributes()->iSessionNameAndID.iSessionId = (TlsSessionPtr()->Attributes())->iSessionNameAndID.iSessionId;
 
@@ -668,13 +645,11 @@
 */
 EXPORT_C void CTLSSession::CancelRequest()
 	{
-    if (iTlsSessionImpl)
-        iTlsSessionImpl->CancelRequest();
+	iTlsSessionImpl->CancelRequest();
 	}
 
 EXPORT_C CTLSSession::~CTLSSession()
 	{
 	delete iTlsSessionImpl;
-	iTlsSessionImpl = NULL;
 	}
 
diff -r bb2423252ea3 -r c1029e558ef5 package_definition.xml
--- a/package_definition.xml	Wed Sep 15 13:53:10 2010 +0300
+++ b/package_definition.xml	Wed Oct 13 16:17:27 2010 +0300
@@ -27,9 +27,6 @@
       <component id="punycodeconv" name="Punycode Converter" introduced="^3" purpose="mandatory">
         <unit bldFile="tcpiputils/punycodeconv/group" mrp="tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
       </component>
-      <component id="tun" name="Tun Hook" introduced="^3" purpose="mandatory">
-        <unit bldFile="tcpiputils/tun/group" mrp="tcpiputils/tun/group/networking_tun.mrp"/>
-      </component>
     </collection>
     <collection id="linklayercontrol" name="Link Layer Control" level="hw-if">
       <component id="nullagt" name="NULL AGT" introduced="7.0s" purpose="optional" class="plugin">
@@ -44,9 +41,6 @@
       <component id="networkinterfacemgr" name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
         <unit version="2" bldFile="linklayercontrol/networkinterfacemgr/group" mrp="linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp"/>
       </component>
-      <component id="tundriveragt" name="Tun Driver Agent" introduced="^3" purpose="mandatory" class="plugin">
-        <unit bldFile="linklayercontrol/tundriveragt/group" mrp="linklayercontrol/tundriveragt/group/networking_tundriveragt.mrp"/>
-      </component>
     </collection>
     <collection id="linklayerprotocols" name="Link Layer Protocols" level="hw-if">
       <component id="ethernetnif" name="Ethernet NIF" purpose="optional" class="plugin">
@@ -67,9 +61,6 @@
       <component id="tunnelnif" name="Tunnel NIF" introduced="7.0s" purpose="optional" class="plugin">
         <unit bldFile="linklayerprotocols/tunnelnif/group" mrp="linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
       </component>
-      <component id="tundriver" name="Tun Driver" introduced="^3" purpose="mandatory" class="plugin">
-        <unit bldFile="linklayerprotocols/tundriver/group" mrp="linklayerprotocols/tundriver/group/networking_tundriver.mrp"/>
-      </component>
     </collection>
     <collection id="linklayerutils" name="Link Layer Utilities" level="hw-if">
       <component id="packetlogger" name="Packet Logger" introduced="8.1" purpose="development">
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dhcp/group/DHCPServ.iby
--- a/tcpiputils/dhcp/group/DHCPServ.iby	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dhcp/group/DHCPServ.iby	Wed Oct 13 16:17:27 2010 +0300
@@ -31,7 +31,6 @@
 #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
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dhcp/group/DHCPServ.mmp
--- a/tcpiputils/dhcp/group/DHCPServ.mmp	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dhcp/group/DHCPServ.mmp	Wed Oct 13 16:17:27 2010 +0300
@@ -78,4 +78,3 @@
 CAPABILITY ProtServ NetworkServices NetworkControl ReadDeviceData WriteDeviceData
 
 SMPSAFE
-
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dhcp/group/bld.inf
--- a/tcpiputils/dhcp/group/bld.inf	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dhcp/group/bld.inf	Wed Oct 13 16:17:27 2010 +0300
@@ -30,15 +30,6 @@
 ../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
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dhcp/group/dhcp.ini
--- a/tcpiputils/dhcp/group/dhcp.ini	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-// 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,
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dhcp/include/DHCPIP4Msg.h
--- a/tcpiputils/dhcp/include/DHCPIP4Msg.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dhcp/include/DHCPIP4Msg.h	Wed Oct 13 16:17:27 2010 +0300
@@ -114,7 +114,6 @@
 	EDHCPClientID = 61,
    	EDHCPDNSUpdate = 81,
    	EDHCPAuthentication = 90,
-	EDHCPDomainSearch = 119,
 	EDHCPSIPServers = 120,
 #ifdef SYMBIAN_NETWORKING_DHCP_MSG_HEADERS
 	EDHCPOptionOverload = 52,
@@ -252,8 +251,6 @@
 #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)
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dhcp/include/DHCPIP4StateMachine.h
--- a/tcpiputils/dhcp/include/DHCPIP4StateMachine.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dhcp/include/DHCPIP4StateMachine.h	Wed Oct 13 16:17:27 2010 +0300
@@ -190,9 +190,6 @@
 	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
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dhcp/include/DHCPStateMachine.h
--- a/tcpiputils/dhcp/include/DHCPStateMachine.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dhcp/include/DHCPStateMachine.h	Wed Oct 13 16:17:27 2010 +0300
@@ -24,7 +24,6 @@
 
 #include <e32base.h>
 #include <comms-infras/statemachine.h>
-#include <es_ini.h>
 
 #include "MsgSender.h"
 #include "DHCP_Std.h"
@@ -197,7 +196,7 @@
    virtual void AssembleClientIDsL() = 0;
    void FetchHWAddress();
 
-   void ConfigureInterfaceL( const TSoInetInterfaceInfoExtnDnsSuffix& aInterfaceInfo );
+   void ConfigureInterfaceL( const TSoInet6InterfaceInfo& aInterfaceInfo );
    virtual void PrepareToSendL(CDHCPStateMachine::EAddressType aEAddressType) = 0;
 #ifdef SYMBIAN_NETWORKING_DHCPSERVER   
    	virtual void PrepareToSendServerMsgL(CDHCPStateMachine::EAddressType aEAddressType) = 0;
@@ -275,7 +274,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
@@ -300,15 +299,7 @@
 public:	
 	TBool iDhcpInformAckPending;
 	RBuf8 iSavedExtraParameters;
-#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
+#endif //SYMBIAN_NETWORKING_DHCP_MSG_HEADERS	
 	};
 	
 #ifdef SYMBIAN_NETWORKING_DHCPSERVER
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dhcp/include/DHCP_Std.h
--- a/tcpiputils/dhcp/include/DHCP_Std.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dhcp/include/DHCP_Std.h	Wed Oct 13 16:17:27 2010 +0300
@@ -40,9 +40,6 @@
 
 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
@@ -162,9 +159,7 @@
 //    specific numbers must have KConnWriteUserDataBit/KConnReadUserDataBit set as appropriate
 const TUint KDhcpInterfaceDbgIoctl    = 0x2000;
 
-_LIT(KDhcpExtraOptions, "ExtraDhcpOptions");
-_LIT(KDhcpSection, "DHCP");
-const TInt KOpCodeOutOfBounds = 0x100;
+
 
 
 
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dhcp/src/DHCPControl.cpp
--- a/tcpiputils/dhcp/src/DHCPControl.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dhcp/src/DHCPControl.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -94,10 +94,10 @@
 	//forced to do this horrible stuff
 	RSocket socket;
 	User::LeaveIfError(socket.Open(iEsock, KAfInet, KSockDatagram, KProtocolInetUdp,iConnection));
-	CleanupClosePushL( socket );
 	// make socket invisible for interface counting
 	User::LeaveIfError(socket.SetOpt(KSoKeepInterfaceUp, KSolInetIp, 0));
 	
+	CleanupClosePushL( socket );
 	TPckgBuf<TSoInet6InterfaceInfo> info;
 	while ( err == KErrNotFound && iConnection.Control(KCOLProvider, KConnGetInterfaceName, name) == KErrNone )
 		{
@@ -164,10 +164,13 @@
   *   If complete is performed, true is returned
   */
 	{
+	__CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPControl[%08x]::CompleteClientMessage  Error %d. FunctionCancel %d"),this,aError,aFunctionToCancel));
+
 	if (iMessage &&
 		 !iMessage->IsNull() &&
 		  ( aFunctionToCancel == -1 || aFunctionToCancel == iMessage->Function() || EConfigDaemonDeregister == iMessage->Function() ) )
 		{
+		__CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPControl[%08x]::CompleteClientMessage iMessage->Complete with Function %d"),this,iMessage->Function()));
 		iMessage->Complete(aError);
 		iMessage = NULL;
 		return ETrue;
@@ -180,7 +183,7 @@
 void CDHCPControl::BindingFinishedL()
    {
    //cancel any pending timer
-	__CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPControl::BindingFinishedL")));
+	__CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPControl[%08x]::BindingFinishedL"),this));
 	iTimer->Cancel();
 	UpdateDns(iDhcpStateMachine->iHostName, iDhcpStateMachine->iDomainName);
 	iDhcpStateMachine->iStartedAquisitionAt.HomeTime(); //remember acquisition time
@@ -205,15 +208,17 @@
  
 void CDHCPControl::ServiceAnyOutstandingIoctlL()
 	{
+    __CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPControl[%08x]::ServiceAnyOutstandingIoctlL "),this));
 	if(iMessage && !iMessage->IsNull() && (iMessage->Function() == EConfigDaemonIoctl || iMessage->Function() == EConfigDaemonDeregister))
 		{
 		TInt err = KErrNone;
-		
+	    __CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPControl[%08x]::ServiceAnyOutstandingIoctlL, iMessage complete %d, iState =%d"),this,iMessage->Function(), iState ));
 		// Run the request again, this time service it (because iMessage is set).  We need
 		// to check to make sure the IOCTL is not a renew which has caused a reinitialisation
 		// - we don't want to restart the IOCTL!.
 		if( ( ( iState != EInitInProgress ) && ( iState != EInformInProgress ) ) || !iInitStartedByRenew )
 			{
+            __CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPControl[%08x]::ServiceAnyOutstandingIoctlL, iMessage.function = %d, iState= %d"), this, iMessage->Function(), iState));
 			TRAP(err,HandleClientRequestL(*iMessage));
 			}
 		iInitStartedByRenew = EFalse;
@@ -227,6 +232,7 @@
 	{
 	if(iMessage && !iMessage->IsNull() && iMessage->Function() == EConfigDaemonIoctl)
 		{
+        __CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPControl[%08x]::ServiceAnyOutstandingServerIoctlL, iMessage.function = %d"), this, iMessage->Function()));
 		// run the request again, this time service it (because iMessage is set)
 		TRAPD(err,HandleClientRequestL(*iMessage));
 		CompleteServerIoctlMessage(err);
@@ -354,6 +360,7 @@
   * @internalTechnology
   */
 	{
+    __CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPControl[%08x]::HandleClientRequestL,  aMessage.Handle %08x, aMessage.Function %d"), this, aMessage.Handle(), aMessage.Function()));
 	if (aMessage.Function() == EConfigDaemonDeregister)
 		{
 		iDhcpDaemonDeregister = ETrue;
@@ -723,7 +730,7 @@
 	// cancel possibly working message sender & socket activity and delete current states
 	iDhcpStateMachine->Cancel();
 	__CFLOG_VAR((KLogSubSysDHCP, KLogCode, 
-		         _L8("CDHCPControl::TaskCompleteL (%d) with error = %d") ,
+		         _L8("CDHCPControl[%08x]::TaskCompleteL (%d) with error = %d") ,this,
 		         iState, aError));
 	if ( aError == KErrServerTerminated )
 		{
@@ -739,6 +746,8 @@
 		case EInitInProgress:
 			if (KErrTimedOut == aError)
 				{
+			 __CFLOG_VAR((KLogSubSysDHCP, KLogCode, 
+			                 _L8("CDHCPControl[%08x]::TaskCompleteL EInitInProgress"), this));
 				// Listen for Link Local address.
 				// DHCP server is timed out so we unblock our client.
 				if (iDhcpConfigListener && iDhcpConfigListener->HaveLinkLocal())
@@ -841,6 +850,8 @@
 			break;
 
 		case EReleaseInProgress:
+	           __CFLOG_VAR((KLogSubSysDHCP, KLogCode, 
+	                             _L8("CDHCPControl[%08x]::TaskCompleteL  EReleaseInProgress"), this));
 			if (! iDhcpDaemonDeregister)  
 				{
 				iDhcpStateMachine->RemoveConfiguredAddress();
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dhcp/src/DHCPIP4Control.cpp
--- a/tcpiputils/dhcp/src/DHCPIP4Control.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dhcp/src/DHCPIP4Control.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -31,7 +31,7 @@
 #include "DomainNameDecoder.h"
 #include <nifman.h>
 #include <comms-infras/es_config.h>
-#include "NetCfgExtnDhcpMsg.h"
+#include "netcfgextndhcpmsg.h"
 #include <f32file.h>
 #include <comms-infras/metatype.h>
 #include <comms-infras/metadata.h>
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dhcp/src/DHCPIP4Msg.cpp
--- a/tcpiputils/dhcp/src/DHCPIP4Msg.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dhcp/src/DHCPIP4Msg.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -368,22 +368,6 @@
 	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),
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dhcp/src/DHCPIP4StateMachine.cpp
--- a/tcpiputils/dhcp/src/DHCPIP4StateMachine.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dhcp/src/DHCPIP4StateMachine.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -82,13 +82,7 @@
    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);
@@ -482,9 +476,7 @@
 	else
 		{
 #endif // SYMBIAN_NETWORKING_DHCP_MSG_HEADERS
-	// From tb92 and later, including iSavedExtraParameters for FinishL()
-	// as SYMBIAN_NETWORKING_DHCP_MSG_HEADERS is expected to be always ON
-	DhcpMessage()->FinishL(iClientId,&iSavedExtraParameters);
+	DhcpMessage()->FinishL(iClientId);
 #ifdef SYMBIAN_NETWORKING_DHCP_MSG_HEADERS
 		}	
 #endif // SYMBIAN_NETWORKING_DHCP_MSG_HEADERS
@@ -1514,24 +1506,10 @@
 	__CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPIP4StateMachine::ConfigureInterfaceL - KSoNoSourceAddressSelect")));
 	User::LeaveIfError(iSocket.SetOpt(KSoNoSourceAddressSelect, KSolInetIp, 0));
 
-	// Using the new structure derived from TSoInet6InterfaceInfo
-	// to be able to set domain search list for the interface
-	TSoInetInterfaceInfoExtnDnsSuffix interfaceInfo;
+	TSoInet6InterfaceInfo 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());
@@ -1603,24 +1581,8 @@
 	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()
@@ -1913,175 +1875,4 @@
 	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
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dhcp/src/DHCPIP6Control.cpp
--- a/tcpiputils/dhcp/src/DHCPIP6Control.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dhcp/src/DHCPIP6Control.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -29,7 +29,7 @@
 #include "ExpireTimer.h"
 #include "DomainNameDecoder.h"
 #include <comms-infras/es_config.h>
-#include "NetCfgExtnDhcpMsg.h"
+#include "netcfgextndhcpmsg.h"
 #include <nifman.h>
 #include <f32file.h>
 #include <comms-infras/metatype.h>
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dhcp/src/DHCPIP6StateMachine.cpp
--- a/tcpiputils/dhcp/src/DHCPIP6StateMachine.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dhcp/src/DHCPIP6StateMachine.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -931,7 +931,7 @@
 		User::Leave( KErrNotFound );
 		}
 
-	TSoInetInterfaceInfoExtnDnsSuffix interfaceInfo;
+	TSoInet6InterfaceInfo interfaceInfo;
    //fill interfaceInfo current address is iCurrentAddress
 	interfaceInfo.iHwAddr = iHardwareAddr;
 	interfaceInfo.iAddress = iCurrentAddress;
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dhcp/src/DHCPSess.cpp
--- a/tcpiputils/dhcp/src/DHCPSess.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dhcp/src/DHCPSess.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -88,14 +88,17 @@
  * @leave KErrNotSupported or other leave code from ConfigureL, ControL or IoctlL
  */
 	{
-	__CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPSession::ServiceL")));
+	__CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPSession[%08x]::DoServiceL, &aMessage %08x, aMessage.sessionid [%08x],aMessage.Function %d, aMessage.Handle %08x"),this, &aMessage, aMessage.Session(),aMessage.Function(), aMessage.Handle()));
 
 	switch (aMessage.Function())
 		{
 		case EConfigDaemonDeregister:
 		if ( iDHCPIfs.Count())
 			{
-			iDHCPIfs[0]->HandleClientRequestL(aMessage);
+			__CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPSession[%08x]::DoServiceL Count is true"),this));
+			ASSERT(iMessage.IsNull());
+            iMessage = aMessage;
+            iDHCPIfs[0]->HandleClientRequestL(iMessage);
 			}
 		else
 			{
@@ -104,6 +107,7 @@
 		break;
 		case EConfigDaemonConfigure:
 			ASSERT(iMessage.IsNull());
+            __CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPSession[%08x]::DoServiceL ::EConfigDaemonConfigure ConfigureL ; iMessage =%d"), this, iMessage.Function()));               
 			iMessage = aMessage;
 			ConfigureL(iMessage);
 			break;
@@ -117,6 +121,7 @@
 			ControlL(aMessage);
 			break;
       	case EConfigDaemonCancel:
+            __CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPSession[%08x]::ServiceL, Cancel"),this));
 			aMessage.Complete(KErrNone); //must be before the rest to avoid deadlock with ESOCK
 			for (TInt i=0 ; i < iDHCPIfs.Count() ; ++i)
 				{
@@ -169,7 +174,7 @@
  * @leave KErrNotReady, or leave code in HandleClientRequestL
  */
 	{
-	__CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPSession::Ioctl")));
+	__CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPSession[%08x]::Ioctl"),this));
 
 #ifdef __DHCP_HEAP_CHECK_CONTROL
     if(aMessage.Int1() & KDhcpMemDbgIoctl & ~KConnWriteUserDataBit)
@@ -290,7 +295,7 @@
  * startup of object fails.
  */
 	{
-	__CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPSession::Configure")));
+	__CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPSession[%08x]::Configure"),this));
 
 	if (iDHCPIfs.Count())
 		{
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dhcp/src/DHCPStateMachine.cpp
--- a/tcpiputils/dhcp/src/DHCPStateMachine.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dhcp/src/DHCPStateMachine.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -40,7 +40,6 @@
 	{
 	__CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPStateMachine::~CDHCPStateMachine")));
 	Cancel();
-	UnloadConfigurationFile();
 	delete iDhcpMessage;
 	delete iMessageSender;
 	delete iTimer;
@@ -67,7 +66,7 @@
   */
 	{
 	__CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPStateMachine::ConstructL")));
-	LoadConfigurationFile();
+	
 #ifdef _DEBUG
 	// let's set debug properties to something
 	//  so they can be read immediately..
@@ -446,7 +445,7 @@
 		}
 	}
 
-void CDHCPStateMachine::ConfigureInterfaceL( const TSoInetInterfaceInfoExtnDnsSuffix& aInterfaceInfo )
+void CDHCPStateMachine::ConfigureInterfaceL( const TSoInet6InterfaceInfo& aInterfaceInfo )
 /**
   * Set the interface IP address and other params
   * into the TCP/IP6 stack.
@@ -466,7 +465,7 @@
   */
 	{
 	
-	TPckgBuf<TSoInetInterfaceInfoExtnDnsSuffix> configInfo(aInterfaceInfo);
+	TPckgBuf<TSoInet6InterfaceInfo> configInfo(aInterfaceInfo);
 	
 
 	__CFLOG_VAR((KLogSubSysDHCP, KLogCode, _L8("CDHCPStateMachine::ConfigureInterfaceL - KSoInetConfigInterface")));
@@ -713,77 +712,7 @@
 	}
 
 
-/** 
-  * @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)
 /**
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dhcp/te_dhcp/src/te_dhcpTestStep1.cpp
--- a/tcpiputils/dhcp/te_dhcp/src/te_dhcpTestStep1.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dhcp/te_dhcp/src/te_dhcpTestStep1.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -27,7 +27,7 @@
 #include <comms-infras/es_config.h>
 #include "../../include/DHCP_Std.h"
 #include <comms-infras/startprocess.h>
-#include "Te_TestDaemonClient.h"
+#include "te_TestDaemonClient.h"
 #include "DHCPStatesDebug.h"
 
 TVerdict CDhcpTestStep1_1::doTestStepL()
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dhcp/te_unittest/dhcpservtest.cpp
--- a/tcpiputils/dhcp/te_unittest/dhcpservtest.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dhcp/te_unittest/dhcpservtest.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -28,7 +28,7 @@
 #include "es_enum.h" 
 #include <nifman.h>
 #include <naptinterface.h>
-#include "DHCPStatesDebug.h"
+#include "dhcpstatesdebug.h"
 
 /**
  * MAC address length
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dhcp/te_unittest/dhcpservtest.mmp
--- a/tcpiputils/dhcp/te_unittest/dhcpservtest.mmp	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dhcp/te_unittest/dhcpservtest.mmp	Wed Oct 13 16:17:27 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
 
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/Test/Group/BLD.INF
--- a/tcpiputils/dnd/Test/Group/BLD.INF	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dnd/Test/Group/BLD.INF	Wed Oct 13 16:17:27 2010 +0300
@@ -15,5 +15,4 @@
 
 
 #include"../TE_LLMNR/group/BLD.INF"
-#include"../te_dndunittest/group/bld.inf"
-#include "../te_dnssuffix/group/bld.inf"
+#include"../te_dndunittest/group/BLD.INF"
\ No newline at end of file
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/Test/te_dndunittest/group/te_dndunittest.mmp
--- a/tcpiputils/dnd/Test/te_dndunittest/group/te_dndunittest.mmp	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dnd/Test/te_dndunittest/group/te_dndunittest.mmp	Wed Oct 13 16:17:27 2010 +0300
@@ -15,7 +15,7 @@
 // 
 //
 
-TARGET		  te_dndserver.exe
+TARGET		  te_dndServer.exe
 TARGETTYPE	  exe
 UID		  0 0xED4DC1CD
 
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/Test/te_dnssuffix/configs/te_dnssuffix.ini
Binary file tcpiputils/dnd/Test/te_dnssuffix/configs/te_dnssuffix.ini has changed
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/Test/te_dnssuffix/configs/te_dnssuffixced.xml
--- a/tcpiputils/dnd/Test/te_dnssuffix/configs/te_dnssuffixced.xml	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
- All rights reserved.
- This component and the accompanying materials are made available
- under the terms of 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>
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/Test/te_dnssuffix/configs/te_dnssuffixced_basic.xml
--- a/tcpiputils/dnd/Test/te_dnssuffix/configs/te_dnssuffixced_basic.xml	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
- All rights reserved.
- This component and the accompanying materials are made available
- under the terms of "Eclipse Public License v1.0"
- which accompanies this distribution, and is available
- at the URL "http://www.eclipse.org/legal/epl-v10.html".
-
- Initial Contributors:
- Nokia Corporation - initial contribution.
-
- Contributors:
-
- Description:
- CommDB Settings File
- All Rights Reserved
-
--->
-
-
-
-<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:xlink="http://www.w3.org/1999/xlink"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
-
-<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>
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/Test/te_dnssuffix/configs/te_dnssuffixcedv2.xml
--- a/tcpiputils/dnd/Test/te_dnssuffix/configs/te_dnssuffixcedv2.xml	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
- All rights reserved.
- This component and the accompanying materials are made available
- under the terms of 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>
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/Test/te_dnssuffix/group/bld.inf
--- a/tcpiputils/dnd/Test/te_dnssuffix/group/bld.inf	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-// 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
-
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/Test/te_dnssuffix/group/te_dnssuffix.iby
--- a/tcpiputils/dnd/Test/te_dnssuffix/group/te_dnssuffix.iby	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-// 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__
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/Test/te_dnssuffix/group/te_dnssuffix.mmp
--- a/tcpiputils/dnd/Test/te_dnssuffix/group/te_dnssuffix.mmp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-// 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
-
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/Test/te_dnssuffix/inc/CallBackHandler.h
--- a/tcpiputils/dnd/Test/te_dnssuffix/inc/CallBackHandler.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-/*
- * 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_ */
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/Test/te_dnssuffix/inc/DNSSuffixHostResolver.h
--- a/tcpiputils/dnd/Test/te_dnssuffix/inc/DNSSuffixHostResolver.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// 
- 
-
-#ifndef 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
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/Test/te_dnssuffix/inc/te_dnssuffixtestblock.h
--- a/tcpiputils/dnd/Test/te_dnssuffix/inc/te_dnssuffixtestblock.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-
-/**
- @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__
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/Test/te_dnssuffix/inc/te_dnssuffixtestserver.h
--- a/tcpiputils/dnd/Test/te_dnssuffix/inc/te_dnssuffixtestserver.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-
-/**
- @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__
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/Test/te_dnssuffix/inc/te_dnssuffixtestwrapper.h
--- a/tcpiputils/dnd/Test/te_dnssuffix/inc/te_dnssuffixtestwrapper.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-// 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__
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/Test/te_dnssuffix/scripts/te_dnssuffixsuite.script
--- a/tcpiputils/dnd/Test/te_dnssuffix/scripts/te_dnssuffixsuite.script	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,341 +0,0 @@
-//
-// 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
-
-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
-
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/Test/te_dnssuffix/src/DNSSuffixHostResolver.cpp
--- a/tcpiputils/dnd/Test/te_dnssuffix/src/DNSSuffixHostResolver.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// 
- 
-
-#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
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/Test/te_dnssuffix/src/te_dnssuffixtestblock.cpp
--- a/tcpiputils/dnd/Test/te_dnssuffix/src/te_dnssuffixtestblock.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// 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;
-	}
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/Test/te_dnssuffix/src/te_dnssuffixtestserver.cpp
--- a/tcpiputils/dnd/Test/te_dnssuffix/src/te_dnssuffixtestserver.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-// 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;
-    }
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/Test/te_dnssuffix/src/te_dnssuffixtestwrapper.cpp
--- a/tcpiputils/dnd/Test/te_dnssuffix/src/te_dnssuffixtestwrapper.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2583 +0,0 @@
-// 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
-
-// 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);        
-        
-    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);        
-            
-    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"));
-   
-    if (vTunConn.SubSessionHandle())
-        vTunConn.Close();
-
-    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;
-        }
-    
-    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 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);
-    
-    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);        
-    
-    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(); 
-        
-    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();    
-        }
-    
-    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
-     */
-    
-    TFileName vTunInterface;
-    TInt 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);
-        }
-    
-    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,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);  
-
-    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
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/data/resolver.ini
--- a/tcpiputils/dnd/data/resolver.ini	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dnd/data/resolver.ini	Wed Oct 13 16:17:27 2010 +0300
@@ -17,7 +17,6 @@
 hostname= localhost
 
 [resolver]
-enablesuffixsupport= 1
 retries= 3
 mintime= 1
 maxtime= 30
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/group/bld.inf
--- a/tcpiputils/dnd/group/bld.inf	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dnd/group/bld.inf	Wed Oct 13 16:17:27 2010 +0300
@@ -65,5 +65,3 @@
 // or "support" is specified.
 
 // dndapp.mmp
-
-#include "../Test/Group/BLD.INF"
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/inc/dnd_ini.h
--- a/tcpiputils/dnd/inc/dnd_ini.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dnd/inc/dnd_ini.h	Wed Oct 13 16:17:27 2010 +0300
@@ -112,6 +112,4 @@
 _LIT(KLlmnrIni_Ipv4Addr, "224.0.0.251");
 _LIT(KLlmnrIni_Ipv6Addr, "ff02::fb");
 #endif
-_LIT(DND_INI_SUFFIXSUPPORT, "enablesuffixsupport"); //< enabler for new suffix support
-
 #endif
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/inc/dns.h
--- a/tcpiputils/dnd/inc/dns.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dnd/inc/dns.h	Wed Oct 13 16:17:27 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, TBool aSuffixSupportEnabled);
+	virtual TInt NewQuery(const TDnsMessage &aQuery, TDnsServerScope aServerScope, TUint32 aFlags);
 	virtual void CancelQuery();
 	virtual TInt DoQueryL(const TTime &aRequestTime, const EDnsQType aQType);
 	virtual TInt DoNext(TDnsMessageBuf &aReply, TInt aNext) const;
@@ -118,14 +118,7 @@
 	// "Owner" source
 	CDndDnsclient *iOwner;	//< Actual owner of the request data
 
-	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
+	TUint iNetworkId;      //< NetworkId from the request message.	
 	};
 
 class TInetAddressInfo;
@@ -158,12 +151,14 @@
 	void Query(const TMsgBuf &/*aBuf*/, const TInetAddr &/*aServer*/, const RSocket &/*aSocket*/) {}
 	// Received an error indication for a server
 	void Error(const TInetAddr &aServer, TInt aError);
-	inline void ActivateSocketL(TUint aNetworkId = 0) { CDnsSocket::ActivateSocketL(aNetworkId); } // lint placebo
+	inline CDnsSocketWriter * ActivateSocketL(TUint aNetworkId = 0) { return (CDnsSocket::ActivateSocketL(aNetworkId));  } // lint placebo
 
 	CDndEngine &iControl;					//< The DND Engine
 	MDnsServerManager &iServerManager;		//< The server manager
 	TDndReqData	iDndReqData[KDndNumRequests];	//< Requests being served
-	TUint iActivityCount;			//< Count of activity, shut DNS sockets when ZERO.
+	//TUint iActivityCount;			//< Count of activity, shut DNS sockets when ZERO.
+	TUint iSessionCount;
+	TUint iQueryCount;
 	CDndCache *iCache;				//< The Cache
 	THostNames iHostNames;			//< The current hostnames
 	};
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/inc/dns_sock.h
--- a/tcpiputils/dnd/inc/dns_sock.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dnd/inc/dns_sock.h	Wed Oct 13 16:17:27 2010 +0300
@@ -60,7 +60,7 @@
  	handle when the EXPLICIT_SOCKET_BINDING option and NON_SEAMLESS_
 	BEARER mobility is enabled.
 	*/
-	void ActivateSocketL(TUint aNetworkId=0);
+	CDnsSocketWriter * ActivateSocketL(TUint aNetworkId=0);
 
 	/**
 	Open and activate the UDP socket for DNS traffic (unless already done).
@@ -87,7 +87,7 @@
 	@param aRequest to be queued
 	@param aId of the request, if >= 0. If < 0, then a new random ID is generated
 	*/
-	void Queue(TDnsRequest &aRequest, const TInt aId = -1);
+	void Queue(TDnsRequest &aRequest, CDnsSocketWriter * aWriter, const TInt aId = -1);
 	/**
 	(Re)Queue the request for processing.
 	
@@ -99,7 +99,7 @@
 		@li KErrNone, if queued successfully,
 		@li KErrNotFound, if the socket does not exist (not queued)
 	*/
-	TInt Queue(TDnsRequest &aRequest, const RSocket &aSocket, const TInt aId = -1);
+	TInt Queue(TDnsRequest &aRequest, const RSocket &aSocket, CDnsSocketWriter * aWriter, const TInt aId = -1);
 	/**
 	(Re)Queue the request for processing using connected socket (TCP)
 	
@@ -110,20 +110,16 @@
 	
 	@return KErrNone, if queued successfully, or error code if failed.
 	*/
-	TInt Queue(TDnsRequest &aRequest, const TInetAddr &aServer, const TInt aId = -1, const TInt aTTL = -1);
+	TInt Queue(TDnsRequest &aRequest, const TInetAddr &aServer, CDnsSocketWriter * aWriter, const TInt aId = -1, const TInt aTTL = -1);
 	/**
 	Reque the request for a resend with same ID (if was queued).
 	
 	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, TBool aRetryWithSuffix = EFalse);
+	void ReSend(TDnsRequest &aRequest, CDnsSocketWriter * aWriter);
 
 	/**
 	Received a Query or unmatched Reply packet
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/inc/engine.h
--- a/tcpiputils/dnd/inc/engine.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dnd/inc/engine.h	Wed Oct 13 16:17:27 2010 +0300
@@ -59,7 +59,6 @@
 	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;
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/inc/listener.h
--- a/tcpiputils/dnd/inc/listener.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dnd/inc/listener.h	Wed Oct 13 16:17:27 2010 +0300
@@ -414,14 +414,12 @@
 	//	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, TBool aSuffixSupportEnabled) = 0;
+	virtual TInt NewQuery(const TDnsMessage &aQuery, TDnsServerScope aServerScope, TUint32 aFlags) = 0;
 	/**
 	// Cancel query activity
 	//
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/inc/servers.h
--- a/tcpiputils/dnd/inc/servers.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dnd/inc/servers.h	Wed Oct 13 16:17:27 2010 +0300
@@ -59,7 +59,6 @@
 	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
@@ -174,19 +173,6 @@
 	// @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;
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/src/dns.cpp
--- a/tcpiputils/dnd/src/dns.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dnd/src/dns.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -285,19 +285,7 @@
 	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);
@@ -338,7 +326,7 @@
 				{
 				if (PickDefaultServer())
 					{
-					iOwner->ReSend(*this);
+					iOwner->ReSend(*this, NULL);
 					aResult = KDnsNotify_HAVE_SERVERLIST;
 					}
 				else
@@ -374,7 +362,11 @@
 	TDndReqData &rq = iDndReqData[i];
 	rq.iCallback = aCallback;
 	rq.iOwner = this;
-	iActivityCount++;	// Count each open session as "activity".
+	
+	iSessionCount++;   // Count each open session as "activity".*/
+    #ifdef _LOG
+	Log::Printf(_L("\t\tDNS session [%u] CDndDnsclient::OpenSession Session count is  %d"), (TInt)this,iSessionCount);
+	#endif
 	return &rq;
 	}
 
@@ -415,14 +407,27 @@
 	iOwner->iServerManager.CloseList(iFilter);
 	// If this was the last active session, then
 	// cancel all requests 
-	ASSERT(iOwner->iActivityCount > 0);
-	if (--iOwner->iActivityCount == 0)
-		iOwner->DeactivateSocket();
+	// Also deactivate sockets based on session, e.f query is ongoing and session comes to an end
+    ASSERT(iOwner->iSessionCount > 0);
+    if(iOwner->iSessionCount > 0)
+        {
+        if (--iOwner->iSessionCount == 0)
+            {
+            LOG(Log::Printf(_L("TDndReqData::Close - session count zero deactivating socket = %d, "), iOwner->iSessionCount));
+            iOwner->DeactivateSocket();
+            }
+        }
+    else
+        {
+        // For safety and cleaning purpose
+        iOwner->DeactivateSocket();
+        }
+    LOG(Log::Printf(_L("TDndReqData::Close - current session count = %d"), iOwner->iSessionCount));
 	}
 
 // TDndReqData::NewQuery
 // ***********************
-TInt TDndReqData::NewQuery(const TDnsMessage &aQuery, TDnsServerScope aServerScope, TUint32 aFlags, TBool aSuffixSupportEnabled)
+TInt TDndReqData::NewQuery(const TDnsMessage &aQuery, TDnsServerScope aServerScope, TUint32 aFlags)
 	{
 	iIsReqPending = FALSE;
 	iIsNewQuery = TRUE;
@@ -431,14 +436,7 @@
 	iFlags = aFlags;
 	iFilter.iServerScope = aServerScope;
 	iFilter.iServerId = 0;
-	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);
+	iNetworkId = aQuery.iId;  // Get the networkId information from the Query.
 
 #ifdef SYMBIAN_DNS_PUNYCODE
 	if( (aQuery.iScope & 0x80) == 0x80 )
@@ -462,28 +460,16 @@
 
 			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(queryName);
+				TInt err = iQuestion.SetName(query.iName);
 				if( err != KErrNone)
 					{
 					return err;
 					}
-				iActualQueryName.Copy(queryName);
 #else
-				iQuestion.SetName(queryName);
-				iActualQueryName.Copy(queryName);
+				iQuestion.SetName(query.iName);
 #endif // SYMBIAN_DNS_PUNYCODE
 				}
 			else
@@ -687,10 +673,6 @@
 	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)
 		{
@@ -722,22 +704,7 @@
 		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(
@@ -783,7 +750,7 @@
 		}
 
 	// Automatic restart of DNS socket, if closed for some reason
-	iOwner->ActivateSocketL(iNetworkId);  // pass on the networkId information
+	CDnsSocketWriter *writerInstance = iOwner->ActivateSocketL(iNetworkId);  // pass on the networkId information
 
 	iIsReqPending = TRUE;
 	// If the query is probe, do not AssignWork but continue..
@@ -833,13 +800,13 @@
 
 		// For link local multicast, use TTL = 1 (otherwise, system default is used)
 		const TInt ttl = iFilter.iServerScope == EDnsServerScope_MC_LOCAL ? 1 : -1;
-		if (iOwner->Queue(*this, server, -1, ttl) != KErrNone)
+		if (iOwner->Queue(*this, server, writerInstance, -1, ttl) != KErrNone)
 			break;
 		iIsUsingTCP = 1;
 		SendResponse(KDnsNotify_USING_TCP);
 		return 1;
 		}
-	iOwner->ReSend(*this);		// (uses old ID, if request queued already)
+	iOwner->ReSend(*this, writerInstance);		// (uses old ID, if request queued already)
 	return 1;
 	}
 
@@ -941,15 +908,30 @@
 
 void CDndDnsclient::QueryBegin()
 	{
-	++iActivityCount;
+    // Query is going on
+    iQueryCount++;
+    LOG(Log::Printf(_L("CDndDnsclient::QueryBegin current query count  = %d"), iQueryCount));
 	}
 
 
 void CDndDnsclient::QueryEnd()
 	{
-	ASSERT(iActivityCount > 0);
-	if (--iActivityCount == 0)
-		DeactivateSocket();
+    // if query has ended deactivate the associated sockets.
+    ASSERT(iQueryCount > 0);
+    if(iQueryCount > 0)
+        {
+        if (--iQueryCount == 0 )
+            {
+            LOG(Log::Printf(_L("CDndDnsclient::QueryEnd query count zero deactivating socket = %d"), iQueryCount));
+            DeactivateSocket();
+            }
+        }
+    else
+        {
+        // Call deactivate socket for safety purpose to release the sockets, no effect if already done
+        DeactivateSocket();
+        }
+    LOG(Log::Printf(_L("CDndDnsclient::QueryEnd current query count  = %d"), iQueryCount));
 	}
 
 
@@ -985,7 +967,8 @@
 			return KErrDndFormat;
 		case EDnsRcode_SERVER_FAILURE:
 			/*
-			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 ???-- 
+			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:
@@ -1117,90 +1100,6 @@
 		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())
@@ -1302,7 +1201,7 @@
 		ASSERT(aServer.IsUnicast());	// Should always be true.
 		if (aServer.IsUnicast())
 			{
-			if (iOwner->Queue(*this, aServer, hdr.ID()) == KErrNone)
+			if (iOwner->Queue(*this, aServer, NULL, hdr.ID()) == KErrNone)
 				{
 				iIsUsingTCP = 1;
 				SendResponse(KDnsNotify_USING_TCP);
@@ -1312,17 +1211,6 @@
 		// 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,
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/src/dns_sock.cpp
--- a/tcpiputils/dnd/src/dns_sock.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dnd/src/dns_sock.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -115,7 +115,7 @@
 	// Process socket errors
 	TInt HandleError(TInt aReason, const TInetAddr *aServer = NULL);
 	// Close and deactivate the UDP socket for DNS traffic
-	void DeactivateSocket(TInt aReason); 
+	TBool DeactivateSocket(TInt aReason); 
 	// Handle receive compeleted, keep receiver active
 	void RunReader(const TMsgBuf &aMsg, const TInetAddr &aFrom);
 	// Handle send completed, keep sender active (if work to do)
@@ -130,6 +130,13 @@
 	inline void ResetErrorCount() { iErrorCount = 0;}
 	// A link chain used by the CDnsSocket to keep track of multiple writers
 	CDnsSocketWriter *iNext;
+#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY 
+		RConnection iAttachedConn;	//< The connection on which the DNS socket may be opened on
+#endif	
+
+	// Network ID associated with the writer;
+	TInt   iNetworkIdofWriter;
+	inline void SetDeferredDelete() { iDeferredDelete = ETrue; }
 	
 private:
 	void RunL();
@@ -140,9 +147,7 @@
 
 	CDnsSocket &iMaster;		//< The connection to the CDnsSocket owning this
 	RSocket iSocket;			//< The DNS socket
-#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY 
-	RConnection iAttachedConn;	//< The connection on which the DNS socket may be opened on
-#endif		
+	
 	TUint iDeactivateCount;		//< Count number of deactivations (needed in reply processing)
 	TUint iErrorCount;			//< Count number of consecutive errors in RunL (read and write)
 	TUint iListen;				//< = 1, if socket is listening TCP socket, waiting on accept.
@@ -159,6 +164,7 @@
 	TRequestQueue iWaitQueue;	//< Requests waiting for a reply
 	TDnsRequest *iSending;		//< The request currently being sent, if non-NULL
 	CDnsSocketReader *iReader;	//< The reader object
+	TBool iDeferredDelete;
 	};
 
 void TDnsRequest::Cancel()
@@ -193,9 +199,10 @@
 	TPtr8 iBuf;				//< The current receive buffer
 	};
 
-CDnsSocketWriter::CDnsSocketWriter(CDnsSocket &aMaster) : CActive(0), iMaster(aMaster)
+CDnsSocketWriter::CDnsSocketWriter(CDnsSocket &aMaster) : CActive(0), iMaster(aMaster), iDeferredDelete(EFalse)
 	{
 	LOG(Log::Printf(_L("CDnsSocketWriter[%u]::CDnsSocketWriter([%u])"), this, &aMaster));
+	iNetworkIdofWriter = -1;
 	CActiveScheduler::Add(this);
 
 	TTime seed;
@@ -337,6 +344,12 @@
 					rq->iQueueLink.SetWriter(NULL);
 					rq->Abort(iMaster, KErrCancel);
 					}
+        if (iDeferredDelete)
+          {
+          LOG(Log::Printf(_L("CDnsSocketWriter[%u]::RunReader() deleting itself due to deferred delete"), this));
+          delete this;
+          return;
+          }
 				}
 			}
 		else
@@ -558,13 +571,13 @@
 	return (mark != iDeactivateCount);
 	}
 
-void CDnsSocketWriter::DeactivateSocket(TInt aReason)
+TBool CDnsSocketWriter::DeactivateSocket(TInt aReason)
 	{
 	LOG(Log::Printf(_L("CDnsSocketWriter[%u]::DeactivateSocket() Entry"), this));
 	if (!iOpened )
 	    {
 	    LOG(Log::Printf(_L("CDnsSocketWriter[%u]::DeactivateSocket() return without action"), this));
-		return;			// Nothing to do if not open
+		return ETrue;			// Nothing to do if not open
 	    }
 	// Grab current set of requests away, so that
 	// potentially newly entered requests won't
@@ -603,7 +616,13 @@
 		rq->iQueueLink.SetWriter(0);
 		rq->Abort(iMaster, aReason);
 		}
-	LOG(Log::Printf(_L("CDnsSocketWriter[%u]::DeactivateSocket() complete"), this));
+    if (iRunReader)
+	  {
+      LOG(Log::Printf(_L("CDnsSocketWriter[%u]::DeactivateSocket() complete and defer delete"), this));
+      return EFalse;
+	  }
+    LOG(Log::Printf(_L("CDnsSocketWriter[%u]::DeactivateSocket() complete and allow delete"), this));
+    return ETrue;
 	}
 
 //
@@ -810,7 +829,8 @@
 
             LOG(Log::Printf(_L("CDnsSocketWriter[%u]::CanUseConnection() currentInfo.NetId = %d "), this, currentInfo.iNetId));
             LOG(Log::Printf(_L("CDnsSocketWriter[%u]::CanUseConnection() iMaster.iNetworkId = %d "), this, iMaster.iNetworkId));
-            if(currentInfo.iNetId == iMaster.iNetworkId)
+            //if(currentInfo.iNetId == iMaster.iNetworkId)
+            if(currentInfo.iNetId == this->iNetworkIdofWriter)
                 {
                 foundConnection = ETrue;
                 break;
@@ -932,7 +952,7 @@
 		iWriter.ResetErrorCount();
 		iWriter.RunReader(TMsgBuf::Cast(iBuf), iFrom);
 		}
-	LOG(Log::Printf(_L("<-- CDnsSocketReader[%u]::RunL() -exit- iStatus=%d"), this, iStatus.Int()));
+	LOG(Log::Printf(_L("<-- CDnsSocketReader[%u]::RunL() -exit-"), this));
 	}
 
 void CDnsSocketReader::DoCancel()
@@ -983,26 +1003,91 @@
 //
 // Leaves, if socket cannot be activated
 */
-void CDnsSocket::ActivateSocketL(TUint aNetworkId)
+CDnsSocketWriter * CDnsSocket::ActivateSocketL(TUint aNetworkId)
 	{
 	LOG(Log::Printf(_L("CDnsSocket[%u]::ActivateSocketL([NetId = %d])"), this, aNetworkId));
-
-	if (iConnected && IsOpened())
-		{
-	   LOG(Log::Printf(_L("CDnsSocket[%u]::ActivateSocketL([NetId = %d]) return without action"), this, aNetworkId));
- 	    return;        // Already connected, nothing to do
- 	    }
-
-	User::LeaveIfError(iSS.Connect());
-	iConnected = 1;
-	iNetworkId = aNetworkId;
-
-	const TInt ret = iWriter->ActivateSocket();
-	if (ret != KErrNone)
-		{
-		DeactivateSocket(ret);
-		User::Leave(ret);
-		}
+    if(!iConnected)
+        {
+        LOG(Log::Printf(_L("CDnsSocket::ActivateSocketL([NetId = %d]) connecting socket server"),aNetworkId));
+        User::LeaveIfError(iSS.Connect());
+        iConnected = 1;
+        }
+    // use default in case of default network ID
+    if(aNetworkId == 0)
+        {
+        LOG(Log::Printf(_L("CDnsSocket::ActivateSocketL([NetId = %d]) using default writer"),aNetworkId));
+        if(iWriter->IsOpened())
+            {
+            return iWriter;
+            }
+        else
+            {
+            const TInt ret = iWriter->ActivateSocket();
+            if(ret != KErrNone)
+                {
+                DeactivateSocket(ret);
+                User::Leave(ret);
+                }
+            else
+                {
+                return iWriter;
+                }
+            }
+        
+        }
+    else
+        {
+        LOG(Log::Printf(_L("CDnsSocket::ActivateSocketL([NetId = %d]) Looking for"),aNetworkId));
+        // Find the appropriate writer for the network Id
+        CDnsSocketWriter *loopWriter = iWriter;
+        while (1)
+            {
+            if(loopWriter->iNetworkIdofWriter == aNetworkId)
+                {
+                LOG(Log::Printf(_L("CDnsSocket::ActivateSocketL([NetId = %d]) found"),aNetworkId));
+                if(loopWriter->IsOpened())
+                    {
+                    return loopWriter;
+                    }
+                else
+                    {
+                    const TInt ret = loopWriter->ActivateSocket();
+                    if(ret != KErrNone)
+                        {
+                        DeactivateSocket(ret);
+                        User::Leave(ret);
+                        }
+                    else
+                        {
+                        return loopWriter;
+                        }
+                    }
+                }
+            if(loopWriter->iNext == NULL)
+                {
+                break;
+                }
+            else
+                {
+                loopWriter = loopWriter->iNext;	            
+                }
+            }
+        LOG(Log::Printf(_L("CDnsSocket::ActivateSocketL([NetId = %d]) Creating new"),aNetworkId));
+         // create a new writer
+        loopWriter->iNext = CDnsSocketWriter::NewL(*this, -1);
+        loopWriter->iNext->iNetworkIdofWriter = aNetworkId;
+        const TInt ret = loopWriter->iNext->ActivateSocket();
+        if(ret != KErrNone)
+            {
+            DeactivateSocket(ret);
+            User::Leave(ret);
+            }
+        else
+            {
+            return loopWriter->iNext;
+            }
+        }
+	return NULL;
 	}
 
 /**
@@ -1027,6 +1112,7 @@
 	aBind.OutputWithScope(tmp);
 	Log::Printf(_L("CDnsSocket[%u]::ActivateSocketL([%S#%d])"), this, &tmp, aBind.Port());
 #endif
+	LOG(Log::Printf(_L("CDnsSocket::ActivateSocketL with address bind")));
 	iWriter->SetBind(aBind);
 	ActivateSocketL();
 	}
@@ -1106,12 +1192,21 @@
 	iWriter->iNext = NULL;
 
 	iWriter->DeactivateSocket(aReason);
+	LOG(Log::Printf(_L("CDnsSocket::DeactivateSocket Deativatuing other writers")));
 	while (writer)
 		{
 		CDnsSocketWriter *tmp = writer;
 		writer = tmp->iNext;
-		tmp->DeactivateSocket(aReason);
+		LOG(Log::Printf(_L("CDnsSocket::DeactivateSocket calling deactivate socket for writer")));
+		TBool allowedToDelete = tmp->DeactivateSocket(aReason);
+		if (allowedToDelete)
+			{
 		delete tmp;
+			}
+		else
+			{
+			tmp->SetDeferredDelete();
+			}
 		}
 	// Oops... Should not close if re-activated ---FIX!
 	if (iListening)
@@ -1170,17 +1265,27 @@
 //	@li >= 0,
 //		16 bits of this value is used as id.		
 */
-void CDnsSocket::Queue(TDnsRequest &aRequest, const TInt aId)
+void CDnsSocket::Queue(TDnsRequest &aRequest,  CDnsSocketWriter * aWriter, const TInt aId)
 	{
-	iWriter->Queue(aRequest, aId);
+    if(aWriter == NULL)
+        {
+        // use default
+        iWriter->Queue(aRequest, aId);
+        }
+    else
+        {
+        aWriter->Queue(aRequest, aId);
+        }
 	}
 
 
 // Queue a request for sending with a specific socket
 //
-TInt CDnsSocket::Queue(TDnsRequest &aRequest, const RSocket &aSocket, const TInt aId)
+// Though the DNS socket writer instance was passed as part of this function, but not being used as this
+// function matches the socket to find the appropriate writer instance
+TInt CDnsSocket::Queue(TDnsRequest &aRequest, const RSocket &aSocket,  CDnsSocketWriter */* aWriter*/, const TInt aId)
 	{
-	for (CDnsSocketWriter *writer = iWriter; writer != NULL; writer = writer->iNext)
+    for (CDnsSocketWriter *writer = iWriter; writer != NULL; writer = writer->iNext)
 		{
 		if (&aSocket == &writer->Socket())
 			{
@@ -1189,6 +1294,7 @@
 			return KErrNone;
 			}
 		}
+	
 	return KErrNotFound;
 	}
 
@@ -1204,7 +1310,7 @@
 //
 // @return KErrNone, if queued successfully, or error code if failed.
 */
-TInt CDnsSocket::Queue(TDnsRequest &aRequest, const TInetAddr &aServer, const TInt aId,  const TInt aTTL)
+TInt CDnsSocket::Queue(TDnsRequest &aRequest, const TInetAddr &aServer,  CDnsSocketWriter * /*aWriter*/, const TInt aId,  const TInt aTTL)
 	{
 	//
 	// Locate or create connected Socket reader/writer instance
@@ -1248,17 +1354,11 @@
 // 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, TBool aRetryWithSuffix)
+void CDnsSocket::ReSend(TDnsRequest &aRequest, CDnsSocketWriter * aWriter)
 	{
-	Queue(aRequest, (!aRetryWithSuffix && aRequest.IsQueued()) ? aRequest.Id() : -1);
+	Queue(aRequest, aWriter, aRequest.IsQueued() ? aRequest.Id() : -1);
 	}
 
 /**
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/src/engine.cpp
--- a/tcpiputils/dnd/src/engine.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dnd/src/engine.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -146,8 +146,6 @@
 	//
 	// 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);
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/src/llmnrresponder.cpp
--- a/tcpiputils/dnd/src/llmnrresponder.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dnd/src/llmnrresponder.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -524,7 +524,7 @@
 	upd.iDstAddr.SetScope(aEntry.iZone[upd.iDstAddr.Ip6Address().Scope()-1]);
 	upd.iDstAddr.SetPort(iControl.GetConfig().iLlmnrPort);
 	upd.iRepeat = 1 + iControl.GetConfig().iLlmnrRetries;
-	Queue(upd);
+	Queue(upd, NULL);
 	return KErrNone;
 	}
 
@@ -628,7 +628,7 @@
 	resp.iRCode = EDnsRcode_NOERROR;
 	resp.iDstAddr = aServer;
 	resp.iRepeat = 0;
-	Queue(resp, aSocket, hdr.ID());
+	Queue(resp, aSocket, NULL, hdr.ID());
 	}
 
 
@@ -776,7 +776,7 @@
 		if (iRepeat > 0)
 			{
 			LOG(iParent->LogPrint(_L("\tLLMNR Resend query: "), *iLlmnrEntry));
-			iParent->ReSend(*this);
+			iParent->ReSend(*this, NULL);
 			}
 		else
 			{
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/src/resolver.cpp
--- a/tcpiputils/dnd/src/resolver.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dnd/src/resolver.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -328,7 +328,6 @@
 	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
 
@@ -577,6 +576,12 @@
 		StopSource();
 		iBuffer.SetLength(iBuffer().HeaderSize());
 		}
+	// Added
+	if (iQueryActive)
+	    {
+	    iQueryActive = 0;
+	    iDnsclient.QueryEnd();
+	    }
 	LOG(ShowQuery(iBuffer(), 1));
 	iListener.PostReply();	
 	}
@@ -842,7 +847,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, iSuffixSupportEnabled);
+		(void)iProbe.iSession->NewQuery(iCurrentQuery(),iSourceNow,iQueryFlags | KDnsModifier_PQ);
 		
 		// initialize server (which is not tried)
 		(void)iProbe.iSession->PickDefaultServer();
@@ -1112,7 +1117,6 @@
 	ASSERT(iQueryDoneWait == 0);
 	
 	iBuffer = aMsg;
-	iSuffixSupportEnabled = cf.iSuffixSupportEnabled;
 	//
 	// A new command/query from the application
 	//
@@ -1383,7 +1387,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, iResolver->iSuffixSupportEnabled);
+		iStatus = iSession->NewQuery(iResolver->iCurrentQuery(), iResolver->iSourceNow, iResolver->iQueryFlags);
 		if (iStatus == KErrNone)
 			iStatus = KErrEof;	// No content yet.
 #ifdef SYMBIAN_DNS_PUNYCODE
@@ -1630,7 +1634,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, iResolver->iSuffixSupportEnabled);
+		(void)iSession->NewQuery(iResolver->iCurrentQuery(), iResolver->iSourceNow, iResolver->iQueryFlags);
 		SendDnsQuery();
 		return;
 		}
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/dnd/src/servers.cpp
--- a/tcpiputils/dnd/src/servers.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/dnd/src/servers.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -1,3 +1,4 @@
+// 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"
@@ -35,7 +36,6 @@
 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,10 +70,6 @@
 	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)
@@ -97,9 +93,6 @@
 	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);
 	};
 
 
@@ -147,44 +140,18 @@
 	delete iConfiguredList;
 	}
 
-// CDnsServerManager::AddInterfaceEntry
-TInt CDnsServerManager::AddInterfaceEntry(const TSoInetIfQuery &aInfo, RSocket& aSocket)
+// CDnsServerManager::AddInterfaceData
+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];
-    
-    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);
-            }
-        }
+	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;
 	}
 
-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
 // *************************************
 /**
@@ -211,14 +178,13 @@
 		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(), aSocket);
+	return err < 0 ? err : AddInterfaceEntry(opt());
 	}
 
 // CDnsServerManager::FindInterface
@@ -479,32 +445,6 @@
 	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
@@ -741,22 +681,3 @@
 			}
 		}
 	}
-
-/**
-// @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;
-            }
-        }
-    }
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/networkaddressandporttranslation/te_unittest/group/te_naptunittest.mmp
--- a/tcpiputils/networkaddressandporttranslation/te_unittest/group/te_naptunittest.mmp	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/networkaddressandporttranslation/te_unittest/group/te_naptunittest.mmp	Wed Oct 13 16:17:27 2010 +0300
@@ -23,14 +23,14 @@
 TARGET          te_naptunittest.exe
 TARGETTYPE      exe
 
-SOURCEPATH      ../src
+SOURCEPATH      ..\src
 SOURCE		te_naptunittesttestserver.cpp te_naptunittesttestblock.cpp te_naptunittesttestwrapper.cpp
 
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
-USERINCLUDE     ../../inc
-USERINCLUDE	../inc
+USERINCLUDE     ..\..\inc
+USERINCLUDE	..\inc
 
 LIBRARY euser.lib 
 LIBRARY esock.lib 
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/punycodeconv/te_punycodeconverter/group/te_punycodeconverter.mmp
--- a/tcpiputils/punycodeconv/te_punycodeconverter/group/te_punycodeconverter.mmp	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/punycodeconv/te_punycodeconverter/group/te_punycodeconverter.mmp	Wed Oct 13 16:17:27 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 
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/punycodeconv/te_unittest/group/te_unittestidna.mmp
--- a/tcpiputils/punycodeconv/te_unittest/group/te_unittestidna.mmp	Wed Sep 15 13:53:10 2010 +0300
+++ b/tcpiputils/punycodeconv/te_unittest/group/te_unittestidna.mmp	Wed Oct 13 16:17:27 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 
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/tun/bwins/tun.def
--- a/tcpiputils/tun/bwins/tun.def	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	Install @ 1 NONAME
-
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/tun/data/ip.tun.esk
--- a/tcpiputils/tun/data/ip.tun.esk	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-[sockman]
-protocols= tun
-
-[tun]
-filename= tun.prt
-index= 1
-bindto= ip6
\ No newline at end of file
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/tun/eabi/tun.def
--- a/tcpiputils/tun/eabi/tun.def	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-EXPORTS
-	Install @ 1 NONAME
-	_ZTI12CProtocolTun @ 2 NONAME
-	_ZTI12CTunFlowInfo @ 3 NONAME
-	_ZTI18CProtocolFamilyTun @ 4 NONAME
-	_ZTI7CSapTun @ 5 NONAME
-	_ZTV12CProtocolTun @ 6 NONAME
-	_ZTV12CTunFlowInfo @ 7 NONAME
-	_ZTV18CProtocolFamilyTun @ 8 NONAME
-	_ZTV7CSapTun @ 9 NONAME
-
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/tun/group/MON.dat
Binary file tcpiputils/tun/group/MON.dat has changed
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/tun/group/MON.sym
--- a/tcpiputils/tun/group/MON.sym	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,199 +0,0 @@
-CTC++ sym 5.0
-Thu Apr 15 15:39:45 2010
-@T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\src\tunfamily.cpp
-7 1271326185
-0 0 22 0 CProtocolFamilyTun::CProtocolFamilyTun
-0 90 0 0 ( )
-0 91 36 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tunfamily.h
-1 0 27 0 CProtocolFamilyTun::~CProtocolFamilyTun
-0 90 0 0 ( )
-0 91 37 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tunfamily.h
-2 0 31 0 CProtocolFamilyTun::Install
-0 90 0 0 ( )
-0 91 38 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tunfamily.h
-0 13 33 1 KErrNone
-3 0 36 0 CProtocolFamilyTun::Remove
-0 90 0 0 ( )
-0 91 39 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tunfamily.h
-1 13 38 1 KErrNone
-4 0 41 0 CProtocolFamilyTun::ProtocolList
-0 90 0 0 ( TServerProtocolDesc * & aProtocolList )
-0 91 40 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tunfamily.h
-2 13 48 1 1
-5 0 51 0 CProtocolFamilyTun::NewProtocolL
-0 90 0 0 ( TUint , TUint aProtocol )
-0 91 41 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tunfamily.h
-0 20 54 1 aProtocol != KProtocolTUN
-3 13 60 1 instance
-6 0 78 0 Install
-0 90 0 0 ( void )
-0 91 77 0 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\src\tunfamily.cpp
-1 20 81 1 protocol
-4 13 83 2 protocol
-0 1 85 1 else
-5 13 87 2 0
-%89,7,6,2,0,0
-@T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\src\tun.cpp
-7 1271326185
-0 0 31 0 Panic
-0 90 0 0 ( TTunPanic aPanic )
-0 91 35 0 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.pan
-1 0 45 0 CProtocolTun::CProtocolTun
-0 90 0 0 ( )
-0 91 91 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-2 0 49 0 CProtocolTun::~CProtocolTun
-0 90 0 0 ( )
-0 91 101 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-3 0 58 0 CProtocolTun::NewL
-0 90 0 0 ( )
-0 91 96 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-0 13 64 1 self
-4 0 72 0 CProtocolTun::ConstructL
-0 90 0 0 ( )
-0 91 111 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-5 0 85 0 CProtocolTun::NetworkAttachedL
-0 90 0 0 ( )
-0 91 134 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-6 0 96 0 CProtocolTun::NetworkDetached
-0 90 0 0 ( )
-0 91 141 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-7 0 107 0 CProtocolTun::Identify
-0 90 0 0 ( TServerProtocolDesc & aDesc )
-0 91 127 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-8 0 124 0 CProtocolTun::Identify
-0 90 0 0 ( TServerProtocolDesc * aDesc )
-0 91 119 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-9 0 135 0 CProtocolTun::ApplyL
-0 90 0 0 ( RMBufHookPacket & , RMBufRecvInfo & )
-0 91 150 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-1 13 137 1 KIp6Hook_PASS
-10 0 145 0 CProtocolTun::OpenL
-0 90 0 0 ( TPacketHead & aHead , CFlowContext * aFlow )
-0 91 159 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-0 20 151 1 IsPortSet ( )
-1 20 156 2 localNifBase -> Control ( KSolInetIp , KSoTunnelPort , pckgLocalAddr ) == KErrNone
-2 13 162 1 info
-11 0 170 0 CProtocolTun::NewSAPL
-0 90 0 0 ( TUint aProtocol )
-0 91 167 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-3 13 177 1 iSapInstance
-12 0 192 0 CSapTun::CSapTun
-0 90 0 0 ( )
-0 91 51 3 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-13 0 204 0 CSapTun::SetOption
-0 90 0 0 ( TUint aLevel , TUint aName , const TDesC8 & anOption )
-0 91 65 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-0 78 0 0 2
-0 79 0 0 0,1
-0 70 215 1 ( aName == KSoTunnelPort ) && ( aLevel == KSolInetIp )
-2 75 215 1 (T) && (T)
-1 76 215 1 (T) && (F)
-0 76 215 1 (F) && (_)
-0 80 0 0 1,2
-0 81 0 0 0
-0 77 215 1 aName == KSoTunnelPort
-0 80 0 0 2
-0 81 0 0 1
-0 77 215 1 aLevel == KSolInetIp
-4 13 222 1 err
-14 0 225 0 CSapTun::SecurityCheck
-0 90 0 0 ( MProvdSecurityChecker * aChecker )
-0 91 72 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-2 25 241 1 ( ECapabilityNetworkControl ) == ECapability_None
-3 25 241 1 ( ECapability_None ) == ECapability_None
-4 25 241 1 ( ECapability_None ) == ECapability_None
-5 13 242 1 aChecker -> CheckPolicy ( KPolicyNetworkControl , "SSLVPN Hook Loading failed." )
-15 0 256 0 CSapTun::Ioctl
-0 90 0 0 ( TUint , TUint , TDes8 * )
-0 91 56 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-16 0 259 0 CSapTun::Start
-0 90 0 0 ( )
-0 91 57 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-17 0 262 0 CSapTun::Shutdown
-0 90 0 0 ( TCloseType option )
-0 91 58 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-18 0 265 0 CSapTun::LocalName
-0 90 0 0 ( TSockAddr & anAddr )
-0 91 59 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-19 0 268 0 CSapTun::SetLocalName
-0 90 0 0 ( TSockAddr & anAddr )
-0 91 60 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-6 13 270 1 KErrNotSupported
-20 0 273 0 CSapTun::RemName
-0 90 0 0 ( TSockAddr & anAddr )
-0 91 61 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-21 0 276 0 CSapTun::SetRemName
-0 90 0 0 ( TSockAddr & anAddr )
-0 91 62 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-7 13 278 1 KErrNotSupported
-22 0 281 0 CSapTun::GetOption
-0 90 0 0 ( TUint , TUint , TDes8 & )
-0 91 63 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-8 13 290 1 KErrNone
-23 0 293 0 CSapTun::ActiveOpen
-0 90 0 0 ( )
-0 91 66 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-24 0 296 0 CSapTun::PassiveOpen
-0 90 0 0 ( TUint )
-0 91 68 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-9 13 298 1 KErrNotSupported
-25 0 301 0 CSapTun::Shutdown
-0 90 0 0 ( TCloseType , const TDesC8 & )
-0 91 70 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-26 0 304 0 CSapTun::AutoBind
-0 90 0 0 ( )
-0 91 71 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-27 0 307 0 CSapTun::PassiveOpen
-0 90 0 0 ( TUint , const TDesC8 & )
-0 91 69 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-10 13 309 1 KErrNotSupported
-28 0 312 0 CSapTun::ActiveOpen
-0 90 0 0 ( const TDesC8 & )
-0 91 67 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-29 0 315 0 CSapTun::CancelIoctl
-0 90 0 0 ( TUint , TUint )
-0 91 64 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-30 0 318 0 CSapTun::~CSapTun
-0 90 0 0 ( )
-0 91 52 3 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-31 0 327 0 CTunFlowInfo::CTunFlowInfo
-0 90 0 0 ( )
-0 91 232 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-32 0 333 0 CTunFlowInfo::~CTunFlowInfo
-0 90 0 0 ( )
-0 91 246 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-33 0 341 0 CTunFlowInfo::ReadyL
-0 90 0 0 ( TPacketHead & aHead )
-0 91 266 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-11 13 343 1 EFlow_READY
-34 0 350 0 CTunFlowInfo::ApplyL
-0 90 0 0 ( RMBufSendPacket & aPacket , RMBufSendInfo & aInfo )
-0 91 275 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-5 20 359 1 dest . Address ( ) == src . Address ( )
-6 20 361 2 protocol == KProtocolInetIp
-7 20 366 3 protocol == KProtocolInetUdp
-8 20 371 4 srcPort == iAppPortNum
-12 13 386 5 KIp6Hook_DONE
-9 21 390 2 protocol == KProtocolInet6Ip
-10 20 394 3 protocol == KProtocolInetUdp
-11 20 400 4 srcPort == iAppPortNum
-13 13 416 5 KIp6Hook_DONE
-0 1 418 4 else
-14 13 420 5 KIp6Hook_PASS
-0 1 424 2 else
-12 21 429 1 dest . Address ( ) != src . Address ( )
-13 20 434 2 protocol == KProtocolInetIp
-14 21 443 2 protocol == KProtocolInet6Ip
-0 1 451 2 else
-15 13 456 2 KIp6Hook_PASS
-0 1 458 1 else
-16 13 462 1 KIp6Hook_PASS
-35 0 472 0 CTunFlowInfo::Open
-0 90 0 0 ( )
-0 91 257 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-36 0 483 0 CTunFlowInfo::Close
-0 90 0 0 ( )
-0 91 283 1 T:\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc\tun.h
-15 20 485 1 -- iRef < 0
-%489,37,17,16,3,0
-END OF SYMBOLFILE
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/tun/group/bld.inf
--- a/tcpiputils/tun/group/bld.inf	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* 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_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/tunfamily.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(networking/tunfamily.h)
-../data/ip.tun.esk	/epoc32/winscw/c/private/101f7989/esock/ip.tun.esk
-../group/tun.iby	/epoc32/rom/include/tun.iby
-
-
-PRJ_MMPFILES
-tun.mmp
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/tun/group/ctcerr.txt
--- a/tcpiputils/tun/group/ctcerr.txt	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,354 +0,0 @@
-
-*******************************************************************************
-
-argv[0]: armcc
-argv[1]: --vsn
-
-*** CTC++/ctcagent command: set PATH=C:\Apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;T:\epoc32\tools;T:\epoc32\gcc\bin;C:/Apps/carbide/jre/bin/client;C:/Apps/carbide/jre/bin;C:\Reltools;C:\Program Files\PC Connectivity Solution\;c:\apps\actperl\bin\;c:\apps\rvct22_593\bin;c:\apps\atool;\epoc32\tools;\epoc32\gcc\bin;c:\apps\ue;c:\apps\ccm65\bin;c:\apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;C:\WINNT\system32;C:\WINNT;C:\WINNT\System32\Wbem;C:\Program Files\Intel\Wireless\Bin;c:\Program Files\Intel\WiFi\bin\;C:\Program Files\NTRU Cryptosystems\NTRU TCG Software Stack\bin\;C:\Program Files\Wave Systems Corp\Gemalto\Access Client\v5\;C:\APPS\pclint;C:\APPS\cmt\;C:\APPS\ctc;C:\APPS\prevent\bin;C:\APPS\sbs\bin;C:\APPS\actpython\.;C:\APPS\blocks\bin;C:\APPS\cltools;C:\APPS\codescanner;C:\APPS\symdec;C:\APPS\ant\bin;C:\APPS\j2sdk_1.3.1_06\bin;C:\APPS\7zip;C:\APPS\understand\bin\pc-win95;C:\APPS\unzip;C:\APPS\romtools;C:\APPS\imaker;C:\APPS\codecollaborator;C:\APPS\helium;C:\APPS\bc;\epoc32\gcc_mingw\bin;C:\Program Files\Common Files\Symbian\tools;C:\Program Files\CSL Arm Toolchain\bin;C:\Program Files\Perforce\;C:\Program Files\Nokia\FastTrace;C:\Program Files\QuickTime\QTSystem\; && C:\APPS\ctc\ctc -c C:\APPS\ctc\sym_armv5\armv5.ini @T:\bh1sosd1\NETWOR~1\NETWOR~1\TCPIPU~1\tun\group\CTC_TEMP\ctcopts.rsp armcc --vsn
-*** CTC++/ctcagent command status: 0
-
-
-*******************************************************************************
-
-argv[0]: armcc
-argv[1]: --vsn
-
-*** CTC++/ctcagent command: set PATH=T:\epoc32\gcc\bin;C:\Apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;T:\epoc32\tools;T:\epoc32\gcc\bin;C:/Apps/carbide/jre/bin/client;C:/Apps/carbide/jre/bin;C:\Reltools;C:\Program Files\PC Connectivity Solution\;c:\apps\actperl\bin\;c:\apps\rvct22_593\bin;c:\apps\atool;\epoc32\tools;\epoc32\gcc\bin;c:\apps\ue;c:\apps\ccm65\bin;c:\apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;C:\WINNT\system32;C:\WINNT;C:\WINNT\System32\Wbem;C:\Program Files\Intel\Wireless\Bin;c:\Program Files\Intel\WiFi\bin\;C:\Program Files\NTRU Cryptosystems\NTRU TCG Software Stack\bin\;C:\Program Files\Wave Systems Corp\Gemalto\Access Client\v5\;C:\APPS\pclint;C:\APPS\cmt\;C:\APPS\ctc;C:\APPS\prevent\bin;C:\APPS\sbs\bin;C:\APPS\actpython\.;C:\APPS\blocks\bin;C:\APPS\cltools;C:\APPS\codescanner;C:\APPS\symdec;C:\APPS\ant\bin;C:\APPS\j2sdk_1.3.1_06\bin;C:\APPS\7zip;C:\APPS\understand\bin\pc-win95;C:\APPS\unzip;C:\APPS\romtools;C:\APPS\imaker;C:\APPS\codecollaborator;C:\APPS\helium;C:\APPS\bc;\epoc32\gcc_mingw\bin;C:\Program Files\Common Files\Symbian\tools;C:\Program Files\CSL Arm Toolchain\bin;C:\Program Files\Perforce\;C:\Program Files\Nokia\FastTrace;C:\Program Files\QuickTime\QTSystem\; && C:\APPS\ctc\ctc -c C:\APPS\ctc\sym_armv5\armv5.ini @T:\bh1sosd1\NETWOR~1\NETWOR~1\TCPIPU~1\tun\group\CTC_TEMP\ctcopts.rsp armcc --vsn
-*** CTC++/ctcagent command status: 0
-
-
-*******************************************************************************
-
-argv[0]: mwccsym2.exe
-
-*** CTC++/ctcagent command: set PATH=T:\epoc32\gcc\bin;C:\Apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;T:\epoc32\tools;T:\epoc32\gcc\bin;C:/Apps/carbide/jre/bin/client;C:/Apps/carbide/jre/bin;C:\Reltools;C:\Program Files\PC Connectivity Solution\;c:\apps\actperl\bin\;c:\apps\rvct22_593\bin;c:\apps\atool;\epoc32\tools;\epoc32\gcc\bin;c:\apps\ue;c:\apps\ccm65\bin;c:\apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;C:\WINNT\system32;C:\WINNT;C:\WINNT\System32\Wbem;C:\Program Files\Intel\Wireless\Bin;c:\Program Files\Intel\WiFi\bin\;C:\Program Files\NTRU Cryptosystems\NTRU TCG Software Stack\bin\;C:\Program Files\Wave Systems Corp\Gemalto\Access Client\v5\;C:\APPS\pclint;C:\APPS\cmt\;C:\APPS\ctc;C:\APPS\prevent\bin;C:\APPS\sbs\bin;C:\APPS\actpython\.;C:\APPS\blocks\bin;C:\APPS\cltools;C:\APPS\codescanner;C:\APPS\symdec;C:\APPS\ant\bin;C:\APPS\j2sdk_1.3.1_06\bin;C:\APPS\7zip;C:\APPS\understand\bin\pc-win95;C:\APPS\unzip;C:\APPS\romtools;C:\APPS\imaker;C:\APPS\codecollaborator;C:\APPS\helium;C:\APPS\bc;\epoc32\gcc_mingw\bin;C:\Program Files\Common Files\Symbian\tools;C:\Program Files\CSL Arm Toolchain\bin;C:\Program Files\Perforce\;C:\Program Files\Nokia\FastTrace;C:\Program Files\QuickTime\QTSystem\; && C:\APPS\ctc\ctc -c C:\APPS\ctc\sym_cw\winscw.ini @T:\bh1sosd1\NETWOR~1\NETWOR~1\TCPIPU~1\tun\group\CTC_TEMP\ctcopts.rsp mwccsym2
-*** CTC++/ctcagent command status: 0
-
-
-*******************************************************************************
-
-argv[0]: mwldsym2.exe
-argv[1]: \EPOC32\BUILD\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\group\TUN\WINSCW\tun.prep.def
-argv[2]: -importlib
-argv[3]: -o
-argv[4]: \epoc32\release\winscw\UDEB\tun.lib
-argv[5]: -addcommand
-argv[6]: out:tun.prt
-argv[7]: -warnings
-argv[8]: off
-
-*** CTC++/ctcagent command: set PATH=T:\epoc32\gcc\bin;C:\Apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;T:\epoc32\tools;T:\epoc32\gcc\bin;C:/Apps/carbide/jre/bin/client;C:/Apps/carbide/jre/bin;C:\Reltools;C:\Program Files\PC Connectivity Solution\;c:\apps\actperl\bin\;c:\apps\rvct22_593\bin;c:\apps\atool;\epoc32\tools;\epoc32\gcc\bin;c:\apps\ue;c:\apps\ccm65\bin;c:\apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;C:\WINNT\system32;C:\WINNT;C:\WINNT\System32\Wbem;C:\Program Files\Intel\Wireless\Bin;c:\Program Files\Intel\WiFi\bin\;C:\Program Files\NTRU Cryptosystems\NTRU TCG Software Stack\bin\;C:\Program Files\Wave Systems Corp\Gemalto\Access Client\v5\;C:\APPS\pclint;C:\APPS\cmt\;C:\APPS\ctc;C:\APPS\prevent\bin;C:\APPS\sbs\bin;C:\APPS\actpython\.;C:\APPS\blocks\bin;C:\APPS\cltools;C:\APPS\codescanner;C:\APPS\symdec;C:\APPS\ant\bin;C:\APPS\j2sdk_1.3.1_06\bin;C:\APPS\7zip;C:\APPS\understand\bin\pc-win95;C:\APPS\unzip;C:\APPS\romtools;C:\APPS\imaker;C:\APPS\codecollaborator;C:\APPS\helium;C:\APPS\bc;\epoc32\gcc_mingw\bin;C:\Program Files\Common Files\Symbian\tools;C:\Program Files\CSL Arm Toolchain\bin;C:\Program Files\Perforce\;C:\Program Files\Nokia\FastTrace;C:\Program Files\QuickTime\QTSystem\; && C:\APPS\ctc\ctc -c C:\APPS\ctc\sym_cw\winscw.ini @T:\bh1sosd1\NETWOR~1\NETWOR~1\TCPIPU~1\tun\group\CTC_TEMP\ctcopts.rsp mwldsym2 \EPOC32\BUILD\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\group\TUN\WINSCW\tun.prep.def -importlib -o \epoc32\release\winscw\UDEB\tun.lib -addcommand out:tun.prt -warnings off
-*** CTC++/ctcagent command status: 0
-
-
-*******************************************************************************
-
-argv[0]: mwccsym2.exe
-argv[1]: -g
-argv[2]: -O0
-argv[3]: -inline
-argv[4]: off
-argv[5]: -runtime
-argv[6]: staticmulti
-argv[7]: -wchar_t
-argv[8]: off
-argv[9]: -align
-argv[10]: 4
-argv[11]: -warnings
-argv[12]: on
-argv[13]: -w
-argv[14]: nohidevirtual,nounusedexpr
-argv[15]: -msgstyle
-argv[16]: gcc
-argv[17]: -enum
-argv[18]: int
-argv[19]: -str
-argv[20]: pool
-argv[21]: -exc
-argv[22]: ms
-argv[23]: -trigraphs
-argv[24]: on
-argv[25]: -nostdinc
-argv[26]: -MD
-argv[27]: -gccdep
-argv[28]: -d
-argv[29]: _DEBUG
-argv[30]: -d
-argv[31]: _UNICODE
-argv[32]: -d
-argv[33]: __SYMBIAN32__
-argv[34]: -d
-argv[35]: __CW32__
-argv[36]: -d
-argv[37]: __WINS__
-argv[38]: -d
-argv[39]: __WINSCW__
-argv[40]: -d
-argv[41]: __DLL__
-argv[42]: -d
-argv[43]: __SUPPORT_CPP_EXCEPTIONS__
-argv[44]: -cwd
-argv[45]: source
-argv[46]: -i-
-argv[47]: -i
-argv[48]: \bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc
-argv[49]: -i
-argv[50]: \epoc32\include
-argv[51]: -i
-argv[52]: \epoc32\include\platform
-argv[53]: -i
-argv[54]: \epoc32\include\platform\comms-infras
-argv[55]: -i
-argv[56]: \epoc32\include\variant
-argv[57]: -i
-argv[58]: \epoc32\include\variant\ 
-argv[59]: -include
-argv[60]: Symbian_OS.hrh
-argv[61]: -o
-argv[62]: \EPOC32\BUILD\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\group\TUN\WINSCW\udeb\tunfamily.o
-argv[63]: -c
-argv[64]: \bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\src\tunfamily.cpp
-
-*** CTC++/ctcagent command: set PATH=T:\epoc32\gcc\bin;C:\Apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;T:\epoc32\tools;T:\epoc32\gcc\bin;C:/Apps/carbide/jre/bin/client;C:/Apps/carbide/jre/bin;C:\Reltools;C:\Program Files\PC Connectivity Solution\;c:\apps\actperl\bin\;c:\apps\rvct22_593\bin;c:\apps\atool;\epoc32\tools;\epoc32\gcc\bin;c:\apps\ue;c:\apps\ccm65\bin;c:\apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;C:\WINNT\system32;C:\WINNT;C:\WINNT\System32\Wbem;C:\Program Files\Intel\Wireless\Bin;c:\Program Files\Intel\WiFi\bin\;C:\Program Files\NTRU Cryptosystems\NTRU TCG Software Stack\bin\;C:\Program Files\Wave Systems Corp\Gemalto\Access Client\v5\;C:\APPS\pclint;C:\APPS\cmt\;C:\APPS\ctc;C:\APPS\prevent\bin;C:\APPS\sbs\bin;C:\APPS\actpython\.;C:\APPS\blocks\bin;C:\APPS\cltools;C:\APPS\codescanner;C:\APPS\symdec;C:\APPS\ant\bin;C:\APPS\j2sdk_1.3.1_06\bin;C:\APPS\7zip;C:\APPS\understand\bin\pc-win95;C:\APPS\unzip;C:\APPS\romtools;C:\APPS\imaker;C:\APPS\codecollaborator;C:\APPS\helium;C:\APPS\bc;\epoc32\gcc_mingw\bin;C:\Program Files\Common Files\Symbian\tools;C:\Program Files\CSL Arm Toolchain\bin;C:\Program Files\Perforce\;C:\Program Files\Nokia\FastTrace;C:\Program Files\QuickTime\QTSystem\; && C:\APPS\ctc\ctc -c C:\APPS\ctc\sym_cw\winscw.ini @T:\bh1sosd1\NETWOR~1\NETWOR~1\TCPIPU~1\tun\group\CTC_TEMP\ctcopts.rsp mwccsym2  @ctc-mwccsym2-5716.rsp
-
-*******************************************************************************
-
-argv[0]: mwccsym2.exe
-argv[1]: -g
-argv[2]: -O0
-argv[3]: -inline
-argv[4]: off
-argv[5]: -runtime
-argv[6]: staticmulti
-argv[7]: -wchar_t
-argv[8]: off
-argv[9]: -align
-argv[10]: 4
-argv[11]: -warnings
-argv[12]: on
-argv[13]: -w
-argv[14]: nohidevirtual,nounusedexpr
-argv[15]: -msgstyle
-argv[16]: gcc
-argv[17]: -enum
-argv[18]: int
-argv[19]: -str
-argv[20]: pool
-argv[21]: -exc
-argv[22]: ms
-argv[23]: -trigraphs
-argv[24]: on
-argv[25]: -nostdinc
-argv[26]: -MD
-argv[27]: -gccdep
-argv[28]: -d
-argv[29]: _DEBUG
-argv[30]: -d
-argv[31]: _UNICODE
-argv[32]: -d
-argv[33]: __SYMBIAN32__
-argv[34]: -d
-argv[35]: __CW32__
-argv[36]: -d
-argv[37]: __WINS__
-argv[38]: -d
-argv[39]: __WINSCW__
-argv[40]: -d
-argv[41]: __DLL__
-argv[42]: -d
-argv[43]: __SUPPORT_CPP_EXCEPTIONS__
-argv[44]: -cwd
-argv[45]: source
-argv[46]: -i-
-argv[47]: -i
-argv[48]: \bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc
-argv[49]: -i
-argv[50]: \epoc32\include
-argv[51]: -i
-argv[52]: \epoc32\include\platform
-argv[53]: -i
-argv[54]: \epoc32\include\platform\comms-infras
-argv[55]: -i
-argv[56]: \epoc32\include\variant
-argv[57]: -i
-argv[58]: \epoc32\include\variant\ 
-argv[59]: -include
-argv[60]: Symbian_OS.hrh
-argv[61]: -o
-argv[62]: \EPOC32\BUILD\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\group\TUN\WINSCW\udeb\tun.o
-argv[63]: -c
-argv[64]: \bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\src\tun.cpp
-
-*** CTC++/ctcagent command: set PATH=T:\epoc32\gcc\bin;C:\Apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;T:\epoc32\tools;T:\epoc32\gcc\bin;C:/Apps/carbide/jre/bin/client;C:/Apps/carbide/jre/bin;C:\Reltools;C:\Program Files\PC Connectivity Solution\;c:\apps\actperl\bin\;c:\apps\rvct22_593\bin;c:\apps\atool;\epoc32\tools;\epoc32\gcc\bin;c:\apps\ue;c:\apps\ccm65\bin;c:\apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;C:\WINNT\system32;C:\WINNT;C:\WINNT\System32\Wbem;C:\Program Files\Intel\Wireless\Bin;c:\Program Files\Intel\WiFi\bin\;C:\Program Files\NTRU Cryptosystems\NTRU TCG Software Stack\bin\;C:\Program Files\Wave Systems Corp\Gemalto\Access Client\v5\;C:\APPS\pclint;C:\APPS\cmt\;C:\APPS\ctc;C:\APPS\prevent\bin;C:\APPS\sbs\bin;C:\APPS\actpython\.;C:\APPS\blocks\bin;C:\APPS\cltools;C:\APPS\codescanner;C:\APPS\symdec;C:\APPS\ant\bin;C:\APPS\j2sdk_1.3.1_06\bin;C:\APPS\7zip;C:\APPS\understand\bin\pc-win95;C:\APPS\unzip;C:\APPS\romtools;C:\APPS\imaker;C:\APPS\codecollaborator;C:\APPS\helium;C:\APPS\bc;\epoc32\gcc_mingw\bin;C:\Program Files\Common Files\Symbian\tools;C:\Program Files\CSL Arm Toolchain\bin;C:\Program Files\Perforce\;C:\Program Files\Nokia\FastTrace;C:\Program Files\QuickTime\QTSystem\; && C:\APPS\ctc\ctc -c C:\APPS\ctc\sym_cw\winscw.ini @T:\bh1sosd1\NETWOR~1\NETWOR~1\TCPIPU~1\tun\group\CTC_TEMP\ctcopts.rsp mwccsym2  @ctc-mwccsym2-4436.rsp
-
-*******************************************************************************
-
-argv[0]: mwccsym2.exe
-argv[1]: -g
-argv[2]: -O0
-argv[3]: -inline
-argv[4]: off
-argv[5]: -runtime
-argv[6]: staticmulti
-argv[7]: -wchar_t
-argv[8]: off
-argv[9]: -align
-argv[10]: 4
-argv[11]: -warnings
-argv[12]: on
-argv[13]: -w
-argv[14]: nohidevirtual,nounusedexpr
-argv[15]: -msgstyle
-argv[16]: gcc
-argv[17]: -enum
-argv[18]: int
-argv[19]: -str
-argv[20]: pool
-argv[21]: -exc
-argv[22]: ms
-argv[23]: -trigraphs
-argv[24]: on
-argv[25]: -nostdinc
-argv[26]: -MD
-argv[27]: -gccdep
-argv[28]: -d
-argv[29]: _DEBUG
-argv[30]: -d
-argv[31]: _UNICODE
-argv[32]: -d
-argv[33]: __SYMBIAN32__
-argv[34]: -d
-argv[35]: __CW32__
-argv[36]: -d
-argv[37]: __WINS__
-argv[38]: -d
-argv[39]: __WINSCW__
-argv[40]: -d
-argv[41]: __DLL__
-argv[42]: -d
-argv[43]: __SUPPORT_CPP_EXCEPTIONS__
-argv[44]: -cwd
-argv[45]: source
-argv[46]: -i-
-argv[47]: -i
-argv[48]: \bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\inc
-argv[49]: -i
-argv[50]: \epoc32\include
-argv[51]: -i
-argv[52]: \epoc32\include\platform
-argv[53]: -i
-argv[54]: \epoc32\include\platform\comms-infras
-argv[55]: -i
-argv[56]: \epoc32\include\variant
-argv[57]: -i
-argv[58]: \epoc32\include\variant\ 
-argv[59]: -include
-argv[60]: Symbian_OS.hrh
-argv[61]: -o
-argv[62]: \EPOC32\BUILD\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\group\TUN\WINSCW\udeb\tun_UID_.o
-argv[63]: -c
-argv[64]: \EPOC32\BUILD\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\group\TUN\WINSCW\tun.UID.CPP
-
-*** CTC++/ctcagent command: set PATH=T:\epoc32\gcc\bin;C:\Apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;T:\epoc32\tools;T:\epoc32\gcc\bin;C:/Apps/carbide/jre/bin/client;C:/Apps/carbide/jre/bin;C:\Reltools;C:\Program Files\PC Connectivity Solution\;c:\apps\actperl\bin\;c:\apps\rvct22_593\bin;c:\apps\atool;\epoc32\tools;\epoc32\gcc\bin;c:\apps\ue;c:\apps\ccm65\bin;c:\apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;C:\WINNT\system32;C:\WINNT;C:\WINNT\System32\Wbem;C:\Program Files\Intel\Wireless\Bin;c:\Program Files\Intel\WiFi\bin\;C:\Program Files\NTRU Cryptosystems\NTRU TCG Software Stack\bin\;C:\Program Files\Wave Systems Corp\Gemalto\Access Client\v5\;C:\APPS\pclint;C:\APPS\cmt\;C:\APPS\ctc;C:\APPS\prevent\bin;C:\APPS\sbs\bin;C:\APPS\actpython\.;C:\APPS\blocks\bin;C:\APPS\cltools;C:\APPS\codescanner;C:\APPS\symdec;C:\APPS\ant\bin;C:\APPS\j2sdk_1.3.1_06\bin;C:\APPS\7zip;C:\APPS\understand\bin\pc-win95;C:\APPS\unzip;C:\APPS\romtools;C:\APPS\imaker;C:\APPS\codecollaborator;C:\APPS\helium;C:\APPS\bc;\epoc32\gcc_mingw\bin;C:\Program Files\Common Files\Symbian\tools;C:\Program Files\CSL Arm Toolchain\bin;C:\Program Files\Perforce\;C:\Program Files\Nokia\FastTrace;C:\Program Files\QuickTime\QTSystem\; && C:\APPS\ctc\ctc -c C:\APPS\ctc\sym_cw\winscw.ini @T:\bh1sosd1\NETWOR~1\NETWOR~1\TCPIPU~1\tun\group\CTC_TEMP\ctcopts.rsp mwccsym2  @ctc-mwccsym2-5416.rsp
-*** CTC++/ctcagent command status: 0
-
-*** CTC++/ctcagent command status: 0
-
-*** CTC++/ctcagent command status: 0
-
-
-*******************************************************************************
-
-argv[0]: mwldsym2.exe
-argv[1]: -msgstyle
-argv[2]: gcc
-argv[3]: -stdlib
-argv[4]: \epoc32\release\winscw\udeb\EDLL.LIB
-argv[5]: \epoc32\release\winscw\udeb\scppnwdl.lib
-argv[6]: -main
-argv[7]: __Win32DllMain@12
-argv[8]: -shared
-argv[9]: -subsystem
-argv[10]: windows
-argv[11]: -g
-argv[12]: \epoc32\release\WINSCW\udeb\euser.lib
-argv[13]: \epoc32\release\WINSCW\udeb\esocksvr.lib
-argv[14]: \epoc32\release\WINSCW\udeb\mbufmgr.lib
-argv[15]: \epoc32\release\WINSCW\udeb\inhook6.lib
-argv[16]: \epoc32\release\WINSCW\udeb\insock.lib
-argv[17]: \epoc32\release\WINSCW\udeb\esock.lib
-argv[18]: \epoc32\release\WINSCW\udeb\comsdbgutil.lib
-argv[19]: -o
-argv[20]: \EPOC32\BUILD\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\group\TUN\WINSCW\udeb\tun.prt
-argv[21]: -export
-argv[22]: dllexport
-argv[23]: -m
-argv[24]: __E32Dll
-argv[25]: -nocompactimportlib
-argv[26]: -implib
-argv[27]: \EPOC32\BUILD\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\group\TUN\WINSCW\udeb\tun.lib
-argv[28]: -addcommand
-argv[29]: out:tun.prt
-argv[30]: -warnings
-argv[31]: off
-argv[32]: -l
-argv[33]: \EPOC32\BUILD\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\group\TUN\WINSCW\udeb
-argv[34]: -search
-argv[35]: tunfamily.o
-argv[36]: tun.o
-argv[37]: tun_UID_.o
-
-*** CTC++/ctcagent command: set PATH=T:\epoc32\gcc\bin;C:\Apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;T:\epoc32\tools;T:\epoc32\gcc\bin;C:/Apps/carbide/jre/bin/client;C:/Apps/carbide/jre/bin;C:\Reltools;C:\Program Files\PC Connectivity Solution\;c:\apps\actperl\bin\;c:\apps\rvct22_593\bin;c:\apps\atool;\epoc32\tools;\epoc32\gcc\bin;c:\apps\ue;c:\apps\ccm65\bin;c:\apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;C:\WINNT\system32;C:\WINNT;C:\WINNT\System32\Wbem;C:\Program Files\Intel\Wireless\Bin;c:\Program Files\Intel\WiFi\bin\;C:\Program Files\NTRU Cryptosystems\NTRU TCG Software Stack\bin\;C:\Program Files\Wave Systems Corp\Gemalto\Access Client\v5\;C:\APPS\pclint;C:\APPS\cmt\;C:\APPS\ctc;C:\APPS\prevent\bin;C:\APPS\sbs\bin;C:\APPS\actpython\.;C:\APPS\blocks\bin;C:\APPS\cltools;C:\APPS\codescanner;C:\APPS\symdec;C:\APPS\ant\bin;C:\APPS\j2sdk_1.3.1_06\bin;C:\APPS\7zip;C:\APPS\understand\bin\pc-win95;C:\APPS\unzip;C:\APPS\romtools;C:\APPS\imaker;C:\APPS\codecollaborator;C:\APPS\helium;C:\APPS\bc;\epoc32\gcc_mingw\bin;C:\Program Files\Common Files\Symbian\tools;C:\Program Files\CSL Arm Toolchain\bin;C:\Program Files\Perforce\;C:\Program Files\Nokia\FastTrace;C:\Program Files\QuickTime\QTSystem\; && C:\APPS\ctc\ctc -c C:\APPS\ctc\sym_cw\winscw.ini @T:\bh1sosd1\NETWOR~1\NETWOR~1\TCPIPU~1\tun\group\CTC_TEMP\ctcopts.rsp mwldsym2  @ctc-mwldsym2-5512.rsp
-*** CTC++/ctcagent command status: 0
-
-
-*******************************************************************************
-
-argv[0]: mwldsym2.exe
-argv[1]: -S
-argv[2]: -show
-argv[3]: only,names,unmangled,verbose
-argv[4]: -o
-argv[5]: \EPOC32\BUILD\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\group\TUN\WINSCW\udeb\tun.inf
-argv[6]: \EPOC32\BUILD\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\group\TUN\WINSCW\udeb\tun.lib
-
-*** CTC++/ctcagent command: set PATH=T:\epoc32\gcc\bin;C:\Apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;T:\epoc32\tools;T:\epoc32\gcc\bin;C:/Apps/carbide/jre/bin/client;C:/Apps/carbide/jre/bin;C:\Reltools;C:\Program Files\PC Connectivity Solution\;c:\apps\actperl\bin\;c:\apps\rvct22_593\bin;c:\apps\atool;\epoc32\tools;\epoc32\gcc\bin;c:\apps\ue;c:\apps\ccm65\bin;c:\apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;C:\WINNT\system32;C:\WINNT;C:\WINNT\System32\Wbem;C:\Program Files\Intel\Wireless\Bin;c:\Program Files\Intel\WiFi\bin\;C:\Program Files\NTRU Cryptosystems\NTRU TCG Software Stack\bin\;C:\Program Files\Wave Systems Corp\Gemalto\Access Client\v5\;C:\APPS\pclint;C:\APPS\cmt\;C:\APPS\ctc;C:\APPS\prevent\bin;C:\APPS\sbs\bin;C:\APPS\actpython\.;C:\APPS\blocks\bin;C:\APPS\cltools;C:\APPS\codescanner;C:\APPS\symdec;C:\APPS\ant\bin;C:\APPS\j2sdk_1.3.1_06\bin;C:\APPS\7zip;C:\APPS\understand\bin\pc-win95;C:\APPS\unzip;C:\APPS\romtools;C:\APPS\imaker;C:\APPS\codecollaborator;C:\APPS\helium;C:\APPS\bc;\epoc32\gcc_mingw\bin;C:\Program Files\Common Files\Symbian\tools;C:\Program Files\CSL Arm Toolchain\bin;C:\Program Files\Perforce\;C:\Program Files\Nokia\FastTrace;C:\Program Files\QuickTime\QTSystem\; && C:\APPS\ctc\ctc -c C:\APPS\ctc\sym_cw\winscw.ini @T:\bh1sosd1\NETWOR~1\NETWOR~1\TCPIPU~1\tun\group\CTC_TEMP\ctcopts.rsp mwldsym2 -S -show only,names,unmangled,verbose -o \EPOC32\BUILD\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\group\TUN\WINSCW\udeb\tun.inf \EPOC32\BUILD\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\group\TUN\WINSCW\udeb\tun.lib
-*** CTC++/ctcagent command status: 0
-
-
-*******************************************************************************
-
-argv[0]: mwldsym2.exe
-argv[1]: -msgstyle
-argv[2]: gcc
-argv[3]: -stdlib
-argv[4]: \epoc32\release\winscw\udeb\EDLL.LIB
-argv[5]: \epoc32\release\winscw\udeb\scppnwdl.lib
-argv[6]: -main
-argv[7]: __Win32DllMain@12
-argv[8]: -shared
-argv[9]: -subsystem
-argv[10]: windows
-argv[11]: -g
-argv[12]: \epoc32\release\WINSCW\udeb\euser.lib
-argv[13]: \epoc32\release\WINSCW\udeb\esocksvr.lib
-argv[14]: \epoc32\release\WINSCW\udeb\mbufmgr.lib
-argv[15]: \epoc32\release\WINSCW\udeb\inhook6.lib
-argv[16]: \epoc32\release\WINSCW\udeb\insock.lib
-argv[17]: \epoc32\release\WINSCW\udeb\esock.lib
-argv[18]: \epoc32\release\WINSCW\udeb\comsdbgutil.lib
-argv[19]: -o
-argv[20]: \epoc32\release\winscw\udeb\tun.prt
-argv[21]: -f
-argv[22]: \EPOC32\BUILD\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\group\TUN\WINSCW\tun.def
-argv[23]: -noimplib
-argv[24]: -l
-argv[25]: \EPOC32\BUILD\bh1sosd1\networkingsrv-tundriver_dev_vinoth\networkingsrv\tcpiputils\tun\group\TUN\WINSCW\udeb
-argv[26]: -search
-argv[27]: tunfamily.o
-argv[28]: tun.o
-argv[29]: tun_UID_.o
-
-*** CTC++/ctcagent command: set PATH=T:\epoc32\gcc\bin;C:\Apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;T:\epoc32\tools;T:\epoc32\gcc\bin;C:/Apps/carbide/jre/bin/client;C:/Apps/carbide/jre/bin;C:\Reltools;C:\Program Files\PC Connectivity Solution\;c:\apps\actperl\bin\;c:\apps\rvct22_593\bin;c:\apps\atool;\epoc32\tools;\epoc32\gcc\bin;c:\apps\ue;c:\apps\ccm65\bin;c:\apps\carbide\x86Build\Symbian_Tools\Command_Line_Tools;C:\WINNT\system32;C:\WINNT;C:\WINNT\System32\Wbem;C:\Program Files\Intel\Wireless\Bin;c:\Program Files\Intel\WiFi\bin\;C:\Program Files\NTRU Cryptosystems\NTRU TCG Software Stack\bin\;C:\Program Files\Wave Systems Corp\Gemalto\Access Client\v5\;C:\APPS\pclint;C:\APPS\cmt\;C:\APPS\ctc;C:\APPS\prevent\bin;C:\APPS\sbs\bin;C:\APPS\actpython\.;C:\APPS\blocks\bin;C:\APPS\cltools;C:\APPS\codescanner;C:\APPS\symdec;C:\APPS\ant\bin;C:\APPS\j2sdk_1.3.1_06\bin;C:\APPS\7zip;C:\APPS\understand\bin\pc-win95;C:\APPS\unzip;C:\APPS\romtools;C:\APPS\imaker;C:\APPS\codecollaborator;C:\APPS\helium;C:\APPS\bc;\epoc32\gcc_mingw\bin;C:\Program Files\Common Files\Symbian\tools;C:\Program Files\CSL Arm Toolchain\bin;C:\Program Files\Perforce\;C:\Program Files\Nokia\FastTrace;C:\Program Files\QuickTime\QTSystem\; && C:\APPS\ctc\ctc -c C:\APPS\ctc\sym_cw\winscw.ini @T:\bh1sosd1\NETWOR~1\NETWOR~1\TCPIPU~1\tun\group\CTC_TEMP\ctcopts.rsp mwldsym2  @ctc-mwldsym2-6668.rsp
-*** CTC++/ctcagent command status: 0
-
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/tun/group/networking_tun.mrp
--- a/tcpiputils/tun/group/networking_tun.mrp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-#
-# 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: 
-#
-
-component	networking_tun
-source	\sf\os\networkingsrv\tcpiputils\tun
-binary	\sf\os\networkingsrv\tcpiputils\tun\group	all
-exports	\sf\os\networkingsrv\tcpiputils\tun\group
-notes_source	\component_defs\release.src
-
-ipr E 
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/tun/group/tun.iby
--- a/tcpiputils/tun/group/tun.iby	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-* 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 __TUN_IBY__
-#define __TUN_IBY__
-
-REM dependencies
-#include <esock.iby>
-#include <insock.iby>
-#include <inhook6.iby>
-#include <nifman.iby>
-
-file=ABI_DIR\DEBUG_DIR\tun.prt		System\Libs\tun.prt
-
-data=EPOCROOT##epoc32\winscw\c\private\101F7989\esock\ip.tun.esk		private\101F7989\esock\ip.tun.esk
-
-#endif // __TUN_IBY__
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/tun/group/tun.mmp
--- a/tcpiputils/tun/group/tun.mmp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*
-* 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:
-*
-*/
-
-TARGET		 tun.prt
-TARGETTYPE	 	 dll
-UID			 0x10003D38 0xEFDE93A8
-
-USERINCLUDE	 	../inc
-
-SYSTEMINCLUDE   /epoc32/include
-SYSTEMINCLUDE   /epoc32/include/platform
-SYSTEMINCLUDE   /epoc32/include/platform/comms-infras
-
-SOURCEPATH	  ../src
-
-//Uncomment the following line to include the support for IPV6 in the hook
-//MACRO IPV6SUPPORT
-
-// In order to use .def files to freeze code you must use one or more DEFFILE lines;
-// see the ones commented out below for examples.
-// By default, the build tools look for the WINSCW def file in a BWINS directory
-// (at the same level as the directory containing the mmp file), 
-// the GCC ARM def file in a BMARM directory, and the ARMV5 def file in a EABI directory. 
-// If your .def files are stored in these default locations, you can simply specify the
-// .def filename(s) with no path. If you want to store .def files in non-default 
-// locations, you will need to specify the paths in the DEFFILE statement(s).
-
-//The following commented out code shows how the build system uses the implicit
-// location for defiles. To create the DEF files Choose Project > Freeze Exports from Carbide
-// or run 'abld freeze' from the command-line
-//#if defined (WINS)
-//  DEFFILE ..\bwins\tun.def
-//#elif defined (GCC32)
-//  DEFFILE ..\bmarm\tun.def
-//#else 
-//  DEFFILE ..\eabi\tun.def
-//#endif
-
-nostrictdef
-
-USERINCLUDE		../inc
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY		euser.lib 
-LIBRARY		esocksvr.lib
-LIBRARY		mbufmgr.lib 
-LIBRARY		inhook6.lib
-LIBRARY		insock.lib
-LIBRARY     	esock.lib
-LIBRARY     	comsdbgutil.lib
-
-DOCUMENT		../data/ip.tun.esk
-
-
-CAPABILITY CommDD PowerMgmt ReadDeviceData WriteDeviceData TrustedUI ProtServ NetworkControl NetworkServices LocalServices ReadUserData WriteUserData
-
-VENDORID 0x70000001
-
-#ifdef ENABLE_ABIV2_MODE
-DEBUGGABLE_UDEBONLY
-#endif
-
-SOURCE tunfamily.cpp tun.cpp
-
-SMPSAFE
-
-
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/tun/inc/tun.h
--- a/tcpiputils/tun/inc/tun.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,288 +0,0 @@
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-/**
- @file 
- @internalComponent
- */
-
-#ifndef __TUN_H__
-#define __TUN_H__
-
-#include <posthook.h>
-#include <nifif.h>
-#include "tunfamily.h"
-#include "tun.pan"
-
-const TUint KProtocolTUN    = 145; // number that is unassigned by IANA
-const TUint KTunTos         = 192; // 0xC0; uses the UNUSED 7,8 MSB of Differentiated Services  
-
-class CProtocolTun;
-class CTunFlowInfo;
-class CNifIfBase;
-
-class CSapTun : public CServProviderBase
-/** 
- *  Class Derived from CServProviderBase. 
- *  Inherit virtual functions from CServProviderBase.This Class is socket support for this 
- *  Hook (protocol).Protocol or Hook could be manipulated by the Socket using socket options.
- *  This class will be used to take downlink information from the private client.The SAP will 
- *  called for all the Socket opened by the socket. SAP is 1 to 1 with Socket.
- *  we are maintaining a singleton pattern for this SAP
- **/
-    {
-
-public:
-    friend class CProtocolTun;
-
-protected:
-    CSapTun();
-    ~CSapTun();
-    
-public:
-    //static CSapTun* GetInstanceL();
-    void Ioctl(TUint /*level*/,TUint /* name*/,TDes8* /* anOption*/);
-    void Start();
-    void Shutdown(TCloseType option);
-    void LocalName(TSockAddr& anAddr) const; 
-    TInt SetLocalName(TSockAddr& anAddr); 
-    void RemName(TSockAddr& anAddr) const;
-    TInt SetRemName(TSockAddr& anAddr);
-    TInt GetOption(TUint /*level*/,TUint /*name*/,TDes8& /*anOption*/)const;    
-    void CancelIoctl(TUint /*aLevel*/,TUint /*aName*/);
-    TInt SetOption(TUint aLevel,TUint aName,const TDesC8& anOption); 
-    void ActiveOpen();
-    void ActiveOpen(const TDesC8& /*aConnectionData*/);
-    TInt PassiveOpen(TUint /*aQueSize*/);
-    TInt PassiveOpen(TUint /*aQueSize*/,const TDesC8& /*aConnectionData*/);
-    void Shutdown(TCloseType /*option*/,const TDesC8& /*aDisconnectionData*/);
-    void AutoBind();
-    TInt SecurityCheck(MProvdSecurityChecker* aChecker);
-
-private:
-    //static CSapTun* iInstance;
-    CProtocolTun* iProtocol;
-    CTunFlowInfo* iFlowInfo;
-    };  //End Class CProtocolSap
-
-//CSapTun* CSapTun::iInstance = NULL;
-
-class CProtocolTun : public CProtocolPosthook
-    {
-    friend class CSapTun;
-public:  // Constructors and destructor
-
-    /**
-     * Constructor.
-     */
-
-    CProtocolTun ();
-
-    /* 
-     * Two Phase Construction
-     */
-    static CProtocolTun* NewL();
-
-    /**
-     * Destructor.
-     */
-    virtual ~CProtocolTun ();
-
-public: // Functions from base classes
-
-    /**
-     * From CProtocolBase  
-     * Used as second phase of Two Phase construction
-     * @param aTag Name
-     * @return void
-     */
-    void ConstructL ();
-
-    /**
-     * From CProtocolBase  
-     * @since 
-     * @param aDesc Descriptor to be filled by this method.
-     * @return void
-     */
-    virtual void Identify (TServerProtocolDesc * aDesc) const;
-
-    /**
-     * Static method that can be invoked from the Protocol Family 
-     * @since 
-     * @param aDesc Descriptor to be filled by this method.
-     * @return void
-     */
-    static void Identify (TServerProtocolDesc & aDesc);
-
-    /**
-     * From CProtocolPostHook Handles attach to the stack
-     * @since
-     * @return void
-     */
-    void NetworkAttachedL();
-
-    /**
-     * From CProtocolPostHook Handles detach from the stack
-     * @since
-     * @return void
-     */
-    void NetworkDetached();
-
-    /**
-     * From MIp6Hook Handles received packets. 
-     * @since 
-     * @param aPacket Packet received.
-     * @param aInfo Info structure.
-     * @return void
-     */       
-    virtual TInt ApplyL (RMBufHookPacket & /* aPacket */ ,RMBufRecvInfo & /* aInfo */ );
-
-    /**
-     * From MIp6Hook Handles outbound opening. 
-     * @since 
-     * @param aHead Flow-specific precomputed data.
-     * @param aFlow Flow.
-     * @return void
-     */       
-    virtual MFlowHook *OpenL (TPacketHead & aHead, CFlowContext * aFlow);
-
-    /**
-     * NewSAPL function to create a CSapTun instance
-     * and use for setting up the LocalAddress Information
-     * @param aProtocol ignored in our case.
-     * @return instance of the CServProviderBase instance CSapFullTunnel
-     */
-    CServProviderBase* NewSAPL(TUint aProtocol);
-
-    /**
-     *  Cancels the Sap creation
-     *  @param the Sap instance that has to be removed 
-     */ 
-  //  void CancelSap(CSapTun *aSap);
-
-    /**
-     *  Sets the NifBase instances to be used for Control functionality
-     *  @param the NifBase instance that will be retained.
-     */
-    void SetCNifBase(CNifIfBase* aNifBase)
-        {
-        iNifBase = aNifBase;
-        }
-    
-    void SetAppPortNum(TUint aPort)
-        {
-        iAppPortNum = aPort;
-        iPortSet = ETrue;
-        }
-    
-    TBool IsPortSet()
-        {
-        return iPortSet;
-        }
-
-
-private:
-    TUint iAppPortNum;  // Tunnel port configured.
-    TBool iPortSet;     //Bool to check whether the port is set/not.
-    RPointerArray<CSapTun> iSapList;  // List of SAP instances created.
-    CNifIfBase* iNifBase;    // CNifBase* instance
-    CTunFlowInfo* iFlowinfo;   // instance of the Flow Hook
-    CSapTun* iSapInstance; // instance of sap
-
-    };
-
-/**
- *  TUN Driver flow hook
- *  Outbound Flow hook and performs actions on the packets
- *  destined for the Virtual Tunnel Nif.
- */
-class CTunFlowInfo : public CBase, public MFlowHook
-    {
-    friend class CProtocolTun;
-    friend class CSapTun;
-
-public: // Constructors & destructors
-
-    /**
-     * Constructor.
-     */
-
-    CTunFlowInfo();
-
-    /**
-     * Copy Constructor.
-     */
-
-    CTunFlowInfo(CTunFlowInfo* aInstance )
-    :iAppPortNum(aInstance -> iAppPortNum)
-        {}
-
-    /**
-     * Destructor.
-     */
-
-    ~CTunFlowInfo();
-
-
-public: // Functions from base classes
-
-    /**
-     * From MFlowHook Open and Close implements reference counting system.
-     * @since
-     * @param
-     * @return void
-     */
-    void Open ();
-
-    /**
-     * From MFlowHook Informs stack if the hook is ready. Can update address
-     * information.
-     * @since
-     * @param aHead Address information of the flow.
-     * @return TInt 0 => ready, >0 => pending, <0 => error.
-     */
-    TInt ReadyL (TPacketHead & aHead);
-
-    /**
-     * Called by IP when processing outbound packet.
-     * @since
-     * @param aPacket Complete packet
-     * @param aInfo Information block associated with the packet
-     * @return TInt 0 => processed, <0 => discarded, >0 => restart processing
-     */
-    TInt ApplyL (RMBufSendPacket & aPacket, RMBufSendInfo & aInfo);
-
-    /**
-     * From MFlowHook Open and Close implements reference counting system.
-     * @since
-     * @param
-     * @return void
-     */
-    void Close ();
-    
-    void SetAppPortNum(TUint aPort)
-        {
-        iAppPortNum = aPort;
-        }
-    
-private:    // Data
-
-    TInt iRef; // Reference count
-    TUint iAppPortNum; // Tunnel port configured.
-
-    };
-
-
-#endif //__TUN_H__
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/tun/inc/tun.pan
--- a/tcpiputils/tun/inc/tun.pan	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-
-#ifndef __TUN_PAN__
-#define __TUN_PAN__
-
-//  Data Types
-enum TTunPanic
-    {
-    ETunPanic_BadBind,
-    ETunPanic_BadHeader,
-    ETunPanic_BadCall,
-    ETunPanic_CorruptPacketIn
-    };
-
-//  Function Prototypes
-GLREF_C void Panic(TTunPanic aPanic);
-
-#endif  // __TUN_PAN__
-
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/tun/inc/tunfamily.h
--- a/tcpiputils/tun/inc/tunfamily.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-/**
- @file 
- @internalComponent
-*/
-
-
-#ifndef __TUNFAMILY_H__
-#define __TUNFAMILY_H__
-
-#include <in_bind.h>
-
-class CProtocolFamilyTun : public CProtocolFamilyBase
-/**  
-* Class is derived from CProtocolFamilyBase.
-* This will Install Protocol Family and load new protocol module tun.
-* Implements virtual functions of base class CProtocolFamilyBase( Install, remove)
-* 
-**/ 
-    {
-public:
-    CProtocolFamilyTun();
-    ~CProtocolFamilyTun();
-    TInt Install();
-    TInt Remove();
-    TUint ProtocolList(TServerProtocolDesc *& aProtocolList);
-    CProtocolBase* NewProtocolL(TUint /*aSockType*/, TUint aProtocol);
-    };
-    
-#endif  //__TUNFAMILY_H__
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/tun/sis/tun.pkg
--- a/tcpiputils/tun/sis/tun.pkg	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-; Installation file for SslVpn dll
-;
-; This is an auto-generated PKG file by Carbide.
-; This file uses variables specific to Carbide builds that will not work
-; on command-line builds. If you want to use this generated PKG file from the
-; command-line tools you will need to modify the variables with the appropriate
-; values: $(EPOCROOT), $(PLATFORM), $(TARGET)
-
-;
-; UID is the dll's UID
-;
-#{"tun DLL"},(0xEFDE93A8),1,0,0
-
-
-;Localised Vendor name
-%{"Vendor-EN"}
-
-;Unique Vendor name
-:"Vendor"
-
-"$(EPOCROOT)Epoc32\release\$(PLATFORM)\$(TARGET)\tun.prt"		  -"!:\sys\bin\tun.prt"
\ No newline at end of file
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/tun/src/tun.cpp
--- a/tcpiputils/tun/src/tun.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,491 +0,0 @@
-// 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:
-// implementation of Inbound and Outbound hook
-// 
-//
-
-/**
- @file
- @internalTechnology 
- */
-
-#include <udp_hdr.h>
-#include <in_chk.h>
-#include <es_prot_internal.h>
-#include "tun.pan"
-#include "tun.h"
-
-_LIT(KProtocolTunName, "tun");
-
-void Panic(TTunPanic aPanic)
-    {
-    User::Panic(_L("Tun panic"), aPanic);
-    }
-
-
-// ============================ MEMBER FUNCTIONS ==============================
-
-// ----------------------------------------------------------------------------
-// CProtocolTun::CProtocolTun
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// ----------------------------------------------------------------------------
-//
-CProtocolTun::CProtocolTun ()
-    {}
-
-// Destructor
-CProtocolTun::~CProtocolTun ()
-    {
-    NetworkService()->Protocol()->Unbind((CProtocolBase*)iFlowinfo,0);
-    }
-
-// ----------------------------------------------------------------------------
-// CProtocolTun::NewL
-// ----------------------------------------------------------------------------
-//
-CProtocolTun* CProtocolTun::NewL ()
-    {
-    CProtocolTun* self = new (ELeave) CProtocolTun();
-    CleanupStack::PushL(self);
-    self -> ConstructL ();
-    CleanupStack::Pop();
-    return self;
-    }
-
-// ----------------------------------------------------------------------------
-// CProtocolTun::ConstructL
-// Initializes the CProtocolTun
-// ----------------------------------------------------------------------------
-//
-void CProtocolTun::ConstructL ()
-    {
-    iFlowinfo = new (ELeave) CTunFlowInfo();
-    iSapInstance = new (ELeave) CSapTun();
-    iSapInstance->iFlowInfo= iFlowinfo;
-    iSapInstance->iProtocol=this;
-    }
-
-// ----------------------------------------------------------------------------
-// CProtocolTun::NetworkAttachedL
-// Binds the hooks (inbound, outbound flowhook and forward) to the IP6. 
-// ----------------------------------------------------------------------------
-//
-void CProtocolTun::NetworkAttachedL ()
-    {
-    // Outbound hook
-    NetworkService()->BindL ((CProtocolBase*) this, BindFlowHook());
-    }
-
-// ----------------------------------------------------------------------------
-// CProtocolTun::NetworkDetached
-// Unbind the hooks.
-// ----------------------------------------------------------------------------
-//
-void CProtocolTun::NetworkDetached ()
-    {
-    // Do Nothing
-    // as the destructor does the rest 
-    }
-
-// ----------------------------------------------------------------------------
-// CProtocolTun::Identify
-// Provide identification information to the caller.
-// ----------------------------------------------------------------------------
-//
-void CProtocolTun::Identify (TServerProtocolDesc & aEntry)
-    {
-    aEntry.iName = KProtocolTunName;
-    aEntry.iAddrFamily = KAfInet | KAfInet6;
-    aEntry.iSockType = KSockDatagram;
-    aEntry.iProtocol = KProtocolTUN;
-    aEntry.iVersion = TVersion (1, 0, 0);
-    aEntry.iByteOrder = EBigEndian;
-    aEntry.iServiceInfo=KSIDatagram | KSIConnectionLess;
-    aEntry.iNamingServices = 0;
-    aEntry.iSecurity = KSocketNoSecurity;
-    aEntry.iServiceTypeInfo=0;
-    aEntry.iMessageSize = 0xffff;
-    aEntry.iServiceTypeInfo = ESocketSupport | EInterface;
-    aEntry.iNumSockets = KUnlimitedSockets;
-    }
-
-void CProtocolTun::Identify (TServerProtocolDesc * aDesc) const
-{
-Identify (*aDesc);
-}
-
-// ----------------------------------------------------------------------------
-// CProtocolTun::ApplyL
-// This is the handler for forwarding packets.
-// Udp encapsulation for the packets from the Virtual tunnel nif
-// ----------------------------------------------------------------------------
-//
-TInt CProtocolTun::ApplyL (RMBufHookPacket& /*aPacket*/, RMBufRecvInfo& /*aInfo*/)
-    {
-    return KIp6Hook_PASS;
-    };
-
-// ----------------------------------------------------------------------------
-// CProtocolTun:OpenL
-// Outbound Flow hook Open handler for the protocol. 
-// ----------------------------------------------------------------------------
-//
-MFlowHook *CProtocolTun::OpenL (TPacketHead& /*aHead*/, CFlowContext* aFlow)
-    {
-    // We are interested in this flow, let's create a new local flow instance
-    // create a local copy using copy ctor and return the instance
-    CTunFlowInfo *info = NULL; 
-    CNifIfBase* localNifBase = aFlow->Interface();
-    if(IsPortSet())
-        {
-        TInetAddr localAddr;
-        localAddr.SetPort(iAppPortNum);
-        TPckg<TInetAddr> pckgLocalAddr(localAddr);
-        if(localNifBase->Control(KSolInetIp,KSoTunnelPort,pckgLocalAddr)== KErrNone)
-            {
-            info = new (ELeave) CTunFlowInfo(iFlowinfo);
-            SetCNifBase(localNifBase);
-            }
-        }
-    return info;
-    }
-
-// ----------------------------------------------------------------------------
-// CProtocolTun::NewSAPL
-// Creation of a new SAP instance 
-// ----------------------------------------------------------------------------
-//
-CServProviderBase* CProtocolTun::NewSAPL(TUint /*aProtocol*/)
-    {
-#if 0
-    CSapTun *nsap = new(ELeave) CSapTun();//CSapTun::GetInstanceL();
-    nsap->iProtocol=this;
-    nsap->iFlowInfo= iFlowinfo;
-#endif
-    return iSapInstance;
-    }
-
-/**
----------------------------------------------------------------------------------------
-                                CSapTun
----------------------------------------------------------------------------------------
-
-This class is derived from CServProviderBase.CSapTun is the service class for sockets
-loading CProtocolTun.But here only one socket will be able to load protocol.If protocol once
-loaded other socket cannot service protocol by opening socket.
- */
-
-//CSapTun* CSapTun::iInstance = NULL;
-
-CSapTun::CSapTun()
-    { }
-#if 0
-CSapTun* CSapTun::GetInstanceL()
-    {
-    if(!iInstance)
-        {
-        iInstance = new (ELeave) CSapTun();
-        }
-    return iInstance;
-    }
-#endif 
-TInt CSapTun::SetOption(TUint aName ,TUint aLevel ,const TDesC8& anOption)
-/** 
- * This class is used to set PortNumber information to be used by the hook to perform
- * UDP encapsulation.
- * @param aName  -- KSoTunnelPort
- * @param aLevel --KSolInetIp.
- * return - KErrNone if no value is assigned else KErrPermissionDenied
- **/
-
-    {
-    TInt err = KErrNotSupported;
-    if((aName == KSoTunnelPort) && (aLevel == KSolInetIp))
-        {
-        const TUint opt = *reinterpret_cast<const TUint*>(anOption.Ptr());
-        iProtocol->SetAppPortNum(opt);
-        iFlowInfo->SetAppPortNum(opt);
-        err= KErrNone;
-        }
-    return err;
-    }
-
-TInt CSapTun::SecurityCheck(MProvdSecurityChecker* aChecker)
-/**
- * Capability check for the TUN Hook sockets.
- *
- * TUN Hook sockets require the NetworkControl capability.
- *
- * @param aChecker The policy checker.
- * @return The result of the policy check.
- */
-    {
-    //  This method is called when a SAP is created and when a socket is transferred between sessions.  The SAP is
-    //required to check whether the originating client process has enough privileges to request services from the SAP.
-    //The MProvdSecurityChecker class instance is used to perform security policy checks.  The SAP may choose
-    //to perform a security policy check in its SecurityCheck(...) method, or it may choose to store the
-    //MProvdSecurityChecker class instance argument and perform checking later (i.e. when subsequent
-    //SAP methods are called). 
-    _LIT_SECURITY_POLICY_C1(KPolicyNetworkControl, ECapabilityNetworkControl);
-    return aChecker->CheckPolicy(KPolicyNetworkControl, "TUN Hook Loading failed.");
-    }
-
-/*
-------------------------------------------------------------------------------------------
-
-                        SAP UNUSED FUNTION SECTION
-------------------------------------------------------------------------------------------
-
-SAP definion which are not being used.These functions are not doing anything instead they are 
-returning nothing from it.
-
- */
-
-void CSapTun::Ioctl(TUint /*level*/,TUint /*name*/,TDes8*/*anOption*/)
-    {}
-
-void CSapTun::Start()
-    {}
-
-void CSapTun::Shutdown(TCloseType /*option*/)
-    {}
-
-void CSapTun::LocalName(TSockAddr& /*anAddr*/) const
-{}
-
-TInt CSapTun::SetLocalName(TSockAddr& /*anAddr*/)
-    {
-    return KErrNotSupported;
-    }
-
-void CSapTun::RemName(TSockAddr& /*anAddr*/) const 
-{}
-
-TInt CSapTun::SetRemName(TSockAddr& /*anAddr*/) 
-    { 
-    return KErrNotSupported;
-    }
-
-TInt CSapTun::GetOption(TUint /*aLevel*/, TUint /*aName*/, TDes8& /*aOption*/)const
-/** 
- * This implements GetOption method for Napt specific service provider.
- * @param aLevel
- * @param aName
- * @param anOption
- * @return KErrNone in case of success
- **/
-{
-return KErrNone;
-}
-
-
-void CSapTun::ActiveOpen()
-    {}
-
-TInt CSapTun::PassiveOpen(TUint /*aQueSize*/)
-    {
-    return KErrNotSupported;
-    }
-
-void CSapTun::Shutdown(TCloseType /*option*/,const TDesC8& /*aDisconnectionData*/)
-    {}
-
-void CSapTun::AutoBind()
-    {}
-
-TInt CSapTun::PassiveOpen(TUint /*aQueSize*/,const TDesC8& /*aConnectionData*/)
-    {
-    return KErrNotSupported;
-    }
-
-void CSapTun::ActiveOpen(const TDesC8& /*aConnectionData*/)
-    {}
-
-void CSapTun::CancelIoctl(TUint /*aLevel*/,TUint /*aName*/)
-    {}
-
-CSapTun::~CSapTun()
-    {
-    }
-
-// TUN OUTBOUND FLOW HOOK functions.
-
-// ----------------------------------------------------------------------------
-// CTunFlowInfo::CTunFlowInfo
-// ----------------------------------------------------------------------------
-CTunFlowInfo::CTunFlowInfo ()
-    {}
-
-// ----------------------------------------------------------------------------
-// CTunFlowInfo::~CTunFlowInfo
-// ----------------------------------------------------------------------------
-CTunFlowInfo::~CTunFlowInfo ()
-    {}
-
-// ----------------------------------------------------------------------------
-// CTunFlowInfo::ReadyL
-// The stack asks if the flow is ready to send. 
-// ----------------------------------------------------------------------------
-//
-TInt CTunFlowInfo::ReadyL (TPacketHead& /*aHead*/)
-    {
-    return EFlow_READY;
-    }
-
-// ----------------------------------------------------------------------------
-// CTunFlowInfo::ApplyL
-// Intial stage where the CTunFlowInfo touches the outgoing packet. 
-// ----------------------------------------------------------------------------
-TInt CTunFlowInfo::ApplyL(RMBufSendPacket & aPacket, RMBufSendInfo & aInfo)
-    {
-    const TInetAddr& dest = aInfo.iDstAddr;
-    const TInetAddr& src = aInfo.iSrcAddr;
-
-    TInt protocol = aInfo.iProtocol;
-
-    // protocolnum check is added to avoid loopin in the same hook as the 
-    // source and destination address will not be changed in the RMBufSendInfo.
-    if (dest.Address() == src.Address())
-        {
-        if (protocol == KProtocolInetIp  )
-            {
-            TInet6Packet<TInet6HeaderIP4> localIP(aPacket);
-            TUint protocol = localIP.iHdr->Protocol();
-
-            if (protocol == KProtocolInetUdp)
-                {
-                TInet6HeaderUDP* udpHdr = (TInet6HeaderUDP*) localIP.iHdr->EndPtr();
-                TUint srcPort = udpHdr->SrcPort();
-
-                if (srcPort == iAppPortNum)
-                    {
-                    // Ingress traffic forwarded from TUN Client Application. Trim the
-                    // outer header and send the original pkt back to the ip stack.
-                    TInt outerHdrLen = TInet6HeaderIP4::MinHeaderLength() + TInet6HeaderUDP::MinHeaderLength();
-
-                    // the info length will be updated by TrimStart
-                    aPacket.TrimStart(outerHdrLen);
-                    
-                    TInet6Packet<TInet6HeaderIP4> ip(aPacket);
-                    //Update the info Address information
-                    TInetAddr::Cast(aInfo.iSrcAddr).SetAddress(ip.iHdr->SrcAddr());
-                    TInetAddr::Cast(aInfo.iDstAddr).SetAddress(ip.iHdr->DstAddr());
-
-                    // restart the hook processing from the begining.
-                    return KIp6Hook_DONE;
-                    }
-                }
-            }
-#ifdef IPV6SUPPORT
-        else if (protocol == KProtocolInet6Ip)
-            {
-            TInet6Packet<TInet6HeaderIP> localIP6(aPacket);
-            TInt protocol = localIP6.iHdr->NextHeader();
-            if (protocol == KProtocolInetUdp)
-                {
-                TInet6HeaderUDP* udpHdr =
-                (TInet6HeaderUDP*) localIP6.iHdr->EndPtr();
-                TUint srcPort = udpHdr->SrcPort();
-
-                if (srcPort == iAppPortNum)
-                    {
-                    // Ingress traffic forwarded from TUN Client Application. Trim the
-                    // outer header and send the original pkt back to the ip stack.
-                    TInt outerHdrLen = TInet6HeaderIP::MinHeaderLength()
-                    + TInet6HeaderUDP::MinHeaderLength();
-
-                    // the info length will be updated by TrimStart
-                    aPacket.TrimStart(outerHdrLen);
-                    
-                    TInet6Packet<TInet6HeaderIP> ip6(aPacket);
-                    //Update the info Address information
-                    TInetAddr::Cast(aInfo.iSrcAddr).SetAddress(ip6.iHdr->SrcAddr());
-                    TInetAddr::Cast(aInfo.iDstAddr).SetAddress(ip6.iHdr->DstAddr());
-
-                    // restart the hook processing from the begining.
-                    return KIp6Hook_DONE;
-                    }
-                else
-                    {
-                    return KIp6Hook_PASS;
-                    }
-                }
-            }
-#endif //IPV6SUPPORT
-        else
-            {
-            Panic(ETunPanic_BadHeader);
-            }
-       }
-    else 
-        {
-        // Outgoing packet from the application to the TUN Client Application
-        // need to mark this packet to be handled at Forward hook.
-
-        if (protocol == KProtocolInetIp)
-            {
-            TInet6Packet<TInet6HeaderIP4> ip(aPacket);
-            TInt tmpTos = ip.iHdr->TOS();
-            tmpTos |= KTunTos;
-            ip.iHdr->SetTOS(tmpTos);
-            TInet6Checksum<TInet6HeaderIP4> lIp(aPacket);
-            lIp.ComputeChecksum(); // recompute checksum as TOS field is updated
-            }
-#ifdef IPV6SUPPORT
-        else if (protocol == KProtocolInet6Ip)
-            {
-            TInet6Packet<TInet6HeaderIP> ip6(aPacket);
-            TInt tmpTrafficClass = ip6.iHdr->TrafficClass();
-            tmpTrafficClass |= KTunTos;
-            ip6.iHdr->SetTrafficClass(tmpTrafficClass);
-            // No need to update checksum in case of IPV6
-            }
-#endif //IPV6SUPPORT        
-        else
-            {
-            Panic(ETunPanic_BadHeader);
-            }
-        return KIp6Hook_PASS;
-        }
-   
-    return KIp6Hook_PASS;
-    }
-
-
-// ----------------------------------------------------------------------------
-// CTunFlowInfo::Open
-// Open the flow, keep reference count.
-// ----------------------------------------------------------------------------
-//
-
-void CTunFlowInfo::Open ()
-    {
-    iRef++;
-    }
-
-// ----------------------------------------------------------------------------
-// CTunFlowInfo::Close
-// Close the flow if the reference count has reached zero. Remove the flow 
-// from any list it is stored.
-// ----------------------------------------------------------------------------
-//
-void CTunFlowInfo::Close ()
-    {
-    if (--iRef < 0)
-        {
-        delete this;
-        }
-    }
-
diff -r bb2423252ea3 -r c1029e558ef5 tcpiputils/tun/src/tunfamily.cpp
--- a/tcpiputils/tun/src/tunfamily.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-// 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:
-//
-
-#include "tunfamily.h"
-#include "tun.h"
-#include <in_chk.h>
-#include <es_prot.h>
-
-
-CProtocolFamilyTun::CProtocolFamilyTun()
-    {
-    __DECLARE_NAME(_S("CProtocolFamilyTun"));
-    }
-
-CProtocolFamilyTun::~CProtocolFamilyTun()
-//Destructor
-    {}
-
-TInt CProtocolFamilyTun::Install()
-    {
-    return KErrNone;
-    }
-
-TInt CProtocolFamilyTun::Remove()
-    {
-    return KErrNone;
-    }
-
-TUint CProtocolFamilyTun::ProtocolList(TServerProtocolDesc* &aProtocolList)
-    {
-    const TInt KArraySize = 1;
-    // Esock catches this leave; hence TRAP is not needed
-    TServerProtocolDesc *p = new (ELeave) TServerProtocolDesc[KArraySize]; 
-    CProtocolTun::Identify(p[KArraySize-1]);
-    aProtocolList = p;
-    return 1;
-    }
-
-CProtocolBase* CProtocolFamilyTun::NewProtocolL(TUint /*aSockType*/,
-                                                   TUint aProtocol)
-    {
-    if (aProtocol != KProtocolTUN)
-        {
-        Panic(ETunPanic_BadBind);
-        }
-
-    CProtocolTun* instance = CProtocolTun::NewL(); 
-    return instance;
-
-    }
-
-
-
-//
-// Entrypoint
-//
-#ifndef EKA2
-GLDEF_C TInt E32Dll()
-    {
-    return KErrNone;
-    }
-#endif //#ifndef EKA2
-
-// Force export of non-mangled name
-extern "C" { IMPORT_C CProtocolFamilyBase* Install(void); }
-EXPORT_C CProtocolFamilyBase* Install(void)
-    {
-    CProtocolFamilyTun* protocol = new CProtocolFamilyTun();
-    if (protocol)
-        {
-        return protocol;
-        }
-    else 
-        {
-        return NULL;
-        }
-    }
-