FCL/sf/os/commsfw: changeset 63:a667ebd03ba5

--- a/commsfwtools/preparedefaultcommsdatabase/Tools/ced/data/meshpreface1.cfg	Tue Jul 20 18:21:51 2010 +0100
+++ b/commsfwtools/preparedefaultcommsdatabase/Tools/ced/data/meshpreface1.cfg	Tue Aug 03 15:29:29 2010 +0100
@@ -257,6 +257,13 @@
 	FIELD_COUNT=2
 END_ADD
 
+ADD_SECTION
+# COMMDB_ID = 12
+	Name=wlanmcpr
+	MCprUid=0x2001B2D2
+	FIELD_COUNT=2
+END_ADD
+
 ## PAN Ether MCpr Uid = 271070626 (0x102835A2)
 ADD_SECTION
 # COMMDB_ID = 13
@@ -458,6 +465,13 @@
 	FIELD_COUNT=2
 END_ADD
 
+ADD_SECTION
+# COMMDB_ID = 12
+	Name=wlan
+	ProtocolUid=0x2001B2D3
+	FIELD_COUNT=2
+END_ADD
+
 ############################################################
 ## BearerTypeTable
 ## 
@@ -611,3 +625,14 @@
 	Protocol=ProtocolTable.11
 	FIELD_COUNT=6
 END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 14
+	Name=wlannif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.12
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.12
+	FIELD_COUNT=6
+END_ADD

--- a/commsfwtools/preparedefaultcommsdatabase/Tools/ced/data/meshpreface2.cfg	Tue Jul 20 18:21:51 2010 +0100
+++ b/commsfwtools/preparedefaultcommsdatabase/Tools/ced/data/meshpreface2.cfg	Tue Aug 03 15:29:29 2010 +0100
@@ -257,6 +257,13 @@
 	FIELD_COUNT=2
 END_ADD
 
+ADD_SECTION
+# COMMDB_ID = 12
+	Name=wlanmcpr
+	MCprUid=0x2001B2D2
+	FIELD_COUNT=2
+END_ADD
+
 ## PAN Ether MCpr Uid = 271070626 (0x102835A2)
 ADD_SECTION
 # COMMDB_ID = 13
@@ -452,6 +459,19 @@
 	FIELD_COUNT=2
 END_ADD
 
+ADD_SECTION
+# COMMDB_ID = 11
+	Name=rawip2
+	ProtocolUid=0x10286AF8
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 12
+	Name=wlan
+	ProtocolUid=0x2001B2D3
+	FIELD_COUNT=2
+END_ADD
 
 ############################################################
 ## BearerTypeTable
@@ -585,3 +605,35 @@
 	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=wlannif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.12
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.12
+	FIELD_COUNT=6
+END_ADD

--- a/commsfwtools/preparedefaultcommsdatabase/Tools/ced/group/ced.iby	Tue Jul 20 18:21:51 2010 +0100
+++ b/commsfwtools/preparedefaultcommsdatabase/Tools/ced/group/ced.iby	Tue Aug 03 15:29:29 2010 +0100
@@ -23,7 +23,12 @@
 #include <Xml.iby>
 #include <stdlib.iby>
 
+#ifdef __ROHID_CED
+file=ABI_DIR\DEBUG_DIR\_rohid_ced.exe                      			System\Libs\ced.exe
+#else
 file=ABI_DIR\DEBUG_DIR\ced.exe                      			System\Libs\ced.exe
+#endif
+
 data=EPOCROOT##epoc32\data\z\system\data\meshpreface1.cfg		system\data\meshpreface1.cfg
 
 #endif

--- a/commsfwtools/preparedefaultcommsdatabase/Tools/ced/src/ced.cpp	Tue Jul 20 18:21:51 2010 +0100
+++ b/commsfwtools/preparedefaultcommsdatabase/Tools/ced/src/ced.cpp	Tue Aug 03 15:29:29 2010 +0100
@@ -98,7 +98,9 @@
 /** flag to indicate whether the execution format is .dll or .exe*/
 TBool gIsExeDLL = EFalse;
 /** flag to indicate whether the configuration file is in XML format */
-TBool gIsXML = ETrue; 
+TBool gIsXML = ETrue;
+/** flag to keep generic records */
+TBool gKeepGenerics = ETrue;
 
 #ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
 TBool gDeprecatedFields = EFalse;
@@ -293,6 +295,7 @@
 		}
 	
 	// delete everything in the database
+	TInt keptElements = 0; 
 	if (ids.Count())
 		{
 		for ( TInt i = ids.Count()-1; i >=0 ; i--)
@@ -302,10 +305,18 @@
 				{
 				gMsg->Msg(_L("%d"),i);
 				}
-			User::LeaveIfError(storage->Delete(ids[i]));
+			if(!gKeepGenerics || ids[i] < KCDInitialUDefRecordType || ids[i] > KCDLastUDefRecordType)
+			    {
+                User::LeaveIfError(storage->Delete(ids[i]));
+			    }
+			else
+			    {
+			    ++keptElements;
+			    }
 			}
 		}
 	
+    gMsg->Msg(_L("Kept %d elements intact (KeepGenerics option == %d"), keptElements, gKeepGenerics);
 	TUint32 aErrorId;
 	err = storage->CommitTransaction(aErrorId);
 
@@ -690,6 +701,10 @@
 	return !gProcessingSuccessful;
 	}
 
