# HG changeset patch # User hgs # Date 1280845769 -3600 # Node ID a667ebd03ba5dc7b215318ecfb712d4b9a7fc70d # Parent 48cb711881c2826231c62fcdf32757c99f19ecbc 201029_02 diff -r 48cb711881c2 -r a667ebd03ba5 commsfwtools/preparedefaultcommsdatabase/Tools/ced/data/meshpreface1.cfg --- 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 diff -r 48cb711881c2 -r a667ebd03ba5 commsfwtools/preparedefaultcommsdatabase/Tools/ced/data/meshpreface2.cfg --- 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 diff -r 48cb711881c2 -r a667ebd03ba5 commsfwtools/preparedefaultcommsdatabase/Tools/ced/group/ced.iby --- 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 #include +#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 diff -r 48cb711881c2 -r a667ebd03ba5 commsfwtools/preparedefaultcommsdatabase/Tools/ced/src/ced.cpp --- 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 diff -r 48cb711881c2 -r a667ebd03ba5 commsfwtools/preparedefaultcommsdatabase/Tools/ced/te_ced/group/te_cedsuite.iby --- 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 -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 diff -r 48cb711881c2 -r a667ebd03ba5 commsfwtools/preparedefaultcommsdatabase/Tools/ceddump/group/_ROHID_ceddump.mmp --- 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 diff -r 48cb711881c2 -r a667ebd03ba5 commsfwtools/preparedefaultcommsdatabase/Tools/ceddump/group/ceddump.mmp --- 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 diff -r 48cb711881c2 -r a667ebd03ba5 commsfwtools/preparedefaultcommsdatabase/Tools/ceddump/inc/ceddumper.h --- 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 +#include #include "filedump.h" #include "ceddumpglobals.h" @@ -50,6 +51,8 @@ #define TRUE_VAL _S("TRUE") #define FALSE_VAL _S("FALSE") +typedef RArray RRecordInfoArray; +typedef TBuf 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 iGenericTableIds; + RArray iGenericTableNames; + RArray iGenericTableFields; }; #endif diff -r 48cb711881c2 -r a667ebd03ba5 commsfwtools/preparedefaultcommsdatabase/Tools/ceddump/src/ceddumper.cpp --- 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 tempTable; @@ -2181,3 +2195,224 @@ } #endif //SYMBIAN_NETWORKING_3GPPDEFAULTQOS + +void CCedDumper::ListGenericTablesL() + { + TUint32 KMaskForNames = 0x007FFFFF; + TUint32 KKeyForNames = KCDMaskShowFieldType | KCDMaskShowRecordId; + + + RArray tableIds; + iRepository->FindL(KKeyForNames, KMaskForNames, tableIds); + for(TInt i=0; i= KCDInitialUDefRecordType && + tableIds[i] <= KCDLastUDefRecordType) + { + TBuf name; + iRepository->Get(tableIds[i], name); + iGenericTableIds.Append(tableIds[i]); + iGenericTableNames.Append(name); + + RRecordInfoArray recordInfoArray; + + RArray fields; + TUint32 KMaskForFields = 0xFF80FFFF; + TUint32 tableId = tableIds[i]; + iRepository->FindL(tableIds[i], KMaskForFields, fields); + for(TInt j=0; j 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* recordSet = new (ELeave) CMDBRecordSet(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 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; jiRecords.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(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* textField = static_cast *>(element); + TPtrC ptrTextField(*textField); + iFileDumper->WriteColumnValue(ptrFieldName, ptrTextField); + break; + } + case EDesC8: + { + CMDBField* text8Field = static_cast *>(element); + TPtrC8 ptrText8Field(*text8Field); + iFileDumper->WriteColumnValue(ptrFieldName, reinterpret_cast(ptrText8Field)); + break; + } + case EInt: + { + TInt intVal; + CMDBField* intField = static_cast *>(element); + intVal = *intField; + bufVal.Num(intVal); + TPtrC ptrIntField(bufVal.MidTPtr(0)); + iFileDumper->WriteColumnValue(ptrFieldName, ptrIntField); + break; + } + case EBool: + { + TBool boolVal; + CMDBField* boolField = static_cast *>(element); + boolVal = *boolField; + TPtrC ptrBoolField(boolVal?TRUE_VAL:FALSE_VAL); + iFileDumper->WriteColumnValue(ptrFieldName, ptrBoolField); + break; + } + case EUint32: + case ELink: + { + TInt int32Val; + CMDBField* int32Field = static_cast *>(element); + int32Val = *int32Field; + bufVal.Num(int32Val); + TPtrC ptrInt32Field(bufVal.MidTPtr(0)); + iFileDumper->WriteColumnValue(ptrFieldName, ptrInt32Field); + break; + } + default: + User::Leave(KErrArgument); + } + return ETrue; + } diff -r 48cb711881c2 -r a667ebd03ba5 commsfwtools/preparedefaultcommsdatabase/Tools/ceddump/src/filedump.cpp --- 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")); diff -r 48cb711881c2 -r a667ebd03ba5 commsfwtools/preparedefaultcommsdatabase/src/CommsDatSessionImpl.cpp --- 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 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, diff -r 48cb711881c2 -r a667ebd03ba5 commsprocess/commsrootserverconfig/CapTestFw_Configurator/common/Te_Cap_Configurator.IBY --- 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 diff -r 48cb711881c2 -r a667ebd03ba5 commsprocess/commsrootserverconfig/Te_Configurator/util/src/configloader.cpp --- 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); } } diff -r 48cb711881c2 -r a667ebd03ba5 datacommsserver/esockserver/test/CapTests/RConnServ/Common/Server.csv --- 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 diff -r 48cb711881c2 -r a667ebd03ba5 datacommsserver/esockserver/test/CapTests/RConnServ/Common/Te_Cap_RConnServ.IBY --- 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 diff -r 48cb711881c2 -r a667ebd03ba5 datacommsserver/esockserver/test/CapTests/Resolver/Common/Te_Cap_RES.IBY --- 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 diff -r 48cb711881c2 -r a667ebd03ba5 datacommsserver/esockserver/test/CapTests/Socket/Common/Te_Cap_Esock.IBY --- 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 diff -r 48cb711881c2 -r a667ebd03ba5 datacommsserver/esockserver/test/TE_ESock/TestSuiteEsock.cpp --- 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 ); diff -r 48cb711881c2 -r a667ebd03ba5 datacommsserver/esockserver/test/TE_ESock/group/bld.inf --- 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 diff -r 48cb711881c2 -r a667ebd03ba5 datacommsserver/esockserver/test/TE_ESock/scriptfiles/TE_ESock_IP4_Net_wlan.script --- /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 diff -r 48cb711881c2 -r a667ebd03ba5 datacommsserver/esockserver/test/TE_ESock/scriptfiles/te_esock_wlan.xml --- /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 @@ + + + + + + + + + + + + + Intranet + + + + + + NT RAS + DialOutISP.NT RAS + ModemBearer.Null Modem 115200bps + Network.Intranet + 0 + Location.Office Direct Dial + + + NTRas GPRS + OutgoingGPRS.NTRas GPRS + ModemBearer.GPRS Ericsson R520m via IR + Network.Intranet + 0 + Location.Mobile + + + Padding for removed CDMA IAP + DialOutISP.NT RAS + ModemBearer.Null Modem 115200bps + Network.Intranet + 0 + Location.Mobile + + + Default Dial In ISP + DialInISP.Dial In CS ISP + ModemBearer.US Robotics Sportster + Network.Intranet + 0 + Location.Home + + + LAN Test IAP + LANService.Ethernet (IPv6 static DNS) + LANBearer.Ethernet + Network.Intranet + 0 + Location.Office + + + NT RAS (IPv6 static DNS) + DialOutISP.NT RAS (IPv6 static DNS) + ModemBearer.Null Modem 115200bps + Network.Intranet + 0 + Location.Office + + + WlanConnectivity + LANService.WlanConnectivity + LANBearer.WLANBearer + Network.Intranet + 0 + Location.Office Direct Dial + + + + + + Default Modem + CSD.agt + PPP + COMM::0 + MM + ECUART + 8 + 1 + NONE + 115200 + 0 + 0 + 0 + 0 + AUTO + AFTERDIALUNTILANSWER + AT + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + 6 + 180 + 10 + 0 + + + Null Modem 115200bps + CSD.agt + PPP + COMM::0 + NTRASTSY + ECUART + 8 + 1 + NONE + 115200 + 4 + 0 + 0 + 0 + AUTO + NEVER + QUIET + AT + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + 0 + FALSE + 50 + 30 + 40 + + + US Robotics Sportster + CSD.agt + PPP + COMM::0 + MM + ECUART + 8 + 1 + NONE + 57600 + 244 + 0 + 0 + 0 + AUTO + AFTERDIALUNTILANSWER + QUIET + AT&F1 + AT + AT&d2 + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + 6 + 180 + 10 + + + Dacom Surfer + CSD.agt + PPP + COMM::0 + MM + ECUART + 8 + 1 + NONE + 57600 + 244 + 0 + 0 + 0 + AUTO + AFTERDIALUNTILANSWER + QUIET + AT&F + AT + AT&d2 + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + 6 + 180 + 10 + + + GSM Mobile Phone via Infrared + CSD.agt + PPP + IRCOMM::0 + MM + IRCOMM + 8 + 1 + NONE + 115200 + 196 + 0 + 17 + 19 + AUTO + NEVER + QUIET + ATZ + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +442079460223 + 1440 + FALSE + 9905 + 6 + 180 + 10 + + + GSM Mobile Phone via Serial + CSD.agt + PPP + COMM::0 + MM + ECUART + 8 + 1 + NONE + 19200 + 196 + 0 + 17 + 19 + AUTO + NEVER + QUIET + ATZ + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +442079460223 + 1440 + FALSE + 9905 + 6 + 180 + 10 + + + GPRS Ericsson R520m via IR + CSD.agt + PPP + IRCOMM::0 + MM + IRCOMM + 8 + 1 + NONE + 115200 + 4 + 0 + 17 + 19 + AUTO + NEVER + QUIET + ATZ + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +442079460223 + 1440 + FALSE + 6 + 180 + 10 + + + GPRS Ericsson R520m via Serial + null.agt + PPP + COMM::0 + MM + ECUART + 8 + 1 + NONE + 115200 + 4 + 0 + 17 + 19 + AUTO + NEVER + QUIET + ATZ + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +442079460223 + 1440 + FALSE + 6 + 180 + 10 + + + GPRS Motorola Mobile Phone via Serial + null.agt + PPP + COMM::0 + MM + ECUART + 8 + 1 + NONE + 57600 + 4 + 0 + 17 + 19 + AUTO + NEVER + QUIET + ATZ + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +442079460223 + 1440 + FALSE + 6 + 180 + 10 + + + + + + Ethernet + nullagt.agt + ethint + enet + =Ethernet + ethernet + Ethernet.Wins + EtherPkt.drv + -1 + -1 + -1 + + + WLANBearer + wlannif + not used + not used + -1 + 1 + -1 + wlanagt.agt + + + + + + WlanConnectivity + ip + 255.255.255.0 + 0.0.0.0 + TRUE + 0.0.0.0 + TRUE + 0.0.0.0 + 0.0.0.0 + TRUE + 0:0:0:0:0:0:0:0 + 0:0:0:0:0:0:0:0 + 0 + NetCfgExtnDhcp + !DhcpServ + + + Ethernet + ip,ip6 + 255.255.255.0 + 194.72.6.1 + 192.168.0.100 + TRUE + FALSE + 194.72.6.51 + 194.72.6.52 + + + Ethernet (IPv6 static DNS) + ip,ip6 + 255.255.255.0 + 10.1.2.3 + 192.168.0.100 + TRUE + FALSE + FALSE + 10.1.2.4 + 10.1.2.5 + fe80:0:0:0:0:0:1234:5678 + fe80:0:0:0:0:0:8765:4321 + + + + + + Default Dial In ISP + FALSE + TRUE + TRUE + FALSE + FALSE + FALSE + FALSE + FALSE + + + Dial In CS ISP + FALSE + TRUE + TRUE + FALSE + FALSE + FALSE + FALSE + FALSE + + + + + + Default Dial Out ISP + TRUE + FALSE + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + + + NT RAS + TRUE + TRUE + FALSE + FALSE + TRUE + TRUE + INTERNETONLY + CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND "CLIENT"+<0x0d>\nWAIT 3\n{\n"SERVER" OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n + FALSE + ip,ip6 + RasUser + pass + 0 + FALSE + 0 + FALSE + FALSE + FALSE + FALSE + 0 + ASYNCHRONOUS + UNSPECIFIED + UNSPECIFIED + CSD + UNSPECIFIED + UNSPECIFIED + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + + + NT RAS (IPv6 static DNS) + TRUE + TRUE + FALSE + FALSE + TRUE + TRUE + FALSE + Test + INTERNETONLY + CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND "CLIENT"+<0x0d>\nWAIT 3\n{\n"SERVER" OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n + FALSE + ip,ip6 + RasUser + pass + 0 + fe80:0:0:0:0:0:1234:5678 + fe80:0:0:0:0:0:8765:4321 + FALSE + FALSE + FALSE + FALSE + + + + + + + + + Dummy BT Chargecard + 144,12345678 + 0000 + HG + HFG + HEFG + + + Dummy Mercury Chargecard + 0500800800,,12345678 + **** + HG + J,K,0FG + HEFG + + + + + + ConnectionPreferencesTable1 + 0 + INCOMING + DONOTPROMPT + CSD + IAP.Default Dial In ISP + + + ConnectionPreferencesTable2 + 1 + OUTGOING + DONOTPROMPT + LAN + IAP.WlanConnectivity + + + + + + GlobalSettingsTable1 + 3 + 2 + 2 + 1 + 1 + 2 + 2 + 2 + Location.Office + Location.Office + GSM + Network.Intranet + mm + + + + + + Dummy Incoming GPRS Settings + Test + IPV4 + 0.0.0.0 + FALSE + TRUE + TRUE + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + FALSE + FALSE + FALSE + ip + RasUser + pass + 1 + 0.0.0.0 + 0.0.0.0 + FALSE + FALSE + FALSE + + + + + + NTRas GPRS + Test + IPV4 + FALSE + TRUE + FALSE + 2 + 4 + 3 + 3 + 31 + 2 + 4 + 3 + 3 + 31 + FALSE + FALSE + FALSE + ip + RasUser + pass + 1 + 194.72.6.51 + 194.72.6.51 + FALSE + FALSE + FALSE + + + + + + Dummy Default GPRS Settings + Access point name + IPV6 + www.wid.com + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + TRUE + TRUE + FALSE + TRUE + + + + + + ProxyTable1 + DialOutISP.NT RAS + TRUE + http + www.dummyproxy.com + 80 + www.dummyproxy.com/exception + + + + + + Default Location + TRUE + FALSE + FALSE + 0 + + + 0 + 44 + + + Office + FALSE + FALSE + FALSE + 0 + 00 + 0 + 44 + 171 + 9, + + + Office Direct Dial + FALSE + FALSE + FALSE + 0 + 00 + 0 + 44 + 171 + + + Mobile + TRUE + FALSE + FALSE + 0 + + + 0 + 44 + + + Home + FALSE + TRUE + TRUE + 0 + 00 + 0 + 44 + 181 + + + + + + SecureSocketTable1 + ssl3.0 + ssladaptor.dll + + + SecureSocketTable2 + tls1.0 + ssladaptor.dll + + + + + + + + + + + + + + + + + + Default Dial In ISP + WAPIPBearer + + + Dummy WAP Settings + WAPIPBearer + www.wapstart.com + + + + + + WAPIPBearerTable1 + WAPAccessPoint.-1 + CONNECTIONLESS + FALSE + IAP.-1 + 0 + + + WAPIPBearerTable2 + WAPAccessPoint.Dummy WAP Settings + www.wapgateway.com + CONNECTIONORIENTED + FALSE + IAP.NTRas GPRS + 1 + + + + + + WAPSMSBearerTable1 + WAPAccessPoint.-1 + CONNECTIONLESS + FALSE + + + WAPSMSBearerTable2 + WAPAccessPoint.Dummy WAP Settings + +442079460221 + CONNECTIONORIENTED + FALSE + +442079460223 + + + + + + + + + + + diff -r 48cb711881c2 -r a667ebd03ba5 datacommsserver/esockserver/test/TE_ESock/scriptfiles/test_esock_ip4_vlan2.ini --- 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 diff -r 48cb711881c2 -r a667ebd03ba5 datacommsserver/esockserver/test/TE_ESock/scriptfiles/test_esock_ip4_vlan7.ini --- 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] diff -r 48cb711881c2 -r a667ebd03ba5 datacommsserver/esockserver/test/TE_EsockTestSteps/group/TE_EsockTestStepsSuite.iby --- 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 +data=ABI_DIR\DEBUG_DIR\Te_esockteststepsSuite_captest.exe sys\bin\te_esockteststepsSuite_captest.exe #endif diff -r 48cb711881c2 -r a667ebd03ba5 datacommsserver/esockserver/test/TE_RConnectionSuite/config/ainethernet_MOMAP16xx.xml --- 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 @@ - NT RAS + Intranet - Intranet + NT RAS Linux @@ -64,12 +64,12 @@ Location.Mobile - iTest name cdma2000 - CDMA2000PacketService.test name cdma2000 - ModemBearer.Dummy 2 + Additional Dial In ISP + DialInISP.Dial In CS ISP + ModemBearer.Linux Network.NT RAS 0 - Location.Mobile + Location.Home Default Dial In ISP @@ -96,12 +96,12 @@ Location.Office Direct Dial - Ethernet with Daemon Dynamic IP - LANService.Ethernet - LANBearer.EKA2 Ethernet - Network.Intranet - 0 - Location.Office + WlanConnectivity + LANService.WlanConnectivity + LANBearer.WLANBearer + Network.Intranet + 0 + Location.Office Direct Dial Virtual Comm port @@ -156,8 +156,8 @@ DialOutISP.Dummy ModemBearer.Dummy Network.Dummy - 0 - Location.Office Direct Dial + 0 + Location.Office Direct Dial @@ -638,33 +638,34 @@ - EKA2 Ethernet - nullagt.agt - ethint - enet - Ethernet - ethernet - Ethernet.MOMAP16xx - EtherPkt.drv - 10 - 10 - 10 + WLANBearer + wlannif + not used + not used + 10 + 10 + 10 + wlanagt.agt - Ethernet - ip - 255.255.255.0 - 10.23.143.254 - - TRUE - TRUE - 10.16.59.15 - 10.112.58.6 - NetCfgExtnDhcp - !DhcpServ + WlanConnectivity + ip + 255.255.255.0 + 0.0.0.0 + TRUE + 0.0.0.0 + TRUE + 0.0.0.0 + 0.0.0.0 + TRUE + 0:0:0:0:0:0:0:0 + 0:0:0:0:0:0:0:0 + 0 + NetCfgExtnDhcp + !DhcpServ @@ -863,49 +864,6 @@ - - - test name cdma2000 - Test2000 - HIGHSPEEDCDMA2000DATA - IPV4 - PRIORITY04 - PRIORITY04 - 32KBPS - 32KBPS - LOSS1 - LOSS1 - 40MS - 40MS - 8KBPS - 8KBPS - LOSS2 - LOSS2 - 120MS - 120MS - FALSE - FALSE - FALSE - ip - RasUser - pass - 1 - 0.255.255.255 - 10.0.0.1 - TRUE - TRUE - 2 - FALSE - TRUE - TRUE - UNKNOWN - FALSE - 10000000 - - - - - @@ -941,7 +899,7 @@ OUTGOING DONOTPROMPT LAN - IAP.Ethernet with Daemon Dynamic IP + IAP.WlanConnectivity diff -r 48cb711881c2 -r a667ebd03ba5 datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectioncmm_ethernet_MOMAP16xx.xml --- 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 @@ Location.Office Direct Dial - Ethernet with Daemon Dynamic IP - LANService.Ethernet - LANBearer.EKA2 Ethernet - Network.Intranet - 0 - Location.Office + WlanConnectivity + LANService.WlanConnectivity + LANBearer.WLANBearer + Network.Intranet + 0 + Location.Office Direct Dial Virtual Comm port @@ -695,33 +694,34 @@ - EKA2 Ethernet - nullagt.agt - ethint - enet - Ethernet - ethernet - Ethernet.MOMAP16xx - EtherPkt.drv - 10 - 10 - 10 + WLANBearer + wlannif + not used + not used + -1 + -1 + -1 + wlanagt.agt - Ethernet - ip - 255.255.255.0 - 10.23.143.254 - - TRUE - TRUE - 10.16.59.15 - 10.112.58.6 - NetCfgExtnDhcp - !DhcpServ + WlanConnectivity + ip + 255.255.255.0 + 0.0.0.0 + TRUE + 0.0.0.0 + TRUE + 0.0.0.0 + 0.0.0.0 + TRUE + 0:0:0:0:0:0:0:0 + 0:0:0:0:0:0:0:0 + 0 + NetCfgExtnDhcp + !DhcpServ @@ -1000,7 +1000,7 @@ OUTGOING DONOTPROMPT LAN - IAP.Ethernet with Daemon Dynamic IP + IAP.WlanConnectivity diff -r 48cb711881c2 -r a667ebd03ba5 datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectionconfigdaemon_MOMAP16xx.xml --- 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 @@ Emulator Lan IAP No Daemon LANService.Ethernet No Daemon - LANBearer.EKA2 Emulator Ethernet + LANBearer.WLANBearer Network.Intranet 0 Location.Office @@ -88,7 +88,7 @@ Emulator Lan IAP Bad Daemon LANService.Ethernet Bad Daemon - LANBearer.EKA2 Emulator Ethernet + LANBearer.WLANBearer Network.mRouter 0 Location.Office @@ -96,7 +96,7 @@ Emulator Lan IAP Static IP 1 LANService.Ethernet Static IP - LANBearer.EKA2 Emulator Ethernet + LANBearer.WLANBearer Network.mRouter 0 Location.Office @@ -104,23 +104,23 @@ Emulator Lan IAP Static IP 2 LANService.Ethernet Static IP - LANBearer.EKA2 Emulator Ethernet + LANBearer.WLANBearer Network.Intranet 0 Location.Office - Emulator Lan IAP 1 - LANService.Ethernet - LANBearer.EKA2 Target Ethernet - Network.mRouter - 0 - Location.Office + WlanConnectivity + LANService.WlanConnectivity + LANBearer.WLANBearer + Network.Intranet + 0 + Location.Office Emulator Lan IAP 2 - LANService.Ethernet - LANBearer.EKA2 Emulator Ethernet + LANService.WlanConnectivity + LANBearer.WLANBearer Network.Intranet 0 Location.Office @@ -1198,112 +1198,83 @@ - EKA1 Target Ethernet - nullagt.agt - ethint - ethercard - EtherCard - EtherSmc - EtherCard.Smc - EtherPkt.drv - -1 - -1 - -1 - - - - EKA2 Target Ethernet - nullagt.agt - ethint - enet - Ethernet - ethernet - Ethernet.MOMAP16xx - EtherPkt.drv - -1 - -1 - -1 - - - - EKA1 Emulator Ethernet - nullagt.agt - ethint - ethercard - Ethercard - etherwins - Ethercard.wins - EtherPkt.drv - -1 - -1 - -1 - - - - EKA2 Emulator Ethernet - nullagt.agt - ethint - enet - Ethernet - ethernet - Ethernet.Wins - EtherPkt.drv - -1 - -1 - -1 + WLANBearer + wlannif + not used + not used + 10 + 10 + 10 + wlanagt.agt - Ethernet - ip - 255.255.255.0 - 10.23.143.254 - - TRUE - TRUE - 10.16.59.15 - 10.112.58.6 - NetCfgExtnDhcp - !DhcpServ + WlanConnectivity + ip + 255.255.255.0 + 0.0.0.0 + TRUE + 0.0.0.0 + TRUE + 0.0.0.0 + 0.0.0.0 + TRUE + 0:0:0:0:0:0:0:0 + 0:0:0:0:0:0:0:0 + 0 + NetCfgExtnDhcp + !DhcpServ - Ethernet Static IP - ip - 255.255.255.0 - 192.168.20.2 - 192.168.20.13 - FALSE - TRUE - 194.72.6.51 - 194.72.6.52 - NetCfgExtnDhcp - !DhcpServ + Ethernet Static IP + ip + 255.255.255.0 + 192.168.20.2 + FALSE + 192.168.20.13 + TRUE + 194.72.6.51 + 194.72.6.52 + TRUE + 0:0:0:0:0:0:0:0 + 0:0:0:0:0:0:0:0 + 0 + NetCfgExtnDhcp + !DhcpServ - Ethernet Bad Daemon - ip - 255.255.255.0 - 10.32.194.254 - 10.32.194.251 - FALSE - TRUE - 194.72.6.51 - 194.72.6.52 - NonExistingServ - NonExistingServ + Ethernet Bad Daemon + ip + 255.255.255.0 + 10.32.194.254 + FALSE + 10.32.194.251 + FALSE + 194.72.6.51 + 194.72.6.52 + TRUE + 0:0:0:0:0:0:0:0 + 0:0:0:0:0:0:0:0 + 0 + NonExistingServ + NonExistingServ - Ethernet No Daemon - ip - 255.255.255.0 - 10.32.194.254 - 10.32.194.251 - FALSE - TRUE - 194.72.6.51 - 194.72.6.52 + Ethernet No Daemon + ip + 255.255.255.0 + 10.32.194.254 + FALSE + 10.32.194.251 + FALSE + 194.72.6.51 + 194.72.6.52 + TRUE + 0:0:0:0:0:0:0:0 + 0:0:0:0:0:0:0:0 + 0 @@ -1788,7 +1759,7 @@ OUTGOING DONOTPROMPT LAN - IAP.Emulator Lan IAP 1 + IAP.WlanConnectivity diff -r 48cb711881c2 -r a667ebd03ba5 datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectionethernet_MOMAP16xx.xml --- 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 @@ 0 Location.Mobile - - iTest name cdma2000 - CDMA2000PacketService.test name cdma2000 - ModemBearer.Hungry (Long Timeout) + + Additional Dial In ISP + DialInISP.Dial In CS ISP + ModemBearer.Linux Network.NT RAS 0 - Location.Mobile + Location.Home Default Dial In ISP @@ -102,12 +101,12 @@ Location.Office Direct Dial - Ethernet with Daemon Dynamic IP - LANService.Ethernet - LANBearer.EKA2 Ethernet - Network.Intranet - 0 - Location.Office + WlanConnectivity + LANService.WlanConnectivity + LANBearer.WLANBearer + Network.Intranet + 0 + Location.Office Direct Dial Virtual Comm port @@ -620,33 +619,34 @@ - EKA2 Ethernet - nullagt.agt - ethint - enet - Ethernet - ethernet - Ethernet.MOMAP16xx - EtherPkt.drv - 10 - 10 - 10 + WLANBearer + wlannif + not used + not used + 10 + 10 + 10 + wlanagt.agt - Ethernet - ip - 255.255.255.0 - 10.23.143.254 - - TRUE - TRUE - 10.16.59.15 - 10.112.58.6 - NetCfgExtnDhcp - !DhcpServ + WlanConnectivity + ip + 255.255.255.0 + 0.0.0.0 + TRUE + 0.0.0.0 + TRUE + 0.0.0.0 + 0.0.0.0 + TRUE + 0:0:0:0:0:0:0:0 + 0:0:0:0:0:0:0:0 + 0 + NetCfgExtnDhcp + !DhcpServ @@ -891,50 +891,6 @@ - - - test name cdma2000 - Test2000 - HIGHSPEEDCDMA2000DATA - IPV4 - PRIORITY04 - PRIORITY04 - 32KBPS - 32KBPS - LOSS1 - LOSS1 - 40MS - 40MS - 8KBPS - 8KBPS - LOSS2 - LOSS2 - 120MS - 120MS - FALSE - FALSE - FALSE - ip - RasUser - pass - 1 - 0.255.255.255 - 10.0.0.1 - TRUE - TRUE - 2 - FALSE - TRUE - TRUE - UNKNOWN - FALSE - 10000000 - - - - - - Dummy BT Chargecard @@ -969,7 +925,7 @@ OUTGOING DONOTPROMPT LAN - IAP.Ethernet with Daemon Dynamic IP + IAP.WlanConnectivity @@ -1235,5 +1191,3 @@ - - diff -r 48cb711881c2 -r a667ebd03ba5 datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectiontest_vlan2.ini --- 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 diff -r 48cb711881c2 -r a667ebd03ba5 datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectiontest_vlan7.ini --- 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 diff -r 48cb711881c2 -r a667ebd03ba5 datacommsserver/esockserver/test/TE_RConnectionSuite/config/rconnectionudp_ethernet_MOMAP16xx.xml --- 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 @@ - NT RAS + Intranet - Intranet + NT RAS Linux @@ -66,8 +65,8 @@ 0 Location.Mobile - - Additional Default Dial In ISP + + Additional Dial In ISP DialInISP.Dial In CS ISP ModemBearer.Linux Network.NT RAS @@ -99,12 +98,12 @@ Location.Office Direct Dial - Ethernet with Daemon Dynamic IP - LANService.Ethernet - LANBearer.EKA2 Ethernet - Network.Intranet - 0 - Location.Office + WlanConnectivity + LANService.WlanConnectivity + LANBearer.WLANBearer + Network.Intranet + 0 + Location.Office Direct Dial Virtual Comm port @@ -155,7 +154,7 @@ Location.Office - + Default Modem @@ -703,33 +702,34 @@ - EKA2 Ethernet - nullagt.agt - ethint - enet - Ethernet - ethernet - Ethernet.MOMAP16xx - EtherPkt.drv - 10 - 10 - 10 + WLANBearer + wlannif + not used + not used + 10 + 10 + 10 + wlanagt.agt - Ethernet - ip - 255.255.255.0 - 10.23.143.254 - - TRUE - TRUE - 10.16.59.15 - 10.112.58.6 - NetCfgExtnDhcp - !DhcpServ + WlanConnectivity + ip + 255.255.255.0 + 0.0.0.0 + TRUE + 0.0.0.0 + TRUE + 0.0.0.0 + 0.0.0.0 + TRUE + 0:0:0:0:0:0:0:0 + 0:0:0:0:0:0:0:0 + 0 + NetCfgExtnDhcp + !DhcpServ @@ -1049,8 +1049,8 @@ 1 OUTGOING DONOTPROMPT - CSD - IAP.Dummy + LAN + IAP.WlanConnectivity diff -r 48cb711881c2 -r a667ebd03ba5 general/WLAN_template_cccccc00.cre Binary file general/WLAN_template_cccccc00.cre has changed diff -r 48cb711881c2 -r a667ebd03ba5 general/bld.inf --- 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 diff -r 48cb711881c2 -r a667ebd03ba5 general/commsframeworktest.iby --- 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 #include +#include #include #include #include #include +#endif + #include -#endif +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // RootServer Tests #ifdef CI_TEST_ROM_3 @@ -248,8 +264,19 @@ #if defined(CI_TEST_ROM_1) || defined(NW_TEST_ROM_1) #include #include - +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #endif @@ -355,7 +382,8 @@ #include #include -#if defined(CI_TEST_ROM_1) || defined(CI_TEST_ROM_4) +#if defined(CI_TEST_ROM_1) || defined(CI_TEST_ROM_2) +#include REM #include #endif diff -r 48cb711881c2 -r a667ebd03ba5 general/commsfw_bootwlan.bat --- /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 diff -r 48cb711881c2 -r a667ebd03ba5 general/commsfw_startedservices.xml --- /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 @@ + + + + + + + + + 1.0 + true + + + + + + + MtcStartupSyncReq + MtcIsiMessage + 4000000 + + + + MtcStateReq + MtcIsiMessage + 4000000 + + + + + + + MtcStartupSyncReqAndStateReq + FinalMtcIsiMessage + 4000000 + + + + + + + diff -r 48cb711881c2 -r a667ebd03ba5 general/commsfw_test.iby --- /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 diff -r 48cb711881c2 -r a667ebd03ba5 serialserver/c32serialserver/Test/CapTestFramework/SerComms.IBY --- 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 diff -r 48cb711881c2 -r a667ebd03ba5 serialserver/c32serialserver/Test/TE_C32/util/src/c32loader.cpp --- 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)