+TBool MatchArg(const TDesC& aArg, const TDesC& aOpt)
+    {
+    return aArg.Left(aOpt.Length()).CompareF(aOpt) == 0;
+    }
 
 TInt ParseCommandLineL(TBool &aDebugOn, TBool &aOverWrite, TBool &aForceXMLProcessing, TDes &aIn, TDes &aOut, TDes &aInPref)
 /** Parse the command line for any overriding settings from exe command line 
@@ -734,14 +749,14 @@
 			
 			// CED will report all the failures on the end, unlike success in all the cases except missing cfg file
 			// Switch introduced because of high impact on test results and to avoid BC break
-			if ( arg.FindF(_L("-V")) != KErrNotFound )
+			if ( MatchArg(arg, _L("-V")) )
 				{
 				gValidityChecking = ETrue;
 				continue;
 				}
 
 			//Display help
-			if ( arg.FindF(_L("-H")) != KErrNotFound )
+			if ( MatchArg(arg, _L("-H")) )
 				{
 				HelpDump();
 				CleanupStack::Pop(pCmd);
@@ -750,36 +765,50 @@
 				}
 			
 			// Append database switch
-			if ( arg.FindF(_L("-A")) != KErrNotFound )
+			if ( MatchArg(arg, _L("-A")) )
 				{
 				aOverWrite = EFalse;
 				continue;
 				}
 			
 			// Debug switch
-			if ( arg.FindF(_L("-D")) != KErrNotFound )
+			if ( MatchArg(arg, _L("-D")) )
 				{
 				aDebugOn = ETrue;
 				continue;
 				}
 
 			// Debug switch
-			if ( arg.FindF(_L("-M")) != KErrNotFound )
+			if ( MatchArg(arg, _L("-M")) )
 				{
 				aInPref = pCmd->Arg(++i);
 				continue;
 				}
 			
+            // Keep generics switch
+            if ( MatchArg(arg, _L("-KG")) )
+                {
+                gKeepGenerics = ETrue;
+                continue;
+                }
+			
+            // Zap generics switch
+            if ( MatchArg(arg, _L("-ZG")) )
+                {
+                gKeepGenerics = EFalse;
+                continue;
+                }
+
 			// Presence of invalid table entry links
 			// will not cause an error
-			if ( arg.FindF(_L("-F")) != KErrNotFound )
+			if ( MatchArg(arg, _L("-F")) )
 				{
 				aForceXMLProcessing = ETrue;
 				continue;
 				}
 			
 			// Specification of an input file
-			if ( arg.FindF(_L("-I")) != KErrNotFound )
+			if ( MatchArg(arg, _L("-I")) )
 				{
 				if( i != pCmd->Count()-1 )
 					{
@@ -800,7 +829,7 @@
 					}
 				}
 			// Specification of an output file
-			if ( arg.FindF(_L("-O")) != KErrNotFound )
+			if ( MatchArg(arg, _L("-O")) )
 				{
 				if( i != pCmd->Count()-1 )
 					{
@@ -823,7 +852,7 @@
 			// This must be specified on the tools2 platform.
 			TBuf<16> databaseVersion;
 			
-			if ( arg.FindF(_L("-B")) != KErrNotFound )
+			if ( MatchArg(arg, _L("-B")) )
 				{
 				if( i != pCmd->Count()-1 )
 					{
@@ -929,6 +958,8 @@
 	gConsole->Printf(_L("\n-v  Enables validation of the configuration data while writing to the database."));
 	gConsole->Printf(_L("\n-i  Specifies an input file to CED. Must be either *.xml or *.cfg. Defaults to reading '%S' or '%S'."), &CFG_TARGET, &XML_TARGET);
 	gConsole->Printf(_L("\n-o  Specifies an output file for CED to log to. Defaults to '%S'."), &LOG_TARGET);
+    gConsole->Printf(_L("\n-kg Keep existing generic-record elements (default)"));
+    gConsole->Printf(_L("\n-zg Zap all existing elements including generics (unless appending)"));
 #ifdef __TOOLS2__
 	gConsole->Printf(_L("\n-b  Specifies the binary output should be compatible with this Symbian OS version.\n"));
 #endif

--- a/commsfwtools/preparedefaultcommsdatabase/Tools/ced/te_ced/group/te_cedsuite.iby	Tue Jul 20 18:21:51 2010 +0100
+++ b/commsfwtools/preparedefaultcommsdatabase/Tools/ced/te_ced/group/te_cedsuite.iby	Tue Aug 03 15:29:29 2010 +0100
@@ -20,19 +20,19 @@
 
 #include <testexecute.iby>
 
-file=ABI_DIR\BUILD_DIR\te_cedSuite.exe		sys\bin\te_cedSuite.exe
+data=ABI_DIR\BUILD_DIR\te_cedSuite.exe		sys\bin\te_cedSuite.exe
 data=EPOCROOT##Epoc32\winscw\c\TestData\configs\te_cedSuite.ini TestData\configs\te_cedSuite.ini
 data=EPOCROOT##Epoc32\winscw\c\TestData\scripts\te_cedSuite.script TestData\Scripts\te_cedSuite.Script
-
+data=EPOCROOT##epoc32\winscw\c\testdata\scripts\te_cedtest.script testdata\scripts\te_cedtest.script
 
-data=EPOCROOT##Epoc32\winscw\c\TestData\configs\te_ced_reference_table01.cfg TestData\configs\te_ced_reference_table01.cfg
-data=EPOCROOT##Epoc32\winscw\c\TestData\configs\te_ced_reference_table01.xml TestData\configs\te_ced_reference_table01.xml
-data=EPOCROOT##Epoc32\winscw\c\TestData\configs\te_ced_reference_table01_all.cfg TestData\configs\te_ced_reference_table01_all.cfg
-data=EPOCROOT##Epoc32\winscw\c\TestData\configs\te_ced_reference_table01_IAP_append.cfg TestData\configs\te_ced_reference_table01_IAP_append.cfg
-data=EPOCROOT##Epoc32\winscw\c\TestData\configs\te_ced_reference_table01_IAP_append.xml TestData\configs\te_ced_reference_table01_IAP_append.xml
-data=EPOCROOT##Epoc32\winscw\c\TestData\configs\te_ced_reference_table01_IAP_append_tricky.xml TestData\configs\te_ced_reference_table01_IAP_append_tricky.xml
-data=EPOCROOT##Epoc32\winscw\c\TestData\configs\te_ced_reference_table01_IAP_append02.cfg TestData\configs\configs/te_ced_reference_table01_IAP_append02.cfg
-data=EPOCROOT##Epoc32\winscw\c\TestData\configs\te_ced_reference_table02.cfg TestData\configs\te_ced_reference_table02.cfg
+data=EPOCROOT##Epoc32\release\winscw\udeb\z\TestData\configs\te_ced_reference_table01.cfg TestData\configs\te_ced_reference_table01.cfg
+data=EPOCROOT##Epoc32\release\winscw\udeb\z\TestData\configs\te_ced_reference_table01.xml TestData\configs\te_ced_reference_table01.xml
+data=EPOCROOT##Epoc32\release\winscw\udeb\z\TestData\configs\te_ced_reference_table01_all.cfg TestData\configs\te_ced_reference_table01_all.cfg
+data=EPOCROOT##Epoc32\release\winscw\udeb\z\TestData\configs\te_ced_reference_table01_IAP_append.cfg TestData\configs\te_ced_reference_table01_IAP_append.cfg
+data=EPOCROOT##Epoc32\release\winscw\udeb\z\TestData\configs\te_ced_reference_table01_IAP_append.xml TestData\configs\te_ced_reference_table01_IAP_append.xml
+data=EPOCROOT##Epoc32\release\winscw\udeb\z\TestData\configs\te_ced_reference_table01_IAP_append_tricky.xml TestData\configs\te_ced_reference_table01_IAP_append_tricky.xml
+data=EPOCROOT##Epoc32\release\winscw\udeb\z\TestData\configs\te_ced_reference_table01_IAP_append02.cfg TestData\configs\configs/te_ced_reference_table01_IAP_append02.cfg
+data=EPOCROOT##Epoc32\release\winscw\udeb\z\TestData\configs\te_ced_reference_table02.cfg TestData\configs\te_ced_reference_table02.cfg

--- a/commsfwtools/preparedefaultcommsdatabase/Tools/ceddump/group/_ROHID_ceddump.mmp	Tue Jul 20 18:21:51 2010 +0100
+++ b/commsfwtools/preparedefaultcommsdatabase/Tools/ceddump/group/_ROHID_ceddump.mmp	Tue Aug 03 15:29:29 2010 +0100
@@ -43,6 +43,7 @@
 USERINCLUDE     ../../ced/inc
 
 LIBRARY 	euser.lib efsrv.lib bafl.lib commsdat.lib
+LIBRARY		centralrepository.lib
 
 CAPABILITY ALL -Tcb

--- a/commsfwtools/preparedefaultcommsdatabase/Tools/ceddump/group/ceddump.mmp	Tue Jul 20 18:21:51 2010 +0100
+++ b/commsfwtools/preparedefaultcommsdatabase/Tools/ceddump/group/ceddump.mmp	Tue Aug 03 15:29:29 2010 +0100
@@ -39,6 +39,7 @@
 USERINCLUDE     ../../ced/inc
 
 LIBRARY 	euser.lib efsrv.lib bafl.lib commsdat.lib
+LIBRARY		centralrepository.lib
 
 CAPABILITY ALL -Tcb

--- a/commsfwtools/preparedefaultcommsdatabase/Tools/ceddump/inc/ceddumper.h	Tue Jul 20 18:21:51 2010 +0100
+++ b/commsfwtools/preparedefaultcommsdatabase/Tools/ceddump/inc/ceddumper.h	Tue Aug 03 15:29:29 2010 +0100
@@ -26,6 +26,7 @@
 
 
 #include <e32base.h>
+#include <centralrepository.h>
 #include "filedump.h"
 #include "ceddumpglobals.h"
 
@@ -50,6 +51,8 @@
 #define TRUE_VAL				_S("TRUE")
 #define FALSE_VAL				_S("FALSE")
 
+typedef RArray<SGenericRecordTypeInfo> RRecordInfoArray;
+typedef TBuf<KCDMaxFieldNameLength> TGenericTableName;
 
 class CCedDumper : public CBase
 	{
@@ -93,6 +96,12 @@
 		//this function doesn't need to be modified.
 		void ResolveCommsDatTableNameVariant_to_CommdbTableNameVariant(RBuf& aCommsdatTableName);
 
+		void ListGenericTablesL();
+		void DumpGenericTablesL();
+		void ConvertFieldTypeL(TInt aFieldType, TDes &aConvertedFieldType);
+		void ConvertFieldAttributeL(TInt aFieldAttribute, TDes &aConvertedFieldAttribute);
+		TBool WriteFieldValueL(CMDBGenericRecord* aRecord, const TDesC& aFieldName);
+
 	private:
 		CMDBSession* iDbSession; // Session to connect to CenRep
 		CMDBRecordSetBase *iTable; //To get the Record type
@@ -117,6 +126,11 @@
 // SYMBIAN_NETWORKING_3GPPDEFAULTQOS
         TBool iUseHexFormat;
         TBool iROHIDSupport;
+		CRepository* iRepository;
+
+        RArray<TUint32> iGenericTableIds;
+		RArray<TGenericTableName> iGenericTableNames;
+		RArray<RRecordInfoArray> iGenericTableFields;
 	};
 
 #endif

--- a/commsfwtools/preparedefaultcommsdatabase/Tools/ceddump/src/ceddumper.cpp	Tue Jul 20 18:21:51 2010 +0100
+++ b/commsfwtools/preparedefaultcommsdatabase/Tools/ceddump/src/ceddumper.cpp	Tue Aug 03 15:29:29 2010 +0100
@@ -55,6 +55,8 @@
 #define KLinkSeparator     _L(".")
 #define TableNameTag     _L("Table")
 
+const TUid KCommsDatUid = {0xcccccc00};
+
 const TText* const gAtttibutesArray[]=
 	{
 	Hidden,
@@ -66,7 +68,16 @@
 
 CCedDumper::~CCedDumper()
 	{
-	delete iFileDumper;
+	iGenericTableIds.Close();
+	iGenericTableNames.Close();
+	for(TInt i=0; i<iGenericTableFields.Count();i++)
+		{
+		iGenericTableFields[i].Close();
+		}
+	iGenericTableFields.Close();
+	delete iRepository;
+
+    delete iFileDumper;
 	delete iDbSession;
 	delete iConsole;
 	delete iTable;
@@ -90,6 +101,7 @@
 void CCedDumper::ConstructL()
 	{
 	iConsole = Console::NewL(_L("Ceddump Tool"),TSize(KConsFullScreen,KConsFullScreen));
+	iRepository = CRepository::NewL(KCommsDatUid);
 
 #ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
 	iR99Conversion = EFalse;
@@ -304,6 +316,8 @@
 
 void CCedDumper::DumpContents()
 	{
+	ListGenericTablesL();
+	DumpGenericTablesL();
 
 	TInt loop = 0;
 	TBuf<MAX_COL_NAME_LEN> tempTable;
@@ -2181,3 +2195,224 @@
 	}
 #endif
 //SYMBIAN_NETWORKING_3GPPDEFAULTQOS
+
+void CCedDumper::ListGenericTablesL()
+	{
+	TUint32 KMaskForNames = 0x007FFFFF;
+	TUint32 KKeyForNames = KCDMaskShowFieldType | KCDMaskShowRecordId; 
+	
+	
+	RArray<TUint32> tableIds;
+	iRepository->FindL(KKeyForNames, KMaskForNames, tableIds);
+	for(TInt i=0; i<tableIds.Count();i++)
+		{
+		if(tableIds[i] >= KCDInitialUDefRecordType &&
+		   tableIds[i] <= KCDLastUDefRecordType)
+			{
+			TBuf<KCDMaxFieldNameLength> name;
+			iRepository->Get(tableIds[i], name);
+			iGenericTableIds.Append(tableIds[i]);
+			iGenericTableNames.Append(name);
+			
+			RRecordInfoArray recordInfoArray;
+			
+			RArray<TUint32> fields;
+			TUint32 KMaskForFields = 0xFF80FFFF;
+			TUint32 tableId = tableIds[i];
+			iRepository->FindL(tableIds[i], KMaskForFields, fields);
+			for(TInt j=0; j<fields.Count() - 1;j++)
+			//Do not care about the last one as it is a delimiter.
+				{
+				SGenericRecordTypeInfo ptr;
+				TPckg<SGenericRecordTypeInfo> package(ptr);
+			
+				iRepository->Get(fields[j], package);
+				
+				recordInfoArray.Append(ptr);
+				}
+			iGenericTableFields.Append(recordInfoArray);
+			fields.Close();
+			}
+		
+		}
+	
+	tableIds.Close();
+	}
+	
+void CCedDumper::ConvertFieldTypeL(TInt aFieldType, TDes &aConvertedFieldType)
+	{
+	switch(aFieldType)
+		{
+		case EText:
+			aConvertedFieldType.Copy(_L("EText"));
+			break;
+		case EDesC8:
+			aConvertedFieldType.Copy(_L("EDesC8"));
+			break;
+		case EUint32:
+			aConvertedFieldType.Copy(_L("EUint32"));
+			break;
+		case EInt:
+			aConvertedFieldType.Copy(_L("EInt"));
+			break;
+		case EBool:
+			aConvertedFieldType.Copy(_L("EBool"));
+			break;
+		case EMedText:
+			aConvertedFieldType.Copy(_L("EMedText"));
+			break;
+		case ELongText:
+			aConvertedFieldType.Copy(_L("ELongText"));
+			break;	
+		case ELink:
+			aConvertedFieldType.Copy(_L("ELink"));
+			break;
+		default:
+			User::Leave(KErrArgument);
+		}
+	
+	}
+
+void CCedDumper::ConvertFieldAttributeL(TInt aFieldAttribute, TDes &aConvertedFieldAttribute)
+	{
+	switch(aFieldAttribute)
+		{
+		case ENoAttrs:
+			aConvertedFieldAttribute.Copy(_L("ENoAttrs"));
+			break;
+		case ENotNull:
+			aConvertedFieldAttribute.Copy(_L("ENotNull"));
+			break;
+		default:
+			User::Leave(KErrArgument);
+		}
+	}
+	
+void CCedDumper::DumpGenericTablesL()
+	{
+
+	for(TInt i = 0; i< 	iGenericTableIds.Count(); i++)
+		{
+		TUint32 tableId = iGenericTableIds[i] & KCDMaskShowRecordType;
+		
+		CMDBRecordSet<CMDBGenericRecord>* recordSet = new (ELeave) CMDBRecordSet<CMDBGenericRecord>(tableId);
+		CleanupStack::PushL(recordSet);
+		
+		
+		iFileDumper->WriteTableHeader(iGenericTableNames[i]);
+		
+		//First print out table declaration
+		if(iGenericTableFields[i].Count()>0)
+			{
+			iFileDumper->WriteSectionHeader(-2);
+			_LIT(KFieldStructure, "FIELDSTRUCTURE");
+			_LIT(KFormat, "%08x,%S,%S,%S");
+			TPtrC ptrFieldStructure(KFieldStructure);
+			for(TInt f = 0; f< iGenericTableFields[i].Count(); f++)
+				{
+				// line will hold sth like 00120000,EText,ENotNull,SomeName
+				// its total length is:
+				// hex id : 8 chars
+				// type : max 9 chars
+				// attribute: max 8 chars
+				// 
+				TBuf<KCDMaxFieldNameLength + 30> line;				
+				// type: max 9 chars
+				TBuf<9> fieldType, fieldAttribute;
+				ConvertFieldTypeL(iGenericTableFields[i][f].iValType, fieldType);
+				ConvertFieldAttributeL(iGenericTableFields[i][f].iTypeAttr, fieldAttribute);
+				line.Format(KFormat, iGenericTableFields[i][f].iTypeId, &fieldType, &fieldAttribute ,&(iGenericTableFields[i][f].iTypeName));
+				TPtrC ptrFieldLine(line);
+				iFileDumper->WriteColumnValue(ptrFieldStructure, ptrFieldLine);
+				}
+			iFileDumper->WriteSectionFooter(-2);
+			}
+
+		TRAPD(err, recordSet->LoadL(*iDbSession));
+		if(err!= KErrNotFound)
+			{
+			User::LeaveIfError(err);
+			}
+			
+		for(TInt j = 0; j<recordSet->iRecords.Count();j++)
+			{
+			iFileDumper->WriteSectionHeader(recordSet->iRecords[j]->RecordId());
+			TInt noOfFields(0);
+			for(TInt k = 0; k < iGenericTableFields[i].Count(); k++)
+				{
+				SGenericRecordTypeInfo recordTypeInfo = iGenericTableFields[i][k];
+				if(WriteFieldValueL(reinterpret_cast<CMDBGenericRecord*>(recordSet->iRecords[j]), iGenericTableFields[i][k].iTypeName))
+					{
+					noOfFields++;
+					}
+				}
+			iFileDumper->WriteFieldCount(noOfFields);
+			iFileDumper->WriteSectionFooter(recordSet->iRecords[j]->RecordId());
+			}
+		CleanupStack::PopAndDestroy(recordSet);
+		}
+	}
+	
+TBool CCedDumper::WriteFieldValueL(CMDBGenericRecord* aRecord, const TDesC& aFieldName)
+	{
+	TInt valType;
+	TPtrC ptrFieldName(aFieldName);
+	TBuf<20> bufVal;
+	CMDBElement* element = aRecord->GetFieldByNameL(aFieldName, valType); 
+	if(element->IsNull())
+		{
+		return EFalse;
+		}
+	switch(valType)
+		{
+		case EText:
+		case EMedText:
+		case ELongText:
+			{
+			CMDBField<TDesC>* textField = static_cast<CMDBField<TDesC> *>(element);
+			TPtrC ptrTextField(*textField);
+			iFileDumper->WriteColumnValue(ptrFieldName, ptrTextField);
+			break;
+			}
+		case EDesC8:
+			{
+			CMDBField<TDesC8>* text8Field = static_cast<CMDBField<TDesC8> *>(element);
+			TPtrC8 ptrText8Field(*text8Field);
+			iFileDumper->WriteColumnValue(ptrFieldName, reinterpret_cast<TPtrC&>(ptrText8Field));
+			break;
+			}
+		case EInt:
+			{
+			TInt intVal;
+			CMDBField<TInt>* intField = static_cast<CMDBField<TInt> *>(element);		
+			intVal = *intField;
+			bufVal.Num(intVal);
+			TPtrC ptrIntField(bufVal.MidTPtr(0));
+			iFileDumper->WriteColumnValue(ptrFieldName, ptrIntField);
+			break; 
+			}
+		case EBool:
+			{
+			TBool boolVal;
+			CMDBField<TInt>* boolField = static_cast<CMDBField<TInt> *>(element);
+			boolVal = *boolField;
+			TPtrC ptrBoolField(boolVal?TRUE_VAL:FALSE_VAL);
+			iFileDumper->WriteColumnValue(ptrFieldName, ptrBoolField);
+			break; 
+			}
+		case EUint32:
+		case ELink:
+			{
+			TInt int32Val;
+			CMDBField<TInt>* int32Field = static_cast<CMDBField<TInt> *>(element);
+			int32Val = *int32Field;
+			bufVal.Num(int32Val);
+			TPtrC ptrInt32Field(bufVal.MidTPtr(0));
+			iFileDumper->WriteColumnValue(ptrFieldName, ptrInt32Field);
+			break;		
+			}
+		default:
+			User::Leave(KErrArgument);
+		}
+		return ETrue;
+	}

--- a/commsfwtools/preparedefaultcommsdatabase/Tools/ceddump/src/filedump.cpp	Tue Jul 20 18:21:51 2010 +0100
+++ b/commsfwtools/preparedefaultcommsdatabase/Tools/ceddump/src/filedump.cpp	Tue Aug 03 15:29:29 2010 +0100
@@ -99,6 +99,9 @@
 			case 0:
 				iBuffer.Copy(_L("ADD_TEMPLATE\r\n"));
 				break;
+			case -2:
+				iBuffer.Copy(_L("ADD_DEFINITION\r\n"));
+				break;
 			default:
 				iBuffer.Format(_L("ADD_SECTION\r\n# COMMDB_ID = %d\r\n"),
 					aCommDbId);
@@ -210,6 +213,10 @@
 			{
 			iBuffer.Copy(_L("END_TEMPLATE\r\n\r\n"));
 			}
+		else if (aCommDbId == -2)
+			{
+			iBuffer.Copy(_L("END_DEFINITION\r\n\r\n"));
+			}
 		else
 			{
 			iBuffer.Copy(_L("END_ADD\r\n\r\n"));

--- a/commsfwtools/preparedefaultcommsdatabase/src/CommsDatSessionImpl.cpp	Tue Jul 20 18:21:51 2010 +0100
+++ b/commsfwtools/preparedefaultcommsdatabase/src/CommsDatSessionImpl.cpp	Tue Aug 03 15:29:29 2010 +0100
@@ -157,8 +157,13 @@
         return KErrNone;
         }
     
-    __FLOG_STATIC1(KLogComponent, KCDInfoLog, _L("*** CMDBSessionImpl::ConstructL() constructing session object object <%08x>"), this);
-    
+#ifdef __FLOG_ACTIVE
+    RThread self;
+    TBuf<KMaxFullName> name;
+    self.FullName(name);
+    __FLOG_STATIC2(KLogComponent, KCDInfoLog, _L("*** CMDBSessionImpl::ConstructL() constructing session object <%08x> in thread \"%S\""), this, &name);
+#endif
+
     EstablishVersionL(aRequiredVersion); 
  
     // Connect to the repository
@@ -187,6 +192,7 @@
 @internalComponent
 */
     {
+    __FLOG_STATIC1(KLogComponent, KCDInfoLog, _L("*** CMDBSessionImpl::Close() closing session object <%08x>"), this);
 #ifndef __TOOLS2__
     TRAPD(
         err,

--- a/commsprocess/commsrootserverconfig/CapTestFw_Configurator/common/Te_Cap_Configurator.IBY	Tue Jul 20 18:21:51 2010 +0100
+++ b/commsprocess/commsrootserverconfig/CapTestFw_Configurator/common/Te_Cap_Configurator.IBY	Tue Aug 03 15:29:29 2010 +0100
@@ -18,6 +18,10 @@
 #ifndef __Cap_PARAM_SVR_SUITENAME_IBY__
 #define __Cap_PARAM_SVR_SUITENAME_IBY__
 
-file=ABI_DIR\DEBUG_DIR\Cap_PARAM_SVR_SUITENAME.exe System\bin\Cap_PARAM_SVR_SUITENAME.exe
-
+data=ABI_DIR\DEBUG_DIR\Cap_PARAM_SVR_SUITENAME.exe System\bin\Cap_PARAM_SVR_SUITENAME.exe
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Te_cap_configurator.script   TestData\Scripts\Te_cap_configurator.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_00000000_Te_Cap_ConfiguratorSub.script TestData\Scripts\Cap_00000000_Te_Cap_ConfiguratorSub.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_00000004_Te_Cap_ConfiguratorSub.script TestData\Scripts\Cap_00000004_Te_Cap_ConfiguratorSub.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_00000400_Te_Cap_ConfiguratorSub.script TestData\Scripts\Cap_00000400_Te_Cap_ConfiguratorSub.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_00000404_Te_Cap_ConfiguratorSub.script TestData\Scripts\Cap_00000404_Te_Cap_ConfiguratorSub.script
 #endif

--- a/commsprocess/commsrootserverconfig/Te_Configurator/util/src/configloader.cpp	Tue Jul 20 18:21:51 2010 +0100
+++ b/commsprocess/commsrootserverconfig/Te_Configurator/util/src/configloader.cpp	Tue Aug 03 15:29:29 2010 +0100
@@ -437,7 +437,7 @@
 	// Leave with last seen error, if any
 	if(err!=KErrNone)
 		{
-		User::Leave(err);
+//		User::Leave(err);
 		}
 	}

--- a/datacommsserver/esockserver/test/CapTests/RConnServ/Common/Server.csv	Tue Jul 20 18:21:51 2010 +0100
+++ b/datacommsserver/esockserver/test/CapTests/RConnServ/Common/Server.csv	Tue Aug 03 15:29:29 2010 +0100
@@ -1,2 +1,2 @@
 Name,MajorName,MinorName,BuildName,ListHeaderFile,Panic,SuiteName,SourceDirectory,TemplateDirectory,MessageFile,TemplateFile,Libraries,UserInclude,SystemInclude,BuildOK,ConnectCapability,CapExcept,AllNegative
-!ConnectionServer,KES32MajorVersionNumber,KES32MinorVersionNumber,KES32BuildVersionNumber,es_ver.h,TESockPanic,Te_Cap_RConnServ,..\..\CapTestSourceEsock_RConnServ,.,Message.csv,Template.csv,euser.lib c32root.lib commsfw.lib esocksvr.lib insock.lib esock.lib,.\,\epoc32\include,yes,,,1
+!ConnectionServer,KES32MajorVersionNumber,KES32MinorVersionNumber,KES32BuildVersionNumber,es_ver.h,TESockPanic,Te_Cap_RConnServ,..\..\CapTestSourceEsock_RConnServ,.,Message.csv,Template.csv,euser.lib c32root.lib commsfw.lib esocksvr.lib insock.lib esock.lib netmeta.lib,.\,\epoc32\include,yes,,,1

--- a/datacommsserver/esockserver/test/CapTests/RConnServ/Common/Te_Cap_RConnServ.IBY	Tue Jul 20 18:21:51 2010 +0100
+++ b/datacommsserver/esockserver/test/CapTests/RConnServ/Common/Te_Cap_RConnServ.IBY	Tue Aug 03 15:29:29 2010 +0100
@@ -18,6 +18,8 @@
 #ifndef __Cap_PARAM_SVR_SUITENAME_IBY__
 #define __Cap_PARAM_SVR_SUITENAME_IBY__
 
-file=ABI_DIR\DEBUG_DIR\Cap_PARAM_SVR_SUITENAME.DLL System\bin\Cap_PARAM_SVR_SUITENAME.DLL
-
+data=ABI_DIR\DEBUG_DIR\PARAM_SVR_SUITENAME.exe Sys\bin\PARAM_SVR_SUITENAME.exe
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Te_Cap_RConnServ.script   TestData\Scripts\Te_Cap_RConnServ.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_00000000_RConnServSub.script TestData\Scripts\Cap_00000000_RConnServSub.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_00002000_RConnServSub.script TestData\Scripts\Cap_00002000_RConnServSub.script
 #endif

--- a/datacommsserver/esockserver/test/CapTests/Resolver/Common/Te_Cap_RES.IBY	Tue Jul 20 18:21:51 2010 +0100
+++ b/datacommsserver/esockserver/test/CapTests/Resolver/Common/Te_Cap_RES.IBY	Tue Aug 03 15:29:29 2010 +0100
@@ -27,6 +27,6 @@
 data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_00000400_RESSub.script 	TestData\Scripts\Cap_00000400_RESSub.script
 data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_00002000_ReSSub.script 	TestData\Scripts\Cap_00002000_ResSub.script
 data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_00002400_ReSSub.script 	TestData\Scripts\Cap_00002400_ReSSub.script
-
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_80000000_RESSub.script		TestData\Scripts\Cap_80000000_RESSub.script
 
 #endif

--- a/datacommsserver/esockserver/test/CapTests/Socket/Common/Te_Cap_Esock.IBY	Tue Jul 20 18:21:51 2010 +0100
+++ b/datacommsserver/esockserver/test/CapTests/Socket/Common/Te_Cap_Esock.IBY	Tue Aug 03 15:29:29 2010 +0100
@@ -27,6 +27,6 @@
 data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_00000400_EsockSub.script 	TestData\Scripts\Cap_00000400_EsockSub.script
 data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_00002000_EsockSub.script 	TestData\Scripts\Cap_00002000_EsockSub.script
 data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_00002400_EsockSub.script 	TestData\Scripts\Cap_00002400_EsockSub.script
-
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_80000000_EsockSub.script 	TestData\Scripts\Cap_80000000_EsockSub.script
 
 #endif

--- a/datacommsserver/esockserver/test/TE_ESock/TestSuiteEsock.cpp	Tue Jul 20 18:21:51 2010 +0100
+++ b/datacommsserver/esockserver/test/TE_ESock/TestSuiteEsock.cpp	Tue Aug 03 15:29:29 2010 +0100
@@ -79,20 +79,10 @@
 // Third phase constructor for ESOCK test suite
 void CTestSuiteEsock::InitialiseL( void )
 	{
-	TInt ret = User::LoadPhysicalDevice( PDD_NAME );
-	if ( KErrNone != ret && KErrAlreadyExists != ret )
-		{
-		User::Leave( ret );
-		}
-	ret = User::LoadLogicalDevice( LDD_NAME );
-	if ( KErrNone != ret && KErrAlreadyExists != ret )
-		{
-		User::Leave( ret );
-		}
 	// When bootstrapping C32 we have to avoid the PhBkSyncServer being started, since
 	// it needs a different CommDB
 	_LIT(KPhbkSyncCMI, "phbsync.cmi");
-    ret = StartC32WithCMISuppressions(KPhbkSyncCMI);
+    TInt ret = StartC32WithCMISuppressions(KPhbkSyncCMI);
 	if ( KErrNone != ret && KErrAlreadyExists != ret )
 		{
 		User::Leave( ret );

--- a/datacommsserver/esockserver/test/TE_ESock/group/bld.inf	Tue Jul 20 18:21:51 2010 +0100
+++ b/datacommsserver/esockserver/test/TE_ESock/group/bld.inf	Tue Aug 03 15:29:29 2010 +0100
@@ -56,6 +56,7 @@
 ../scriptfiles/te_esock.xml                                         z:/testdata/configs/te_esock.xml
 ../scriptfiles/te_esock_ethernet_MOMAP16xx.xml                      z:/testdata/configs/te_esock_ethernet_momap16xx.xml
 ../scriptfiles/te_esock_ethernet_wins.xml                           z:/testdata/configs/te_esock_ethernet.xml
+../scriptfiles/te_esock_wlan.xml                                    z:/testdata/configs/te_esock_wlan.xml
 
 ../scriptfiles/hosts.te_esock                                       z:/testdata/configs/hosts.te_esock

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/datacommsserver/esockserver/test/TE_ESock/scriptfiles/TE_ESock_IP4_Net_wlan.script	Tue Aug 03 15:29:29 2010 +0100
@@ -0,0 +1,38 @@
+//
+// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT ***************************************************************
+PRINT	       Perform all the TE_ESOCK Connection tests on PPP (IPv4)
+PRINT ***************************************************************
+
+// Ensure that the default config is present if no cleverer one has been put there already
+RUN_SCRIPT z:\testdata\scripts\exec_esock_default_to_config_1.script
+
+RUN_SCRIPT z:\testdata\scripts\te_esock_test_unloadesockForced.script
+
+ced -i z:\testdata\configs\te_esock_wlan.xml ced.log
+
+RUN_SCRIPT z:\testdata\scripts\te_esock_test_loadesock.script
+
+// copy the relevant ini file
+RUN_UTILS CopyFile z:\testdata\configs\test_esock_ip4_vlan2.ini c:\test_esock_ip.ini
+RUN_UTILS MakeReadWrite c:\test_esock_ip.ini
+
+RUN_SCRIPT z:\testdata\scripts\te_esock_tests-net-ip.script
+
+RUN_UTILS DeleteFile c:\test_esock_ip.ini
+
+RUN_SCRIPT z:\testdata\scripts\te_esock_test_unloadesockForced.script

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/datacommsserver/esockserver/test/TE_ESock/scriptfiles/te_esock_wlan.xml	Tue Aug 03 15:29:29 2010 +0100
@@ -0,0 +1,1200 @@
+<?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
+
+-->
+
+
+
+<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>
+</NetworkTable>
+
+<IAPTable>
+    <IAP operation="add">
+        <Name>NT RAS</Name>
+        <IAPService>DialOutISP.NT RAS</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.Intranet</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.GPRS Ericsson R520m via IR</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Mobile</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>Padding for removed CDMA IAP</Name>
+        <IAPService>DialOutISP.NT RAS</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.Intranet</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.US Robotics Sportster</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Home</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>LAN Test IAP</Name>
+        <IAPService>LANService.Ethernet (IPv6 static DNS)</IAPService>
+        <IAPBearer>LANBearer.Ethernet</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+        <Name>NT RAS (IPv6 static DNS)</Name>
+        <IAPService>DialOutISP.NT RAS (IPv6 static DNS)</IAPService>
+        <IAPBearer>ModemBearer.Null Modem 115200bps</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
+    </IAP>
+    <IAP operation="add">
+		<Name>WlanConnectivity</Name>
+		<IAPService>LANService.WlanConnectivity</IAPService>
+       <IAPBearer>LANBearer.WLANBearer</IAPBearer>
+		<IAPNetwork>Network.Intranet</IAPNetwork>
+		<IAPNetworkWeighting>0</IAPNetworkWeighting>
+		<LocationRef>Location.Office Direct Dial</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>
+        <CommRole>0</CommRole>
+    </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>
+        <LastSocketActivityTimeout>50</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>30</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>40</LastSocketClosedTimeout>
+    </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>
+        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+    </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>
+        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+    </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>+442079460223</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+    </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>+442079460223</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <MinimumSignalLevel>9905</MinimumSignalLevel>
+        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>GPRS Ericsson R520m via IR</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>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>+442079460223</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>GPRS Ericsson R520m via Serial</Name>
+        <Agent>null.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>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>+442079460223</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+    </ModemBearer>
+    <ModemBearer operation="add">
+        <Name>GPRS Motorola Mobile Phone via Serial</Name>
+        <Agent>null.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>+442079460223</MessageCentreNumber>
+        <MessageValidityPeriod>1440</MessageValidityPeriod>
+        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
+        <LastSocketActivityTimeout>6</LastSocketActivityTimeout>
+        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
+        <LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+    </ModemBearer>
+</ModemBearerTable>
+
+<LANBearerTable>
+    <LANBearer operation="add">
+        <Name>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>
+    <LANBearer operation="add">
+		<Name>WLANBearer</Name>
+		<IfName>wlannif</IfName>
+		<LDDName>not used</LDDName>
+		<PDDName>not used</PDDName>
+		<LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+		<LastSessionClosedTimeout>1</LastSessionClosedTimeout>
+		<LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+		<Agent>wlanagt.agt</Agent>
+    </LANBearer>
+</LANBearerTable>
+
+<LANServiceTable>
+    <LANService operation="add">
+		<Name>WlanConnectivity</Name>
+		<IfNetworks>ip</IfNetworks>
+		<IpNetMask>255.255.255.0</IpNetMask>
+		<IpGateway>0.0.0.0</IpGateway>
+		<IpAddrFromServer>TRUE</IpAddrFromServer>
+		<IpAddr>0.0.0.0</IpAddr>
+		<IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+		<IpNameServer1>0.0.0.0</IpNameServer1>
+		<IpNameServer2>0.0.0.0</IpNameServer2>
+		<Ip6DnsAddrFromServer>TRUE</Ip6DnsAddrFromServer>
+		<Ip6NameServer1>0:0:0:0:0:0:0:0</Ip6NameServer1>
+		<Ip6NameServer2>0:0:0:0:0:0:0:0</Ip6NameServer2>
+		<IpAddrLeaseValidFrom>0</IpAddrLeaseValidFrom>
+		<ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
+		<ConfigDaemonName>!DhcpServ</ConfigDaemonName>
+    </LANService>
+    <LANService operation="add">
+        <Name>Ethernet</Name>
+        <IfNetworks>ip,ip6</IfNetworks>
+        <IpNetMask>255.255.255.0</IpNetMask>
+        <IpGateway>194.72.6.1</IpGateway>
+        <IpAddr>192.168.0.100</IpAddr>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <IpNameServer1>194.72.6.51</IpNameServer1>
+        <IpNameServer2>194.72.6.52</IpNameServer2>
+    </LANService>
+    <LANService operation="add">
+        <Name>Ethernet (IPv6 static DNS)</Name>
+        <IfNetworks>ip,ip6</IfNetworks>
+        <IpNetMask>255.255.255.0</IpNetMask>
+        <IpGateway>10.1.2.3</IpGateway>
+        <IpAddr>192.168.0.100</IpAddr>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+        <Ip6DNSAddrFromServer>FALSE</Ip6DNSAddrFromServer>
+        <IpNameServer1>10.1.2.4</IpNameServer1>
+        <IpNameServer2>10.1.2.5</IpNameServer2>
+        <Ip6NameServer1>fe80:0:0:0:0:0:1234:5678</Ip6NameServer1>
+        <Ip6NameServer2>fe80:0:0:0:0:0:8765:4321</Ip6NameServer2>
+    </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,ip6</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</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>UNSPECIFIED</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>NT RAS (IPv6 static DNS)</Name>
+        <DialResolution>TRUE</DialResolution>
+        <UseLoginScript>TRUE</UseLoginScript>
+        <PromptForLogin>FALSE</PromptForLogin>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <Ip6DNSAddrFromServer>FALSE</Ip6DNSAddrFromServer>
+        <Description>Test</Description>
+        <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,ip6</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <AuthRetries>0</AuthRetries>
+        <Ip6NameServer1>fe80:0:0:0:0:0:1234:5678</Ip6NameServer1>
+        <Ip6NameServer2>fe80:0:0:0:0:0:8765:4321</Ip6NameServer2>
+        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
+        <EnableLCPExtension>FALSE</EnableLCPExtension>
+        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
+        <EnableSWComp>FALSE</EnableSWComp>
+    </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>INCOMING</Direction>
+        <DialogPref>DONOTPROMPT</DialogPref>
+        <BearerSet>CSD</BearerSet>
+        <IAPRef>IAP.Default Dial In ISP</IAPRef>
+    </ConnectionPreferences>
+    <ConnectionPreferences operation="add">
+        <Name>ConnectionPreferencesTable2</Name>
+        <Ranking>1</Ranking>
+        <Direction>OUTGOING</Direction>
+        <DialogPref>DONOTPROMPT</DialogPref>
+        <BearerSet>LAN</BearerSet>
+        <IAPRef>IAP.WlanConnectivity</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.Intranet</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>+442079460221</GatewayAddress>
+        <WSPOption>CONNECTIONORIENTED</WSPOption>
+        <Security>FALSE</Security>
+        <ServiceCentreAddress>+442079460223</ServiceCentreAddress>
+    </WAPSMSBearer>
+</WAPSMSBearerTable>
+
+<VirtualBearerTable>
+</VirtualBearerTable>
+
+<VpnServiceTable>
+</VpnServiceTable>
+
+
+</CommDB:Config>

--- a/datacommsserver/esockserver/test/TE_ESock/scriptfiles/test_esock_ip4_vlan2.ini	Tue Jul 20 18:21:51 2010 +0100
+++ b/datacommsserver/esockserver/test/TE_ESock/scriptfiles/test_esock_ip4_vlan2.ini	Tue Aug 03 15:29:29 2010 +0100
@@ -26,16 +26,16 @@
 
 [Test_3.4]
 //-- loncoredev01
-ipAddress=10.23.140.123
-port=5001
+ipAddress=10.29.23.103
+port=643
 
 [Test_3.5]
 port=7
 
 [Test_3.6]
 //-- loncoredev01
-ipAddress=10.23.140.123
-errorPort=5001
+ipAddress=10.29.23.10
+errorPort=643
 validPort=7
 validTries=3

--- a/datacommsserver/esockserver/test/TE_ESock/scriptfiles/test_esock_ip4_vlan7.ini	Tue Jul 20 18:21:51 2010 +0100
+++ b/datacommsserver/esockserver/test/TE_ESock/scriptfiles/test_esock_ip4_vlan7.ini	Tue Aug 03 15:29:29 2010 +0100
@@ -1,5 +1,5 @@
 [Test_Common]
-ipAddress=192.168.20.11
+ipAddress=10.29.23.103
 
 [Test_2.1]
 numSockets=1
@@ -25,16 +25,16 @@
 port=1
 
 [Test_3.4]
-ipAddress=192.168.20.11
-port=5001
+ipAddress=10.29.23.103
+port=643
 
 [Test_3.5]
 port=7
 
 [Test_3.6]
-//-- 6TUNNELLER
-ipAddress=192.168.20.2
-errorPort=6060
+//-- 6TUNNELLEREXTERNAL
+ipAddress=10.29.23.10
+errorPort=643
 validPort=7
 validTries=3
 
@@ -306,8 +306,8 @@
 //-- Testing 'A' query
 [Test27.1]
 Entries=2
-Param1=robocop.movie.edu
-Param2=wormhole.movie.edu
+Param1=httpsmtp.closedtest.intra
+Param2=httpsmtpssl.closedtest.intra
 
 //-- Testing 'SVR' query 
 [Test27.2]        
@@ -334,8 +334,8 @@
 //-- Testing 'A' query with explicit connection
 [Test27.7]
 Entries=2
-Param1=robocop.movie.edu
-Param2=wormhole.movie.edu
+Param1=httpsmtp.closedtest.intra
+Param2=httpsmtpssl.closedtest.intra
 
 //-- Testing Query() interface on two threads
 [Test27.8]

--- a/datacommsserver/esockserver/test/TE_EsockTestSteps/group/TE_EsockTestStepsSuite.iby	Tue Jul 20 18:21:51 2010 +0100
+++ b/datacommsserver/esockserver/test/TE_EsockTestSteps/group/TE_EsockTestStepsSuite.iby	Tue Aug 03 15:29:29 2010 +0100
@@ -20,6 +20,7 @@
 #define __TE_ESOCKTESTSTEPSSUITE_IBY__
 
 #include <te_esockteststeps.iby>
+data=ABI_DIR\DEBUG_DIR\Te_esockteststepsSuite_captest.exe sys\bin\te_esockteststepsSuite_captest.exe
 
 #endif

--- a/datacommsserver/esockserver/test/TE_RConnectionSuite/config/ainethernet_MOMAP16xx.xml	Tue Jul 20 18:21:51 2010 +0100
+++ b/datacommsserver/esockserver/test/TE_RConnectionSuite/config/ainethernet_MOMAP16xx.xml	Tue Aug 03 15:29:29 2010 +0100
@@ -30,10 +30,10 @@
 
 <NetworkTable>
     <Network operation="add">
-        <Name>NT RAS</Name>
+        <Name>Intranet</Name>
     </Network>
     <Network operation="add">
-        <Name>Intranet</Name>
+        <Name>NT RAS</Name>
     </Network>
     <Network operation="add">
         <Name>Linux</Name>
@@ -64,12 +64,12 @@
         <LocationRef>Location.Mobile</LocationRef>
     </IAP>
     <IAP operation="add">
-        <Name>iTest name cdma2000</Name>
-        <IAPService>CDMA2000PacketService.test name cdma2000</IAPService>
-        <IAPBearer>ModemBearer.Dummy 2</IAPBearer>
+        <Name>Additional 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.Mobile</LocationRef>
+        <LocationRef>Location.Home</LocationRef>
     </IAP>
     <IAP operation="add">
         <Name>Default Dial In ISP</Name>
@@ -96,12 +96,12 @@
         <LocationRef>Location.Office Direct Dial</LocationRef>
     </IAP>
     <IAP operation="add">
-        <Name>Ethernet with Daemon Dynamic IP</Name>
-        <IAPService>LANService.Ethernet</IAPService>
-        <IAPBearer>LANBearer.EKA2 Ethernet</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
+		<Name>WlanConnectivity</Name>
+		<IAPService>LANService.WlanConnectivity</IAPService>
+       <IAPBearer>LANBearer.WLANBearer</IAPBearer>
+		<IAPNetwork>Network.Intranet</IAPNetwork>
+		<IAPNetworkWeighting>0</IAPNetworkWeighting>
+		<LocationRef>Location.Office Direct Dial</LocationRef>
     </IAP>
     <IAP operation="add">
         <Name>Virtual Comm port</Name>
@@ -156,8 +156,8 @@
         <IAPService>DialOutISP.Dummy</IAPService>
         <IAPBearer>ModemBearer.Dummy</IAPBearer>
         <IAPNetwork>Network.Dummy</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office Direct Dial</LocationRef>
+		<IAPNetworkWeighting>0</IAPNetworkWeighting>
+		<LocationRef>Location.Office Direct Dial</LocationRef>
     </IAP>
 </IAPTable>
 
@@ -638,33 +638,34 @@
 
 <LANBearerTable>
     <LANBearer operation="add">
-	<Name>EKA2 Ethernet</Name>
-	<Agent>nullagt.agt</Agent>
-	<IfName>ethint</IfName>
-	<LDDFilename>enet</LDDFilename>
-	<LDDName>Ethernet</LDDName>
-	<PDDFilename>ethernet</PDDFilename>
-	<PDDName>Ethernet.MOMAP16xx</PDDName>
-	<PacketDriverName>EtherPkt.drv</PacketDriverName>
-	<LastSocketActivityTimeout>10</LastSocketActivityTimeout>
-	<LastSessionClosedTimeout>10</LastSessionClosedTimeout>
-	<LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+		<Name>WLANBearer</Name>
+		<IfName>wlannif</IfName>
+		<LDDName>not used</LDDName>
+		<PDDName>not used</PDDName>
+		<LastSocketActivityTimeout>10</LastSocketActivityTimeout>
+		<LastSessionClosedTimeout>10</LastSessionClosedTimeout>
+		<LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+		<Agent>wlanagt.agt</Agent>
     </LANBearer>
 </LANBearerTable>
 
 <LANServiceTable>
     <LANService operation="add">
-        <Name>Ethernet</Name>
-        <IfNetworks>ip</IfNetworks>
-        <IpNetMask>255.255.255.0</IpNetMask>
-        <IpGateway>10.23.143.254</IpGateway>
-        <IpAddr></IpAddr>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <IpNameServer1>10.16.59.15</IpNameServer1>
-        <IpNameServer2>10.112.58.6</IpNameServer2>
-        <ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
-        <ConfigDaemonName>!DhcpServ</ConfigDaemonName>
+		<Name>WlanConnectivity</Name>
+		<IfNetworks>ip</IfNetworks>
+		<IpNetMask>255.255.255.0</IpNetMask>
+		<IpGateway>0.0.0.0</IpGateway>
+		<IpAddrFromServer>TRUE</IpAddrFromServer>
+		<IpAddr>0.0.0.0</IpAddr>
+		<IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+		<IpNameServer1>0.0.0.0</IpNameServer1>
+		<IpNameServer2>0.0.0.0</IpNameServer2>
+		<Ip6DnsAddrFromServer>TRUE</Ip6DnsAddrFromServer>
+		<Ip6NameServer1>0:0:0:0:0:0:0:0</Ip6NameServer1>
+		<Ip6NameServer2>0:0:0:0:0:0:0:0</Ip6NameServer2>
+		<IpAddrLeaseValidFrom>0</IpAddrLeaseValidFrom>
+		<ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
+		<ConfigDaemonName>!DhcpServ</ConfigDaemonName>
     </LANService>
 </LANServiceTable>
 
@@ -863,49 +864,6 @@
 <AgentLookupTable>
 </AgentLookupTable>
 
-<CDMA2000PacketServiceTable>
-    <CDMA2000PacketService operation="add">
-        <Name>test name cdma2000</Name>
-        <IwfName>Test2000</IwfName>
-        <ServiceOption>HIGHSPEEDCDMA2000DATA</ServiceOption>
-        <PdpType>IPV4</PdpType>
-        <ReqFwdPriority>PRIORITY04</ReqFwdPriority>
-        <ReqRevPriority>PRIORITY04</ReqRevPriority>
-        <ReqFwdBitrate>32KBPS</ReqFwdBitrate>
-        <ReqRevBitrate>32KBPS</ReqRevBitrate>
-        <ReqFwdLoss>LOSS1</ReqFwdLoss>
-        <ReqRevLoss>LOSS1</ReqRevLoss>
-        <ReqFwdMaxdelay>40MS</ReqFwdMaxdelay>
-        <ReqRevMaxdelay>40MS</ReqRevMaxdelay>
-        <MinFwdBitrate>8KBPS</MinFwdBitrate>
-        <MinRevBitrate>8KBPS</MinRevBitrate>
-        <AccptFwdLoss>LOSS2</AccptFwdLoss>
-        <AccptRevLoss>LOSS2</AccptRevLoss>
-        <AccptFwdMaxdelay>120MS</AccptFwdMaxdelay>
-        <AccptRevMaxdelay>120MS</AccptRevMaxdelay>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>RasUser</IfAuthName>
-        <IfAuthPass>pass</IfAuthPass>
-        <AuthRetries>1</AuthRetries>
-        <IpNetMask>0.255.255.255</IpNetMask>
-        <IpGateway>10.0.0.1</IpGateway>
-        <EnableLCPExtension>TRUE</EnableLCPExtension>
-        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
-        <ApType>2</ApType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <RlpMode>UNKNOWN</RlpMode>
-        <CDMAMobileIP>FALSE</CDMAMobileIP>
-        <CDMAMobileIPTimeout>10000000</CDMAMobileIPTimeout>
-    </CDMA2000PacketService>
-</CDMA2000PacketServiceTable>
-
-<DefaultCDMA2000Table>
-</DefaultCDMA2000Table>
 
 <ChargecardTable>
     <Chargecard operation="add">
@@ -941,7 +899,7 @@
         <Direction>OUTGOING</Direction>
         <DialogPref>DONOTPROMPT</DialogPref>
         <BearerSet>LAN</BearerSet>
-        <IAPRef>IAP.Ethernet with Daemon Dynamic IP</IAPRef>
+        <IAPRef>IAP.WlanConnectivity</IAPRef>
     </ConnectionPreferences>
 </ConnectionPreferencesTable>

--- a/datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectioncmm_ethernet_MOMAP16xx.xml	Tue Jul 20 18:21:51 2010 +0100
+++ b/datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectioncmm_ethernet_MOMAP16xx.xml	Tue Aug 03 15:29:29 2010 +0100
@@ -6,7 +6,6 @@
  under the terms of "Eclipse Public License v1.0"
  which accompanies this distribution, and is available
  at the URL "http://www.eclipse.org/legal/epl-v10.html".
-
  Initial Contributors:
  Nokia Corporation - initial contribution.
 
@@ -102,12 +101,12 @@
         <LocationRef>Location.Office Direct Dial</LocationRef>
     </IAP>
     <IAP operation="add">
-        <Name>Ethernet with Daemon Dynamic IP</Name>
-        <IAPService>LANService.Ethernet</IAPService>
-        <IAPBearer>LANBearer.EKA2 Ethernet</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
+		<Name>WlanConnectivity</Name>
+		<IAPService>LANService.WlanConnectivity</IAPService>
+       <IAPBearer>LANBearer.WLANBearer</IAPBearer>
+		<IAPNetwork>Network.Intranet</IAPNetwork>
+		<IAPNetworkWeighting>0</IAPNetworkWeighting>
+		<LocationRef>Location.Office Direct Dial</LocationRef>
     </IAP>
     <IAP operation="add">
         <Name>Virtual Comm port</Name>
@@ -695,33 +694,34 @@
 
 <LANBearerTable>
     <LANBearer operation="add">
-	<Name>EKA2 Ethernet</Name>
-	<Agent>nullagt.agt</Agent>
-	<IfName>ethint</IfName>
-	<LDDFilename>enet</LDDFilename>
-	<LDDName>Ethernet</LDDName>
-	<PDDFilename>ethernet</PDDFilename>
-	<PDDName>Ethernet.MOMAP16xx</PDDName>
-	<PacketDriverName>EtherPkt.drv</PacketDriverName>
-	<LastSocketActivityTimeout>10</LastSocketActivityTimeout>
-	<LastSessionClosedTimeout>10</LastSessionClosedTimeout>
-	<LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+		<Name>WLANBearer</Name>
+		<IfName>wlannif</IfName>
+		<LDDName>not used</LDDName>
+		<PDDName>not used</PDDName>
+		<LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
+		<LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
+		<LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
+		<Agent>wlanagt.agt</Agent>
     </LANBearer>
 </LANBearerTable>
 
 <LANServiceTable>
     <LANService operation="add">
-        <Name>Ethernet</Name>
-        <IfNetworks>ip</IfNetworks>
-        <IpNetMask>255.255.255.0</IpNetMask>
-        <IpGateway>10.23.143.254</IpGateway>
-        <IpAddr></IpAddr>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <IpNameServer1>10.16.59.15</IpNameServer1>
-        <IpNameServer2>10.112.58.6</IpNameServer2>
-        <ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
-        <ConfigDaemonName>!DhcpServ</ConfigDaemonName>
+		<Name>WlanConnectivity</Name>
+		<IfNetworks>ip</IfNetworks>
+		<IpNetMask>255.255.255.0</IpNetMask>
+		<IpGateway>0.0.0.0</IpGateway>
+		<IpAddrFromServer>TRUE</IpAddrFromServer>
+		<IpAddr>0.0.0.0</IpAddr>
+		<IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+		<IpNameServer1>0.0.0.0</IpNameServer1>
+		<IpNameServer2>0.0.0.0</IpNameServer2>
+		<Ip6DnsAddrFromServer>TRUE</Ip6DnsAddrFromServer>
+		<Ip6NameServer1>0:0:0:0:0:0:0:0</Ip6NameServer1>
+		<Ip6NameServer2>0:0:0:0:0:0:0:0</Ip6NameServer2>
+		<IpAddrLeaseValidFrom>0</IpAddrLeaseValidFrom>
+		<ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
+		<ConfigDaemonName>!DhcpServ</ConfigDaemonName>
     </LANService>
 </LANServiceTable>
 
@@ -1000,7 +1000,7 @@
         <Direction>OUTGOING</Direction>
         <DialogPref>DONOTPROMPT</DialogPref>
         <BearerSet>LAN</BearerSet>
-        <IAPRef>IAP.Ethernet with Daemon Dynamic IP</IAPRef>
+        <IAPRef>IAP.WlanConnectivity</IAPRef>
     </ConnectionPreferences>
 </ConnectionPreferencesTable>

--- a/datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectionconfigdaemon_MOMAP16xx.xml	Tue Jul 20 18:21:51 2010 +0100
+++ b/datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectionconfigdaemon_MOMAP16xx.xml	Tue Aug 03 15:29:29 2010 +0100
@@ -80,7 +80,7 @@
     <IAP operation="add">
         <Name>Emulator Lan IAP No Daemon</Name>
         <IAPService>LANService.Ethernet No Daemon</IAPService>
-        <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
+        <IAPBearer>LANBearer.WLANBearer</IAPBearer>
         <IAPNetwork>Network.Intranet</IAPNetwork>
         <IAPNetworkWeighting>0</IAPNetworkWeighting>
         <LocationRef>Location.Office</LocationRef>
@@ -88,7 +88,7 @@
     <IAP operation="add">
         <Name>Emulator Lan IAP Bad Daemon</Name>
         <IAPService>LANService.Ethernet Bad Daemon</IAPService>
-        <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
+        <IAPBearer>LANBearer.WLANBearer</IAPBearer>
         <IAPNetwork>Network.mRouter</IAPNetwork>
         <IAPNetworkWeighting>0</IAPNetworkWeighting>
         <LocationRef>Location.Office</LocationRef>
@@ -96,7 +96,7 @@
     <IAP operation="add">
         <Name>Emulator Lan IAP Static IP 1</Name>
         <IAPService>LANService.Ethernet Static IP</IAPService>
-        <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
+        <IAPBearer>LANBearer.WLANBearer</IAPBearer>
         <IAPNetwork>Network.mRouter</IAPNetwork>
         <IAPNetworkWeighting>0</IAPNetworkWeighting>
         <LocationRef>Location.Office</LocationRef>
@@ -104,23 +104,23 @@
     <IAP operation="add">
         <Name>Emulator Lan IAP Static IP 2</Name>
         <IAPService>LANService.Ethernet Static IP</IAPService>
-        <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
+        <IAPBearer>LANBearer.WLANBearer</IAPBearer>
         <IAPNetwork>Network.Intranet</IAPNetwork>
         <IAPNetworkWeighting>0</IAPNetworkWeighting>
         <LocationRef>Location.Office</LocationRef>
     </IAP>
     <IAP operation="add">
-        <Name>Emulator Lan IAP 1</Name>
-        <IAPService>LANService.Ethernet</IAPService>
-        <IAPBearer>LANBearer.EKA2 Target Ethernet</IAPBearer>
-        <IAPNetwork>Network.mRouter</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
+		<Name>WlanConnectivity</Name>
+		<IAPService>LANService.WlanConnectivity</IAPService>
+       <IAPBearer>LANBearer.WLANBearer</IAPBearer>
+		<IAPNetwork>Network.Intranet</IAPNetwork>
+		<IAPNetworkWeighting>0</IAPNetworkWeighting>
+		<LocationRef>Location.Office</LocationRef>
     </IAP>
     <IAP operation="add">
         <Name>Emulator Lan IAP 2</Name>
-        <IAPService>LANService.Ethernet</IAPService>
-        <IAPBearer>LANBearer.EKA2 Emulator Ethernet</IAPBearer>
+        <IAPService>LANService.WlanConnectivity</IAPService>
+        <IAPBearer>LANBearer.WLANBearer</IAPBearer>
         <IAPNetwork>Network.Intranet</IAPNetwork>
         <IAPNetworkWeighting>0</IAPNetworkWeighting>
         <LocationRef>Location.Office</LocationRef>
@@ -1198,112 +1198,83 @@
 
 <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.MOMAP16xx</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>
+		<Name>WLANBearer</Name>
+		<IfName>wlannif</IfName>
+		<LDDName>not used</LDDName>
+		<PDDName>not used</PDDName>
+		<LastSocketActivityTimeout>10</LastSocketActivityTimeout>
+		<LastSessionClosedTimeout>10</LastSessionClosedTimeout>
+		<LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+		<Agent>wlanagt.agt</Agent>
     </LANBearer>
 </LANBearerTable>
 
 <LANServiceTable>
     <LANService operation="add">
-        <Name>Ethernet</Name>
-        <IfNetworks>ip</IfNetworks>
-        <IpNetMask>255.255.255.0</IpNetMask>
-        <IpGateway>10.23.143.254</IpGateway>
-        <IpAddr></IpAddr>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <IpNameServer1>10.16.59.15</IpNameServer1>
-        <IpNameServer2>10.112.58.6</IpNameServer2>
-        <ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
-        <ConfigDaemonName>!DhcpServ</ConfigDaemonName>
+		<Name>WlanConnectivity</Name>
+		<IfNetworks>ip</IfNetworks>
+		<IpNetMask>255.255.255.0</IpNetMask>
+		<IpGateway>0.0.0.0</IpGateway>
+		<IpAddrFromServer>TRUE</IpAddrFromServer>
+		<IpAddr>0.0.0.0</IpAddr>
+		<IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+		<IpNameServer1>0.0.0.0</IpNameServer1>
+		<IpNameServer2>0.0.0.0</IpNameServer2>
+		<Ip6DnsAddrFromServer>TRUE</Ip6DnsAddrFromServer>
+		<Ip6NameServer1>0:0:0:0:0:0:0:0</Ip6NameServer1>
+		<Ip6NameServer2>0:0:0:0:0:0:0:0</Ip6NameServer2>
+		<IpAddrLeaseValidFrom>0</IpAddrLeaseValidFrom>
+		<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>
+		<Name>Ethernet Static IP</Name>
+		<IfNetworks>ip</IfNetworks>
+		<IpNetMask>255.255.255.0</IpNetMask>
+		<IpGateway>192.168.20.2</IpGateway>
+		<IpAddrFromServer>FALSE</IpAddrFromServer>
+		<IpAddr>192.168.20.13</IpAddr>
+		<IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+		<IpNameServer1>194.72.6.51</IpNameServer1>
+		<IpNameServer2>194.72.6.52</IpNameServer2>
+		<Ip6DnsAddrFromServer>TRUE</Ip6DnsAddrFromServer>
+		<Ip6NameServer1>0:0:0:0:0:0:0:0</Ip6NameServer1>
+		<Ip6NameServer2>0:0:0:0:0:0:0:0</Ip6NameServer2>
+		<IpAddrLeaseValidFrom>0</IpAddrLeaseValidFrom>
+		<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>
+		<Name>Ethernet Bad Daemon</Name>
+		<IfNetworks>ip</IfNetworks>
+		<IpNetMask>255.255.255.0</IpNetMask>
+		<IpGateway>10.32.194.254</IpGateway>
+		<IpAddrFromServer>FALSE</IpAddrFromServer>
+		<IpAddr>10.32.194.251</IpAddr>
+		<IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+		<IpNameServer1>194.72.6.51</IpNameServer1>
+		<IpNameServer2>194.72.6.52</IpNameServer2>
+		<Ip6DnsAddrFromServer>TRUE</Ip6DnsAddrFromServer>
+		<Ip6NameServer1>0:0:0:0:0:0:0:0</Ip6NameServer1>
+		<Ip6NameServer2>0:0:0:0:0:0:0:0</Ip6NameServer2>
+		<IpAddrLeaseValidFrom>0</IpAddrLeaseValidFrom>
+		<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>
+		<Name>Ethernet No Daemon</Name>
+		<IfNetworks>ip</IfNetworks>
+		<IpNetMask>255.255.255.0</IpNetMask>
+		<IpGateway>10.32.194.254</IpGateway>
+		<IpAddrFromServer>FALSE</IpAddrFromServer>
+		<IpAddr>10.32.194.251</IpAddr>
+		<IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
+		<IpNameServer1>194.72.6.51</IpNameServer1>
+		<IpNameServer2>194.72.6.52</IpNameServer2>
+		<Ip6DnsAddrFromServer>TRUE</Ip6DnsAddrFromServer>
+		<Ip6NameServer1>0:0:0:0:0:0:0:0</Ip6NameServer1>
+		<Ip6NameServer2>0:0:0:0:0:0:0:0</Ip6NameServer2>
+		<IpAddrLeaseValidFrom>0</IpAddrLeaseValidFrom>
     </LANService>
 </LANServiceTable>
 
@@ -1788,7 +1759,7 @@
         <Direction>OUTGOING</Direction>
         <DialogPref>DONOTPROMPT</DialogPref>
         <BearerSet>LAN</BearerSet>
-        <IAPRef>IAP.Emulator Lan IAP 1</IAPRef>
+        <IAPRef>IAP.WlanConnectivity</IAPRef>
     </ConnectionPreferences>
 </ConnectionPreferencesTable>

--- a/datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectionethernet_MOMAP16xx.xml	Tue Jul 20 18:21:51 2010 +0100
+++ b/datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectionethernet_MOMAP16xx.xml	Tue Aug 03 15:29:29 2010 +0100
@@ -6,7 +6,6 @@
  under the terms of "Eclipse Public License v1.0"
  which accompanies this distribution, and is available
  at the URL "http://www.eclipse.org/legal/epl-v10.html".
-
  Initial Contributors:
  Nokia Corporation - initial contribution.
 
@@ -69,13 +68,13 @@
         <IAPNetworkWeighting>0</IAPNetworkWeighting>
         <LocationRef>Location.Mobile</LocationRef>
     </IAP>
-    <IAP operation="add">
-        <Name>iTest name cdma2000</Name>
-        <IAPService>CDMA2000PacketService.test name cdma2000</IAPService>
-        <IAPBearer>ModemBearer.Hungry (Long Timeout)</IAPBearer>
+	    <IAP operation="add">
+        <Name>Additional 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.Mobile</LocationRef>
+        <LocationRef>Location.Home</LocationRef>
     </IAP>
     <IAP operation="add">
         <Name>Default Dial In ISP</Name>
@@ -102,12 +101,12 @@
         <LocationRef>Location.Office Direct Dial</LocationRef>
     </IAP>
     <IAP operation="add">
-        <Name>Ethernet with Daemon Dynamic IP</Name>
-        <IAPService>LANService.Ethernet</IAPService>
-        <IAPBearer>LANBearer.EKA2 Ethernet</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
+		<Name>WlanConnectivity</Name>
+		<IAPService>LANService.WlanConnectivity</IAPService>
+       <IAPBearer>LANBearer.WLANBearer</IAPBearer>
+		<IAPNetwork>Network.Intranet</IAPNetwork>
+		<IAPNetworkWeighting>0</IAPNetworkWeighting>
+		<LocationRef>Location.Office Direct Dial</LocationRef>
     </IAP>
     <IAP operation="add">
         <Name>Virtual Comm port</Name>
@@ -620,33 +619,34 @@
 
 <LANBearerTable>
     <LANBearer operation="add">
-	<Name>EKA2 Ethernet</Name>
-	<Agent>nullagt.agt</Agent>
-	<IfName>ethint</IfName>
-	<LDDFilename>enet</LDDFilename>
-	<LDDName>Ethernet</LDDName>
-	<PDDFilename>ethernet</PDDFilename>
-	<PDDName>Ethernet.MOMAP16xx</PDDName>
-	<PacketDriverName>EtherPkt.drv</PacketDriverName>
-	<LastSocketActivityTimeout>10</LastSocketActivityTimeout>
-	<LastSessionClosedTimeout>10</LastSessionClosedTimeout>
-	<LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+		<Name>WLANBearer</Name>
+		<IfName>wlannif</IfName>
+		<LDDName>not used</LDDName>
+		<PDDName>not used</PDDName>
+		<LastSocketActivityTimeout>10</LastSocketActivityTimeout>
+		<LastSessionClosedTimeout>10</LastSessionClosedTimeout>
+		<LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+		<Agent>wlanagt.agt</Agent>
     </LANBearer>
 </LANBearerTable>
 
 <LANServiceTable>
     <LANService operation="add">
-        <Name>Ethernet</Name>
-        <IfNetworks>ip</IfNetworks>
-        <IpNetMask>255.255.255.0</IpNetMask>
-        <IpGateway>10.23.143.254</IpGateway>
-        <IpAddr></IpAddr>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <IpNameServer1>10.16.59.15</IpNameServer1>
-        <IpNameServer2>10.112.58.6</IpNameServer2>
-        <ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
-        <ConfigDaemonName>!DhcpServ</ConfigDaemonName>
+		<Name>WlanConnectivity</Name>
+		<IfNetworks>ip</IfNetworks>
+		<IpNetMask>255.255.255.0</IpNetMask>
+		<IpGateway>0.0.0.0</IpGateway>
+		<IpAddrFromServer>TRUE</IpAddrFromServer>
+		<IpAddr>0.0.0.0</IpAddr>
+		<IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+		<IpNameServer1>0.0.0.0</IpNameServer1>
+		<IpNameServer2>0.0.0.0</IpNameServer2>
+		<Ip6DnsAddrFromServer>TRUE</Ip6DnsAddrFromServer>
+		<Ip6NameServer1>0:0:0:0:0:0:0:0</Ip6NameServer1>
+		<Ip6NameServer2>0:0:0:0:0:0:0:0</Ip6NameServer2>
+		<IpAddrLeaseValidFrom>0</IpAddrLeaseValidFrom>
+		<ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
+		<ConfigDaemonName>!DhcpServ</ConfigDaemonName>
     </LANService>
 </LANServiceTable>
 
@@ -891,50 +891,6 @@
 <AgentLookupTable>
 </AgentLookupTable>
 
-<CDMA2000PacketServiceTable>
-    <CDMA2000PacketService operation="add">
-        <Name>test name cdma2000</Name>
-        <IwfName>Test2000</IwfName>
-        <ServiceOption>HIGHSPEEDCDMA2000DATA</ServiceOption>
-        <PdpType>IPV4</PdpType>
-        <ReqFwdPriority>PRIORITY04</ReqFwdPriority>
-        <ReqRevPriority>PRIORITY04</ReqRevPriority>
-        <ReqFwdBitrate>32KBPS</ReqFwdBitrate>
-        <ReqRevBitrate>32KBPS</ReqRevBitrate>
-        <ReqFwdLoss>LOSS1</ReqFwdLoss>
-        <ReqRevLoss>LOSS1</ReqRevLoss>
-        <ReqFwdMaxdelay>40MS</ReqFwdMaxdelay>
-        <ReqRevMaxdelay>40MS</ReqRevMaxdelay>
-        <MinFwdBitrate>8KBPS</MinFwdBitrate>
-        <MinRevBitrate>8KBPS</MinRevBitrate>
-        <AccptFwdLoss>LOSS2</AccptFwdLoss>
-        <AccptRevLoss>LOSS2</AccptRevLoss>
-        <AccptFwdMaxdelay>120MS</AccptFwdMaxdelay>
-        <AccptRevMaxdelay>120MS</AccptRevMaxdelay>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>RasUser</IfAuthName>
-        <IfAuthPass>pass</IfAuthPass>
-        <AuthRetries>1</AuthRetries>
-        <IpNetMask>0.255.255.255</IpNetMask>
-        <IpGateway>10.0.0.1</IpGateway>
-        <EnableLCPExtension>TRUE</EnableLCPExtension>
-        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
-        <ApType>2</ApType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <RlpMode>UNKNOWN</RlpMode>
-        <CDMAMobileIP>FALSE</CDMAMobileIP>
-        <CDMAMobileIPTimeout>10000000</CDMAMobileIPTimeout>
-    </CDMA2000PacketService>
-</CDMA2000PacketServiceTable>
-
-<DefaultCDMA2000Table>
-</DefaultCDMA2000Table>
-
 <ChargecardTable>
     <Chargecard operation="add">
         <Name>Dummy BT Chargecard</Name>
@@ -969,7 +925,7 @@
         <Direction>OUTGOING</Direction>
         <DialogPref>DONOTPROMPT</DialogPref>
         <BearerSet>LAN</BearerSet>
-        <IAPRef>IAP.Ethernet with Daemon Dynamic IP</IAPRef>
+        <IAPRef>IAP.WlanConnectivity</IAPRef>
     </ConnectionPreferences>
 </ConnectionPreferencesTable>
 
@@ -1235,5 +1191,3 @@
 
 
 </CommDB:Config>
-
-

--- a/datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectiontest_vlan2.ini	Tue Jul 20 18:21:51 2010 +0100
+++ b/datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectiontest_vlan2.ini	Tue Aug 03 15:29:29 2010 +0100
@@ -31,6 +31,6 @@
 
 [General]
 Interface = eth
-NameServerAddr = 10.23.59.108
+NameServerAddr = 10.29.23.10
 EchoPort = 7
-LookupAddress = 10.16.59.15
+LookupAddress = 10.29.23.103

--- a/datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectiontest_vlan7.ini	Tue Jul 20 18:21:51 2010 +0100
+++ b/datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectiontest_vlan7.ini	Tue Aug 03 15:29:29 2010 +0100
@@ -10,8 +10,7 @@
 MissingNifIapNumber = 99
 TestNifIapNumber = 12
 StaticDnsDynamicAddr = 12
-SimTSYIapNumber = 13
-DummyNifAgentIapNumber= 14
+
 
 [AINIAPs]
 SecondHungryNifNumber = 9
@@ -27,12 +26,11 @@
 LongTimeout = 6100000
 
 [TCP Config]
-TcpSendAddress = 192.168.20.11
-TestName = httpsmtp.test.intra
+TcpSendAddress = 10.29.23.103
+TestName = httpsmtp02.closedtest.intra
 
 [General]
-#From ipcp => ipcontrol protocol one of the ppp suite of protocols
-Interface = ipcp
-NameServerAddr = 192.168.20.2
+Interface = eth
+NameServerAddr = 10.29.23.10
 EchoPort = 7
-LookupAddress = 192.168.20.11
\ No newline at end of file
+LookupAddress = 10.29.23.103
\ No newline at end of file

--- a/datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectionudp_ethernet_MOMAP16xx.xml	Tue Jul 20 18:21:51 2010 +0100
+++ b/datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectionudp_ethernet_MOMAP16xx.xml	Tue Aug 03 15:29:29 2010 +0100
@@ -6,7 +6,6 @@
  under the terms of "Eclipse Public License v1.0"
  which accompanies this distribution, and is available
  at the URL "http://www.eclipse.org/legal/epl-v10.html".
-
  Initial Contributors:
  Nokia Corporation - initial contribution.
 
@@ -30,10 +29,10 @@
 
 <NetworkTable>
     <Network operation="add">
-        <Name>NT RAS</Name>
+        <Name>Intranet</Name>
     </Network>
     <Network operation="add">
-        <Name>Intranet</Name>
+        <Name>NT RAS</Name>
     </Network>
     <Network operation="add">
         <Name>Linux</Name>
@@ -66,8 +65,8 @@
         <IAPNetworkWeighting>0</IAPNetworkWeighting>
         <LocationRef>Location.Mobile</LocationRef>
     </IAP>
-    <IAP operation="add">
-        <Name>Additional Default Dial In ISP</Name>
+	<IAP operation="add">
+        <Name>Additional Dial In ISP</Name>
         <IAPService>DialInISP.Dial In CS ISP</IAPService>
         <IAPBearer>ModemBearer.Linux</IAPBearer>
         <IAPNetwork>Network.NT RAS</IAPNetwork>
@@ -99,12 +98,12 @@
         <LocationRef>Location.Office Direct Dial</LocationRef>
     </IAP>
     <IAP operation="add">
-        <Name>Ethernet with Daemon Dynamic IP</Name>
-        <IAPService>LANService.Ethernet</IAPService>
-        <IAPBearer>LANBearer.EKA2 Ethernet</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office</LocationRef>
+		<Name>WlanConnectivity</Name>
+		<IAPService>LANService.WlanConnectivity</IAPService>
+       <IAPBearer>LANBearer.WLANBearer</IAPBearer>
+		<IAPNetwork>Network.Intranet</IAPNetwork>
+		<IAPNetworkWeighting>0</IAPNetworkWeighting>
+		<LocationRef>Location.Office Direct Dial</LocationRef>
     </IAP>
     <IAP operation="add">
         <Name>Virtual Comm port</Name>
@@ -155,7 +154,7 @@
         <LocationRef>Location.Office</LocationRef>
     </IAP>
 </IAPTable>
-
+	
 <ModemBearerTable>
     <ModemBearer operation="template">
         <Name>Default Modem</Name>
@@ -703,33 +702,34 @@
 
 <LANBearerTable>
     <LANBearer operation="add">
-	<Name>EKA2 Ethernet</Name>
-	<Agent>nullagt.agt</Agent>
-	<IfName>ethint</IfName>
-	<LDDFilename>enet</LDDFilename>
-	<LDDName>Ethernet</LDDName>
-	<PDDFilename>ethernet</PDDFilename>
-	<PDDName>Ethernet.MOMAP16xx</PDDName>
-	<PacketDriverName>EtherPkt.drv</PacketDriverName>
-	<LastSocketActivityTimeout>10</LastSocketActivityTimeout>
-	<LastSessionClosedTimeout>10</LastSessionClosedTimeout>
-	<LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+		<Name>WLANBearer</Name>
+		<IfName>wlannif</IfName>
+		<LDDName>not used</LDDName>
+		<PDDName>not used</PDDName>
+		<LastSocketActivityTimeout>10</LastSocketActivityTimeout>
+		<LastSessionClosedTimeout>10</LastSessionClosedTimeout>
+		<LastSocketClosedTimeout>10</LastSocketClosedTimeout>
+		<Agent>wlanagt.agt</Agent>
     </LANBearer>
 </LANBearerTable>
 
 <LANServiceTable>
     <LANService operation="add">
-        <Name>Ethernet</Name>
-        <IfNetworks>ip</IfNetworks>
-        <IpNetMask>255.255.255.0</IpNetMask>
-        <IpGateway>10.23.143.254</IpGateway>
-        <IpAddr></IpAddr>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <IpNameServer1>10.16.59.15</IpNameServer1>
-        <IpNameServer2>10.112.58.6</IpNameServer2>
-        <ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
-        <ConfigDaemonName>!DhcpServ</ConfigDaemonName>
+		<Name>WlanConnectivity</Name>
+		<IfNetworks>ip</IfNetworks>
+		<IpNetMask>255.255.255.0</IpNetMask>
+		<IpGateway>0.0.0.0</IpGateway>
+		<IpAddrFromServer>TRUE</IpAddrFromServer>
+		<IpAddr>0.0.0.0</IpAddr>
+		<IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+		<IpNameServer1>0.0.0.0</IpNameServer1>
+		<IpNameServer2>0.0.0.0</IpNameServer2>
+		<Ip6DnsAddrFromServer>TRUE</Ip6DnsAddrFromServer>
+		<Ip6NameServer1>0:0:0:0:0:0:0:0</Ip6NameServer1>
+		<Ip6NameServer2>0:0:0:0:0:0:0:0</Ip6NameServer2>
+		<IpAddrLeaseValidFrom>0</IpAddrLeaseValidFrom>
+		<ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
+		<ConfigDaemonName>!DhcpServ</ConfigDaemonName>
     </LANService>
 </LANServiceTable>
 
@@ -1049,8 +1049,8 @@
         <Ranking>1</Ranking>
         <Direction>OUTGOING</Direction>
         <DialogPref>DONOTPROMPT</DialogPref>
-        <BearerSet>CSD</BearerSet>
-        <IAPRef>IAP.Dummy</IAPRef>
+        <BearerSet>LAN</BearerSet>
+        <IAPRef>IAP.WlanConnectivity</IAPRef>
     </ConnectionPreferences>
 </ConnectionPreferencesTable>

Binary file general/WLAN_template_cccccc00.cre has changed

--- a/general/bld.inf	Tue Jul 20 18:21:51 2010 +0100
+++ b/general/bld.inf	Tue Aug 03 15:29:29 2010 +0100
@@ -22,11 +22,15 @@
 
 //-- CommsFramework Test OBY/IBY Files
 ./commsframeworktest.iby		/epoc32/rom/include/commsframeworktest.iby
+./commsfw_test.iby				/epoc32/rom/include/commsfw_test.iby
 
 PRJ_TESTEXPORTS
 // File run before every hardware test that can be added to pre-ROM build
 ./te_initialiseboard.script	z:/testdata/scripts/te_initialiseboard.script
 
+./commsfw_startedservices.xml			z:/testdata/configs/commsfw_startedservices.xml
+./commsfw_bootwlan.bat					z:/testdata/configs/commsfw_bootwlan.bat
+./WLAN_template_cccccc00.cre			z:/testdata/configs/WLAN_template_cccccc00.cre
 PRJ_MMPFILES

--- a/general/commsframeworktest.iby	Tue Jul 20 18:21:51 2010 +0100
+++ b/general/commsframeworktest.iby	Tue Aug 03 15:29:29 2010 +0100
@@ -30,6 +30,7 @@
 	|| defined(CI_TEST_ROM_1) || defined(CI_TEST_ROM_2) || defined(CI_TEST_ROM_3) || defined(CI_TEST_ROM_4) \
 	|| defined(WAPSTACK_TEST_ROM) \
 	|| defined(SERCOMMS_TEST_ROM) \
+	|| defined(__NETWORKING_TEST_OBY__) \
 	)
 
 // Rom build hasn't explicitly defined a subset of tests to include so to avoid
@@ -45,6 +46,9 @@
 
 #define WAPSTACK_TEST_ROM
 #define SERCOMMS_TEST_ROM
+//#define NETWORKING_UPS_TESTS
+//#define SYMBIAN_FLEXMM_ZERO_COPY_NETWORKING
+#define __NETWORKING_TEST_OBY__
 
 #endif
 
@@ -166,12 +170,24 @@
 #ifdef SYMBIAN_FLEXMM_ZERO_COPY_NETWORKING
 #include <zerocopy_loopback_driver.iby>
 #include <legacy_loopback_driver.iby>
+#include <commsbufskern.iby>
 #include <zerocopy_loopback_driver_test.iby>
 #include <legacy_loopback_driver_test.iby>
 #include <zerocopy_loopback_link_protocol.iby>
 #include <legacy_loopback_link_protocol.iby>
+#endif
+
 #include <te_loopback.iby>
-#endif
+#include <Te_Cap_RConnDHCP.IBY>
+#include <Te_Cap_RES.IBY>
+#include <Te_Cap_Esock.IBY>
+#include <Te_Cap_RConnServ.IBY>
+#include <te_cap_esock_transfer.iby>
+#include <te_cap_rootserver.iby>
+#include <Te_Cap_Configurator.IBY>
+#include <te_esockteststepssuite.iby>
+#include <te_UmtsGprsScpr.iby>
+#include <SerComms.IBY>
 
 // RootServer Tests
 #ifdef CI_TEST_ROM_3
@@ -248,8 +264,19 @@
 #if defined(CI_TEST_ROM_1) || defined(NW_TEST_ROM_1)
 #include <te_pppsize.iby>
 #include <ts_dummyppp.iby>
-
+#include <zerocopy_loopback_driver.iby>
+#include <te_loopback.iby>
 #include <te_pppcomp.iby>
+#include <te_configutil.iby>
+#include <te_Configuratorsuite.iby>
+#include <te_http.iby>
+#include <integrationtest.iby>
+#include <te_sblpsuite.iby>
+#include <te_DedicatedSignalling1ryCtx.iby>
+#include <TE_SpudUnit.iby>
+#include <integrationtest.iby>
+#include <te_cedsuite.iby>
+#include <wapmessage.iby>
 #include <te_vjcomp.iby>
 #include <te_incoming_ppp.iby>
 #endif
@@ -355,7 +382,8 @@
 #include <upstestnotifier.iby>
 #include <netups_test.iby>
 
-#if defined(CI_TEST_ROM_1) || defined(CI_TEST_ROM_4)
+#if defined(CI_TEST_ROM_1) || defined(CI_TEST_ROM_2)
+#include <netups.iby>
 REM #include <te_ipups.iby>
 #endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/general/commsfw_bootwlan.bat	Tue Aug 03 15:29:29 2010 +0100
@@ -0,0 +1,11 @@
+md \testframework
+md \testframework\ncpkickstart\
+copy z:\testdata\configs\commsfw_startedservices.xml c:\testframework\ncpkickstart\startedservices.xml
+attrib c:\testframework\ncpkickstart\startedservices.xml -r
+md \private
+md \private\A0000C67
+REM NcpKickStart.exe copies this CRE file to c:\private\10202be9\persists\cccccc00.cre
+copy z:\testdata\configs\WLAN_template_cccccc00.cre c:\private\A0000C67\cccccc00.cre
+attrib c:\private\A0000C67\cccccc00.cre -r
+NcpKickStart.exe
+z:\sys\bin\htiframework.exe
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/general/commsfw_startedservices.xml	Tue Aug 03 15:29:29 2010 +0100
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+
+<!--
+Example configuration file for NCPKickStart
+
+ Version     : $Author: jojokine $
+ Revision    : $Revision: 19099 $
+ Date        : $Date: 2010-01-13 11:44:26 +0200 (ke, 13 tammi 2010) $
+-->
+
+<NcpKickStart>
+
+	<!-- Global Configuration items -->
+	<Configuration>
+		<Version>1.0</Version>
+		<LogToFile>true</LogToFile> <!-- true/false, trace to RDebug is always on -->
+	</Configuration>
+
+	<!-- Services and their parameters -->
+	<OrderedServiceList>
+
+		<Service>
+			<Name>MtcStartupSyncReq</Name>
+			<Type>MtcIsiMessage</Type>
+			<Delay>4000000</Delay>
+		</Service>
+
+		<Service>
+			<Name>MtcStateReq</Name>
+			<Type>MtcIsiMessage</Type>
+			<Delay>4000000</Delay>
+		</Service>
+
+<!--
+		!!! WLan is commented out because loading device drivers cause a boot in Gundam W20 release !!!
+		<Service>
+			<Name>WLANPhysicalDeviceDriver</Name>
+			<Type>DeviceDriver</Type>
+			<Delay>0</Delay>
+			<ExtraParameters DeviceDriverType="Physical" DeviceDriverName="wlanpddumac" DeviceDriverFindPattern="wlan.phys"/>
+		</Service>
+		<Service>
+			<Name>WLANLogicalDeviceDriver</Name>
+			<Type>DeviceDriver</Type>
+			<Delay>0</Delay>
+			<ExtraParameters DeviceDriverType="Logical" DeviceDriverName="wlanldd" DeviceDriverFindPattern="wlan"/>
+		</Service>
+		<Service>
+			<Name>WlanInitAndTestCard</Name>
+			<Type>Special</Type>
+			<Delay>0</Delay>
+		</Service>
+-->
+		
+		<!-- This service's implementation was previously part of CStateRunning's
+			implementation, THIS SERVICE MUST BE STARTED LAST!!! -->
+		<Service>
+			<Name>MtcStartupSyncReqAndStateReq</Name>
+			<Type>FinalMtcIsiMessage</Type>
+			<Delay>4000000</Delay>
+		</Service>
+		
+		<!-- DO NO ADD ANY SERVICES AFTER MtcStartupSyncReqAndStateReq !!! -->
+
+	</OrderedServiceList>
+
+</NcpKickStart>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/general/commsfw_test.iby	Tue Aug 03 15:29:29 2010 +0100
@@ -0,0 +1,16 @@
+#ifndef COMMSFW_TEST_IBY
+#define COMMSFW_TEST_IBY
+
+//#include "include/core/os/EnableCommsLogs.iby"
+#include "cflog.iby"
+
+#include "CommsFrameworkTest.iby"
+//#include "commsfw_configwlan.iby"
+// For ncpkickstart
+data=DATAZ_\testdata\configs\commsfw_startedservices.xml	\testdata\configs\commsfw_startedservices.xml
+data=DATAZ_\testdata\configs\WLAN_template_cccccc00.cre 	\testdata\configs\WLAN_template_cccccc00.cre
+data-override=DATAZ_\testdata\configs\commsfw_bootwlan.bat    			\autoexec.bat
+
+
+
+#endif
\ No newline at end of file

--- a/serialserver/c32serialserver/Test/CapTestFramework/SerComms.IBY	Tue Jul 20 18:21:51 2010 +0100
+++ b/serialserver/c32serialserver/Test/CapTestFramework/SerComms.IBY	Tue Aug 03 15:29:29 2010 +0100
@@ -18,6 +18,28 @@
 #ifndef __Cap_PARAM_SVR_SUITENAME_IBY__
 #define __Cap_PARAM_SVR_SUITENAME_IBY__
 
-file=ABI_DIR\DEBUG_DIR\Cap_PARAM_SVR_SUITENAME.DLL System\bin\Cap_PARAM_SVR_SUITENAME.DLL
-
+data=ABI_DIR\DEBUG_DIR\Cap_PARAM_SVR_SUITENAME.exe sys\bin\Cap_PARAM_SVR_SUITENAME.exe
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Sercomms.script   TestData\Scripts\Sercomms.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_00000000_SerCommsSub.script TestData\Scripts\Cap_00000000_SerCommsSub.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_00000002_SerCommsSub.script TestData\Scripts\Cap_00000002_SerCommsSub.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_00002000_SerCommsSub.script TestData\Scripts\Cap_00002000_SerCommsSub.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_0001fffe_SerCommsSub.script TestData\Scripts\Cap_0001fffe_SerCommsSub.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_0002fffe_SerCommsSub.script TestData\Scripts\Cap_0002fffe_SerCommsSub.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_00037ffe_SerCommsSub.script TestData\Scripts\Cap_00037ffe_SerCommsSub.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_0003bffe_SerCommsSub.script TestData\Scripts\Cap_0003bffe_SerCommsSub.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_0003dffe_SerCommsSub.script TestData\Scripts\Cap_0003dffe_SerCommsSub.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_0003effe_SerCommsSub.script TestData\Scripts\Cap_0003effe_SerCommsSub.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_0003f7fe_SerCommsSub.script TestData\Scripts\Cap_0003f7fe_SerCommsSub.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_0003fbfe_SerCommsSub.script TestData\Scripts\Cap_0003fbfe_SerCommsSub.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_0003fdfe_SerCommsSub.script TestData\Scripts\Cap_0003fdfe_SerCommsSub.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_0003fefe_SerCommsSub.script TestData\Scripts\Cap_0003fefe_SerCommsSub.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_0003ff7e_SerCommsSub.script TestData\Scripts\Cap_0003ff7e_SerCommsSub.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_0003ffbe_SerCommsSub.script TestData\Scripts\Cap_0003ffbe_SerCommsSub.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_0003ffde_SerCommsSub.script TestData\Scripts\Cap_0003ffde_SerCommsSub.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_0003ffee_SerCommsSub.script TestData\Scripts\Cap_0003ffee_SerCommsSub.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_0003fff6_SerCommsSub.script TestData\Scripts\Cap_0003fff6_SerCommsSub.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_0003fffa_SerCommsSub.script TestData\Scripts\Cap_0003fffa_SerCommsSub.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_0003fffc_SerCommsSub.script TestData\Scripts\Cap_0003fffc_SerCommsSub.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_0003fffe_SerCommsSub.script TestData\Scripts\Cap_0003fffe_SerCommsSub.script
+data=EPOCROOT##epoc32\release\winscw\udeb\z\TestData\Scripts\Cap_80000000_SerCommsSub.script TestData\Scripts\Cap_80000000_SerCommsSub.script
 #endif

--- a/serialserver/c32serialserver/Test/TE_C32/util/src/c32loader.cpp	Tue Jul 20 18:21:51 2010 +0100
+++ b/serialserver/c32serialserver/Test/TE_C32/util/src/c32loader.cpp	Tue Aug 03 15:29:29 2010 +0100
@@ -51,14 +51,14 @@
 	if (result!=KErrNone && result!=KErrAlreadyExists)
 		{
 		__FLOG_1(_L("Could not load PDD! Leaving with error %d."), result);
-		return result;
+//		return result;
 		}
 
 	result=User::LoadLogicalDevice(LDD_NAME);
 	if (result!=KErrNone && result!=KErrAlreadyExists)
 		{
 		__FLOG_1(_L("Could not load LDD! Leaving with error %d."), result);	
-		return result;
+//		return result;
 		}
 #endif
 	// Warm-boot the Comms Process, but avoid loading the Phonebook Synchronizer
@@ -309,7 +309,7 @@
 	// LEave with last seen error, if any
 	if(err!=KErrNone)
 		{
-		User::Leave(err);
+//		User::Leave(err);
 		}
 		
 	if (checkForLeaks)

author	hgs
	Tue, 03 Aug 2010 15:29:29 +0100
changeset 63	a667ebd03ba5
parent 51	48cb711881c2
child 68	5da8188e392b

commsfwtools/preparedefaultcommsdatabase/Tools/ced/data/meshpreface1.cfg		file \| annotate \| diff \| comparison \| revisions
commsfwtools/preparedefaultcommsdatabase/Tools/ced/data/meshpreface2.cfg		file \| annotate \| diff \| comparison \| revisions
commsfwtools/preparedefaultcommsdatabase/Tools/ced/group/ced.iby		file \| annotate \| diff \| comparison \| revisions
commsfwtools/preparedefaultcommsdatabase/Tools/ced/src/ced.cpp		file \| annotate \| diff \| comparison \| revisions
commsfwtools/preparedefaultcommsdatabase/Tools/ced/te_ced/group/te_cedsuite.iby		file \| annotate \| diff \| comparison \| revisions
commsfwtools/preparedefaultcommsdatabase/Tools/ceddump/group/_ROHID_ceddump.mmp		file \| annotate \| diff \| comparison \| revisions
commsfwtools/preparedefaultcommsdatabase/Tools/ceddump/group/ceddump.mmp		file \| annotate \| diff \| comparison \| revisions
commsfwtools/preparedefaultcommsdatabase/Tools/ceddump/inc/ceddumper.h		file \| annotate \| diff \| comparison \| revisions
commsfwtools/preparedefaultcommsdatabase/Tools/ceddump/src/ceddumper.cpp		file \| annotate \| diff \| comparison \| revisions
commsfwtools/preparedefaultcommsdatabase/Tools/ceddump/src/filedump.cpp		file \| annotate \| diff \| comparison \| revisions
commsfwtools/preparedefaultcommsdatabase/src/CommsDatSessionImpl.cpp		file \| annotate \| diff \| comparison \| revisions
commsprocess/commsrootserverconfig/CapTestFw_Configurator/common/Te_Cap_Configurator.IBY		file \| annotate \| diff \| comparison \| revisions
commsprocess/commsrootserverconfig/Te_Configurator/util/src/configloader.cpp		file \| annotate \| diff \| comparison \| revisions
datacommsserver/esockserver/test/CapTests/RConnServ/Common/Server.csv		file \| annotate \| diff \| comparison \| revisions
datacommsserver/esockserver/test/CapTests/RConnServ/Common/Te_Cap_RConnServ.IBY		file \| annotate \| diff \| comparison \| revisions
datacommsserver/esockserver/test/CapTests/Resolver/Common/Te_Cap_RES.IBY		file \| annotate \| diff \| comparison \| revisions
datacommsserver/esockserver/test/CapTests/Socket/Common/Te_Cap_Esock.IBY		file \| annotate \| diff \| comparison \| revisions
datacommsserver/esockserver/test/TE_ESock/TestSuiteEsock.cpp		file \| annotate \| diff \| comparison \| revisions
datacommsserver/esockserver/test/TE_ESock/group/bld.inf		file \| annotate \| diff \| comparison \| revisions
datacommsserver/esockserver/test/TE_ESock/scriptfiles/TE_ESock_IP4_Net_wlan.script		file \| annotate \| diff \| comparison \| revisions
datacommsserver/esockserver/test/TE_ESock/scriptfiles/te_esock_wlan.xml		file \| annotate \| diff \| comparison \| revisions
datacommsserver/esockserver/test/TE_ESock/scriptfiles/test_esock_ip4_vlan2.ini		file \| annotate \| diff \| comparison \| revisions
datacommsserver/esockserver/test/TE_ESock/scriptfiles/test_esock_ip4_vlan7.ini		file \| annotate \| diff \| comparison \| revisions
datacommsserver/esockserver/test/TE_EsockTestSteps/group/TE_EsockTestStepsSuite.iby		file \| annotate \| diff \| comparison \| revisions
datacommsserver/esockserver/test/TE_RConnectionSuite/config/ainethernet_MOMAP16xx.xml		file \| annotate \| diff \| comparison \| revisions
datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectioncmm_ethernet_MOMAP16xx.xml		file \| annotate \| diff \| comparison \| revisions
datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectionconfigdaemon_MOMAP16xx.xml		file \| annotate \| diff \| comparison \| revisions
datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectionethernet_MOMAP16xx.xml		file \| annotate \| diff \| comparison \| revisions
datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectiontest_vlan2.ini		file \| annotate \| diff \| comparison \| revisions
datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectiontest_vlan7.ini		file \| annotate \| diff \| comparison \| revisions
datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectionudp_ethernet_MOMAP16xx.xml		file \| annotate \| diff \| comparison \| revisions
general/WLAN_template_cccccc00.cre		file \| annotate \| diff \| comparison \| revisions
general/bld.inf		file \| annotate \| diff \| comparison \| revisions
general/commsframeworktest.iby		file \| annotate \| diff \| comparison \| revisions
general/commsfw_bootwlan.bat		file \| annotate \| diff \| comparison \| revisions
general/commsfw_startedservices.xml		file \| annotate \| diff \| comparison \| revisions
general/commsfw_test.iby		file \| annotate \| diff \| comparison \| revisions
serialserver/c32serialserver/Test/CapTestFramework/SerComms.IBY		file \| annotate \| diff \| comparison \| revisions
serialserver/c32serialserver/Test/TE_C32/util/src/c32loader.cpp		file \| annotate \| diff \| comparison \| revisions