# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1283259795 -10800 # Node ID 0aa8cc770c8a5f93876e40337f8a313599a7f0f7 # Parent 453dfc402455eb57fd5f1a993e2b844136286599 Revision: 201032 Kit: 201035 diff -r 453dfc402455 -r 0aa8cc770c8a backupandrestore/backupengine/src/absession.cpp --- a/backupandrestore/backupengine/src/absession.cpp Thu Aug 19 10:44:03 2010 +0300 +++ b/backupandrestore/backupengine/src/absession.cpp Tue Aug 31 16:03:15 2010 +0300 @@ -148,7 +148,12 @@ iCallbackWatchdog = NULL; // Remove this session from the server's session map - Server().RemoveElement(iClientSID); + // Use dynamic_cast in case that ABServer is deconstructing + CABServer *pServer = dynamic_cast(const_cast(CSession2::Server())); + if(pServer) + { + pServer->RemoveElement(iClientSID); + } // Clear up any outstanding message HandleIPCClosingDownCallback(); @@ -159,7 +164,10 @@ // If the client has detached properly, they should // have done this - but just in case. //DoCancelWaitForCallback(); - Server().DropSession(); + if(pServer) + { + pServer->DropSession(); + } } void CABSession::CreateL() diff -r 453dfc402455 -r 0aa8cc770c8a backupandrestore/backuptest/ABTester/data/backup_public_files_registration.xml --- a/backupandrestore/backuptest/ABTester/data/backup_public_files_registration.xml Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff -r 453dfc402455 -r 0aa8cc770c8a backupandrestore/backuptest/ABTester/data/base_active_backup_registration.xml Binary file backupandrestore/backuptest/ABTester/data/base_active_backup_registration.xml has changed diff -r 453dfc402455 -r 0aa8cc770c8a backupandrestore/backuptest/ABTester/data/base_active_backup_registration2.xml Binary file backupandrestore/backuptest/ABTester/data/base_active_backup_registration2.xml has changed diff -r 453dfc402455 -r 0aa8cc770c8a backupandrestore/backuptest/ABTester/data/base_active_backup_registration3.xml Binary file backupandrestore/backuptest/ABTester/data/base_active_backup_registration3.xml has changed diff -r 453dfc402455 -r 0aa8cc770c8a backupandrestore/backuptest/ABTester/data/incremental_active_backup_registration.xml Binary file backupandrestore/backuptest/ABTester/data/incremental_active_backup_registration.xml has changed diff -r 453dfc402455 -r 0aa8cc770c8a backupandrestore/backuptest/ABTester/data/passive_backup_registration.xml --- a/backupandrestore/backuptest/ABTester/data/passive_backup_registration.xml Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 453dfc402455 -r 0aa8cc770c8a backupandrestore/backuptest/ABTester/data/proxy_active_backup_registration.xml Binary file backupandrestore/backuptest/ABTester/data/proxy_active_backup_registration.xml has changed diff -r 453dfc402455 -r 0aa8cc770c8a backupandrestore/backuptest/ABTester/group/abtester.iby --- a/backupandrestore/backuptest/ABTester/group/abtester.iby Thu Aug 19 10:44:03 2010 +0300 +++ b/backupandrestore/backuptest/ABTester/group/abtester.iby Tue Aug 31 16:03:15 2010 +0300 @@ -21,13 +21,13 @@ file=ABI_DIR\BUILD_DIR\abtestclient3.EXE System\programs\abtestclient3.EXE file=ABI_DIR\BUILD_DIR\abtestclient4.EXE System\programs\abtestclient4.EXE -data=DATAZ_\private\0AB7E57C\backup_registration.xml private\0AB7E57C\backup_registration.xml -data=DATAZ_\private\0AB7E57D\backup_registration.xml private\0AB7E57D\backup_registration.xml -data=DATAZ_\private\0AB7E57E\backup_registration.xml private\0AB7E57E\backup_registration.xml -data=DATAZ_\private\0AB7E58A\backup_registration.xml private\0AB7E58A\backup_registration.xml -data=DATAZ_\private\0AB7E58B\backup_registration.xml private\0AB7E58B\backup_registration.xml -data=DATAZ_\private\0AB7E58C\backup_registration.xml private\0AB7E58C\backup_registration.xml +data=DATAZ_\private\0ab7e57c\backup_registration.xml private\0ab7e57c\backup_registration.xml +data=DATAZ_\private\0ab7e57d\backup_registration.xml private\0ab7e57d\backup_registration.xml +data=DATAZ_\private\0ab7e57e\backup_registration.xml private\0ab7e57e\backup_registration.xml +data=DATAZ_\private\0ab7e58a\backup_registration.xml private\0ab7e58a\backup_registration.xml +data=DATAZ_\private\0ab7e58b\backup_registration.xml private\0ab7e58b\backup_registration.xml +data=DATAZ_\private\0ab7e58c\backup_registration.xml private\0ab7e58c\backup_registration.xml -data=DATAZ_\private\0FA00001\backup_registration.xml private\0FA00001\backup_registration.xml +data=DATAZ_\private\0fa00001\backup_registration.xml private\0fa00001\backup_registration.xml #endif diff -r 453dfc402455 -r 0aa8cc770c8a backupandrestore/backuptest/burtestserver/Group/bld.inf --- a/backupandrestore/backuptest/burtestserver/Group/bld.inf Thu Aug 19 10:44:03 2010 +0300 +++ b/backupandrestore/backuptest/burtestserver/Group/bld.inf Tue Aug 31 16:03:15 2010 +0300 @@ -40,9 +40,8 @@ ../testscripts/test_restorepackage.script z:/testdata/scripts/sbetestdata/test_restorepackage.script ../testscripts/test_increament.script z:/testdata/scripts/sbetestdata/test_increament.script -../testscripts/sbeconfig.xml /epoc32/release/winscw/udeb/z/private/10202d56/sbeconfig.xml -../testscripts/sbeconfig.xml /epoc32/release/winscw/urel/z/private/10202d56/sbeconfig.xml - +../../testdata/armv5/bigexeforbackup.sis /epoc32/data/z/testdata/scripts/sbetestdata/bigexeforbackup.sis +../../testdata/armv5/test_dll_nopublic.sis /epoc32/data/z/testdata/scripts/sbetestdata/test_dll_nopublic.sis PRJ_TESTMMPFILES burtestserver.mmp diff -r 453dfc402455 -r 0aa8cc770c8a backupandrestore/backuptest/burtestserver/Group/burtestserver.iby --- a/backupandrestore/backuptest/burtestserver/Group/burtestserver.iby Thu Aug 19 10:44:03 2010 +0300 +++ b/backupandrestore/backuptest/burtestserver/Group/burtestserver.iby Tue Aug 31 16:03:15 2010 +0300 @@ -35,6 +35,10 @@ data=EPOCROOT##Epoc32\data\z\testdata\scripts\sbetestdata\test_activebackuprestore.script testdata\scripts\sbetestdata\test_activebackuprestore.script data=EPOCROOT##Epoc32\data\z\testdata\scripts\sbetestdata\test_increament.script testdata\scripts\sbetestdata\test_increament.script +data=EPOCROOT##Epoc32\data\z\testdata\scripts\sbetestdata\bigexeforbackup.sis testdata\scripts\sbetestdata\bigexeforbackup.sis +data=EPOCROOT##Epoc32\data\z\testdata\scripts\sbetestdata\test_dll_nopublic.sis testdata\scripts\sbetestdata\test_dll_nopublic.sis + + #ifndef __SERIES60_ data=EPOCROOT##Epoc32\data\z\testdata\scripts\sbetestdata\sbeconfig.xml private\10202d56\sbeconfig.xml #endif diff -r 453dfc402455 -r 0aa8cc770c8a backupandrestore/backuptest/burtestserver/TestSteps/inc/t_burteststepbase.h --- a/backupandrestore/backuptest/burtestserver/TestSteps/inc/t_burteststepbase.h Thu Aug 19 10:44:03 2010 +0300 +++ b/backupandrestore/backuptest/burtestserver/TestSteps/inc/t_burteststepbase.h Tue Aug 31 16:03:15 2010 +0300 @@ -90,6 +90,9 @@ public: RSIDArray iSidArray; + // add support for exclude sid list + RSIDArray iExcludeSidArray; + private: HBufC* GetIndentation(TInt aLevel); diff -r 453dfc402455 -r 0aa8cc770c8a backupandrestore/backuptest/burtestserver/TestSteps/src/t_burteststepbase.cpp --- a/backupandrestore/backuptest/burtestserver/TestSteps/src/t_burteststepbase.cpp Thu Aug 19 10:44:03 2010 +0300 +++ b/backupandrestore/backuptest/burtestserver/TestSteps/src/t_burteststepbase.cpp Tue Aug 31 16:03:15 2010 +0300 @@ -63,6 +63,9 @@ iDataOwners.Close(); iSidArray.Close(); + + iExcludeSidArray.Close(); + iJidArray.Close(); iPublicFileNames.Close(); iPrivateFileNames.Close(); @@ -387,6 +390,48 @@ /** Read private file sizes into array */ _LIT(KExpectPrivateFileSizes, "ExpectPrivateFileSizes"); ReadListIntoIntArray(KExpectPrivateFileSizes, delimiter, iPrivateFileSizes); + + // Read Exclude IDs LIST // + TSecureId sid; + TChar ch; + TPtrC list; + + // clear the array + iExcludeSidArray.Reset(); + // read the string + _LIT(KExcludeSIDList, "ExcludeIDs"); + GetStringFromConfig(ConfigSection(), KExcludeSIDList, list); + TLex sidLex(list); + // parse the string + while (!sidLex.Eos()) + { + sidLex.Mark(); + ch=sidLex.Peek(); + + while(!sidLex.Eos() && ( ch=sidLex.Peek() ) != TChar(',')) + sidLex.Inc(); + + if(!sidLex.TokenLength()) + continue; + + TPtrC pToken = sidLex.MarkedToken(); + TLex token(pToken); + + if (pToken.Length() <= KMaxHexLength && token.Val(sid.iId, EHex) == KErrNone) + { + iExcludeSidArray.Append(sid); + _LIT(KFound, "Exclude ID Found in ini file: "); + LogWithSID(LOG_LEVEL4, KFound, sid); + } //if + + if(ch==TChar(',')) + sidLex.Inc(); + + sidLex.SkipSpace(); + + } //while + + } void CBURTestStepBase::ReadListIntoStringArray(const TDesC& aSectionName, const TChar& aDelimiter, RArray& aResultList) @@ -458,7 +503,6 @@ LogWithNum(LOG_LEVEL2,KTempText1, err); iFailures++; } - // Log if (iDataOwners.Count() == 0) { @@ -470,6 +514,30 @@ _LIT(KTempText4, "Number of data owners found on device: "); LogWithNum(LOG_LEVEL3, KTempText4, iDataOwners.Count()); } + + //filter the dataowners per the exclude SID list + for (TInt index = 0; index < iDataOwners.Count(); index++) + { + TSecureId sid = NULL; + sid = ExtractIDL(*iDataOwners[index]); + + if (sid != NULL) + { + TInt position = iExcludeSidArray.Find(sid); + if (position != KErrNotFound) + { + _LIT(KTempText2, "ExcludeID found in list of data owners: "); + LogWithSID(LOG_LEVEL3, KTempText2, sid); + + delete iDataOwners[index]; + iDataOwners[index] = NULL; + iDataOwners.Remove(index); + index--; + } + } + } + + } void CBURTestStepBase::PopulateListOfDataOwnersAsyncL() @@ -510,6 +578,28 @@ _LIT(KTempText4, "Number of data owners found on device: "); LogWithNum(LOG_LEVEL3, KTempText4, iDataOwners.Count()); } + + //filter the dataowners per the exclude SID list + for (TInt index = 0; index < iDataOwners.Count(); index++) + { + TSecureId sid = NULL; + sid = ExtractIDL(*iDataOwners[index]); + + if (sid != NULL) + { + TInt position = iExcludeSidArray.Find(sid); + if (position != KErrNotFound) + { + _LIT(KTempText2, "ExcludeID found in list of data owners: "); + LogWithSID(LOG_LEVEL3, KTempText2, sid); + + delete iDataOwners[index]; + iDataOwners[index] = NULL; + iDataOwners.Remove(index); + index--; + } + } + } } void CBURTestStepBase::SetBURModeL(TBURPartType aBURPartType, TBackupIncType aBackupIncType) @@ -557,8 +647,8 @@ for (TInt index = 0; index < iDataOwners.Count(); index++) { TBool notFound = ETrue; - sid = ExtractIDL(*iDataOwners[index]); - + sid = ExtractIDL(*iDataOwners[index]); + if (sid != NULL) { TInt position = iSidArray.Find(sid); @@ -576,19 +666,22 @@ else // possibly jid { HBufC* pSuiteHash = ExtractJavaIDL(*iDataOwners[index]); - TPtrC suiteHash = pSuiteHash->Des(); - if (iJidArray.Find(suiteHash) != KErrNotFound) - { - _LIT(KTempText3, "Java ID found in list of data owners: "); - LogWithText(LOG_LEVEL3, KTempText3, suiteHash); - notFound = EFalse; - } - else // not found - { - notFound = ETrue; - } - delete pSuiteHash; - pSuiteHash = NULL; + if (pSuiteHash != NULL) + { + TPtrC suiteHash = pSuiteHash->Des(); + if (iJidArray.Find(suiteHash) != KErrNotFound) + { + _LIT(KTempText3, "Java ID found in list of data owners: "); + LogWithText(LOG_LEVEL3, KTempText3, suiteHash); + notFound = EFalse; + } + else // not found + { + notFound = ETrue; + } + delete pSuiteHash; + pSuiteHash = NULL; + } } if (notFound) { @@ -1223,6 +1316,12 @@ j--; total--; } + else + { + // print the status + LogWithSID(LOG_LEVEL3, _L("---The unexpected dataowner status-SID: "),statusArray[j].iSID.iId); + LogWithNum(LOG_LEVEL3,_L("---The unexpected dataowner status-status: "),statusArray[j].iStatus) ; + } } //for statusArray.Reset(); CleanupStack::PopAndDestroy(&statusArray); @@ -1367,8 +1466,25 @@ for (TInt i=0; i < KRetries;) { + + + LogWithNum(LOG_LEVEL3,_L("retryies :"), i); + CheckSIDStatusL(iTransferTypes, readyArray); - + + + LogWithNum(LOG_LEVEL3,_L("readyArray count :"), readyArray.Count()); + + // print all the ready array + for(TInt jj = 0 ; jj < readyArray.Count(); jj++) + { + CSBSIDTransferType* type = CSBSIDTransferType::NewL(readyArray[jj]); + CleanupStack::PushL(type); + + LogWithSID(LOG_LEVEL3, _L("readyArray SIDs : ") , type->SecureIdL()); + CleanupStack::PopAndDestroy(type); + } + if (readyArray.Count()) // dataowners ready { // ========= Supply Data ================ @@ -1389,6 +1505,19 @@ iFailures++; _LIT(KLogNoTrans, "***Error: Some Data Owners were Not Ready or Failed to Connect"); Log(LOG_LEVEL3, KLogNoTrans); + + // print the remenan sids + for( TInt kk = 0 ; kk SecureIdL(); + CleanupStack::PopAndDestroy(sidType); + LogWithSID(LOG_LEVEL3, _L("--iTransferTypes, remanent SIDs : "),id.iId); + } + // } readyArray.ResetAndDestroy(); CleanupStack::PopAndDestroy(&readyArray); @@ -1482,7 +1611,6 @@ { User::Leave(KErrInUse); } - iStatus = KRequestPending; SetActive(); iActiveScheduler->Start(); } diff -r 453dfc402455 -r 0aa8cc770c8a backupandrestore/backuptest/burtestserver/TestSteps/src/t_teststepbackup.cpp --- a/backupandrestore/backuptest/burtestserver/TestSteps/src/t_teststepbackup.cpp Thu Aug 19 10:44:03 2010 +0300 +++ b/backupandrestore/backuptest/burtestserver/TestSteps/src/t_teststepbackup.cpp Tue Aug 31 16:03:15 2010 +0300 @@ -17,7 +17,7 @@ @file @released */ - +#include "W32STD.H" #include "t_teststepbackup.h" namespace bur_ts @@ -145,6 +145,8 @@ Log(LOG_LEVEL2, KLog3); } + _LIT(KLog31, "Checking valid registration..."); + Log(LOG_LEVEL2, KLog31); CheckValidRegistrationL(); _LIT(KLog4, "Saving Data Owners..."); @@ -201,9 +203,13 @@ BackupSystemBaseDataL(); BackupSystemSnapshotDataL(); - //active - BackupActiveBaseDataL(); - BackupActiveSnapshotDataL(); + // do active backup when in partial backup mode + if (iIsPartial) + { + //active + BackupActiveBaseDataL(); + BackupActiveSnapshotDataL(); + } //passive BackupPassiveBaseDataL(); @@ -238,9 +244,13 @@ BackupSystemBaseDataL(); BackupSystemSnapshotDataL(); - // active - BackupActiveIncDataL(); - BackupActiveSnapshotDataL(); + // do active backup when in partial backup mode + if (iIsPartial) + { + //active + BackupActiveIncDataL(); + BackupActiveSnapshotDataL(); + } //passive BackupPassiveIncDataL(); @@ -530,6 +540,10 @@ TRAPD(error, for (TInt i=0; i < KRetries;) { + // + LogWithNum(LOG_LEVEL3,_L("doActiveBackup-retryies :"), i); + + CheckSIDStatusL(transferTypes, iTransferTypes); if (iTransferTypes.Count()) // dataowners ready { @@ -551,7 +565,20 @@ iFailures++; _LIT(KLogNoTrans, "***Error: Some Data Owners were Not Ready or Failed to Connect"); Log(LOG_LEVEL3, KLogNoTrans); - } //if + + + //print the remenant sids + for( TInt kk = 0 ; kk SecureIdL(); + CleanupStack::PopAndDestroy(sidType); + LogWithSID(LOG_LEVEL3, _L("doActiveBackup-transferTypes, remanent SIDs : "),id.iId); + } + } //if transferTypes.ResetAndDestroy(); User::LeaveIfError(error); diff -r 453dfc402455 -r 0aa8cc770c8a backupandrestore/backuptest/burtestserver/TestSteps/src/t_teststepbackup2.cpp --- a/backupandrestore/backuptest/burtestserver/TestSteps/src/t_teststepbackup2.cpp Thu Aug 19 10:44:03 2010 +0300 +++ b/backupandrestore/backuptest/burtestserver/TestSteps/src/t_teststepbackup2.cpp Tue Aug 31 16:03:15 2010 +0300 @@ -204,9 +204,13 @@ BackupSystemBaseDataL(); BackupSystemSnapshotDataL(); - //active - BackupActiveBaseDataL(); - BackupActiveSnapshotDataL(); + // do active backup when in partial backup mode + if (iIsPartial) + { + //active + BackupActiveBaseDataL(); + BackupActiveSnapshotDataL(); + } //passive BackupPassiveBaseDataL(); @@ -241,9 +245,13 @@ BackupSystemBaseDataL(); BackupSystemSnapshotDataL(); - // active - BackupActiveIncDataL(); - BackupActiveSnapshotDataL(); + // do active backup when in partial backup mode + if (iIsPartial) + { + //active + BackupActiveIncDataL(); + BackupActiveSnapshotDataL(); + } //passive BackupPassiveIncDataL(); diff -r 453dfc402455 -r 0aa8cc770c8a backupandrestore/backuptest/burtestserver/TestSteps/src/t_teststepbackupasync.cpp --- a/backupandrestore/backuptest/burtestserver/TestSteps/src/t_teststepbackupasync.cpp Thu Aug 19 10:44:03 2010 +0300 +++ b/backupandrestore/backuptest/burtestserver/TestSteps/src/t_teststepbackupasync.cpp Tue Aug 31 16:03:15 2010 +0300 @@ -148,6 +148,8 @@ Log(LOG_LEVEL2, KLog3); } + _LIT(KLog31, "Checking valid registration..."); + Log(LOG_LEVEL2, KLog31); CheckValidRegistrationL(); _LIT(KLog4, "Saving Data Owners..."); @@ -204,9 +206,12 @@ BackupSystemBaseDataL(); BackupSystemSnapshotDataL(); - //active - BackupActiveBaseDataL(); - BackupActiveSnapshotDataL(); + if (iIsPartial) + { + //active + BackupActiveBaseDataL(); + BackupActiveSnapshotDataL(); + } //passive BackupPassiveBaseDataL(); @@ -251,9 +256,12 @@ BackupSystemBaseDataL(); BackupSystemSnapshotDataL(); - // active - BackupActiveIncDataL(); - BackupActiveSnapshotDataL(); + if (iIsPartial) + { + // active + BackupActiveIncDataL(); + BackupActiveSnapshotDataL(); + } //passive BackupPassiveIncDataL(); diff -r 453dfc402455 -r 0aa8cc770c8a backupandrestore/backuptest/burtestserver/TestSteps/src/t_teststeprestore.cpp --- a/backupandrestore/backuptest/burtestserver/TestSteps/src/t_teststeprestore.cpp Thu Aug 19 10:44:03 2010 +0300 +++ b/backupandrestore/backuptest/burtestserver/TestSteps/src/t_teststeprestore.cpp Tue Aug 31 16:03:15 2010 +0300 @@ -241,9 +241,13 @@ SupplyPassiveSnapshotDataL(); RestorePassiveBaseDataL(); - //active - SupplyActiveSnapshotDataL(); - RestoreActiveBaseDataL(); + // do active restore when in partial restore mode + if (iIsPartial) + { + //active + SupplyActiveSnapshotDataL(); + RestoreActiveBaseDataL(); + } } void CBURTestStepRestore::IncrementalRestoreL() @@ -259,11 +263,14 @@ RestorePassiveBaseDataL(); RestorePassiveIncDataL(); - - //active - SupplyActiveSnapshotDataL(); - RestoreActiveBaseDataL(); - RestoreActiveIncDataL(); + // do active restore when in partial restore mode + if (iIsPartial) + { + //active + SupplyActiveSnapshotDataL(); + RestoreActiveBaseDataL(); + RestoreActiveIncDataL(); + } } diff -r 453dfc402455 -r 0aa8cc770c8a backupandrestore/backuptest/burtestserver/TestSteps/src/t_teststeprestoreasync.cpp --- a/backupandrestore/backuptest/burtestserver/TestSteps/src/t_teststeprestoreasync.cpp Thu Aug 19 10:44:03 2010 +0300 +++ b/backupandrestore/backuptest/burtestserver/TestSteps/src/t_teststeprestoreasync.cpp Tue Aug 31 16:03:15 2010 +0300 @@ -200,9 +200,12 @@ { RestoreJavaMidletDataL(); - // passive - SupplyPassiveSnapshotDataL(); - RestorePassiveBaseDataL(); + if (iIsPartial) + { + // passive + SupplyPassiveSnapshotDataL(); + RestorePassiveBaseDataL(); + } //active SupplyActiveSnapshotDataL(); @@ -216,17 +219,19 @@ */ { RestoreJavaMidletDataL(); - - // passive - SupplyPassiveSnapshotDataL(); - RestorePassiveBaseDataL(); - RestorePassiveIncDataL(); - - - //active - SupplyActiveSnapshotDataL(); - RestoreActiveBaseDataL(); - RestoreActiveIncDataL(); + + // passive + SupplyPassiveSnapshotDataL(); + RestorePassiveBaseDataL(); + RestorePassiveIncDataL(); + + if (iIsPartial) + { + //active + SupplyActiveSnapshotDataL(); + RestoreActiveBaseDataL(); + RestoreActiveIncDataL(); + } } diff -r 453dfc402455 -r 0aa8cc770c8a backupandrestore/backuptest/burtestserver/testscripts/test.ini --- a/backupandrestore/backuptest/burtestserver/testscripts/test.ini Thu Aug 19 10:44:03 2010 +0300 +++ b/backupandrestore/backuptest/burtestserver/testscripts/test.ini Tue Aug 31 16:03:15 2010 +0300 @@ -17,12 +17,14 @@ IsPartial=0 BaseOnly=1 DriveList=c +ExcludeIDs=10281d18,101fdf81,2000b4d8,1028246f,1028312B,200286d2,101F51F2,10202BE9,101F99FB,100069CC,20021367,10003A73,101F401D,2002BCC0,1020383E [BACKUP_RESTORE_0040] BackupDir=c:\BackupArchive\ IsPartial=0 BaseOnly=0 DriveList=c +ExcludeIDs=10281d18,101fdf81,2000b4d8,1028246f,1028312B,200286d2,101F51F2,10202BE9,101F99FB,100069CC,20021367,10003A73,101F401D,2002BCC0,1020383E [BACKUP_RESTORE_0050] BackupDir=c:\BackupArchive\ diff -r 453dfc402455 -r 0aa8cc770c8a backupandrestore/backuptest/burtestserver/testscripts/test_backuprestore.script --- a/backupandrestore/backuptest/burtestserver/testscripts/test_backuprestore.script Thu Aug 19 10:44:03 2010 +0300 +++ b/backupandrestore/backuptest/burtestserver/testscripts/test_backuprestore.script Tue Aug 31 16:03:15 2010 +0300 @@ -20,8 +20,6 @@ //////////////////////////////////////////////////////////////////////////////////// LOAD_SUITE BURTestServer -DELAY 120000 - PRINT ---------------------------------------------- PRINT Test Backup Restore PRINT ---------------------------------------------- diff -r 453dfc402455 -r 0aa8cc770c8a backupandrestore/backuptest/burtestserver/testscripts/test_backuprestoreasync.script --- a/backupandrestore/backuptest/burtestserver/testscripts/test_backuprestoreasync.script Thu Aug 19 10:44:03 2010 +0300 +++ b/backupandrestore/backuptest/burtestserver/testscripts/test_backuprestoreasync.script Tue Aug 31 16:03:15 2010 +0300 @@ -21,8 +21,6 @@ //////////////////////////////////////////////////////////////////////////////////// LOAD_SUITE BURTestServer -DELAY 120000 - PRINT ---------------------------------------------- PRINT Test Backup Restore Async PRINT ---------------------------------------------- diff -r 453dfc402455 -r 0aa8cc770c8a backupandrestore/backuptest/testdata/armv5/bigexeforbackup.sis Binary file backupandrestore/backuptest/testdata/armv5/bigexeforbackup.sis has changed diff -r 453dfc402455 -r 0aa8cc770c8a backupandrestore/backuptest/testdata/armv5/test_dll_nopublic.sis Binary file backupandrestore/backuptest/testdata/armv5/test_dll_nopublic.sis has changed diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/apple/S60_RnD_32.phoneplugin/Contents/Info.plist --- a/connectivitymodules/SeCon/apple/S60_RnD_32.phoneplugin/Contents/Info.plist Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleGetInfoString - Nokia S60-32 v1.0, © Nokia - CFBundleIdentifier - nokia.com.phoneplugin.com.nokia.S6032 - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - Nokia S60-32 - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 556 - IPHPhoneConduitVersion - 597.0 - IPHPhonePluginUID - 367C0F5C-1E53-44A3-AEA5-54D1EEE12F29 - IPHPluginProviderName - Nokia - IPHPluginSupportURL - http://www.nokia.com/support - IPHPublicPluginVersion - 2.0 - - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/apple/S60_RnD_32.phoneplugin/Contents/Resources/MetaClasses.plist --- a/connectivitymodules/SeCon/apple/S60_RnD_32.phoneplugin/Contents/Resources/MetaClasses.plist Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,329 +0,0 @@ - - - family.com.nokia.S6032 - - InheritsFrom - - family.com.apple.external.all-phones.usb-bt - - Services - - - ServiceName - com.apple.synchro - ServiceClass - IPHSyncMLSyncTransportServiceObexClient - ServiceProperties - - IPHEnginePlist - SyncEngine.plist - SyncProperties2 - PhoneConduit.plist - SyncMLVersion - SyncML11 - SyncMLLargeObjectSupport - - SyncMLNumberOfChangesSupport - - SyncMLRefreshFromServerSupport - - SyncMLRemoteNeedsRelativePaths - - SyncMLBusySignalingSupport - - SyncMLOnlyOneBusySignaling - - SyncMLBusySignalingInterval - 60 - SyncMLSimulateBusySignalingWithEmptySync - - SyncDataClasses - - - com.apple.pimsync.contacts - com.apple.pimsync.calendars - - - DontSyncEventsAfterDateValue.visible - - DontSyncEventsAfterDateValue.default-value - 1month - OnlySyncContactsWithPhoneNumber.visible - - OnlySyncContactsWithPhoneNumber.default-value - - SyncAllDayEventsKey.visible - - SyncAllDayEventsKey.default-value - - DontSyncEventsPriorToDateValue.visible - - DontSyncEventsPriorToDateValue.default-value - 1week - DontSyncEventsPriorToDateIsEnabled.visible - - DontSyncEventsPriorToDateIsEnabled.default-value - - DontSyncEventsAfterDateIsEnabled.visible - - DontSyncEventsAfterDateIsEnabled.default-value - - SyncMLLocalSource - iSync - SyncMLCodec - SyncMLCodecLibWBXML - SyncMLMsgTemporization - 500000 - SyncMLMaxObjSize - 786432 - SyncMLMaxMsgSize - 65535 - BTProtocolService - com.nokia.S6032.protocol.bt.obex.syncml - USBProtocolService - com.nokia.S6032.protocol.usb.obex.syncml - - - - ServiceName - com.nokia.S6032.protocol.usb.obex.syncml - ServiceClass - IPHObexService - ServiceProperties - - ObexTargetUUID - 53 59 4e 43 4d 4c 2d 53 59 4e 43 - ObexTimeOut - 60 - TransportService - com.nokia.S6032.transport.usb.syncml - - - - ServiceName - com.nokia.S6032.protocol.bt.obex.syncml - ServiceClass - IPHObexService - ServiceProperties - - ObexTargetUUID - 53 59 4e 43 4d 4c 2d 53 59 4e 43 - ObexTimeOut - 60 - TransportService - com.nokia.S6032.transport.rfcomm.syncml - - - - ServiceName - com.apple.protocol.usb.AT - ServiceClass - IPHSerialATService - ServiceProperties - - - - ServiceName - com.nokia.S6032.transport.rfcomm.syncml - ServiceClass - IPHRFCOMMChannelService - ServiceProperties - - RFCOMMChannelUUID - 000000020000100080000002ee000002 - - - - ServiceName - com.apple.transport.usb.modem - ServiceClass - IPHUSBCDCChannelService - ServiceProperties - - - - ServiceName - com.nokia.S6032.transport.usb.syncml - ServiceClass - IPHUSBObexChannelService - ServiceProperties - - - - ServiceName - com.apple.pimsync.parser.vCal - ServiceClass - IPHSyncParserService - ServiceProperties - - ParserType - vCal - Encoding - QUOTED-PRINTABLE - FoldingStyle - FoldingNG - Charset - UTF-8 - AllDayEventFormat - AllDayEventFromMidnightTo235900 - vCalRecDropIfUseless - - EscapeSemicolonInNotComponedValues - - EscapeBackslash - - IgnoreProperties - - X-IRMC-LUID - - UntilDateInLocal - - SetUntilTimeWithStartTime - - - - - ServiceName - com.apple.pimsync.parser.vCard - ServiceClass - IPHSyncParserService - ServiceProperties - - ParserType - vCard - Encoding - QUOTED-PRINTABLE - FoldingStyle - FoldingNG - Charset - UTF-8 - EscapeSemicolonInNotComponedValues - - EscapeBackslash - - IgnoreProperties - - X-IRMC-LUID - - PropertyNameMapping - - X-NICKNAME - X-EPOCSECONDNAME - - AddCRLFAfterBase64Folding - - IgnoreSubTypesForThisMainTypes - - CELL - - - - - ServiceName - com.apple.pimsync.contacts - ServiceClass - IPHSyncDataClassService - ServiceProperties - - MimeType - text/x-vcard - ParserService - com.apple.pimsync.parser.vCard - RemoteName - - needsCompanyNameInFirstName - - needsFullAddressInStreetField - - DataClassName - Contacts - needsDeleteAddOnModify - - MaxSyncCmd - 1 - - - - ServiceName - com.apple.pimsync.calendars - ServiceClass - IPHSyncDataClassService - ServiceProperties - - MimeType - text/x-vcalendar - ParserService - com.apple.pimsync.parser.vCal - hasEvent - - RemoteName - - hasAllDayEvents - - hasAllDayFromMidnightTo235900 - - hasVCalRecurrence - - needsToFormatCountToUntilDate - - needsToFormatUntilDateToCount - - hasOneAlarmType - - alarmTypeIsDisplay - - hasTimeZone - - hasTask - - handleAllDayRecurrent - - doNotSyncAlarmIfAfterStartDateTime - - DataClassName - Calendar - allDayInLocalDateTime - - untilDateIsDateOnly - - exDatesAreDateOnly - - doNotSyncAlarmIfCompleted - - dueDateIsDateOnly - - - - - - com.nokia.S6032 - - Identification - - com.apple.usb.vendorid-modelid - 0x0421/0x0500 - com.apple.gmi+gmm - Nokia+Nokia 6290 - - InheritsFrom - - family.com.nokia.S6032 - - Services - - - ServiceName - com.apple.model - ServiceProperties - - ModelName - S60-32 - CompanyName - Nokia - ModelIcon - com.nokia.S6032.tiff - - - - - \ No newline at end of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/apple/S60_RnD_32.phoneplugin/Contents/Resources/PhoneConduit.plist --- a/connectivitymodules/SeCon/apple/S60_RnD_32.phoneplugin/Contents/Resources/PhoneConduit.plist Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,534 +0,0 @@ - - - - - Formatting - - com.apple.calendars.Event - - classification - - mappings - - - mappedValue - PUBLIC - originalValue - public - - - mappedValue - PRIVATE - originalValue - private - - - mappedValue - PRIVATE - originalValue - confidential - - - - description - - charsToStrip - \r,\n - maxLength - 500 - - end date - - location - - charsToStrip - \r,\n - maxLength - 255 - - start date - - summary - - charsToStrip - \r,\n - maxLength - 500 - - - com.apple.calendars.Task - - classification - - mappings - - - mappedValue - PUBLIC - originalValue - public - - - mappedValue - PRIVATE - originalValue - private - - - mappedValue - PRIVATE - originalValue - confidential - - - - completion date - - description - - charsToStrip - \r,\n - maxLength - 255 - - due date - - priority - - mappings - - - mappedValue - - originalValue - 0 - - - mappedValue - 1 - originalValue - 1 - - - mappedValue - 2 - originalValue - 2 - - - mappedValue - 3 - originalValue - 3 - - - mappedValue - 4 - originalValue - 4 - - - mappedValue - 5 - originalValue - 5 - - - mappedValue - 6 - originalValue - 6 - - - mappedValue - 7 - originalValue - 7 - - - mappedValue - 8 - originalValue - 8 - - - mappedValue - 9 - originalValue - 9 - - - - status - - mappings - - - mappedValue - DECLINED - originalValue - cancelled - - - mappedValue - NEEDS ACTION - originalValue - needsaction - - - mappedValue - COMPLETED - originalValue - completed - - - mappedValue - ACCEPTED - originalValue - inprocess - - - mappedValue - - originalValue - none - - - - summary - - charsToStrip - \r,\n - maxLength - 255 - - - com.apple.contacts.Contact - - birthday - - company name - - charsToStrip - \r,\n - maxLength - 255 - - department - - charsToStrip - \r,\n - maxLength - 255 - - first name - - charsToStrip - \r,\n - maxLength - 255 - - image - - maxLength - 0 - - job title - - charsToStrip - \r,\n - maxLength - 255 - - last name - - charsToStrip - \r,\n - maxLength - 255 - - middle name - - charsToStrip - \r,\n - maxLength - 255 - - nickname - - charsToStrip - \r,\n - maxLength - 255 - - notes - - maxLength - 1000 - - suffix - - charsToStrip - \r,\n - maxLength - 255 - - title - - charsToStrip - \r,\n - maxLength - 255 - - - com.apple.contacts.Date - - type - - mappings - - - value - - - com.apple.contacts.Email Address - - type - - mappings - - - mappedValue - WORK - originalValue - work - - - mappedValue - HOME - originalValue - home - - - mappedValue - INTERNET - originalValue - other - - - - value - - charsToStrip - \r,\n - maxLength - 255 - - - com.apple.contacts.Phone Number - - type - - mappings - - - mappedValue - WORK - originalValue - work - - - mappedValue - HOME - originalValue - home - - - mappedValue - CELL - originalValue - mobile - - - mappedValue - FAX - originalValue - work fax - - - mappedValue - FAX - originalValue - home fax - - - mappedValue - - originalValue - other - - - mappedValue - - originalValue - main - - - mappedValue - PAGER - originalValue - pager - - - - value - - charsToKeep - 0123456789+#*pw - maxLength - 255 - - - com.apple.contacts.Related Name - - type - - mappings - - - mappedValue - X-CHILDREN - originalValue - child - - - mappedValue - X-SPOUSE - originalValue - spouse - - - mappedValue - X-ASSISTANT - originalValue - assistant - - - - value - - charsToStrip - \r,\n - maxLength - 255 - - - com.apple.contacts.Street Address - - city - - charsToStrip - \r,\n - maxLength - 255 - - country - - charsToStrip - \r,\n - maxLength - 255 - - postal code - - charsToStrip - \r,\n - maxLength - 255 - - state - - charsToStrip - \r,\n - maxLength - 255 - - street - - charsToStrip - \r,\n - maxLength - 255 - - type - - mappings - - - mappedValue - WORK - originalValue - work - - - mappedValue - HOME - originalValue - home - - - mappedValue - - originalValue - other - - - relationshipConstraint - perSubType - relationshipSize - 1 - - - com.apple.contacts.URL - - type - - mappings - - - mappedValue - WORK - originalValue - work - - - mappedValue - HOME - originalValue - home page - - - mappedValue - HOME - originalValue - home - - - mappedValue - - originalValue - other - - - - value - - charsToStrip - \r,\n - maxLength - 500 - - - - - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/apple/S60_RnD_32.phoneplugin/Contents/Resources/SyncEngine.plist --- a/connectivitymodules/SeCon/apple/S60_RnD_32.phoneplugin/Contents/Resources/SyncEngine.plist Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,151 +0,0 @@ - - - - - Entities - - com.apple.calendars.AudioAlarm - - com.apple.syncservices.RecordEntityName - triggerdate - triggerduration - owner - - com.apple.calendars.Calendar - - com.apple.syncservices.RecordEntityName - title - read only - com.apple.PhoneConduitExtension.uid - - com.apple.calendars.DisplayAlarm - - com.apple.syncservices.RecordEntityName - triggerdate - triggerduration - owner - - com.apple.calendars.Event - - com.apple.syncservices.RecordEntityName - original date - all day - exception dates - calendar - recurrences - main event - detached events - audio alarms - display alarms - start date - location - summary - end date - description - classification - - com.apple.calendars.Recurrence - - com.apple.syncservices.RecordEntityName - frequency - count - until - interval - bymonth - byweeknumber - byyearday - bymonthday - bydayfreq - bydaydays - bysetpos - weekstartday - owner - - com.apple.calendars.Task - - com.apple.syncservices.RecordEntityName - due date is date only - calendar - audio alarms - display alarms - status - summary - completion date - description - due date - classification - priority - - com.apple.contacts.Contact - - com.apple.syncservices.RecordEntityName - title - suffix - image - last name - company name - first name - middle name - job title - nickname - notes - department - birthday - email addresses - phone numbers - URLs - street addresses - related names - dates - - com.apple.contacts.Date - - com.apple.syncservices.RecordEntityName - contact - value - type - - com.apple.contacts.Email Address - - com.apple.syncservices.RecordEntityName - contact - value - type - - com.apple.contacts.Phone Number - - com.apple.syncservices.RecordEntityName - contact - value - type - - com.apple.contacts.Related Name - - com.apple.syncservices.RecordEntityName - contact - value - type - - com.apple.contacts.Street Address - - com.apple.syncservices.RecordEntityName - contact - city - state - street - country - type - postal code - - com.apple.contacts.URL - - com.apple.syncservices.RecordEntityName - contact - value - type - - - Type - device - - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/apple/S60_RnD_32.phoneplugin/Contents/Resources/com.nokia.S6032.tiff Binary file connectivitymodules/SeCon/apple/S60_RnD_32.phoneplugin/Contents/Resources/com.nokia.S6032.tiff has changed diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/apple/S60_RnD_32.pkg/Contents/Archive.bom Binary file connectivitymodules/SeCon/apple/S60_RnD_32.pkg/Contents/Archive.bom has changed diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/apple/S60_RnD_32.pkg/Contents/Archive.pax.gz Binary file connectivitymodules/SeCon/apple/S60_RnD_32.pkg/Contents/Archive.pax.gz has changed diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/apple/S60_RnD_32.pkg/Contents/Info.plist --- a/connectivitymodules/SeCon/apple/S60_RnD_32.pkg/Contents/Info.plist Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,67 +0,0 @@ - - - - - CFBundleGetInfoString - 0.0, Copyright 2006 Apple Computer, Inc. - CFBundleIdentifier - com.apple.isyncpluginmaker.phoneplugin - CFBundleShortVersionString - 0.0 - IFMajorVersion - 1 - IFMinorVersion - 0 - IFPkgFlagAllowBackRev - - IFPkgFlagAuthorizationAction - AdminAuthorization - IFPkgFlagBackgroundAlignment - topleft - IFPkgFlagBackgroundScaling - none - IFPkgFlagDefaultLocation - / - IFPkgFlagFollowLinks - - IFPkgFlagInstallFat - - IFPkgFlagInstalledSize - 156 - IFPkgFlagIsRequired - - IFPkgFlagOverwritePermissions - - IFPkgFlagRelocatable - - IFPkgFlagRestartAction - NoRestart - IFPkgFlagRootVolumeOnly - - IFPkgFlagUpdateInstalledLanguages - - IFPkgFormatVersion - 0.10000000149011612 - IFRequirementDicts - - - LabelKey - iSync24Label - MessageKey - iSync2XMessage - SpecArgument - /Applications/iSync.app/Contents/Info.plist - SpecProperty - CFBundleVersion - SpecType - plist - TestObject - 500.134 - TestOperator - ge - TitleKey - iSync24Title - - - - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/apple/S60_RnD_32.pkg/Contents/PkgInfo --- a/connectivitymodules/SeCon/apple/S60_RnD_32.pkg/Contents/PkgInfo Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -pkmkrpkg1 \ No newline at end of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/apple/S60_RnD_32.pkg/Contents/Resources/Description.plist --- a/connectivitymodules/SeCon/apple/S60_RnD_32.pkg/Contents/Resources/Description.plist Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ - - - - - IFPkgDescriptionDescription - Description of a Phone Plug-in - IFPkgDescriptionTitle - the phone plug-in - - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/apple/S60_RnD_32.pkg/Contents/Resources/English.lproj/ReadMe.rtf --- a/connectivitymodules/SeCon/apple/S60_RnD_32.pkg/Contents/Resources/English.lproj/ReadMe.rtf Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf410 -{\fonttbl\f0\fswiss\fcharset77 Helvetica;} -{\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural - -\f0\fs24 \cf0 This package has been built by Nokia Corporation. It will install a phone plugin to enable iSync support for your phone E60} \ No newline at end of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/apple/S60_RnD_32.pkg/Contents/Resources/IFRequirement.strings Binary file connectivitymodules/SeCon/apple/S60_RnD_32.pkg/Contents/Resources/IFRequirement.strings has changed diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/apple/S60_RnD_32.pkg/Contents/Resources/PhonePlugin.info --- a/connectivitymodules/SeCon/apple/S60_RnD_32.pkg/Contents/Resources/PhonePlugin.info Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -Title Phone Plug-in -Version -Description -DefaultLocation /Library/PhonePlugins -DeleteWarning - -### Package Flags - -NeedsAuthorization NO -Required YES -Relocatable YES -RequiresReboot NO -UseUserMask NO -OverwritePermissions NO -InstallFat NO -RootVolumeOnly YES -OnlyUpdateInstalledLanguages NO diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/apple/S60_RnD_32.pkg/Contents/Resources/TokenDefinitions.plist --- a/connectivitymodules/SeCon/apple/S60_RnD_32.pkg/Contents/Resources/TokenDefinitions.plist Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ - - - - - iSyncToken - - - searchPlugin - CommonAppSearch - path - /Applications/iSync.app - identifier - com.apple.isync - - - - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/apple/S60_RnD_32.pkg/Contents/Resources/Welcome.rtf --- a/connectivitymodules/SeCon/apple/S60_RnD_32.pkg/Contents/Resources/Welcome.rtf Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf380 -{\fonttbl\f0\fnil\fcharset77 LucidaGrande-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fnil\fcharset77 LucidaGrande; -} -{\colortbl;\red255\green255\blue255;\red1\green1\blue1;} -\vieww9000\viewh8400\viewkind0 -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural - -\f0\b\fs24 \cf0 Welcome to the iSync Phone Plug-in for Mac OS X Installer -\f1\b0 \ -\ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural - -\f2\fs22 \cf0 iSync for Mac OS X is synchronization software that keeps your Address Book contacts and iCal calendar and to-do information in sync between your Mac OS computers and iSync-compatible mobile phones.\ -\ -This installer guides you through the steps necessary to install an iSync Phone Plug-in for Mac OS X. To get started, click Continue. -\f1\fs24 \cf2 \ -} \ No newline at end of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/apple/S60_RnD_32.pkg/Contents/Resources/en.lproj/Description.plist --- a/connectivitymodules/SeCon/apple/S60_RnD_32.pkg/Contents/Resources/en.lproj/Description.plist Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ - - - - - IFPkgDescriptionDescription - - IFPkgDescriptionTitle - 367C0F5C-1E53-44A3-AEA5-54D1EEE12F29-installerRoot - - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/apple/S60_RnD_32.pkg/Contents/Resources/package_version --- a/connectivitymodules/SeCon/apple/S60_RnD_32.pkg/Contents/Resources/package_version Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -major: 1 -minor: 0 \ No newline at end of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/apple/S60_RnD_32.ppdoc/Icon.tiff Binary file connectivitymodules/SeCon/apple/S60_RnD_32.ppdoc/Icon.tiff has changed diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/apple/S60_RnD_32.ppdoc/InstallerReadMe-en.rtf --- a/connectivitymodules/SeCon/apple/S60_RnD_32.ppdoc/InstallerReadMe-en.rtf Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf410 -{\fonttbl\f0\fswiss\fcharset77 Helvetica;} -{\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural - -\f0\fs24 \cf0 This package has been built by Nokia Corporation. It will install a phone plugin to enable iSync support for your phone E60} \ No newline at end of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/apple/S60_RnD_32.ppdoc/Properties.plist --- a/connectivitymodules/SeCon/apple/S60_RnD_32.ppdoc/Properties.plist Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1358 +0,0 @@ - - - - - TramontaneVersion - 597.0 - UUID - 367C0F5C-1E53-44A3-AEA5-54D1EEE12F29 - properties - - BTOptionsDict - - OBEXTimeout - 60 - TransportType - 0 - synchroScriptConnect - - synchroScriptDisconnect - - - UISettingsOptionsDict - - DontSyncEventsAfterDateIsEnabled - - default - 0 - visible - - - DontSyncEventsAfterDateValue - - default - 1month - visible - - - DontSyncEventsPriorToDateIsEnabled - - default - 0 - visible - - - DontSyncEventsPriorToDateValue - - default - 1week - visible - - - OnlySyncContactsWithPhoneNumber - - default - 1 - visible - - - SyncAllDayEventsKey - - default - 0 - visible - - - - USBOptionsDict - - OBEXTimeout - 60 - identificationCDCChannel - 0 - identificationScriptConnect - - identificationScriptDisconnect - - synchroCDCChannel - 1 - synchroOBEXChannel - 0 - synchroScriptConnect - - synchroScriptDisconnect - - useOBEX - - useOtherCDC - - useSameCDC - - - advancedOptionsSettings - - com_apple_pimsync_contacts - - DataClassName - Contacts - MaxAddAndReplaceCmd - 0 - MaxDeleteCmd - 0 - MaxSyncCmd - 1 - needsDeleteAddOnModify - 1 - - com_apple_pimsync_events - - DataClassName - Calendar - MaxAddAndReplaceCmd - 0 - MaxDeleteCmd - 0 - MaxSyncCmd - 0 - allDayInLocalDateTime - 1 - allowedAlarmRelativeValues - - countValueWhenMissing - 0 - defaultUntilDateWhenMissing - - doNotSyncAlarmForADE - - doNotSyncAlarmIfAfterStartDateTime - 1 - dontSyncEventBeforeDate - - exDatesAreDateOnly - - handleMultiDayRecurrent - - hasAllDayMultiDay - - maxMinutesNbDeltaForAlarm - 0 - needsDeleteAddOnModify - 0 - noNewLines - 0 - onlyAsciiCharacters - - syncAlarmOnlyIfSameDayAsADEStartDate - - untilDateIsDateOnly - 1 - - com_apple_pimsync_parser_vCal - - AllDayCategories - REMINDER - EscapeBackslash - 1 - EscapeSemicolonInNotComponedValues - 1 - EscapeStrings - - ExDatesInLocal - - IgnoreProperties - X-IRMC-LUID - PropertyNameMapping - - SetExDateTimeWithEndTime - - SetExDateTimeWithStartTime - - SetUntilTimeWithEndTime - 0 - SetUntilTimeWithStartTime - 1 - TimedCategories - MEETING - UntilDateInLocal - 1 - - com_apple_pimsync_parser_vCard - - AddCRLFAfterBase64Folding - 1 - IgnoreSubTypesForThisMainTypes - CELL - PropertyNameMapping - - - key - X-NICKNAME - value - X-EPOCSECONDNAME - - - - com_apple_pimsync_tasks - - DataClassName - Tasks - MaxAddAndReplaceCmd - 0 - MaxDeleteCmd - 0 - MaxSyncCmd - 0 - completionDateIsDateOnly - - defaultDueDateValueWhenMissing - - defaultDueDateWhenMissing - - doNotSyncAlarmForTask - - doNotSyncAlarmIfCompleted - 1 - dueDateIsDateOnly - - needsDeleteAddOnModify - - setDueDateToCompletionDateIfCompleted - - - com_apple_synchro - - SyncMLCodec - 0 - SyncMLDoNotTryToDetectPhoneDBReset - - SyncMLLocalSource - iSync - SyncMLMaxMsgSize - 65535 - SyncMLMaxObjSize - 786432 - SyncMLMsgTemporization - 500000 - SyncMLNoPropertiesCapabilitiesInDevInf - - SyncMLSendDevInfIntoPutIfNoGetReceived - 0 - SyncMLUseBinaryWBXMLPublicID - - - - calendarsOptionsDict - - Charset - UTF-8 - FoldingStyle - FoldingNG - RemoteName - / - allDayFormat - 3 - eventRecurrenceEndType - 1 - hasAudioAlarm - - hasDisplayAlarm - - hasEvent - - hasTimeZone - 1 - hasVCalRecurrence - - - contactsOptionsDict - - RemoteName - / - firstAndLastNameInSameField - - needsCompanyNameInFirstName - 0 - needsFullAddressInStreetField - - - documentVersion - 556 - extraOptionsSettings - - familyOptionsDict - - BTAvailable - - BluetoothAvailable - - CGMI - Nokia - CGMM - Nokia 6290 - GMI - Nokia - GMM - Nokia 6290 - ModelID - com.nokia.S6032 - Name - S60-32 - PluginProviderName - Nokia - ProductID - 0x0500 - USBAvailable - - VendorID - 0x0421 - connection - 2 - constructorName - Nokia - domainName - nokia.com - fixedDatabasesNames - 0 - pluginVersion - 1.0 - supportURL - http://www.nokia.com/support - useCGMICGMM - - - javaScriptDict - - btObexConnection - - Value - function prepareChannelForProtocol() -{ - // You can customize this function but do NOT change the signature -} - - btObexDisconnection - - Value - function unprepareChannelForProtocol() -{ - // You can customize this function but do NOT change the signature -} - - usbCdcConnection - - Value - function prepareChannelForProtocol() -{ - // You can customize this function but do NOT change the signature -} - - usbCdcDisconnection - - Value - function unprepareChannelForProtocol() -{ - // You can customize this function but do NOT change the signature -} - - usbObexConnection - - Value - function prepareChannelForProtocol() -{ - // You can customize this function but do NOT change the signature -} - - usbObexDisconnection - - Value - function unprepareChannelForProtocol() -{ - // You can customize this function but do NOT change the signature -} - - - notes - - WW91IGNhbiBzYXZlIGFueSBraW5kIG9mIGluZm9ybWF0aW9uIG9uIHRoZSBw - bHVnaW4gaGVyZS4KVGhleSB3b24ndCBiZSBleHBvcnRlZCBpbiB0aGUgcGx1 - Z2luLg== - - syncFieldsSettings - - com_apple_calendars_Event - - classification - - Activated - - mappings - - - activated - - mappedValue - PUBLIC - originalValue - public - - - activated - - mappedValue - PRIVATE - originalValue - private - - - activated - - mappedValue - PRIVATE - originalValue - confidential - - - - description - - Activated - - charsFiltering - 1 - charsToStrip - \r,\n - maxLength - 500 - - end date - - Activated - - - location - - Activated - - charsFiltering - 1 - charsToStrip - \r,\n - maxLength - 255 - - start date - - Activated - - - summary - - Activated - - DontNeedCheckBox - - charsFiltering - 1 - charsToStrip - \r,\n - maxLength - 500 - - - com_apple_calendars_Task - - classification - - Activated - - mappings - - - activated - - mappedValue - PUBLIC - originalValue - public - - - activated - - mappedValue - PRIVATE - originalValue - private - - - activated - - mappedValue - PRIVATE - originalValue - confidential - - - - completion date - - Activated - - - description - - Activated - - charsFiltering - 1 - charsToStrip - \r,\n - maxLength - 255 - - due date - - Activated - - - priority - - Activated - - mappings - - - activated - - originalValue - 0 - - - activated - - mappedValue - 1 - originalValue - 1 - - - activated - - mappedValue - 2 - originalValue - 2 - - - activated - - mappedValue - 3 - originalValue - 3 - - - activated - - mappedValue - 4 - originalValue - 4 - - - activated - - mappedValue - 5 - originalValue - 5 - - - activated - - mappedValue - 6 - originalValue - 6 - - - activated - - mappedValue - 7 - originalValue - 7 - - - activated - - mappedValue - 8 - originalValue - 8 - - - activated - - mappedValue - 9 - originalValue - 9 - - - - status - - Activated - - mappings - - - activated - - mappedValue - DECLINED - originalValue - cancelled - - - activated - - mappedValue - NEEDS ACTION - originalValue - needsaction - - - activated - - mappedValue - COMPLETED - originalValue - completed - - - activated - - mappedValue - ACCEPTED - originalValue - inprocess - - - activated - - mappedValue - - originalValue - none - - - - summary - - Activated - - DontNeedCheckBox - - charsFiltering - 1 - charsToStrip - \r,\n - maxLength - 255 - - - com_apple_contacts_Contact - - birthday - - Activated - - - company name - - Activated - - DontNeedCheckBox - - charsFiltering - 1 - charsToStrip - \r,\n - maxLength - 255 - - department - - Activated - - charsFiltering - 1 - charsToStrip - \r,\n - maxLength - 255 - - first name - - Activated - - DontNeedCheckBox - - charsFiltering - 1 - charsToStrip - \r,\n - maxLength - 255 - - image - - Activated - - maxLength - 0 - - job title - - Activated - - charsFiltering - 1 - charsToStrip - \r,\n - maxLength - 255 - - last name - - Activated - - DontNeedCheckBox - - charsFiltering - 1 - charsToStrip - \r,\n - maxLength - 255 - - middle name - - Activated - - charsFiltering - 1 - charsToStrip - \r,\n - maxLength - 255 - - nickname - - Activated - - charsFiltering - 1 - charsToStrip - \r,\n - maxLength - 255 - - notes - - Activated - - maxLength - 1000 - - suffix - - Activated - - charsFiltering - 1 - charsToStrip - \r,\n - maxLength - 255 - - title - - Activated - - charsFiltering - 1 - charsToStrip - \r,\n - maxLength - 255 - - - com_apple_contacts_Date - - IPSGlobalEntity - - Activated - - - type - - Activated - - mappings - - - activated - - mappedValue - X-ANNIVERSARY - originalValue - anniversary - - - activated - - mappedValue - X-DATE - originalValue - other - - - - value - - Activated - - - - com_apple_contacts_Email Address - - IPSGlobalEntity - - Activated - - - type - - Activated - - mappings - - - activated - - mappedValue - WORK - originalValue - work - - - activated - - mappedValue - HOME - originalValue - home - - - activated - - mappedValue - INTERNET - originalValue - other - - - - value - - Activated - - DontNeedCheckBox - - charsFiltering - 1 - charsToStrip - \r,\n - maxLength - 255 - - - com_apple_contacts_Phone Number - - IPSGlobalEntity - - Activated - - - type - - Activated - - mappings - - - activated - - mappedValue - WORK - originalValue - work - - - activated - - mappedValue - HOME - originalValue - home - - - activated - - mappedValue - CELL - originalValue - mobile - - - activated - - mappedValue - FAX - originalValue - work fax - - - activated - - mappedValue - FAX - originalValue - home fax - - - activated - - mappedValue - - originalValue - other - - - activated - - mappedValue - - originalValue - main - - - activated - - mappedValue - PAGER - originalValue - pager - - - - value - - Activated - - DontNeedCheckBox - - charsFiltering - 2 - charsToKeep - 0123456789+#*pw - maxLength - 255 - - - com_apple_contacts_Related Name - - IPSGlobalEntity - - Activated - - - type - - Activated - - mappings - - - activated - - mappedValue - X-FATHER - originalValue - father - - - activated - - mappedValue - X-MOTHER - originalValue - mother - - - activated - - mappedValue - X-PARENT - originalValue - parent - - - activated - - mappedValue - X-CHILDREN - originalValue - child - - - activated - - mappedValue - X-BROTHER - originalValue - brother - - - activated - - mappedValue - X-SISTER - originalValue - sister - - - activated - - mappedValue - X-FRIEND - originalValue - friend - - - activated - - mappedValue - X-SPOUSE - originalValue - spouse - - - activated - - mappedValue - X-PARTNER - originalValue - partner - - - activated - - mappedValue - X-ASSISTANT - originalValue - assistant - - - activated - - mappedValue - X-MANAGER - originalValue - manager - - - activated - - mappedValue - X-NAME - originalValue - other - - - - value - - Activated - - DontNeedCheckBox - - charsFiltering - 1 - charsToStrip - \r,\n - maxLength - 255 - - - com_apple_contacts_Street Address - - IPSGlobalEntity - - Activated - - - city - - Activated - - charsFiltering - 1 - charsToStrip - \r,\n - maxLength - 255 - - country - - Activated - - charsFiltering - 1 - charsToStrip - \r,\n - maxLength - 255 - - postal code - - Activated - - charsFiltering - 1 - charsToStrip - \r,\n - maxLength - 255 - - state - - Activated - - charsFiltering - 1 - charsToStrip - \r,\n - maxLength - 255 - - street - - Activated - - DontNeedCheckBox - - charsFiltering - 1 - charsToStrip - \r,\n - maxLength - 255 - - type - - Activated - - mappings - - - activated - - mappedValue - WORK - originalValue - work - - - activated - - mappedValue - HOME - originalValue - home - - - activated - - mappedValue - - originalValue - other - - - relationshipLimitKind - 2 - - - com_apple_contacts_URL - - IPSGlobalEntity - - Activated - - - type - - Activated - - mappings - - - activated - - mappedValue - WORK - originalValue - work - - - activated - - mappedValue - HOME - originalValue - home page - - - activated - - mappedValue - HOME - originalValue - home - - - activated - - mappedValue - - originalValue - other - - - - value - - Activated - - DontNeedCheckBox - - charsFiltering - 1 - charsToStrip - \r,\n - maxLength - 500 - - - - syncMLOptionsDict - - SyncMLBusySignalingInterval - 60 - SyncMLBusySignalingSupport - - SyncMLLargeObjectSupport - - SyncMLMaxSyncCmdNbInEncodedMsg - 30 - SyncMLNumberOfChangesSupport - - SyncMLOnlyOneBusySignaling - - SyncMLRefreshFromServerSupport - - SyncMLRemoteNeedsRelativePaths - - SyncMLSimulateBusySignalingWithEmptySync - - SyncMLVersion - SyncML11 - limitSyncCmd - - - tasksOptionsDict - - RemoteName - Tasks - hasDifferentDataclassesForTasksAndEvents - - hasTasks - - - vCalRecSettings - - com_apple_pimsync_events - - handleAllDayRecurrent - - - com_apple_pimsync_parser_vCal - - vCalExDatesSupport - - vCalRecDaily - - vCalRecDailyInterval - - vCalRecDropIfUseless - 1 - vCalRecMaxExDatesNb - 0 - vCalRecMonthlyByDay - - vCalRecMonthlyByDayOnlyOnStartDateMonthDay - - vCalRecMonthlyByDayOnlyOneMonthDay - - vCalRecMonthlyByDayWithMonthDay - - vCalRecMonthlyByPos - - vCalRecMonthlyByPosOnlyOnStartDateWeekDay - - vCalRecMonthlyByPosOnlyOneWeekDay - - vCalRecMonthlyInterval - - vCalRecOnlyForever - - vCalRecWeekly - - vCalRecWeeklyInterval - - vCalRecWeeklyOnlyOnStartDateWeekDay - - vCalRecWeeklyOnlyOneWeekDay - - vCalRecWeeklyWithWeekDay - - vCalRecYearlyByMonth - - vCalRecYearlyByMonthInterval - - vCalRecYearlyByMonthOnlyOnStartDateMonthNumber - - vCalRecYearlyByMonthOnlyOneMonthNumber - - vCalRecYearlyByMonthWithMonthNumber - - - - - version - 0 - - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/catalogspcconnectivityplugin/bwins/catalogspcconnectivitypluginu.def --- a/connectivitymodules/SeCon/catalogspcconnectivityplugin/bwins/catalogspcconnectivitypluginu.def Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -EXPORTS - ??1CCatalogsPCConnectivityPlugin@@UAE@XZ @ 1 NONAME ; CCatalogsPCConnectivityPlugin::~CCatalogsPCConnectivityPlugin(void) - ?Close@CCatalogsPCConnectivityPlugin@@QAEXXZ @ 2 NONAME ; void CCatalogsPCConnectivityPlugin::Close(void) - ?Connect@CCatalogsPCConnectivityPlugin@@QAEHXZ @ 3 NONAME ; int CCatalogsPCConnectivityPlugin::Connect(void) - ?GetDataL@CCatalogsPCConnectivityPlugin@@QAEXAAVTDataType@@AAVCBufFlat@@@Z @ 4 NONAME ; void CCatalogsPCConnectivityPlugin::GetDataL(class TDataType &, class CBufFlat &) - ?NewL@CCatalogsPCConnectivityPlugin@@SAPAV1@XZ @ 5 NONAME ; class CCatalogsPCConnectivityPlugin * CCatalogsPCConnectivityPlugin::NewL(void) - ?NewLC@CCatalogsPCConnectivityPlugin@@SAPAV1@XZ @ 6 NONAME ; class CCatalogsPCConnectivityPlugin * CCatalogsPCConnectivityPlugin::NewLC(void) - ?PutDataL@CCatalogsPCConnectivityPlugin@@QAEXABVTDataType@@ABVCBufFlat@@@Z @ 7 NONAME ; void CCatalogsPCConnectivityPlugin::PutDataL(class TDataType const &, class CBufFlat const &) - ?SupportedMimeTypesL@CCatalogsPCConnectivityPlugin@@QAE?AV?$RPointerArray@VTDataType@@@@XZ @ 8 NONAME ; class RPointerArray CCatalogsPCConnectivityPlugin::SupportedMimeTypesL(void) - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/catalogspcconnectivityplugin/eabi/catalogspcconnectivitypluginu.def --- a/connectivitymodules/SeCon/catalogspcconnectivityplugin/eabi/catalogspcconnectivitypluginu.def Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -EXPORTS - _ZN29CCatalogsPCConnectivityPlugin19SupportedMimeTypesLEv @ 1 NONAME - _ZN29CCatalogsPCConnectivityPlugin4NewLEv @ 2 NONAME - _ZN29CCatalogsPCConnectivityPlugin5CloseEv @ 3 NONAME - _ZN29CCatalogsPCConnectivityPlugin5NewLCEv @ 4 NONAME - _ZN29CCatalogsPCConnectivityPlugin7ConnectEv @ 5 NONAME - _ZN29CCatalogsPCConnectivityPlugin8GetDataLER9TDataTypeR8CBufFlat @ 6 NONAME - _ZN29CCatalogsPCConnectivityPlugin8PutDataLERK9TDataTypeRK8CBufFlat @ 7 NONAME - _ZN29CCatalogsPCConnectivityPluginD0Ev @ 8 NONAME - _ZN29CCatalogsPCConnectivityPluginD1Ev @ 9 NONAME - _ZN29CCatalogsPCConnectivityPluginD2Ev @ 10 NONAME - _ZTI29CCatalogsPCConnectivityPlugin @ 11 NONAME ; ## - _ZTV29CCatalogsPCConnectivityPlugin @ 12 NONAME ; ## - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/catalogspcconnectivityplugin/group/bld.inf --- a/connectivitymodules/SeCon/catalogspcconnectivityplugin/group/bld.inf Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -/* -* Copyright (c) 2006-2008 Nokia Corporation and/or 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: Build info file for Catalogs PC Connectivity Plugin -* -*/ - - -PRJ_MMPFILES - -catalogspcconnectivityplugin.mmp - - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/catalogspcconnectivityplugin/group/catalogspcconnectivityplugin.mmp --- a/connectivitymodules/SeCon/catalogspcconnectivityplugin/group/catalogspcconnectivityplugin.mmp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -/* -* Copyright (c) 2006-2008 Nokia Corporation and/or 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: Project definition file for project Catalogs PC Connectivity -* Plugin -* -*/ - -#include -#include - -TARGET catalogspcconnectivityplugin.dll -TARGETTYPE dll -UID 0x1000008D 0x10207E73 - -CAPABILITY CAP_ECOM_PLUGIN -VENDORID VID_DEFAULT - -SOURCEPATH ../src -SOURCE catalogspcconnectivityplugin.cpp -SOURCE catalogspcconnectivityclient.cpp - -USERINCLUDE ../inc - -// Default system include paths for middleware layer modules. -MW_LAYER_SYSTEMINCLUDE - -LIBRARY euser.lib -LIBRARY apmime.lib - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/catalogspcconnectivityplugin/inc/catalogspcconnectivityclient.h --- a/connectivitymodules/SeCon/catalogspcconnectivityplugin/inc/catalogspcconnectivityclient.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,145 +0,0 @@ -/* -* Copyright (c) 2006 Nokia Corporation and/or 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: This is a client which communicate with the server -* CatalogsEnginePCClientFrontEnd -* -*/ - - -#ifndef R_CATALOGSPCCONNECTIVITYCLIENT_H -#define R_CATALOGSPCCONNECTIVITYCLIENT_H - -#include -#include - -/** - * This client communicate with the server CatalogsEnginePCClientFrontEnd - * - * This class get requests from CatalogsPCConnectivityPlugin. - * Class itself is client in client-server solution. When request - * is received it will start the server (CatalogsEnginePCClientFrontEnd). - * This client class is dummy, the server have all the functionality. - * - * @lib catalogspcconnectivityplugin - * @since S60 v3.1 - */ -class RCatalogsPCConnectivityClient : public RSessionBase - { -public: - - /** - * Constructor - * - * @since S60 v3.1 - */ - RCatalogsPCConnectivityClient(); - - /** - * Destructor - * - * @since S60 v3.1 - */ - ~RCatalogsPCConnectivityClient(); - - /** - * A connection is formed to the Catalogs engine pc client front-end. - * This will start up the front-end server and connect to it - * - * @since S60 v3.1 - * @return TInt Standard error code, KErrNone if connection is formed - * or the connection was formed already - */ - TInt Connect(); - - /** - * The connection to the Catalogs engine front-end is closed - * - * @since S60 v3.1 - */ - void Close(); - - /** - * All MIME types supported by this component can be asked using this method - * - * @since S60 v3.1 - * @return RPointerArray< TDataType > contain all supported MIME types - * RPointerArray TDataTypes have allocated using new, caller - * have to remember to delete them properly - * @exeption Leaves with standard error codes - */ - RPointerArray SupportedMimeTypesL(); - - /** - * A data packet of max length 65535 (0xFFFF) bytes is synchronously - * sent to the Catalogs engine front-end - * Usage: After PutDataL have been called, you have to call GetDataL - * before you can call PutDataL again - * - * @since S60 v3.1 - * @param aMimeType data packet MIME type - * @param aData data buffer to read from - * @exeption Leaves with standard error codes - */ - void PutDataL( const TDataType& aMimeType, - const CBufFlat& aData ); - - /** - * A data packet is synchronously transfered from the Catalogs front-end - * and returned to caller - * Usage: Everytime before calling GetDataL, you have to call PutDataL. - * So you can't call GetData in sequentially. - * - * @since S60 v3.1 - * @param aMimeType data packet MIME type - * @param aData data buffer to write to. Will call ExpandL function - * for aData, but never more than max length 65535 (OxFFFF) - * @return nothing, but parameter aData work as return buffer - * @exeption Leaves with standard error codes - */ - void GetDataL( TDataType& aMimeType, CBufFlat& aData ); - - -private: - -// private functions - - /** - * Returns the earliest version number of the server that we can talk to - * - * @since S60 v3.1 - * @return TVersion Earliest version number we can talk to - */ - TVersion Version() const; - - /** - * Start server if it isn't running already - * - * @since S60 v3.1 - * @return TInt Standard error code, KErrNone if server was running - * already or start was succesfull - */ - TInt StartServer(); - - /** - * Create server process - * - * @since S60 v3.1 - * @return TInt standard error code, KErrNone when creation was success - */ - TInt CreateServerProcess(); - - }; - -#endif // R_CATALOGSPCCONNECTIVITYCLIENT_H - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/catalogspcconnectivityplugin/inc/catalogspcconnectivitydefines.h --- a/connectivitymodules/SeCon/catalogspcconnectivityplugin/inc/catalogspcconnectivitydefines.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -/* -* Copyright (c) 2006 Nokia Corporation and/or 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: Server information that the client needs -* -*/ - - -#include - -/** Server name */ -_LIT( KCatalogsPCConnectivityServerName, - "CatalogsPCConnectivityServer" ); - -/** Semaphore that is used when creating a new server */ -_LIT( KCatalogsPCConnectivityServerSemaphoreName, - "CATALOGSPCCONNECTIVITYSemaphore" ); - -/** File that is passed to the new server-process for execution */ -_LIT( KCatalogsPCConnectivityServerFilename, - "catalogsenginepcclientfrontend" ); - -// Default message slot amount in a session -const TUint KCatalogsPCConnectivityDefaultMessageSlots = 255; - -/** Version numbers */ -const TUint KCatalogsPCConnectivityMajorVersionNumber=1; -const TUint KCatalogsPCConnectivityMinorVersionNumber=0; -const TUint KCatalogsPCConnectivityBuildVersionNumber=0; - -/** Function opcodes used in message passing between client and server */ -enum TCatalogsPCConnectivityServRqst - { - ECatalogsPCConnectivitySupportedMimeTypes = 1, - ECatalogsPCConnectivityPutData, - ECatalogsPCConnectivityGetData, - ECatalogsPCConnectivityGetSize - }; - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/catalogspcconnectivityplugin/inc/catalogspcconnectivityplugin.h --- a/connectivitymodules/SeCon/catalogspcconnectivityplugin/inc/catalogspcconnectivityplugin.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,147 +0,0 @@ -/* -* Copyright (c) 2006 Nokia Corporation and/or 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: This plugin enables the Catalogs PC client to communicate -* with the Catalogs engine -* -*/ - - -#ifndef C_CATALOGSPCCONNECTIVITYPLUGIN_H -#define C_CATALOGSPCCONNECTIVITYPLUGIN_H - -#include "catalogspcconnectivityclient.h" - -/** - * Plugin enables Catalogs PC client to communicate with the Catalogs engine - * - * This class get requests from Catalogs PC client. It passes the requests - * to client CatalogsPCConnectivityClient - * - * @lib catalogspcconnectivityplugin - * @since S60 v3.1 - */ -class CCatalogsPCConnectivityPlugin : public CBase - { -public: - - /** - * Standard symbian object construction first phase - * - * @since S60 v3.1 - * @return CCatalogsPCConnectivityPlugin pointer - */ - IMPORT_C static CCatalogsPCConnectivityPlugin* NewL(); - - /** - * Standard symbian object constructing first phase - * - * @since S60 v3.1 - * @return CCatalogsPCConnectivityPlugin pointer - */ - IMPORT_C static CCatalogsPCConnectivityPlugin* NewLC(); - - /** - * Destructor - * - * @since S60 v3.1 - */ - IMPORT_C virtual ~CCatalogsPCConnectivityPlugin(); - - /** - * A connection is formed to the Catalogs engine pc client front-end. - * This will start up the front-end server and connect to it - * - * @return TInt Standard error code, KErrNone if connection is formed - * @since S60 v3.1 - */ - IMPORT_C TInt Connect(); - - /** - * The connection to the Catalogs engine front-end is closed - * - * @since S60 v3.1 - */ - IMPORT_C void Close(); - - /** - * All MIME types supported by this component can be asked using this method - * - * @return RPointerArray contains all supported MIME types. - * The ownership is transferred to the caller. - * Use ResetAndDestroy method to free all allocated memory - * @exeption Leaves with standard error codes - * @since S60 v3.1 - */ - IMPORT_C RPointerArray SupportedMimeTypesL(); - - /** - * A Data packet of max length 65535 (0xFFFF) bytes is synchronously - * sent to the Catalogs engine front-end. - * Usage: After PutDataL has been called, you must call GetDataL - * before you can call PutDataL again - * - * @param aMimeType Data packet MIME type - * @param aData Data buffer to read from - * @exeption Leaves with standard error codes - * KErrNotSupported if not supported MIME type - * @since S60 v3.1 - */ - IMPORT_C void PutDataL( const TDataType& aMimeType, - const CBufFlat& aData ); - - /** - * A data packet is synchronously transfered from the Catalogs front-end - * and returned to caller - * Usage: Everytime before calling GetDataL, you have to call PutDataL. - * You may not call GetData in sequentially. - * - * @since S60 v3.1 - * @param aMimeType MIME type of the received data packet - * @param aData Data buffer to write to. ExpandL function will be called - * with the correct size for aData, but not more than max length - * 65535 (OxFFFF) - * @return The reference parameters contain the return data - * @exeption Leaves with standard error codes - */ - IMPORT_C void GetDataL( TDataType& aMimeType, CBufFlat& aData ); - - -private: - -// private functions - - - /** - * Constructor - * - * @since S60 v3.1 - */ - CCatalogsPCConnectivityPlugin(); - - /** - * Standard symbian object construction second phase - */ - void ConstructL(); - - -private: // data - - /** - * Client that communicate with the CatalogsEnginePCClientFrontEnd - */ - RCatalogsPCConnectivityClient iClient; - - }; - -#endif // C_CATALOGSPCCONNECTIVITYPLUGIN_H diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/catalogspcconnectivityplugin/src/catalogspcconnectivityclient.cpp --- a/connectivitymodules/SeCon/catalogspcconnectivityplugin/src/catalogspcconnectivityclient.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,229 +0,0 @@ -/* -* Copyright (c) 2006 Nokia Corporation and/or 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: Client that communicate with CatalogsEnginePCClientFrontEnd -* -*/ - - -#include "catalogspcconnectivityclient.h" -#include "catalogspcconnectivitydefines.h" - - -// ======== MEMBER FUNCTIONS ======== - -// --------------------------------------------------------------------------- -// Constructor -// --------------------------------------------------------------------------- -// -RCatalogsPCConnectivityClient::RCatalogsPCConnectivityClient() - { - } - -// --------------------------------------------------------------------------- -// Destructor -// --------------------------------------------------------------------------- -// -RCatalogsPCConnectivityClient::~RCatalogsPCConnectivityClient() - { - } - -// --------------------------------------------------------------------------- -// Start server and create session with server -// --------------------------------------------------------------------------- -// -TInt RCatalogsPCConnectivityClient::Connect() - { - TInt err = StartServer(); - - if ( err == KErrNone ) - { - err = CreateSession( - KCatalogsPCConnectivityServerName, - Version(), - KCatalogsPCConnectivityDefaultMessageSlots ); - } - return err; - } - -// --------------------------------------------------------------------------- -// Close session (After session is closed will server be closed too) -// --------------------------------------------------------------------------- -// -void RCatalogsPCConnectivityClient::Close() - { - RHandleBase::Close(); - } - -// --------------------------------------------------------------------------- -// Give MIME types supported by this Module -// --------------------------------------------------------------------------- -// -RPointerArray RCatalogsPCConnectivityClient:: -SupportedMimeTypesL() - { - RPointerArray supportedMIMEs; - TBool isThereMore = ETrue; - TPckgBuf pckgIsThereMore; - TDataType* tempMIME = 0; - TPckgBuf pckgMIME; - - while( isThereMore ) - { - User::LeaveIfError( SendReceive( - ECatalogsPCConnectivitySupportedMimeTypes, - TIpcArgs( &pckgMIME, &pckgIsThereMore ) ) ); - isThereMore = pckgIsThereMore(); - tempMIME = new( ELeave ) TDataType( pckgMIME() ); - User::LeaveIfError( supportedMIMEs.Append( tempMIME ) ); - } - - return supportedMIMEs; - } - -// --------------------------------------------------------------------------- -// Data package from CatalogsPCConnectivityPlugin -// --------------------------------------------------------------------------- -// -void RCatalogsPCConnectivityClient::PutDataL( - const TDataType& aMimeType, const CBufFlat& aData ) - { - TInt size = aData.Size(); - - RBuf8 desData; - desData.CreateL( size ); - desData.CleanupClosePushL(); - aData.Read( 0, desData, size ); - TPckgBuf pckgMIME( aMimeType ); - - User::LeaveIfError( SendReceive( - ECatalogsPCConnectivityPutData, - TIpcArgs( &pckgMIME, &desData, size ) ) ); - - CleanupStack::Pop(); //desData - desData.Close(); - } - -// --------------------------------------------------------------------------- -// Data request from CatalogsPCConnectivityPlugin -// First ask the size from server, then give correct size CBufFlat -// --------------------------------------------------------------------------- -// -void RCatalogsPCConnectivityClient::GetDataL( - TDataType& aMimeType, CBufFlat& aData ) - { - TPckgBuf pckgSize; - TPckgBuf pckgMIME; - - User::LeaveIfError( SendReceive( - ECatalogsPCConnectivityGetSize, - TIpcArgs( &pckgMIME, &pckgSize ) ) ); - - TInt size = pckgSize(); - aMimeType = pckgMIME(); - - RBuf8 desData; - desData.CreateL( size ); - desData.CleanupClosePushL(); - - User::LeaveIfError( SendReceive( - ECatalogsPCConnectivityGetData, - TIpcArgs( &desData ) ) ); - - aData.Reset(); - aData.ExpandL( 0, size ); - aData.Write( 0, desData, size ); - - CleanupStack::Pop(); //desData - desData.Close(); - } - -// --------------------------------------------------------------------------- -// Return version number -// --------------------------------------------------------------------------- -// -TVersion RCatalogsPCConnectivityClient::Version() const - { - return( TVersion( KCatalogsPCConnectivityMajorVersionNumber, - KCatalogsPCConnectivityMinorVersionNumber, - KCatalogsPCConnectivityBuildVersionNumber ) ); - } - -// --------------------------------------------------------------------------- -// Start server if it isn't running already -// --------------------------------------------------------------------------- -// -TInt RCatalogsPCConnectivityClient::StartServer() - { - // Check if the server is already running - TFindServer findServer( KCatalogsPCConnectivityServerName ); - TFullName name; - - TInt result = findServer.Next( name ); - if ( result == KErrNone ) - { - // Server is running - return KErrNone; - } - - // Create a semaphore so we can wait while the server starts - RSemaphore semaphore; - result = semaphore.CreateGlobal( - KCatalogsPCConnectivityServerSemaphoreName, 0 ); - if ( result != KErrNone ) - { - return result; - } - - // Create new Engine service process - result = CreateServerProcess(); - if ( result != KErrNone ) - { - semaphore.Close(); - return result; - } - - // Wait while the server starts - semaphore.Wait(); - - // Semaphore has been signaled, close and return - semaphore.Close(); - - return KErrNone; - } - -// --------------------------------------------------------------------------- -// Create server process -// --------------------------------------------------------------------------- -// -TInt RCatalogsPCConnectivityClient::CreateServerProcess() - { - - RProcess server; - - TInt result = server.Create( - KCatalogsPCConnectivityServerFilename, KNullDesC ); - if ( result != KErrNone ) - { - return result; - } - - // Resume server thread and close handle - server.Resume(); - server.Close(); - - return KErrNone; - } - - -//end diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/catalogspcconnectivityplugin/src/catalogspcconnectivityplugin.cpp --- a/connectivitymodules/SeCon/catalogspcconnectivityplugin/src/catalogspcconnectivityplugin.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,139 +0,0 @@ -/* -* Copyright (c) 2006 Nokia Corporation and/or 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: This plugin enables the Catalogs PC client to communicate -* with the Catalogs engine -* -*/ - - - -#include "catalogspcconnectivityplugin.h" - - - -// ======== MEMBER FUNCTIONS ======== - -// --------------------------------------------------------------------------- -// Constructor -// --------------------------------------------------------------------------- -// -CCatalogsPCConnectivityPlugin::CCatalogsPCConnectivityPlugin() - { - } - -// --------------------------------------------------------------------------- -// Empty -// --------------------------------------------------------------------------- -// -void CCatalogsPCConnectivityPlugin::ConstructL() - { - } - - -// --------------------------------------------------------------------------- -// Standard symbian object constructing first phase -// --------------------------------------------------------------------------- -// -EXPORT_C CCatalogsPCConnectivityPlugin* CCatalogsPCConnectivityPlugin::NewL() - { - CCatalogsPCConnectivityPlugin* self = - CCatalogsPCConnectivityPlugin::NewLC(); - CleanupStack::Pop( self ); - return self; - } - - -// --------------------------------------------------------------------------- -// Standard symbian object constructing first phase -// --------------------------------------------------------------------------- -// -EXPORT_C CCatalogsPCConnectivityPlugin* CCatalogsPCConnectivityPlugin::NewLC() - { - CCatalogsPCConnectivityPlugin* self = - new( ELeave ) CCatalogsPCConnectivityPlugin; - CleanupStack::PushL( self ); - self->ConstructL(); - return self; - } - -// --------------------------------------------------------------------------- -// Destructor -// --------------------------------------------------------------------------- -// -EXPORT_C CCatalogsPCConnectivityPlugin::~CCatalogsPCConnectivityPlugin() - { - iClient.Close(); - } - - -// --------------------------------------------------------------------------- -// Connect to Catalogs engine pc client front-end -// --------------------------------------------------------------------------- -// -EXPORT_C TInt CCatalogsPCConnectivityPlugin::Connect() - { - return iClient.Connect(); - } - -// --------------------------------------------------------------------------- -// Close the connection to Catalogs engine pc client front-end -// --------------------------------------------------------------------------- -// -EXPORT_C void CCatalogsPCConnectivityPlugin::Close() - { - iClient.Close(); - } - -// --------------------------------------------------------------------------- -// Give all MIME types supported by this component -// --------------------------------------------------------------------------- -// -EXPORT_C RPointerArray CCatalogsPCConnectivityPlugin:: - SupportedMimeTypesL() - { - return iClient.SupportedMimeTypesL(); - } - -// --------------------------------------------------------------------------- -// Data package from PC Client -// --------------------------------------------------------------------------- -// -EXPORT_C void CCatalogsPCConnectivityPlugin::PutDataL( - const TDataType& aMimeType, const CBufFlat& aData ) - { - iClient.PutDataL( aMimeType, aData ); - } - -// --------------------------------------------------------------------------- -// Data request from PC Client -// --------------------------------------------------------------------------- -// -EXPORT_C void CCatalogsPCConnectivityPlugin::GetDataL( - TDataType& aMimeType, CBufFlat& aData ) - { - iClient.GetDataL( aMimeType, aData ); - } - - -// ======== GLOBAL FUNCTIONS ======== - -// --------------------------------------------------------------------------- -// Dll entry point -// --------------------------------------------------------------------------- -// -GLDEF_C TInt E32Dll() - { - return( KErrNone ); - } - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/clients/pcconn/bld/bld.inf --- a/connectivitymodules/SeCon/clients/pcconn/bld/bld.inf Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -/* -* Copyright (c) 2005 Nokia Corporation and/or 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: -* This file provides the information required for building the -* whole of SConPCConnClient -* -*/ - - -PRJ_PLATFORMS -DEFAULT - -PRJ_MMPFILES -../bld/sconpcconnclient.mmp diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/clients/pcconn/bld/def/bwinscwu.def --- a/connectivitymodules/SeCon/clients/pcconn/bld/def/bwinscwu.def Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -EXPORTS - ??0RSConPCConnSession@@QAE@XZ @ 1 NONAME ; RSConPCConnSession::RSConPCConnSession(void) - ??1RSConPCConnSession@@QAE@XZ @ 2 NONAME ; RSConPCConnSession::~RSConPCConnSession(void) - ?Close@RSConPCConnSession@@QAEXXZ @ 3 NONAME ; void RSConPCConnSession::Close(void) - ?Connect@RSConPCConnSession@@QAEHXZ @ 4 NONAME ; int RSConPCConnSession::Connect(void) - ?GetPacketL@RSConPCConnSession@@QAEHABVTDesC16@@ABVTDesC8@@AAPAVCBufFlat@@@Z @ 5 NONAME ; int RSConPCConnSession::GetPacketL(class TDesC16 const &, class TDesC8 const &, class CBufFlat * &) - ?PutPacketL@RSConPCConnSession@@QAEHABVTDesC16@@ABVTDesC8@@AAPAVCBufFlat@@@Z @ 6 NONAME ; int RSConPCConnSession::PutPacketL(class TDesC16 const &, class TDesC8 const &, class CBufFlat * &) - ?ResetServer@RSConPCConnSession@@QAEHXZ @ 7 NONAME ; int RSConPCConnSession::ResetServer(void) - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/clients/pcconn/bld/def/eabiuu.def --- a/connectivitymodules/SeCon/clients/pcconn/bld/def/eabiuu.def Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -EXPORTS - _ZN18RSConPCConnSession10GetPacketLERK7TDesC16RK6TDesC8RP8CBufFlat @ 1 NONAME - _ZN18RSConPCConnSession10PutPacketLERK7TDesC16RK6TDesC8RP8CBufFlat @ 2 NONAME - _ZN18RSConPCConnSession11ResetServerEv @ 3 NONAME - _ZN18RSConPCConnSession5CloseEv @ 4 NONAME - _ZN18RSConPCConnSession7ConnectEv @ 5 NONAME - _ZN18RSConPCConnSessionC1Ev @ 6 NONAME - _ZN18RSConPCConnSessionC2Ev @ 7 NONAME - _ZN18RSConPCConnSessionD1Ev @ 8 NONAME - _ZN18RSConPCConnSessionD2Ev @ 9 NONAME - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/clients/pcconn/bld/sconpcconnclient.mmp --- a/connectivitymodules/SeCon/clients/pcconn/bld/sconpcconnclient.mmp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,62 +0,0 @@ -/* -* Copyright (c) 2005-2008 Nokia Corporation and/or 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: Client side of PC Connectivity Server-Client -* -*/ - - -// To get the MW_LAYER_SYSTEMINCLUDE-definition -#include -#include - -VENDORID VID_DEFAULT - -CAPABILITY CAP_CLIENT_DLL - -TARGET sconpcconnclient.dll -TARGETTYPE dll - -UID 0x10009D8D 0x101F99F7 - -TARGETPATH sys/bin - -#if defined(ARMCC) -DEFFILE ./def/eabiu -#elif defined(WINSCW) -DEFFILE ./def/bwinscw -#elif defined(WINS) -DEFFILE ./def/bwins -#elif defined(ARM) -DEFFILE ./def/bmarm -#endif - - -SOURCEPATH ../src - -SOURCE sconpcconnclient.cpp - -// Client -USERINCLUDE ../inc -USERINCLUDE ../../../inc - -// Server -USERINCLUDE ../../../servers/pcconn/inc - -// Default system include paths for middleware layer modules. -MW_LAYER_SYSTEMINCLUDE - -LIBRARY euser.lib -LIBRARY estor.lib // RMemWriteStream -LIBRARY efsrv.lib // Rfs, RFile -DEBUGLIBRARY flogger.lib diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/clients/pcconn/inc/sconpcconnclient.h --- a/connectivitymodules/SeCon/clients/pcconn/inc/sconpcconnclient.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,79 +0,0 @@ -/* -* Copyright (c) 2005-2008 Nokia Corporation and/or 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: PC Connectivity client -* -*/ - - -#ifndef __SCONPCCONNCLIENT_H__ -#define __SCONPCCONNCLIENT_H__ - -// ----------------------------------------------------------------------------- -// class RSConPCConnSession - the client session -// ----------------------------------------------------------------------------- -class RSConPCConnSession : public RSessionBase - { -public: - IMPORT_C RSConPCConnSession(); - IMPORT_C ~RSConPCConnSession(); - - /** - * Starts the server and connects to it - * @param none - * @return KerrNone or an error code - */ - IMPORT_C TInt Connect(); - - /** - * Disconnects from the server and terminates the server - * @param none - * @return none - */ - IMPORT_C void Close(); - - /** - * Passes an OBEX Put -message to the server - * @param none - * @return none - */ - IMPORT_C TInt PutPacketL( const TDesC& aNameHeader, - const TDesC8& aTypeHeader, - CBufFlat*& aBuffer ); - - /** - * Passes an OBEX Get -message to the server - * @param none - * @return none - */ - IMPORT_C TInt GetPacketL( const TDesC& aNameHeader, - const TDesC8& aTypeHeader, - CBufFlat*& aBuffer ); - - /** - * Passes an reset -message to the server - * @param none - * @return none - */ - IMPORT_C TInt ResetServer(); - -private: - TVersion Version() const; - TInt LaunchServer(); - TInt CreateAndSendChunkHandle(); - -private: - RChunk iChunk; - }; - -#endif \ No newline at end of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/clients/pcconn/src/sconpcconnclient.cpp --- a/connectivitymodules/SeCon/clients/pcconn/src/sconpcconnclient.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,304 +0,0 @@ -/* -* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* 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: PC Connectivity client -* -*/ - - - -// ----------------------------------------------------------------------------- -// Includes -// ----------------------------------------------------------------------------- -#include -#include - -// Client - server -#include "sconpcconnclient.h" -#include "sconpcconnclientserver.h" -#include "debug.h" - -// ----------------------------------------------------------------------------- -// RSConPCConnSession::RSConPCConnSession() -// Default constructor -// ----------------------------------------------------------------------------- -// -EXPORT_C RSConPCConnSession::RSConPCConnSession() - { - TRACE_FUNC; - } - -// ----------------------------------------------------------------------------- -// RSConPCConnSession::~RSConPCConnSession() -// Default destructor -// ----------------------------------------------------------------------------- -// -EXPORT_C RSConPCConnSession::~RSConPCConnSession() - { - TRACE_FUNC; - } - -// ----------------------------------------------------------------------------- -// RSConPCConnSession::Connect() -// Creates a chunk and server, starts the server connection -// ----------------------------------------------------------------------------- -// -EXPORT_C TInt RSConPCConnSession::Connect() - { - TRACE_FUNC_ENTRY; - - TInt ret ( KErrNone ); - - ret = CreateSession(KSConPCConnServerName,Version()); - - if ( ret == KErrNotFound || ret == KErrServerTerminated ) - { - ret = LaunchServer(); - - if ( ret == KErrNone || ret == KErrAlreadyExists ) - { - ret = CreateSession( KSConPCConnServerName, Version() ); - } - } - - if ( ret == KErrNone ) - { - ret = CreateAndSendChunkHandle(); - if ( ret != KErrNone ) - { - LOGGER_WRITE("CreateAndSendChunkHandle failed, close session"); - Close(); - } - } - - LOGGER_WRITE_1( "RSConPCConnSession::Connect() : returned %d", ret ); - return ret; - } - -// ----------------------------------------------------------------------------- -// RSConPCConnSession::Close() -// Closes the server connection -// ----------------------------------------------------------------------------- -// -EXPORT_C void RSConPCConnSession::Close() - { - TRACE_FUNC_ENTRY; - iChunk.Close(); - RSessionBase::Close(); - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// RSConPCConnSession::Version() -// Returns the version of the client -// ----------------------------------------------------------------------------- -// -TVersion RSConPCConnSession::Version(void) const - { - return (TVersion(KSConPCConnServerVersionMajor, - KSConPCConnServerVersionMinor, - KSConPCConnServerVersionBuild)); - } - -// ----------------------------------------------------------------------------- -// RSConPCConnSession::Version() -// Forwards a PUT -message to the server -// ----------------------------------------------------------------------------- -// -EXPORT_C TInt RSConPCConnSession::PutPacketL( - const TDesC& aNameHeader, const TDesC8& aTypeHeader, CBufFlat*& aBuffer ) - { - TRACE_FUNC_ENTRY; - - if ( !aBuffer ) - { - return KErrArgument; - } - - if ((aBuffer->Size() + aTypeHeader.Size() + - aNameHeader.Size()) > KSConPCConnChunkMaxSize) - { - LOGGER_WRITE( "RSConPCConnSession::PutPacketL() :\ - WBXML document too big" ); - return KErrTooBig; - } - - TInt ret (KErrNone); - iChunk.Adjust( KSConPCConnChunkMaxSize ); - RMemWriteStream buf( iChunk.Base(), iChunk.Size() ); - - buf.WriteInt32L( aNameHeader.Size() ); - buf.WriteL( aNameHeader ); - - buf.WriteInt32L( aTypeHeader.Size() ); - buf.WriteL( aTypeHeader ); - - // WBXML document - buf.WriteInt32L( aBuffer->Size() ); - buf.WriteL( aBuffer->Ptr(0) ); - buf.CommitL(); - buf.Close(); - - TIpcArgs args; - ret = SendReceive ( EPutMessage, args ); - - LOGGER_WRITE_1( "RSConPCConnSession::PutPacketL() : returned %d", ret ); - return ret; - } - -// ----------------------------------------------------------------------------- -// RSConPCConnSession::Version() -// Forwards a GET -message to the server -// ----------------------------------------------------------------------------- -// -EXPORT_C TInt RSConPCConnSession::GetPacketL( - const TDesC& aNameHeader, const TDesC8& aTypeHeader, CBufFlat*& aBuffer ) - { - TRACE_FUNC_ENTRY; - - if ( !aBuffer ) - { - return KErrArgument; - } - - TInt ret (KErrNone); - - iChunk.Adjust( KSConPCConnChunkMaxSize); - RMemWriteStream writeBuf( iChunk.Base(), iChunk.Size() ); - writeBuf.WriteInt32L( aNameHeader.Size() ); - writeBuf.WriteL( aNameHeader ); - - writeBuf.WriteInt32L( aTypeHeader.Size() ); - writeBuf.WriteL( aTypeHeader ); - - writeBuf.CommitL(); - writeBuf.Close(); - - TIpcArgs args; - ret = SendReceive ( EGetMessage, args ); - - if ( ret != KErrNone) - { - LOGGER_WRITE_1( "RSConPCConnSession::GetPacketL() :\ - Send Receive failed with code %d", ret ); - return ret; - }; - - // copy data from the chunk - RMemReadStream readBuf( iChunk.Base(), iChunk.Size() ); - TInt32 length ( 0 ); - - aBuffer->Reset(); - length = readBuf.ReadInt32L(); - - HBufC8* data = HBufC8::NewLC( length ); - TPtr8 dataPtr = data->Des(); - - readBuf.ReadL( dataPtr, length ); - aBuffer->ExpandL( 0, length ); - aBuffer->Write ( 0, dataPtr ); - - readBuf.Close(); - - CleanupStack::PopAndDestroy(); // data; - - LOGGER_WRITE_1( "RSConPCConnSession::GetPacketL()\ - : returned %d", ret ); - return ret; - } - -// ----------------------------------------------------------------------------- -// RSConPCConnSession::Version() -// Forwards a Reset -message to the server -// ----------------------------------------------------------------------------- -// -EXPORT_C TInt RSConPCConnSession::ResetServer() - { - TRACE_FUNC_ENTRY; - TInt ret ( KErrNone ); - TIpcArgs args; - ret = SendReceive ( EResetMessage, args ); - LOGGER_WRITE_1( "RSConPCConnSession::ResetServerL(): ret %d", ret ); - return ret; - } - -// ----------------------------------------------------------------------------- -// RSConPCConnSession::LaunchServer() -// Launches the server -// ----------------------------------------------------------------------------- -// -TInt RSConPCConnSession::LaunchServer() - { - TRACE_FUNC_ENTRY; - TInt ret( KErrNone ); - - // Create server - RProcess p; - ret = p.Create(KSConPCConnServerExe, KNullDesC); - - if ( ret != KErrNone ) - { - // Loading failed. - LOGGER_WRITE_1( "RProcess::Create failed, err: %d", ret ); - return ret; - } - - - TRequestStatus status; - p.Rendezvous( status ); - - if ( status != KRequestPending ) - { - p.Kill(0); // abort startup - p.Close(); - LOGGER_WRITE("Abort startup, return KErrGeneral"); - return KErrGeneral; - } - else - { - p.Resume(); // logon OK - start the server - } - - User::WaitForRequest(status); - - p.Close(); - - LOGGER_WRITE_1( "RSConPCConnSession::LaunchServerL(): returned %d", status.Int() ); - return status.Int(); - } - -// ----------------------------------------------------------------------------- -// RSConPCConnSession::CreateAndSendChunkHandle() -// Creates a chunk and sends a handle to server -// ----------------------------------------------------------------------------- -// -TInt RSConPCConnSession::CreateAndSendChunkHandle() - { - TRACE_FUNC_ENTRY; - TInt err = iChunk.CreateGlobal( KNullDesC, - KSConPCConnChunkSize, - KSConPCConnChunkMaxSize ); - if ( err != KErrNone ) - { - LOGGER_WRITE_1("iChunk.CreateGlobal failed, err: %d", err); - return err; - } - TIpcArgs args; - args.Set( 0, iChunk ); - err = SendReceive( EChunkMessage, args ); - - LOGGER_WRITE_1("RSConPCConnSession::CreateAndSendChunkHandle : returned: %d", err); - return err; - } - -// End of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/clients/syncclient/bwins/sconsyncclientu.def --- a/connectivitymodules/SeCon/clients/syncclient/bwins/sconsyncclientu.def Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -EXPORTS - ??0RSconSyncSession@@QAE@XZ @ 1 NONAME ; RSconSyncSession::RSconSyncSession(void) - ??1CSconDataproviderInfo@@UAE@XZ @ 2 NONAME ; CSconDataproviderInfo::~CSconDataproviderInfo(void) - ??1RSconSyncSession@@QAE@XZ @ 3 NONAME ; RSconSyncSession::~RSconSyncSession(void) - ?AddedItemsL@RSconSyncSession@@QBEXAAV?$RArray@H@@@Z @ 4 NONAME ; void RSconSyncSession::AddedItemsL(class RArray &) const - ?CancelRequest@RSconSyncSession@@QAEXXZ @ 5 NONAME ; void RSconSyncSession::CancelRequest(void) - ?Close@RSconSyncSession@@QAEXXZ @ 6 NONAME ; void RSconSyncSession::Close(void) - ?CloseDataStore@RSconSyncSession@@QBEXXZ @ 7 NONAME ; void RSconSyncSession::CloseDataStore(void) const - ?CommitChangeInfoL@RSconSyncSession@@QAEXABV?$RArray@H@@@Z @ 8 NONAME ; void RSconSyncSession::CommitChangeInfoL(class RArray const &) - ?Connect@RSconSyncSession@@QAEHXZ @ 9 NONAME ; int RSconSyncSession::Connect(void) - ?CreateItemL@RSconSyncSession@@QAEXAAHHABVTDesC8@@11@Z @ 10 NONAME ; void RSconSyncSession::CreateItemL(int &, int, class TDesC8 const &, class TDesC8 const &, class TDesC8 const &) - ?CreateItemL@RSconSyncSession@@QAEXAAV?$TPckg@H@@HABVTDesC8@@11AAVTRequestStatus@@@Z @ 11 NONAME ; void RSconSyncSession::CreateItemL(class TPckg &, int, class TDesC8 const &, class TDesC8 const &, class TDesC8 const &, class TRequestStatus &) - ?DefaultStoreL@CSconDataproviderInfo@@QAEAAVTDesC16@@XZ @ 12 NONAME ; class TDesC16 & CSconDataproviderInfo::DefaultStoreL(void) - ?DeleteAllItems@RSconSyncSession@@QAEXAAVTRequestStatus@@@Z @ 13 NONAME ; void RSconSyncSession::DeleteAllItems(class TRequestStatus &) - ?DeleteItemL@RSconSyncSession@@QAEXH@Z @ 14 NONAME ; void RSconSyncSession::DeleteItemL(int) - ?DeletedItemsL@RSconSyncSession@@QBEXAAV?$RArray@H@@@Z @ 15 NONAME ; void RSconSyncSession::DeletedItemsL(class RArray &) const - ?DisplayNameL@CSconDataproviderInfo@@QAEAAVTDesC16@@XZ @ 16 NONAME ; class TDesC16 & CSconDataproviderInfo::DisplayNameL(void) - ?ExternalizeL@CSconDataproviderInfo@@QBEXAAVRWriteStream@@@Z @ 17 NONAME ; void CSconDataproviderInfo::ExternalizeL(class RWriteStream &) const - ?GetParent@RSconSyncSession@@QAEHHAAH@Z @ 18 NONAME ; int RSconSyncSession::GetParent(int, int &) - ?GetSyncTimeStampL@RSconSyncSession@@QBEXHHAAVTDateTime@@@Z @ 19 NONAME ; void RSconSyncSession::GetSyncTimeStampL(int, int, class TDateTime &) const - ?HasSyncHistoryL@RSconSyncSession@@QBEHXZ @ 20 NONAME ; int RSconSyncSession::HasSyncHistoryL(void) const - ?ImplementationUid@CSconDataproviderInfo@@QBE?AVTUid@@XZ @ 21 NONAME ; class TUid CSconDataproviderInfo::ImplementationUid(void) const - ?InternalizeL@CSconDataproviderInfo@@QAEXAAVRReadStream@@@Z @ 22 NONAME ; void CSconDataproviderInfo::InternalizeL(class RReadStream &) - ?ListAllImplementationsL@RSconSyncSession@@QAEXAAV?$RPointerArray@VCSconDataproviderInfo@@@@@Z @ 23 NONAME ; void RSconSyncSession::ListAllImplementationsL(class RPointerArray &) - ?ListStoresL@CSconDataproviderInfo@@QBEPAVCDesC16Array@@XZ @ 24 NONAME ; class CDesC16Array * CSconDataproviderInfo::ListStoresL(void) const - ?ModifiedItemsL@RSconSyncSession@@QBEXAAV?$RArray@H@@@Z @ 25 NONAME ; void RSconSyncSession::ModifiedItemsL(class RArray &) const - ?MoveItemL@RSconSyncSession@@QAEXHH@Z @ 26 NONAME ; void RSconSyncSession::MoveItemL(int, int) - ?MovedItemsL@RSconSyncSession@@QBEXAAV?$RArray@H@@@Z @ 27 NONAME ; void RSconSyncSession::MovedItemsL(class RArray &) const - ?NewL@CSconDataproviderInfo@@SAPAV1@XZ @ 28 NONAME ; class CSconDataproviderInfo * CSconDataproviderInfo::NewL(void) - ?OpenDataStoreL@RSconSyncSession@@QAEXHABVTDesC16@@H@Z @ 29 NONAME ; void RSconSyncSession::OpenDataStoreL(int, class TDesC16 const &, int) - ?OpenItemL@RSconSyncSession@@QAEXHAAH0AAVTDes8@@1AAVCBufFlat@@@Z @ 30 NONAME ; void RSconSyncSession::OpenItemL(int, int &, int &, class TDes8 &, class TDes8 &, class CBufFlat &) - ?ReplaceItemL@RSconSyncSession@@QAEXHHHABVTDesC8@@@Z @ 31 NONAME ; void RSconSyncSession::ReplaceItemL(int, int, int, class TDesC8 const &) - ?ReplaceItemL@RSconSyncSession@@QAEXHHHABVTDesC8@@AAVTRequestStatus@@@Z @ 32 NONAME ; void RSconSyncSession::ReplaceItemL(int, int, int, class TDesC8 const &, class TRequestStatus &) - ?ResetChangeInfoL@RSconSyncSession@@QAEXXZ @ 33 NONAME ; void RSconSyncSession::ResetChangeInfoL(void) - ?SetDefaultStoreL@CSconDataproviderInfo@@QAEXABVTDesC16@@@Z @ 34 NONAME ; void CSconDataproviderInfo::SetDefaultStoreL(class TDesC16 const &) - ?SetDisplayNameL@CSconDataproviderInfo@@QAEXABVTDesC16@@@Z @ 35 NONAME ; void CSconDataproviderInfo::SetDisplayNameL(class TDesC16 const &) - ?SetImplementationUid@CSconDataproviderInfo@@QAEXVTUid@@@Z @ 36 NONAME ; void CSconDataproviderInfo::SetImplementationUid(class TUid) - ?SetRemoteStoreFormatL@RSconSyncSession@@QAEXABVCSmlDataStoreFormat@@@Z @ 37 NONAME ; void RSconSyncSession::SetRemoteStoreFormatL(class CSmlDataStoreFormat const &) - ?SetStoresL@CSconDataproviderInfo@@QAEXABVCDesC16Array@@@Z @ 38 NONAME ; void CSconDataproviderInfo::SetStoresL(class CDesC16Array const &) - ?SoftDeleteItemL@RSconSyncSession@@QAEXH@Z @ 39 NONAME ; void RSconSyncSession::SoftDeleteItemL(int) - ?SoftDeletedItemsL@RSconSyncSession@@QBEXAAV?$RArray@H@@@Z @ 40 NONAME ; void RSconSyncSession::SoftDeletedItemsL(class RArray &) const - ?StoreFormatL@RSconSyncSession@@QAEPAVCSmlDataStoreFormat@@ABVRStringPool@@@Z @ 41 NONAME ; class CSmlDataStoreFormat * RSconSyncSession::StoreFormatL(class RStringPool const &) - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/clients/syncclient/eabi/sconsyncclientu.def --- a/connectivitymodules/SeCon/clients/syncclient/eabi/sconsyncclientu.def Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -EXPORTS - _ZN16RSconSyncSession11CreateItemLER5TPckgIiEiRK6TDesC8S5_S5_R14TRequestStatus @ 1 NONAME - _ZN16RSconSyncSession11CreateItemLERiiRK6TDesC8S3_S3_ @ 2 NONAME - _ZN16RSconSyncSession11DeleteItemLEi @ 3 NONAME - _ZN16RSconSyncSession12ReplaceItemLEiiiRK6TDesC8 @ 4 NONAME - _ZN16RSconSyncSession12ReplaceItemLEiiiRK6TDesC8R14TRequestStatus @ 5 NONAME - _ZN16RSconSyncSession12StoreFormatLERK11RStringPool @ 6 NONAME - _ZN16RSconSyncSession13CancelRequestEv @ 7 NONAME - _ZN16RSconSyncSession14DeleteAllItemsER14TRequestStatus @ 8 NONAME - _ZN16RSconSyncSession14OpenDataStoreLEiRK7TDesC16i @ 9 NONAME - _ZN16RSconSyncSession15SoftDeleteItemLEi @ 10 NONAME - _ZN16RSconSyncSession16ResetChangeInfoLEv @ 11 NONAME - _ZN16RSconSyncSession17CommitChangeInfoLERK6RArrayIiE @ 12 NONAME - _ZN16RSconSyncSession21SetRemoteStoreFormatLERK19CSmlDataStoreFormat @ 13 NONAME - _ZN16RSconSyncSession23ListAllImplementationsLER13RPointerArrayI21CSconDataproviderInfoE @ 14 NONAME - _ZN16RSconSyncSession5CloseEv @ 15 NONAME - _ZN16RSconSyncSession7ConnectEv @ 16 NONAME - _ZN16RSconSyncSession9GetParentEiRi @ 17 NONAME - _ZN16RSconSyncSession9MoveItemLEii @ 18 NONAME - _ZN16RSconSyncSession9OpenItemLEiRiS0_R5TDes8S2_R8CBufFlat @ 19 NONAME - _ZN16RSconSyncSessionC1Ev @ 20 NONAME - _ZN16RSconSyncSessionC2Ev @ 21 NONAME - _ZN16RSconSyncSessionD1Ev @ 22 NONAME - _ZN16RSconSyncSessionD2Ev @ 23 NONAME - _ZN21CSconDataproviderInfo10SetStoresLERK12CDesC16Array @ 24 NONAME - _ZN21CSconDataproviderInfo12DisplayNameLEv @ 25 NONAME - _ZN21CSconDataproviderInfo12InternalizeLER11RReadStream @ 26 NONAME - _ZN21CSconDataproviderInfo13DefaultStoreLEv @ 27 NONAME - _ZN21CSconDataproviderInfo15SetDisplayNameLERK7TDesC16 @ 28 NONAME - _ZN21CSconDataproviderInfo16SetDefaultStoreLERK7TDesC16 @ 29 NONAME - _ZN21CSconDataproviderInfo20SetImplementationUidE4TUid @ 30 NONAME - _ZN21CSconDataproviderInfo4NewLEv @ 31 NONAME - _ZN21CSconDataproviderInfoD0Ev @ 32 NONAME - _ZN21CSconDataproviderInfoD1Ev @ 33 NONAME - _ZN21CSconDataproviderInfoD2Ev @ 34 NONAME - _ZNK16RSconSyncSession11AddedItemsLER6RArrayIiE @ 35 NONAME - _ZNK16RSconSyncSession11MovedItemsLER6RArrayIiE @ 36 NONAME - _ZNK16RSconSyncSession13DeletedItemsLER6RArrayIiE @ 37 NONAME - _ZNK16RSconSyncSession14CloseDataStoreEv @ 38 NONAME - _ZNK16RSconSyncSession14ModifiedItemsLER6RArrayIiE @ 39 NONAME - _ZNK16RSconSyncSession15HasSyncHistoryLEv @ 40 NONAME - _ZNK16RSconSyncSession17GetSyncTimeStampLEiiR9TDateTime @ 41 NONAME - _ZNK16RSconSyncSession17SoftDeletedItemsLER6RArrayIiE @ 42 NONAME - _ZNK21CSconDataproviderInfo11ListStoresLEv @ 43 NONAME - _ZNK21CSconDataproviderInfo12ExternalizeLER12RWriteStream @ 44 NONAME - _ZNK21CSconDataproviderInfo17ImplementationUidEv @ 45 NONAME - _ZTI21CSconDataproviderInfo @ 46 NONAME ; ## - _ZTV21CSconDataproviderInfo @ 47 NONAME ; ## - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/clients/syncclient/group/bld.inf --- a/connectivitymodules/SeCon/clients/syncclient/group/bld.inf Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -/* -* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* 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: Build information file for project SyncClient -* -*/ - - -PRJ_EXPORTS -../rom/sconsyncclient.iby CORE_APP_LAYER_IBY_EXPORT_PATH(sconsyncclient.iby) - -PRJ_PLATFORMS -DEFAULT - -PRJ_MMPFILES -sconsyncclient.mmp - -PRJ_TESTMMPFILES diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/clients/syncclient/group/sconsyncclient.mmp --- a/connectivitymodules/SeCon/clients/syncclient/group/sconsyncclient.mmp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Client side of sconsyncserver -* -*/ - - -// To get the MW_LAYER_SYSTEMINCLUDE-definition -#include -#include - -TARGET sconsyncclient.dll -TARGETTYPE dll - -CAPABILITY CAP_CLIENT_DLL - -UID 0x1000008d 0x2001A963 -VENDORID VID_DEFAULT - -SOURCEPATH ../src -SOURCE sconsyncclient.cpp -SOURCE scondataproviderinfo.cpp - -USERINCLUDE ../inc -USERINCLUDE ../../../inc - -// Server -USERINCLUDE ../../../servers/syncserver/inc - - -// Default system include paths for middleware layer modules. -MW_LAYER_SYSTEMINCLUDE - -LIBRARY euser.lib -LIBRARY estor.lib -LIBRARY bafl.lib -LIBRARY charconv.lib -LIBRARY smlstoreformat.lib -DEBUGLIBRARY flogger.lib diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/clients/syncclient/inc/scondataproviderinfo.h --- a/connectivitymodules/SeCon/clients/syncclient/inc/scondataproviderinfo.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: CSconDataproviderInfo header -* -*/ - - -#ifndef SCONDATAPROVIDERINFO_H_ -#define SCONDATAPROVIDERINFO_H_ - -#include -#include - -class RWriteStream; -class RReadStream; - -/** - * Contains information about DataSync dataprovider. - */ -class CSconDataproviderInfo : public CBase -{ -public: - IMPORT_C static CSconDataproviderInfo* NewL(); - IMPORT_C ~CSconDataproviderInfo(); - - IMPORT_C void ExternalizeL( RWriteStream& aStream ) const; - IMPORT_C void InternalizeL( RReadStream& aStream ); - - IMPORT_C TUid ImplementationUid() const; - IMPORT_C void SetImplementationUid( const TUid aUid ); - IMPORT_C TDesC& DisplayNameL(); - IMPORT_C void SetDisplayNameL( const TDesC& aName ); - IMPORT_C TDesC& DefaultStoreL(); - IMPORT_C void SetDefaultStoreL( const TDesC& aStore ); - IMPORT_C CDesCArray* ListStoresL() const; - IMPORT_C void SetStoresL( const CDesCArray& aStores ); -private: - CSconDataproviderInfo(); - void ConstructL(); - -private: - TInt iUid; - HBufC* iName; - HBufC* iDefaultStore; - CDesCArrayFlat* iStores; -}; - -typedef RPointerArray RSconDataProviderInfoArray; - -#endif /*SCONDATAPROVIDERINFO_H_*/ diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/clients/syncclient/inc/sconsyncclient.h --- a/connectivitymodules/SeCon/clients/syncclient/inc/sconsyncclient.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,99 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: RSconSyncSession header -* -*/ - - -#ifndef _SCONSYNCCLIENT_H_ -#define _SCONSYNCCLIENT_H_ - -#include -#include -#include -#include - -#include "scondataproviderinfo.h" - - - -class CNSmlDataItemUidSet; - -class RSconSyncSession : public RSessionBase -{ -public: - IMPORT_C RSconSyncSession(); - IMPORT_C ~RSconSyncSession(); - - IMPORT_C TInt Connect(); - IMPORT_C void Close(); - - IMPORT_C void ListAllImplementationsL( RSconDataProviderInfoArray& aInfoArray ); - - IMPORT_C void OpenDataStoreL( const TSmlDataProviderId aProviderId, const TDesC& aStoreName, const TInt aContextId ); - - IMPORT_C void OpenItemL(TSmlDbItemUid aUid, TBool& aFieldChange, - TSmlDbItemUid& aParent, TDes8& aMimeType, TDes8& aMimeVer, - CBufFlat& aItemData ); - - IMPORT_C void CreateItemL(TSmlDbItemUid& aUid, TSmlDbItemUid aParent, - const TDesC8& aMimeType, const TDesC8& aMimeVer, const TDesC8& aData); - IMPORT_C void CreateItemL(TPckg& aUidPckg, TSmlDbItemUid aParent, - const TDesC8& aMimeType, const TDesC8& aMimeVer, const TDesC8& aData, - TRequestStatus& aStatus ); - - IMPORT_C void ReplaceItemL(TSmlDbItemUid aUid, TSmlDbItemUid aParent, - TBool aFieldChange, const TDesC8& aData); - IMPORT_C void ReplaceItemL(TSmlDbItemUid aUid, TSmlDbItemUid aParent, - TBool aFieldChange, const TDesC8& aData, - TRequestStatus& aStatus ); - - IMPORT_C void MoveItemL(TSmlDbItemUid aUid, TSmlDbItemUid aNewParent); - IMPORT_C void DeleteItemL(TSmlDbItemUid aUid); - IMPORT_C void SoftDeleteItemL(TSmlDbItemUid aUid); - IMPORT_C void DeleteAllItems( TRequestStatus& aStatus ); - - IMPORT_C TBool HasSyncHistoryL() const; - IMPORT_C void AddedItemsL( RArray& aItems ) const; - IMPORT_C void DeletedItemsL( RArray& aItems ) const; - IMPORT_C void SoftDeletedItemsL( RArray& aItems ) const; - IMPORT_C void ModifiedItemsL( RArray& aItems ) const; - IMPORT_C void MovedItemsL( RArray& aItems ) const; - - IMPORT_C void CloseDataStore() const; - - IMPORT_C void ResetChangeInfoL(); - IMPORT_C void CommitChangeInfoL(const RArray& aItems ); - - IMPORT_C void GetSyncTimeStampL( const TSmlDataProviderId aProviderId, const TInt aContextId, TDateTime& aTimeStamp ) const; - - IMPORT_C CSmlDataStoreFormat* StoreFormatL( const RStringPool& aStringPool ); - IMPORT_C void SetRemoteStoreFormatL( const CSmlDataStoreFormat& aServerDataStoreFormat ); - - - IMPORT_C void CancelRequest(); - - IMPORT_C TInt GetParent( TSmlDbItemUid aUid, TSmlDbItemUid& aParent ); -private: - TInt StartServer(); - TInt CreateAndSendChunkHandle(); -private: - RChunk iChunk; - TIpcArgs iArgs; - -}; - -#endif // _SCONSYNCCLIENT_H_ - -// End of File diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/clients/syncclient/rom/sconsyncclient.iby --- a/connectivitymodules/SeCon/clients/syncclient/rom/sconsyncclient.iby Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -/* -* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: IBY file for SconSyncClient -* -*/ - -#ifndef _SCONSYNCCLIENT_IBY_ -#define _SCONSYNCCLIENT_IBY_ - -#include - -file=ABI_DIR\BUILD_DIR\sconsyncclient.dll SHARED_LIB_DIR\sconsyncclient.dll - -#endif \ No newline at end of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/clients/syncclient/src/scondataproviderinfo.cpp --- a/connectivitymodules/SeCon/clients/syncclient/src/scondataproviderinfo.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,220 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: CSconDataproviderInfo implementation -* -*/ - - -#include "scondataproviderinfo.h" -#include -#include -#include // for CnvUtfConverter -#include "debug.h" - -CSconDataproviderInfo::CSconDataproviderInfo() - { - } - -EXPORT_C CSconDataproviderInfo::~CSconDataproviderInfo() - { - delete iName; - delete iDefaultStore; - delete iStores; - } - -EXPORT_C CSconDataproviderInfo* CSconDataproviderInfo::NewL() - { - return new (ELeave) CSconDataproviderInfo(); - } - -EXPORT_C void CSconDataproviderInfo::ExternalizeL( RWriteStream& aStream ) const - { - TRACE_FUNC_ENTRY; - LOGGER_WRITE_1("iUid: 0x%x", iUid); - aStream.WriteInt32L( iUid ); - if ( iName ) - { - HBufC8* temp = CnvUtfConverter::ConvertFromUnicodeToUtf8L( iName->Des() ); - CleanupStack::PushL( temp ); - TPtrC8 tempPtr = temp->Des(); - aStream.WriteUint16L( tempPtr.Length() ); - aStream.WriteL( tempPtr ); - CleanupStack::PopAndDestroy( temp ); - } - else - { - aStream.WriteUint16L( 0 ); - } - - if ( iDefaultStore ) - { - HBufC8* temp = CnvUtfConverter::ConvertFromUnicodeToUtf8L( iDefaultStore->Des() ); - CleanupStack::PushL( temp ); - TPtrC8 tempPtr = temp->Des(); - aStream.WriteUint16L( tempPtr.Length() ); - aStream.WriteL( tempPtr ); - CleanupStack::PopAndDestroy( temp ); - } - else - { - aStream.WriteUint16L( 0 ); - } - if ( iStores ) - { - aStream.WriteUint16L( iStores->Count() ); - for ( TInt i=0; iCount(); i++ ) - { - TPtrC storePtr = (*iStores)[i]; - HBufC8* temp = CnvUtfConverter::ConvertFromUnicodeToUtf8L( storePtr ); - CleanupStack::PushL( temp ); - TPtrC8 tempPtr = temp->Des(); - aStream.WriteUint16L( tempPtr.Length() ); - if ( tempPtr.Length() > 0 ) - { - aStream.WriteL( tempPtr ); - } - CleanupStack::PopAndDestroy( temp ); - } - } - else - { - aStream.WriteUint16L( 0 ); - } - aStream.CommitL(); - TRACE_FUNC_EXIT; - } - -EXPORT_C void CSconDataproviderInfo::InternalizeL( RReadStream& aStream ) - { - TRACE_FUNC_ENTRY; - delete iName; - iName = NULL; - delete iDefaultStore; - iDefaultStore = NULL; - delete iStores; - iStores = NULL; - iStores = new ( ELeave ) CDesCArrayFlat( 1 ); - iUid = aStream.ReadInt32L(); - TInt len = aStream.ReadUint16L(); - if ( len > 0 ) - { - HBufC8* tempBuf = HBufC8::NewLC( len ); - TPtr8 tempPtr = tempBuf->Des(); - aStream.ReadL( tempPtr, len ); - - iName = CnvUtfConverter::ConvertToUnicodeFromUtf8L( tempPtr ); - CleanupStack::PopAndDestroy( tempBuf ); - } - - len = aStream.ReadUint16L(); - if ( len > 0 ) - { - HBufC8* tempBuf = HBufC8::NewLC( len ); - TPtr8 tempPtr = tempBuf->Des(); - aStream.ReadL( tempPtr, len ); - - iDefaultStore = CnvUtfConverter::ConvertToUnicodeFromUtf8L( tempPtr ); - CleanupStack::PopAndDestroy( tempBuf ); - } - - TInt storeCount = aStream.ReadUint16L(); - for (TInt i=0; i 0 ) - { - HBufC8* tempBuf8 = HBufC8::NewLC( len ); - TPtr8 tempPtr8 = tempBuf8->Des(); - aStream.ReadL( tempPtr8, len ); - - HBufC* temp = CnvUtfConverter::ConvertToUnicodeFromUtf8L( tempPtr8 ); - CleanupStack::PushL( temp ); - TPtr tempPtr = temp->Des(); - iStores->AppendL( tempPtr ); - CleanupStack::PopAndDestroy( temp ); - CleanupStack::PopAndDestroy( tempBuf8 ); - } - } - TRACE_FUNC_EXIT; - } - -EXPORT_C TUid CSconDataproviderInfo::ImplementationUid() const - { - return TUid::Uid( iUid ); - } - -EXPORT_C void CSconDataproviderInfo::SetImplementationUid( const TUid aUid ) - { - iUid = aUid.iUid; - } - -EXPORT_C TDesC& CSconDataproviderInfo::DisplayNameL() - { - if ( iName ) - { - return *iName; - } - else - { - iName = KNullDesC().AllocL(); - return *iName; - } - } - -EXPORT_C void CSconDataproviderInfo::SetDisplayNameL( const TDesC& aName ) - { - delete iName; - iName = NULL; - iName = aName.AllocL(); - } - -EXPORT_C TDesC& CSconDataproviderInfo::DefaultStoreL() - { - if ( iDefaultStore ) - { - return *iDefaultStore; - } - else - { - iDefaultStore = KNullDesC().AllocL(); - return *iDefaultStore; - } - } - -EXPORT_C void CSconDataproviderInfo::SetDefaultStoreL( const TDesC& aStore ) - { - delete iDefaultStore; - iDefaultStore = NULL; - iDefaultStore = aStore.AllocL(); - } - -EXPORT_C CDesCArray* CSconDataproviderInfo::ListStoresL() const - { - if ( !iStores ) - { - User::Leave( KErrNotFound ); - } - return iStores; - } - -EXPORT_C void CSconDataproviderInfo::SetStoresL( const CDesCArray& aStores ) - { - delete iStores; - iStores = NULL; - iStores = new ( ELeave ) CDesCArrayFlat( 1 ); - for ( TInt i=0; iAppendL( aStores[i] ); - } - } diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/clients/syncclient/src/sconsyncclient.cpp --- a/connectivitymodules/SeCon/clients/syncclient/src/sconsyncclient.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,668 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: RSconSyncSession implementation -* -*/ - - -#include "sconsyncclient.h" - -#include -#include - -#include "sconsyncclientserver.h" -#include "debug.h" - -const TInt KSConSyncChunkSize = 0xFFFF; // 65535 bytes; -const TInt KSConSyncChunkMaxSize = 0x400000; // 4194304 bytes - -EXPORT_C RSconSyncSession::RSconSyncSession() - { - TRACE_FUNC; - } - -EXPORT_C RSconSyncSession::~RSconSyncSession() - { - TRACE_FUNC; - } - -EXPORT_C TInt RSconSyncSession::Connect() - { - TRACE_FUNC_ENTRY; - TInt retryCount = 2; - TInt error = KErrNone; - while(retryCount) - { - error = CreateSession(KSconSyncServerName, TVersion(1,0,0)); - if ( error != KErrNotFound && error != KErrServerTerminated ) - { - break; - } - error = StartServer(); - if( error != KErrNone && error != KErrAlreadyExists ) - { - break; - } - --retryCount; - } - - if ( error == KErrNone ) - { - error = CreateAndSendChunkHandle(); - if ( error != KErrNone ) - { - LOGGER_WRITE("CreateAndSendChunkHandle failed, close session"); - Close(); - } - } - TRACE_FUNC_EXIT; - return error; - } - -// ----------------------------------------------------------------------------- -// RSconSyncSession::Close() -// Closes the server connection -// ----------------------------------------------------------------------------- -// -EXPORT_C void RSconSyncSession::Close() - { - TRACE_FUNC_ENTRY; - iChunk.Close(); - RSessionBase::Close(); - TRACE_FUNC_EXIT - } - -EXPORT_C void RSconSyncSession::ListAllImplementationsL( RSconDataProviderInfoArray& aInfoArray ) - { - TRACE_FUNC_ENTRY; - TIpcArgs args; - TInt ret = SendReceive ( EListImplementations, args ); - - if ( ret != KErrNone) - { - LOGGER_WRITE_1( "RSconSyncSession::ListAllImplementationsL() :\ - Send Receive failed with code %d", ret ); - User::Leave( ret ); - }; - - // copy data from the chunk - RMemReadStream readStream( iChunk.Base(), iChunk.Size() ); - CleanupClosePushL( readStream ); - - TInt count( readStream.ReadUint16L() ); - LOGGER_WRITE_1("count: %d", count); - for ( TInt i=0; iInternalizeL( readStream ); - aInfoArray.AppendL( dpInfo ); - CleanupStack::Pop( dpInfo ); - } - - CleanupStack::PopAndDestroy( &readStream ); - - TRACE_FUNC_EXIT; - } - -EXPORT_C void RSconSyncSession::OpenDataStoreL( const TSmlDataProviderId aProviderId, const TDesC& aStoreName, TInt aContextId ) - { - TRACE_FUNC_ENTRY; - User::LeaveIfError( iChunk.Adjust( - sizeof(TInt32) - + sizeof(TInt32) - + aStoreName.Size() - + sizeof(TInt) )); - - RMemWriteStream writeBuf( iChunk.Base(), iChunk.Size() ); - writeBuf.WriteInt32L( aProviderId ); - - writeBuf.WriteInt32L( aStoreName.Length() ); - writeBuf.WriteL( aStoreName ); - - writeBuf.WriteInt32L( aContextId ); - - writeBuf.CommitL(); - writeBuf.Close(); - - TIpcArgs args; - TInt ret = SendReceive ( EOpenStore, args ); - - if ( ret != KErrNone) - { - LOGGER_WRITE_1( "RSconSyncSession::OpenDataStoreL() :\ - Send Receive failed with code %d", ret ); - User::Leave( ret ); - }; - TRACE_FUNC_EXIT; - } - -EXPORT_C void RSconSyncSession::OpenItemL( TSmlDbItemUid aUid, TBool& aFieldChange, - TSmlDbItemUid& aParent, TDes8& aMimeType, TDes8& aMimeVer, CBufFlat& aItemData ) - { - TRACE_FUNC_ENTRY; - TIpcArgs args( aUid ); - TInt ret = SendReceive ( EOpenItem, args ); - if ( ret != KErrNone) - { - LOGGER_WRITE_1( "RSconSyncSession::OpenItemL() :\ - Send Receive failed with code %d", ret ); - User::Leave( ret ); - }; - - // copy data from the chunk - RMemReadStream readStream( iChunk.Base(), iChunk.Size() ); - CleanupClosePushL( readStream ); - TInt32 length ( 0 ); - - aItemData.Reset(); - length = readStream.ReadInt32L(); - - HBufC8* data = HBufC8::NewLC( length ); - TPtr8 dataPtr = data->Des(); - - readStream.ReadL( dataPtr, length ); - aItemData.ExpandL( 0, length ); - aItemData.Write ( 0, dataPtr ); - - CleanupStack::PopAndDestroy( data ); - - aFieldChange = readStream.ReadInt8L(); - - aParent = readStream.ReadInt32L(); - length = readStream.ReadInt32L(); - readStream.ReadL( aMimeType, length ); - - length = readStream.ReadInt32L(); - readStream.ReadL( aMimeVer, length ); - - CleanupStack::PopAndDestroy( &readStream ); - TRACE_FUNC_EXIT; - } - -EXPORT_C void RSconSyncSession::CreateItemL(TSmlDbItemUid& aUid/*, TInt aSize*/, - TSmlDbItemUid aParent, const TDesC8& aMimeType, const TDesC8& aMimeVer, - const TDesC8& aData) - { - TRACE_FUNC_ENTRY; - User::LeaveIfError( iChunk.Adjust( - sizeof(TInt32) - + sizeof(TInt32) - + aMimeType.Length() - + sizeof(TInt32) - + aMimeVer.Length() - + sizeof(TInt32) - + aData.Length() )); - RMemWriteStream writeBuf( iChunk.Base(), iChunk.Size() ); - CleanupClosePushL( writeBuf ); - writeBuf.WriteInt32L( aParent ); - writeBuf.WriteInt32L( aMimeType.Length() ); - writeBuf.WriteL( aMimeType ); - writeBuf.WriteInt32L( aMimeVer.Length() ); - writeBuf.WriteL( aMimeVer ); - writeBuf.WriteInt32L( aData.Length() ); - writeBuf.WriteL( aData ); - - writeBuf.CommitL(); - CleanupStack::PopAndDestroy( &writeBuf ); - - - - TPckg pckg(aUid); - iArgs = TIpcArgs( &pckg ); - - TInt ret = SendReceive ( ECreateItem, iArgs ); - if ( ret != KErrNone) - { - LOGGER_WRITE_1( "RSconSyncSession::CreateItemL() :\ - Send Receive failed with code %d", ret ); - User::Leave( ret ); - }; - LOGGER_WRITE_1("aUid: %d", aUid); - TRACE_FUNC_EXIT; - } - -EXPORT_C void RSconSyncSession::CreateItemL(TPckg& aUidPckg, - TSmlDbItemUid aParent, const TDesC8& aMimeType, const TDesC8& aMimeVer, - const TDesC8& aData, TRequestStatus& aStatus) - { - TRACE_FUNC_ENTRY; - User::LeaveIfError( iChunk.Adjust( - sizeof(TInt32) - + sizeof(TInt32) - + aMimeType.Length() - + sizeof(TInt32) - + aMimeVer.Length() - + sizeof(TInt32) - + aData.Length() )); - RMemWriteStream writeBuf( iChunk.Base(), iChunk.Size() ); - CleanupClosePushL( writeBuf ); - writeBuf.WriteInt32L( aParent ); - writeBuf.WriteInt32L( aMimeType.Length() ); - writeBuf.WriteL( aMimeType ); - writeBuf.WriteInt32L( aMimeVer.Length() ); - writeBuf.WriteL( aMimeVer ); - writeBuf.WriteInt32L( aData.Length() ); - writeBuf.WriteL( aData ); - - writeBuf.CommitL(); - CleanupStack::PopAndDestroy( &writeBuf ); - - iArgs = TIpcArgs( &aUidPckg ); - SendReceive( ECreateItem, iArgs, aStatus ); - - TRACE_FUNC_EXIT; - } - -EXPORT_C void RSconSyncSession::ReplaceItemL(TSmlDbItemUid aUid, - TSmlDbItemUid aParent, TBool aFieldChange, const TDesC8& aData) - { - TRACE_FUNC_ENTRY; - User::LeaveIfError( iChunk.Adjust( - sizeof(TInt32) - + sizeof(TInt32) - + sizeof(TInt8) - + sizeof(TInt32) - + aData.Length() )); - RMemWriteStream writeBuf( iChunk.Base(), iChunk.Size() ); - CleanupClosePushL( writeBuf ); - writeBuf.WriteInt32L( aUid ); - writeBuf.WriteInt32L( aParent ); - writeBuf.WriteInt8L( aFieldChange ); - writeBuf.WriteInt32L( aData.Length() ); - writeBuf.WriteL( aData ); - writeBuf.CommitL(); - CleanupStack::PopAndDestroy( &writeBuf ); - - TIpcArgs args; - TInt ret = SendReceive( EReplaceItem, args ); - if ( ret != KErrNone) - { - LOGGER_WRITE_1( "RSconSyncSession::ReplaceItemL() :\ - Send Receive failed with code %d", ret ); - User::Leave( ret ); - }; - TRACE_FUNC_EXIT; - } - -EXPORT_C void RSconSyncSession::ReplaceItemL(TSmlDbItemUid aUid, - TSmlDbItemUid aParent, TBool aFieldChange, const TDesC8& aData, - TRequestStatus& aStatus) - { - TRACE_FUNC_ENTRY; - User::LeaveIfError( iChunk.Adjust( - sizeof(TInt32) - + sizeof(TInt32) - + sizeof(TInt8) - + sizeof(TInt32) - + aData.Length() )); - RMemWriteStream writeBuf( iChunk.Base(), iChunk.Size() ); - CleanupClosePushL( writeBuf ); - writeBuf.WriteInt32L( aUid ); - writeBuf.WriteInt32L( aParent ); - writeBuf.WriteInt8L( aFieldChange ); - writeBuf.WriteInt32L( aData.Length() ); - writeBuf.WriteL( aData ); - writeBuf.CommitL(); - CleanupStack::PopAndDestroy( &writeBuf ); - - TIpcArgs args; - SendReceive( EReplaceItem, args, aStatus ); - TRACE_FUNC_EXIT; - } - -EXPORT_C void RSconSyncSession::MoveItemL( TSmlDbItemUid aUid, TSmlDbItemUid aNewParent ) - { - TRACE_FUNC_ENTRY; - - TIpcArgs args(aUid, aNewParent); - TInt ret = SendReceive ( EMoveItem, args ); - if ( ret != KErrNone) - { - LOGGER_WRITE_1( "RSconSyncSession::MoveItemL() :\ - Send Receive failed with code %d", ret ); - User::Leave( ret ); - }; - TRACE_FUNC_EXIT; - } - -EXPORT_C void RSconSyncSession::DeleteItemL( TSmlDbItemUid aUid ) - { - TRACE_FUNC_ENTRY; - - TIpcArgs args( aUid ); - TInt ret = SendReceive ( EDeleteItem, args ); - if ( ret != KErrNone) - { - LOGGER_WRITE_1( "RSconSyncSession::DeleteItemL() :\ - Send Receive failed with code %d", ret ); - User::Leave( ret ); - }; - TRACE_FUNC_EXIT; - } - - -EXPORT_C void RSconSyncSession::SoftDeleteItemL( TSmlDbItemUid aUid ) - { - TRACE_FUNC_ENTRY; - - TIpcArgs args( aUid ); - TInt ret = SendReceive ( ESoftDeleteItem, args ); - if ( ret != KErrNone) - { - LOGGER_WRITE_1( "RSconSyncSession::SoftDeleteItemL() :\ - Send Receive failed with code %d", ret ); - User::Leave( ret ); - }; - TRACE_FUNC_EXIT; - } - -EXPORT_C void RSconSyncSession::DeleteAllItems( TRequestStatus& aStatus ) - { - TRACE_FUNC_ENTRY; - TIpcArgs args; - SendReceive( EDeleteAllItems, args, aStatus ); - TRACE_FUNC_EXIT; - } - - -EXPORT_C TBool RSconSyncSession::HasSyncHistoryL() const - { - TRACE_FUNC; - TBool history(EFalse); - TPckg pck(history); - TIpcArgs args(&pck); - TInt ret = SendReceive ( EHasHistory, args ); - User::LeaveIfError( ret ); - TRACE_FUNC_EXIT; - return history; - } - -EXPORT_C void RSconSyncSession::AddedItemsL( RArray& aItems) const - { - TRACE_FUNC_ENTRY; - TIpcArgs args; - TInt ret = SendReceive ( EAddedItems, args ); - User::LeaveIfError( ret ); - - RMemReadStream readStream( iChunk.Base(), iChunk.Size() ); - CleanupClosePushL( readStream ); - - aItems.Reset(); - TInt itemCount = readStream.ReadInt32L(); - for (TInt i=0; i& aItems) const - { - TRACE_FUNC_ENTRY; - TIpcArgs args; - TInt ret = SendReceive ( EDeletedItems, args ); - User::LeaveIfError( ret ); - - RMemReadStream readStream( iChunk.Base(), iChunk.Size() ); - CleanupClosePushL( readStream ); - - aItems.Reset(); - TInt itemCount = readStream.ReadInt32L(); - for (TInt i=0; i& aItems) const - { - TRACE_FUNC_ENTRY; - TIpcArgs args; - TInt ret = SendReceive ( ESoftDeletedItems, args ); - User::LeaveIfError( ret ); - - RMemReadStream readStream( iChunk.Base(), iChunk.Size() ); - CleanupClosePushL( readStream ); - - aItems.Reset(); - TInt itemCount = readStream.ReadInt32L(); - for (TInt i=0; i& aItems) const - { - TRACE_FUNC_ENTRY; - TIpcArgs args; - TInt ret = SendReceive ( EModifiedItems, args ); - User::LeaveIfError( ret ); - - RMemReadStream readStream( iChunk.Base(), iChunk.Size() ); - CleanupClosePushL( readStream ); - - aItems.Reset(); - TInt itemCount = readStream.ReadInt32L(); - for (TInt i=0; i& aItems) const - { - TRACE_FUNC_ENTRY; - TIpcArgs args; - TInt ret = SendReceive ( EMovedItems, args ); - User::LeaveIfError( ret ); - - RMemReadStream readStream( iChunk.Base(), iChunk.Size() ); - CleanupClosePushL( readStream ); - - aItems.Reset(); - TInt itemCount = readStream.ReadInt32L(); - for (TInt i=0; i& aItems ) - { - TRACE_FUNC_ENTRY; - RMemWriteStream stream ( iChunk.Base(), iChunk.Size() ); - CleanupClosePushL( stream ); - LOGGER_WRITE_1("items count: %d", aItems.Count()); - stream.WriteInt32L( aItems.Count() ); - for (TInt i=0; i < aItems.Count(); i++ ) - { - LOGGER_WRITE("Write item"); - stream.WriteInt32L( aItems[i] ); - } - stream.CommitL(); - CleanupStack::PopAndDestroy( &stream ); - - TIpcArgs args; - TInt ret = SendReceive ( ECommitChangeInfo, args ); - User::LeaveIfError( ret ); - TRACE_FUNC_EXIT; - } - -EXPORT_C void RSconSyncSession::GetSyncTimeStampL( const TSmlDataProviderId aProviderId, const TInt aContextId, TDateTime& aTimeStamp ) const - { - TRACE_FUNC_ENTRY; - - TPckg timeBuf( aTimeStamp ); - TIpcArgs args( aProviderId, aContextId, &timeBuf ); - TInt ret = SendReceive ( EGetSyncTimeStamp, args ); - User::LeaveIfError( ret ); - - TRACE_FUNC_EXIT; - } - -EXPORT_C CSmlDataStoreFormat* RSconSyncSession::StoreFormatL( const RStringPool& aStringPool ) - { - TRACE_FUNC_ENTRY; - TIpcArgs args; - TInt ret = SendReceive ( EExportStoreFormat, args ); - User::LeaveIfError( ret ); - - RMemReadStream readStream( iChunk.Base(), iChunk.Size() ); - CleanupClosePushL( readStream ); - TInt len = readStream.ReadInt32L(); - LOGGER_WRITE_1("data size from server: %d", len); - LOGGER_WRITE("CSmlDataStoreFormat::NewLC"); - CSmlDataStoreFormat* tempStoreFormat = CSmlDataStoreFormat::NewLC( aStringPool, readStream ); - LOGGER_WRITE("CSmlDataStoreFormat::NewLC -ok"); - CleanupStack::Pop( tempStoreFormat ); - - LOGGER_WRITE("PopAndDestroy( &readStream )"); - CleanupStack::PopAndDestroy( &readStream ); - LOGGER_WRITE("return"); - TRACE_FUNC_EXIT; - return tempStoreFormat; - } - -EXPORT_C void RSconSyncSession::SetRemoteStoreFormatL( const CSmlDataStoreFormat& aServerDataStoreFormat ) - { - TRACE_FUNC_ENTRY; - const TInt KMaximumDataStoreFormatSize = 100000; // 100kb should be enought - User::LeaveIfError( iChunk.Adjust( KMaximumDataStoreFormatSize )); - - RMemWriteStream stream ( iChunk.Base(), iChunk.Size() ); - CleanupClosePushL( stream ); - - aServerDataStoreFormat.ExternalizeL( stream ); - - stream.CommitL(); - CleanupStack::PopAndDestroy( &stream ); - - TIpcArgs args; - TInt ret = SendReceive ( ESetRemoteStoreFormat, args ); - User::LeaveIfError( ret ); - TRACE_FUNC_EXIT; - } - -EXPORT_C void RSconSyncSession::CancelRequest() - { - TRACE_FUNC_ENTRY; - SendReceive( ECancelRequest, TIpcArgs() ); - TRACE_FUNC_EXIT; - } - -EXPORT_C TInt RSconSyncSession::GetParent( TSmlDbItemUid aUid, TSmlDbItemUid& aParent ) - { - TRACE_FUNC_ENTRY; - TPckg pckg(aParent); - TIpcArgs args( aUid, &pckg ); - TInt ret = SendReceive( EReadParent, args ); - TRACE_FUNC_EXIT; - return ret; - } - -TInt RSconSyncSession::StartServer() - { - TRACE_FUNC_ENTRY; - - RProcess server; - TInt error = server.Create(KSconSyncServerExe, KNullDesC); - if ( error != KErrNone ) - { - return error; - } - // start server and wait for signal before proceeding - TRequestStatus status; - server.Rendezvous(status); - if ( status.Int() != KRequestPending ) - { - server.Kill(0); - } - else - { - server.Resume(); - } - - User::WaitForRequest( status ); - error = server.ExitType() == EExitPanic ? KErrGeneral : status.Int(); - server.Close(); - TRACE_FUNC_EXIT; - return error; - } - -// ----------------------------------------------------------------------------- -// RSconSyncSession::CreateAndSendChunkHandle() -// Creates a chunk and sends a handle to server -// ----------------------------------------------------------------------------- -// -TInt RSconSyncSession::CreateAndSendChunkHandle() - { - TRACE_FUNC_ENTRY; - - TInt err = iChunk.CreateGlobal( KNullDesC, - KSConSyncChunkSize, - KSConSyncChunkMaxSize ); - if ( err != KErrNone ) - { - LOGGER_WRITE_1("iChunk.CreateGlobal failed, err: %d", err); - return err; - } - TIpcArgs args; - args.Set( 0, iChunk ); - err = SendReceive( ESendChunkHandle, args ); - - LOGGER_WRITE_1("RSconSyncSession::CreateAndSendChunkHandle : returned: %d", err); - return err; - } - -// End of File diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/cntparser/bld/bld.inf --- a/connectivitymodules/SeCon/cntparser/bld/bld.inf Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -/* -* Copyright (c) 2002-2007 Nokia Corporation and/or 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: Contact Parser Client-Server build information file. -* -*/ - - - -PRJ_PLATFORMS -DEFAULT - - -PRJ_MMPFILES -cntparsersrv.mmp -cntparsersrvexe.mmp - - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/cntparser/bld/cntparsersrv.mmp --- a/connectivitymodules/SeCon/cntparser/bld/cntparsersrv.mmp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,60 +0,0 @@ -/* -* Copyright (c) 2002-2008 Nokia Corporation and/or 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: Contact Parser Client -* -*/ - - -// To get the MW_LAYER_SYSTEMINCLUDE-definition -#include -#include - -VENDORID VID_DEFAULT - -CAPABILITY CAP_CLIENT_DLL - -TARGET cntparserserver.dll -TARGETTYPE dll - -UID 0x10009d8d 0x101F99F8 - -#if defined(ARMCC) -DEFFILE ./def/eabiu -#elif defined(WINSCW) -DEFFILE ./def/bwinscw -#elif defined(WINS) -DEFFILE ./def/bwins -#elif defined(ARM) -DEFFILE ./def/bmarm -#endif - -SOURCEPATH ../src -SOURCE cntparserclient.cpp -SOURCE cntparserinfolog.cpp - -USERINCLUDE ../inc -USERINCLUDE ../../inc - -// Default system include paths for middleware layer modules. -MW_LAYER_SYSTEMINCLUDE - -LIBRARY euser.lib -LIBRARY cntmodel.lib -LIBRARY efsrv.lib -LIBRARY estor.lib -LIBRARY versit.lib -LIBRARY vcard.lib -LIBRARY bafl.lib -DEBUGLIBRARY flogger.lib - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/cntparser/bld/cntparsersrvexe.mmp --- a/connectivitymodules/SeCon/cntparser/bld/cntparsersrvexe.mmp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +0,0 @@ -/* -* Copyright (c) 2002-2008 Nokia Corporation and/or 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: Contact Parser Server -* -*/ - - -// To get the MW_LAYER_SYSTEMINCLUDE-definition -#include -#include - -VENDORID VID_DEFAULT - -CAPABILITY CAP_SERVER - -TARGET cntparserserverexe.exe -TARGETTYPE exe - -UID 0 0x101F99F9 - -SOURCEPATH ../src -SOURCE cntparserserverexe.cpp -SOURCE cntparserserversession.cpp -SOURCE cntparsercollector.cpp - -USERINCLUDE ../inc -USERINCLUDE ../../inc - -// Default system include paths -APP_LAYER_SYSTEMINCLUDE - -LIBRARY euser.lib -LIBRARY cntmodel.lib -LIBRARY efsrv.lib -LIBRARY estor.lib -LIBRARY versit.lib -LIBRARY vcard.lib -LIBRARY bafl.lib -DEBUGLIBRARY flogger.lib diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/cntparser/bld/def/bwinscwu.def --- a/connectivitymodules/SeCon/cntparser/bld/def/bwinscwu.def Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -EXPORTS - ??0RCntParserServer@@QAE@XZ @ 1 NONAME ; RCntParserServer::RCntParserServer(void) - ?Cancel@RCntParserServer@@QAEHXZ @ 2 NONAME ; int RCntParserServer::Cancel(void) - ?CancelAll@RCntParserServer@@QAEHXZ @ 3 NONAME ; int RCntParserServer::CancelAll(void) - ?Connect@RCntParserServer@@QAEHXZ @ 4 NONAME ; int RCntParserServer::Connect(void) - ?ContactsParsed@RCntParserServer@@QAEHXZ @ 5 NONAME ; int RCntParserServer::ContactsParsed(void) - ?ContactsSaved@RCntParserServer@@QAEHXZ @ 6 NONAME ; int RCntParserServer::ContactsSaved(void) - ?CreateIrMCL2PhoneBook@RCntParserServer@@QAEHHH@Z @ 7 NONAME ; int RCntParserServer::CreateIrMCL2PhoneBook(int, int) - ?Disconnect@RCntParserServer@@QAEHXZ @ 8 NONAME ; int RCntParserServer::Disconnect(void) - ?MaximumRecords@CCntParserInfoLog@@QBEHXZ @ 9 NONAME ; int CCntParserInfoLog::MaximumRecords(void) const - ?NewL@CCntParserInfoLog@@SAPAV1@XZ @ 10 NONAME ; class CCntParserInfoLog * CCntParserInfoLog::NewL(void) - ?SaveToFileL@CCntParserInfoLog@@QBEXABVTDesC16@@@Z @ 11 NONAME ; void CCntParserInfoLog::SaveToFileL(class TDesC16 const &) const - ?SetMaximumRecords@CCntParserInfoLog@@QAEXH@Z @ 12 NONAME ; void CCntParserInfoLog::SetMaximumRecords(int) - ?SetTotalRecords@CCntParserInfoLog@@QAEXH@Z @ 13 NONAME ; void CCntParserInfoLog::SetTotalRecords(int) - ?TotalNumberOfContacts@RCntParserServer@@QAEHXZ @ 14 NONAME ; int RCntParserServer::TotalNumberOfContacts(void) - ?TotalRecords@CCntParserInfoLog@@QBEHXZ @ 15 NONAME ; int CCntParserInfoLog::TotalRecords(void) const - ?Version@RCntParserServer@@QBE?AVTVersion@@XZ @ 16 NONAME ; class TVersion RCntParserServer::Version(void) const - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/cntparser/bld/def/eabiuu.def --- a/connectivitymodules/SeCon/cntparser/bld/def/eabiuu.def Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -EXPORTS - _ZN16RCntParserServer10DisconnectEv @ 1 NONAME - _ZN16RCntParserServer13ContactsSavedEv @ 2 NONAME - _ZN16RCntParserServer14ContactsParsedEv @ 3 NONAME - _ZN16RCntParserServer21CreateIrMCL2PhoneBookEii @ 4 NONAME - _ZN16RCntParserServer21TotalNumberOfContactsEv @ 5 NONAME - _ZN16RCntParserServer6CancelEv @ 6 NONAME - _ZN16RCntParserServer7ConnectEv @ 7 NONAME - _ZN16RCntParserServer9CancelAllEv @ 8 NONAME - _ZN16RCntParserServerC1Ev @ 9 NONAME - _ZN16RCntParserServerC2Ev @ 10 NONAME - _ZN17CCntParserInfoLog15SetTotalRecordsEi @ 11 NONAME - _ZN17CCntParserInfoLog17SetMaximumRecordsEi @ 12 NONAME - _ZN17CCntParserInfoLog4NewLEv @ 13 NONAME - _ZNK16RCntParserServer7VersionEv @ 14 NONAME - _ZNK17CCntParserInfoLog11SaveToFileLERK7TDesC16 @ 15 NONAME - _ZNK17CCntParserInfoLog12TotalRecordsEv @ 16 NONAME - _ZNK17CCntParserInfoLog14MaximumRecordsEv @ 17 NONAME - _ZTI17CCntParserInfoLog @ 18 NONAME ; ## - _ZTV17CCntParserInfoLog @ 19 NONAME ; ## - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/cntparser/inc/clientserver.h --- a/connectivitymodules/SeCon/cntparser/inc/clientserver.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ -/* -* Copyright (c) 2002 Nokia Corporation and/or 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: Contact Parser Server definitions -* -*/ - - -#ifndef __CLIENTSERVER_H__ -#define __CLIENTSERVER_H__ -#include - -// server name -_LIT(KCntParserName,"Contacts Parser"); - -// A version must be specified when creating a session with the server - -const TUint KCntParserMajorVersionNumber=0; -const TUint KCntParserMinorVersionNumber=1; -const TUint KCntParserBuildVersionNumber=1; - -// opcodes used in message passing between client and server -enum TCntParserRqst - { - ECntParserServerCancel, - ECntParserServerClose, - ECntParserServerCreateIrMCL2, - ECntParserServerTotalNumOfContacts, - ECntParserServerDisconnect, - ECntParserServerCntParsed, - ECntParserServerCntSaved, - ECntParserServerCancelAll - }; - -#endif \ No newline at end of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/cntparser/inc/cntparserclient.h --- a/connectivitymodules/SeCon/cntparser/inc/cntparserclient.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,56 +0,0 @@ -/* -* Copyright (c) 2002-2005 Nokia Corporation and/or 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: Contact Parser Client -* -*/ - - - -#if !defined(__CNTPARSERCLIENT_H__) -#define __CNTPARSERCLIENT_H__ - -#include -#include - -enum TCntParserConnection -{ - ECntParserNotConnected, - ECntParserConnected -}; - -//********************************** -//RCntParserServer -//********************************** - -class RCntParserServer : public RSessionBase -{ - public: - IMPORT_C RCntParserServer(); - IMPORT_C TInt Connect(); - IMPORT_C TInt Disconnect(); - IMPORT_C TVersion Version() const; - IMPORT_C TInt CreateIrMCL2PhoneBook(TInt aMaxNumberOfContacts, TBool aForced); - IMPORT_C TInt ContactsParsed(); - IMPORT_C TInt ContactsSaved(); - IMPORT_C TInt TotalNumberOfContacts(); - IMPORT_C TInt Cancel(); //cancels phonebook request - IMPORT_C TInt CancelAll(); //cancels all request - - private: - TCntParserConnection iConnected; -}; - - -#endif - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/cntparser/inc/cntparsercollector.h --- a/connectivitymodules/SeCon/cntparser/inc/cntparsercollector.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,76 +0,0 @@ -/* -* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "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: CCntParserCollector header -* -*/ - - - -#ifndef __CNTPARSERCOLLECTOR_H__ -#define __CNTPARSERCOLLECTOR_H__ - -#include -#include - -class CCntParserServer; -class CContactDatabase; -class CContactIdArray; -class CCntFilter; -class CVersitTlsData; - -class CCntParserCollector : public CActive -{ - public: - - CCntParserCollector(); - static CCntParserCollector* NewL(CCntParserServer* aServer,CContactDatabase* aCurrentDatabase); - static CCntParserCollector* NewLC(CCntParserServer* aServer,CContactDatabase* aCurrentDatabase); - virtual ~CCntParserCollector(); - void ConstructL(CCntParserServer* aServer,CContactDatabase* aCurrentDatabase); - TInt CreateIrMCL2FileL(const TDesC& aFileName,TInt aMaxNumberOfContacts,TBool aForced); - void PrepareParserL(); - void ParseCntDatabaseL(); - void DoCancel(); - - TInt CurrentItem(); - TInt Count(); - TInt ContactsSaved(); - - protected: - void RunL(); - TInt RunError(TInt aError); - void ExternalizeCurrentContactL(CContactDatabase* aContactsDb,TInt aCurrentItem,TBool ExternalizeEmpty); - void CloseResources(); - void SaveTotalCountL(); - TInt ReadTotalCountL() const; - TBool ContactCountChanged(); - - private: - CContactDatabase* iContactsDb; //Caller has the ownership - TInt iCurrentItem; - TInt iCount; //Contacts in CDB - TInt iMaxNumberOfContacts; //Max contacts to be parsed (MAXIMUM RECORDS in info.log) - RFileWriteStream iWriter; - CContactIdArray* iIds; //List of ID numbers of contacts - CCntParserServer* iServer; //Caller has the ownership - CCntFilter* iFilter; - CVersitTlsData* iVersitTLS; //For speed optimization - TBool iCancel; - TInt iContactsSaved; - TInt iTotalCount; - - RFs iFsSession; -}; - -#endif \ No newline at end of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/cntparser/inc/cntparserinfolog.h --- a/connectivitymodules/SeCon/cntparser/inc/cntparserinfolog.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +0,0 @@ -/* -* Copyright (c) 2002 Nokia Corporation and/or 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: CCntParserInfoLog header. -* This class is intended to create the INFO.LOG file for RANSI car phone when -* downloading contacts using IrMC L2. The implementation contains only mandatory -* needs and some extension possibilities. This class is RANSI specific and -* should _NOT_ be used by anyone else without a deeper knowledge. -* -*/ - - -#ifndef _CNTPARSERINFOLOG_H_ -#define _CNTPARSERINFOLOG_H_ - - -class CCntParserInfoLog : public CBase -{ - public: - CCntParserInfoLog(); - virtual ~CCntParserInfoLog(); - IMPORT_C static CCntParserInfoLog* NewL(); - void ConstructL(); - - IMPORT_C void SaveToFileL(const TDesC& aFileName) const; - - IMPORT_C void SetTotalRecords(TInt aTotalRecords); - IMPORT_C void SetMaximumRecords(TInt aMaximumRecords); - - IMPORT_C TInt TotalRecords() const; - IMPORT_C TInt MaximumRecords() const; - - private: - - TInt iTotalRecords; - TInt iLastUsedIndex; - TInt iMaximumRecords; -}; - -#endif // _CNTPARSERINFOLOG_H_ diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/cntparser/inc/cntparserserver.h --- a/connectivitymodules/SeCon/cntparser/inc/cntparserserver.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,95 +0,0 @@ -/* -* Copyright (c) 2002 Nokia Corporation and/or 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: CCntParserServer header -* -*/ - - -#ifndef __CNTPARSERSERVER_H__ -#define __CNTPARSERSERVER_H__ - -#include -#include - -class CCntParserCollector; -class CContactDatabase; - -_LIT(KTxtServer,"CntParserServerExe.exe"); - -// needed for creating server thread. -const TUint KDefaultHeapSize=0x10000; - -// reasons for server panic -enum TCntParserServerPanic -{ - EBadRequest, - EBadDescriptor, - EMainSchedulerError, - ESvrCreateServer, - ESvrStartServer, - ECreateTrapCleanup, - ENotImplementedYet, -}; - - -//********************************** -//CCntParserServer -//********************************** -class CCntParserServer : public CServer2 -{ - public: - IMPORT_C static CCntParserServer* NewL(); - IMPORT_C virtual ~CCntParserServer(); - static TInt RunServer(); - static void RunServerL(); - void IncreaseSessionCountL(); - void DecreaseSessionCount(); - void Stop(); - - TInt CreateIrMCL2PhoneBookL(const TDesC& path, TInt aMaxNumberOfContacts,TBool aForced); - void PrepareCollectorL(); - TInt ContactsParsed(); - void CancelPhoneBookRequest(); - void CancelAllPhoneBookRequests(); - TInt TotalNumOfContacts(); - TInt ContactsSaved(); - void Disconnect(); - void CompletePhoneBookRequests(TInt aErr); - void SetRequests(TInt aRequests); - - protected: - virtual CSession2* NewSessionL(const TVersion &aVersion, const RMessage2& aMsg) const; - - - protected: - CCntParserServer(); - - - private: - TInt iSessionCount; - TInt iRequests; //How many PB.VCF requests are ongoing, if 0 collector is canceled - - CCntParserCollector* iCollector; - CContactDatabase* iCurrentDatabase; -}; - -//********************************** -//global functions -//********************************** - -// function to panic the server -GLREF_C void PanicServer(TCntParserServerPanic aPanic); - - -#endif \ No newline at end of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/cntparser/inc/cntparserserversession.h --- a/connectivitymodules/SeCon/cntparser/inc/cntparserserversession.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -/* -* Copyright (c) 2002 Nokia Corporation and/or 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: CCntParserServerSession header -* -*/ - - -#ifndef __CNTPARSERSERVERSESSION_H__ -#define __CNTPARSERSERVERSESSION_H__ - -#include "clientserver.h" -#include "cntparserclient.h" -#include "cntparserserver.h" -#include "cntparsercollector.h" - -class CCntParserServer; - -//********************************** -//CCntParserServerSession -//********************************** -class CCntParserServerSession : public CSession2 -{ - public: - static CCntParserServerSession* NewL(CCntParserServer* aServer); - virtual ~CCntParserServerSession(); - void ConstructL(CCntParserServer* aServer); - - private: - CCntParserServerSession(); - - public: - virtual void ServiceL(const RMessage2& aMessage); - TInt DispatchMessageL(const RMessage2& aMessage); - void CompletePhoneBookRequest(TInt aErr); - - protected: - // panic the client - void PanicClient(TInt aPanic) const; - - private: - CCntParserServer* iContactsParserSrv; - TBool iPhoneBookRequest; - RMessage2 iPhoneBookRequestMessage; -}; - -#endif \ No newline at end of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/cntparser/inc/irmcconsts.h --- a/connectivitymodules/SeCon/cntparser/inc/irmcconsts.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -/* -* Copyright (c) 2002 Nokia Corporation and/or 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: Contact Parser constants -* -*/ - - -#ifndef _IRMCCONSTS_H_ -#define _IRMCCONSTS_H_ - -_LIT(KPhoneBookFilename,"c:\\IrMC\\pb.vcf"); -const TInt KMaximumNumberOfContacts=-1; //-1 == all contacts are transferred -const TInt KPBNotUpdated=1; //Must be grater than 0 -const TInt KPerformComplete=2; //Must be grater than 0 and different than KPBNotUpdated - -#endif diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/cntparser/src/cntparserclient.cpp --- a/connectivitymodules/SeCon/cntparser/src/cntparserclient.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,252 +0,0 @@ -/* -* Copyright (c) 2002-2007 Nokia Corporation and/or 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: RCntParserServer implementation. -* -*/ - - -// needed for client interface -#include "clientserver.h" -#include "cntparserserver.h" -#include "cntparserclient.h" - -#include "debug.h" - -const TUint KDefaultMessageSlots=4; - - -//------------------------------------------------------------ -// RCntParserServer::RCntParserServer() -//------------------------------------------------------------ -EXPORT_C RCntParserServer::RCntParserServer():iConnected(ECntParserNotConnected) - { - } -//------------------------------------------------------------ -// RCntParserServer::Connect() -//------------------------------------------------------------ -EXPORT_C TInt RCntParserServer::Connect() - { - LOGGER_ENTERFN( "RCntParserServer::Connect()" ); - - TInt r = KErrNone; - - if( iConnected == ECntParserNotConnected ) - { - r = CreateSession( KCntParserName, Version(), KDefaultMessageSlots ); - if(r==KErrNone) - { - iConnected=ECntParserConnected; - } - else - { - RProcess p; - TInt err = p.Create(KTxtServer, KNullDesC); - if ( err != KErrNone ) - { - // Loading failed. - return err; - } - TRequestStatus status; - p.Rendezvous( status ); - if( status != KRequestPending ) - { - p.Kill(0); // abort startup - p.Close(); - return KErrGeneral; // status can be KErrNone: don't return status.Int() - } - else - { - p.Resume(); // logon OK - start the server - } - - User::WaitForRequest( status ); - - if( status != KErrNone ) - { - p.Close(); - return status.Int(); - } - - r = CreateSession( KCntParserName, Version() ); - if( r == KErrNone ) - { - iConnected = ECntParserConnected; - } - p.Close(); - } - } - else - { - r = KErrCouldNotConnect; - } - LOGGER_WRITE_1( "RCntParserServer::Connect() : return %d", r ); - return r; - } -//------------------------------------------------------------ -// RCntParserServer::Disconnect() -//------------------------------------------------------------ -EXPORT_C TInt RCntParserServer::Disconnect() - { - LOGGER_ENTERFN( "RCntParserServer::Disconnect()" ); - - TInt res = KErrNone; - if(iConnected==ECntParserConnected) - { - res = SendReceive( ECntParserServerDisconnect, TIpcArgs(NULL) ); - if( res == KErrNone ) - { - iConnected = ECntParserNotConnected; - RSessionBase::Close(); - } - } - else - { - res = KErrCouldNotDisconnect; - } - LOGGER_WRITE_1( "RCntParserServer::CreateIrMCL2PhoneBook() : return %d", res ); - return res; - } -//------------------------------------------------------------ -// RCntParserServer::Version(void) const -//------------------------------------------------------------ -EXPORT_C TVersion RCntParserServer::Version(void) const - { - return(TVersion(KCntParserMajorVersionNumber,KCntParserMinorVersionNumber,KCntParserBuildVersionNumber)); - } -//------------------------------------------------------------ -// RCntParserServer::CreateIrMCL2PhoneBook(TInt aMaxNumberOfContacts, TBool aForced) -//------------------------------------------------------------ -EXPORT_C int RCntParserServer::CreateIrMCL2PhoneBook(TInt aMaxNumberOfContacts, TBool aForced) - { - LOGGER_ENTERFN( "RCntParserServer::CreateIrMCL2PhoneBook()" ); - TInt res(KErrNone); - if( iConnected == ECntParserConnected ) - { - res = SendReceive(ECntParserServerCreateIrMCL2,TIpcArgs(aMaxNumberOfContacts,aForced)); - } - else - { - res = KErrNotReady; - } - LOGGER_WRITE_1( "RCntParserServer::CreateIrMCL2PhoneBook() : return %d", res ); - return res; - } -//------------------------------------------------------------ -// RCntParserServer::ContactsParsed() -//------------------------------------------------------------ -EXPORT_C TInt RCntParserServer::ContactsParsed() - { - LOGGER_ENTERFN( "RCntParserServer::ContactsParsed()" ); - - TInt res=KErrNone; - if( iConnected == ECntParserConnected ) - { - TPckgBuf pckg; - res = SendReceive(ECntParserServerCntParsed,TIpcArgs(&pckg)); - if( res == KErrNone ) - { - res = pckg(); - } - } - else - { - res = KErrNotReady; - } - LOGGER_WRITE_1( "RCntParserServer::ContactsParsed() : return %d", res ); - return res; - } -//------------------------------------------------------------ -// RCntParserServer::TotalNumberOfContacts() -//------------------------------------------------------------ -EXPORT_C TInt RCntParserServer::TotalNumberOfContacts() - { - LOGGER_ENTERFN( "RCntParserServer::TotalNumberOfContacts()" ); - - TInt res = KErrNone; - if( iConnected == ECntParserConnected ) - { - TPckgBuf pckg; - res = SendReceive(ECntParserServerTotalNumOfContacts,TIpcArgs(&pckg)); - if( res == KErrNone) - { - res = pckg(); - } - } - else - { - res = KErrNotReady; - } - LOGGER_WRITE_1( "RCntParserServer::TotalNumberOfContacts() : return %d", res ); - return res; - } -//------------------------------------------------------------ -// RCntParserServer::Cancel() -//------------------------------------------------------------ -EXPORT_C TInt RCntParserServer::Cancel() - { - LOGGER_ENTERFN( "RCntParserServer::Cancel()" ); - - TInt res = KErrNone; - if( iConnected == ECntParserConnected ) - { - res = SendReceive(ECntParserServerCancel,TIpcArgs(NULL)); - } - else - { - res = KErrCancel; - } - LOGGER_WRITE_1( "RCntParserServer::Cancel() : return %d", res ); - return res; - } -//------------------------------------------------------------ -// RCntParserServer::CancelAll() -//------------------------------------------------------------ -EXPORT_C TInt RCntParserServer::CancelAll() - { - LOGGER_ENTERFN( "RCntParserServer::CancelAll()" ); - - TInt res = KErrNone; - if(iConnected==ECntParserConnected) - { - res = SendReceive(ECntParserServerCancelAll,TIpcArgs(NULL)); - } - else - { - res = KErrCancel; - } - LOGGER_WRITE_1( "RCntParserServer::CancelAll() : return %d", res ); - return res; - } -//------------------------------------------------------------ -// RCntParserServer::ContactsSaved() -//------------------------------------------------------------ -EXPORT_C TInt RCntParserServer::ContactsSaved() - { - LOGGER_ENTERFN( "RCntParserServer::ContactsSaved()" ); - - TInt res = KErrNone; - if( iConnected == ECntParserConnected ) - { - TPckgBuf pckg; - SendReceive(ECntParserServerCntSaved,TIpcArgs(&pckg)); - res = pckg(); - } - else - { - res = KErrNotReady; - } - LOGGER_WRITE_1( "RCntParserServer::ContactsSaved() : return %d", res ); - return res; - } - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/cntparser/src/cntparsercollector.cpp --- a/connectivitymodules/SeCon/cntparser/src/cntparsercollector.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,620 +0,0 @@ -/* -* Copyright (c) 2002-2007 Nokia Corporation and/or 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: CCntParserCollector implementation. -* -*/ - - - -#include -#include -#include - -#include -#include -#include - -#include "cntparsercollector.h" -#include "cntparserserver.h" -#include "irmcconsts.h" -#include "debug.h" - -//Next values are defined in cntdef.h -const TUid typesToBeSearched[]={{KUidContactFieldPhoneNumberValue},{KUidContactFieldFaxValue}}; - -_LIT( KTotalCountFilePath, "count.txt" ); - -_LIT8( KNameProperty, "N" ); -_LIT8( KTelProperty, "TEL" ); - - -//------------------------------------------------------------ -// CCntParserCollector::CCntParserCollector():CActive( 0 ) -//------------------------------------------------------------ -CCntParserCollector::CCntParserCollector():CActive( 0 ) - { - } -//------------------------------------------------------------ -// CCntParserCollector::~CCntParserCollector() -//------------------------------------------------------------ -CCntParserCollector::~CCntParserCollector() - { - LOGGER_ENTERFN( "CntParserCollector::~CCntParserCollector()" ); - - if( iVersitTLS != NULL ) - { - iVersitTLS->VersitTlsDataClose(); //Close reference - } - LOGGER_WRITE( "CntParserCollector: Versit OK!" ); - - iFsSession.Close(); - LOGGER_WRITE( "CntParserCollector: FsSession OK!" ); - iWriter.Close(); - LOGGER_WRITE( "CntParserCollector: iWriter OK!" ); - delete iFilter; - LOGGER_LEAVEFN( "CntParserCollector::~CCntParserCollector()" ); - } -//------------------------------------------------------------ -// CCntParserCollector::NewL(CCntParserServer* aServer,CContactDatabase* aCurrentDatabase) -//------------------------------------------------------------ -CCntParserCollector* CCntParserCollector::NewL(CCntParserServer* aServer,CContactDatabase* aCurrentDatabase) - { - CCntParserCollector* self=NewLC(aServer, aCurrentDatabase); - CleanupStack::Pop(); - return self; - } -//------------------------------------------------------------ -// CCntParserCollector::NewLC(CCntParserServer* aServer,CContactDatabase* aCurrentDatabase) -//------------------------------------------------------------ -CCntParserCollector* CCntParserCollector::NewLC(CCntParserServer* aServer,CContactDatabase* aCurrentDatabase) - { - CCntParserCollector* self=new (ELeave) CCntParserCollector(); - CleanupStack::PushL( self ); - self->ConstructL( aServer, aCurrentDatabase ); - return self; - } -//------------------------------------------------------------ -// CCntParserCollector::ConstructL(CCntParserServer* aServer,CContactDatabase* aCurrentDatabase) -//------------------------------------------------------------ -void CCntParserCollector::ConstructL(CCntParserServer* aServer,CContactDatabase* aCurrentDatabase) - { - LOGGER_WRITE( "CntParserCollector: ConstructL" ); - - CVersitTlsData& VersitTLS = CVersitTlsData::VersitTlsDataL(); //For speed optimization take a reference to TLS, SEE DESTRUCTOR!! - iVersitTLS = &VersitTLS; - - iServer = aServer; - iContactsDb = aCurrentDatabase; - PrepareParserL(); - - CActiveScheduler::Add(this); - } -//------------------------------------------------------------ -// CCntParserCollector::CreateIrMCL2FileL(const TDesC& aFileName, TInt aMaxNumberOfContacts,TBool aForced) -//------------------------------------------------------------ -TInt CCntParserCollector::CreateIrMCL2FileL(const TDesC& aFileName, TInt aMaxNumberOfContacts,TBool aForced) - { - LOGGER_WRITE( "CntParserCollector: CreateIrMCL2FileL" ); - LOGGER_WRITE_1( "CCntParserCollector::CreateIrMCL2FileL aFileName %S", &aFileName ); - - iMaxNumberOfContacts = aMaxNumberOfContacts; - - CContactIdArray* changedItems; - TTime tTime; - - LOGGER_WRITE( "CntParserCollector: CreateIrMCL2FileL: Does the PB.VCF already exist" ); - - //Is there a previously created pb.vcf file? - RFile file; - TInt err = file.Open( iFsSession, aFileName, EFileShareExclusive ); //Open file - if( err == KErrNone ) - { - LOGGER_WRITE( "CntParserCollector: CreateIrMCL2FileL: Yes, when created" ); - file.Modified(tTime); //When modified - } - file.Close(); - - err = iWriter.Open( iFsSession, aFileName, EFileShareExclusive ); //Open stream - CleanupClosePushL( iWriter ); //Yes, this is a member variable, but it's considered - - if( err == KErrPathNotFound ) - { - LOGGER_WRITE( "CntParserCollector: CreateIrMCL2FileL: dir did not exist, creating..." ); - err = iFsSession.MkDir( aFileName ); - LOGGER_WRITE_1( "CCntParserCollector MkDir returned %d", err ); - if ( err == KErrNone ) - { - LOGGER_WRITE( "CntParserCollector: CreateIrMCL2FileL: New file after MkDir" ); - //This is the situation that the file is created for the first time - User::LeaveIfError( iWriter.Create( iFsSession, aFileName, EFileShareExclusive ) ); - LOGGER_WRITE( "CntParserCollector: CreateIrMCL2FileL: New file created after MkDir" ); - CleanupStack::Pop(); //iWriter - ParseCntDatabaseL(); //create IrMC L2 stuff - SaveTotalCountL(); - return KErrNone; //File created normally - } - } - if( err == KErrNotFound ) // file does not exist - create it - { - LOGGER_WRITE( "CntParserCollector: CreateIrMCL2FileL: New file" ); - - //This is the situation that the file is created for the first time - User::LeaveIfError( iWriter.Create( iFsSession, aFileName, EFileShareExclusive ) ); - LOGGER_WRITE( "CntParserCollector: CreateIrMCL2FileL: New file created" ); - CleanupStack::Pop(); //iWriter - ParseCntDatabaseL(); //create IrMC L2 stuff - SaveTotalCountL(); - return KErrNone; //File created normally - } - else - { - if( err != KErrNone ) - { - LOGGER_WRITE_1( "CreateIrMCL2FileL errror leaving %d", err ); - User::Leave(err); - } - iWriter.Close(); - - LOGGER_WRITE( "CntParserCollector: CreateIrMCL2FileL: File exists, any changes in CDB?" ); - //The file exists, but are there any changes? - - changedItems = iContactsDb->ContactsChangedSinceL( tTime ); //Create a contactidarray, user takes the ownership - CleanupStack::PushL(changedItems); - - LOGGER_WRITE_1( "CreateIrMCL2FileL changedItems %d", changedItems->Count() ); - LOGGER_WRITE_1( "CreateIrMCL2FileL aForced %d", aForced ); - //Are there changes in any contact - if( changedItems->Count()!=0 || aForced || ContactCountChanged() ) - { - LOGGER_WRITE( "CntParserCollector: CreateIrMCL2FileL: Changes in CDB, replace existing PB.VCF" ); - - CleanupStack::PopAndDestroy(changedItems); - - //Create pb.vcf - User::LeaveIfError( iWriter.Replace( iFsSession, aFileName, EFileShareExclusive) ); - LOGGER_WRITE( "CntParserCollector: CreateIrMCL2FileL: file replaced" ); - CleanupStack::Pop(); //iWriter - ParseCntDatabaseL(); //create IrMC L2 stuff - SaveTotalCountL(); - return KErrNone; //File created normally - } - - //No changes - CleanupStack::PopAndDestroy(changedItems); - CleanupStack::PopAndDestroy(); - - LOGGER_WRITE( "CntParserCollector: CreateIrMCL2FileL: No Changes in CDB, keep old PB.VCF" ); - } - return KPBNotUpdated; //No error occured, KPBNotUpdated used as return value to tell that the file was not created.. - } -//------------------------------------------------------------ -// CCntParserCollector::ParseCntDatabaseL() -//------------------------------------------------------------ -void CCntParserCollector::ParseCntDatabaseL() - { - LOGGER_WRITE( "CntParserCollector: ParseCntDatabaseL" ); - - iCurrentItem = 0; - iCancel = EFalse; - iContactsSaved = 0; - - //Create owncard (it's always included, even if it's empty) - - TFileName defaultDb; - CContactDatabase::GetDefaultNameL( defaultDb ); - TFileName currentDb; - iContactsDb->GetCurrentDatabase( currentDb ); - - if( defaultDb.CompareF(currentDb) == 0 || currentDb == KNullDesC16 /*|| currentDb.CompareF(KSimDummyDatabase)==0*/) //Is current database also default? - { - LOGGER_WRITE( "CntParserCollector: ParseCntDatabaseL: Using default database" ); - TContactItemId ownCardId = iContactsDb->OwnCardId(); - ExternalizeCurrentContactL( iContactsDb, ownCardId, ETrue); - } - else - { - LOGGER_WRITE( "CntParserCollector: ParseCntDatabaseL: Not using default database" ); - CContactDatabase* db=CContactDatabase::OpenL(); //My contact card is only in default db, so open it - CleanupStack::PushL(db); - - TContactItemId ownCardId = db->OwnCardId(); - ExternalizeCurrentContactL( db, ownCardId, ETrue ); - - CleanupStack::PopAndDestroy( db ); - } - - //Start running RunL method and create everything else.. - TRequestStatus* s = &iStatus; - User::RequestComplete( s, KErrNone ); - SetActive(); - } -//------------------------------------------------------------ -// CCntParserCollector::CloseResources() -//------------------------------------------------------------ -void CCntParserCollector::CloseResources() - { - LOGGER_WRITE( "CntParserCollector: CloseResources: Closing resources (iWriter)" ); - iWriter.Close(); - } -//------------------------------------------------------------ -// CCntParserCollector::PrepareParserL() -//------------------------------------------------------------ -void CCntParserCollector::PrepareParserL() - { - LOGGER_WRITE( "CntParserCollector: PrepareParserL" ); - iFilter = CCntFilter::NewL(); //Filter all contact cards out of others - - iFilter->SetContactFilterTypeALL( EFalse ); - iFilter->SetContactFilterTypeCard( ETrue ); - iContactsDb->FilterDatabaseL( *iFilter ); - - iIds=iFilter->iIds; //Get IDs to filtered contacts - iCount=iIds->Count(); //Get number of contacts to be collected - - User::LeaveIfError( iFsSession.Connect() ); //Connect to the file server - - LOGGER_WRITE_1( "CntParserCollector: PrepareParserL: iCount == %d", iCount); - } -//------------------------------------------------------------ -// CCntParserCollector::RunL() -//------------------------------------------------------------ -void CCntParserCollector::RunL() - { - //MaxNumberOfContacts-1 for OwnCard - if( iCurrentItem < iCount && (iCurrentItem < ( iMaxNumberOfContacts - 1 ) || iMaxNumberOfContacts == -1 ) ) //If no more contacts left or maximum number of contacts already parsed - { - ExternalizeCurrentContactL( iContactsDb, (*iIds)[iCurrentItem], EFalse ); - iCurrentItem++; - TRequestStatus* s = &iStatus; //Let's rerun this RunL method as soon as possible - User::RequestComplete( s, KErrNone ); - SetActive(); - return; - } - iCurrentItem++; //for OwnCard that is created separately - LOGGER_WRITE( "CntParserCollector: RunL: No more items" ); - CloseResources(); - iServer->CompletePhoneBookRequests( KErrNone ); - } -//------------------------------------------------------------ -// CCntParserCollector::ExternalizeCurrentContactL(CContactDatabase* aContactsDb,TInt aCurrentItem,TBool ExternalizeEmpty) -//------------------------------------------------------------ -void CCntParserCollector::ExternalizeCurrentContactL(CContactDatabase* aContactsDb,TInt aCurrentItem,TBool ExternalizeEmpty) - { - CContactItem* ownCard; - - if( aCurrentItem < 0 ) - { - ownCard = CContactCard::NewLC(); - } - else - { - ownCard = aContactsDb->ReadContactLC( aCurrentItem ); //Take a new contact item - } - - CParserVCard* VCard=CParserVCard::NewL(); //Create new VCard - CleanupStack::PushL( VCard ); - - TInt nField = ownCard->CardFields().Find( KUidContactFieldGivenName ); - TInt fField = ownCard->CardFields().Find( KUidContactFieldFamilyName ); - TInt cField = ownCard->CardFields().Find( KUidContactFieldCompanyName ); - - //FOR NAMES - //N: -field always included even if it's empty - CDesC16Array* ValueArray=new (ELeave) CDesCArrayFlat(4); - CleanupStack::PushL( ValueArray ); - CParserPropertyValueCDesCArray* NameValues=new (ELeave) CParserPropertyValueCDesCArray( ValueArray ); - CleanupStack::PushL( NameValues ); - CArrayPtr* parameters=new (ELeave) CArrayPtrFlat(1); - CleanupStack::PushL( parameters ); - - TPtrC fName; - TPtrC nName; - TPtrC cName; - - if( fField != KErrNotFound ) - { - fName.Set( ownCard->CardFields()[fField].TextStorage()->Text() ); - } - if( nField != KErrNotFound ) - { - nName.Set( ownCard->CardFields()[nField].TextStorage()->Text() ); - } - if( cField != KErrNotFound ) - { - cName.Set( ownCard->CardFields()[cField].TextStorage()->Text() ); - } - - if( fName.Length() == 0) - { - fField = KErrNotFound; - } - if(nName.Length()==0) - { - nField = KErrNotFound; - if( fField==KErrNotFound ) - { - ValueArray->AppendL( cName ); - } - else - { - ValueArray->AppendL( fName ); - } - } - else - { - ValueArray->AppendL( fName ); - ValueArray->AppendL( nName ); - } - - VCard->AddPropertyL( CParserProperty::NewL((*NameValues),KNameProperty,parameters) ); //Add name property to VCard (VCard takes the ownership of the property) - CleanupStack::Pop(3); //parameters namevalues valuearray - - TBool isNumber = EFalse; - - TInt typeIndex = 0; - TInt index = -1; //NOTE: +1 added before used first time - - for(;;) //Go through all fields (Number of fields is unknown) - { - index = ownCard->CardFields().FindNext(typesToBeSearched[typeIndex],index+1);//Find next field (of current type) - if( index == KErrNotFound ) //No more phone numbers, move to the next group -> (See TypesToBeSearched) - { - typeIndex++; - if( typeIndex >= (signed) (sizeof(typesToBeSearched) / sizeof(TUid)) ) - { - break; //if no more types to search -> exit FOR-loop - } - - index=ownCard->CardFields().FindNext(typesToBeSearched[typeIndex],0); //Find next field - if( index==KErrNotFound ) - { - break; //No fields -> exit - } - } - - TPtrC number = ownCard->CardFields()[index].TextStorage()->Text(); - if( number.Length() != 0) - { - CDesC16Array* ValueArray2=new (ELeave) CDesCArrayFlat(4); - CleanupStack::PushL( ValueArray2 ); - CParserPropertyValueCDesCArray* NumberValues=new (ELeave) CParserPropertyValueCDesCArray(ValueArray2); - CleanupStack::PushL( NumberValues ); - CArrayPtr* parameters2=new (ELeave) CArrayPtrFlat(1); - CleanupStack::PushL( parameters2 ); - - //Take label name to parameter - - for( TInt i=0;iCardFields()[index].ContentType().FieldTypeCount();i++ ) - { - TFieldType fieldType=ownCard->CardFields()[index].ContentType().FieldType(i); - - if(fieldType==KUidContactFieldVCardMapWORK) parameters2->AppendL(CParserParam::NewL(KVersitParam8Work,KNullDesC8)); - if(fieldType==KUidContactFieldVCardMapHOME) parameters2->AppendL(CParserParam::NewL(KVersitParam8Home,KNullDesC8)); - if(fieldType==KUidContactFieldVCardMapMSG) parameters2->AppendL(CParserParam::NewL(KVersitParam8Msg,KNullDesC8)); - if(fieldType==KUidContactFieldVCardMapVOICE)parameters2->AppendL(CParserParam::NewL(KVersitParam8Voice,KNullDesC8)); - if(fieldType==KUidContactFieldVCardMapFAX) parameters2->AppendL(CParserParam::NewL(KVersitParam8Fax,KNullDesC8)); - if(fieldType==KUidContactFieldVCardMapPREF) parameters2->AppendL(CParserParam::NewL(KVersitParam8Pref,KNullDesC8)); - if(fieldType==KUidContactFieldVCardMapCELL) parameters2->AppendL(CParserParam::NewL(KVersitParam8Cell,KNullDesC8)); - if(fieldType==KUidContactFieldVCardMapPAGER)parameters2->AppendL(CParserParam::NewL(KVersitParam8Pager,KNullDesC8)); - if(fieldType==KUidContactFieldVCardMapBBS) parameters2->AppendL(CParserParam::NewL(KVersitParam8Bbs,KNullDesC8)); - if(fieldType==KUidContactFieldVCardMapMODEM)parameters2->AppendL(CParserParam::NewL(KVersitParam8Modem,KNullDesC8)); - if(fieldType==KUidContactFieldVCardMapCAR) parameters2->AppendL(CParserParam::NewL(KVersitParam8Car,KNullDesC8)); - if(fieldType==KUidContactFieldVCardMapISDN) parameters2->AppendL(CParserParam::NewL(KVersitParam8Isdn,KNullDesC8)); - if(fieldType==KUidContactFieldVCardMapVIDEO)parameters2->AppendL(CParserParam::NewL(KVersitParam8Video,KNullDesC8)); - } - - ValueArray2->AppendL( number ); - VCard->AddPropertyL(CParserProperty::NewL((*NumberValues),KTelProperty,parameters2)); //VCard takes the ownership of the property - isNumber=ETrue; - - CleanupStack::Pop(3); //parameters2 numbervalues valuearray2 - } - } - - if( (nField!=KErrNotFound) || (fField!=KErrNotFound) || (cField!=KErrNotFound) || isNumber || ExternalizeEmpty ) - { - if( !isNumber ) - { - //Create empty TEL field (required by the specs) - - CDesC16Array* ValueArray3=new (ELeave) CDesCArrayFlat(4); - CleanupStack::PushL(ValueArray3); - CParserPropertyValueCDesCArray* NumberValues2=new (ELeave) CParserPropertyValueCDesCArray(ValueArray3); - CleanupStack::PushL(NumberValues2); - CArrayPtr* parameters3=new (ELeave) CArrayPtrFlat(1); - CleanupStack::PushL(parameters3); - - VCard->AddPropertyL(CParserProperty::NewL((*NumberValues2),KTelProperty,parameters3)); //VCard takes the ownership of the property - - CleanupStack::Pop(3); //parameters3 numbervalues valuearray3 - } - - TRAPD( err, VCard->ExternalizeL( iWriter );) //If there are no name or numbers, then no externalizing.. - //if error then only current contact card is discarded, but others will be still collected.. - if( err == KErrNone ) - { - iContactsSaved++; - } - else - { - LOGGER_WRITE( "CntParserCollector: RunL: Error,VCARD _NOT_ saved" ); - } - } - - aContactsDb->CloseContactL( aCurrentItem ); //Close current contact item - - CleanupStack::PopAndDestroy( VCard ); // VCard and all arrays (parameters2, numvervalues, valuearray2) related to this VCard are deleted through the ownership relations - CleanupStack::PopAndDestroy( ownCard ); - } -//------------------------------------------------------------ -// CCntParserCollector::DoCancel() -//------------------------------------------------------------ -void CCntParserCollector::DoCancel() - { - LOGGER_WRITE( "CntParserCollector: DoCancel" ); - CloseResources(); - } -//------------------------------------------------------------ -// CCntParserCollector::RunError(TInt aError) -//------------------------------------------------------------ -TInt CCntParserCollector::RunError( TInt aError ) - { - LOGGER_WRITE( "CntParserCollector: RunError!" ); - CloseResources(); //JIC - - iServer->CompletePhoneBookRequests( aError ); //complete all requests with an error - return KErrNone; - } -//------------------------------------------------------------ -// CCntParserCollector::CurrentItem() -//------------------------------------------------------------ -TInt CCntParserCollector::CurrentItem() - { - return iCurrentItem; - } -//------------------------------------------------------------ -// CCntParserCollector::Count() -//------------------------------------------------------------ -TInt CCntParserCollector::Count() - { - return iCount; - } -//------------------------------------------------------------ -// CCntParserCollector::ContactsSaved() -//------------------------------------------------------------ -TInt CCntParserCollector::ContactsSaved() - { - return iContactsSaved; - } -//------------------------------------------------------------ -// CCntParserCollector::SaveTotalCountL() const -//------------------------------------------------------------ -void CCntParserCollector::SaveTotalCountL() - { - LOGGER_WRITE( "CntParserCollector: SaveTotalCount begin" ); - - if( iContactsDb ) - { - iTotalCount = iContactsDb->CountL(); - LOGGER_WRITE_1( "CntParserCollector: SaveTotalCount iTotalCount %d", iTotalCount ); - } - - RFs Fs; - RFile writer; - User::LeaveIfError(Fs.Connect()); //Connect to the file server - CleanupClosePushL(Fs); - - User::LeaveIfError(Fs.CreatePrivatePath( EDriveC )); - User::LeaveIfError(Fs.SetSessionToPrivate( EDriveC )); - - User::LeaveIfError(writer.Replace(Fs,KTotalCountFilePath,EFileWrite)); //Open file - CleanupClosePushL(writer); - LOGGER_WRITE( "CntParserCollector: SaveTotalCount file replaced" ); - - // Prepare externalized representation of iTotalCount - TBuf8< 256 > countData; - RDesWriteStream writeStream( countData ); - CleanupClosePushL( writeStream ); - writeStream.WriteInt32L( iTotalCount ); - writeStream.CommitL(); - CleanupStack::PopAndDestroy( &writeStream ); - - // Then write them to the file itself - User::LeaveIfError(writer.Write( countData )); - - CleanupStack::PopAndDestroy(); //writer - CleanupStack::PopAndDestroy(); //Fs - - LOGGER_WRITE( "CntParserCollector: SaveTotalCount end" ); - } -//------------------------------------------------------------ -// CCntParserCollector::ReadTotalCountL() const -//------------------------------------------------------------ -TInt CCntParserCollector::ReadTotalCountL() const - { - LOGGER_WRITE( "CntParserCollector: ReadTotalCount begin" ); - TInt total; - RFs Fs; - RFile reader; - User::LeaveIfError(Fs.Connect()); //Connect to the file server - CleanupClosePushL(Fs); - - User::LeaveIfError(Fs.CreatePrivatePath( EDriveC )); - User::LeaveIfError(Fs.SetSessionToPrivate( EDriveC )); - - User::LeaveIfError(reader.Open(Fs,KTotalCountFilePath,EFileRead)); //Open file - CleanupClosePushL(reader); - LOGGER_WRITE( "CntParserCollector: ReadTotalCount file opened" ); - - RFileReadStream readStream(reader); - readStream.PushL(); - - total = readStream.ReadInt32L(); - - LOGGER_WRITE_1( "CntParserCollector: ReadTotalCount total %d", total ); - - CleanupStack::PopAndDestroy(); //readStream - CleanupStack::PopAndDestroy(); //writer - CleanupStack::PopAndDestroy(); //Fs - LOGGER_WRITE( "CntParserCollector: ReadTotalCount end" ); - return total; - } -//------------------------------------------------------------ -// CCntParserCollector::ContactCountChanged() const -//------------------------------------------------------------ -TBool CCntParserCollector::ContactCountChanged() - { - LOGGER_WRITE( "CntParserCollector: ContactCountChanged begin" ); - TInt oldCount = 0; - TInt err( KErrNone ); - - if( iContactsDb ) - { - TRAP( err, iTotalCount = iContactsDb->CountL() ); - if ( err != KErrNone ) - { - LOGGER_WRITE_1( "iContactsDb->CountL leaved: %d", err ); - LOGGER_WRITE( "CntParserCollector: ContactCountChanged ETrue" ); - return ETrue; - } - LOGGER_WRITE_1( "CntParserCollector: ContactCountChanged iTotalCount %d", iTotalCount ); - } - - TRAP( err, oldCount = ReadTotalCountL() ); - - LOGGER_WRITE_1( "CntParserCollector: ContactCountChanged err %d", err ); - LOGGER_WRITE_1( "CntParserCollector: ContactCountChanged oldCount %d", oldCount ); - LOGGER_WRITE_1( "CntParserCollector: ContactCountChanged iTotalCount %d", iTotalCount ); - - if( err == KErrNone ) - { - if( iTotalCount != oldCount ) - { - LOGGER_WRITE( "CntParserCollector: ContactCountChanged ETrue" ); - return ETrue; - } - else - { - LOGGER_WRITE( "CntParserCollector: ContactCountChanged EFalse" ); - return EFalse; - } - } - else - { - LOGGER_WRITE( "CntParserCollector: ContactCountChanged ETrue" ); - return ETrue; - } - } - -// end of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/cntparser/src/cntparserinfolog.cpp --- a/connectivitymodules/SeCon/cntparser/src/cntparserinfolog.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,119 +0,0 @@ -/* -* Copyright (c) 2002-2007 Nokia Corporation and/or 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: CCntParserInfoLog implementation. -* -*/ - - -#include -#include -#include - -#include "cntparserinfolog.h" - -_LIT8(KNewLine,"\r\n"); - -_LIT8(KMaxRecords,"Maximum-Records:"); -_LIT8(KTotalRecords,"Total-Records:"); - -//------------------------------------------------------------ -// CCntParserInfoLog::CCntParserInfoLog() -//------------------------------------------------------------ -CCntParserInfoLog::CCntParserInfoLog() - { - } - -//------------------------------------------------------------ -// CCntParserInfoLog::~CCntParserInfoLog() -//------------------------------------------------------------ -CCntParserInfoLog::~CCntParserInfoLog() - { - } - -//------------------------------------------------------------ -// CCntParserInfoLog::CCntParserInfoLog::NewL() -//------------------------------------------------------------ -EXPORT_C CCntParserInfoLog* CCntParserInfoLog::NewL() - { - CCntParserInfoLog* self=new (ELeave) CCntParserInfoLog(); - return self; - } - -//------------------------------------------------------------ -// CCntParserInfoLog::SaveToFileL(const TDesC& aFileName) const -//------------------------------------------------------------ -EXPORT_C void CCntParserInfoLog::SaveToFileL( const TDesC& aFileName ) const - { - TInt err = KErrNone; - RFs Fs; - RFile writer; - User::LeaveIfError( Fs.Connect() ); //Connect to the file server - CleanupClosePushL( Fs ); - err = writer.Replace( Fs, aFileName, EFileWrite ); //Open file - CleanupClosePushL( writer ); - - if( err == KErrNone ) - { - writer.Write( KMaxRecords ); - - TBuf8<16> numVal; - numVal.Num( iMaximumRecords ); - writer.Write( numVal ); - - writer.Write( KNewLine ); - - writer.Write( KTotalRecords ); - - TBuf8<16> numVal2; - numVal2.Num( iTotalRecords ); - writer.Write( numVal2 ); - } - - CleanupStack::PopAndDestroy(); //writer - CleanupStack::PopAndDestroy(); //Fs - } - -//------------------------------------------------------------ -// CCntParserInfoLog::SetTotalRecords(TInt aTotalRecords) -//------------------------------------------------------------ -EXPORT_C void CCntParserInfoLog::SetTotalRecords(TInt aTotalRecords) - { - iTotalRecords = aTotalRecords; - } - -//------------------------------------------------------------ -// CCntParserInfoLog::SetMaximumRecords(TInt aMaximumRecords) -//------------------------------------------------------------ -EXPORT_C void CCntParserInfoLog::SetMaximumRecords(TInt aMaximumRecords) - { - iMaximumRecords = aMaximumRecords; - } - -//------------------------------------------------------------ -// CCntParserInfoLog::TotalRecords() const -//------------------------------------------------------------ -EXPORT_C TInt CCntParserInfoLog::TotalRecords() const - { - return iTotalRecords; - } - -//------------------------------------------------------------ -// CCntParserInfoLog::MaximumRecords() const -//------------------------------------------------------------ -EXPORT_C TInt CCntParserInfoLog::MaximumRecords() const - { - return iMaximumRecords; - } - -// end of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/cntparser/src/cntparserserverexe.cpp --- a/connectivitymodules/SeCon/cntparser/src/cntparserserverexe.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,322 +0,0 @@ -/* -* Copyright (c) 2002-2007 Nokia Corporation and/or 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: CCntParserServer implementation. -* -*/ - - -#include "clientserver.h" -#include "cntparserserver.h" -#include "cntparserserversession.h" -#include "irmcconsts.h" - -#include "debug.h" - -#include - -//------------------------------------------------------------ -// RunServer -//------------------------------------------------------------ -TInt CCntParserServer::RunServer() - { - LOGGER_ENTERFN( "CCntParserServer::RunServer" ); - - CTrapCleanup* cleanup = CTrapCleanup::New(); - TInt ret( KErrNoMemory ); - if( cleanup ) - { - TRAP( ret, CCntParserServer::RunServerL() ); - delete cleanup; - } - if( ret != KErrNone ) - { - // Signal the client that server creation failed - RProcess::Rendezvous( ret ); - } - LOGGER_LEAVEFN( "CCntParserServer::RunServer" ); - return ret; - } -//------------------------------------------------------------ -// RunServerL -//------------------------------------------------------------ -void CCntParserServer::RunServerL() - { - // Create and install the active scheduler we need - LOGGER_ENTERFN( "CCntParserServer::RunServerL" ); - CActiveScheduler *as=new (ELeave)CActiveScheduler; - CleanupStack::PushL( as ); - CActiveScheduler::Install( as ); - - // Create server - CCntParserServer::NewL(); - - // Initialisation complete, now signal the client - User::LeaveIfError( RThread().RenameMe( KTxtServer ) ); - RProcess::Rendezvous( KErrNone ); - - // Ready to run - CActiveScheduler::Start(); - - // Cleanup the scheduler - CleanupStack::PopAndDestroy( as ); - LOGGER_LEAVEFN( "CCntParserServer::RunServerL" ); - } -//------------------------------------------------------------ -// E32Main() -//------------------------------------------------------------ -TInt E32Main() - { - return CCntParserServer::RunServer(); - } -//------------------------------------------------------------ -// PanicServer(TCntParserServerPanic aPanic) -//------------------------------------------------------------ -GLDEF_C void PanicServer(TCntParserServerPanic aPanic) - { - LOGGER_WRITE( "PANIC SERVER!" ); - _LIT(KTxtServerPanic,"Parser server panic"); - User::Panic( KTxtServerPanic, aPanic ); - } - - -//********************************** -//CCntParserServer -//********************************** - -//------------------------------------------------------------ -// CCntParserServer::CCntParserServer() -//------------------------------------------------------------ -CCntParserServer::CCntParserServer() : CServer2( EPriorityStandard ) - { - } -//------------------------------------------------------------ -// CCntParserServer::~CCntParserServer() -//------------------------------------------------------------ -EXPORT_C CCntParserServer::~CCntParserServer() - { - if( iCollector ) - { - iCollector->Cancel(); - } - delete iCollector; - delete iCurrentDatabase; - LOGGER_WRITE( "CntParserServer: DELETED!" ); - } -//------------------------------------------------------------ -// CCntParserServer* CCntParserServer::NewL() -//------------------------------------------------------------ -EXPORT_C CCntParserServer* CCntParserServer::NewL() - { - LOGGER_WRITE( "CntParserServer: NEW" ); - CCntParserServer* pS=new (ELeave) CCntParserServer(); - CleanupStack::PushL(pS); - pS->StartL( KCntParserName ); - CleanupStack::Pop( pS ); - LOGGER_WRITE( "CntParserServer: Created" ); - return pS; - } -//------------------------------------------------------------ -// CCntParserServer::NewSessionL(const TVersion &aVersion, const RMessage2& /*aMsg*/) const -//------------------------------------------------------------ -CSession2* CCntParserServer::NewSessionL(const TVersion &aVersion, const RMessage2& /*aMsg*/) const - { - LOGGER_WRITE( "CntParserServer: NEW SessionL" ); - // check we're the right version - TVersion v( KCntParserMajorVersionNumber,KCntParserMinorVersionNumber,KCntParserBuildVersionNumber ); - if ( !User::QueryVersionSupported( v,aVersion ) ) - User::Leave( KErrNotSupported ); - CCntParserServerSession* self=CCntParserServerSession::NewL( (CCntParserServer*)this ); - return self; - } -//------------------------------------------------------------ -// CCntParserServer::IncreaseSessionCountL() -//------------------------------------------------------------ -void CCntParserServer::IncreaseSessionCountL() - { - LOGGER_WRITE( "CntParserServer: Increase Session Count" ); - iSessionCount++; - if( iSessionCount == 1 ) //If first session, prepare collector - { - PrepareCollectorL(); - } - } -//------------------------------------------------------------ -// CCntParserServer::DecreaseSessionCount() -//------------------------------------------------------------ -void CCntParserServer::DecreaseSessionCount() - { - LOGGER_WRITE( "CntParserServer: Decrease Session Count" ); - iSessionCount--; - if( iSessionCount==0 ) //if last session is disconnected, delete server - { - Stop(); - } - } -//------------------------------------------------------------ -// CCntParserServer::ContactsParsed() -//------------------------------------------------------------ -TInt CCntParserServer::ContactsParsed() - { - return iCollector->CurrentItem(); - } -//------------------------------------------------------------ -// CCntParserServer::TotalNumOfContacts() -//------------------------------------------------------------ -TInt CCntParserServer::TotalNumOfContacts() - { - //After the PrepareCollector is called, the number of contacts can be returned - return iCollector->Count(); - } -//------------------------------------------------------------ -// CCntParserServer::ContactsSaved() -//------------------------------------------------------------ -TInt CCntParserServer::ContactsSaved() - { - return iCollector->ContactsSaved(); - } -//------------------------------------------------------------ -// CCntParserServer::PrepareCollectorL() -//------------------------------------------------------------ -void CCntParserServer::PrepareCollectorL() - { - LOGGER_WRITE( "CntParserServer: Prepare collectorL: Open Contact Database" ); - - TFileName dbFile; - TFileName defaultDb; - - CContactDatabase::GetDefaultNameL( defaultDb ); - - LOGGER_WRITE( "CntParserServer: Prepare collectorL: GetDefault" ); - - iCurrentDatabase=CContactDatabase::OpenL(); - - LOGGER_WRITE( "CntParserServer: Prepare collectorL: OpenDefault" ); - - iCurrentDatabase->GetCurrentDatabase( dbFile ); //Get selected database - - LOGGER_WRITE( "CntParserServer: Prepare collectorL: CompareDefault" ); - - if( dbFile.CompareF(defaultDb)!=0 && dbFile!=KNullDesC16 /*&& dbFile.CompareF(KSimDummyDatabase)!=0*/) //If the selected database is not the default and something is selected - { - LOGGER_WRITE( "CntParserServer: Prepare collectorL: Close Default" ); - delete iCurrentDatabase; - iCurrentDatabase = NULL; - - LOGGER_WRITE( "CntParserServer: Prepare collectorL: OpenSelected" ); - iCurrentDatabase=CContactDatabase::OpenL( dbFile ); //open the selected one - } - - LOGGER_WRITE( "CntParserServer: Prepare collectorL: Is everything ok?" ); - if( !iCurrentDatabase ) - { - User::Leave( KErrNotFound ); - } - - LOGGER_WRITE( "CntParserServer: Prepare collectorL: Create Collector" ); - iCollector = CCntParserCollector::NewL( this,iCurrentDatabase ); - - iRequests = 0; - } -//------------------------------------------------------------ -// CCntParserServer::CreateIrMCL2PhoneBookL() -//------------------------------------------------------------ -TInt CCntParserServer::CreateIrMCL2PhoneBookL(const TDesC& path, TInt aMaxNumberOfContacts,TBool aForced) - { - LOGGER_WRITE( "CntParserServer: CreateIrMCL2PhoneBookL" ); - - TInt err( KErrNone ); - - iRequests++; - if( iRequests == 1 ) - { - LOGGER_WRITE( "CntParserServer: CreateIrMCL2PhoneBookL: Ready to call collector" ); - - err = iCollector->CreateIrMCL2FileL( path,aMaxNumberOfContacts,aForced ); - if( err==KPBNotUpdated ) - { - iRequests = 0; //If the file exists (no parsing), then more requests can be made - } - } - else - { - return KErrNotReady; - } - return err; - } -//------------------------------------------------------------ -// CCntParserServer::CompletePhoneBookRequests() -//------------------------------------------------------------ -void CCntParserServer::CompletePhoneBookRequests(TInt aErr) //Goes through all the sessions and completes the request - { - LOGGER_WRITE( "CntParserServer: Complete phonebook request" ); - iSessionIter.SetToFirst(); - while( iSessionIter!=NULL ) //Go through all sessions - { - ( (CCntParserServerSession*) (iSessionIter++) )->CompletePhoneBookRequest( aErr ); - } - iRequests = 0; //Collector is ready to start again.. - } -//------------------------------------------------------------ -// CCntParserServer::CancelPhoneBookRequest() -//------------------------------------------------------------ -void CCntParserServer::CancelPhoneBookRequest() - { - if( iRequests == 1 ) - { - iCollector->Cancel(); - } - iRequests--; - } -//------------------------------------------------------------ -// CCntParserServer::CancelAllPhoneBookRequests() -//------------------------------------------------------------ -void CCntParserServer::CancelAllPhoneBookRequests() - { - iCollector->Cancel(); - iRequests = 0; - } -//------------------------------------------------------------ -// CCntParserServer::Disconnect() -//------------------------------------------------------------ -void CCntParserServer::Disconnect() - { - LOGGER_WRITE( "CntParserServer: Disconnect" ); - } -//------------------------------------------------------------ -// CCntParserServer::Stop() -//------------------------------------------------------------ -void CCntParserServer::Stop() - { - LOGGER_ENTERFN( "CntParserServer::Stop()" ); - if( iCollector ) - { - iCollector->Cancel(); - } - delete iCollector; - iCollector = NULL; - delete iCurrentDatabase; - iCurrentDatabase = NULL; - CActiveScheduler::Stop(); - LOGGER_LEAVEFN( "CntParserServer::Stop()" ); - } -//------------------------------------------------------------ -// CCntParserServer::SetRequests() -//------------------------------------------------------------ -void CCntParserServer::SetRequests(TInt aRequests) - { - iRequests=aRequests; - } - - - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/cntparser/src/cntparserserversession.cpp --- a/connectivitymodules/SeCon/cntparser/src/cntparserserversession.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,219 +0,0 @@ -/* -* Copyright (c) 2002-2008 Nokia Corporation and/or 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: CCntParserServerSession implementation. -* -*/ - - -#include "cntparserserversession.h" -#include -#include "cntparsercollector.h" -#include "cntparserinfolog.h" -#include "irmcconsts.h" - -#include "debug.h" - -//------------------------------------------------------------ -// CCntParserServerSession::CCntParserServerSession() -//------------------------------------------------------------ -CCntParserServerSession::CCntParserServerSession() - { - } -//------------------------------------------------------------ -// CCntParserServerSession::NewL(CCntParserServer* aServer) -//------------------------------------------------------------ -CCntParserServerSession* CCntParserServerSession::NewL( CCntParserServer* aServer ) - { - LOGGER_ENTERFN( "CntParserServerSession::NewL()" ); - - CCntParserServerSession* self = new( ELeave ) CCntParserServerSession(); - CleanupStack::PushL( self ); - self->ConstructL( aServer ); - CleanupStack::Pop( self ); - LOGGER_LEAVEFN( "CntParserServerSession::NewL()" ); - return self; - } -//------------------------------------------------------------ -// CCntParserServerSession::ConstructL( CCntParserServer* aServer ) -//------------------------------------------------------------ -void CCntParserServerSession::ConstructL( CCntParserServer* aServer ) - { - iContactsParserSrv = aServer; - iContactsParserSrv->IncreaseSessionCountL(); - } -//------------------------------------------------------------ -// CCntParserServerSession::~CCntParserServerSession() -//------------------------------------------------------------ -CCntParserServerSession::~CCntParserServerSession() - { - LOGGER_ENTERFN( "CntParserServerSession::~CCntParserServerSession()" ); - if ( iContactsParserSrv ) - { - iContactsParserSrv->DecreaseSessionCount(); - } - LOGGER_LEAVEFN( "CntParserServerSession::~CCntParserServerSession()" ); - } -//------------------------------------------------------------ -// CCntParserServerSession::ServiceL( const RMessage2& aMessage ) -//------------------------------------------------------------ -void CCntParserServerSession::ServiceL( const RMessage2& aMessage ) - { - LOGGER_WRITE( "CntParserServerSession: ServiceL" ); - - TInt err( KErrNone ); - TInt ret( KErrNone ); - - TRAP( err, ret = DispatchMessageL( aMessage ) ); - - if ( err != KErrNone ) - { - LOGGER_WRITE_1( "CntParserServerSession: ServiceL: Error trapped, complete with ERR code %d", err ); - - iPhoneBookRequest = EFalse; //If requested, then clear request flag - iContactsParserSrv->SetRequests( 0 ); //Reset requests count in server to allow new requests to start.. - aMessage.Complete( err ); //If trap error, complete with it - return; - } - - if ( ret == KErrNone ) - { - LOGGER_WRITE( "CntParserServerSession: ServiceL: No complete" ); - return; - } - - if ( ret == KPerformComplete ) - { - LOGGER_WRITE( "CntParserServerSession: ServiceL: Normal complete" ); - - aMessage.Complete( KErrNone ); - return; - } - - if ( ret == KPBNotUpdated ) - { - LOGGER_WRITE( "CntParserServerSession: ServiceL: Complete (PB not updated)" ); - - iPhoneBookRequest = EFalse; - aMessage.Complete( KPBNotUpdated ); - return; - } - LOGGER_WRITE( "CntParserServerSession: ServiceL: Error, should never come here" ); - aMessage.Complete( KErrGeneral ); - } -//------------------------------------------------------------ -// CCntParserServerSession::CompletePhoneBookRequest( TInt aErr ) -//------------------------------------------------------------ -void CCntParserServerSession::CompletePhoneBookRequest( TInt aErr ) - { - LOGGER_WRITE( "CntParserServerSession: CompletePhoneBookRequest" ); - - if ( iPhoneBookRequest ) //If this session has requested phonebook, then the completion should be done here, as it was not done in ServiceL - { - LOGGER_WRITE( "CntParserServerSession: CompletePhoneBookRequest: collector or cancel" ); - iPhoneBookRequest = EFalse; - iPhoneBookRequestMessage.Complete( aErr ); - } - else - { - LOGGER_WRITE( "CntParserServerSession: CompletePhoneBookRequest: No complete for this session" ); - } - } -//------------------------------------------------------------ -// CCntParserServerSession::DispatchMessageL( const RMessage2 &aMessage ) -//------------------------------------------------------------ -TInt CCntParserServerSession::DispatchMessageL( const RMessage2 &aMessage ) - { - LOGGER_WRITE( "CntParserServerSession: DispatchMessageL" ); - - TInt res( KPerformComplete ); - - switch( aMessage.Function() ) - { - case ECntParserServerCreateIrMCL2: //Create pb.vcf file - { - res = ETrue; - - if ( iPhoneBookRequest == EFalse ) - { - iPhoneBookRequestMessage = aMessage; - iPhoneBookRequest = ETrue; - - TInt sid=aMessage.SecureId(); - TInt MaxNumOfContacts = aMessage.Int0(); - TBool Forced = aMessage.Int1(); - TBuf<8> sidLit; - sidLit.AppendNumFixedWidth( sid, EHex, 8); - TBuf<255> path; - path.Insert( 0, KPhoneBookFilename ); - - res = iContactsParserSrv->CreateIrMCL2PhoneBookL( path, (TInt) MaxNumOfContacts, Forced ); - } - break; - } - case ECntParserServerCntParsed: //How many contacts already parsed - { - TPckgBuf p((TInt) iContactsParserSrv->ContactsParsed()); - aMessage.WriteL( 0, p, 0 ); - break; - } - case ECntParserServerTotalNumOfContacts: //How many contacts total? - { - TPckgBuf p((TInt) iContactsParserSrv->TotalNumOfContacts()); - aMessage.WriteL( 0, p, 0 ); - break; - } - case ECntParserServerDisconnect: //Disconnect session from server - { - iContactsParserSrv->Disconnect(); - break; - } - case ECntParserServerCancel: //Cancel phone book request - { - if (iPhoneBookRequest) - { - iContactsParserSrv->CancelPhoneBookRequest(); - CompletePhoneBookRequest( KErrCancel ); - } - break; - } - case ECntParserServerCntSaved: //How many contacts total? - { - TPckgBuf p((TInt) iContactsParserSrv->ContactsSaved()); - aMessage.WriteL( 0, p, 0 ); - break; - } - case ECntParserServerCancelAll: //Cancel all requests, not just current? - { - iContactsParserSrv->CancelAllPhoneBookRequests(); - break; - } - // requests we don't understand - // so panic the client here, this function also completes the message - default: - { - PanicClient( EBadRequest ); - break; - } - } - return res; - } -//------------------------------------------------------------ -// CCntParserServerSession::PanicClient(TInt aPanic) const -//------------------------------------------------------------ -void CCntParserServerSession::PanicClient(TInt aPanic) const - { - User::Panic( KTxtServer,aPanic ); - } - -// end of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/common/conmltask/inc/sconconmltask.h --- a/connectivitymodules/SeCon/common/conmltask/inc/sconconmltask.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,598 +0,0 @@ -/* -* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Header file for ConML tasks -* -*/ - - -#ifndef _SCONCONMLTASK_H_ -#define _SCONCONMLTASK_H_ - -#include -#include - -const TInt KSConTaskPartiallyCompleted( 206 ); -const TInt KMaxPackageNameLength = 128; - -enum TSConMethodName - { - ECancel = 0, - EGetDataOwnerStatus, - EGetDataSize, - EGetStatus, - EInstall, - EListDataOwners, - EListInstalledApps, - EListPublicFiles, - ERequestData, - ESetBURMode, - ESetInstParams, - ESupplyData, - EUninstall, - EUpdateDeviceInfo, - EReboot, - EGetMetadata - }; - -enum TSConInstallMode - { - ESilentInstall = 0, - EUnsilentInstall, - EUnknown - }; - -enum TSConUserPerm - { - EPermReadOnly = 0, - EPermNormal - }; - -enum TSConDOType - { - EActiveDataOwner = 1, - EPassiveDataOwner, - EHybridDataOwner - }; - -enum TSConHasFiles - { - ENoFiles = 0, - EPublicFiles, - ESystemFiles, - EPublicSystemFiles - }; - -enum TSConAppType - { - ESisApplication = 0, - ESisAugmentation, - EJavaApplication, - EWidgetApplication - }; - -enum TSConBurMode - { - ESConBurNormal = 1, // 1 BUR mode - normal - ESConBurBackupFull, // 2 BUR mode � backup full - ESConBurBackupPartial, // 3 BUR mode � backup partial - ESConBurRestoreFull, // 4 BUR mode � restore full - ESConBurRestorePartial // 5 BUR mode � restore partial - }; - -enum TSConIncType - { - ESConNoBackup = 0, // 0 No backup - ESConBackupBase = 100, // 100 Backup � base - ESConBackupIncrement = 200 // 200 Backup - increment - }; - -enum TSConTransferDataType - { - ESConRegistrationData = 1, // 1 RegistrationData - ESConPassiveSnapshotData, // 2 Passive snapshot data - ESConPassiveBaseData, // 3 Passive base data - ESConPassiveIncrementalData,// 4 Passive incremental data - ESConActiveSnapshotData, // 5 Active snapshot data - ESConActiveBaseData, // 6 Active base data - ESConActiveIncrementalData, // 7 Active incremental data - ESConSystemData, // 8 System data - ESConSystemSnapshotData // 9 System snapshot data - }; - -enum TSConDataOwnerStatus - { - ESConUnset = 0, // 0 Unset - ESConNotFound, // 1 Not found - ESConReady, // 2 Ready - ESConNotReady, // 3 Not ready - ESConFailed, // 4 Failed - ESConNotConnected, // 5 Not connected - ESConNotImplemented // 6 Not implemented - }; - - - - -//============================================================ -// class CSConReboot declaration -//============================================================ -NONSHARABLE_CLASS( CSConReboot ) : public CBase - { - public: - CSConReboot(); - ~CSConReboot(); - CSConReboot* CopyL(); - - //used only with reply - TBool iComplete; //task complete - TInt iProgress; //task progress - }; - -//============================================================ -// class CSConDataOwner declaration -//============================================================ -NONSHARABLE_CLASS( CSConDataOwner ) : public CBase - { - public: - CSConDataOwner(); - ~CSConDataOwner(); - CSConDataOwner* CopyL(); - - public: - //dataowner type - TSConDOType iType; - //unique identifier - TUid iUid; - //drive list - TDriveList iDriveList; - //package name - TBuf iPackageName; - //requires reboot - TBool iReqReboot; - //has files - TSConHasFiles iHasFiles; - //supports incremental backup - TBool iSupportsInc; - //supports selective backup - TBool iSupportsSel; - //delay to prepare data - TBool iDelayToPrep; - //size - TUint iSize; - //data owner status - TSConDataOwnerStatus iDataOwnStatus; - //transfer data type - TSConTransferDataType iTransDataType; - //Java hash - HBufC* iJavaHash; - }; - -//============================================================ -// class CSConUpdateDeviceInfo declaration -//============================================================ -NONSHARABLE_CLASS( CSConUpdateDeviceInfo ) : public CBase - { - public: - CSConUpdateDeviceInfo(); - ~CSConUpdateDeviceInfo(); - CSConUpdateDeviceInfo* CopyL(); - - TBuf8<3> iVersion; //version number - TBool iInstallSupp; - TBool iUninstallSupp; - TBool iInstParamsSupp; - TBool iInstAppsSupp; - TBool iDataOwnersSupp; - TBool iSetBURModeSupp; - TBool iGetSizeSupp; - TBool iReqDataSupp; - TBool iSupplyDataSupp; - TBool iRebootSupp; - TInt iMaxObjectSize; //kBytes - - //used only with reply - TBool iComplete; //task complete - TInt iProgress; //task progress - }; -//============================================================ -// class CSConInstApp declaration -//============================================================ -NONSHARABLE_CLASS( CSConInstApp ) : public CBase - { - public: - CSConInstApp() {}; - ~CSConInstApp(); - CSConInstApp* CopyL(); - - TFileName iName; - TFileName iParentName; - TFileName iVendor; - TFileName iVersion; - TInt64 iSize; - TSConAppType iType; - TUid iUid; - HBufC* iWidgetBundleId; // Widget bundle identifier like "com.nokia.widget.HelloWorld" - }; - -//============================================================ -// class CSConListInstApps declaration -//============================================================ -NONSHARABLE_CLASS( CSConListInstApps ) : public CBase - { - public: - CSConListInstApps(); - ~CSConListInstApps(); - CSConListInstApps* CopyL(); - - TBool iAllApps; //list all apps - TDriveList iDriveList; //drive list - - //used only with reply - TBool iComplete; //task complete - TInt iProgress; //task progress - - RPointerArray iApps; //installed apps - }; - -//============================================================ -// class CSConGetStatus declaration -//============================================================ -NONSHARABLE_CLASS( CSConGetStatus ) : public CBase - { - public: - TBool iAll; //list all statuses - TInt iTaskId; //task id - }; - -//============================================================ -// class CSConFile declaration -//============================================================ -NONSHARABLE_CLASS( CSConFile ) : public CBase - { - public: - CSConFile(); - ~CSConFile(); - CSConFile* CopyL(); - - TFileName iPath; //file path + name - TBuf iModified; //modified date - TUint iSize; //file size - TSConUserPerm iUserPerm; //user permission - }; - -//============================================================ -// class CSConInstall declaration -//============================================================ -NONSHARABLE_CLASS( CSConInstall ) : public CBase - { - public: - CSConInstall(); - ~CSConInstall(); - - CSConInstall* CopyL(); - - TFileName iPath; //path to file - TSConInstallMode iMode; //install mode - - //used only with reply - TBool iComplete; //task complete - TInt iProgress; //task progress - }; - -//============================================================ -// class CSConUninstall declaration -//============================================================ -NONSHARABLE_CLASS( CSConUninstall ) : public CBase - { - public: - CSConUninstall(); - ~CSConUninstall(); - - CSConUninstall* CopyL(); - - TFileName iName; // application name - TFileName iVendor; // application vendor - TUid iUid; // application uid - TSConAppType iType; // application type - TSConInstallMode iMode; // install mode - - //used only with reply - TBool iComplete; //task complete - TInt iProgress; //task progress - }; - -//============================================================ -// class CSConListDataOwners declaration -//============================================================ -NONSHARABLE_CLASS( CSConListDataOwners ) : public CBase - { - public: - CSConListDataOwners(); - ~CSConListDataOwners(); - CSConListDataOwners* CopyL(); - void DeleteDataOwners(); - - //used only with reply - TBool iComplete; //task complete - TInt iProgress; //task progress - - RPointerArray iDataOwners; //data owners - }; - -//============================================================ -// class CSConSetBURMode declaration -//============================================================ -NONSHARABLE_CLASS( CSConSetBURMode ) : public CBase - { - public: - TDriveList iDriveList; //drive list - TSConBurMode iPartialType; //partial backup type - TSConIncType iIncType; //incremental backup type - - CSConSetBURMode(); - ~CSConSetBURMode(); - CSConSetBURMode* CopyL(); - - //used only with reply - TBool iComplete; //task complete - TInt iProgress; //task progress - }; - -//============================================================ -// class CSConGetDataSize declaration -//============================================================ -NONSHARABLE_CLASS( CSConGetDataSize ) : public CBase - { - public: - CSConGetDataSize(); - ~CSConGetDataSize(); - - CSConGetDataSize* CopyL(); - void DeleteDataOwners(); - - public: - RPointerArray iDataOwners; //data owners - - //used only with reply - TBool iComplete; //task complete - TInt iProgress; //task progress - }; - -//============================================================ -// class CSConListPublicFiles declaration -//============================================================ -NONSHARABLE_CLASS( CSConListPublicFiles ) : public CBase - { - public: - CSConListPublicFiles(); - ~CSConListPublicFiles(); - CSConListPublicFiles* CopyL(); - - public: - RPointerArray iFiles; //data owners - RPointerArray iDataOwners; //data owners - - //used only with reply - TBool iComplete; //task complete - TInt iProgress; //task progress - }; - -//============================================================ -// class CSConRequestData declaration -//============================================================ -NONSHARABLE_CLASS( CSConRequestData ) : public CBase - { - public: - CSConRequestData(); - ~CSConRequestData(); - CSConRequestData* CopyL(); - void DeleteDataAndDataOwner(); - - CSConDataOwner* iDataOwner; //data owner - HBufC8* iBackupData; //backup data - TBool iMoreData; //more data - - //used only with reply - TBool iComplete; //task complete - TInt iProgress; //task progress - }; - -//============================================================ -// class CSConGetDataOwnerStatus declaration -//============================================================ -NONSHARABLE_CLASS( CSConGetDataOwnerStatus ) : public CBase - { - public: - CSConGetDataOwnerStatus(); - ~CSConGetDataOwnerStatus(); - CSConGetDataOwnerStatus* CopyL(); - void DeleteDataOwners(); - - public: - RPointerArray iDataOwners; //data owners - - //used only with reply - TBool iComplete; //task complete - TInt iProgress; //task progress - }; - -//============================================================ -// class CSConSupplyData declaration -//============================================================ -NONSHARABLE_CLASS( CSConSupplyData ) : public CBase - { - public: - CSConSupplyData(); - ~CSConSupplyData(); - CSConSupplyData* CopyL(); - public: - CSConDataOwner* iDataOwner; - HBufC8* iRestoreData; //restore data - TBool iMoreData; //more data - //used only with reply - TBool iComplete; //task complete - TInt iProgress; //task progress - }; - -//============================================================ -// class CSConGetMetadata declaration -//============================================================ -NONSHARABLE_CLASS( CSConGetMetadata ) : public CBase - { - public: - CSConGetMetadata(); - ~CSConGetMetadata(); - CSConGetMetadata* CopyL(); - public: - TFileName iFilename; - HBufC8* iData; //metadata - TBool iMoreData; //more data - //used only with reply - TBool iComplete; //task complete - TInt iProgress; //task progress - }; - -//============================================================ -// class CSConTask declaration -//============================================================ -NONSHARABLE_CLASS( CSConTask ): public CBase - { - public: - /** - * Two-phase constructor - * @return CSConTask instance - */ - static CSConTask* NewL( TSConMethodName aMethod ); - static CSConTask* NewLC( TSConMethodName aMethod ); - - CSConTask(); - ~CSConTask(); - TSConMethodName GetServiceId() const; - CSConTask* CopyL() const; - TBool GetComplete(); - void SetCompleteValue( TBool aValue ); - TBool GetCompleteValue(); - void SetProgressValue( TInt aValue ); - private: - - void ConstructL( TSConMethodName aMethod ); - public: - //Task - //service id - TSConMethodName iMethod; - //task number - TInt iTaskId; - - //DeviceInfo -params - CSConUpdateDeviceInfo* iDevInfoParams; - //ListInstalledTasks -params - CSConListInstApps* iListAppsParams; - //GetStatus -params - CSConGetStatus* iGetStatusParams; - //Install -params - CSConInstall* iInstallParams; - //Uninstall -params - CSConUninstall* iUninstallParams; - //SetBURMode -params - CSConSetBURMode* iBURModeParams; - //GetDataSize -params - CSConGetDataSize* iGetDataSizeParams; - //RequestData -params - CSConRequestData* iRequestDataParams; - //GetDataOwnerStatus -params - CSConGetDataOwnerStatus* iGetDataOwnerParams; - //SupplyData -params - CSConSupplyData* iSupplyDataParams; - //ListPublicFiles -params - CSConListPublicFiles* iPubFilesParams; - //ListDataOwners -params - CSConListDataOwners* iListDataOwnersParams; - //Reboot -params - CSConReboot* iRebootParams; - //GetMetadata -params - CSConGetMetadata* iGetMetadataParams; - - TInt iCancelTaskId; - TBool iCancelTaskAll; - }; - -//============================================================ -// class CSConTaskReply declaration -//============================================================ -NONSHARABLE_CLASS( CSConTaskReply ) : public CBase - { - public: - CSConTaskReply(); - CSConTaskReply( TSConMethodName aMethod ); - ~CSConTaskReply(); - void InitializeL( const CSConTask& aTask ); - void InitializeL( TSConMethodName aMethod, - TInt aProgress, TBool aComplete ); - CSConTaskReply* CopyAndFreeL(); - void CleanTaskData(); - - public: - //task id number - TInt iTaskId; - //method type - TSConMethodName iMethod; - - //DeviceInfo -params - CSConUpdateDeviceInfo* iDevInfoParams; - //ListInstalledTasks -params - CSConListInstApps* iListAppsParams; - //GetStatus -params - CSConGetStatus* iGetStatusParams; - //Install -params - CSConInstall* iInstallParams; - //Uninstall -params - CSConUninstall* iUninstallParams; - //SetBURMode -params - CSConSetBURMode* iBURModeParams; - //GetDataSize -params - CSConGetDataSize* iGetDataSizeParams; - //RequestData -params - CSConRequestData* iRequestDataParams; - //GetDataOwnerStatus -params - CSConGetDataOwnerStatus* iGetDataOwnerParams; - //SupplyData -params - CSConSupplyData* iSupplyDataParams; - //ListPublicFiles -params - CSConListPublicFiles* iPubFilesParams; - //ListDataOwners -params - CSConListDataOwners* iListDataOwnersParams; - //Reboot -params - CSConReboot* iRebootParams; - //GetMetadata -params - CSConGetMetadata* iGetMetadataParams; - }; - -//============================================================ -// class CSConStatusReply declaration -//============================================================ -NONSHARABLE_CLASS( CSConStatusReply ): public CBase - { - public: - CSConStatusReply(); - ~CSConStatusReply(); - - public: - TBool iNoTasks; //no active tasks - RPointerArray iTasks; - }; - -#endif - -// End of file - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/common/conmltask/src/sconconmltask.cpp --- a/connectivitymodules/SeCon/common/conmltask/src/sconconmltask.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1696 +0,0 @@ -/* -* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* 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: ConML Task implementations -* -*/ - - -// INCLUDE FILES - -#include "sconconmltask.h" - -// ----------------------------------------------------------------------------- -// CSConReboot::CSConReboot() -// -// ----------------------------------------------------------------------------- -// -CSConReboot::CSConReboot() : iComplete( EFalse ), iProgress( 0 ) - { - } - -// ----------------------------------------------------------------------------- -// CSConReboot::~CSConReboot() -// -// ----------------------------------------------------------------------------- -// -CSConReboot::~CSConReboot() - { - } - -// ----------------------------------------------------------------------------- -// CSConReboot::Copy() -// -// ----------------------------------------------------------------------------- -// -CSConReboot* CSConReboot::CopyL() - { - CSConReboot* copy = new (ELeave) CSConReboot(); - copy->iComplete = iComplete; - copy->iProgress = iProgress; - return copy; - } - -// ----------------------------------------------------------------------------- -// CSConDataOwner::CSConDataOwner() -// -// ----------------------------------------------------------------------------- -// -CSConDataOwner::CSConDataOwner() - { - iHasFiles = ENoFiles; - iJavaHash = NULL; - iUid.iUid = 0; - - //Initialize iDriveList with zeros - iDriveList.Fill( '\x0' ); - } - -// ----------------------------------------------------------------------------- -// CSConDataOwner::~CSConDataOwner() -// -// ----------------------------------------------------------------------------- -// -CSConDataOwner::~CSConDataOwner() - { - delete iJavaHash; - iJavaHash = NULL; - } - -// ----------------------------------------------------------------------------- -// CSConDataOwner::Copy() -// -// ----------------------------------------------------------------------------- -// -CSConDataOwner* CSConDataOwner::CopyL() - { - CSConDataOwner* copy = new (ELeave) CSConDataOwner(); - copy->iType = iType; - copy->iUid = iUid; - copy->iDriveList.Copy( iDriveList ); - copy->iPackageName = iPackageName; - copy->iReqReboot = iReqReboot; - copy->iHasFiles = iHasFiles; - copy->iSupportsInc = iSupportsInc; - copy->iSupportsSel = iSupportsSel; - copy->iDelayToPrep = iDelayToPrep; - copy->iSize = iSize; - copy->iDataOwnStatus = iDataOwnStatus; - copy->iTransDataType = iTransDataType; - - if ( iJavaHash ) - { - if ( copy->iJavaHash ) - { - delete copy->iJavaHash; - copy->iJavaHash = NULL; - } - copy->iJavaHash = iJavaHash->Alloc(); - } - - return copy; - } - -// ----------------------------------------------------------------------------- -// CSConUpdateDeviceInfo::CSConUpdateDeviceInfo() -// -// ----------------------------------------------------------------------------- -// -CSConUpdateDeviceInfo::CSConUpdateDeviceInfo() : - iInstallSupp(EFalse), iUninstallSupp(EFalse), - iInstParamsSupp(EFalse), iInstAppsSupp(EFalse), - iDataOwnersSupp(EFalse), iSetBURModeSupp(EFalse), - iGetSizeSupp(EFalse), iReqDataSupp(EFalse), - iSupplyDataSupp(EFalse), iRebootSupp(EFalse), - iComplete( EFalse ), iProgress( 0 ) - { - } - -// ----------------------------------------------------------------------------- -// CSConUpdateDeviceInfo::~CSConUpdateDeviceInfo() -// -// ----------------------------------------------------------------------------- -// -CSConUpdateDeviceInfo::~CSConUpdateDeviceInfo() - { - } - -// ----------------------------------------------------------------------------- -// CSConUpdateDeviceInfo::Copy() -// -// ----------------------------------------------------------------------------- -// -CSConUpdateDeviceInfo* CSConUpdateDeviceInfo::CopyL() - { - CSConUpdateDeviceInfo* copy = new (ELeave) CSConUpdateDeviceInfo(); - copy->iVersion.Copy( iVersion ); - copy->iInstallSupp = iInstallSupp; - copy->iUninstallSupp = iUninstallSupp; - copy->iInstParamsSupp = iInstParamsSupp; - copy->iInstAppsSupp = iInstAppsSupp; - copy->iDataOwnersSupp = iDataOwnersSupp; - copy->iSetBURModeSupp = iSetBURModeSupp; - copy->iGetSizeSupp = iGetSizeSupp; - copy->iReqDataSupp = iReqDataSupp; - copy->iSupplyDataSupp = iSupplyDataSupp; - copy->iMaxObjectSize = iMaxObjectSize; - copy->iRebootSupp = iRebootSupp; - copy->iComplete = iComplete; - copy->iProgress = iProgress; - - return copy; - } - -CSConInstApp::~CSConInstApp() - { - delete iWidgetBundleId; - } -// ----------------------------------------------------------------------------- -// CSConInstApp::Copy() -// -// ----------------------------------------------------------------------------- -// -CSConInstApp* CSConInstApp::CopyL() - { - CSConInstApp* copy = new (ELeave) CSConInstApp(); - - copy->iName.Copy( iName ); - copy->iParentName.Copy( iParentName ); - copy->iVendor.Copy( iVendor ); - copy->iVersion.Copy( iVersion ); - copy->iSize = iSize; - copy->iType = iType; - copy->iUid = iUid; - if ( iWidgetBundleId ) - { - copy->iWidgetBundleId = iWidgetBundleId->AllocL(); - } - else - { - copy->iWidgetBundleId = NULL; - } - - return copy; - } - -// ----------------------------------------------------------------------------- -// CSConListInstApps::CSConListInstApps() -// -// ----------------------------------------------------------------------------- -// -CSConListInstApps::CSConListInstApps() : iComplete( EFalse ), iProgress( 0 ) - { - //Initialize iDriveList with zeros - iDriveList.Fill( '\x0' ); - } - -// ----------------------------------------------------------------------------- -// CSConListInstApps::~CSConListInstApps() -// -// ----------------------------------------------------------------------------- -// -CSConListInstApps::~CSConListInstApps() - { - iApps.ResetAndDestroy(); - iApps.Close(); - } - -// ----------------------------------------------------------------------------- -// CSConListInstApps::CopyL() -// -// ----------------------------------------------------------------------------- -// -CSConListInstApps* CSConListInstApps::CopyL() - { - CSConListInstApps* copy = new (ELeave) CSConListInstApps(); - copy->iAllApps = iAllApps; - copy->iDriveList = iDriveList; - - copy->iComplete = iComplete; - copy->iProgress = iProgress; - - for( TInt i = 0; i < iApps.Count(); i++ ) - { - copy->iApps.Append( iApps[i]->CopyL() ); - } - - return copy; - } - -// ----------------------------------------------------------------------------- -// CSConFile::CSConFile -// -// ----------------------------------------------------------------------------- -// -CSConFile::CSConFile() - { - } - -// ----------------------------------------------------------------------------- -// CSConFile::~CSConFile -// -// ----------------------------------------------------------------------------- -// -CSConFile::~CSConFile() - { - - } - -// ----------------------------------------------------------------------------- -// CSConFile::Copy() -// -// ----------------------------------------------------------------------------- -// -CSConFile* CSConFile::CopyL() - { - CSConFile* copy = new (ELeave) CSConFile(); - - copy->iPath.Copy( iPath ); - copy->iModified.Copy( iModified ); - copy->iSize = iSize; - copy->iUserPerm = iUserPerm; - - return copy; - } - -// ----------------------------------------------------------------------------- -// CSConInstall::CSConInstall() -// -// ----------------------------------------------------------------------------- -// -CSConInstall::CSConInstall() : iMode( EUnknown ), iComplete( EFalse ), iProgress( 0 ) - { - } - -// ----------------------------------------------------------------------------- -// CSConInstall::~CSConInstall() -// -// ----------------------------------------------------------------------------- -// -CSConInstall::~CSConInstall() - { - } - -// ----------------------------------------------------------------------------- -// CSConInstall::CopyL() -// -// ----------------------------------------------------------------------------- -// -CSConInstall* CSConInstall::CopyL() - { - CSConInstall* copy = new (ELeave) CSConInstall(); - copy->iPath = iPath; - copy->iMode = iMode; - - copy->iComplete = iComplete; - copy->iProgress = iProgress; - - return copy; - } - -// ----------------------------------------------------------------------------- -// CSConUninstall::CSConUninstall() -// -// ----------------------------------------------------------------------------- -// -CSConUninstall::CSConUninstall() : iMode( EUnknown ), iComplete( EFalse ), iProgress( 0 ) - { - } - -// ----------------------------------------------------------------------------- -// CSConUninstall::~CSConUninstall() -// -// ----------------------------------------------------------------------------- -// -CSConUninstall::~CSConUninstall() - { - } - -// ----------------------------------------------------------------------------- -// CSConUninstall::Copy() -// -// ----------------------------------------------------------------------------- -// -CSConUninstall* CSConUninstall::CopyL() - { - CSConUninstall* copy = new (ELeave) CSConUninstall(); - copy->iName = iName; - copy->iVendor = iVendor; - copy->iUid = iUid; - copy->iMode = iMode; - - copy->iComplete = iComplete; - copy->iProgress = iProgress; - - return copy; - } - -// ----------------------------------------------------------------------------- -// CSConListDataOwners::CSConListDataOwners() -// -// ----------------------------------------------------------------------------- -// -CSConListDataOwners::CSConListDataOwners() : iComplete( EFalse ), iProgress( 0 ) - { - } - -// ----------------------------------------------------------------------------- -// CSConListDataOwners::~CSConListDataOwners() -// -// ----------------------------------------------------------------------------- -// -CSConListDataOwners::~CSConListDataOwners() - { - iDataOwners.ResetAndDestroy(); - iDataOwners.Close(); - } - -// ----------------------------------------------------------------------------- -// CSConListDataOwners::CopyL() -// -// ----------------------------------------------------------------------------- -// -CSConListDataOwners* CSConListDataOwners::CopyL() - { - CSConListDataOwners* copy = new (ELeave) CSConListDataOwners(); - CleanupStack::PushL( copy ); - for( TInt i = 0; i < iDataOwners.Count(); i++ ) - { - copy->iDataOwners.Append( iDataOwners[i]->CopyL() ); - } - CleanupStack::Pop( copy ); - - copy->iComplete = iComplete; - copy->iProgress = iProgress; - - return copy; - } - -// ----------------------------------------------------------------------------- -// CSConListDataOwners::DeleteDataOwners() -// -// ----------------------------------------------------------------------------- -// -void CSConListDataOwners::DeleteDataOwners() - { - iDataOwners.ResetAndDestroy(); - iDataOwners.Close(); - } - -// ----------------------------------------------------------------------------- -// CCSConSetBURMode::CSConSetBURMode() -// -// ----------------------------------------------------------------------------- -// -CSConSetBURMode::CSConSetBURMode() : iComplete( EFalse ), iProgress( 0 ) - { - //Initialize iDriveList with zeros - iDriveList.Fill( '\x0' ); - } - -// ----------------------------------------------------------------------------- -// CSConSetBURMode::~CSConSetBURMode() -// -// ----------------------------------------------------------------------------- -// -CSConSetBURMode::~CSConSetBURMode() - { - } - -// ----------------------------------------------------------------------------- -// CSConSetBURMode::Copy() -// -// ----------------------------------------------------------------------------- -// -CSConSetBURMode* CSConSetBURMode::CopyL() - { - CSConSetBURMode* copy = new (ELeave) CSConSetBURMode(); - copy->iDriveList.Copy( iDriveList ); - copy->iPartialType = iPartialType; - copy->iIncType = iIncType; - - copy->iComplete = iComplete; - copy->iProgress = iProgress; - - return copy; - } - -// ----------------------------------------------------------------------------- -// CSConGetDataSize::CSConGetDataSize() -// -// ----------------------------------------------------------------------------- -// -CSConGetDataSize::CSConGetDataSize() : iComplete( EFalse ), iProgress( 0 ) - { - } - -// ----------------------------------------------------------------------------- -// CSConGetDataSize::~CSConGetDataSize() -// -// ----------------------------------------------------------------------------- -// -CSConGetDataSize::~CSConGetDataSize() - { - iDataOwners.ResetAndDestroy(); - iDataOwners.Close(); - } - -// ----------------------------------------------------------------------------- -// CSConGetDataSize::Copy() -// -// ----------------------------------------------------------------------------- -// -CSConGetDataSize* CSConGetDataSize::CopyL() - { - CSConGetDataSize* copy = new (ELeave) CSConGetDataSize(); - CleanupStack::PushL( copy ); - for( TInt i = 0; i < iDataOwners.Count(); i++ ) - { - copy->iDataOwners.Append( iDataOwners[i]->CopyL() ); - } - CleanupStack::Pop( copy ); - copy->iComplete = iComplete; - copy->iProgress = iProgress; - - return copy; - } - -// ----------------------------------------------------------------------------- -// CSConGetDataSize::DeleteDataOwners() -// -// ----------------------------------------------------------------------------- -// -void CSConGetDataSize::DeleteDataOwners() - { - iDataOwners.ResetAndDestroy(); - iDataOwners.Close(); - } - -// ----------------------------------------------------------------------------- -// CSConListPublicFiles::CSConListPublicFiles() -// -// ----------------------------------------------------------------------------- -// -CSConListPublicFiles::CSConListPublicFiles() : iComplete( EFalse ), iProgress( 0 ) - { - } - -// ----------------------------------------------------------------------------- -// CSConListPublicFiles::~CSConListPublicFiles() -// -// ----------------------------------------------------------------------------- -// -CSConListPublicFiles::~CSConListPublicFiles() - { - iFiles.ResetAndDestroy(); - iFiles.Close(); - - iDataOwners.ResetAndDestroy(); - iDataOwners.Close(); - } - -// ----------------------------------------------------------------------------- -// CSConListPublicFiles::CopyL() -// -// ----------------------------------------------------------------------------- -// -CSConListPublicFiles* CSConListPublicFiles::CopyL() - { - CSConListPublicFiles* copy = new (ELeave) CSConListPublicFiles(); - CleanupStack::PushL( copy ); - for( TInt i = 0; i < iFiles.Count(); i++ ) - { - copy->iFiles.Append( iFiles[i]->CopyL() ); - } - - for( TInt j = 0; j < iDataOwners.Count(); j++ ) - { - copy->iDataOwners.Append( iDataOwners[j]->CopyL() ); - } - CleanupStack::Pop( copy ); - - copy->iComplete = iComplete; - copy->iProgress = iProgress; - - return copy; - } - -// ----------------------------------------------------------------------------- -// CSConRequestData::CSConRequestData() -// -// ----------------------------------------------------------------------------- -// -CSConRequestData::CSConRequestData() : iDataOwner( NULL ), iBackupData( NULL ), - iMoreData( EFalse ), iComplete( EFalse ), iProgress( 0 ) - { - iDataOwner = new CSConDataOwner(); - } - -// ----------------------------------------------------------------------------- -// CSConRequestData::~CSConRequestData() -// -// ----------------------------------------------------------------------------- -// -CSConRequestData::~CSConRequestData() - { - if ( iDataOwner ) - { - delete iDataOwner; - iDataOwner = NULL; - } - - if ( iBackupData ) - { - delete iBackupData; - iBackupData = NULL; - } - } - -// ----------------------------------------------------------------------------- -// CSConRequestData::Copy() -// -// ----------------------------------------------------------------------------- -// -CSConRequestData* CSConRequestData::CopyL() - { - CSConRequestData* copy = new (ELeave) CSConRequestData(); - - if ( iDataOwner ) - { - if ( copy->iDataOwner ) - { - delete copy->iDataOwner; - copy->iDataOwner = NULL; - } - copy->iDataOwner = iDataOwner->CopyL(); - } - - copy->iComplete = iComplete; - copy->iProgress = iProgress; - - if ( iBackupData ) - { - if ( copy->iBackupData ) - { - delete copy->iBackupData; - copy->iBackupData = NULL; - } - copy->iBackupData = iBackupData->Alloc(); - } - - copy->iMoreData = iMoreData; - - return copy; - } - -// ----------------------------------------------------------------------------- -// CSConRequestData::DeleteDataAndDataOwner() -// -// ----------------------------------------------------------------------------- -// -void CSConRequestData::DeleteDataAndDataOwner() - { - if ( iDataOwner ) - { - delete iDataOwner; - iDataOwner = NULL; - } - - if ( iBackupData ) - { - delete iBackupData; - iBackupData = NULL; - } - } - -// ----------------------------------------------------------------------------- -// CSConGetDataOwnerStatus::CSConGetDataOwnerStatus() -// -// ----------------------------------------------------------------------------- -// -CSConGetDataOwnerStatus::CSConGetDataOwnerStatus() : iComplete( EFalse ), iProgress( 0 ) - { - } - -// ----------------------------------------------------------------------------- -// CSConGetDataOwnerStatus::~CSConGetDataOwnerStatus() -// -// ----------------------------------------------------------------------------- -// -CSConGetDataOwnerStatus::~CSConGetDataOwnerStatus() - { - iDataOwners.ResetAndDestroy(); - iDataOwners.Close(); - } - -// ----------------------------------------------------------------------------- -// CSConGetDataOwnerStatus::Copy() -// -// ----------------------------------------------------------------------------- -// -CSConGetDataOwnerStatus* CSConGetDataOwnerStatus::CopyL() - { - CSConGetDataOwnerStatus* copy = new (ELeave) CSConGetDataOwnerStatus(); - CleanupStack::PushL( copy ); - for( TInt i = 0; i < iDataOwners.Count(); i++ ) - { - copy->iDataOwners.Append( iDataOwners[i]->CopyL() ); - } - CleanupStack::Pop( copy ); - - copy->iComplete = iComplete; - copy->iProgress = iProgress; - - return copy; - } - -// ----------------------------------------------------------------------------- -// CSConGetDataOwnerStatus::DeleteDataOwners() -// -// ----------------------------------------------------------------------------- -// -void CSConGetDataOwnerStatus::DeleteDataOwners() - { - iDataOwners.ResetAndDestroy(); - iDataOwners.Close(); - } - -// ----------------------------------------------------------------------------- -// CSConSupplyData::CSConSupplyData() -// -// ----------------------------------------------------------------------------- -// -CSConSupplyData::CSConSupplyData() : iDataOwner( NULL ), iRestoreData( NULL ), - iComplete( EFalse ), iProgress( 0 ) - { - iDataOwner = new CSConDataOwner(); - } - -// ----------------------------------------------------------------------------- -// CSConSupplyData::~CSConSupplyData() -// -// ----------------------------------------------------------------------------- -// -CSConSupplyData::~CSConSupplyData() - { - if ( iDataOwner ) - { - delete iDataOwner; - iDataOwner = NULL; - } - - if ( iRestoreData ) - { - delete iRestoreData; - iRestoreData = NULL; - } - } - -// ----------------------------------------------------------------------------- -// CSConSupplyData::Copy() -// -// ----------------------------------------------------------------------------- -// -CSConSupplyData* CSConSupplyData::CopyL() - { - CSConSupplyData* copy = new (ELeave) CSConSupplyData(); - CleanupStack::PushL( copy ); - - copy->iComplete = iComplete; - copy->iProgress = iProgress; - - if ( iDataOwner ) - { - if ( copy->iDataOwner ) - { - delete copy->iDataOwner; - copy->iDataOwner = NULL; - } - - copy->iDataOwner = iDataOwner->CopyL(); - } - CleanupStack::Pop( copy ); - - if ( iRestoreData ) - { - if ( copy->iRestoreData ) - { - delete copy->iRestoreData; - copy->iRestoreData = NULL; - } - - copy->iRestoreData = iRestoreData->Alloc(); - } - - copy->iMoreData = iMoreData; - - return copy; - } - -// ----------------------------------------------------------------------------- -// CSConGetMetadata::CSConGetMetadata() -// -// ----------------------------------------------------------------------------- -// -CSConGetMetadata::CSConGetMetadata() : iData( NULL ), - iMoreData( EFalse ), iComplete( EFalse ), iProgress( 0 ) - { - } - -// ----------------------------------------------------------------------------- -// CSConGetMetadata::~CSConGetMetadata() -// -// ----------------------------------------------------------------------------- -// -CSConGetMetadata::~CSConGetMetadata() - { - if ( iData ) - { - delete iData; - iData = NULL; - } - } - -// ----------------------------------------------------------------------------- -// CSConGetMetadata::Copy() -// -// ----------------------------------------------------------------------------- -// -CSConGetMetadata* CSConGetMetadata::CopyL() - { - CSConGetMetadata* copy = new (ELeave) CSConGetMetadata(); - - copy->iFilename = iFilename; - - if ( iData ) - { - if ( copy->iData ) - { - delete copy->iData; - copy->iData = NULL; - } - - copy->iData = iData->Alloc(); - } - - copy->iMoreData = iMoreData; - copy->iComplete = iComplete; - copy->iProgress = iProgress; - - return copy; - } - - -// ----------------------------------------------------------------------------- -// CSConTask::NewL( TSConMethodName aMethod ) -// -// ----------------------------------------------------------------------------- -// -CSConTask* CSConTask::NewL( TSConMethodName aMethod ) - { - CSConTask* self = NewLC( aMethod ); - CleanupStack::Pop( self ); - return self; - } - -// ----------------------------------------------------------------------------- -// CSConTask::NewLC( TSConMethodName aMethod ) -// -// ----------------------------------------------------------------------------- -// -CSConTask* CSConTask::NewLC( TSConMethodName aMethod ) - { - CSConTask* self = new (ELeave) CSConTask(); - CleanupStack::PushL( self ); - self->ConstructL( aMethod ); - return self; - } - -// ----------------------------------------------------------------------------- -// CSConTask::ConstructL( TSConMethodName aMethod ) -// Initializes member data -// ----------------------------------------------------------------------------- -// -void CSConTask::ConstructL( TSConMethodName aMethod ) - { - iMethod = aMethod; - - switch( aMethod ) - { - case ECancel : - break; - case EGetDataOwnerStatus : - iGetDataOwnerParams = new (ELeave) CSConGetDataOwnerStatus(); - break; - case EGetDataSize : - iGetDataSizeParams = new (ELeave) CSConGetDataSize(); - break; - case EGetStatus : - iGetStatusParams = new (ELeave) CSConGetStatus(); - break; - case EInstall : - iInstallParams = new (ELeave) CSConInstall(); - break; - case EListDataOwners : - iListDataOwnersParams = new (ELeave) CSConListDataOwners(); - break; - case EListInstalledApps : - iListAppsParams = new (ELeave) CSConListInstApps(); - break; - case EListPublicFiles : - iPubFilesParams = new (ELeave) CSConListPublicFiles(); - break; - case ERequestData : - iRequestDataParams = new (ELeave) CSConRequestData(); - break; - case ESetBURMode : - iBURModeParams = new (ELeave) CSConSetBURMode(); - break; - case ESetInstParams : - break; - case ESupplyData : - iSupplyDataParams = new (ELeave) CSConSupplyData(); - break; - case EUninstall : - iUninstallParams = new (ELeave) CSConUninstall(); - break; - case EUpdateDeviceInfo : - iDevInfoParams = new (ELeave) CSConUpdateDeviceInfo(); - break; - case EReboot : - iRebootParams = new (ELeave) CSConReboot(); - break; - case EGetMetadata : - iGetMetadataParams = new (ELeave) CSConGetMetadata(); - break; - default : - break; - } - } -// ----------------------------------------------------------------------------- -// CSConTask::CSConTask() -// -// ----------------------------------------------------------------------------- -// -CSConTask::CSConTask() - { - } - -// ----------------------------------------------------------------------------- -// CSConTask::~CSConTask() -// -// ----------------------------------------------------------------------------- -// -CSConTask::~CSConTask() - { - delete iDevInfoParams; - delete iListAppsParams; - delete iGetStatusParams; - delete iInstallParams; - delete iUninstallParams; - delete iBURModeParams; - delete iGetDataSizeParams; - delete iRequestDataParams; - delete iGetDataOwnerParams; - delete iSupplyDataParams; - delete iPubFilesParams; - delete iListDataOwnersParams; - delete iRebootParams; - delete iGetMetadataParams; - } - -// ----------------------------------------------------------------------------- -// CSConTask::GetServiceId() const -// -// ----------------------------------------------------------------------------- -// -TSConMethodName CSConTask::GetServiceId() const - { - return iMethod; - } - -// ----------------------------------------------------------------------------- -// CSConTask::Copy() const -// -// ----------------------------------------------------------------------------- -// -CSConTask* CSConTask::CopyL() const - { - CSConTask* copy = new (ELeave) CSConTask(); - copy->iMethod = iMethod; - - if ( iDevInfoParams ) - { - copy->iDevInfoParams = iDevInfoParams->CopyL(); - } - if ( iListAppsParams ) - { - copy->iListAppsParams = iListAppsParams->CopyL(); - } - if ( iGetStatusParams ) - { - - } - if ( iInstallParams ) - { - copy->iInstallParams = iInstallParams->CopyL(); - } - if ( iUninstallParams ) - { - copy->iUninstallParams = iUninstallParams->CopyL(); - } - if ( iBURModeParams ) - { - copy->iBURModeParams = iBURModeParams->CopyL(); - } - if ( iGetDataSizeParams ) - { - copy->iGetDataSizeParams = iGetDataSizeParams->CopyL(); - } - if ( iRequestDataParams ) - { - copy->iRequestDataParams = iRequestDataParams->CopyL(); - } - if ( iGetDataOwnerParams ) - { - copy->iGetDataOwnerParams = iGetDataOwnerParams->CopyL(); - } - if ( iSupplyDataParams ) - { - copy->iSupplyDataParams = iSupplyDataParams->CopyL(); - } - if ( iPubFilesParams ) - { - copy->iPubFilesParams = iPubFilesParams->CopyL(); - } - if ( iListDataOwnersParams ) - { - copy->iListDataOwnersParams = iListDataOwnersParams->CopyL(); - } - if ( iRebootParams ) - { - copy->iRebootParams = iRebootParams->CopyL(); - } - if ( iGetMetadataParams ) - { - copy->iGetMetadataParams = iGetMetadataParams->CopyL(); - } - - return copy; - } - -// ----------------------------------------------------------------------------- -// CSConTask::GetComplete() -// -// ----------------------------------------------------------------------------- -// -TBool CSConTask::GetComplete() - { - TBool complete( EFalse ); - - switch( iMethod ) - { - case EInstall : - complete = this->iInstallParams->iComplete; - break; - case EUninstall : - complete = this->iUninstallParams->iComplete; - break; - case EListInstalledApps : - complete = this->iListAppsParams->iComplete; - break; - case ESetInstParams : - break; - case ESetBURMode : - complete = this->iBURModeParams->iComplete; - break; - case EListPublicFiles : - complete = this->iPubFilesParams->iComplete; - break; - case EListDataOwners : - complete = this->iListDataOwnersParams->iComplete; - break; - case EGetDataSize : - complete = this->iGetDataSizeParams->iComplete; - break; - case EReboot : - complete = this->iRebootParams->iComplete; - break; - case ERequestData : - //If task is partially completed, - //it can be removed from the queue - if ( this->iRequestDataParams->iProgress == KSConTaskPartiallyCompleted ) - { - complete = ETrue; - } - else - { - complete = this->iRequestDataParams->iComplete; - } - - break; - case EGetDataOwnerStatus : - complete = this->iGetDataOwnerParams->iComplete; - break; - case ESupplyData : - //If task is partially completed, - //it can be removed from the queue - if ( this->iSupplyDataParams->iProgress == KSConTaskPartiallyCompleted ) - { - complete = ETrue; - } - else - { - complete = this->iSupplyDataParams->iComplete; - } - - break; - case EGetMetadata : - complete = this->iGetMetadataParams->iComplete; - break; - default : - break; - } - - return complete; - } - -// ----------------------------------------------------------------------------- -// CSConTask::SetCompleteValue( TBool aValue ) -// -// ----------------------------------------------------------------------------- -// -void CSConTask::SetCompleteValue( TBool aValue ) - { - switch( iMethod ) - { - case EInstall : - this->iInstallParams->iComplete = aValue; - break; - case EUninstall : - this->iUninstallParams->iComplete = aValue; - break; - case EListInstalledApps : - this->iListAppsParams->iComplete = aValue; - break; - case ESetInstParams : - this->iInstallParams->iComplete = aValue; - break; - case ESetBURMode : - this->iBURModeParams->iComplete = aValue; - break; - case EListPublicFiles : - this->iPubFilesParams->iComplete = aValue; - break; - case EListDataOwners : - this->iListDataOwnersParams->iComplete = aValue; - break; - case EGetDataSize : - this->iGetDataSizeParams->iComplete = aValue; - break; - case EReboot : - this->iRebootParams->iComplete = aValue; - break; - case ERequestData : - this->iRequestDataParams->iComplete = aValue; - break; - case EGetDataOwnerStatus : - this->iGetDataOwnerParams->iComplete = aValue; - break; - case ESupplyData : - this->iSupplyDataParams->iComplete = aValue; - break; - case EGetMetadata : - this->iGetMetadataParams->iComplete = aValue; - break; - default: - break; - } - } - -// ----------------------------------------------------------------------------- -// CSConTask::GetCompleteValue() -// -// ----------------------------------------------------------------------------- -// -TBool CSConTask::GetCompleteValue() - { - TBool complete( EFalse ); - - switch( iMethod ) - { - case EInstall : - complete = this->iInstallParams->iComplete; - break; - case EUninstall : - complete = this->iUninstallParams->iComplete; - break; - case EListInstalledApps : - complete = this->iListAppsParams->iComplete; - break; - case ESetInstParams : - complete = this->iInstallParams->iComplete; - break; - case ESetBURMode : - complete = this->iBURModeParams->iComplete; - break; - case EListPublicFiles : - complete = this->iPubFilesParams->iComplete; - break; - case EListDataOwners : - complete = this->iListDataOwnersParams->iComplete; - break; - case EGetDataSize : - complete = this->iGetDataSizeParams->iComplete; - break; - case EReboot : - complete = this->iRebootParams->iComplete; - break; - case ERequestData : - if ( this->iRequestDataParams->iProgress != KSConTaskPartiallyCompleted ) - { - complete = this->iRequestDataParams->iComplete; - } - else - { - complete = ETrue; - } - - break; - case EGetDataOwnerStatus : - complete = this->iGetDataOwnerParams->iComplete; - break; - case ESupplyData : - if ( this->iSupplyDataParams->iProgress != KSConTaskPartiallyCompleted ) - { - complete = this->iSupplyDataParams->iComplete; - } - else - { - complete = ETrue; - } - break; - case EGetMetadata : - complete = this->iGetMetadataParams->iComplete; - break; - default: - break; - } - return complete; - } - -// ----------------------------------------------------------------------------- -// CSConTask::SetProgressValue( TInt aValue ) -// -// ----------------------------------------------------------------------------- -// -void CSConTask::SetProgressValue( TInt aValue ) - { - switch( iMethod ) - { - case EInstall : - this->iInstallParams->iProgress = aValue; - break; - case EUninstall : - this->iUninstallParams->iProgress = aValue; - break; - case EListInstalledApps : - this->iListAppsParams->iProgress = aValue; - break; - case ESetInstParams : - this->iInstallParams->iProgress = aValue; - break; - case ESetBURMode : - this->iBURModeParams->iProgress = aValue; - break; - case EListPublicFiles : - this->iPubFilesParams->iProgress = aValue; - break; - case EListDataOwners : - this->iListDataOwnersParams->iProgress = aValue; - break; - case EGetDataSize : - this->iGetDataSizeParams->iProgress = aValue; - break; - case EReboot : - this->iRebootParams->iProgress = aValue; - break; - case ERequestData : - this->iRequestDataParams->iProgress = aValue; - break; - case EGetDataOwnerStatus : - this->iGetDataOwnerParams->iProgress = aValue; - break; - case ESupplyData : - this->iSupplyDataParams->iProgress = aValue; - break; - case EGetMetadata : - this->iGetMetadataParams->iProgress = aValue; - break; - default: - break; - } - } - -// ----------------------------------------------------------------------------- -// CSConTaskReply::CSConTaskReply() -// -// ----------------------------------------------------------------------------- -// -CSConTaskReply::CSConTaskReply() - { - } - -// ----------------------------------------------------------------------------- -// CSConTaskReply::CSConTaskReply( TSConMethodName aMethod ) -// -// ----------------------------------------------------------------------------- -// -CSConTaskReply::CSConTaskReply( TSConMethodName aMethod ) - { - iMethod = aMethod; - switch( aMethod ) - { - case ECancel : - break; - case EGetDataOwnerStatus : - iGetDataOwnerParams = new CSConGetDataOwnerStatus(); - break; - case EGetDataSize : - iGetDataSizeParams = new CSConGetDataSize(); - break; - case EGetStatus : - iGetStatusParams = new CSConGetStatus(); - break; - case EInstall : - iInstallParams = new CSConInstall(); - break; - case EListDataOwners : - iListDataOwnersParams = new CSConListDataOwners(); - break; - case EListInstalledApps : - iListAppsParams = new CSConListInstApps(); - break; - case EListPublicFiles : - iPubFilesParams = new CSConListPublicFiles(); - break; - case ERequestData : - iRequestDataParams = new CSConRequestData(); - break; - case ESetBURMode : - iBURModeParams = new CSConSetBURMode(); - break; - case ESetInstParams : - break; - case ESupplyData : - iSupplyDataParams = new CSConSupplyData(); - break; - case EUninstall : - iUninstallParams = new CSConUninstall(); - break; - case EUpdateDeviceInfo : - iDevInfoParams = new CSConUpdateDeviceInfo(); - break; - case EReboot : - iRebootParams = new CSConReboot(); - break; - case EGetMetadata : - iGetMetadataParams = new CSConGetMetadata(); - break; - default : - break; - } - } - -// ----------------------------------------------------------------------------- -// CSConTaskReply::~CSConTaskReply() -// -// ----------------------------------------------------------------------------- -// -CSConTaskReply::~CSConTaskReply() - { - delete iDevInfoParams; - delete iListAppsParams; - delete iGetStatusParams; - delete iInstallParams; - delete iUninstallParams; - delete iBURModeParams; - delete iGetDataSizeParams; - delete iRequestDataParams; - delete iGetDataOwnerParams; - delete iSupplyDataParams; - delete iPubFilesParams; - delete iListDataOwnersParams; - delete iRebootParams; - delete iGetMetadataParams; - } - -// ----------------------------------------------------------------------------- -// CSConTaskReply::Initialize( const CSConTask& aTask ) -// -// ----------------------------------------------------------------------------- -// -void CSConTaskReply::InitializeL( const CSConTask& aTask ) - { - iTaskId = aTask.iTaskId; - iMethod = aTask.iMethod; - - if ( iMethod == EInstall ) - { - if ( iInstallParams ) - { - delete iInstallParams; - iInstallParams = NULL; - } - iInstallParams = aTask.iInstallParams->CopyL(); - } - else if ( iMethod == EListInstalledApps ) - { - if ( iListAppsParams ) - { - delete iListAppsParams; - iListAppsParams = NULL; - } - - iListAppsParams = aTask.iListAppsParams->CopyL(); - } - else if ( iMethod == EUninstall ) - { - if ( iUninstallParams ) - { - delete iUninstallParams; - iUninstallParams = NULL; - } - - iUninstallParams = aTask.iUninstallParams->CopyL(); - } - else if ( iMethod == ESetBURMode ) - { - if ( iBURModeParams ) - { - delete iBURModeParams; - iBURModeParams = NULL; - } - - iBURModeParams = aTask.iBURModeParams->CopyL(); - } - else if ( iMethod == EListPublicFiles ) - { - if ( iPubFilesParams ) - { - delete iPubFilesParams; - iPubFilesParams = NULL; - } - - iPubFilesParams = aTask.iPubFilesParams->CopyL(); - } - else if ( iMethod == EListDataOwners ) - { - if ( iListDataOwnersParams ) - { - delete iListDataOwnersParams; - iListDataOwnersParams = NULL; - } - - iListDataOwnersParams = aTask.iListDataOwnersParams->CopyL(); - } - else if ( iMethod == EGetDataSize ) - { - if ( iGetDataSizeParams ) - { - delete iGetDataSizeParams; - iGetDataSizeParams = NULL; - } - - iGetDataSizeParams = aTask.iGetDataSizeParams->CopyL(); - } - else if ( iMethod == EReboot ) - { - if ( iRebootParams ) - { - delete iRebootParams; - iRebootParams = NULL; - } - } - else if ( iMethod == ERequestData ) - { - if ( iRequestDataParams ) - { - delete iRequestDataParams; - iRequestDataParams = NULL; - } - - iRequestDataParams = aTask.iRequestDataParams->CopyL(); - } - else if ( iMethod == EGetDataOwnerStatus ) - { - if ( iGetDataOwnerParams ) - { - delete iGetDataOwnerParams; - iGetDataOwnerParams = NULL; - } - - iGetDataOwnerParams = aTask.iGetDataOwnerParams->CopyL(); - } - else if ( iMethod == ESupplyData ) - { - if ( iSupplyDataParams ) - { - delete iSupplyDataParams; - iSupplyDataParams = NULL; - } - - iSupplyDataParams = aTask.iSupplyDataParams->CopyL(); - } - else if ( iMethod == EGetMetadata ) - { - if ( iGetMetadataParams ) - { - delete iGetMetadataParams; - iGetMetadataParams = NULL; - } - - iGetMetadataParams = aTask.iGetMetadataParams->CopyL(); - } - } - -// ----------------------------------------------------------------------------- -// CSConTaskReply::Initialize( TSConMethodName aMethod, -// TInt aProgress, TBool aComplete ) -// -// ----------------------------------------------------------------------------- -// -void CSConTaskReply::InitializeL( TSConMethodName aMethod, - TInt aProgress, TBool aComplete ) - { - iMethod = aMethod; - if ( aMethod == EUpdateDeviceInfo ) - { - if ( !iDevInfoParams ) - { - iDevInfoParams = new (ELeave) CSConUpdateDeviceInfo(); - } - - iDevInfoParams->iComplete = aComplete; - iDevInfoParams->iProgress = aProgress; - } - else if ( aMethod == EReboot ) - { - if ( !iRebootParams ) - { - iRebootParams = new (ELeave) CSConReboot(); - } - - iRebootParams->iComplete = aComplete; - iRebootParams->iProgress = aProgress; - } - else if ( aMethod == EGetMetadata ) - { - if ( !iGetMetadataParams ) - { - iGetMetadataParams = new (ELeave) CSConGetMetadata(); - } - - iGetMetadataParams->iComplete = aComplete; - iGetMetadataParams->iProgress = aProgress; - } - } - -// ----------------------------------------------------------------------------- -// CSConTaskReply::CopyAndFree() -// -// ----------------------------------------------------------------------------- -// -CSConTaskReply* CSConTaskReply::CopyAndFreeL() - { - CSConTaskReply* copy = new (ELeave) CSConTaskReply(); - copy->iTaskId = iTaskId; - copy->iMethod = iMethod; - - if ( iDevInfoParams ) - { - copy->iDevInfoParams = iDevInfoParams->CopyL(); - - //free allocated memory - delete iDevInfoParams; - iDevInfoParams = NULL; - } - if ( iListAppsParams ) - { - copy->iListAppsParams = iListAppsParams->CopyL(); - - //free allocated memory - delete iListAppsParams; - iListAppsParams = NULL; - } - if ( iInstallParams ) - { - copy->iInstallParams = iInstallParams->CopyL(); - - //free allocated memory - delete iInstallParams; - iInstallParams = NULL; - } - if ( iUninstallParams ) - { - copy->iUninstallParams = iUninstallParams->CopyL(); - - //free allocated memory - delete iUninstallParams; - iUninstallParams = NULL; - } - if ( iBURModeParams ) - { - copy->iBURModeParams = iBURModeParams->CopyL(); - - //free allocated memory - delete iBURModeParams; - iBURModeParams = NULL; - } - if ( iGetDataSizeParams ) - { - copy->iGetDataSizeParams = iGetDataSizeParams->CopyL(); - - //free allocated memory - delete iGetDataSizeParams; - iGetDataSizeParams = NULL; - } - if ( iRequestDataParams ) - { - copy->iRequestDataParams = iRequestDataParams->CopyL(); - - //free allocated memory - delete iRequestDataParams; - iRequestDataParams = NULL; - } - if ( iGetDataOwnerParams ) - { - copy->iGetDataOwnerParams = iGetDataOwnerParams->CopyL(); - - //free allocated memory - delete iGetDataOwnerParams; - iGetDataOwnerParams = NULL; - } - if ( iSupplyDataParams ) - { - copy->iSupplyDataParams = iSupplyDataParams->CopyL(); - - //free allocated memory - delete iSupplyDataParams; - iSupplyDataParams = NULL; - } - if ( iPubFilesParams ) - { - copy->iPubFilesParams = iPubFilesParams->CopyL(); - - //free allocated memory - delete iPubFilesParams; - iPubFilesParams = NULL; - } - if ( iListDataOwnersParams ) - { - copy->iListDataOwnersParams = iListDataOwnersParams->CopyL(); - - //free allocated memory - delete iListDataOwnersParams; - iListDataOwnersParams = NULL; - } - if ( iRebootParams ) - { - copy->iRebootParams = iRebootParams->CopyL(); - - //free allocated memory - delete iRebootParams; - iRebootParams = NULL; - } - if ( iGetMetadataParams ) - { - copy->iGetMetadataParams = iGetMetadataParams->CopyL(); - - //free allocated memory - delete iGetMetadataParams; - iGetMetadataParams = NULL; - } - - return copy; - } - -// ----------------------------------------------------------------------------- -// CSConTaskReply::CleanTaskData() -// -// ----------------------------------------------------------------------------- -// -void CSConTaskReply::CleanTaskData() - { - switch( iMethod ) - { - case EGetDataSize : - if ( iGetDataSizeParams ) - { - this->iGetDataSizeParams->DeleteDataOwners(); - } - break; - case EGetDataOwnerStatus : - if ( iGetDataOwnerParams ) - { - this->iGetDataOwnerParams->DeleteDataOwners(); - } - break; - case EListDataOwners : - if ( iListDataOwnersParams ) - { - this->iListDataOwnersParams->DeleteDataOwners(); - } - break; - case ERequestData : - if ( iRequestDataParams ) - { - this->iRequestDataParams->DeleteDataAndDataOwner(); - } - break; - default : - break; - } - } - -// ----------------------------------------------------------------------------- -// CSConStatusReply::CSConStatusReply() -// -// ----------------------------------------------------------------------------- -// -CSConStatusReply::CSConStatusReply() : iNoTasks( EFalse ) - { - } - -// ----------------------------------------------------------------------------- -// CSConStatusReply::~CSConStatusReply() -// -// ----------------------------------------------------------------------------- -// -CSConStatusReply::~CSConStatusReply() - { - iTasks.ResetAndDestroy(); - iTasks.Close(); - }; - -// End of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/group/bld.inf --- a/connectivitymodules/SeCon/group/bld.inf Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,52 +0,0 @@ -/* -* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "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: Build info file for SeCon -* -*/ - -#include - -#include "../catalogspcconnectivityplugin/group/bld.inf" -#include "../cntparser/bld/bld.inf" -#include "../services/csc/bld/bld.inf" -#include "../services/ftp/bld/bld.inf" -#include "../services/pcd/bld/bld.inf" - -#include "../wbxml/conmlhandler/bld/bld.inf" -#include "../servers/pcconn/bld/bld.inf" -#include "../servers/syncserver/group/bld.inf" - -#include "../clients/pcconn/bld/bld.inf" -#include "../clients/syncclient/group/bld.inf" - -#include "../plugins/pcconn/bld/bld.inf" -#include "../plugins/ftp/bld/bld.inf" -#include "../plugins/hapticsconnplugin/group/bld.inf" - -PRJ_EXPORTS - -// Export stub files -stubs/secon_stub.SIS /epoc32/data/z/system/install/secon_stub.SIS -stubs/sconpcconnplugin_stub.SIS /epoc32/data/z/system/install/sconpcconnplugin_stub.SIS -stubs/sconftpplugin_stub.SIS /epoc32/data/z/system/install/sconftpplugin_stub.SIS - -../rom/sconpcd.iby CORE_MW_LAYER_IBY_EXPORT_PATH(sconpcd.iby) -../rom/sconpcconnplugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH(sconpcconnplugin.iby) -../rom/sconpcconnclientserver.iby CORE_MW_LAYER_IBY_EXPORT_PATH(sconpcconnclientserver.iby) -../rom/sconftpresources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(sconftpresources.iby) -../rom/sconftpplugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH(sconftpplugin.iby) -../rom/sconftp.iby CORE_MW_LAYER_IBY_EXPORT_PATH(sconftp.iby) -../rom/sconcsc.iby CORE_MW_LAYER_IBY_EXPORT_PATH(sconcsc.iby) -../rom/cntparser.iby CORE_MW_LAYER_IBY_EXPORT_PATH(cntparser.iby) - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/group/stubs/createstubs.bat --- a/connectivitymodules/SeCon/group/stubs/createstubs.bat Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -rem -rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -rem All rights reserved. -rem This component and the accompanying materials are made available -rem under the terms of "Eclipse Public License v1.0" -rem which accompanies this distribution, and is available -rem at the URL "http://www.eclipse.org/legal/epl-v10.html". -rem -rem Initial Contributors: -rem Nokia Corporation - initial contribution. -rem -rem Contributors: -rem -rem Description: Batch file for creating needed stub files. -rem - -makesis -s sconftpplugin_stub.pkg -makesis -s sconpcconnplugin_stub.pkg -makesis -s secon_stub.pkg diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/group/stubs/sconftpplugin_stub.SIS Binary file connectivitymodules/SeCon/group/stubs/sconftpplugin_stub.SIS has changed diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/group/stubs/sconftpplugin_stub.pkg --- a/connectivitymodules/SeCon/group/stubs/sconftpplugin_stub.pkg Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -; -; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -; All rights reserved. -; This component and the accompanying materials are made available -; under the terms of "Eclipse Public License v1.0" -; which accompanies this distribution, and is available -; at the URL "http://www.eclipse.org/legal/epl-v10.html". -; -; Initial Contributors: -; Nokia Corporation - initial contribution. -; -; Contributors: -; -; Description: Sis-stub file for FTP Plugin -; -; Languages -&EN - -; Header -#{"FTP Plugin"},(0x101F9686),1,0,0, TYPE=SA - -; Localised Vendor name -%{"Nokia"} - -; Unique Vendor name -:"Nokia" - -; Files to install -""-"z:\resource\plugins\sconftpplugin.rsc" -""-"z:\sys\bin\sconftpplugin.dll" diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/group/stubs/sconpcconnplugin_stub.SIS Binary file connectivitymodules/SeCon/group/stubs/sconpcconnplugin_stub.SIS has changed diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/group/stubs/sconpcconnplugin_stub.pkg --- a/connectivitymodules/SeCon/group/stubs/sconpcconnplugin_stub.pkg Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -; -; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -; All rights reserved. -; This component and the accompanying materials are made available -; under the terms of "Eclipse Public License v1.0" -; which accompanies this distribution, and is available -; at the URL "http://www.eclipse.org/legal/epl-v10.html". -; -; Initial Contributors: -; Nokia Corporation - initial contribution. -; -; Contributors: -; -; Description: Sis-stub file for PCConn Plugin -; -; Languages -&EN - -; Header -#{"PCConn Plugin"},(0x101F9688),1,0,0, TYPE=SA - -; Localised Vendor name -%{"Nokia"} - -; Unique Vendor name -:"Nokia" - -; Files to install -""-"z:\resource\plugins\sconpcconnplugin.rsc" -""-"z:\sys\bin\sconpcconnplugin.dll" diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/group/stubs/secon_stub.SIS Binary file connectivitymodules/SeCon/group/stubs/secon_stub.SIS has changed diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/group/stubs/secon_stub.pkg --- a/connectivitymodules/SeCon/group/stubs/secon_stub.pkg Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -; -; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). -; All rights reserved. -; This component and the accompanying materials are made available -; under the terms of "Eclipse Public License v1.0" -; which accompanies this distribution, and is available -; at the URL "http://www.eclipse.org/legal/epl-v10.html". -; -; Initial Contributors: -; Nokia Corporation - initial contribution. -; -; Contributors: -; -; Description: Sis-stub file for Service Controllers -; -; Languages -&EN - -; Header -#{"Service Controllers"},(0x101F99F6),1,72,0, TYPE=SA - -; Localised Vendor name -%{"Nokia"} - -; Unique Vendor name -:"Nokia" - -; Files to install -""-"z:\sys\bin\sconpcconnserver.exe" -""-"z:\sys\bin\sconpcconnclient.dll" -""-"z:\sys\bin\sconpcd.dll" -""-"z:\resource\sconftp.r??" -""-"z:\sys\bin\sconftp.dll" -""-"z:\sys\bin\sconcsc.dll" -""-"z:\sys\bin\sconconmlhandler.dll" -""-"z:\sys\bin\catalogspcconnectivityplugin.dll" -""-"z:\sys\bin\cntparserserver.dll" -""-"z:\sys\bin\cntparserserverexe.exe" diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/inc/debug.h --- a/connectivitymodules/SeCon/inc/debug.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,128 +0,0 @@ -/* -* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* 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: Debug utility for SeCon components. -* -*/ - - -#ifndef _SECON_DEBUG_H -#define _SECON_DEBUG_H - -#ifdef _DEBUG - - #ifdef __WINS__ - // Enable file logging - #define __FLOGGING__ - #endif //__WINS__ - - #include - #ifdef __FLOGGING__ - #include - #include - #endif - - NONSHARABLE_CLASS(TOverflowTruncate16) : public TDes16Overflow - { - public: - void Overflow(TDes16& /*aDes*/) {} - }; - - NONSHARABLE_CLASS(TOverflowTruncate8) : public TDes8Overflow - { - public: - void Overflow(TDes8& /*aDes*/) {} - }; - - _LIT( KLogDir, "SECON" ); - _LIT( KLogFile, "SeconDebug.txt" ); - - _LIT(KTracePrefix16, "[SeCon] "); - _LIT8(KTracePrefix8, "[SeCon] "); - _LIT8(KFuncEntryFormat8, "%S : Begin"); - _LIT8(KFuncExitFormat8, "%S : End"); - _LIT8(KFuncReturnFormat8, "%S : End, return: %d"); - _LIT8(KFuncFormat8, "><%S"); - - const TInt KMaxLogLineLength = 512; - - // old function loggin macros - #define LOGGER_ENTERFN( name ) {TRACE_FUNC_ENTRY;} - #define LOGGER_LEAVEFN( name ) {TRACE_FUNC_EXIT;} - - #define LOGGER_WRITE( text ) {_LIT( KTemp, text ); FPrint( KTemp );} - #define LOGGER_WRITE_1( text,par1 ) {_LIT( KTemp, text ); FPrint( KTemp, par1 );} - #define LOGGER_WRITE8_1( text,par1 ) {_LIT8( KTemp, text ); FPrint( KTemp, par1 );} - #define LOGGER_WRITE_2( text,par1,par2 ) {_LIT( KTemp, text ); FPrint( KTemp, par1, par2 );} - #define LOGGER_WRITE_3( text,par1,par2,par3 ) {_LIT( KTemp, text ); FPrint( KTemp, par1, par2, par3 );} - - // New function logging macros - #define TRACE_FUNC_ENTRY {TPtrC8 ptr8((TUint8*)__PRETTY_FUNCTION__); FPrint(KFuncEntryFormat8, &ptr8);} - #define TRACE_FUNC_EXIT {TPtrC8 ptr8((TUint8*)__PRETTY_FUNCTION__); FPrint(KFuncExitFormat8, &ptr8);} - #define TRACE_FUNC {TPtrC8 ptr8((TUint8*)__PRETTY_FUNCTION__); FPrint(KFuncFormat8, &ptr8);} - - #define TRACE_FUNC_RET( number ) {TPtrC8 ptr8((TUint8*)__PRETTY_FUNCTION__); FPrint(KFuncReturnFormat8, &ptr8, number);} - // Declare the FPrint function - inline void FPrint( TRefByValue aFmt, ...) - { - VA_LIST list; - VA_START(list,aFmt); - #ifdef __FLOGGING__ - RFileLogger::WriteFormat( KLogDir, KLogFile, EFileLoggingModeAppend, aFmt, list ); - #endif - TBuf16 theFinalString; - theFinalString.Append(KTracePrefix16); - TOverflowTruncate16 overflow; - theFinalString.AppendFormatList(aFmt,list,&overflow); - RDebug::Print(theFinalString); - } - - // Declare the FPrint function - inline void FPrint(TRefByValue aFmt, ...) - { - VA_LIST list; - VA_START(list, aFmt); - #ifdef __FLOGGING__ - RFileLogger::WriteFormat(KLogDir, KLogFile, EFileLoggingModeAppend, aFmt, list); - #endif - TOverflowTruncate8 overflow; - TBuf8 buf8; - buf8.Append(KTracePrefix8); - buf8.AppendFormatList(aFmt, list, &overflow); - TBuf16 buf16(buf8.Length()); - buf16.Copy(buf8); - TRefByValue tmpFmt(_L("%S")); - RDebug::Print(tmpFmt, &buf16); - } -#else - - // No loggings --> reduced code size - - #define LOGGER_ENTERFN( name ) - #define LOGGER_LEAVEFN( name ) - #define LOGGER_WRITE( text ) - #define LOGGER_WRITE_1( text, par1 ) - #define LOGGER_WRITE8_1( text, par1 ) - #define LOGGER_WRITE_2( text, par1, par2 ) - #define LOGGER_WRITE_3( text, par1, par2, par3 ) - #define TRACE_FUNC_ENTRY - #define TRACE_FUNC_EXIT - #define TRACE_FUNC - #define TRACE_FUNC_RET( number ) - -#endif //_DEBUG - -#endif // SECON_DEBUG_H - -// End of file - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/ftp/bld/bld.inf --- a/connectivitymodules/SeCon/plugins/ftp/bld/bld.inf Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -/* -* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: File Transfer Profile Plug-in build information file. -* -*/ - - -PRJ_PLATFORMS -DEFAULT - -PRJ_MMPFILES -sconftpplugin.mmp diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/ftp/bld/def/bwinscwU.DEF --- a/connectivitymodules/SeCon/plugins/ftp/bld/def/bwinscwU.DEF Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -EXPORTS - ?ImplementationGroupProxy@@YAPBUTImplementationProxy@@AAH@Z @ 1 NONAME ; struct TImplementationProxy const * ImplementationGroupProxy(int &) - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/ftp/bld/def/eabiU.DEF --- a/connectivitymodules/SeCon/plugins/ftp/bld/def/eabiU.DEF Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -EXPORTS - _Z24ImplementationGroupProxyRi @ 1 NONAME - _ZTI14CSConFTPplugin @ 2 NONAME ; ## - _ZTV14CSConFTPplugin @ 3 NONAME ; ## - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/ftp/bld/sconftpplugin.mmp --- a/connectivitymodules/SeCon/plugins/ftp/bld/sconftpplugin.mmp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -/* -* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: File Transfer Profile Plug-in -* -*/ - - -// To get the MW_LAYER_SYSTEMINCLUDE-definition -#include -#include - -VENDORID VID_DEFAULT - -CAPABILITY CAP_ECOM_PLUGIN - -TARGET sconftpplugin.dll -TARGETTYPE PLUGIN - -UID 0x10009D8D 0x101F9686 - -SOURCEPATH ../src - -SOURCE sconftpplugin.cpp -SOURCE proxy.cpp -SOURCE sconftppluginutils.cpp -SOURCE sconservicetimer.cpp -SOURCE sconshutdownwatcher.cpp - -START RESOURCE 101f9686.rss - TARGET sconftpplugin.rsc -END - -// Default system include paths for middleware layer modules. -MW_LAYER_SYSTEMINCLUDE - -USERINCLUDE ../inc -USERINCLUDE ../../../inc -USERINCLUDE ../../../services/ftp/inc - -DEBUGLIBRARY flogger.lib -LIBRARY euser.lib -LIBRARY irobex.lib -LIBRARY ecom.lib -LIBRARY efsrv.lib -LIBRARY bluetooth.lib -LIBRARY esock.lib diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/ftp/inc/sconftpplugin.h --- a/connectivitymodules/SeCon/plugins/ftp/inc/sconftpplugin.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,194 +0,0 @@ -/* -* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: File Transfer Profile Plug-in header file -* -*/ - - -#ifndef _SCONFTPPLUGIN_H -#define _SCONFTPPLUGIN_H - -#include -#include - -#include "sconshutdownwatcher.h" - -// forward declaration -class CSConFTP; -class CSConServiceTimer; -// CLASS DECLARATION - -/* -* File Transfer Profile Plugin class -* -*/ - -class CSConFTPplugin : public CSrcsInterface, public MObexServerNotify, - public MShutdownObserver - { - public: - static CSConFTPplugin* NewL(); - ~CSConFTPplugin(); - - /** - * Returns active status of OBEX session - * @return ETrue if session is active, else EFalse - */ - TBool IsOBEXActive(); - - /** - * Device is shutting down, abort connection. - */ - void NotifyShutdown(); - - private: - /** - * Loads sconftp.dll module - * @return none - */ - void LoadFTPDllL(); - /** - * Closes initialized services - * @return none - */ - void Disconnect(); - /** - * Removes spaces and nulls from the end of the string - * @param aDes String to be formatted - * @return none - */ - void TrimRightSpaceAndNull( TDes8& aDes ) const; - /** - * Current used transfer media (IR,USB,BT) - * @param aMediaType Enumeration indicating the media type - * @return none - */ - void SetMediaType( TSrcsMediaType aMediaType ); - /** - * MObexServerNotify implementation - * @param aError Error code - * @return none - */ - void ErrorIndication( TInt aError ); - /** - * MObexServerNotify implementation - * @return none - */ - void TransportUpIndication(); - /** - * MObexServerNotify implementation - * @return none - */ - void TransportDownIndication(); - /** - * MObexServerNotify implementation - * @param aRemoteInfo Structure containing information used during OBEX - * connection - * @param aInfo Further information about the requested connection - * @return System wide error code that indicates the success of the connection - */ - TInt ObexConnectIndication( const TObexConnectInfo& aRemoteInfo, - const TDesC8& aInfo ); - /** - * MObexServerNotify implementation - * @param aInfo Contains information about the disconnection - * @return none - */ - void ObexDisconnectIndication( const TDesC8& aInfo ); - /** - * MObexServerNotify implementation - * @return CObexBaseObject-derived object, which the object being put - * will be parsed into. - */ - CObexBufObject* PutRequestIndication(); - /** - * MObexServerNotify implementation - * @return System wide error code that indicates the success of the - * PUT packet operation. - */ - TInt PutPacketIndication(); - /** - * MObexServerNotify implementation - * @return System wide error code that indicates the success of the - * PUT packet operation. - */ - TInt PutCompleteIndication(); - /** - * MObexServerNotify implementation - * @param aRequiredObject Details about the object the remote client - * has requested - * @returnObject to return to the client - */ - CObexBufObject* GetRequestIndication( CObexBaseObject - *aRequiredObject ); - /** - * MObexServerNotify implementation - * @return System wide error code that indicates the success of the - * GET packet operation. - */ - TInt GetPacketIndication(); - /** - * MObexServerNotify implementation - * @return System wide error code that indicates the success of the - * GET packet operation. - */ - TInt GetCompleteIndication(); - /** - * MObexServerNotify implementation - * @param aPathInfo SETPATH command parameters - * @param aInfo Not currently used - * @return System wide error code indicating the success of the - * setpath command. - */ - TInt SetPathIndication( const CObex::TSetPathInfo& aPathInfo, - const TDesC8& aInfo ); - /** - * SetObexServer - * @param aObexServer pass obex server pointer to sevice controller - * @return System wide error code. - */ - TInt SetObexServer( CObexServer* aObexServer ); - /** - * MObexServerNotify implementation - * @return none - */ - void AbortIndication(); - - void ConstructL(); - CSConFTPplugin(); - - private: - RLibrary iFTPlib; - CObexBufObject* iObject; - CBufFlat* iBuffer; - CSConFTP* iFTPHandler; - TInt iPutError; - TBool iSessionActive; - CSConServiceTimer* iServiceTimer; - TBool iStartTimer; - TSrcsMediaType iMediaType; - CObexFileObject* iFileObject; - TBool iPutPacketIndicationCalled; - CShutdownWatcher* iShutdownWatcher; - TBool iShutdownInProgress; - CObexServer* iObexServer; - RSocketServ iSocketServer; - RBTPhysicalLinkAdapter iLinkAdapter; - private: - // Friend class is used,because existing impelentation has been working - // properly. Avoiding re-design. - friend class CSConServiceTimer; - }; - -#endif // SCONPCCONNPLUGIN_H diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/ftp/inc/sconftppluginutils.h --- a/connectivitymodules/SeCon/plugins/ftp/inc/sconftppluginutils.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -/* -* Copyright (c) 2005-2007 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: File Transfer Profile Plug-in Utils header -* -*/ - - -#ifndef _SCONFTPPLUGINUTILS_H -#define _SCONFTPPLUGINUTILS_H - -#include -//============================================================ -// Class TFTPpluginUtils declaration -//============================================================ -class TFTPpluginUtils - { - public: - /** - * Converts Symbian error code to OBEX error code - * @param aError The error code - * @return The converted error code - */ - static TInt ConvertFTPResponseCode( TInt aError ); - }; - -#endif // _SCONFTPPLUGINUTILS_H \ No newline at end of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/ftp/inc/sconservicetimer.h --- a/connectivitymodules/SeCon/plugins/ftp/inc/sconservicetimer.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -/* -* Copyright (c) 2005-2007 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: File Transfer Profile Plug-in Service Timer Header file -* -*/ - - -#ifndef _SCONSERVICETIMER_H -#define _SCONSERVICETIMER_H - -#include - -class CSConFTPplugin; - - -//============================================================ -// Class CSConServiceTimer declaration -//============================================================ - -NONSHARABLE_CLASS ( CSConServiceTimer ) : public CActive - { - public: - CSConServiceTimer( CSConFTPplugin* aEngine, TInt aValue ); - void ConstructL(); - ~CSConServiceTimer(); - - /** - * Starts the timer - * @return none - */ - void StartTimer(); - /** - * Stops the timer - * @return none - */ - void StopTimer(); - - private: - void DoCancel(); - void RunL(); - - private: - RTimer iTimer; - CSConFTPplugin* iEngine; - TInt iValue; - }; - -#endif //_SCONSERVICETIMER_H - -// End of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/ftp/inc/sconshutdownwatcher.h --- a/connectivitymodules/SeCon/plugins/ftp/inc/sconshutdownwatcher.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -/* -* Copyright (c) 2007 Nokia Corporation and/or 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: Power shutdown -watcher header file -* -*/ - - -#ifndef _SCONSHUTDOWNWATCHER_H -#define _SCONSHUTDOWNWATCHER_H - - -#include -#include - -//============================================================ -// Class MShutdownObserver declaration -//============================================================ -class MShutdownObserver - { -public: - virtual void NotifyShutdown()=0; - }; - -//============================================================ -// Class CShutdownWatcher declaration -//============================================================ -NONSHARABLE_CLASS ( CShutdownWatcher ) : public CActive - { - public: - static CShutdownWatcher* NewL( MShutdownObserver* aObserver ); - ~CShutdownWatcher(); - - /** - * Starts to watch shutdown status - * @return none - */ - void StartShutdownWatcher(); - - private: - //construct/destruct - CShutdownWatcher( MShutdownObserver* aObserver ); - void ConstructL(); - - // from CActive - void DoCancel(); - void RunL(); - - private: - MShutdownObserver* iObserver; - RProperty iProperty; - }; - -#endif //_SCONSHUTDOWNWATCHER_H - -// End of file \ No newline at end of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/ftp/src/101f9686.rss --- a/connectivitymodules/SeCon/plugins/ftp/src/101f9686.rss Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,68 +0,0 @@ -/* -* Copyright (c) 2005-2007 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: File Transfer Profile Plug-in resource file -* -*/ - - -#include "ecom/registryinfo.rh" - -// Declares info for two implementations -RESOURCE REGISTRY_INFO theInfo - { - // UID for the DLL - dll_uid = 0x101F9686; - // Declare array of interface info - interfaces = - { - INTERFACE_INFO - { - // UID of interface that is implemented - interface_uid = 0x101F7C8C; - implementations = - { - // Info for CSConFTPplugin - IMPLEMENTATION_INFO - { - implementation_uid = 0x101F9687; - version_no = 1; - display_name = "OBEX File Transfer"; - default_data = "OBEX/BT"; - - // - // opaque_data contains parameters used by following API calls in SRCS: - // 1. Setup USB interface string descriptor in Unicode; - // 2. TInt CObex::SetLocalWho(const TDesC8& aInfo); - // 3. TInt CBTConnection::RegisterSecuritySettingsL( TUint aService, - // TInt aProtocol, - // TInt aChannel, - // TBool aAuthenticate, - // TBool aAuthorise, - // TBool aEncrypt ); - // opaque_data = "@0||@1||@2||@3||@4||@5||@6" - // @0 aStrDesc e.g. "OBEX File Transfer" - // @1 aInfo e.g. KFolderBrowsingID, "\xF9\xEC\x7B\xC4\x95\x3C\x11\xd2\x98\x4E\x52\x54\x00\xDC\x9E\x09" - // @2 aService e.g. KBTSecurityUidFileTransfer, 0x1106 - // @3 aProtocol e.g. KSolBtRFCOMM, 0x1013 - // @4 aAuthenticate e.g. EFalse, 0 - // @5 aAuthorise e.g. EFalse, 0 - // @6 aEncrypt e.g. EFalse, 0 - // - opaque_data = "OBEX File Transfer||\xF9\xEC\x7B\xC4\x95\x3C\x11\xd2\x98\x4E\x52\x54\x00\xDC\x9E\x09||0x1106||0x1013||1||1||1"; - } - }; - } - }; - } - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/ftp/src/proxy.cpp --- a/connectivitymodules/SeCon/plugins/ftp/src/proxy.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ -/* -* Copyright (c) 2005-2007 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: File Transfer Profile Plug-in proxy implementation -* -*/ - - -// INCLUDE FILES - -#include -#include - -#include "sconftpplugin.h" - -const TImplementationProxy ImplementationTable[] = - { - IMPLEMENTATION_PROXY_ENTRY(0x101F9687, CSConFTPplugin::NewL) - }; - -// ----------------------------------------------------------------------------- -// TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount) -// Exported proxy for instantiation method resolution -// ----------------------------------------------------------------------------- -// -EXPORT_C const TImplementationProxy* ImplementationGroupProxy( - TInt& aTableCount) - { - aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy); - - return ImplementationTable; - } diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/ftp/src/sconftpplugin.cpp --- a/connectivitymodules/SeCon/plugins/ftp/src/sconftpplugin.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,880 +0,0 @@ -/* -* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: File Transfer Profile Plug-in implementation -* -*/ - - -// INCLUDE FILES - -#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS -#include -#endif -#include "sconftpplugin.h" -#include "sconftp.h" -#include "sconftppluginutils.h" -#include "sconservicetimer.h" -#include "debug.h" - - -// CONSTANTS -_LIT(KSConFTPLibName, "sconftp.dll"); -const TInt KSConFTPUidValue = 0x10009D8D; -const TUid KSConFTPUid = {KSConFTPUidValue}; - -// Folder listing type from IrObex specification -_LIT8( KSConFolderListType, "x-obex/folder-listing" ); - -_LIT( K_C_ROOT, "C:\\" ); -const TInt KSConBufSize = 262144; // 256KB -// Time (in milliseconds) for the timer -const TInt KSConTimeOutValue = 60000000; -// Flags used to indicate SetPath commands -const TInt KSConNULLSetPath = 0x00; - -const TInt KSConHeaderMaxLength = 256; - -// ============================= MEMBER FUNCTIONS =============================== - -// ----------------------------------------------------------------------------- -// CSConFTPplugin::NewL() -// Two-phase constructor -// ----------------------------------------------------------------------------- -// -CSConFTPplugin* CSConFTPplugin::NewL() - { - TRACE_FUNC_ENTRY; - CSConFTPplugin* self = new ( ELeave ) CSConFTPplugin(); - CleanupStack::PushL( self ); - self->ConstructL(); - CleanupStack::Pop( self ); - TRACE_FUNC_EXIT; - return( self ); - } - -// ----------------------------------------------------------------------------- -// CSConFTPplugin::~CSConFTPplugin() -// Destructor -// ----------------------------------------------------------------------------- -// -CSConFTPplugin::~CSConFTPplugin() - { - TRACE_FUNC_ENTRY; - - // Disconnect from services. - Disconnect(); - - if ( iFTPHandler ) - { - delete iFTPHandler; - iFTPHandler = NULL; - iFTPlib.Close(); - } - - delete iBuffer; - iBuffer = NULL; - delete iObject; - iObject = NULL; - - if ( iServiceTimer ) - { - iServiceTimer->Cancel(); - } - - delete iServiceTimer; - iServiceTimer = NULL; - - if ( iFileObject ) - { - delete iFileObject; - iFileObject = NULL; - } - - - delete iShutdownWatcher; - iShutdownWatcher = NULL; - - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConFTPplugin::IsOBEXActive() -// Returns active status of OBEX session -// ----------------------------------------------------------------------------- -// -TBool CSConFTPplugin::IsOBEXActive() - { - TRACE_FUNC; - return iSessionActive; - } - -// ----------------------------------------------------------------------------- -// CSConFTPplugin::NotifyShutdown() -// System is shutting down -// ----------------------------------------------------------------------------- -// -void CSConFTPplugin::NotifyShutdown() - { - TRACE_FUNC; - iShutdownInProgress = ETrue; - } - -// ----------------------------------------------------------------------------- -// CSConFTPplugin::LoadFTPDllL() -// Loads sconftp.dll module -// ----------------------------------------------------------------------------- -// -void CSConFTPplugin::LoadFTPDllL() - { - TRACE_FUNC_ENTRY; - // Dynamically load DLL - User::LeaveIfError( iFTPlib.Load( KSConFTPLibName ) ); - if ( iFTPlib.Type()[1] != KSConFTPUid ) - { - LOGGER_WRITE( "KSConFTPUidValue incorrect" ); - iFTPlib.Close(); - User::Leave( KErrNotFound ); - } - TSConCreateCSConFTPFunc CreateCSConFTPL = - (TSConCreateCSConFTPFunc)iFTPlib.Lookup(1); - iFTPHandler = (CSConFTP*)CreateCSConFTPL(); - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConFTPplugin::Disconnect() -// Closes initialized services -// ----------------------------------------------------------------------------- -// -void CSConFTPplugin::Disconnect() - { - TRACE_FUNC_ENTRY; - - iLinkAdapter.Close(); - iSocketServer.Close(); - - if ( iStartTimer != EFalse ) - { - iServiceTimer->Cancel(); - iServiceTimer->StartTimer(); - } - - delete iObject; - iObject = NULL; - - if ( iFileObject ) - { - delete iFileObject; - iFileObject = NULL; - } - if ( iFTPHandler ) - { - delete iFTPHandler; - iFTPHandler = NULL; - iFTPlib.Close(); - } - - TRACE_FUNC_EXIT - } - -// ----------------------------------------------------------------------------- -// CSConFTPplugin::ErrorIndication( TInt aError ) -// MObexServerNotify implementation -// ----------------------------------------------------------------------------- -// -void CSConFTPplugin::ErrorIndication( TInt aError ) - { - TRACE_FUNC_ENTRY; - LOGGER_WRITE_1( "aError : %d", aError ); - - if ( iFTPHandler ) - { - iFTPHandler->AbortFileTransfer( iObject ); - } - - if ( iObject ) - { - delete iObject; - iObject = NULL; - } - - if ( iFileObject ) - { - iFileObject->Reset(); - delete iFileObject; - iFileObject = NULL; - } - - // Keep compiler happy - (void)aError; - - delete iShutdownWatcher; - iShutdownWatcher = NULL; - - if ( iLinkAdapter.IsOpen() ) - { - // Cancel ActivateActiveRequester & allow going to low power mode - TInt err2 = iLinkAdapter.CancelLowPowerModeRequester(); - LOGGER_WRITE_1( "iLinkAdapter.CancelLowPowerModeRequester() err: %d", err2 ); - } - - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConFTPplugin::AbortIndication() -// MObexServerNotify implementation -// ----------------------------------------------------------------------------- -// -void CSConFTPplugin::AbortIndication() - { - TRACE_FUNC_ENTRY; - if ( iFTPHandler ) - { - iFTPHandler->AbortFileTransfer( iObject ); - } - - if ( iObject ) - { - delete iObject; - iObject = NULL; - } - - if ( iFileObject ) - { - iFileObject->Reset(); - delete iFileObject; - iFileObject = NULL; - } - - delete iShutdownWatcher; - iShutdownWatcher = NULL; - - if ( iLinkAdapter.IsOpen() ) - { - // Cancel ActivateActiveRequester & allow going to low power mode - TInt err = iLinkAdapter.CancelLowPowerModeRequester(); - LOGGER_WRITE_1( "iLinkAdapter.CancelLowPowerModeRequester() err: %d", err ); - } - - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConFTPplugin::TransportUpIndication() -// MObexServerNotify implementation -// ----------------------------------------------------------------------------- -// -void CSConFTPplugin::TransportUpIndication() - { - TRACE_FUNC; - } - -// ----------------------------------------------------------------------------- -// CSConFTPplugin::ObexConnectIndication( const TObexConnectInfo& aRemoteInfo, -// const TDesC8& aInfo ) -// MObexServerNotify implementation -// ----------------------------------------------------------------------------- -// -TInt CSConFTPplugin::ObexConnectIndication( - const TObexConnectInfo& /*aRemoteInfo*/, - const TDesC8& /*aInfo*/ ) - { - TRACE_FUNC_ENTRY; - TInt err( KErrNone ); - iStartTimer = ETrue; - - if ( iMediaType == ESrcsMediaBT && iObexServer ) - { - TSockAddr remoteAddr; - iObexServer->RemoteAddr( remoteAddr ); - - TBTSockAddr btSockAddr( remoteAddr ); - TBTDevAddr devAddr = btSockAddr.BTAddr(); - - err = iSocketServer.Connect(); - LOGGER_WRITE_1("iSocketServer.Connect err: %d", err ); - if ( !err ) - { - err = iLinkAdapter.Open( iSocketServer, devAddr ); - LOGGER_WRITE_1("iLinkAdapter.Open err: %d", err ); - } - // Ignore all BT link errors - err = KErrNone; - } - - if ( err == KErrNone && !iFTPHandler ) - { - TRAP( err, LoadFTPDllL() ); - LOGGER_WRITE_1( "LoadFTPDllL returned : %d", err ); - } - - if ( err == KErrNone ) - { - iFTPHandler->SetProfile( EStandard ); - LOGGER_WRITE( "CSConFTPplugin::ObexConnectIndication() : iServiceTimer->StopTimer()" ); - iServiceTimer->Cancel(); - iServiceTimer->StopTimer(); - } - - TRACE_FUNC_EXIT; - LOGGER_WRITE_1( "CSConFTPplugin::ObexConnectIndication returned %d", err ); - return TFTPpluginUtils::ConvertFTPResponseCode( err ); - } - -// ----------------------------------------------------------------------------- -// CSConFTPplugin::ObexDisconnectIndication( const TDesC8& ) -// MObexServerNotify implementation -// ----------------------------------------------------------------------------- -// -void CSConFTPplugin::ObexDisconnectIndication( const TDesC8& ) - { - TRACE_FUNC_ENTRY; - Disconnect(); - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConFTPplugin::TransportDownIndication() -// MObexServerNotify implementation -// ----------------------------------------------------------------------------- -// -void CSConFTPplugin::TransportDownIndication() - { - TRACE_FUNC_ENTRY; - Disconnect(); - if ( iBuffer ) - { - iBuffer->Reset(); - } - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConFTPplugin::PutRequestIndication() -// MObexServerNotify implementation -// ----------------------------------------------------------------------------- -// -CObexBufObject* CSConFTPplugin::PutRequestIndication() - { - TRACE_FUNC_ENTRY; - TInt ret( KErrNone ); - TInt err( KErrNone ); - iPutError = KErrNone; - - if ( iBuffer ) - { - iBuffer->Reset(); - } - - if ( iObject ) - { - delete iObject; - iObject = NULL; - } - - TRAP( err, iObject = CObexBufObject::NewL ( iBuffer ) ); - - if ( err != KErrNone ) - { - return NULL; - } - - if ( !iFTPHandler ) - { - LOGGER_WRITE( "Creating iFTPHandler has failed" ); - return NULL; - } - - TRAP( err, ret = iFTPHandler->PutFileObjectInitL( iObject, iBuffer ) ); - - if ( err != KErrNone ) - { - LOGGER_WRITE_1( "iFTPHandler->PutFileObjectInitL() leaves: %d", err ); - return NULL; - } - if ( ret != KErrNone ) - { - LOGGER_WRITE_1( "PutFileObjectInitL failed - returning error in next PutPacketIndication : %d", ret ); - iPutError = ret; - } - iPutPacketIndicationCalled = EFalse; - - if ( !iShutdownWatcher ) - { - TRAP( err, iShutdownWatcher = CShutdownWatcher::NewL( this ) ); - if ( err == KErrNone ) - { - iShutdownWatcher->StartShutdownWatcher(); - } - else - { - LOGGER_WRITE_1( "CShutdownWatcher::NewL leaves: %d", err ); - } - } - - if ( iLinkAdapter.IsOpen() ) - { - // request active BT mode (high power mode) - err = iLinkAdapter.ActivateActiveRequester(); - LOGGER_WRITE_1( "iLinkAdapter.ActivateActiveRequester() err: %d", err ); - } - - TRACE_FUNC_EXIT; - return( iObject ); - } - -// ----------------------------------------------------------------------------- -// CSConFTPplugin::PutPacketIndication() -// MObexServerNotify implementation -// ----------------------------------------------------------------------------- -// -TInt CSConFTPplugin::PutPacketIndication() - { - TRACE_FUNC_ENTRY; - TInt ret( KErrNone ); - - // always normal file transfer - if ( (TInt)iObject->Length() > 0 ) - { - if ( !iPutPacketIndicationCalled ) - { - // This is first check, need to check only once - TFileName path; - iFTPHandler->GetPath( path ); - if ( path.CompareF( K_C_ROOT ) == 0 ) - { - // path forbidden - ret = KErrAccessDenied; - } - else - { - if ( iPutError != KErrNone ) - { - ret = iPutError; - LOGGER_WRITE_1( "CSConFTPplugin::PutPacketIndication() : PutError : %d", iPutError ); - } - else - { - // check required free space - // if filesize is small ( <65k ) it fits into one package and its already saved to filesystem. - // if file is larger, need to check is there enought free space in device. - - const TUint32 filesize = iObject->Length(); - LOGGER_WRITE_1( "CSConFTPplugin::PutPacketIndication() filesize %d", filesize ); - LOGGER_WRITE_1( "CSConFTPplugin::PutPacketIndication() iObject->BytesReceived() %d", iObject->BytesReceived() ); - if ( filesize > iObject->BytesReceived() ) - { - LOGGER_WRITE( "CSConFTPplugin::PutPacketIndication() : check freespace" ); - // file does not fit into one obex packet, check is there enought free space in current drive - if ( iFTPHandler->IsCurrentDiskSpaceBelowCritical( filesize ) ) - { - LOGGER_WRITE( "CSConFTPplugin::PutPacketIndication() : returning KErrNoMemory" ); - ret = KErrNoMemory; - } - } - } - } - } - - if ( iShutdownInProgress ) - { - LOGGER_WRITE( "ShutdownInProgress, abort" ); - ret = KErrDisconnected; - } - } - - if ( !iPutPacketIndicationCalled ) - { - // Need to check only once - iPutPacketIndicationCalled = ETrue; - - //Check if filename is too long. - TFileName path; - iFTPHandler->GetPath( path ); - if ( ret == KErrNone && path.Length() + iObject->Name().Length() > KMaxFileName ) - { - LOGGER_WRITE_1( "Name length overflow! : %d", path.Length() + iObject->Name().Length() ); - ret = KErrBadName; - } - } - - if ( ret != KErrNone ) - { - if ( iFTPHandler ) - { - iFTPHandler->AbortFileTransfer( iObject ); - } - - delete iObject; - iObject = NULL; - - if ( iLinkAdapter.IsOpen() ) - { - // Cancel ActivateActiveRequester & allow going to low power mode - TInt err = iLinkAdapter.CancelLowPowerModeRequester(); - LOGGER_WRITE_1( "iLinkAdapter.CancelLowPowerModeRequester() err: %d", err ); - } - } - - LOGGER_WRITE_1( "CSConFTPplugin::PutPacketIndication returned: %d", ret ); - return TFTPpluginUtils::ConvertFTPResponseCode( ret ); - } - -// ----------------------------------------------------------------------------- -// CSConFTPplugin::PutCompleteIndication() -// MObexServerNotify implementation -// ----------------------------------------------------------------------------- -// -TInt CSConFTPplugin::PutCompleteIndication() - { - TRACE_FUNC_ENTRY; - TInt ret( KErrNone ); - TInt err( KErrNone ); - - if ( iLinkAdapter.IsOpen() ) - { - // Cancel ActivateActiveRequester & allow going to low power mode - TInt err2 = iLinkAdapter.CancelLowPowerModeRequester(); - LOGGER_WRITE_1( "iLinkAdapter.CancelLowPowerModeRequester() err: %d", err2 ); - } - - TObexHeaderMask validHdrs = iObject->ValidHeaders(); - TTime time = iObject->Time(); - - // shutdownWatcher is not needed anymore - delete iShutdownWatcher; - iShutdownWatcher = NULL; - - TInt size = iObject->BytesReceived(); - - if (!(validHdrs & KObexHdrTime)) - { - LOGGER_WRITE( "CSConFTPplugin::PutCompleteIndication() no valid time header received - using hometime" ); - time.HomeTime(); - TRAP( ret, iObject->SetTimeL(time) ); - LOGGER_WRITE_1( "CSConFTPplugin::PutCompleteIndication SetTimeL %d", ret ); - } - - if ( ( validHdrs & KObexHdrBody ) || ( validHdrs & KObexHdrEndOfBody ) ) - { - LOGGER_WRITE_1( "CSConFTPplugin::PutCompleteIndication : number of received bytes %d", size ); - TSConUsedMedia media( ESConNoMedia ); - - switch ( iMediaType ) - { - case ESrcsMediaBT: - media = ESConBTMedia; - break; - case ESrcsMediaIrDA: - media = ESConIRMedia; - break; - case ESrcsMediaUSB: - media = ESConUSBMedia; - break; - default: - media = ESConNoMedia; - break; - } - iFTPHandler->SetUsedMedia( media ); - - TRAP( ret, err = - this->iFTPHandler->PutFileObjectFinalizeL( iObject ) ); - LOGGER_WRITE_1( "CSConFTPplugin::PutCompleteIndication :PutFileObjectL %d", ret ); - } - else - { - LOGGER_WRITE( "CSConFTPplugin::PutCompleteIndication() : Delete starts" ); - TRAP( ret, err = this->iFTPHandler->DeleteObjectL( iObject->Name() ) ); - LOGGER_WRITE_1( "CSConFTPplugin::PutCompleteIndication : DeleteObjectL %d", ret ); - } - - if ( iObject ) - { - delete iObject; - iObject = NULL; - } - - iFTPHandler->DeleteTempFile(); - - if ( ret != KErrNone ) - { - LOGGER_WRITE_1( "CSConFTPplugin::PutCompleteIndication : returned %d", ret ); - return TFTPpluginUtils::ConvertFTPResponseCode( ret ); - } - - LOGGER_WRITE_1( "CSConFTPplugin::PutCompleteIndication : returned %d", err ); - return TFTPpluginUtils::ConvertFTPResponseCode( err ); - } - -// ----------------------------------------------------------------------------- -// CSConFTPplugin::GetRequestIndication( CObexBaseObject* aRequiredObject ) -// MObexServerNotify implementation -// ----------------------------------------------------------------------------- -// -CObexBufObject* CSConFTPplugin::GetRequestIndication( - CObexBaseObject* aRequiredObject ) - { - TRACE_FUNC_ENTRY; - CObexBufObject* bufObject(NULL); - if ( aRequiredObject->Type().Length() > KSConHeaderMaxLength ) - { - LOGGER_WRITE("TypeHeader too big"); - return NULL; - } - if ( aRequiredObject->Name().Length() > KMaxFileName ) - { - LOGGER_WRITE("NameHeader is too long"); - return NULL; - } - TInt ret( KErrNone ); - TInt err( KErrNone ); - TBuf8 typeHeader( aRequiredObject->Type() ); - TrimRightSpaceAndNull( typeHeader ); - LOGGER_WRITE8_1("type: %S", &typeHeader); - LOGGER_WRITE_1("name: %S", &aRequiredObject->Name()); - - iBuffer->Reset(); - - delete iObject; - iObject = NULL; - - TRAP( err, iObject = CObexBufObject::NewL ( iBuffer ) ); - if ( err != KErrNone ) - { - return NULL; - } - - // Client requests folder listing - if ( typeHeader == KSConFolderListType ) - { - LOGGER_WRITE( "Client requests folder listning" ); - if ( !iFTPHandler ) - { - LOGGER_WRITE( "Creating iFTPHandler has failed" ); - return NULL; - } - - TRAP( err, ret = iFTPHandler->GetFolderObjectL( iObject ) ); - LOGGER_WRITE_1( "iFTPHandler->GetFolderObjectL() returned: %d", ret ); - if ( err == KErrNone && ret == KErrNone ) - { - bufObject = iObject; - } - else - { - LOGGER_WRITE_1( "CSConFTPplugin::GetRequestIndication : Leavecode returned %d", err ); - return NULL; - } - } - - // Client requests a file - else - { - if ( iFileObject ) - { - delete iFileObject; - iFileObject = NULL; - } - - TRAP( err, iFileObject = CObexFileObject::NewL() ); - if ( err != KErrNone ) - { - LOGGER_WRITE( "Creating iFileObject has failed" ); - return NULL; - } - iFileObject->Reset(); - TRAP( err, iFileObject->SetNameL( aRequiredObject->Name() ) ); - - if ( err == KErrNone ) - { - if ( !iFTPHandler ) - { - LOGGER_WRITE( "CSConFTPplugin::GetRequestIndication() Creating iFTPHandler has failed" ); - return NULL; - } - - TRAP( err, ret = - this->iFTPHandler->GetFileObjectL( iFileObject ) ); - LOGGER_WRITE_1( "CSConFTPplugin::GetRequestIndication : GetFileObjectL returned %d", ret ); - } - if ( err == KErrNone && ret == KErrNone ) - { - bufObject = (CObexBufObject*)iFileObject; - } - else - { - LOGGER_WRITE_1( "CSConFTPplugin::GetRequestIndication : Leavecode %d", err ); - return NULL; - } - } - if ( bufObject && iLinkAdapter.IsOpen() ) - { - // request active BT mode (high power mode) - err = iLinkAdapter.ActivateActiveRequester(); - LOGGER_WRITE_1( "iLinkAdapter.ActivateActiveRequester() err: %d", err ); - } - return bufObject; - } - -// ----------------------------------------------------------------------------- -// CSConFTPplugin::GetPacketIndication() -// MObexServerNotify implementation -// ----------------------------------------------------------------------------- -// -TInt CSConFTPplugin::GetPacketIndication() - { - TRACE_FUNC; - return KErrNone; - } - -// ----------------------------------------------------------------------------- -// CSConFTPplugin::GetCompleteIndication() -// MObexServerNotify implementation -// ----------------------------------------------------------------------------- -// -TInt CSConFTPplugin::GetCompleteIndication() - { - TRACE_FUNC_ENTRY; - if ( iLinkAdapter.IsOpen() ) - { - // Cancel ActivateActiveRequester & allow going to low power mode - TInt err = iLinkAdapter.CancelLowPowerModeRequester(); - LOGGER_WRITE_1( "iLinkAdapter.CancelLowPowerModeRequester() err: %d", err ); - } - - TInt ret( KErrNone ); - if ( iFileObject ) - { - iFileObject->Reset(); - delete iFileObject; - iFileObject = NULL; - } - - LOGGER_WRITE_1( "CSConFTPplugin::GetCompleteIndication() : returned %d", ret ); - return ret; - } - -// ----------------------------------------------------------------------------- -// CSConFTPplugin::SetPathIndication( const CObex::TSetPathInfo& aPathInfo, -// const TDesC8& aInfo ) -// MObexServerNotify implementation -// ----------------------------------------------------------------------------- -// -TInt CSConFTPplugin::SetPathIndication( const CObex::TSetPathInfo& aPathInfo, - const TDesC8& /*aInfo*/ ) - { - TRACE_FUNC_ENTRY; - TInt ret( KErrNone ); - TInt err( KErrNone ); - - if ( !iFTPHandler ) - { - LOGGER_WRITE( "Creating iFTPHandler has failed" ); - return TFTPpluginUtils::ConvertFTPResponseCode( KErrNoMemory ); - } - - if ( aPathInfo.iFlags == KSConNULLSetPath ) - { - TRAP( err, ret = this->iFTPHandler->CreateFolderL( aPathInfo.iName ) ); - } - else - { - TRAP( err, ret = this->iFTPHandler->SetPathL( aPathInfo.iName, - aPathInfo.iFlags ) ); - } - - if ( err != KErrNone ) - { - LOGGER_WRITE_1( "CSConFTPplugin::SetPathIndication : returned %d", err ); - return TFTPpluginUtils::ConvertFTPResponseCode( err ); - } - LOGGER_WRITE_1( "CSConFTPplugin::SetPathIndication : returned %d", ret ); - return TFTPpluginUtils::ConvertFTPResponseCode( ret ); - } - -// ----------------------------------------------------------------------------- -// CSConFTPplugin::TrimRightSpaceAndNull( TDes8& aDes ) const -// Removes spaces and nulls from the end of the string -// ----------------------------------------------------------------------------- -// -void CSConFTPplugin::TrimRightSpaceAndNull( TDes8& aDes ) const - { - TRACE_FUNC; - aDes.TrimRight(); - if ( aDes.Length() > 0 ) - { - if ( !aDes[aDes.Length() - 1] ) - { - aDes.SetLength( aDes.Length() - 1 ); - } - } - } - -// ----------------------------------------------------------------------------- -// CSConFTPplugin::SetMediaType ( TSrcsMediaType aMediaType ) -// Current used transfer media (IR,USB,BT) -// ----------------------------------------------------------------------------- -// -void CSConFTPplugin::SetMediaType ( TSrcsMediaType aMediaType ) - { - TRACE_FUNC; - iMediaType = aMediaType; - } - -// ----------------------------------------------------------------------------- -// CSConFTPplugin::CSConFTPplugin() -// Constructor -// ----------------------------------------------------------------------------- -// -CSConFTPplugin::CSConFTPplugin() - { - TRACE_FUNC; - iBuffer = NULL; - iObject = NULL; - iFileObject = NULL; - iSessionActive = EFalse; - } - -// ----------------------------------------------------------------------------- -// CSConFTPplugin::ConstructL() -// Initializes member data -// ----------------------------------------------------------------------------- -// -void CSConFTPplugin::ConstructL() - { - TRACE_FUNC_ENTRY; - iBuffer = CBufFlat::NewL( KSConBufSize ); - iObject = CObexBufObject::NewL ( iBuffer ); - iServiceTimer = new (ELeave) CSConServiceTimer( this, KSConTimeOutValue ); - iServiceTimer->ConstructL(); - CActiveScheduler::Add( iServiceTimer ); - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConFTPplugin::SetObexServer( CObexServer* aObexServer ) -// SetObexServer -// ----------------------------------------------------------------------------- -// -TInt CSConFTPplugin::SetObexServer( CObexServer* aObexServer ) - { - iObexServer = aObexServer; - TInt ret = iObexServer->Start(this); - LOGGER_WRITE_1( "CSConFTPplugin::SetObexServer() ret: %d", ret ); - return ret; - } - -// End of file - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/ftp/src/sconftppluginutils.cpp --- a/connectivitymodules/SeCon/plugins/ftp/src/sconftppluginutils.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,129 +0,0 @@ -/* -* Copyright (c) 2005-2007 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: File Transfer Profile Plug-in utilities -* -*/ - - -// INCLUDE FILES -#include -#include "sconftppluginutils.h" -#include "debug.h" - -// ============================= MEMBER FUNCTIONS =============================== - -// ----------------------------------------------------------------------------- -// TFTPpluginUtils::ConvertFTPResponseCode( TInt aError ) -// Converts Symbian error code to OBEX error code -// ----------------------------------------------------------------------------- -// -TInt TFTPpluginUtils::ConvertFTPResponseCode( TInt aError ) - { - LOGGER_WRITE_1( "TFTPpluginUtils::ConvertFTPResponseCode : begin Code %d", aError ); - TInt obexErr ( KErrIrObexRespBadRequest ); - switch( aError ) - { - case KErrNone: - obexErr = KErrNone; - break; - case KErrNotFound: - obexErr = KErrIrObexRespNotFound; - break; - case KErrGeneral: - case KErrCancel: - obexErr = KErrIrObexRespBadRequest; - break; - case KErrNoMemory: - obexErr = KErrIrObexRespDatabaseFull; - break; - case KErrNotSupported: - obexErr = KErrIrObexRespNotImplemented; - break; - case KErrArgument: - case KErrTotalLossOfPrecision: - case KErrBadHandle: - case KErrOverflow: - case KErrUnderflow: - case KErrAlreadyExists: - obexErr = KErrIrObexRespConflict; - break; - case KErrPathNotFound: - case KErrDied: - obexErr = KErrIrObexRespNotFound; - break; - case KErrInUse: - obexErr = KErrIrObexRespTimedOut; - break; - case KErrServerTerminated: - obexErr = KErrIrObexRespNotFound; - break; - case KErrServerBusy: - case KErrCompletion: - case KErrNotReady: - case KErrUnknown: - case KErrCorrupt: - obexErr = KErrIrObexRespForbidden; - break; - case KErrAccessDenied: - case KErrLocked: - obexErr = KErrIrObexRespUnauthorized; - break; - case KErrWrite: - case KErrDisMounted: - case KErrEof: - obexErr = KErrIrObexRespForbidden; - break; - case KErrDiskFull: - obexErr = KErrIrObexRespDatabaseFull; - break; - case KErrBadDriver: - case KErrBadName: - obexErr = KErrIrObexRespPreCondFailed; - break; - case KErrCommsLineFail: - case KErrCommsFrame: - case KErrCommsOverrun: - case KErrCommsParity: - case KErrTimedOut: - case KErrCouldNotConnect: - case KErrCouldNotDisconnect: - case KErrBadLibraryEntryPoint: - case KErrBadDescriptor: - case KErrAbort: - obexErr = KErrIrObexRespForbidden; - break; - case KErrTooBig: - obexErr = KErrIrObexRespReqEntityTooLarge; - break; - case KErrDivideByZero: - case KErrBadPower: - case KErrDirFull: - case KErrHardwareNotAvailable: - obexErr = KErrIrObexRespForbidden; - break; - case KErrDisconnected: // System is shutting down - obexErr = KErrIrObexRespMethodNotAllowed; - break; - default: - obexErr = KErrIrObexRespBadRequest; - break; - }; - LOGGER_WRITE_1( "TFTPpluginUtils::ConvertFTPResponseCode : returned %d", obexErr ); - return obexErr; -}; - -//End of file - - - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/ftp/src/sconservicetimer.cpp --- a/connectivitymodules/SeCon/plugins/ftp/src/sconservicetimer.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,119 +0,0 @@ -/* -* Copyright (c) 2005-2007 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: File Transfer Profile Plug-in Service Timer implementation -* -*/ - - -// INCLUDE FILES - -#include "sconservicetimer.h" -#include "sconftpplugin.h" -#include "debug.h" - -// ============================= MEMBER FUNCTIONS =============================== - -// ----------------------------------------------------------------------------- -// CSConServiceTimer::CSConServiceTimer( CSConFTPplugin* aEngine, TInt aValue ) -// Constuctor -// ----------------------------------------------------------------------------- -// -CSConServiceTimer::CSConServiceTimer( CSConFTPplugin* aEngine, TInt aValue ) - : CActive( EPriorityStandard ), iEngine( aEngine ), iValue( aValue ) {} - -// ----------------------------------------------------------------------------- -// CSConServiceTimer::ConstructL() -// Initializes member data -// ----------------------------------------------------------------------------- -// -void CSConServiceTimer::ConstructL() - { - LOGGER_ENTERFN( "CSConServiceTimer::ConstructL()" ); - // create a thread-relative timer - User::LeaveIfError( iTimer.CreateLocal() ); - LOGGER_LEAVEFN( "CSConServiceTimer::ConstructL()" ); - } - -// ----------------------------------------------------------------------------- -// CSConServiceTimer::~CSConServiceTimer() -// Destructor -// ----------------------------------------------------------------------------- -// -CSConServiceTimer::~CSConServiceTimer() - { - LOGGER_ENTERFN( "CSConServiceTimer::~CSConServiceTimer()" ); - iTimer.Close(); - LOGGER_LEAVEFN( "CSConServiceTimer::~CSConServiceTimer()" ); - } - -// ----------------------------------------------------------------------------- -// CSConServiceTimer::~CSConServiceTimer() -// Starts the timer -// ----------------------------------------------------------------------------- -// -void CSConServiceTimer::StartTimer() - { - LOGGER_ENTERFN( "CSConServiceTimer::StartTimer()" ); - if( !IsActive() ) - { - LOGGER_WRITE( "CSConServiceTimer::StartTimer() : !IsActive()" ); - iTimer.After( iStatus, TTimeIntervalMicroSeconds32( iValue ) ); - iEngine->iSessionActive = ETrue; - SetActive(); - LOGGER_WRITE( "CSConServiceTimer::StartTimer() : SetActive()" ); - } - LOGGER_LEAVEFN( "CSConServiceTimer::StartTimer()" ); - } - -// ----------------------------------------------------------------------------- -// CSConServiceTimer::StopTimer() -// StopTimer() -// ----------------------------------------------------------------------------- -// -void CSConServiceTimer::StopTimer() - { - LOGGER_ENTERFN( "CSConServiceTimer::StopTimer()" ); - iEngine->iSessionActive = ETrue; - LOGGER_WRITE( "CSConServiceTimer::StopTimer() : iSessionActive = ETrue" ); - LOGGER_LEAVEFN( "CSConServiceTimer::StopTimer()" ); - } - -// ----------------------------------------------------------------------------- -// CSConServiceTimer::DoCancel() -// Cancels the timer -// ----------------------------------------------------------------------------- -// -void CSConServiceTimer::DoCancel() - { - LOGGER_ENTERFN( "CSConServiceTimer::DoCancel()" ); - iTimer.Cancel(); - LOGGER_LEAVEFN( "CSConServiceTimer::DoCancel()" ); - } - -// ----------------------------------------------------------------------------- -// CSConServiceTimer::RunL() -// Executed when timer is triggered -// ----------------------------------------------------------------------------- -// -void CSConServiceTimer::RunL() - { - LOGGER_ENTERFN( "CSConServiceTimer::RunL()" ); - iEngine->iSessionActive = EFalse; - LOGGER_WRITE( "CSConServiceTimer::RunL() : iSessionActive = EFalse" ); - iEngine->iStartTimer = EFalse; - LOGGER_WRITE( "CSConServiceTimer::RunL() : iStartTimer = EFalse " ); - LOGGER_LEAVEFN( "CSConServiceTimer::RunL()" ); - } - -// End of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/ftp/src/sconshutdownwatcher.cpp --- a/connectivitymodules/SeCon/plugins/ftp/src/sconshutdownwatcher.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,153 +0,0 @@ -/* -* Copyright (c) 2007 Nokia Corporation and/or 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: Power shutdown -watcher implementation -* -*/ - - -// INCLUDE FILES - -#include "sconshutdownwatcher.h" -#include "debug.h" - -#include - - - -// ============================= MEMBER FUNCTIONS =============================== - -// ----------------------------------------------------------------------------- -// CShutdownWatcher::NewL( MShutdownObserver* aObserver ) -// Two-phase constructor -// ----------------------------------------------------------------------------- -// -CShutdownWatcher* CShutdownWatcher::NewL( MShutdownObserver* aObserver ) - { - LOGGER_ENTERFN( "CShutdownWatcher::NewL()" ); - CShutdownWatcher* self = new (ELeave) CShutdownWatcher( aObserver ); - CleanupStack::PushL(self); - self->ConstructL(); - CleanupStack::Pop(self); - LOGGER_LEAVEFN( "CShutdownWatcher::NewL()" ); - return self; - } - -// ----------------------------------------------------------------------------- -// CShutdownWatcher::~CShutdownWatcher() -// Destructor -// ----------------------------------------------------------------------------- -// -CShutdownWatcher::~CShutdownWatcher() - { - LOGGER_ENTERFN( "CShutdownWatcher::~CShutdownWatcher()" ); - Cancel(); - iProperty.Close(); - LOGGER_LEAVEFN( "CShutdownWatcher::~CShutdownWatcher()" ); - } - -// ----------------------------------------------------------------------------- -// CShutdownWatcher::StartShutdownWatcher() -// Starts to watch shutdown status -// ----------------------------------------------------------------------------- -// -void CShutdownWatcher::StartShutdownWatcher() - { - LOGGER_ENTERFN( "CShutdownWatcher::StartShutdownWatcher()" ); - TInt status; - TInt err = iProperty.Get( KPSUidStartup, KPSGlobalSystemState, status ); - LOGGER_WRITE_2( "CShutdownWatcher::StartShutdownWatcher() :\ - err %d, KPSGlobalSystemState status %d", err, status); - if ( err == KErrNone ) - { - if ( status == ESwStateShuttingDown ) - { - LOGGER_WRITE( "Call NotifyShutdown" ); - iObserver->NotifyShutdown(); - return; - } - } - - err = iProperty.Attach( KPSUidStartup, KPSGlobalSystemState ); - LOGGER_WRITE_1( "CShutdownWatcher::StartShutdownWatcher() :\ - iProperty.Attach( KPSUidStartup, KPSGlobalSystemState ) : err %d", err ); - iProperty.Subscribe( iStatus ); - LOGGER_WRITE( "CShutdownWatcher::StartShutdownWatcher() :\ - iProperty.Subscribe( iStatus ) : ok" ); - SetActive(); - - LOGGER_LEAVEFN( "CShutdownWatcher::StartShutdownWatcher()" ); - } - -// ----------------------------------------------------------------------------- -// CShutdownWatcher::DoCancel() -// Executed when CActive is canceled. -// ----------------------------------------------------------------------------- -// -void CShutdownWatcher::DoCancel() - { - LOGGER_ENTERFN( "CShutdownWatcher::DoCancel()" ); - iProperty.Cancel(); - LOGGER_LEAVEFN( "CShutdownWatcher::DoCancel()" ); - } - -// ----------------------------------------------------------------------------- -// CShutdownWatcher::RunL() -// Executed when disk watcher is triggered -// ----------------------------------------------------------------------------- -// -void CShutdownWatcher::RunL() - { - LOGGER_ENTERFN( "CShutdownWatcher::RunL()" ); - TInt status; - iProperty.Get( status ); - LOGGER_WRITE_1( "CShutdownWatcher::RunL() : status %d", status ); - - if ( status == ESwStateShuttingDown ) - { - LOGGER_WRITE( "Call NotifyShutdown" ); - iObserver->NotifyShutdown(); - return; - } - - iProperty.Cancel(); - iProperty.Close(); - - LOGGER_LEAVEFN( "CShutdownWatcher::RunL()" ); - } - - -// ----------------------------------------------------------------------------- -// CShutdownWatcher::CShutdownWatcher( MShutdownObserver* aObserver ) -// Default constructor -// ----------------------------------------------------------------------------- -// -CShutdownWatcher::CShutdownWatcher( MShutdownObserver* aObserver ) -: CActive(EPriorityStandard), - iObserver(aObserver) - { - } - -// ----------------------------------------------------------------------------- -// CShutdownWatcher::ConstructL() -// Initializes member data -// ----------------------------------------------------------------------------- -// -void CShutdownWatcher::ConstructL() - { - LOGGER_ENTERFN( "CShutdownWatcher::ConstructL()" ); - CActiveScheduler::Add(this); - LOGGER_LEAVEFN( "CShutdownWatcher::ConstructL()" ); - } - -// End of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/hapticsconnplugin/data/2001FE54.rss --- a/connectivitymodules/SeCon/plugins/hapticsconnplugin/data/2001FE54.rss Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,74 +0,0 @@ -/* -* Copyright (c) 2001 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Plugin info file. -* -*/ - - -#include "ecom/registryinfo.rh" - -// Declares info for two implementations -RESOURCE REGISTRY_INFO theInfo - { - // UID for the DLL - dll_uid = 0x2001FE54; - // Declare array of interface info - interfaces = - { - INTERFACE_INFO - { - // UID of interface that is implemented - interface_uid = 0x101F7C8C; - implementations = - { - IMPLEMENTATION_INFO - { - implementation_uid = 0x2001FE53; - version_no = 1; - display_name = "Haptics Bridge"; - default_data = "OBEX/USB||OBEX/BT"; - // - // opaque_data contains parameters used by following API calls in SRCS: - // 1. Setup USB interface string descriptor in Unicode; - // 2. TInt CObex::SetLocalWho(const TDesC8& aInfo); - // 3. TInt CBTConnection::RegisterSecuritySettingsL( TUint aService, - // TInt aProtocol, - // TInt aChannel, - // TBool aAuthenticate, - // TBool aAuthorise, - // TBool aEncrypt ); - // opaque_data = "@0||@1||@2||@3||@4||@5||@6" - // @0 aStrDesc e.g. "PC Connectivity" - // @1 aInfo e.g. KFolderBrowsingID, "\xF9\xEC\x7B\xC4\x95\x3C\x11\xd2\x98\x4E\x52\x54\x00\xDC\x9E\x09" - // @2 aService e.g. KBTSecurityUidFileTransfer, 0x1106 - // @3 aProtocol e.g. KSolBtRFCOMM, 0x1013 - // @4 aAuthenticate e.g. EFalse, 0 - // @5 aAuthorise e.g. EFalse, 0 - // @6 aEncrypt e.g. EFalse, 0 - // - opaque_data = "Haptics Bridge|"\ - "|\xF9\xEC\x7B\xC4\x95\x3C\x11\xd2\x98\x4E\x52\x54\x00\xDC\x9E\x09|"\ - "|0x2001E2B5|"\ - "|0x1013|"\ - "|0|"\ - "|1|"\ - "|0|"\ - "|0xffff|"\ - "|0xffff"; - } - }; - } - }; - } - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/hapticsconnplugin/group/bld.inf --- a/connectivitymodules/SeCon/plugins/hapticsconnplugin/group/bld.inf Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Haptics connection plugin build file. -* -*/ - -#include - -PRJ_PLATFORMS -DEFAULT - -PRJ_EXPORTS -../rom/hapticsconnplugin.iby CORE_IBY_EXPORT_PATH(mw, hapticsconnplugin.iby) - -PRJ_MMPFILES -hapticsconnplugin.mmp - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/hapticsconnplugin/group/hapticsconnplugin.mmp --- a/connectivitymodules/SeCon/plugins/hapticsconnplugin/group/hapticsconnplugin.mmp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Haptics connection plugin project definition file. -* -*/ - - -#include -#include - -VENDORID VID_DEFAULT - -CAPABILITY CAP_ECOM_PLUGIN - -TARGET hapticsconnplugin.dll -TARGETTYPE PLUGIN - -UID 0x10009D8D 0x2001FE54 - -SOURCEPATH ../src - -SOURCE hapticsconnplugin.cpp -SOURCE hapticsconntimer.cpp -SOURCE hapticsmsghandler.cpp -SOURCE hapticsbridgeclient.cpp -SOURCE proxy.cpp - -SOURCEPATH ../data - -START RESOURCE 2001FE54.rss - TARGET hapticsconnplugin.rsc -END - -MW_LAYER_SYSTEMINCLUDE -SYSTEMINCLUDE /epoc32/include/stdapis - -USERINCLUDE ../inc - -LIBRARY flogger.lib -LIBRARY euser.lib -LIBRARY ecom.lib -LIBRARY efsrv.lib -LIBRARY avkon.lib -LIBRARY bafl.lib -LIBRARY platformenv.lib -LIBRARY irobex.lib -LIBRARY hwrmhapticspacketizer.lib diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/hapticsconnplugin/inc/hapticsbridgeclient.h --- a/connectivitymodules/SeCon/plugins/hapticsconnplugin/inc/hapticsbridgeclient.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,101 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Client interface to haptics server for haptics bridge -* commands. -* -*/ - - -#ifndef C_HAPTICSBRIDGECLIENT_H -#define C_HAPTICSBRIDGECLIENT_H - -#include - -class CHWRMHapticsPacketizer; - -class RHapticsBridgeClient : public RSessionBase -{ -public: - /** - * Constructor - */ - RHapticsBridgeClient(); - - /** - * Destructor - */ - virtual ~RHapticsBridgeClient(); - -public: - /** - * Create a connection to haptics server. - */ - TInt Connect(); - - /** - * Close the connection to haptics server. - */ - void Close(); - - /** - * Send message to haptics server. - * @param aReqData Data request to be sent to haptics server. - * @param aRetDataPckg Returned data from haptics server. - * @return KErrNone if sent succesfully, otherwise system wide error code. - */ - TInt SendBridgeBuffer( const TDesC8& aReqData, TDes8& aRetDataPckg ); - - /** - * Sends a message clean-up commend to haptics server. - */ - void CleanUp(); - - -private: - - /** - * Returns the version of the haptics server. - * @return Version. - */ - TVersion ServerVersion() const; - - /** - * Starts the server process if it is not already running. - * @return KErrNone on success, otherwise a system error code. - */ - TInt StartServer() const; - - /** - * Handles the device opening request. - * @param aResponse Reference to a descriptor containing the response - * received from haptics server. - */ - void HandleOpenDeviceResponseL( const TDesC8& aResponse ); - - /** - * Opens the haptic effect ("vibra") device. - * @return KErrNone on success, otherwise a system error code. - */ - TInt OpenHapticsDevice(); - -private: - - /** - * Haptic packetizer. - * Owned. - */ - CHWRMHapticsPacketizer* iPacketizer; -}; - -#endif // C_HAPTICSBRIDGECLIENT_H \ No newline at end of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/hapticsconnplugin/inc/hapticsconnplugin.h --- a/connectivitymodules/SeCon/plugins/hapticsconnplugin/inc/hapticsconnplugin.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Haptics OBEX connection plugin. -* -*/ - - -#ifndef C_HAPTICSCONNPLUGIN_H -#define C_HAPTICSCONNPLUGIN_H - -#include -#include - -class CHapticsMsgHandler; - -class CHapticsConnPlugin : public CSrcsInterface - { - public: - /** - * 2-phased constructor. - */ - static CHapticsConnPlugin* NewL(); - - /** - * Destructor. - */ - virtual ~CHapticsConnPlugin(); - - /** - * From CSrcsInterface. - * @see CSrcsInterface. - */ - TBool IsOBEXActive(); - - private: - /** - * 2nd phase constructor. - */ - void ConstructL(); - - /** - * Constructor. - */ - CHapticsConnPlugin(); - - private: - /** - * Component to handle messages between file systen and - * haptics server. - * Own. - */ - CHapticsMsgHandler* iMsgHandler; - }; - -#endif // C_HAPTICSCONNPLUGIN_H \ No newline at end of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/hapticsconnplugin/inc/hapticsconntimer.h --- a/connectivitymodules/SeCon/plugins/hapticsconnplugin/inc/hapticsconntimer.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,71 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Connection shutdown timer for haptics server connection. -* -*/ - - -#ifndef C_HAPTICSCONNTIMER_H -#define C_HAPTICSCONNTIMER_H - -#include - -#include "hapticsmsghandler.h" - -NONSHARABLE_CLASS ( CHapticsConnTimer ) : public CTimer - { - public: - /** - * 2-phased constructor. - */ - static CHapticsConnTimer* NewL( MHapticsConnectionShutdown* aCallback ); - - /** - * Destructor. - */ - virtual ~CHapticsConnTimer(); - - /** - * Starts the timer - */ - void Start(); - - private: // From CActive. - /** - * Notifies client on timeout. - */ - void RunL(); - - private: - /** - * Constructor. - */ - CHapticsConnTimer( MHapticsConnectionShutdown* aCallback ); - - /** - * 2nd phase constructor. - */ - void ConstructL(); - - private: - /** - * Callback interface to notify about timeout. - * Not own. - */ - MHapticsConnectionShutdown* iCallback; - }; - -#endif // C_HAPTICSCONNTIMER_H - -// End of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/hapticsconnplugin/inc/hapticsconntrace.h --- a/connectivitymodules/SeCon/plugins/hapticsconnplugin/inc/hapticsconntrace.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,113 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Haptics conn plugin debug trace macro definition header file. -* -*/ -#ifndef HAPTICSCONNTRACE_H -#define HAPTICSCONNTRACE_H - -#include -#include -#include -#include -#include - -/** - * Writes formatted string data to a file using RFileLogger. - * - * @param aFmt Value-referenced descriptor containing the formatted string. - */ -inline void HwrmWriteFormat( TRefByValue aFmt, ... ) - { - _LIT( KDir, "Hwrm" ); - _LIT( KName, "Hwres.log" ); - - // take the ellipsis parameters - VA_LIST args; - VA_START( args, aFmt ); - RFileLogger::WriteFormat( KDir, KName, EFileLoggingModeAppend, aFmt, args ); - VA_END( args ); - } - -/** - * Writes data dump in hex format in "[ 00 01 FF ]" style. - * - * @param aPrefix Descriptor containing the string to be appended in - * front of the actual data dump. - * @param aData An 8-bit descriptor containing the data buffer for which - * the data dump is written. - */ -inline void DataDumpTrace( const TDesC& aPrefix, const TDesC8& aData ) - { - _LIT( KSATraceDataDumpStart, " [ " ); - _LIT( KSATraceDataDumpLineAlign, " " ); - _LIT( KSATraceDataDumpStop, " ] " ); - _LIT( KSATraceDataDumpValue, "%02x " ); - const TInt KSASDataDumpTraceBytesPerLine = 10; - - HBufC* buffer = HBufC::New( 255 ); - - if ( buffer != NULL ) - { - buffer->Des().Copy( aPrefix ); - buffer->Des().Append( KSATraceDataDumpStart ); - for ( TInt i = 0; i < aData.Length(); i++) - { - buffer->Des().AppendFormat( KSATraceDataDumpValue, aData[i] ); - - if( ( i % KSASDataDumpTraceBytesPerLine == ( KSASDataDumpTraceBytesPerLine - 1 ) ) && - ( i + 1 < aData.Length() ) ) - { - RDebug::Print( buffer->Des() ); - - buffer->Des().Copy( aPrefix); - buffer->Des().Append( KSATraceDataDumpLineAlign ); - } - } - buffer->Des().Append( KSATraceDataDumpStop ); - - RDebug::Print( buffer->Des() ); - - } - - delete buffer; - } - -#ifdef _DEBUG - - #ifdef USE_FILE_LOGGING - - #define COMPONENT_TRACE( a ) HwrmWriteFormat a - #define API_TRACE( a ) HwrmWriteFormat a - #define DATADUMP_TRACE( a, b ) - - #else - - #define COMPONENT_TRACE( a ) RDebug::Print a - #define API_TRACE( a ) RDebug::Print a - #define DATADUMP_TRACE( a, b ) DataDumpTrace( a, b ) - - #endif // #ifdef USE_FILE_LOGGING - -#else // #ifdef _DEBUG - - #define COMPONENT_TRACE( a ) - #define API_TRACE( a ) - #define DATADUMP_TRACE( a, b ) - -#endif //#ifdef _DEBUG -#endif //#ifndef HAPTICSCONNTRACE_H - - -// End of File diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/hapticsconnplugin/inc/hapticsmsghandler.h --- a/connectivitymodules/SeCon/plugins/hapticsconnplugin/inc/hapticsmsghandler.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,136 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Handles messaging between file system and haptics -* client interface. -* -*/ - - -#ifndef C_HAPTICSMSGHANDLER_H -#define C_HAPTICSMSGHANDLER_H - -#include -#include -#include - -#include "hapticsbridgeclient.h" - -class CHapticsConnTimer; - -/** - * Interface to notify about connection timeout. - */ -class MHapticsConnectionShutdown - { - public: - /** - * Called to notify about connection timeout. - */ - virtual void NotifyShutdown() = 0; - - }; - -/** - * Helper class for Bridge functionality for handling RFs (File Session) - * change notifications for VibeTonz request file. - * - * @since S60 5.1 - */ -class CHapticsMsgHandler : public CActive, - public MHapticsConnectionShutdown - { -public: - /** - * 2-phased constructor. - */ - static CHapticsMsgHandler* NewL(); - - /** - * Destructor - */ - virtual ~CHapticsMsgHandler(); - - /** - * Method for starting the listening for change notifications - */ - void StartNotifier(); - - /** - * From MHapticsConnectionShutdown. - * Called to notify about connection timeout. - */ - void NotifyShutdown(); - -protected: // From CActive. - /** - * @see CActive - */ - void RunL(); - /** - * @see CActive - */ - TInt RunError(TInt aError); - /** - * @see CActive - */ - void DoCancel(); - -private: - - /** - * Constructor - */ - CHapticsMsgHandler(); - - /** - * Two-phase construction ConstructL - */ - void ConstructL(); - - /** - * Method for connecting to file system. Also sets the paths and - * creates directories (if not already exists). - */ - void ConnectToFilesystemL(); - - /** - * Helper for clearing the possible left-over request file from - * previous runs. - */ - void ClearRequestFile(); - -private: // data - - /** - * File server session through which all file server related - * services are requested. - */ - RFs iFs; - - /** - * Buffer for the request file data - */ - HBufC8* iReqBuf; - - /** - * The RHapticsBridgeClient object that is responsible for further - * handling of received Bridge commands - */ - RHapticsBridgeClient iClient; - - CHapticsConnTimer* iConnectionTimeout; - - }; - -#endif // C_HAPTICSMSGHANDLER_H diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/hapticsconnplugin/rom/hapticsconnplugin.iby --- a/connectivitymodules/SeCon/plugins/hapticsconnplugin/rom/hapticsconnplugin.iby Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: IBY file for Haptics conn plugin. -* -*/ - - -#ifndef HAPTICSCONNPLUGIN_IBY -#define HAPTICSCONNPLUGIN_IBY - -#include - -ECOM_PLUGIN(hapticsconnplugin.dll,hapticsconnplugin.rsc) - -#endif // HAPTICSCONNPLUGIN_IBY diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/hapticsconnplugin/src/hapticsbridgeclient.cpp --- a/connectivitymodules/SeCon/plugins/hapticsconnplugin/src/hapticsbridgeclient.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,317 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Client interface to haptics server for haptics bridge -* commands. -* -*/ - - -#include -#include -#include // KDC_PROGRAMS_DIR -#include -#include -#include - -#include "hapticsbridgeclient.h" -#include "hapticsconntrace.h" - -const TInt KServerVersionMajor = 1; -const TInt KServerVersionMinor = 1; -const TInt KServerVersionBuild = 1; -_LIT( KServerProcessName, "!hwrmhapticsserver" ); -_LIT( KServerExeName, "hwrmhapticsserver.exe" ); -const TInt KAsyncMsgSlots = 10; - -const TInt KHWRMHapticsServiceCommand = 2001; -const TInt KHWRMHapticsOpenActuatorCommand = 2004; -const TInt KHWRMHapticsCleanupCommand = 2008; -const TInt KHWRMHapticsBridgeCommand = 2011; - -// -------------------------------------------------------------------------- -// Simple constructor -// -// -------------------------------------------------------------------------- -// -RHapticsBridgeClient::RHapticsBridgeClient() - { - TRAP_IGNORE( iPacketizer = - CHWRMHapticsPacketizer::NewL( EHWRMLogicalActuatorAny ) ); - } - -// -------------------------------------------------------------------------- -// Simple destructor -// -// -------------------------------------------------------------------------- -// -RHapticsBridgeClient::~RHapticsBridgeClient() - { - delete iPacketizer; - } - -// -------------------------------------------------------------------------- -// Method for connecting (creating a new session) with Haptics Server -// -// -------------------------------------------------------------------------- -// -TInt RHapticsBridgeClient::Connect() - { - COMPONENT_TRACE( ( _L( "RHapticsBridgeClient::Connect()" ) ) ); - TInt ret = CreateSession( KServerProcessName, - ServerVersion(), - KAsyncMsgSlots ); - if ( ret != KErrNone ) - { - ret = StartServer(); - if ( ret == KErrNone ) - { - ret = CreateSession( KServerProcessName, - ServerVersion(), - KAsyncMsgSlots ); - COMPONENT_TRACE(_L("RHapticsBridgeClient::Connect(), Session created")); - } - } - - // Initialize server components. - if ( ret == KErrNone ) - { - ret = SendReceive( KHWRMHapticsServiceCommand ); - } - - // Open the haptic effect ("vibra") device. - if ( ret == KErrNone ) - { - ret = OpenHapticsDevice(); - } - - - COMPONENT_TRACE( ( _L( "RHapticsBridgeClient::Connect - return(%d)" ), ret ) ); - return ret; - } - -// -------------------------------------------------------------------------- -// Method for starting Haptics Server (if not already running) -// -// -------------------------------------------------------------------------- -// -TInt RHapticsBridgeClient::StartServer() const - { - COMPONENT_TRACE( ( _L( "RHapticsBridgeClient::StartServer()" ) ) ); - - TParse parser; - parser.Set( KServerExeName, &KDC_PROGRAMS_DIR, NULL ); - - RProcess server; - TInt ret = server.Create( parser.FullName(), KNullDesC ); - - if ( ret != KErrNone ) // Loading failed. - { - return ret; - } - - TRequestStatus status; - server.Rendezvous( status ); - - if ( status != KRequestPending ) - { - server.Kill( 0 ); // Abort startup. - server.Close(); - return KErrGeneral; - } - else - { - server.Resume(); // Logon OK - start the server. - } - - User::WaitForRequest( status ); - server.Close(); - - COMPONENT_TRACE( ( _L( "RHapticsBridgeClient::StartServer() - return %d" ), status.Int() ) ); - return status.Int(); - } - -// -------------------------------------------------------------------------- -// Method for closing session to haptics server. -// -// -------------------------------------------------------------------------- -// -void RHapticsBridgeClient::Close() - { - RSessionBase::Close(); - } - -// -------------------------------------------------------------------------- -// Getter method for server version. -// -// -------------------------------------------------------------------------- -// -TVersion RHapticsBridgeClient::ServerVersion() const - { - return TVersion( KServerVersionMajor, - KServerVersionMinor, - KServerVersionBuild ); - } - -// -------------------------------------------------------------------------- -// Method for sending commands to Haptics Server. -// -// -------------------------------------------------------------------------- -// -TInt RHapticsBridgeClient::SendBridgeBuffer( const TDesC8& aReqData, TDes8& aRetDataPckg ) - { - COMPONENT_TRACE( ( _L( "RHapticsBridgeClient::SendBridgeBufferL() - Begin" ) ) ); - - TInt retVal( KErrDisconnected ); - if ( iHandle ) - { - TInt vibeStatus(0); - TPckg vibeStatusPckg( vibeStatus ); - retVal = SendReceive( KHWRMHapticsBridgeCommand, - TIpcArgs( &aReqData, - &vibeStatusPckg, - &aRetDataPckg ) ); - - if ( retVal == KErrNone ) - { - TRAP( retVal, HandleOpenDeviceResponseL( aRetDataPckg ) ); - } - } - - COMPONENT_TRACE( ( _L( "RHapticsBridgeClient::SendBridgeBufferL() - End (%d)" ), retVal ) ); - return retVal; - } - -// -------------------------------------------------------------------------- -// Method for cleaning up session to Haptics Server. -// -// -------------------------------------------------------------------------- -// -void RHapticsBridgeClient::CleanUp() - { - COMPONENT_TRACE( ( _L( "RHapticsBridgeClient::CleanUp() - Begin" ) ) ); - if ( iHandle ) - { - SendReceive ( KHWRMHapticsCleanupCommand ); - } - COMPONENT_TRACE( ( _L( "RHapticsBridgeClient::CleanUp() - End" ) ) ); - } - -// -------------------------------------------------------------------------- -// Method for handling Open Device responses (basically for requesting the -// setting of the license key). -// -// -------------------------------------------------------------------------- -// -void RHapticsBridgeClient::HandleOpenDeviceResponseL( const TDesC8& aResponse ) - { - COMPONENT_TRACE( ( _L( "RHapticsBridgeClient::HandleOpenDeviceResponse() - Begin" ) ) ); - TInt err( KErrNone ); - if ( !iPacketizer ) - { - COMPONENT_TRACE( ( _L( "RHapticsBridgeClient::HandleOpenDeviceResponse() - No Packetizer!" ) ) ); - User::Leave( KErrGeneral ); - } - else - { - const TUint8* pRsp ( aResponse.Ptr() ); - if ( 0x12 == pRsp[0] && 0x00 == pRsp[1] && 0x00 == pRsp[2] ) - { - COMPONENT_TRACE( ( _L( "RHapticsBridgeClient::HandleOpenDeviceResponse() - OPEN DEVICE RESPONSE handling" ) ) ); - iPacketizer->DecodeMessageL( aResponse, err ); - if ( !err ) - { - RBuf8 reqBuf; - err = iPacketizer->EncSetPlatformLicenseKeyReq( - iPacketizer->DeviceHandle(), reqBuf ); - if ( !err ) - { - TBuf8<50> dummyRetBuf; - TInt dummyStatus; - TPckg dummyStatusPckg( dummyStatus ); - err = SendReceive( KHWRMHapticsBridgeCommand, - TIpcArgs ( &reqBuf, - &dummyStatusPckg, - &dummyRetBuf ) ); - COMPONENT_TRACE( ( _L( "RHapticsBridgeClient::HandleOpenDeviceResponse() - Sent set license command (%d)"), err ) ); - } - reqBuf.Close(); - } - User::LeaveIfError( err ); - } - } - COMPONENT_TRACE( ( _L( "RHapticsBridgeClient::HandleOpenDeviceResponse() - End" ) ) ); - } - - -// -------------------------------------------------------------------------- -// Method for opening haptics device. This is needed since there's possibility -// that no other haptics client has opened the device prior to this bridge -// connectivity. This method also call set license key, i.e., completes the -// device opening. -// -// -------------------------------------------------------------------------- -// -TInt RHapticsBridgeClient::OpenHapticsDevice() - { - COMPONENT_TRACE( ( _L( "RHapticsBridgeClient::OpenHapticsDevice - Begin" ) ) ); - TInt err( KErrGeneral ); - if ( iPacketizer ) - { - RBuf8 openDevReqBuf; - RBuf8 setLicenseReqBuf; - TBuf8<50> setLicenseRspBuf; - TInt dummyStatus; - TPckg dummyStatusPckg( dummyStatus ); - - err = iPacketizer->EncOpenDeviceReq( EHWRMLogicalActuatorAny, - openDevReqBuf ); - - COMPONENT_TRACE( ( _L( "RHapticsBridgeClient::OpenHapticsDevice - EncOpenDevice (%d)" ), err ) ); - if ( !err ) - { - TInt deviceHandle; - TPckg deviceHandlePckg( deviceHandle ); - err = SendReceive( KHWRMHapticsOpenActuatorCommand, - TIpcArgs ( &openDevReqBuf, - &deviceHandlePckg, - EHWRMLogicalActuatorAny ) ); - COMPONENT_TRACE( ( _L( "RHapticsBridgeClient::OpenHapticsDevice - Send OpenDevice (%d)" ), err ) ); - COMPONENT_TRACE( ( _L( "RHapticsBridgeClient::OpenHapticsDevice - Device handle = %d" ), deviceHandle ) ); - if ( !err ) - { - err = iPacketizer->EncSetPlatformLicenseKeyReq( - deviceHandle, setLicenseReqBuf ); - COMPONENT_TRACE( ( _L( "RHapticsBridgeClient::OpenHapticsDevice - EncSetEmptyLicenseKey (%d)" ), err ) ); - if ( !err ) - { - TBuf8<50> dummyRspBuf; - TInt dummyStatus; - TPckg dummyStatusPckg( dummyStatus ); - err = SendReceive( KHWRMHapticsBridgeCommand, - TIpcArgs ( &setLicenseReqBuf, - &dummyStatusPckg, - &dummyRspBuf ) ); - COMPONENT_TRACE( ( _L( "RHapticsBridgeClient::OpenHapticsDevice - Send SetLicense (%d)" ), err ) ); - } - } - } - - openDevReqBuf.Close(); - setLicenseReqBuf.Close(); - } - COMPONENT_TRACE( ( _L( "RHapticsBridgeClient::OpenHapticsDevice - End (err=%d)" ),err ) ); - return err; - } - -// eof diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/hapticsconnplugin/src/hapticsconnplugin.cpp --- a/connectivitymodules/SeCon/plugins/hapticsconnplugin/src/hapticsconnplugin.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,84 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Haptics OBEX connection plugin. -* -*/ - - -#include "hapticsconnplugin.h" -#include "hapticsmsghandler.h" -#include "hapticsconntrace.h" - -// ----------------------------------------------------------------------------- -// CHapticsConnPlugin::NewL() -// Two-phase constructing -// ----------------------------------------------------------------------------- -// -CHapticsConnPlugin* CHapticsConnPlugin::NewL() - { - COMPONENT_TRACE( ( _L( "CHapticsConnPlugin::NewL - Begin" ) ) ); - CHapticsConnPlugin* self = new ( ELeave ) CHapticsConnPlugin(); - CleanupStack::PushL( self ); - self->ConstructL(); - CleanupStack::Pop( self ); - COMPONENT_TRACE( ( _L( "CHapticsConnPlugin::NewL - End" ) ) ); - return( self ); - } - -// ----------------------------------------------------------------------------- -// CHapticsConnPlugin::ConstructL() -// -// ----------------------------------------------------------------------------- -// -void CHapticsConnPlugin::ConstructL() - { - COMPONENT_TRACE( ( _L( "CHapticsConnPlugin::ConstructL() - Begin" ) ) ); - iMsgHandler = CHapticsMsgHandler::NewL(); - iMsgHandler->StartNotifier(); - COMPONENT_TRACE( ( _L( "CHapticsConnPlugin::ConstructL() - End" ))); - } - -// ----------------------------------------------------------------------------- -// CHapticsConnPlugin::~CHapticsConnPlugin() -// Destructor -// ----------------------------------------------------------------------------- -// -CHapticsConnPlugin::~CHapticsConnPlugin() - { - COMPONENT_TRACE( ( _L( "CHapticsConnPlugin::~CHapticsConnPlugin() - Begin" ) ) ); - delete iMsgHandler; - COMPONENT_TRACE( ( _L( "CHapticsConnPlugin::~CHapticsConnPlugin() - End" ) ) ); - } - -// ----------------------------------------------------------------------------- -// CHapticsConnPlugin::CHapticsConnPlugin() -// Constructor -// ----------------------------------------------------------------------------- -// -CHapticsConnPlugin::CHapticsConnPlugin() - { - } - -// ----------------------------------------------------------------------------- -// CHapticsConnPlugin::IsOBEXActive() -// -// ----------------------------------------------------------------------------- -// -TBool CHapticsConnPlugin::IsOBEXActive() - { - COMPONENT_TRACE( ( _L( "CHapticsConnPlugin::IsOBEXActive" ) )); - return ETrue; - } - -// End of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/hapticsconnplugin/src/hapticsconntimer.cpp --- a/connectivitymodules/SeCon/plugins/hapticsconnplugin/src/hapticsconntimer.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,81 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Connection shutdown timer for haptics server connection. -* -*/ - - -#include "hapticsconntimer.h" - -const TInt KHapticsConnectionTimeout = 30000000; // 30 sec. - -// --------------------------------------------------------------------------- -// Two phased constructor. -// --------------------------------------------------------------------------- -// -CHapticsConnTimer* CHapticsConnTimer::NewL( MHapticsConnectionShutdown* aCallback ) - { - CHapticsConnTimer* self = new ( ELeave ) CHapticsConnTimer(aCallback); - CleanupStack::PushL( self ); - self->ConstructL(); - CleanupStack::Pop( self ); - return self; - } - -// --------------------------------------------------------------------------- -// Destructor. -// --------------------------------------------------------------------------- -// -CHapticsConnTimer::~CHapticsConnTimer() - { - } - -// --------------------------------------------------------------------------- -// Activates this timer. -// --------------------------------------------------------------------------- -// -void CHapticsConnTimer::Start() - { - After( KHapticsConnectionTimeout ); - } - -// --------------------------------------------------------------------------- -// Constructor of the shutdown timer. -// --------------------------------------------------------------------------- -// -CHapticsConnTimer::CHapticsConnTimer( MHapticsConnectionShutdown* aCallback ) - : CTimer( EPriorityStandard ), iCallback(aCallback) - { - CActiveScheduler::Add( this ); - } - -// --------------------------------------------------------------------------- -// Second phase construction. -// --------------------------------------------------------------------------- -// -void CHapticsConnTimer::ConstructL() - { - CTimer::ConstructL(); - } - -// --------------------------------------------------------------------------- -// -// --------------------------------------------------------------------------- -// -void CHapticsConnTimer::RunL() - { - iCallback->NotifyShutdown(); - } - -// End of File diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/hapticsconnplugin/src/hapticsmsghandler.cpp --- a/connectivitymodules/SeCon/plugins/hapticsconnplugin/src/hapticsmsghandler.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,255 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Handles messaging between file system and haptics -* client interface. -* -*/ - - -#include -#include -#include -#include - -#include "hapticsmsghandler.h" -#include "hapticsconntimer.h" -#include "hapticsconntrace.h" - -_LIT( KVibeTonzFolder,"VibeTonz\\" ); -_LIT( KSourceFileName,"VibeTonzDataReq" ); -_LIT( KTargetFileName,"VibeTonzDataRsp" ); - -// --------------------------------------------------------------------------- -// CHapticsMsgHandler* CHapticsMsgHandler::NewL() -// --------------------------------------------------------------------------- -// -CHapticsMsgHandler* CHapticsMsgHandler::NewL() - { - CHapticsMsgHandler* self = new (ELeave) CHapticsMsgHandler(); - CleanupStack::PushL( self ); - self->ConstructL(); - CleanupStack::Pop( self ); - return self; - } - -// --------------------------------------------------------------------------- -// Default C++ constructor -// --------------------------------------------------------------------------- -// -CHapticsMsgHandler::CHapticsMsgHandler () : CActive( EPriorityStandard ) - { - } - -// --------------------------------------------------------------------------- -// void CHapticsMsgHandler::ConstructL() -// --------------------------------------------------------------------------- -// -void CHapticsMsgHandler::ConstructL() - { - COMPONENT_TRACE( ( _L( "CHapticsMsgHandler::ConstructL - Begin") ) ); - CActiveScheduler::Add( this ); - ConnectToFilesystemL(); - iConnectionTimeout = CHapticsConnTimer::NewL(this); - COMPONENT_TRACE( ( _L( "CHapticsMsgHandler::ConstructL - End") ) ); - } - -// --------------------------------------------------------------------------- -// CHapticsMsgHandler::~CHapticsMsgHandler() -// --------------------------------------------------------------------------- -// -CHapticsMsgHandler::~CHapticsMsgHandler() - { - Cancel(); - - if ( iConnectionTimeout ) - { - iConnectionTimeout->Cancel(); - delete iConnectionTimeout; - } - - delete iReqBuf; - - iClient.Close(); - iFs.Close(); - } - -// --------------------------------------------------------------------------- -// void ClearRequestFile() -// --------------------------------------------------------------------------- -// -void CHapticsMsgHandler::ClearRequestFile() - { - COMPONENT_TRACE( ( _L( "CHapticsMsgHandler::ClearRequestFile - Begin") ) ); - - TFindFile findDataFile( iFs ); - - TFileName sourcefile = PathInfo::PhoneMemoryRootPath(); - sourcefile.Append( PathInfo::OthersPath() ); - sourcefile.Append( KVibeTonzFolder ); - sourcefile.Append( KSourceFileName ); - - if( findDataFile.FindByDir( sourcefile, KNullDesC ) == KErrNone ) - { - COMPONENT_TRACE( _L("CHapticsMsgHandler::ClearRequestFile - Deleting REQ file") ); - iFs.Delete( KSourceFileName ); - } - COMPONENT_TRACE( ( _L( "CHapticsMsgHandler::ClearRequestFile - End") ) ); - } -// --------------------------------------------------------------------------- -// void ConnectToFilesystem() -// --------------------------------------------------------------------------- -// -void CHapticsMsgHandler::ConnectToFilesystemL() - { - COMPONENT_TRACE( ( _L( "CHapticsMsgHandler::ConnectToFilesystemL - Begin") ) ); - User::LeaveIfError( iFs.Connect() ); - - TFileName sessionPath = PathInfo::PhoneMemoryRootPath(); - sessionPath.Append( PathInfo::OthersPath() ); - sessionPath.Append( KVibeTonzFolder ); - TBool folderExists = BaflUtils::FolderExists( iFs, sessionPath ); - - if( folderExists ) - { - User::LeaveIfError( iFs.SetSessionPath( sessionPath ) ); - ClearRequestFile(); - } - else - { - User::LeaveIfError( iFs.MkDir( sessionPath ) ); - User::LeaveIfError( iFs.SetSessionPath( sessionPath ) ); - } - COMPONENT_TRACE( ( _L( "CHapticsMsgHandler::ConnectToFilesystemL - End") ) ); - } - -// --------------------------------------------------------------------------- -// CHapticsMsgHandler::StartNotifier() -// --------------------------------------------------------------------------- -// -void CHapticsMsgHandler::StartNotifier() - { - COMPONENT_TRACE( ( _L( "CHapticsMsgHandler::StartNotifier - Begin" ) ) ); - if ( !IsActive() ) - { - TFileName sessionPath = PathInfo::PhoneMemoryRootPath(); - sessionPath.Append( PathInfo::OthersPath() ); - sessionPath.Append( KVibeTonzFolder ); - iFs.NotifyChange( ENotifyAll, iStatus, sessionPath ); - SetActive(); - COMPONENT_TRACE( ( _L( "CHapticsMsgHandler::StartNotifier - Started" ) ) ); - } - COMPONENT_TRACE( ( _L( "CHapticsMsgHandler::StartNotifier - End" ) ) ); - } - -// --------------------------------------------------------------------------- -// CHapticsMsgHandler::RunL() -// --------------------------------------------------------------------------- -// -void CHapticsMsgHandler::RunL() - { - COMPONENT_TRACE( ( _L( "CHapticsMsgHandler::RunL - Begin" ) ) ); - - StartNotifier(); // re-subscribe for change notifications. - - TFindFile findDataFile(iFs); - TFileName sourcefileName = PathInfo::PhoneMemoryRootPath(); - sourcefileName.Append( PathInfo::OthersPath() ); - sourcefileName.Append( KVibeTonzFolder ); - sourcefileName.Append( KSourceFileName ); - - if( findDataFile.FindByDir( sourcefileName, KNullDesC ) == KErrNone ) - { - COMPONENT_TRACE( ( _L("CHapticsMsgHandler::RunL - found request file") ) ); - - RFile sourceFile; - TInt sourceFileSize; - - User::LeaveIfError( sourceFile.Open( iFs, sourcefileName, EFileShareAny ) ); - CleanupClosePushL( sourceFile ); - sourceFile.Size( sourceFileSize ); - - iReqBuf = HBufC8::NewL( sourceFileSize ); - TPtr8 reqBufPtr = iReqBuf->Des(); - sourceFile.Read( reqBufPtr ); - CleanupStack::PopAndDestroy( &sourceFile ); - - ClearRequestFile(); - - DATADUMP_TRACE( _L("CHapticsMsgHandler::RunL - request data dump:"), reqBufPtr ); - - if ( !iClient.Handle() ) - { - User::LeaveIfError( iClient.Connect() ); - } - - TBuf8<256> retData; - TInt bridgeErr = iClient.SendBridgeBuffer( reqBufPtr, retData ); - - delete iReqBuf; - iReqBuf = NULL; - - if ( bridgeErr == KErrNone ) - { - iConnectionTimeout->Cancel(); - iConnectionTimeout->Start(); - - DATADUMP_TRACE( _L("CHapticsMsgHandler::RunL - response data dump:"), retData ); - RFile targetFile; - targetFile.Replace( iFs, KTargetFileName, EFileWrite ); - targetFile.Write( retData ); - targetFile.Close(); - } - } - COMPONENT_TRACE( ( _L( "CHapticsMsgHandler::RunL - End" ) ) ); - } - -// ----------------------------------------------------------------------------- -// -// -// ----------------------------------------------------------------------------- -// -TInt CHapticsMsgHandler::RunError( TInt aError ) - { - COMPONENT_TRACE( ( _L( "CHapticsMsgHandler::RunError: %d" ), aError ) ); - return aError; - } - -// ----------------------------------------------------------------------------- -// -// -// ----------------------------------------------------------------------------- -// -void CHapticsMsgHandler::DoCancel() - { - COMPONENT_TRACE( ( _L( "Inside CHapticsMsgHandler::DoCancel" ) ) ); - if ( IsActive() ) - { - iFs.NotifyChangeCancel( iStatus ); - } - } - -// ----------------------------------------------------------------------------- -// CHapticsConnPlugin::CHapticsConnPlugin() -// Constructor -// ----------------------------------------------------------------------------- -// -void CHapticsMsgHandler::NotifyShutdown() - { - COMPONENT_TRACE( ( _L( "CHapticsMsgHandler::NotifyShutdown - Begin" ) ) ); - iClient.CleanUp(); - iClient.Close(); - COMPONENT_TRACE( ( _L( "CHapticsMsgHandler::NotifyShutdown - End" ) ) ); - } - -// end of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/hapticsconnplugin/src/proxy.cpp --- a/connectivitymodules/SeCon/plugins/hapticsconnplugin/src/proxy.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Implementation proxy for haptics connection plugin. -* -*/ - - -#include -#include - -#include "hapticsconnplugin.h" - -// Map the interface UIDs to implementation factory functions -const TImplementationProxy ImplementationTable[] = - { - IMPLEMENTATION_PROXY_ENTRY( 0x2001FE53, CHapticsConnPlugin::NewL ) - }; - -// Exported proxy for instantiation method resolution -EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount) - { - aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy); - - return ImplementationTable; - } - -// End of file - - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/pcconn/bld/bld.inf --- a/connectivitymodules/SeCon/plugins/pcconn/bld/bld.inf Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -/* -* Copyright (c) 2005-2007 Nokia Corporation and/or 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: PC Connectivity Plug-in build information file. -* -*/ - - -PRJ_PLATFORMS -DEFAULT - -PRJ_MMPFILES -sconpcconnplugin.mmp diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/pcconn/bld/def/bwinscwu.def --- a/connectivitymodules/SeCon/plugins/pcconn/bld/def/bwinscwu.def Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -EXPORTS - ?ImplementationGroupProxy@@YAPBUTImplementationProxy@@AAH@Z @ 1 NONAME ; struct TImplementationProxy const * ImplementationGroupProxy(int &) - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/pcconn/bld/def/eabiu.def --- a/connectivitymodules/SeCon/plugins/pcconn/bld/def/eabiu.def Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -EXPORTS - _Z24ImplementationGroupProxyRi @ 1 NONAME - _ZTI17CSConPCConnplugin @ 2 NONAME ; ## - _ZTV17CSConPCConnplugin @ 3 NONAME ; ## - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/pcconn/bld/sconpcconnplugin.mmp --- a/connectivitymodules/SeCon/plugins/pcconn/bld/sconpcconnplugin.mmp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -/* -* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* 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: PC Connectivity Plug-in MMP file -* -*/ - - -// To get the MW_LAYER_SYSTEMINCLUDE-definition -#include -#include - -VENDORID VID_DEFAULT - -CAPABILITY CAP_ECOM_PLUGIN - -TARGET sconpcconnplugin.dll -TARGETTYPE PLUGIN - -UID 0x10009D8D 0x101F9688 - -SOURCEPATH ../src - -SOURCE sconpcconnplugin.cpp -SOURCE proxy.cpp -SOURCE sconpcconnpluginutils.cpp -SOURCE sconservicetimer.cpp -SOURCE sconshutdownwatcher.cpp - -START RESOURCE 101f9688.rss - TARGET sconpcconnplugin.rsc -END - -// Default system include paths for middleware layer modules. -MW_LAYER_SYSTEMINCLUDE - -USERINCLUDE ../inc -USERINCLUDE ../../../inc -USERINCLUDE ../../../clients/pcconn/inc -USERINCLUDE ../../../servers/pcconn/inc -USERINCLUDE ../../../services/ftp/inc -USERINCLUDE ../../../catalogspcconnectivityplugin/inc - -DEBUGLIBRARY flogger.lib -LIBRARY sconpcconnclient.lib -LIBRARY euser.lib -LIBRARY irobex.lib -LIBRARY ecom.lib -LIBRARY efsrv.lib -LIBRARY bafl.lib -LIBRARY catalogspcconnectivityplugin.lib -LIBRARY apmime.lib -LIBRARY bluetooth.lib -LIBRARY esock.lib diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/pcconn/inc/sconpcconnplugin.h --- a/connectivitymodules/SeCon/plugins/pcconn/inc/sconpcconnplugin.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,234 +0,0 @@ -/* -* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* 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: PC Connectivity plugin header file -* -*/ - -#ifndef _SCONPCCONNPLUGIN_H -#define _SCONPCCONNPLUGIN_H - -#include -#include -#include - -#include "sconpcconnclient.h" -#include "sconshutdownwatcher.h" - -// forward declaration -class CSConFTP; -class CSConServiceTimer; -class CCatalogsPCConnectivityPlugin; - - - -class CSConPCConnplugin : public CSrcsInterface, public MObexServerNotify, - public MShutdownObserver - { - public: - static CSConPCConnplugin* NewL(); - virtual ~CSConPCConnplugin(); - - /** - * Returns active status of OBEX session - * @return ETrue if session is active, else EFalse - */ - TBool IsOBEXActive(); - - /** - * Device is shutting down, abort connection. - */ - void NotifyShutdown(); - - private: - /** - * Loads sconftp.dll module - * @return none - */ - void LoadFTPDllL(); - /** - * Closes initialized services - * @return none - */ - void Disconnect(); - /** - * Removes spaces and nulls from the end of the string - * @param aDes String to be formatted - * @return none - */ - void TrimRightSpaceAndNull( TDes8& aDes ) const; - /** - * Current used transfer media (IR,USB,BT) - * @param aMediaType Enumeration indicating the media type - * @return none - */ - void SetMediaType( TSrcsMediaType aMediaType ); - /** - * MObexServerNotify implementation - * @param aError Error code - * @return none - */ - void ErrorIndication( TInt aError ); - /** - * MObexServerNotify implementation - * @return none - */ - void TransportUpIndication(); - /** - * MObexServerNotify implementation - * @return none - */ - void TransportDownIndication(); - /** - * MObexServerNotify implementation - * @param aRemoteInfo Structure containing information used during OBEX - * connection - * @param aInfo Further information about the requested connection - * @return System wide error code that indicates the success of the connection - */ - TInt ObexConnectIndication( const TObexConnectInfo& aRemoteInfo, - const TDesC8& aInfo ); - /** - * MObexServerNotify implementation - * @param aInfo Contains information about the disconnection - * @return none - */ - void ObexDisconnectIndication( const TDesC8& aInfo ); - /** - * MObexServerNotify implementation - * @return CObexBaseObject-derived object, which the object being put - * will be parsed into. - */ - CObexBufObject* PutRequestIndication(); - /** - * MObexServerNotify implementation - * @return System wide error code that indicates the success of the - * PUT packet operation. - */ - TInt PutPacketIndication(); - /** - * MObexServerNotify implementation - * @return System wide error code that indicates the success of the - * PUT packet operation. - */ - TInt PutCompleteIndication(); - /** - * MObexServerNotify implementation - * @param aRequiredObject Details about the object the remote client - * has requested - * @returnObject to return to the client - */ - CObexBufObject* GetRequestIndication( CObexBaseObject - *aRequiredObject ); - /** - * MObexServerNotify implementation - * @return System wide error code that indicates the success of the - * GET packet operation. - */ - TInt GetPacketIndication(); - /** - * MObexServerNotify implementation - * @return System wide error code that indicates the success of the - * GET packet operation. - */ - TInt GetCompleteIndication(); - /** - * MObexServerNotify implementation - * @param aPathInfo SETPATH command parameters - * @param aInfo Not currently used - * @return System wide error code indicating the success of the - * setpath command. - */ - TInt SetPathIndication( const CObex::TSetPathInfo& aPathInfo, - const TDesC8& aInfo ); - /** - * SetObexServer - * @param aObexServer pass obex server pointer to sevice controller - * @return System wide error code. - */ - TInt SetObexServer( CObexServer* aObexServer ); - /** - * MObexServerNotify implementation - * @return none - */ - void AbortIndication(); - /** - * Checks if mime type belongs to Catalogs - * @return TBool - */ - TBool IsCatalogsMimeType( TDataType aMime ); - - void ConstructL(); - CSConPCConnplugin(); - - /** - * Handles PCD object. Used for advanced file handling. - * @param aDescriptionHeader Contains command code and destination filename - * @param aNameHeader Source filename - * @return System wide error code. - */ - TInt HandlePCDObjectPut( const TDesC& aDescriptionHeader, const TDesC& aNameHeader ); - - /** - * Get Capbility object or ConML message from PCConnServer - * @param aNameHeader Name information. - * @param aTypeHeader Object type header. ConML or Capability object type - * @return none - */ - void HandleGetPCConnObjectL( const TDesC& aNameHeader, const TDesC8& aTypeHeader ); - - /** - * Get Catalogs object - * @param aTypeHeader Object type header. - * @return none - */ - void HandleGetCatalogsObjectL( const TDesC8& aTypeHeader ); - - /** - * Get file object - * @param aNameHeader requested filename. - * @return none - */ - void HandleGetFileObjectL( const TDesC& aNameHeader ); - - private: - RLibrary iFTPlib; - CObexBufObject* iObject; - CBufFlat* iBuffer; - CSConFTP* iFTPHandler; - TInt iPutError; - TBool iSessionActive; - CSConServiceTimer* iServiceTimer; - TBool iStartTimer; - TSrcsMediaType iMediaType; - CObexFileObject* iFileObject; - RSConPCConnSession iPCConnSession; - TBool iPCConnSessionConnected; - CCatalogsPCConnectivityPlugin* iCatalogs; - TBool iCatalogsConnected; - HBufC8* iCatalogsMimeType; - RPointerArray iMimeArray; - TBool iCatalogsMimeTypesExist; - TBool iPutPacketIndicationCalled; - CShutdownWatcher* iShutdownWatcher; - TBool iShutdownInProgress; - CObexServer* iObexServer; - RSocketServ iSocketServer; - RBTPhysicalLinkAdapter iLinkAdapter; - private: - // Friend class is used,because existing impelentation has been working - // properly. Avoiding re-design. - friend class CSConServiceTimer; - }; - -#endif // SCONPCCONNPLUGIN_H \ No newline at end of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/pcconn/inc/sconpcconnpluginutils.h --- a/connectivitymodules/SeCon/plugins/pcconn/inc/sconpcconnpluginutils.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,53 +0,0 @@ -/* -* Copyright (c) 2005-2007 Nokia Corporation and/or 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: PC Connectivity Plug-in Utils header -* -*/ - - -#ifndef _SCONPCCONNPLUGINUTILS_H -#define _SCONPCCONNPLUGINUTILS_H - -#include -//============================================================ -// Class TPCConnpluginUtils declaration -//============================================================ -class TPCConnpluginUtils - { - public: - /** - * Converts Symbian error code to OBEX error code - * @param aError The error code - * @return The converted error code - */ - static TInt ConvertPCDResponseCode( TInt aError ); - /** - * Converts Symbian error code to OBEX error code - * @param aError The error code - * @return The converted error code - */ - static TInt ConvertFTPResponseCode( TInt aError ); - - /** - * Converts Symbian error code to OBEX error code - * @param aError The error code - * @return The converted error code - */ - static TInt ConvertObexMoveResponseCode( TInt aError ); - }; - -#endif //_SCONPCCONNPLUGINUTILS_H - -// End of file - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/pcconn/inc/sconservicetimer.h --- a/connectivitymodules/SeCon/plugins/pcconn/inc/sconservicetimer.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -/* -* Copyright (c) 2005-2007 Nokia Corporation and/or 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: PC Connectivity Plug-in Service Timer Header file -* -*/ - - -#ifndef _SCONSERVICETIMER_H -#define _SCONSERVICETIMER_H - -#include - -class CSConPCConnplugin; - - -//============================================================ -// Class CSConServiceTimer declaration -//============================================================ - -NONSHARABLE_CLASS ( CSConServiceTimer ) : public CActive - { - public: - CSConServiceTimer( CSConPCConnplugin* aEngine, TInt aValue ); - void ConstructL(); - ~CSConServiceTimer(); - - /** - * Starts the timer - * @return none - */ - void StartTimer(); - /** - * Stops the timer - * @return none - */ - void StopTimer(); - - private: - void DoCancel(); - void RunL(); - - private: - RTimer iTimer; - CSConPCConnplugin* iEngine; - TInt iValue; - }; - -#endif //_SCONSERVICETIMER_H - -// End of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/pcconn/inc/sconshutdownwatcher.h --- a/connectivitymodules/SeCon/plugins/pcconn/inc/sconshutdownwatcher.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -/* -* Copyright (c) 2007 Nokia Corporation and/or 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: Power shutdown -watcher header file -* -*/ - - -#ifndef _SCONSHUTDOWNWATCHER_H -#define _SCONSHUTDOWNWATCHER_H - - -#include -#include - -//============================================================ -// Class MShutdownObserver declaration -//============================================================ -class MShutdownObserver - { -public: - virtual void NotifyShutdown()=0; - }; - -//============================================================ -// Class CShutdownWatcher declaration -//============================================================ -NONSHARABLE_CLASS ( CShutdownWatcher ) : public CActive - { - public: - static CShutdownWatcher* NewL( MShutdownObserver* aObserver ); - ~CShutdownWatcher(); - - /** - * Starts to watch shutdown status - * @return none - */ - void StartShutdownWatcher(); - - private: - //construct/destruct - CShutdownWatcher( MShutdownObserver* aObserver ); - void ConstructL(); - - // from CActive - void DoCancel(); - void RunL(); - - private: - MShutdownObserver* iObserver; - RProperty iProperty; - }; - -#endif //_SCONSHUTDOWNWATCHER_H - -// End of file \ No newline at end of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/pcconn/src/101f9688.rss --- a/connectivitymodules/SeCon/plugins/pcconn/src/101f9688.rss Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,68 +0,0 @@ -/* -* Copyright (c) 2005-2007 Nokia Corporation and/or 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: PC Connectivity Plug-in resource file -* -*/ - - -#include "ecom/registryinfo.rh" - -// Declares info for two implementations -RESOURCE REGISTRY_INFO theInfo - { - // UID for the DLL - dll_uid = 0x101F9688; - // Declare array of interface info - interfaces = - { - INTERFACE_INFO - { - // UID of interface that is implemented - interface_uid = 0x101F7C8C; - implementations = - { - // Info for CSConPCConnplugin - IMPLEMENTATION_INFO - { - implementation_uid = 0x101F9689; - version_no = 1; - display_name = "PC Suite Services"; - default_data = "OBEX/USB||OBEX/BT||OBEX/IrDA"; - - // - // opaque_data contains parameters used by following API calls in SRCS: - // 1. Setup USB interface string descriptor in Unicode; - // 2. TInt CObex::SetLocalWho(const TDesC8& aInfo); - // 3. TInt CBTConnection::RegisterSecuritySettingsL( TUint aService, - // TInt aProtocol, - // TInt aChannel, - // TBool aAuthenticate, - // TBool aAuthorise, - // TBool aEncrypt ); - // opaque_data = "@0||@1||@2||@3||@4||@5||@6" - // @0 aStrDesc e.g. "PC Connectivity" - // @1 aInfo e.g. KFolderBrowsingID, "\xF9\xEC\x7B\xC4\x95\x3C\x11\xd2\x98\x4E\x52\x54\x00\xDC\x9E\x09" - // @2 aService e.g. KBTSecurityUidFileTransfer, 0x1106 - // @3 aProtocol e.g. KSolBtRFCOMM, 0x1013 - // @4 aAuthenticate e.g. EFalse, 0 - // @5 aAuthorise e.g. EFalse, 0 - // @6 aEncrypt e.g. EFalse, 0 - // - opaque_data = "PC Suite Services||\xF9\xEC\x7B\xC4\x95\x3C\x11\xd2\x98\x4E\x52\x54\x00\xDC\x9E\x09||0x000050050000100080000002EE000001||0x1013||1||1||1||0xffff||0xffff"; - } - }; - } - }; - } - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/pcconn/src/proxy.cpp --- a/connectivitymodules/SeCon/plugins/pcconn/src/proxy.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ -/* -* Copyright (c) 2005-2007 Nokia Corporation and/or 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: PC Connectivity Plug-in proxy implementation -* -*/ - - - -#include -#include - -#include "sconpcconnplugin.h" - -// Map the interface UIDs to implementation factory functions -const TImplementationProxy ImplementationTable[] = - { - IMPLEMENTATION_PROXY_ENTRY(0x101F9689, CSConPCConnplugin::NewL) - }; - -// Exported proxy for instantiation method resolution -EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount) - { - aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy); - - return ImplementationTable; - } - -// End of file - - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/pcconn/src/sconpcconnplugin.cpp --- a/connectivitymodules/SeCon/plugins/pcconn/src/sconpcconnplugin.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1254 +0,0 @@ -/* -* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* 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: PC Connectivity Plug-in implementation -* -*/ - - -// INCLUDE FILES - -#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS -#include -#endif -#include "sconpcconnplugin.h" -#include "sconftp.h" -#include "sconpcconnpluginutils.h" -#include "sconservicetimer.h" -#include "catalogspcconnectivityplugin.h" -#include "debug.h" - - -// CONSTANTS -_LIT(KSConFTPLibName, "sconftp.dll"); -const TInt KSConFTPUidValue = 0x10009D8D; -const TUid KSConFTPUid = {KSConFTPUidValue}; - -// Folder listing type from IrObex specification -_LIT8( KSConFolderListType, "x-obex/folder-listing" ); -// Folder listing type from IrObex specification -_LIT8( KSConCapabilityObjectType, "x-obex/capability" ); -// PCD types -_LIT8( KSConPCDObjectType, "application/vnd.nokia.pcd" ); -_LIT8( KSConPCDXMLObjectType, "application/vnd.nokia.conml+xml" ); -_LIT8( KSConPCDWBXMLObjectType, "application/vnd.nokia.conml+wbxml" ); -_LIT8( KSConPCDXMLObjectType2, "application/vnd.nokia.pcd+xml" ); -_LIT8( KSConPCDWBXMLObjectType2, "application/vnd.nokia.pcd+wbxml" ); -_LIT( K_C_ROOT, "C:\\" ); - -// PCD header commands -const TInt KSCon_PCD_TAG = 0x003A; -const TInt KSCon_PCD_CMD_COPY = 0x0037; -const TInt KSCon_PCD_CMD_MOVE_OR_RENAME = 0x0038; -const TInt KSCon_PCD_CMD_SET_PERMISSION = 0x0039; -// PCD header parameters -const TInt KSCon_PCD_PAR_FULL_PERMISSION = 0x0040; -const TInt KSCon_PCD_PAR_READ_ONLY_PERMISSION = 0x0041; - - -const TInt KSConBufSize = 262144; // 256KB -// Time (in milliseconds) for the timer -const TInt KSConTimeOutValue = 180000000; -// Flags used to indicate SetPath commands -const TInt KSConNULLSetPath = 0x00; - -const TInt KSConHeaderMaxLength = 256; - -// ============================= MEMBER FUNCTIONS =============================== - -// ----------------------------------------------------------------------------- -// CSConPCConnplugin::NewL() -// Two-phase constructing -// ----------------------------------------------------------------------------- -// -CSConPCConnplugin* CSConPCConnplugin::NewL() - { - TRACE_FUNC_ENTRY; - CSConPCConnplugin* self = new ( ELeave ) CSConPCConnplugin(); - CleanupStack::PushL( self ); - self->ConstructL(); - CleanupStack::Pop( self ); - TRACE_FUNC_EXIT; - return( self ); - } - -// ----------------------------------------------------------------------------- -// CSConPCConnplugin::~CSConPCConnplugin() -// Destructor -// ----------------------------------------------------------------------------- -// -CSConPCConnplugin::~CSConPCConnplugin() - { - TRACE_FUNC_ENTRY; - - // Disconnect from services. - Disconnect(); - - delete iBuffer; - iBuffer = NULL; - - if ( iServiceTimer ) - { - iServiceTimer->Cancel(); - } - - delete iServiceTimer; - iServiceTimer = NULL; - - delete iCatalogs; - iCatalogs = NULL; - delete iCatalogsMimeType; - iCatalogsMimeType = NULL; - - iMimeArray.Reset(); - iMimeArray.Close(); - - delete iShutdownWatcher; - iShutdownWatcher = NULL; - - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnplugin::IsOBEXActive() -// Returns active status of OBEX session -// ----------------------------------------------------------------------------- -// -TBool CSConPCConnplugin::IsOBEXActive() - { - TRACE_FUNC; - return iSessionActive; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnplugin::NotifyShutdown() -// System is shutting down -// ----------------------------------------------------------------------------- -// -void CSConPCConnplugin::NotifyShutdown() - { - TRACE_FUNC; - iShutdownInProgress = ETrue; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnplugin::LoadFTPDllL() -// Loads sconftp.dll module -// ----------------------------------------------------------------------------- -// -void CSConPCConnplugin::LoadFTPDllL() - { - TRACE_FUNC_ENTRY; - // Dynamically load DLL - User::LeaveIfError( iFTPlib.Load( KSConFTPLibName ) ); - if ( iFTPlib.Type()[1] != KSConFTPUid ) - { - LOGGER_WRITE( "KSConFTPUidValue incorrect" ); - iFTPlib.Close(); - User::Leave( KErrNotFound ); - } - TSConCreateCSConFTPFunc CreateCSConFTPL = - (TSConCreateCSConFTPFunc)iFTPlib.Lookup(1); - iFTPHandler = (CSConFTP*)CreateCSConFTPL(); - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnplugin::Disconnect() -// Closes initialized services -// ----------------------------------------------------------------------------- -// -void CSConPCConnplugin::Disconnect() - { - TRACE_FUNC_ENTRY; - - iLinkAdapter.Close(); - iSocketServer.Close(); - - //Disconnect from server - iPCConnSession.Close(); - iPCConnSessionConnected = EFalse; - - if ( iStartTimer != EFalse ) - { - iServiceTimer->Cancel(); - iServiceTimer->StartTimer(); - } - - delete iObject; - iObject = NULL; - - if ( iFTPHandler ) - { - delete iFTPHandler; - iFTPHandler = NULL; - iFTPlib.Close(); - } - if ( iFileObject ) - { - delete iFileObject; - iFileObject = NULL; - } - if ( iCatalogsConnected ) - { - iCatalogs->Close(); - iCatalogsConnected = EFalse; - iCatalogsMimeTypesExist = EFalse; - } - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnplugin::ErrorIndication( TInt aError ) -// MObexServerNotify implementation -// ----------------------------------------------------------------------------- -// -void CSConPCConnplugin::ErrorIndication( TInt aError ) - { - TRACE_FUNC_ENTRY; - LOGGER_WRITE_1( "aError : %d", aError ); - - if ( iFTPHandler ) - { - iFTPHandler->AbortFileTransfer( iObject ); - } - - if ( iObject ) - { - delete iObject; - iObject = NULL; - } - - if ( iFileObject ) - { - iFileObject->Reset(); - delete iFileObject; - iFileObject = NULL; - } - - if ( iPCConnSessionConnected ) - { - iPCConnSession.ResetServer(); - } - - // Keep compiler happy - (void)aError; - - delete iShutdownWatcher; - iShutdownWatcher = NULL; - - if ( iLinkAdapter.IsOpen() ) - { - // Cancel ActivateActiveRequester & allow going to low power mode - TInt err = iLinkAdapter.CancelLowPowerModeRequester(); - LOGGER_WRITE_1( "iLinkAdapter.CancelLowPowerModeRequester() err: %d", err ); - } - - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnplugin::AbortIndication() -// MObexServerNotify implementation -// ----------------------------------------------------------------------------- -// -void CSConPCConnplugin::AbortIndication() - { - TRACE_FUNC_ENTRY; - - if ( iFTPHandler ) - { - iFTPHandler->AbortFileTransfer( iObject ); - } - - if ( iObject ) - { - delete iObject; - iObject = NULL; - } - - if ( iFileObject ) - { - iFileObject->Reset(); - delete iFileObject; - iFileObject = NULL; - } - - if ( iPCConnSessionConnected ) - { - iPCConnSession.ResetServer(); - } - - delete iShutdownWatcher; - iShutdownWatcher = NULL; - - if ( iLinkAdapter.IsOpen() ) - { - // Cancel ActivateActiveRequester & allow going to low power mode - TInt err = iLinkAdapter.CancelLowPowerModeRequester(); - LOGGER_WRITE_1( "iLinkAdapter.CancelLowPowerModeRequester() err: %d", err ); - } - - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnplugin::TransportUpIndication() -// MObexServerNotify implementation -// ----------------------------------------------------------------------------- -// -void CSConPCConnplugin::TransportUpIndication() - { - TRACE_FUNC; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnplugin::ObexConnectIndication( const TObexConnectInfo& -// aRemoteInfo, const TDesC8& aInfo ) -// MObexServerNotify implementation -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnplugin::ObexConnectIndication( const TObexConnectInfo& - /*aRemoteInfo*/, const TDesC8& /*aInfo*/ ) - { - TRACE_FUNC_ENTRY; - TInt err( KErrNone ); - TInt catalogsErr( KErrNone ); - iStartTimer = ETrue; - - if ( iMediaType == ESrcsMediaBT && iObexServer ) - { - TSockAddr remoteAddr; - iObexServer->RemoteAddr( remoteAddr ); - - TBTSockAddr btSockAddr( remoteAddr ); - TBTDevAddr devAddr = btSockAddr.BTAddr(); - - err = iSocketServer.Connect(); - LOGGER_WRITE_1("iSocketServer.Connect err: %d", err ); - if ( !err ) - { - err = iLinkAdapter.Open( iSocketServer, devAddr ); - LOGGER_WRITE_1("iLinkAdapter.Open err: %d", err ); - } - // Ignore all BT link errors - err = KErrNone; - } - - //Connect to server - if ( !iPCConnSessionConnected ) - { - LOGGER_WRITE("Try to connect to iPCConnSession"); - err = iPCConnSession.Connect(); - LOGGER_WRITE_1( "iPCConnSession.Connect returned : %d", err ); - if ( err == KErrNone ) - { - iPCConnSessionConnected = ETrue; - } - } - - if ( err == KErrNone && !iFTPHandler ) - { - TRAP( err, LoadFTPDllL() ); - LOGGER_WRITE_1( "LoadFTPDllL returned : %d", err ); - } - - if ( err == KErrNone ) - { - iFTPHandler->SetProfile( EProprietary ); - LOGGER_WRITE( "iServiceTimer->StopTimer()" ); - iServiceTimer->Cancel(); - iServiceTimer->StopTimer(); - } - - if ( !iCatalogsConnected ) - { - LOGGER_WRITE( "CSConPCConnplugin::ObexConnectIndication() before iCatalogs->Connect()" ); - catalogsErr = iCatalogs->Connect(); - LOGGER_WRITE_1( "CSConPCConnplugin::ObexConnectIndication() iCatalogs->Connect() err: %d", catalogsErr ); - if ( catalogsErr == KErrNone ) - { - LOGGER_WRITE( "CSConPCConnplugin::ObexConnectIndication() iCatalogs->Connect() success" ); - iCatalogsConnected = ETrue; - TRAPD( ret, iMimeArray = iCatalogs->SupportedMimeTypesL() ); - if ( ret == KErrNone ) - { - LOGGER_WRITE_1( "iCatalogs->SupportedMimeTypesL count: %d", iMimeArray.Count() ); - iCatalogsMimeTypesExist = ETrue; - } - } - } - TRACE_FUNC_EXIT; - return TPCConnpluginUtils::ConvertFTPResponseCode( err ); - } - -// ----------------------------------------------------------------------------- -// CSConPCConnplugin::ObexDisconnectIndication( const TDesC8& ) -// MObexServerNotify implementation -// ----------------------------------------------------------------------------- -// -void CSConPCConnplugin::ObexDisconnectIndication( const TDesC8& ) - { - TRACE_FUNC_ENTRY; - Disconnect(); - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnplugin::TransportDownIndication() -// MObexServerNotify implementation -// ----------------------------------------------------------------------------- -// -void CSConPCConnplugin::TransportDownIndication() - { - TRACE_FUNC_ENTRY; - Disconnect(); - if ( iBuffer ) - { - iBuffer->Reset(); - } - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnplugin::PutRequestIndication() -// MObexServerNotify implementation -// ----------------------------------------------------------------------------- -// -CObexBufObject* CSConPCConnplugin::PutRequestIndication() - { - TRACE_FUNC_ENTRY; - TInt ret( KErrNone ); - TInt err( KErrNone ); - iPutError = KErrNone; - - if ( iBuffer ) - { - iBuffer->Reset(); - } - - if ( iObject ) - { - delete iObject; - iObject = NULL; - } - - TRAP( err, iObject = CObexBufObject::NewL ( iBuffer ) ); - - if ( err != KErrNone ) - { - return NULL; - } - - if ( !iFTPHandler ) - { - LOGGER_WRITE( "Creating iFTPHandler has failed" ); - return NULL; - } - - TRAP( err, ret = iFTPHandler->PutFileObjectInitL( iObject, iBuffer ) ); - - if ( err != KErrNone ) - { - LOGGER_WRITE_1( "iFTPHandler->PutFileObjectInitL() leaves: %d", err ); - return NULL; - } - if ( ret != KErrNone ) - { - LOGGER_WRITE_1( "PutFileObjectInitL failed - returning error in next PutPacketIndication : %d", ret ); - iPutError = ret; - } - iPutPacketIndicationCalled = EFalse; - - if ( !iShutdownWatcher ) - { - TRAP( err, iShutdownWatcher = CShutdownWatcher::NewL( this ) ); - if ( err == KErrNone ) - { - iShutdownWatcher->StartShutdownWatcher(); - } - else - { - LOGGER_WRITE_1( "CShutdownWatcher::NewL leaves: %d", err ); - } - } - - if ( iLinkAdapter.IsOpen() ) - { - // request active BT mode (high power mode) - err = iLinkAdapter.ActivateActiveRequester(); - LOGGER_WRITE_1( "iLinkAdapter.ActivateActiveRequester() err: %d", err ); - } - - TRACE_FUNC_EXIT; - return( iObject ); - } - -// ----------------------------------------------------------------------------- -// CSConPCConnplugin::PutPacketIndication() -// MObexServerNotify implementation -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnplugin::PutPacketIndication() - { - TRACE_FUNC_ENTRY; - TInt ret( KErrNone ); - - TBool catalogsMime( EFalse ); - if ( iObject->Type().Length() > KSConHeaderMaxLength ) - { - LOGGER_WRITE("TypeHeader too big, return KErrNotSupported"); - return TPCConnpluginUtils::ConvertFTPResponseCode( KErrNotSupported ); - } - TBuf8 typeHeader( iObject->Type() ); - TrimRightSpaceAndNull( typeHeader ); - - if ( iCatalogsConnected && IsCatalogsMimeType( TDataType( typeHeader ) ) ) - { - catalogsMime = ETrue; - } - - if ( (TInt)iObject->Length() > 0 - && typeHeader != KSConPCDWBXMLObjectType - && typeHeader != KSConPCDWBXMLObjectType2 - && !catalogsMime - && typeHeader != KSConPCDObjectType ) - { - // normal file transfer - if ( !iPutPacketIndicationCalled ) - { - // This is first check, need to check only once - - TFileName path; - iFTPHandler->GetPath( path ); - if ( path.CompareF( K_C_ROOT ) == 0 ) - { - // path forbidden - ret = KErrAccessDenied; - } - else - { - if ( iPutError != KErrNone ) - { - ret = iPutError; - LOGGER_WRITE_1( "CSConPCConnplugin::PutPacketIndication() : PutError : %d", iPutError ); - } - else - { - // check required free space - // if filesize is small ( <65k ) it fits into one package and its already saved to filesystem. - // if file is larger, need to check is there enought free space in device. - - const TUint32 filesize = iObject->Length(); - LOGGER_WRITE_1( "CSConPCConnplugin::PutPacketIndication() filesize %d", filesize ); - LOGGER_WRITE_1( "CSConPCConnplugin::PutPacketIndication() iObject->BytesReceived() %d", iObject->BytesReceived() ); - if ( filesize > iObject->BytesReceived() ) - { - LOGGER_WRITE( "CSConPCConnplugin::PutPacketIndication() : check freespace" ); - // file does not fit into one obex packet, check is there enought free space in current drive - if ( iFTPHandler->IsCurrentDiskSpaceBelowCritical( filesize ) ) - { - LOGGER_WRITE( "CSConPCConnplugin::PutPacketIndication() : returning KErrNoMemory" ); - ret = KErrNoMemory; - } - } - } - } - } - - if ( iShutdownInProgress ) - { - LOGGER_WRITE( "ShutdownInProgress, abort" ); - ret = KErrDisconnected; - } - } - - if ( !iPutPacketIndicationCalled ) - { - // Need to check only once - iPutPacketIndicationCalled = ETrue; - - //Check if filename is too long. - TFileName path; - iFTPHandler->GetPath( path ); - if ( ret == KErrNone && path.Length() + iObject->Name().Length() > KMaxFileName ) - { - LOGGER_WRITE_1( "Name length overflow! : %d", path.Length() + iObject->Name().Length() ); - ret = KErrBadName; - } - } - - if ( ret != KErrNone ) - { - if ( iFTPHandler ) - { - iFTPHandler->AbortFileTransfer( iObject ); - } - - delete iObject; - iObject = NULL; - - if ( iLinkAdapter.IsOpen() ) - { - // Cancel ActivateActiveRequester & allow going to low power mode - TInt err = iLinkAdapter.CancelLowPowerModeRequester(); - LOGGER_WRITE_1( "iLinkAdapter.CancelLowPowerModeRequester() err: %d", err ); - } - } - - LOGGER_WRITE_1( "CSConPCConnplugin::PutPacketIndication(): ret %d", ret ); - return TPCConnpluginUtils::ConvertFTPResponseCode( ret ); - } - -// ----------------------------------------------------------------------------- -// CSConPCConnplugin::PutCompleteIndication() -// MObexServerNotify implementation -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnplugin::PutCompleteIndication() - { - TRACE_FUNC_ENTRY; - TInt ret( KErrNone ); - TInt err( KErrNone ); - - if ( iLinkAdapter.IsOpen() ) - { - // Cancel ActivateActiveRequester & allow going to low power mode - TInt err2 = iLinkAdapter.CancelLowPowerModeRequester(); - LOGGER_WRITE_1( "iLinkAdapter.CancelLowPowerModeRequester() err: %d", err2 ); - } - - if ( iObject->Type().Length() > KSConHeaderMaxLength ) - { - LOGGER_WRITE("TypeHeader too big, return KErrNotSupported"); - delete iObject; - iObject = NULL; - - iFTPHandler->DeleteTempFile(); - return TPCConnpluginUtils::ConvertPCDResponseCode( KErrNotSupported ); - } - if ( iObject->Name().Length() > KSConHeaderMaxLength ) - { - LOGGER_WRITE("NameHeader too big, return KErrNotSupported"); - delete iObject; - iObject = NULL; - - iFTPHandler->DeleteTempFile(); - return TPCConnpluginUtils::ConvertPCDResponseCode( KErrNotSupported ); - } - - // check if ConML signal is received - TBuf8 typeHeader( iObject->Type() ); - TBuf nameHeader( iObject->Name() ); - TrimRightSpaceAndNull( typeHeader ); - LOGGER_WRITE8_1("type: %S", &typeHeader); - LOGGER_WRITE_1("name: %S", &nameHeader); - LOGGER_WRITE_1("description: %S", &iObject->Description()); - TInt size = iObject->BytesReceived(); - TTime time = iObject->Time(); - - // shutdownWatcher is not needed anymore - delete iShutdownWatcher; - iShutdownWatcher = NULL; - - if ( IsCatalogsMimeType( TDataType( typeHeader ) ) ) - { - if ( iCatalogsConnected ) - { - LOGGER_WRITE( "iCatalogs->PutDataL" ); - TRAP( err, iCatalogs->PutDataL( typeHeader, *iBuffer ) ); - LOGGER_WRITE_1( "iCatalogs->PutDataL : %d", err ); - if ( err == KErrServerTerminated ) - { - err = iCatalogs->Connect(); - LOGGER_WRITE_1( "CSConPCConnplugin::PutCompleteIndication() iCatalogs->Connect() err: %d", err ); - if ( err == KErrNone ) - { - LOGGER_WRITE( "iCatalogs->PutDataL" ); - TRAP( err, iCatalogs->PutDataL( typeHeader, *iBuffer ) ); - LOGGER_WRITE_1( "iCatalogs->PutDataL : %d", err ); - } - } - } - else - { - LOGGER_WRITE( "Catalogs mime type recognised - failing due no connection" ); - err = KErrNotSupported; - } - - delete iObject; - iObject = NULL; - - iFTPHandler->DeleteTempFile(); - return TPCConnpluginUtils::ConvertPCDResponseCode( err ); - } - - if ( typeHeader == KSConPCDObjectType ) - { - LOGGER_WRITE( "CSConPCConnplugin::PutCompleteIndication KSConPCDObjectType" ); - err = HandlePCDObjectPut( iObject->Description(), iObject->Name() ); - delete iObject; - iObject = NULL; - - iFTPHandler->DeleteTempFile(); - LOGGER_WRITE_1( "CSConPCConnplugin::PutCompleteIndication() end, err: %d", err ); - return TPCConnpluginUtils::ConvertObexMoveResponseCode( err ); - } - - if ( typeHeader != KSConPCDWBXMLObjectType && - typeHeader != KSConPCDWBXMLObjectType2 ) - { - TObexHeaderMask validHdrs = iObject->ValidHeaders(); - if ( ( validHdrs & KObexHdrBody ) || ( validHdrs & KObexHdrEndOfBody ) ) - { - LOGGER_WRITE( "CSConPCConnplugin::PutCompleteIndication() normal filetransfer" ); - LOGGER_WRITE_1( "Number of received bytes : %d", size ); - TSConUsedMedia media( ESConNoMedia ); - - switch( iMediaType ) - { - case ESrcsMediaBT : - media = ESConBTMedia; - break; - case ESrcsMediaIrDA : - media = ESConIRMedia; - break; - case ESrcsMediaUSB : - media = ESConUSBMedia; - break; - default : - media = ESConNoMedia; - break; - } - - iFTPHandler->SetUsedMedia( media ); - - TRAP( ret, err = iFTPHandler->PutFileObjectFinalizeL( iObject ) ); - LOGGER_WRITE_1( "PutFileObjectL() returned : %d", ret ); - } - else - { - LOGGER_WRITE( "Delete starts" ); - TRAP( ret, err = iFTPHandler->DeleteObjectL( iObject->Name() ) ); - LOGGER_WRITE_1( "DeleteObjectL() returned : %d", ret ); - } - } - - delete iObject; - iObject = NULL; - - if ( typeHeader == KSConPCDWBXMLObjectType || - typeHeader == KSConPCDWBXMLObjectType2 ) - { - LOGGER_WRITE( "CSConPCConnplugin::PutCompleteIndication() ReadWBXMLDataL" ); - TRAP( ret, err = iFTPHandler->ReadWBXMLDataL( iBuffer ) ); - - if ( err == KErrNone && ret == KErrNone ) - { - TRAP( ret, err = iPCConnSession.PutPacketL( nameHeader, - typeHeader, iBuffer ) ); - LOGGER_WRITE_1( "iPCConnSession.PutPacketL() leaveCode : %d", ret ); - LOGGER_WRITE_1( "iPCConnSession.PutPacketL() returned : %d", err ); - } - - iFTPHandler->DeleteTempFile(); - - return TPCConnpluginUtils::ConvertPCDResponseCode( err ); - } - - iFTPHandler->DeleteTempFile(); - - TRACE_FUNC_EXIT; - if ( ret != KErrNone ) - { - return TPCConnpluginUtils::ConvertFTPResponseCode( ret ); - } - return TPCConnpluginUtils::ConvertFTPResponseCode( err ); - } - -// ----------------------------------------------------------------------------- -// CSConPCConnplugin::GetRequestIndication( CObexBaseObject* aRequiredObject ) -// MObexServerNotify implementation -// ----------------------------------------------------------------------------- -// -CObexBufObject* CSConPCConnplugin::GetRequestIndication( CObexBaseObject* - aRequiredObject ) - { - TRACE_FUNC_ENTRY; - CObexBufObject* bufObject(NULL); - if ( aRequiredObject->Type().Length() > KSConHeaderMaxLength ) - { - LOGGER_WRITE("TypeHeader too big"); - return NULL; - } - if ( aRequiredObject->Name().Length() > KMaxFileName ) - { - LOGGER_WRITE("NameHeader is too long"); - return NULL; - } - TInt ret( KErrNone ); - TInt err( KErrNone ); - TBuf8 typeHeader( aRequiredObject->Type() ); - TrimRightSpaceAndNull( typeHeader ); - LOGGER_WRITE8_1("type: %S", &typeHeader); - LOGGER_WRITE_1("name: %S", &aRequiredObject->Name()); - - iBuffer->Reset(); - - delete iObject; - iObject = NULL; - - TRAP( err, iObject = CObexBufObject::NewL ( iBuffer ) ); - if ( err != KErrNone ) - { - return NULL; - } - - // Client requests folder listing - if ( typeHeader == KSConFolderListType ) - { - LOGGER_WRITE( "Client requests folder listning" ); - if ( !iFTPHandler ) - { - LOGGER_WRITE( "Creating iFTPHandler has failed" ); - return NULL; - } - - TRAP( err, ret = iFTPHandler->GetFolderObjectL( iObject ) ); - LOGGER_WRITE_1( "iFTPHandler->GetFolderObjectL() returned: %d", ret ); - if ( err == KErrNone && ret == KErrNone ) - { - bufObject = iObject; - } - else - { - return NULL; - } - } - // Client requests capability object or ConML packet - else if ( typeHeader == KSConCapabilityObjectType - || typeHeader == KSConPCDWBXMLObjectType - || typeHeader == KSConPCDWBXMLObjectType2) - { - LOGGER_WRITE( "Client requests capability object or ConML packet" ); - // HandleGetPCConnObjectL will set some data to iObject, or leaves if error occurs - TRAP( err, HandleGetPCConnObjectL( aRequiredObject->Name(), typeHeader ) ); - - if ( err == KErrNone ) - { - bufObject = iObject; - } - else - { - LOGGER_WRITE_1("Get PCConn object failed, err: %d", err); - return NULL; - } - } - // Client requests file conversion - else if ( typeHeader == KSConPCDObjectType ) - { - LOGGER_WRITE("request of KSConPCDObjectType is not supported.") - return NULL; - } - // catalogs - else if ( IsCatalogsMimeType( TDataType( typeHeader ) ) ) - { - TRAP( err, HandleGetCatalogsObjectL( typeHeader ) ); - if ( err == KErrNone ) - { - bufObject = iObject; - } - else - { - LOGGER_WRITE_1("Get catalogs object failed, err: %d", err); - return NULL; - } - } - // Client requests file - else - { - LOGGER_WRITE( "Client requests file" ); - TRAP( err, HandleGetFileObjectL( aRequiredObject->Name() ) ); - if ( err == KErrNone ) - { - bufObject = (CObexBufObject*)iFileObject; - } - else - { - LOGGER_WRITE_1("Get file object failed, err: %d", err); - return NULL; - } - } - if ( bufObject && iLinkAdapter.IsOpen() ) - { - // request active BT mode (high power mode) - err = iLinkAdapter.ActivateActiveRequester(); - LOGGER_WRITE_1( "iLinkAdapter.ActivateActiveRequester() err: %d", err ); - } - return bufObject; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnplugin::GetPacketIndication() -// MObexServerNotify implementation -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnplugin::GetPacketIndication() - { - TRACE_FUNC; - return KErrNone; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnplugin::GetCompleteIndication() -// MObexServerNotify implementation -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnplugin::GetCompleteIndication() - { - TRACE_FUNC_ENTRY; - if ( iLinkAdapter.IsOpen() ) - { - // Cancel ActivateActiveRequester & allow going to low power mode - TInt err = iLinkAdapter.CancelLowPowerModeRequester(); - LOGGER_WRITE_1( "iLinkAdapter.CancelLowPowerModeRequester() err: %d", err ); - } - - TInt ret( KErrNone ); - if ( iFileObject ) - { - iFileObject->Reset(); - delete iFileObject; - iFileObject = NULL; - } - - LOGGER_WRITE_1( "CSConPCConnplugin::GetCompleteIndication() : returned %d", ret ); - return ret; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnplugin::SetPathIndication( const CObex::TSetPathInfo& aPathInfo, -// const TDesC8& aInfo ) -// MObexServerNotify implementation -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnplugin::SetPathIndication( const CObex::TSetPathInfo& aPathInfo, - const TDesC8& /*aInfo*/ ) - { - TRACE_FUNC_ENTRY; - TInt ret( KErrNone ); - TInt err( KErrNone ); - - if ( !iFTPHandler ) - { - LOGGER_WRITE( "Creating iFTPHandler has failed" ); - return TPCConnpluginUtils::ConvertFTPResponseCode( KErrNoMemory ); - } - - if ( aPathInfo.iFlags == KSConNULLSetPath ) - { - TRAP( err, ret = this->iFTPHandler->CreateFolderL( aPathInfo.iName ) ); - } - else - { - TRAP( err, ret = this->iFTPHandler->SetPathL( aPathInfo.iName, - aPathInfo.iFlags ) ); - } - - if ( err != KErrNone ) - { - LOGGER_WRITE_1( "CSConPCConnplugin::SetPathIndication : returned %d", err ); - return TPCConnpluginUtils::ConvertFTPResponseCode( err ); - } - LOGGER_WRITE_1( "CSConPCConnplugin::SetPathIndication : returned %d", ret ); - return TPCConnpluginUtils::ConvertFTPResponseCode( ret ); - } - -// ----------------------------------------------------------------------------- -// CSConPCConnplugin::TrimRightSpaceAndNull( TDes8& aDes ) const -// Removes spaces and nulls from the end of the string -// ----------------------------------------------------------------------------- -// -void CSConPCConnplugin::TrimRightSpaceAndNull( TDes8& aDes ) const - { - TRACE_FUNC; - aDes.TrimRight(); - if ( aDes.Length() > 0 ) - { - if ( !aDes[aDes.Length() - 1] ) - { - aDes.SetLength( aDes.Length() - 1 ); - } - } - } - -// ----------------------------------------------------------------------------- -// CSConPCConnplugin::SetMediaType( TSrcsMediaType aMediaType ) -// Current used transfer media (IR,USB,BT) -// ----------------------------------------------------------------------------- -// -void CSConPCConnplugin::SetMediaType( TSrcsMediaType aMediaType ) - { - TRACE_FUNC; - iMediaType = aMediaType; - } -// ----------------------------------------------------------------------------- -// CSConPCConnplugin::TBool IsCatalogsMimeType( TDataType aMime ) -// Checks if mime type belogs to Catalogs -// ----------------------------------------------------------------------------- -// -TBool CSConPCConnplugin::IsCatalogsMimeType( TDataType aMime ) - { - TRACE_FUNC_ENTRY; - TBool result = EFalse; - - if ( !iCatalogsConnected - && aMime.Des8() != KSConPCDObjectType - && aMime.Des8() != KSConPCDXMLObjectType - && aMime.Des8() != KSConPCDWBXMLObjectType - && aMime.Des8() != KSConPCDXMLObjectType2 - && aMime.Des8() != KSConPCDWBXMLObjectType2 - ) - { - // Catalogs never connected and not secon mime type - // Try to connect to catalogs to get catalogstypes - TInt catalogsErr = iCatalogs->Connect(); - LOGGER_WRITE_1( "CSConPCConnplugin::IsCatalogsMimeType() iCatalogs->Connect() err: %d", catalogsErr ); - if ( catalogsErr == KErrNone ) - { - LOGGER_WRITE( "CSConPCConnplugin::IsCatalogsMimeType() iCatalogs->Connect() success" ); - iCatalogsConnected = ETrue; - TRAPD( ret, iMimeArray = iCatalogs->SupportedMimeTypesL() ); - if ( ret == KErrNone ) - { - LOGGER_WRITE_1( "iCatalogs->SupportedMimeTypesL count: %d", iMimeArray.Count() ); - iCatalogsMimeTypesExist = ETrue; - } - } - } - - if ( iCatalogsMimeTypesExist ) - { - // Compare to supported values - for ( TInt j = 0; j < iMimeArray.Count(); j++ ) - { - if ( (*iMimeArray[j]) == aMime ) - { - LOGGER_WRITE( "CSConPCConnplugin::IsCatalogsMimeTypeL returns TRUE" ); - result = ETrue; - break; - } - } - } - TRACE_FUNC_EXIT; - return result; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnplugin::CSConPCConnplugin() -// Default constructor -// ----------------------------------------------------------------------------- -// -CSConPCConnplugin::CSConPCConnplugin() - { - TRACE_FUNC; - iBuffer = NULL; - iObject = NULL; - iFileObject = NULL; - iSessionActive = EFalse; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnplugin::ConstructL() -// Initializes member data -// ----------------------------------------------------------------------------- -// -void CSConPCConnplugin::ConstructL() - { - TRACE_FUNC_ENTRY; - iBuffer = CBufFlat::NewL( KSConBufSize ); - iObject = CObexBufObject::NewL ( iBuffer ); - iServiceTimer = new (ELeave) CSConServiceTimer( this, KSConTimeOutValue ); - iServiceTimer->ConstructL(); - CActiveScheduler::Add( iServiceTimer ); - - // catalogs - iCatalogs = CCatalogsPCConnectivityPlugin::NewL(); - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnplugin::SetObexServer( CObexServer* aObexServer ) -// SetObexServer -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnplugin::SetObexServer( CObexServer* aObexServer ) - { - iObexServer = aObexServer; - TInt ret = iObexServer->Start(this); - LOGGER_WRITE_1( "CSConPCConnplugin::SetObexServer() ret: %d", ret ); - return ret; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnplugin::HandlePCDObjectPut -// Handles PCD object. Used for advanced file handling. -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnplugin::HandlePCDObjectPut( const TDesC& aDescriptionHeader, - const TDesC& aNameHeader ) - { - TRACE_FUNC_ENTRY; - TInt err( KErrNotSupported); - if ( aDescriptionHeader.Length() >= 3 ) - { - TInt commandTag = aDescriptionHeader[0]; - TInt commandID = aDescriptionHeader[1]; - TInt commandParam1 = aDescriptionHeader[2]; - - TPtrC destination; - if ( aDescriptionHeader.Length() >= 3 ) - { - destination.Set( aDescriptionHeader.Mid(3) ); - } - TPtrC source; - if ( aNameHeader.Length() >= 1 ) - { - // remove ":" character from beginning - source.Set( aNameHeader.Mid(1) ); - } - - if ( commandTag == KSCon_PCD_TAG ) - { - LOGGER_WRITE( "CSConPCConnplugin::HandlePCDObjectPut KSCon_PCD_TAG found" ); - switch (commandID) - { - case KSCon_PCD_CMD_COPY: - err = iFTPHandler->CopyFile( source, destination ); - break; - - case KSCon_PCD_CMD_MOVE_OR_RENAME: - err = iFTPHandler->MoveFile( source, destination ); - break; - - case KSCon_PCD_CMD_SET_PERMISSION: - if ( commandParam1 == KSCon_PCD_PAR_FULL_PERMISSION ) - { - err = iFTPHandler->SetReadOnly( source, EFalse ); - } - else if ( commandParam1 == KSCon_PCD_PAR_READ_ONLY_PERMISSION ) - { - err = iFTPHandler->SetReadOnly( source, ETrue ); - } - else - { - err = KErrNotSupported; - } - break; - - default: - LOGGER_WRITE( "CSConPCConnplugin::HandlePCDObjectPut unknown commandID" ); - err = KErrNotSupported; - break; - } - - } - - } - TRACE_FUNC_EXIT; - return err; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnplugin::HandleGetPCConnObjectL -// Get Capbility object or ConML message from PCConnServer -// ----------------------------------------------------------------------------- -// -void CSConPCConnplugin::HandleGetPCConnObjectL( const TDesC& aNameHeader, - const TDesC8& aTypeHeader ) - { - TRACE_FUNC_ENTRY; - if ( !iPCConnSessionConnected ) - { - LOGGER_WRITE( "ERROR, iPCConnSession was not connected" ); - User::Leave( KErrNotReady ); - } - TInt err = iPCConnSession.GetPacketL( aNameHeader, aTypeHeader, iBuffer ); - LOGGER_WRITE_1( "iPCConnSession.GetPacketL() returned: %d", err ); - User::LeaveIfError( err ); - iObject->SetDataBufL( iBuffer ); - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnplugin::HandleGetCatalogsObjectL -// Get Catalogs object -// ----------------------------------------------------------------------------- -// -void CSConPCConnplugin::HandleGetCatalogsObjectL( const TDesC8& aTypeHeader ) - { - TRACE_FUNC_ENTRY; - TInt err(KErrNone); - if ( !iCatalogsConnected ) - { - LOGGER_WRITE( "catalogs mime type recognised - failing due to no connection" ); - User::Leave( KErrNotReady ); - } - else - { - LOGGER_WRITE( "iCatalogs->GetDataL" ); - TDataType mime( aTypeHeader ); - TRAP( err, iCatalogs->GetDataL( mime, *iBuffer ) ); - LOGGER_WRITE_1( "iCatalogs->GetDataL : %d", err ); - if ( err == KErrServerTerminated ) - { - // server was terminated, try to reconnect - err = iCatalogs->Connect(); - LOGGER_WRITE_1( "iCatalogs->Connect() err: %d", err ); - User::LeaveIfError( err ); - LOGGER_WRITE( "iCatalogs->GetDataL" ); - iCatalogs->GetDataL( mime, *iBuffer ); - } - } - User::LeaveIfError( err ); - iObject->SetDataBufL( iBuffer ); - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnplugin::HandleGetFileObjectL -// Get file object -// ----------------------------------------------------------------------------- -// -void CSConPCConnplugin::HandleGetFileObjectL( const TDesC& aNameHeader ) - { - TRACE_FUNC_ENTRY; - delete iFileObject; - iFileObject = NULL; - iFileObject = CObexFileObject::NewL(); - - iFileObject->Reset(); - iFileObject->SetNameL( aNameHeader ); - - if ( !iFTPHandler ) - { - LOGGER_WRITE( "Creating iFTPHandler has failed" ); - User::Leave( KErrNotReady ); - } - - TInt err = iFTPHandler->GetFileObjectL( iFileObject ); - User::LeaveIfError( err ); - TRACE_FUNC_EXIT; - } - -// End of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/pcconn/src/sconpcconnpluginutils.cpp --- a/connectivitymodules/SeCon/plugins/pcconn/src/sconpcconnpluginutils.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,274 +0,0 @@ -/* -* Copyright (c) 2005-2007 Nokia Corporation and/or 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: PC Connectivity Plug-in Utils implementation -* -*/ - - -// INCLUDE FILES -#include -#include "sconpcconnpluginutils.h" -#include "debug.h" - -// ============================= MEMBER FUNCTIONS =============================== - -// ----------------------------------------------------------------------------- -// TPCConnpluginUtils::ConvertFTPResponseCode( TInt aError ) -// Converts Symbian error code to OBEX error code -// ----------------------------------------------------------------------------- -// -TInt TPCConnpluginUtils::ConvertFTPResponseCode( TInt aError ) - { - LOGGER_WRITE_1( "TPCConnpluginUtils::ConvertFTPResponseCode( TInt aError )\ - : begin, aError: %d", aError ); - TInt obexErr ( KErrIrObexRespBadRequest ); - switch( aError ) - { - case KErrNone: - obexErr = KErrNone; - break; - case KErrNotFound: - obexErr = KErrIrObexRespNotFound; - break; - case KErrGeneral: - case KErrCancel: - obexErr = KErrIrObexRespBadRequest; - break; - case KErrNoMemory: - obexErr = KErrIrObexRespDatabaseFull; - break; - case KErrNotSupported: - obexErr = KErrIrObexRespNotImplemented; - break; - case KErrArgument: - case KErrTotalLossOfPrecision: - case KErrBadHandle: - case KErrOverflow: - case KErrUnderflow: - case KErrAlreadyExists: - obexErr = KErrIrObexRespConflict; - break; - case KErrPathNotFound: - case KErrDied: - obexErr = KErrIrObexRespNotFound; - break; - case KErrInUse: - obexErr = KErrIrObexRespTimedOut; - break; - case KErrServerTerminated: - obexErr = KErrIrObexRespNotFound; - break; - case KErrServerBusy: - case KErrCompletion: - case KErrNotReady: - case KErrUnknown: - case KErrCorrupt: - obexErr = KErrIrObexRespForbidden; - break; - case KErrAccessDenied: - case KErrLocked: - obexErr = KErrIrObexRespUnauthorized; - break; - case KErrWrite: - case KErrDisMounted: - case KErrEof: - obexErr = KErrIrObexRespForbidden; - break; - case KErrDiskFull: - obexErr = KErrIrObexRespDatabaseFull; - break; - case KErrBadDriver: - case KErrBadName: - obexErr = KErrIrObexRespPreCondFailed; - break; - case KErrCommsLineFail: - case KErrCommsFrame: - case KErrCommsOverrun: - case KErrCommsParity: - case KErrTimedOut: - case KErrCouldNotConnect: - case KErrCouldNotDisconnect: - case KErrBadLibraryEntryPoint: - case KErrBadDescriptor: - case KErrAbort: - obexErr = KErrIrObexRespForbidden; - break; - case KErrTooBig: - obexErr = KErrIrObexRespReqEntityTooLarge; - break; - case KErrDivideByZero: - case KErrBadPower: - case KErrDirFull: - case KErrHardwareNotAvailable: - obexErr = KErrIrObexRespForbidden; - break; - case KErrDisconnected: // System is shutting down - obexErr = KErrIrObexRespMethodNotAllowed; - break; - default: - obexErr = KErrIrObexRespBadRequest; - break; - }; - LOGGER_WRITE_1( "TPCConnpluginUtils::ConvertFTPResponseCode( \ - TInt aError ) returned : %d", obexErr ); - return obexErr; -}; - -// ----------------------------------------------------------------------------- -// TPCConnpluginUtils::ConvertPCDResponseCode( TInt aError ) -// Converts Symbian error code to OBEX error code -// ----------------------------------------------------------------------------- -// -TInt TPCConnpluginUtils::ConvertPCDResponseCode( TInt aError ) - { - LOGGER_WRITE_1( "TPCConnpluginUtils::ConvertPCDResponseCode( TInt \ - aError ) : begin, aError: %d", aError ); - - TInt obexErr ( KErrIrObexRespInternalError ); - switch( aError ) - { - case KErrNone: - obexErr = KErrNone; - break; - case KErrNotFound: - obexErr = KErrIrObexRespNotFound; - break; - case KErrGeneral: - case KErrCancel: - obexErr = KErrIrObexRespInternalError; - break; - case KErrNoMemory: - obexErr = KErrIrObexRespDatabaseFull; - break; - case KErrNotSupported: - obexErr = KErrIrObexRespUnsupMediaType; - break; - case KErrArgument: - case KErrTotalLossOfPrecision: - case KErrBadHandle: - case KErrOverflow: - case KErrUnderflow: - obexErr = KErrIrObexRespPreCondFailed; - break; - case KErrAlreadyExists: - obexErr = KErrIrObexRespConflict; - break; - case KErrPathNotFound: - case KErrDied: - case KErrInUse: - obexErr = KErrIrObexRespTimedOut; - break; - case KErrServerTerminated: - obexErr = KErrIrObexRespPreCondFailed; - break; - case KErrServerBusy: - obexErr = KErrIrObexRespConflict; - break; - case KErrCompletion: - case KErrNotReady: - case KErrUnknown: - case KErrCorrupt: - obexErr = KErrIrObexRespInternalError; - break; - case KErrAccessDenied: - case KErrLocked: - obexErr = KErrIrObexRespUnauthorized; - break; - case KErrWrite: - case KErrDisMounted: - case KErrEof: - obexErr = KErrIrObexRespInternalError; - break; - case KErrDiskFull: - obexErr = KErrIrObexRespDatabaseFull; - break; - case KErrBadDriver: - case KErrBadName: - obexErr = KErrIrObexRespNotFound; - break; - case KErrCommsLineFail: - case KErrCommsFrame: - case KErrCommsOverrun: - case KErrCommsParity: - case KErrTimedOut: - case KErrCouldNotConnect: - case KErrCouldNotDisconnect: - case KErrBadLibraryEntryPoint: - case KErrBadDescriptor: - case KErrAbort: - case KErrTooBig: - case KErrDivideByZero: - case KErrBadPower: - case KErrDirFull: - case KErrHardwareNotAvailable: - obexErr = KErrIrObexRespInternalError; - break; - default: - obexErr = KErrIrObexRespInternalError; - break; - }; - LOGGER_WRITE_1( "TPCConnpluginUtils::ConvertPCDResponseCode(\ - TInt aError ) returned : %d", obexErr ); - return obexErr; -}; - -// ----------------------------------------------------------------------------- -// TPCConnpluginUtils::ConvertObexMoveResponseCode( TInt aError ) -// Converts Symbian error code to OBEX error code -// ----------------------------------------------------------------------------- -// -TInt TPCConnpluginUtils::ConvertObexMoveResponseCode( TInt aError ) - { - LOGGER_WRITE_1( "TPCConnpluginUtils::ConvertObexMoveResponseCode( TInt \ - aError ) : begin, aError: %d", aError ); - - TInt obexErr ( KErrIrObexRespInternalError ); - switch( aError ) - { - case KErrNone: - obexErr = KErrIrObexRespSuccess; - break; - case KErrNotFound: - case KErrPathNotFound: - obexErr = KErrIrObexRespNotFound; - break; - case KErrAccessDenied: - obexErr = KErrIrObexRespForbidden; - break; - case KErrNoMemory: - case KErrDiskFull: - obexErr = KErrIrObexRespDatabaseFull; - break; - case KErrInUse: - case KErrLocked: - obexErr = KErrIrObexRespConflict; - break; - case KErrNotSupported: - obexErr = KErrIrObexRespNotImplemented; - break; - case KErrAlreadyExists: - obexErr = KErrIrObexRespNotModified; - break; - - default: - obexErr = KErrIrObexRespInternalError; - break; - }; - LOGGER_WRITE_1( "TPCConnpluginUtils::ConvertObexMoveResponseCode(\ - TInt aError ) returned : %d", obexErr ); - return obexErr; -}; - -//End of file - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/pcconn/src/sconservicetimer.cpp --- a/connectivitymodules/SeCon/plugins/pcconn/src/sconservicetimer.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,119 +0,0 @@ -/* -* Copyright (c) 2005-2007 Nokia Corporation and/or 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: PC Connectivity Plug-in Service Timer implementation -* -*/ - - -// INCLUDE FILES - -#include "sconservicetimer.h" -#include "sconpcconnplugin.h" -#include "debug.h" - -// ============================= MEMBER FUNCTIONS =============================== - -// ----------------------------------------------------------------------------- -// CSConServiceTimer::CSConServiceTimer( CSConPCConnplugin* aEngine, TInt aValue ) -// Constuctor -// ----------------------------------------------------------------------------- -// -CSConServiceTimer::CSConServiceTimer( CSConPCConnplugin* aEngine, TInt aValue ) - : CActive( EPriorityStandard ), iEngine( aEngine ), iValue( aValue ) {} - -// ----------------------------------------------------------------------------- -// CSConServiceTimer::ConstructL() -// Initializes member data -// ----------------------------------------------------------------------------- -// -void CSConServiceTimer::ConstructL() - { - LOGGER_ENTERFN( "CSConServiceTimer::ConstructL()" ); - // create a thread-relative timer - User::LeaveIfError( iTimer.CreateLocal() ); - LOGGER_LEAVEFN( "CSConServiceTimer::ConstructL()" ); - } - -// ----------------------------------------------------------------------------- -// CSConServiceTimer::~CSConServiceTimer() -// Destructor -// ----------------------------------------------------------------------------- -// -CSConServiceTimer::~CSConServiceTimer() - { - LOGGER_ENTERFN( "CSConServiceTimer::~CSConServiceTimer()" ); - iTimer.Close(); - LOGGER_LEAVEFN( "CSConServiceTimer::~CSConServiceTimer()" ); - } - -// ----------------------------------------------------------------------------- -// CSConServiceTimer::~CSConServiceTimer() -// Starts the timer -// ----------------------------------------------------------------------------- -// -void CSConServiceTimer::StartTimer() - { - LOGGER_ENTERFN( "CSConServiceTimer::StartTimer()" ); - if( !IsActive() ) - { - LOGGER_WRITE( "CSConServiceTimer::StartTimer() : !IsActive()" ); - iTimer.After( iStatus, TTimeIntervalMicroSeconds32( iValue ) ); - iEngine->iSessionActive = ETrue; - SetActive(); - LOGGER_WRITE( "CSConServiceTimer::StartTimer() : SetActive()" ); - } - LOGGER_LEAVEFN( "CSConServiceTimer::StartTimer()" ); - } - -// ----------------------------------------------------------------------------- -// CSConServiceTimer::StopTimer() -// StopTimer() -// ----------------------------------------------------------------------------- -// -void CSConServiceTimer::StopTimer() - { - LOGGER_ENTERFN( "CSConServiceTimer::StopTimer()" ); - iEngine->iSessionActive = ETrue; - LOGGER_WRITE( "CSConServiceTimer::StopTimer() : iSessionActive = ETrue" ); - LOGGER_LEAVEFN( "CSConServiceTimer::StopTimer()" ); - } - -// ----------------------------------------------------------------------------- -// CSConServiceTimer::DoCancel() -// Cancels the timer -// ----------------------------------------------------------------------------- -// -void CSConServiceTimer::DoCancel() - { - LOGGER_ENTERFN( "CSConServiceTimer::DoCancel()" ); - iTimer.Cancel(); - LOGGER_LEAVEFN( "CSConServiceTimer::DoCancel()" ); - } - -// ----------------------------------------------------------------------------- -// CSConServiceTimer::RunL() -// Executed when timer is triggered -// ----------------------------------------------------------------------------- -// -void CSConServiceTimer::RunL() - { - LOGGER_ENTERFN( "CSConServiceTimer::RunL()" ); - iEngine->iSessionActive = EFalse; - LOGGER_WRITE( "CSConServiceTimer::RunL() : iSessionActive = EFalse" ); - iEngine->iStartTimer = EFalse; - LOGGER_WRITE( "CSConServiceTimer::RunL() : iStartTimer = EFalse " ); - LOGGER_LEAVEFN( "CSConServiceTimer::RunL()" ); - } - -// End of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/plugins/pcconn/src/sconshutdownwatcher.cpp --- a/connectivitymodules/SeCon/plugins/pcconn/src/sconshutdownwatcher.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,153 +0,0 @@ -/* -* Copyright (c) 2007 Nokia Corporation and/or 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: Power shutdown -watcher implementation -* -*/ - - -// INCLUDE FILES - -#include "sconshutdownwatcher.h" -#include "debug.h" - -#include - - - -// ============================= MEMBER FUNCTIONS =============================== - -// ----------------------------------------------------------------------------- -// CShutdownWatcher::NewL( MShutdownObserver* aObserver ) -// Two-phase constructor -// ----------------------------------------------------------------------------- -// -CShutdownWatcher* CShutdownWatcher::NewL( MShutdownObserver* aObserver ) - { - LOGGER_ENTERFN( "CShutdownWatcher::NewL()" ); - CShutdownWatcher* self = new (ELeave) CShutdownWatcher( aObserver ); - CleanupStack::PushL(self); - self->ConstructL(); - CleanupStack::Pop(self); - LOGGER_LEAVEFN( "CShutdownWatcher::NewL()" ); - return self; - } - -// ----------------------------------------------------------------------------- -// CShutdownWatcher::~CShutdownWatcher() -// Destructor -// ----------------------------------------------------------------------------- -// -CShutdownWatcher::~CShutdownWatcher() - { - LOGGER_ENTERFN( "CShutdownWatcher::~CShutdownWatcher()" ); - Cancel(); - iProperty.Close(); - LOGGER_LEAVEFN( "CShutdownWatcher::~CShutdownWatcher()" ); - } - -// ----------------------------------------------------------------------------- -// CShutdownWatcher::StartShutdownWatcher() -// Starts to watch shutdown status -// ----------------------------------------------------------------------------- -// -void CShutdownWatcher::StartShutdownWatcher() - { - LOGGER_ENTERFN( "CShutdownWatcher::StartShutdownWatcher()" ); - TInt status; - TInt err = iProperty.Get( KPSUidStartup, KPSGlobalSystemState, status ); - LOGGER_WRITE_2( "CShutdownWatcher::StartShutdownWatcher() :\ - err %d, KPSGlobalSystemState status %d",err, status); - if ( err == KErrNone ) - { - if ( status == ESwStateShuttingDown ) - { - LOGGER_WRITE( "Call NotifyShutdown" ); - iObserver->NotifyShutdown(); - return; - } - } - - err = iProperty.Attach( KPSUidStartup, KPSGlobalSystemState ); - LOGGER_WRITE_1( "CShutdownWatcher::StartShutdownWatcher() :\ - iProperty.Attach( KPSUidStartup, KPSGlobalSystemState ) : err %d", err ); - iProperty.Subscribe( iStatus ); - LOGGER_WRITE( "CShutdownWatcher::StartShutdownWatcher() :\ - iProperty.Subscribe( iStatus ) : ok" ); - SetActive(); - - LOGGER_LEAVEFN( "CShutdownWatcher::StartShutdownWatcher()" ); - } - -// ----------------------------------------------------------------------------- -// CShutdownWatcher::DoCancel() -// Executed when CActive is canceled. -// ----------------------------------------------------------------------------- -// -void CShutdownWatcher::DoCancel() - { - LOGGER_ENTERFN( "CShutdownWatcher::DoCancel()" ); - iProperty.Cancel(); - LOGGER_LEAVEFN( "CShutdownWatcher::DoCancel()" ); - } - -// ----------------------------------------------------------------------------- -// CShutdownWatcher::RunL() -// Executed when disk watcher is triggered -// ----------------------------------------------------------------------------- -// -void CShutdownWatcher::RunL() - { - LOGGER_ENTERFN( "CShutdownWatcher::RunL()" ); - TInt status; - iProperty.Get( status ); - LOGGER_WRITE_1( "CShutdownWatcher::RunL() : status %d", status ); - - if ( status == ESwStateShuttingDown ) - { - LOGGER_WRITE( "Call NotifyShutdown" ); - iObserver->NotifyShutdown(); - return; - } - - iProperty.Cancel(); - iProperty.Close(); - - LOGGER_LEAVEFN( "CShutdownWatcher::RunL()" ); - } - - -// ----------------------------------------------------------------------------- -// CShutdownWatcher::CShutdownWatcher( MShutdownObserver* aObserver ) -// Default constructor -// ----------------------------------------------------------------------------- -// -CShutdownWatcher::CShutdownWatcher( MShutdownObserver* aObserver ) -: CActive(EPriorityStandard), - iObserver(aObserver) - { - } - -// ----------------------------------------------------------------------------- -// CShutdownWatcher::ConstructL() -// Initializes member data -// ----------------------------------------------------------------------------- -// -void CShutdownWatcher::ConstructL() - { - LOGGER_ENTERFN( "CShutdownWatcher::ConstructL()" ); - CActiveScheduler::Add(this); - LOGGER_LEAVEFN( "CShutdownWatcher::ConstructL()" ); - } - -// End of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/rom/cntparser.iby --- a/connectivitymodules/SeCon/rom/cntparser.iby Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Image description file for Contact Parser Client and Server. -* -*/ - - -file=ABI_DIR\BUILD_DIR\cntparserserverexe.exe PROGRAMS_DIR\cntparserserverexe.exe -file=ABI_DIR\BUILD_DIR\cntparserserver.dll SHARED_LIB_DIR\cntparserserver.dll - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/rom/sconcsc.iby --- a/connectivitymodules/SeCon/rom/sconcsc.iby Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -/* -* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* 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: Image description file for project SConCSC -* -*/ - - -#ifndef __SCONCSC_IBY__ -#define __SCONCSC_IBY__ -//file content - -file=ABI_DIR\BUILD_DIR\sconcsc.dll SHARED_LIB_DIR\sconcsc.dll -data=ZPRIVATE\101F99F6\capability\101F9698.xml PRIVATE\101F99F6\capability\101F9698.xml -data=ZPRIVATE\101F99F6\capability\fwdcomp.xml PRIVATE\101F99F6\capability\fwdcomp.xml -data=ZPRIVATE\101F99F6\capability\101F99F6.xml PRIVATE\101F99F6\capability\101F99F6.xml -#endif diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/rom/sconftp.iby --- a/connectivitymodules/SeCon/rom/sconftp.iby Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Image description file for CSConFTP -* -*/ - - -#ifndef __SCONFTP_IBY__ -#define __SCONFTP_IBY__ -//file content - -file=ABI_DIR\BUILD_DIR\sconftp.dll SHARED_LIB_DIR\sconftp.dll - -#endif diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/rom/sconftpplugin.iby --- a/connectivitymodules/SeCon/rom/sconftpplugin.iby Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Image description file for FTPplugin -* -*/ - - -#ifndef __SCONFTP_PLUGIN_IBY__ -#define __SCONFTP_PLUGIN_IBY__ -//file content - -ECOM_PLUGIN(sconftpplugin.dll,101F9686.RSC) - -#endif diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/rom/sconftpresources.iby --- a/connectivitymodules/SeCon/rom/sconftpresources.iby Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Image description file for SConFTP resources. -* -*/ - -#ifndef __SCONFTP_RESOURCE_IBY__ -#define __SCONFTP_RESOURCE_IBY__ - -data=DATAZ_\RESOURCE_FILES_DIR\sconftp.rsc RESOURCE_FILES_DIR\sconftp.rsc - -#endif \ No newline at end of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/rom/sconpcconnclientserver.iby --- a/connectivitymodules/SeCon/rom/sconpcconnclientserver.iby Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -/* -* Copyright (c) 2005-2008 Nokia Corporation and/or 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: Image description file for project PCCONNClientServer -* -*/ - - -#ifndef __SCONPCCONNCLIENTSERVER_IBY__ -#define __SCONPCCONNCLIENTSERVER_IBY__ -//file content - -file=ABI_DIR\BUILD_DIR\sconconmlhandler.dll SHARED_LIB_DIR\sconconmlhandler.dll - -file=ABI_DIR\BUILD_DIR\sconpcconnserver.exe PROGRAMS_DIR\sconpcconnserver.exe -file=ABI_DIR\BUILD_DIR\sconpcconnclient.dll SHARED_LIB_DIR\sconpcconnclient.dll - -// stub files -data=ZSYSTEM\install\secon_stub.sis system\install\secon_stub.sis -data=ZSYSTEM\install\sconpcconnplugin_stub.sis system\install\sconpcconnplugin_stub.sis -data=ZSYSTEM\install\sconftpplugin_stub.sis system\install\sconftpplugin_stub.sis - -#endif diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/rom/sconpcconnplugin.iby --- a/connectivitymodules/SeCon/rom/sconpcconnplugin.iby Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Image description file for PC Connectivity Plug-in. -* -*/ -#ifndef __SCONPCCONN_PLUGIN_IBY__ -#define __SCONPCCONN_PLUGIN_IBY__ -//file content - -ECOM_PLUGIN(sconpcconnplugin.dll,101F9688.RSC) - -file=ABI_DIR\BUILD_DIR\catalogspcconnectivityplugin.dll SHARED_LIB_DIR\catalogspcconnectivityplugin.dll - -#endif diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/rom/sconpcd.iby --- a/connectivitymodules/SeCon/rom/sconpcd.iby Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Image description file for SConPCD. -* -*/ -#ifndef __SCONPCD_IBY__ -#define __SCONPCD_IBY__ -//file content - -file=ABI_DIR\BUILD_DIR\sconpcd.dll system\libs\sconpcd.dll - -data=ZPRIVATE\10202D56\sbeconfig.xml PRIVATE\10202D56\sbeconfig.xml - -#endif diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/servers/pcconn/bld/bld.inf --- a/connectivitymodules/SeCon/servers/pcconn/bld/bld.inf Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -/* -* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* 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: Build information file for project PCConnServer -* -*/ - - -PRJ_EXPORTS - - -PRJ_PLATFORMS -DEFAULT - -PRJ_MMPFILES -sconpcconnserver.mmp diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/servers/pcconn/bld/sconpcconnserver.mmp --- a/connectivitymodules/SeCon/servers/pcconn/bld/sconpcconnserver.mmp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,77 +0,0 @@ -/* -* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* 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: PC Connectivity Server -* -*/ - - -// To get the MW_LAYER_SYSTEMINCLUDE-definition -#include -#include - -VENDORID VID_DEFAULT - -CAPABILITY CAP_SERVER TrustedUI - -TARGET sconpcconnserver.exe -TARGETTYPE exe - -EPOCSTACKSIZE 0x10000 -EPOCHEAPSIZE 0x10000 0x1000000 // heap memory 16MB - -UID 0 0x101F99F6 - -// Server -SOURCEPATH ../src -SOURCE sconpcconnserver.cpp -SOURCE sconimsireader.cpp -SOURCE sconfolderlister.cpp -SOURCE sconbtengine.cpp - -// ConML -SOURCEPATH ../../../wbxml/conmlhandler/src -SOURCE sconconmldtd.cpp -SOURCE sconxmlelement.cpp - -SOURCEPATH ../../../common/conmltask/src -SOURCE sconconmltask.cpp - -USERINCLUDE ../inc -USERINCLUDE ../../../inc -USERINCLUDE ../../../common/conmltask/inc -USERINCLUDE ../../../services/pcd/inc -USERINCLUDE ../../../services/csc/inc -USERINCLUDE ../../../services/oviaccounthandler/inc -USERINCLUDE ../../../wbxml/conmlhandler/inc - -// Default system include paths for middleware layer modules. -MW_LAYER_SYSTEMINCLUDE - -LIBRARY euser.lib -LIBRARY estor.lib // RMemWriteStream, RMemReadStream -LIBRARY efsrv.lib // Rfs, RFile -LIBRARY charconv.lib // For Unicode conversion -LIBRARY etel3rdparty.lib -LIBRARY platformenv.lib // For pathinfo -LIBRARY directorylocalizer.lib // For localizing directories -LIBRARY centralrepository.lib -LIBRARY commonengine.lib // For resource reader -LIBRARY bafl.lib // Basic Application Framework Library -LIBRARY btengdevman.lib -LIBRARY btmanclient.lib -LIBRARY btdevice.lib -LIBRARY bluetooth.lib -LIBRARY btengsettings.lib -DEBUGLIBRARY flogger.lib - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/servers/pcconn/inc/sconbtengine.h --- a/connectivitymodules/SeCon/servers/pcconn/inc/sconbtengine.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,82 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: CSconBtEngine declaration -* -*/ - - - -#ifndef SCONBTENGINE_H_ -#define SCONBTENGINE_H_ - -#include -#include -#include -#include -#include - -const TInt KCenRepAddrBufSize = 2 * KBTDevAddrSize; - -class CSconBtEngine : public CBase, - public MBTEngDevManObserver, - public MBTEngSettingsObserver - { -public: - static CSconBtEngine* NewL(); - ~CSconBtEngine(); - - void ReadBTInfoL( RBufWriteStream& aStream ); - - void SetBtAuthorizedL( const TDesC& aBtDevAddress, TBool aAuthorized ); - - TInt SetBtPowerState( TBool aPower ); - - TInt SetBtName( const TDesC& aBtName ); - -protected: - // From MBTEngDevManObserver - void HandleDevManComplete( TInt aErr ); - void HandleGetDevicesComplete( TInt aErr, - CBTDeviceArray* aDeviceArray ); - - // From MBTEngSettingsObserver - void PowerStateChanged( TBTPowerStateValue aState ); - void VisibilityModeChanged( TBTVisibilityMode aState ); - -private: - CSconBtEngine(); - void ConstructL(); - - void PrintDevicesL(); - -private: - enum TState - { - EIdle, - ERequestBtInfo, - EChangeBtState, - EChangeAuthorized - }; - TState iState; - TInt iOperationError; - CActiveSchedulerWait iWait; - RBufWriteStream* iStream; - CBTEngDevMan* iBtEng; - CBTDeviceArray* iBtDevArray; - CBTEngSettings* iBtSettings; - TBool iAuthorizedValue; - TBuf iBtAddress; - }; - -#endif /* SCONBTENGINE_H_ */ diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/servers/pcconn/inc/sconfolderlister.h --- a/connectivitymodules/SeCon/servers/pcconn/inc/sconfolderlister.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,136 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: CSconFolderLister declaration -* -*/ - - -#ifndef CSCONFOLDERLISTER_H -#define CSCONFOLDERLISTER_H - -// INCLUDES -#include -#include -#include // For RMemReadStream -#include -// CLASS DECLARATION - -class TSconDriveInfoEntry - { -public: - TUint8 iDriveType; - TUint8 iDriveTypeCount; - TInt64 iSize; - TInt64 iFree; - }; - -class TSconDriveInfo : public TSconDriveInfoEntry - { -public: - TUint iDriveStatus; - TBuf16<2> iDriveLetter; - TUint iDriveAttr; - TBufC iVolumeName; - }; - - -class CSconFolderEntry : public CBase - { -public: - static CSconFolderEntry* NewLC(); - static CSconFolderEntry* NewLC( const TEntry& aEntry ); - ~CSconFolderEntry(); -private: - CSconFolderEntry(); - void ConstructL( const TEntry& aEntry ); - -public: - TUint iAtt; - TTime iModified; - HBufC *iName; - HBufC *iLabel; - TBool iDriveInfoEntryExists; - TSconDriveInfoEntry iDriveInfoEntry; - }; - - -class CDirectoryLocalizer; - -/** - * CSconFolderLister - * - */ -class CSconFolderLister : public CBase - { -public: - // Constructors and destructor - - /** - * Destructor. - */ - ~CSconFolderLister(); - - /** - * Two-phased constructor. - */ - static CSconFolderLister* NewL( RFs& aFs ); - - /** - * - * @param aStream - * @param aStartPath - * @param aLevelsToSearch -1 = Search all levels, 0 = Search only current level, 1..N Search N levels - */ - void GenerateFolderListL( RBufWriteStream& aStream, const TDesC& aStartPath, const TInt aLevelsToSearch ); - -private: - - void ListAllDrivesL( RBufWriteStream& aStream, const TInt aLevelsToSearch ); - void ListDriveAndPathL( RBufWriteStream& aStream, TInt aDrive, const TDesC& aStartPath, const TInt aLevelsToSearch ); - - void ExportDriveL( RBufWriteStream& aStream, const TSconDriveInfo& aDriveInfo, - const TDesC& aPathName, const TInt aLevelsToSearch ); - - /** - * - * @param aStream - * @param aPathName - */ - void ExportPathL( RBufWriteStream& aStream, const TDesC& aPathName, - const CSconFolderEntry& aEntry, const TBool aLocalize, const TInt aLevelsToSearch ); - - void GetDriveTypeNumberL( TInt aDrive , TUint driveStatus, TInt& aTypeNumber); - - /** - * Constructor for performing 1st stage construction - */ - CSconFolderLister( RFs& aFs ); - - /** - * EPOC default constructor for performing 2nd stage construction - */ - void ConstructL(); - - TBool IsDirectoryPrintable( const TDesC& aParentPath, const TEntry& aFolderEntry ); - - void GetLocalizedVolumeNameL( CSconFolderEntry& aDriveEntry ); -private: - RFs& iFs; - TInt iFolders; - TInt iFiles; - TInt iCriticalLevel; - CDirectoryLocalizer* iLocalizer; - }; - -#endif // CSCONFOLDERLISTER_H diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/servers/pcconn/inc/sconimsireader.h --- a/connectivitymodules/SeCon/servers/pcconn/inc/sconimsireader.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,65 +0,0 @@ -/* -* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* 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: Imsi reader -* -*/ - - -#ifndef __SCONIMSIREADER_H__ -#define __SCONIMSIREADER_H__ - -#include -#include - -enum TImsiReaderStatus - { - EIdle, - ERequestingImsi, - ERequestingNetworkStatus - }; - -class CSconImsiReader : public CActive - { - public: - - static TInt GetImsiL( TDes& aImsi ); - - static TInt GetNetworkStatusL( CTelephony::TRegistrationStatus& aRegistrationStatus ); - - private: - CSconImsiReader( TDes& aImsi, CTelephony::TRegistrationStatus& aRegistrationStatus ); - void ConstructL(); - ~CSconImsiReader(); - - void RequestImsi(); - void RequestNetworkStatus(); - - private: // From CActive - - void RunL(); - void DoCancel(); - - private: // data - TDes& iImsi; - CTelephony::TRegistrationStatus& iNetworkStatus; - CTelephony* iTelephony; - CTelephony::TSubscriberIdV1 iSubscriberIdV1; - CTelephony::TSubscriberIdV1Pckg iSubscriberIdV1Pckg; - - CTelephony::TNetworkRegistrationV1 iNetworkRegistrationV1; - CTelephony::TNetworkRegistrationV1Pckg iNetworkRegistrationV1Pckg; - TImsiReaderStatus iImsiReaderStatus; - }; - -#endif // __SCONIMSIREADER_H__ diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/servers/pcconn/inc/sconpcconnclientserver.h --- a/connectivitymodules/SeCon/servers/pcconn/inc/sconpcconnclientserver.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,70 +0,0 @@ -/* -* Copyright (c) 2005-2006 Nokia Corporation and/or 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: PC Connectivity server client -* -*/ - - - - -#ifndef __SCONPCCONNCLIENTSERVER_H__ -#define __SCONPCCONNCLIENTSERVER_H__ - -#include - -// for debugging ConML messages and capability objects -//#define DEBUG_XML - - -// reasons for server panic -enum TPCConnServPanic - { - E_BadRequest = 1, - E_DispatchRequest, - E_InvalidClient, - E_CleanupCreate, - E_MainSchedulerError - }; - - -// server related constants -_LIT( KSConPCConnServerName,"SConPCConnServer" ); -_LIT( KSConPCConnServerExe, "SConPCConnServer.exe" ); - -// client -_LIT( KSConPCConnClientDll, "SConPCConnClient.dll" ); - - -// Chunk -const TUint KSConPCConnChunkSize = 128; -const TUint KSConPCConnChunkMaxSize = 65536; -const TUint KSConPCConnBufferMaxSize = 65000; - -// Version number -const TUint KSConPCConnServerVersionMajor = 1; -const TUint KSConPCConnServerVersionMinor = 0; -const TUint KSConPCConnServerVersionBuild = 1; - - -// Function codes - -enum TRequest -{ - EPutMessage, - EGetMessage, - EResetMessage, - EChunkMessage -}; - -#endif // __SCONPCCONNCLIENTSERVER_H__ diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/servers/pcconn/inc/sconpcconnserver.h --- a/connectivitymodules/SeCon/servers/pcconn/inc/sconpcconnserver.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,247 +0,0 @@ -/* -* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* 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: PC Connectivity server -* -*/ - - -#ifndef __SCONPCCONNSERVER_H__ -#define __SCONPCCONNSERVER_H__ - -#include "sconconmlhandler.h" -#include "sconconmltask.h" - - -class CSConPCD; -class CSConCSC; -class CSConConMLParser; - -const TUint KSConDefaultHeapSize=0x10000; -const TInt KSConFirstDrive = 65; - -_LIT8 ( KParamNameSilent, "Silent" ); - - -// PCD Handler Dll -_LIT(KSConPCDLibName, "sconpcd.dll"); -const TInt KSConPCDUidValue = 0x10009D8D; -const TUid KSConPCDUid = {KSConPCDUidValue}; - -// CSC Handler Dll -_LIT(KSConCSCLibName, "sconcsc.dll"); -const TInt KSConCSCUidValue = 0x10009D8D; -const TUid KSConCSCUid = {KSConCSCUidValue}; - -// ConML Handler Dll -_LIT (KSConConMLHandlerLibName, "sconconmlhandler.dll"); -const TInt KSConConMLHandlerUidValue = 0x10009D8D; -const TUid KSConConMLHandlerUid = {KSConConMLHandlerUidValue}; - -// debug file for put and get messages -_LIT ( KSConConMLDebugFile, "c:\\data\\handler_result.txt"); - -// Secure ids -_LIT_SECURE_ID(KSConPCConnClientSecureId,0x101F7C87); - -// PCD types -_LIT8( KSConPCDXMLObjectType, "application/vnd.nokia.conml+xml" ); -_LIT8( KSConPCDXMLObjectType2, "application/vnd.nokia.pcd+xml" ); -_LIT8( KSConPCDWBXMLObjectType, "application/vnd.nokia.conml+wbxml" ); -_LIT8( KSConPCDWBXMLObjectType2, "application/vnd.nokia.pcd+wbxml" ); - -// CSC types -_LIT8( KSConCapabilityObjectType, "x-obex/capability" ); - -// Drives -_LIT( KSConNoDrive, "\x0" ); -_LIT( KSConDriveExists, "\x1" ); - -// user permissions -_LIT8( KSConPermReadOnly, "R" ); -_LIT8( KSConPermNormal, "RW" ); -// Java hash id for ConML -_LIT8( KSConJavaHashId, "JAVA_"); - -_LIT8( KSConAppInfoSeparator, "#" ); - -//********************************** -//CSConPCConnServer - PC Connectivity Server -//********************************** - -class CSConPCConnServer : public CServer2 - { -public: - // From CServer2 - IMPORT_C static CSConPCConnServer* NewLC(); - IMPORT_C ~CSConPCConnServer(); - - /** - * Function to start the server - * @param none - * @return Error code - */ - static TInt RunServer(); - - /** - * Function to start the server - * @param none - * @return none - */ - static void RunServerL(); - - /** - * Increments session count. - * @param none - * @return none - */ - void IncSessionCount(); - - /** - * Decrements session count. - * When count reaches zero, stops active scheduler - * @param none - * @return none - */ - void DecSessionCount(); - - -protected: - virtual CSession2* NewSessionL( const TVersion &aVersion, - const RMessage2& aMessage) const; - -private: - CSConPCConnServer(); - - TInt iSessionCount; - - }; - - -class CSconFolderLister; -class CSconBtEngine; - -//********************************** -//CSConPCConnSession - Server session class, handles the requested operations -//********************************** -class CSConPCConnSession : public CSession2, public MWBXMLConMLCallback - { - -public: - static CSConPCConnSession* NewL(CSConPCConnServer& aServer); - - /** - * From CSession2 - */ - void ServiceL( const RMessage2 &aMessage); - -private: - void DispatchRequestL( const RMessage2 &aMessage); - void LoadPCDDllL(); - void LoadCSCDllL(); - void LoadConMLHandlerDllL(); - -protected: - // Callback funktion for WBXML parsing - void ConMLL ( ConML_ConMLPtr_t aContent ); - -private: - void ConstructL(); - CSConPCConnSession ( CSConPCConnServer& aServer); - ~CSConPCConnSession(); - - TInt HandlePutMessageL(); - TInt HandleGetMessageL(); - TInt HandleWBXMLGetRequestL( const TDesC& aFileName ); - TInt HandleResetMessage(); - TInt HandleChunkMessage( const RMessage2& aMessage ); - TInt OptionsFromExecuteL ( ConML_ExecutePtr_t aContent ); - TInt TaskCancelL(ConML_CancelPtr_t aContent); - TInt TaskGetStatusL(ConML_GetStatusPtr_t aContent ); - TInt TaskInstallL( ConML_InstallPtr_t aContent ); - TInt TaskUnInstallL( ConML_UnInstallPtr_t aContent ); - void SplitL( const TDesC8& aText, const TChar aSeparator, RArray& aArray ); - TInt TaskListInstalledAppsL( ConML_ListInstalledAppsPtr_t aContent ); - TInt TaskListDataOwnersL(); - TInt TaskSetBURModeL( ConML_SetBURModePtr_t aContent ); - TInt TaskGetDataSizeL( ConML_GetDataSizePtr_t aContent ); - TInt TaskRequestDataL( ConML_RequestDataPtr_t aContent ); - TInt TaskUpdateDeviceInfoL( ConML_UpdateDeviceInfoPtr_t aContent ); - TInt TaskListPublicFilesL( ConML_ListPublicFilesPtr_t aContent ); - TInt TaskGetDataOwnerStatusL( ConML_GetDataOwnerStatusPtr_t aContent ); - TInt TaskSupplyDataL ( ConML_SupplyDataPtr_t aContent ); - TInt TaskRebootL(); - TInt TaskGetMetadataL( ConML_GetMetadataPtr_t aContent ); - void AppendStatusL( ConML_ConMLPtr_t aContent, CSConStatusReply* reply ); - void AppendUpdateDeviceInfoResultsL( ConML_ResultsPtr_t aContent, - CSConUpdateDeviceInfo* aResult ); - void AppendSetBURModeResultsL ( ConML_ResultsPtr_t aContent, - CSConSetBURMode* aResult ); - void AppendListInstalledAppsResultsL ( ConML_ResultsPtr_t aContent, - CSConListInstApps* aResult ); - void AppendListPublicFilesResultsL ( ConML_ResultsPtr_t aContent, - CSConListPublicFiles* aResult ); - void AppendRequestDataResultsL( ConML_ResultsPtr_t aContent, - CSConRequestData* aResult ); - void AppendSupplyDataResultsL( ConML_ResultsPtr_t aContent, - CSConSupplyData* aResult ); - void AppendInstallResultsL( ConML_ResultsPtr_t aContent, - CSConInstall* aResult ); - void AppendUninstallResultsL( ConML_ResultsPtr_t aContent, - CSConUninstall* aResult ); - void AppendListDataOwnersResultsL ( ConML_ResultsPtr_t aContent, - CSConListDataOwners* aResult ); - void AppendGetDataOwnerStatusResultsL ( ConML_ResultsPtr_t aContent, - CSConGetDataOwnerStatus* aResult ); - void AppendGetDataSizeResultsL ( ConML_ResultsPtr_t aContent, - CSConGetDataSize* aResult ); - void AppendGetMetadataResultsL ( ConML_ResultsPtr_t aContent, - CSConGetMetadata* aResult ); - void AppendProgressL ( ConML_ResultsPtr_t aContent, TInt progress ); - void AppendDrivesL( ConML_DrivesPtr_t aContent, TDriveList aDrives ); - TDriveList DriveList( ConML_DriveListPtr_t aContent ); - TDesC8& IntToDesLC( const TInt& anInt); - TDesC8& DriveNumToDesLC( const TInt& anInt ); - TDesC8& BufToDesLC( const TDesC& aBuf ); - TDesC8& UidToDesLC( const TUid& aUid ); - TUid DesToUid ( const TDesC8& aDes ); - TInt DesToInt( const TDesC8& aDes); - TBool HasDrives( TDriveList& aDrive ); - TDesC8& HashToDesLC( const TDesC& aBuf ); - TPtr DesToHashLC( const TDesC8& aDes ); - TBool IsJavaHash( const TDesC8& aDes ); - - TInt ReadOviAccountInfoL( RWriteStream& aAccountInfoStream ); - -// data -private: - CSConPCConnServer& iServer; - - RLibrary iPCDlib; - RLibrary iCSClib; - RLibrary iConMLHandlerLib; - - CSConPCD* iPCDHandler; - CSConCSC* iCSCHandler; - CSConConMLHandler* iConMLHandler; - - RChunk iChunk; - CBufFlat* iBuffer; - TInt iResult; - - CSconFolderLister* iFolderLister; - RFs iFs; - CSconBtEngine* iBtEngine; - }; - -#endif // __SCONPCCONNSERVER_H__ diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/servers/pcconn/src/sconbtengine.cpp --- a/connectivitymodules/SeCon/servers/pcconn/src/sconbtengine.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,415 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: CSconBtEngine implementation -* -*/ - - - -#include -#include - -#include -#include -#include - -#include "sconbtengine.h" -#include "debug.h" - -CSconBtEngine* CSconBtEngine::NewL() - { - TRACE_FUNC; - CSconBtEngine* self = new (ELeave) CSconBtEngine(); - CleanupStack::PushL( self ); - self->ConstructL(); - CleanupStack::Pop( self ); - return self; - } - -CSconBtEngine::~CSconBtEngine() - { - TRACE_FUNC; - if ( iBtEng ) - { - iBtEng->Cancel(); - delete iBtEng; - } - - delete iBtSettings; - } - -CSconBtEngine::CSconBtEngine() - { - } - -void CSconBtEngine::ConstructL() - { - iBtEng = CBTEngDevMan::NewL( this ); - iBtSettings = CBTEngSettings::NewL( this ); - iState = EIdle; - } - -void CSconBtEngine::ReadBTInfoL( RBufWriteStream& aStream ) - { - TRACE_FUNC_ENTRY; - if ( iState != EIdle ) - { - User::Leave( KErrInUse ); - } - iStream = &aStream; - iOperationError = KErrNone; - - // Write local name (8 bit name length + unicode name) - TBuf<100> localName; - TInt err = iBtSettings->GetLocalName( localName ); - User::LeaveIfError( err ); - LOGGER_WRITE_1("localName: %S", &localName); - iStream->WriteUint8L( localName.Length() ); - iStream->WriteL( localName, localName.Length() ); - - if ( iBtAddress.Length() == 0 ) - { - LOGGER_WRITE("Try to read bt address"); - - CRepository* cenRep = NULL; - // Use TRAP to catch a leave if the CenRep key does not exist. - TRAP( err, cenRep = CRepository::NewL( KCRUidBluetoothLocalDeviceAddress ) ); - CleanupStack::PushL( cenRep ); - if( !err ) - { - err = cenRep->Get( KBTLocalDeviceAddress, iBtAddress ); - LOGGER_WRITE_1("cenRep->Get err: %d", err); - } - CleanupStack::PopAndDestroy( cenRep ); - - if ( err ) - { - iBtAddress.Zero(); - } - } - - // Write bt address (8 bit addr length + unicode address) - if ( iBtAddress.Length() > 0 ) - { - LOGGER_WRITE_1("btAddr: %S", &iBtAddress); - iStream->WriteUint8L( iBtAddress.Length() ); - iStream->WriteL( iBtAddress, iBtAddress.Length() ); - } - else - { - iStream->WriteUint8L( 0 ); - } - - // Write BT Power State (8-bit, 0=Off, 1=On) - TBTPowerStateValue state; - err = iBtSettings->GetPowerState( state ); - User::LeaveIfError( err ); - LOGGER_WRITE_1("PowerState: %d", state); - iStream->WriteUint8L( state ); - - // Get device info - TBTRegistrySearch crit; - crit.FindAll(); - if ( !iBtDevArray ) - { - LOGGER_WRITE("create arr"); - iBtDevArray = new (ELeave) CBTDeviceArray(5); - LOGGER_WRITE("create arr -ok"); - } - else - { - iBtDevArray->ResetAndDestroy(); - } - err = iBtEng->GetDevices( crit, iBtDevArray ); - LOGGER_WRITE_1("GetDevices err: %d", err); - User::LeaveIfError( err ); - iState = ERequestBtInfo; - - // Wait until completed - iWait.Start(); - iState = EIdle; - if ( iOperationError ) - { - LOGGER_WRITE_1("Operation failed, leave %d", iOperationError); - User::Leave( iOperationError ); - } - TRACE_FUNC_EXIT; - } - -void CSconBtEngine::SetBtAuthorizedL( const TDesC& aBtDevAddress, TBool aAuthorized ) - { - TRACE_FUNC_ENTRY; - if ( iState != EIdle ) - { - User::Leave( KErrInUse ); - } - - TBTRegistrySearch crit; - TBTDevAddr addr; - addr.SetReadable( aBtDevAddress ); - crit.FindAddress( addr ); - - if ( !iBtDevArray ) - { - LOGGER_WRITE("create arr"); - iBtDevArray = new (ELeave) CBTDeviceArray(5); - LOGGER_WRITE("create arr -ok"); - } - else - { - iBtDevArray->ResetAndDestroy(); - } - TInt err = iBtEng->GetDevices( crit, iBtDevArray ); - LOGGER_WRITE_1("GetDevices err: %d", err); - User::LeaveIfError( err ); - iState = EChangeAuthorized; - iOperationError = KErrNone; - iAuthorizedValue = aAuthorized; - - // Wait until completed - iWait.Start(); - iState = EIdle; - if ( iOperationError ) - { - LOGGER_WRITE_1("Operation failed, leave %d", iOperationError); - User::Leave( iOperationError ); - - } - - TRACE_FUNC_EXIT; - } - -TInt CSconBtEngine::SetBtPowerState( TBool aPower ) - { - TRACE_FUNC_ENTRY; - if ( iState != EIdle ) - { - return KErrInUse; - } - - TBTPowerStateValue state; - iOperationError = iBtSettings->GetPowerState( state ); - if ( iOperationError ) - { - return iOperationError; - } - else if ( ( aPower && state == EBTPowerOn ) - || ( !aPower && state == EBTPowerOff ) ) - { - // No need to change state - return KErrNone; - } - - state = EBTPowerOff; - if ( aPower ) - { - state = EBTPowerOn; - } - iOperationError = iBtSettings->SetPowerState( state ); - if ( iOperationError ) - { - return iOperationError; - } - iState = EChangeBtState; - - // Wait until completed - iWait.Start(); - - iState = EIdle; - TRACE_FUNC_RET( iOperationError ); - return iOperationError; - } - -TInt CSconBtEngine::SetBtName( const TDesC& aBtName ) - { - LOGGER_WRITE_1("SetBtName aBtName: %S", &aBtName); - TInt err = iBtSettings->SetLocalName( static_cast( aBtName ) ); - TRACE_FUNC_RET( err ); - return err; - } - -// From MBTEngDevManObserver -void CSconBtEngine::HandleDevManComplete( TInt aErr ) - { - TRACE_FUNC; - LOGGER_WRITE_1("aErr: %d", aErr ); - if ( iState == EChangeAuthorized ) - { - if ( iWait.IsStarted() ) - { - iOperationError = aErr; - iWait.AsyncStop(); - } - } - - } - -void CSconBtEngine::HandleGetDevicesComplete( TInt aErr, - CBTDeviceArray* aDeviceArray ) - { - TRACE_FUNC_ENTRY; - LOGGER_WRITE_1("aErr: %d", aErr); - //iBtReqOngoing = EFalse; - if ( iState == ERequestBtInfo ) - { - // Continue to write devices info - TRAP( iOperationError, PrintDevicesL() ); - LOGGER_WRITE_1("PrintDevicesL err: %d", iOperationError); - - if ( iWait.IsStarted() ) - { - iWait.AsyncStop(); - } - } - else if ( iState == EChangeAuthorized ) - { - iOperationError = aErr; - if ( !aErr && aDeviceArray->Count() == 1 ) - { - CBTDevice* btRef = aDeviceArray->At(0); - TBTDeviceSecurity devSec = btRef->GlobalSecurity(); - if ( btRef->IsPaired() && !devSec.Banned() ) - { - LOGGER_WRITE8_1("btAdrr: %S", &btRef->BDAddr().Des() ); - CBTDevice* btDevice = CBTDevice::NewLC( btRef->BDAddr() ); - - btDevice->SetPaired( ETrue ); - - btDevice->SetDeviceNameL( btRef->DeviceName() ); - btDevice->SetFriendlyNameL( btRef->FriendlyName() ); - LOGGER_WRITE8_1("name: %S", &btRef->DeviceName()); - LOGGER_WRITE8_1("FriendlyName: %S", &btRef->FriendlyName()); - - LOGGER_WRITE_1("iAuthorizedValue: %d", iAuthorizedValue); - // Set as authorized and store the device - TBTDeviceSecurity security; - security.SetNoAuthenticate( EFalse ); - security.SetNoAuthorise( iAuthorizedValue ); - security.SetBanned( EFalse ); - - btDevice->SetGlobalSecurity (security ); - - //iOperationError = iBtEng->ModifyDevice(*aDeviceArray->At(0)); - iOperationError = iBtEng->ModifyDevice( *btDevice ); - LOGGER_WRITE_1( "ModifyDevice err: %d", iOperationError ); - CleanupStack::PopAndDestroy( btDevice ); - } - else - { - LOGGER_WRITE("Device was not paired or it's banned") - iOperationError = KErrAccessDenied; - } - } - - // If error occured stop waiting, otherwise continue waiting until - // HandleDevManComplete has been called - if ( iOperationError && iWait.IsStarted() ) - { - iWait.AsyncStop(); - } - } - TRACE_FUNC_EXIT; - } - -void CSconBtEngine::PrintDevicesL() - { - TRACE_FUNC_ENTRY; - // calculate devices count - TInt devCount(0); - - for ( TInt i=0 ; iCount(); i++ ) - { - CBTDevice* device = iBtDevArray->At(i); - // show only paired and banned devices - if ( device->IsPaired() || device->GlobalSecurity().Banned() ) - { - devCount++; - } - } - - // Print info - iStream->WriteUint8L( devCount ); - - for ( TInt i=0 ; iCount(); i++ ) - { - CBTDevice* device = iBtDevArray->At(i); - - const TBTDeviceSecurity btSec = device->GlobalSecurity(); - - // show only paired and banned devices - if ( device->IsPaired() || btSec.Banned() ) - { - LOGGER_WRITE_1("IsValidDeviceName: %d", device->IsValidDeviceName()); - const TDesC8& deviceName = device->DeviceName(); - LOGGER_WRITE8_1("DeviceName: %S", &deviceName ); - iStream->WriteUint8L( deviceName.Length() ); - iStream->WriteL( deviceName, deviceName.Length() ); - - LOGGER_WRITE_1("IsValidFriendlyName: %d", device->IsValidFriendlyName()); - LOGGER_WRITE_1("FriendlyName: %S", &device->FriendlyName() ); - - const TBTDevAddr& addr = device->BDAddr(); - - TBuf<100> readable; - addr.GetReadable( readable ); - LOGGER_WRITE_1("readable addr: %S", &readable); - iStream->WriteUint8L( readable.Length() ); - iStream->WriteL( readable, readable.Length() ); - - LOGGER_WRITE_1("paired: %d", device->IsPaired() ); - LOGGER_WRITE_1("IsValidPaired: %d", device->IsValidPaired() ); - TUint8 paired(0); - if ( device->IsPaired() && device->IsValidPaired() ) - { - paired = 1; - } - iStream->WriteUint8L( paired ); - - TUint8 noAuthorise(0); - if ( btSec.NoAuthorise() ) - { - noAuthorise = 1; - } - iStream->WriteUint8L( noAuthorise ); - - TUint8 banned(0); - if ( btSec.Banned() ) - { - banned = 1; - } - iStream->WriteUint8L( banned ); - - LOGGER_WRITE(""); - } - } - iStream->CommitL(); - iStream = NULL; //delete reference only - TRACE_FUNC_EXIT; - } - -// From MBTEngSettingsObserver -void CSconBtEngine::PowerStateChanged( TBTPowerStateValue /*aState*/ ) - { - TRACE_FUNC; - if ( iState == EChangeBtState && iWait.IsStarted() ) - { - iWait.AsyncStop(); - } - - } - -void CSconBtEngine::VisibilityModeChanged( TBTVisibilityMode /*aState*/ ) - { - TRACE_FUNC; - } diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/servers/pcconn/src/sconfolderlister.cpp --- a/connectivitymodules/SeCon/servers/pcconn/src/sconfolderlister.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,717 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: CSconFolderLister implementation -* -*/ - - -#include "sconfolderlister.h" - -#include -#include -#include -#include -#include -#include -#include - -#include "debug.h" - -const TUint16 KFormatVersion( 1 ); - -// Obex package size -const TInt KPackageSize = 65536; - -const TInt KMaxLevelsToSearch = 80; - -_LIT( KSConResourceName, "z:\\Resource\\sconftp.rsc" ); - -CSconFolderEntry* CSconFolderEntry::NewLC() - { - CSconFolderEntry* self = new (ELeave) CSconFolderEntry(); - CleanupStack::PushL( self ); - return self; - } -CSconFolderEntry* CSconFolderEntry::NewLC( const TEntry& aEntry ) - { - CSconFolderEntry* self = new (ELeave) CSconFolderEntry(); - CleanupStack::PushL( self ); - self->ConstructL( aEntry ); - return self; - } -CSconFolderEntry::CSconFolderEntry() - { - } -CSconFolderEntry::~CSconFolderEntry() - { - delete iName; - delete iLabel; - } - - -void CSconFolderEntry::ConstructL( const TEntry& aEntry ) - { - iAtt = aEntry.iAtt; - iModified = aEntry.iModified.Int64(); - iName = aEntry.iName.AllocL(); - } - -CSconFolderLister::CSconFolderLister( RFs& aFs ) : iFs(aFs) - { - // No implementation required - } - -CSconFolderLister::~CSconFolderLister() - { - TRACE_FUNC; - delete iLocalizer; - } - -CSconFolderLister* CSconFolderLister::NewL( RFs& aFs ) - { - TRACE_FUNC_ENTRY; - CSconFolderLister* self = new (ELeave) CSconFolderLister( aFs ); - CleanupStack::PushL( self ); - self->ConstructL(); - CleanupStack::Pop( self ); - TRACE_FUNC_EXIT; - return self; - } - -void CSconFolderLister::ConstructL() - { - TRACE_FUNC_ENTRY; - - iLocalizer = CDirectoryLocalizer::NewL(); - - // set free memory up to critical level for all drives - CRepository* repository = CRepository::NewLC( KCRUidDiskLevel ); - TInt iCriticalLevel(0); - User::LeaveIfError( repository->Get( KDiskCriticalThreshold, iCriticalLevel ) ); - CleanupStack::PopAndDestroy( repository ); - iCriticalLevel += KPackageSize; // add obex package size to critical level - TRACE_FUNC_EXIT; - } - - -void CSconFolderLister::GenerateFolderListL( RBufWriteStream& aStream, const TDesC& aStartPath, - const TInt aLevelsToSearch ) - { - TRACE_FUNC_ENTRY; - LOGGER_WRITE_1("aStartPath: %S", &aStartPath ); - LOGGER_WRITE_1("aLevelsToSearch: %d", aLevelsToSearch ); - TInt levelsToSearch = aLevelsToSearch; - if ( levelsToSearch > KMaxLevelsToSearch || levelsToSearch == KErrNotFound ) - levelsToSearch = KMaxLevelsToSearch; - iFolders = 0; - iFiles = 0; - const TInt KDriveNameLength( 3 ); - - if ( aStartPath.CompareF( _L("\\") ) == 0 ) - { - LOGGER_WRITE("List all drives"); - aStream.WriteUint16L( KFormatVersion ); - ListAllDrivesL( aStream, levelsToSearch ); - } - else if ( aStartPath.Length() >= KDriveNameLength ) - { - if ( aStartPath.Length() > KDriveNameLength ) - { - // check root path permissions, is listing allowed - TPtrC path = aStartPath.Mid(KDriveNameLength); - LOGGER_WRITE_1("pathFromRoot: %S", &path); - TInt pathEndMark = path.Locate(TChar('\\')); - if ( pathEndMark == KErrNotFound ) - { - User::Leave( KErrArgument ); - } - //"private\" locate = 7" - TPtrC pathName = aStartPath.Left( KDriveNameLength+pathEndMark ); - LOGGER_WRITE_1("pathName: %S", &path); - TEntry pathEntry; - User::LeaveIfError( iFs.Entry(pathName, pathEntry) ); - - TBool printable = IsDirectoryPrintable( aStartPath.Left(3), pathEntry ); - if ( !printable ) - { - // access denied - LOGGER_WRITE("Access denied!"); - User::Leave( KErrAccessDenied ); - } - User::LeaveIfError( iFs.Entry(aStartPath, pathEntry) ); - if ( pathEntry.IsSystem() ) - { - // access denied - LOGGER_WRITE("System folder, Access denied!"); - User::Leave( KErrAccessDenied ); - } - } - - - aStream.WriteUint16L( KFormatVersion ); - - TInt drive; - User::LeaveIfError( iFs.CharToDrive( aStartPath[0], drive) ); - ListDriveAndPathL( aStream, drive, aStartPath, levelsToSearch); - - } - else - { - LOGGER_WRITE("aStartPath KErrArgument"); - User::Leave( KErrArgument ); - } - - - LOGGER_WRITE_1("iFolders: %d", iFolders); - LOGGER_WRITE_1("iFiles: %d", iFiles); - TRACE_FUNC_EXIT; - } - -void CSconFolderLister::ListAllDrivesL( RBufWriteStream& aStream, const TInt aLevelsToSearch ) - { - TRACE_FUNC_ENTRY; - TInt devDriveCount = 0; - TInt mmcDriveCount = 0; - TChar driveLetter; - TBuf8<1> driveBuf; - RArray sconDriveInfo(5); - - // Write all drives to folderlisting object - TDriveList driveList; - // Get all drives that are visible to the user. - TInt driveCount; - User::LeaveIfError( DriveInfo::GetUserVisibleDrives( iFs, driveList, driveCount ) ); - - for( TInt i = EDriveA; i < KMaxDrives; i++ ) - { - if( driveList[i] ) - { - TUint driveStatus; - User::LeaveIfError( DriveInfo::GetDriveStatus( iFs, i, driveStatus ) ); - //LOGGER_WRITE_1( "DriveInfo for drive: %d", i); - - if( !(driveStatus & DriveInfo::EDrivePresent ) - || driveStatus & DriveInfo::EDriveCorrupt - || (driveStatus & DriveInfo::EDriveRemote) ) - { - //LOGGER_WRITE_1( "skip drive %d", i); - continue; - } - - User::LeaveIfError( iFs.DriveToChar( i, driveLetter ) ); - //Letter to uppercase form. - driveLetter.UpperCase(); - - TSconDriveInfo info; - info.iDriveStatus = driveStatus; - info.iDriveLetter.Zero(); - info.iDriveLetter.Append( driveLetter ); - info.iDriveLetter.Append( _L(":") ); - - - info.iDriveAttr = KEntryAttNormal; // ReadWrite - - if( driveStatus & DriveInfo::EDriveInternal && devDriveCount==0 ) - { - //permission always R for first internal drive - info.iDriveAttr = KEntryAttReadOnly; - } - - //memory type - if( driveStatus & DriveInfo::EDriveInternal ) - { - LOGGER_WRITE( "DriveInfo::EDriveInternal" ); - devDriveCount++; - info.iDriveType = DriveInfo::EDriveInternal; // =1 - info.iDriveTypeCount = devDriveCount; - - } - else if( driveStatus & DriveInfo::EDriveRemovable ) - { - LOGGER_WRITE( "DriveInfo::EDriveRemovable" ); - mmcDriveCount++; - info.iDriveType = DriveInfo::EDriveRemovable;; // =2 - info.iDriveTypeCount = mmcDriveCount; - } - - TVolumeInfo volumeInfo; - User::LeaveIfError( iFs.Volume( volumeInfo, i) ); - - info.iVolumeName = volumeInfo.iName; - if ( volumeInfo.iFree > iCriticalLevel ) - { - volumeInfo.iFree = volumeInfo.iFree - iCriticalLevel; - } - else - { - volumeInfo.iFree = 0; - } - - info.iFree = volumeInfo.iFree; - info.iSize = volumeInfo.iSize; - - - sconDriveInfo.AppendL( info ); - - } - } - - LOGGER_WRITE_1("Drives: %d", sconDriveInfo.Count()); - aStream.WriteUint8L( sconDriveInfo.Count() ); - for ( TInt i=0; i < sconDriveInfo.Count(); i++ ) - { - - TBuf<3> path(KNullDesC); - path.Copy(sconDriveInfo[i].iDriveLetter); - path.Append(_L("\\")); - - ExportDriveL( aStream, sconDriveInfo[i], path, aLevelsToSearch); - } - sconDriveInfo.Close(); - TRACE_FUNC_EXIT; - } - -void CSconFolderLister::ListDriveAndPathL( RBufWriteStream& aStream, TInt aDrive, const TDesC& aStartPath, const TInt aLevelsToSearch ) - { - TRACE_FUNC_ENTRY; - TVolumeInfo volumeInfo; - User::LeaveIfError( iFs.Volume(volumeInfo, aDrive) ); - TInt driveCount(0); - TUint driveStatus; - User::LeaveIfError( DriveInfo::GetDriveStatus( iFs, aDrive, driveStatus ) ); - GetDriveTypeNumberL( aDrive, driveStatus, driveCount ); - - - TSconDriveInfo info; - info.iDriveLetter.Copy( aStartPath.Left(2) ); - info.iVolumeName = volumeInfo.iName; - - info.iDriveAttr = KEntryAttNormal; // ReadWrite - if( driveStatus & DriveInfo::EDriveInternal && driveCount==0 ) - { - //permission always R for first internal drive - info.iDriveAttr = KEntryAttReadOnly; - } - info.iDriveType = 0; - if( driveStatus & DriveInfo::EDriveInternal ) - { - info.iDriveType = DriveInfo::EDriveInternal; // =1 - } - else if( driveStatus & DriveInfo::EDriveRemovable ) - { - info.iDriveType = DriveInfo::EDriveRemovable;; // =2 - } - - if ( volumeInfo.iFree > iCriticalLevel ) - { - volumeInfo.iFree = volumeInfo.iFree - iCriticalLevel; - } - else - { - volumeInfo.iFree = 0; - } - - info.iFree = volumeInfo.iFree; - info.iSize = volumeInfo.iSize; - - aStream.WriteUint8L( 1 ); - ExportDriveL( aStream, info, aStartPath, aLevelsToSearch); - - TRACE_FUNC_EXIT; - } - -void CSconFolderLister::ExportDriveL( RBufWriteStream& aStream, const TSconDriveInfo& aDriveInfo, - const TDesC& aPathName, const TInt aLevelsToSearch ) - { - TRACE_FUNC_ENTRY; - LOGGER_WRITE_1("Drive: %S", &aDriveInfo.iDriveLetter); - LOGGER_WRITE_1("aLevelsToSearch: %d", aLevelsToSearch ); - - CSconFolderEntry* driveEntry = CSconFolderEntry::NewLC(); - driveEntry->iName = aDriveInfo.iDriveLetter.AllocL(); - - if ( driveEntry->iLabel ) - { - LOGGER_WRITE_1("Label: %S", &driveEntry->iLabel->Des()); - } - driveEntry->iAtt = aDriveInfo.iDriveAttr; - - driveEntry->iDriveInfoEntryExists = ETrue; - driveEntry->iDriveInfoEntry.iDriveType = aDriveInfo.iDriveType; - driveEntry->iDriveInfoEntry.iDriveTypeCount = aDriveInfo.iDriveTypeCount; - - driveEntry->iDriveInfoEntry.iFree = aDriveInfo.iFree; - driveEntry->iDriveInfoEntry.iSize = aDriveInfo.iSize; - - driveEntry->iLabel = aDriveInfo.iVolumeName.AllocL(); - GetLocalizedVolumeNameL( *driveEntry ); - - ExportPathL( aStream, aPathName, *driveEntry, ETrue, aLevelsToSearch ); - CleanupStack::PopAndDestroy( driveEntry ); - TRACE_FUNC_EXIT; - } - -void CSconFolderLister::GetLocalizedVolumeNameL( CSconFolderEntry& aDriveEntry ) - { - TRACE_FUNC_ENTRY; - // Get localized names - if ( aDriveEntry.iDriveInfoEntry.iDriveType == DriveInfo::EDriveInternal - && aDriveEntry.iDriveInfoEntry.iDriveTypeCount > 1 ) - { - LOGGER_WRITE("Internal mass memory"); - // internal second memory (Mass memory) - TFileName file( KSConResourceName ); - BaflUtils::NearestLanguageFile( iFs, file ); - - CStringResourceReader* reader = CStringResourceReader::NewL( file ); - if ( aDriveEntry.iLabel ) - { - delete aDriveEntry.iLabel; - aDriveEntry.iLabel = NULL; - } - aDriveEntry.iLabel = reader->ReadResourceString( R_SECON_VALUE_MASS_STORAGE ).AllocL(); - delete reader; - } - else if ( aDriveEntry.iLabel && aDriveEntry.iLabel->Length()>0 ) - { - LOGGER_WRITE("Use normal volume label"); - - } - else - { - TFileName file( KSConResourceName ); - BaflUtils::NearestLanguageFile( iFs, file ); - CStringResourceReader* reader = CStringResourceReader::NewL( file ); - if (aDriveEntry.iLabel) - { - delete aDriveEntry.iLabel; - aDriveEntry.iLabel = NULL; - } - if ( aDriveEntry.iDriveInfoEntry.iDriveType == DriveInfo::EDriveRemovable ) - { - LOGGER_WRITE("EDriveRemovable"); - // read default MMC name - aDriveEntry.iLabel = reader->ReadResourceString( R_SECON_VALUE_MMC ).AllocL(); - } - else - { - LOGGER_WRITE("EDriveInternal"); - // read default DEV name - aDriveEntry.iLabel = reader->ReadResourceString( R_SECON_VALUE_DEVICE ).AllocL(); - } - delete reader; - } - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSconFolderLister::GetDriveTypeNumberL() -// -// ----------------------------------------------------------------------------- -// -void CSconFolderLister::GetDriveTypeNumberL( TInt aDrive, TUint aDriveStatus , TInt& aTypeNumber) - { - TRACE_FUNC_ENTRY; - aTypeNumber = 0; - - //TUint driveStatus; - // - // if true, search internal drives, else search removable drives - TBool searchInternalDrives = (aDriveStatus & DriveInfo::EDriveInternal); - - TInt driveCount; - TDriveList driveList; - - User::LeaveIfError( DriveInfo::GetUserVisibleDrives( iFs, driveList, driveCount ) ); - - for( TInt i = EDriveA; i <= aDrive; i++ ) - { - if( driveList[i] ) - { - TUint driveStatus; - User::LeaveIfError( DriveInfo::GetDriveStatus( iFs, i, driveStatus ) ); - - if( !(driveStatus & DriveInfo::EDrivePresent ) - || driveStatus & DriveInfo::EDriveCorrupt ) - { - LOGGER_WRITE( "not present or corrupted" ); - continue; - } - - if( driveStatus & DriveInfo::EDriveInternal ) - { - if( searchInternalDrives ) - { - aTypeNumber++; - } - } - else if( driveStatus & DriveInfo::EDriveRemovable ) - { - if( !searchInternalDrives ) - { - aTypeNumber++; - } - } - } - } - TRACE_FUNC_EXIT; - } - - -void CSconFolderLister::ExportPathL( RBufWriteStream& aStream, const TDesC& aPathName, - const CSconFolderEntry& aEntry, const TBool aLocalize, const TInt aLevelsToSearch ) - { - TRACE_FUNC_ENTRY; - LOGGER_WRITE_1("aPathName: %S", &aPathName ); - LOGGER_WRITE_1("aLevelsToSearch: %d", aLevelsToSearch ); - - LOGGER_WRITE_1("aEntry.iName: %S", &aEntry.iName->Des() ); - - TBool localized(EFalse); - - // foldername length + name - aStream.WriteUint8L( aEntry.iName->Length() ); - aStream.WriteL( aEntry.iName->Des() ); - - TUint att = aEntry.iAtt; - - if ( aEntry.iLabel && aEntry.iLabel->Length() > 0 ) - { - aStream.WriteUint8L( aEntry.iLabel->Length() ); - aStream.WriteL( aEntry.iLabel->Des() ); - } - else - { - if ( aLocalize ) - { - // initialize Localizer - iLocalizer->SetFullPath( aPathName ); - localized = iLocalizer->IsLocalized(); - } - - if( localized ) - { - const TDesC& localizedName = iLocalizer->LocalizedName(); - aStream.WriteUint8L( localizedName.Length() ); - aStream.WriteL( localizedName ); - LOGGER_WRITE_1("LocalizedName: %S", &localizedName ); - } - else if ( aPathName.CompareF(_L("C:\\Data\\")) == 0 ) - { - TFileName file( KSConResourceName ); - - BaflUtils::NearestLanguageFile( iFs, file ); - - CStringResourceReader* reader = CStringResourceReader::NewL( file ); - CleanupStack::PushL( reader ); - - const TDesC& localizedName = reader->ReadResourceString( R_SECON_DATA_FOLDER ); - aStream.WriteUint8L( localizedName.Length() ); - aStream.WriteL( localizedName ); - LOGGER_WRITE_1("LocalizedName: %S", &localizedName ); - - CleanupStack::PopAndDestroy( reader ); - localized = ETrue; - } - else - { - aStream.WriteUint8L( 0 ); - } - // attributes - if ( localized ) - { - // localized folder, set readonly flag - att = att | KEntryAttReadOnly; - } - } - - if ( aPathName.Length() == 3 && aLocalize ) - { - // enable subfolder localization, even when root cannot be localized - localized = ETrue; - } - - // DriveInfoEntry - if ( aEntry.iDriveInfoEntryExists ) - { - aStream.WriteUint8L( 1 ); - aStream.WriteUint8L( aEntry.iDriveInfoEntry.iDriveType ); - aStream.WriteUint8L( aEntry.iDriveInfoEntry.iDriveTypeCount ); - aStream << aEntry.iDriveInfoEntry.iFree; - aStream << aEntry.iDriveInfoEntry.iSize; - } - else - { - aStream.WriteUint8L( 0 ); - } - - - // modified time - TDateTime time = aEntry.iModified.DateTime(); - aStream.WriteInt16L( time.Year() ); - aStream.WriteInt8L( time.Month()+1 ); // range 1...12 - aStream.WriteInt8L( time.Day()+1 ); - aStream.WriteInt8L( time.Hour() ); - aStream.WriteInt8L( time.Minute() ); - aStream.WriteInt8L( time.Second() ); - - // write attribute - aStream.WriteUint32L( att ); - - - if ( aLevelsToSearch == 0 ) - { - // don't list directory content - LOGGER_WRITE("Not listing directory content"); - aStream.WriteInt16L( 0 ); // files count - aStream.WriteInt16L( 0 ); // directory count - return; - } - - CDir *fileList = 0; - CDir *dirList = 0; - - // show normal and hidden files and folders - TUint entryAttMask = KEntryAttNormal | KEntryAttHidden; - - // get folders and files - TInt err = iFs.GetDir( aPathName, entryAttMask, ESortByName, - fileList, dirList ); - - if ( err ) - { - LOGGER_WRITE_1( "ParseFolderListL GetDir returned: %d", err ); - User::Leave( err ); - } - - CleanupStack::PushL( dirList ); - CleanupStack::PushL( fileList ); - - - LOGGER_WRITE_1("files: %d", fileList->Count()); - aStream.WriteUint16L( fileList->Count() ); - - // Print files to folder listing object - for( TInt i = 0; i < fileList->Count(); i++ ) - { - const TEntry& fileEntry = ( *fileList )[i]; - iFiles++; - LOGGER_WRITE_1("fileEntry.iName: %S", &fileEntry.iName); - // filename length + name - aStream.WriteUint8L( fileEntry.iName.Length() ); - aStream.WriteL( fileEntry.iName ); - - // modified time - TDateTime time = fileEntry.iModified.DateTime(); - aStream.WriteInt16L( time.Year() ); - aStream.WriteInt8L( time.Month()+1 ); // range 1...12 - aStream.WriteInt8L( time.Day()+1 ); - aStream.WriteInt8L( time.Hour() ); - aStream.WriteInt8L( time.Minute() ); - aStream.WriteInt8L( time.Second() ); - - // attributes - aStream.WriteUint32L( fileEntry.iAtt ); - - // file size - aStream.WriteUint32L( fileEntry.iSize ); - } - CleanupStack::PopAndDestroy( fileList ); - - - // calculate ow many directories we are going to list - TInt directoryCount(0); - for( TInt i = 0; i < dirList->Count(); i++ ) - { - if ( IsDirectoryPrintable(aPathName, ( *dirList )[i] ) ) - { - directoryCount++; - } - } - LOGGER_WRITE_1("directories: %d", directoryCount); - aStream.WriteUint16L( directoryCount ); - - HBufC* fullpath = HBufC::NewL( KMaxPath ); - TPtr fullpathPtr = fullpath->Des(); - CleanupStack::PushL( fullpath ); - - // Print folders to folder listing object - for( TInt i = 0; i < dirList->Count(); i++ ) - { - const TEntry& folderEntry = ( *dirList )[i]; - if ( !IsDirectoryPrintable(aPathName, folderEntry) ) - { - continue; - } - iFolders++; - - fullpathPtr.Copy( aPathName ); - fullpathPtr.Append( folderEntry.iName ); - fullpathPtr.Append( _L("\\") ); - CSconFolderEntry* subFolderEntry = CSconFolderEntry::NewLC( folderEntry ); - if ( aLevelsToSearch == KErrNotFound ) - { - ExportPathL( aStream, fullpathPtr, *subFolderEntry, localized, aLevelsToSearch); - } - else - { - ExportPathL( aStream, fullpathPtr, *subFolderEntry, localized, aLevelsToSearch-1); - } - CleanupStack::PopAndDestroy( subFolderEntry ); - } - CleanupStack::PopAndDestroy( fullpath ); - CleanupStack::PopAndDestroy( dirList ); - - TRACE_FUNC_EXIT; - } -TBool CSconFolderLister::IsDirectoryPrintable( const TDesC& aParentPath, const TEntry& aFolderEntry ) - { - if ( aFolderEntry.IsSystem() ) - { - LOGGER_WRITE_1("folder '%S' was system folder", &aFolderEntry.iName); - return EFalse; - } - if ( aParentPath.Length() == 3 ) - { - if ( aParentPath.FindF(_L("C:\\")) == 0 && aFolderEntry.iName.CompareF(_L("data")) != 0 ) - { - // C root not visible, exept Data folder - LOGGER_WRITE_1("folder '%S' not visible to user in c-root", &aFolderEntry.iName); - return EFalse; - } - - if ( aFolderEntry.iName.CompareF(_L("private")) == 0 ) - { - LOGGER_WRITE_1("folder '%S' not visible to user", &aFolderEntry.iName); - return EFalse; - } - else if ( aFolderEntry.iName.CompareF(_L("sys")) == 0 ) - { - LOGGER_WRITE_1("folder '%S' not visible to user", &aFolderEntry.iName); - return EFalse; - } - else if ( aFolderEntry.iName.CompareF(_L("system")) == 0 ) - { - LOGGER_WRITE_1("folder '%S' not visible to user", &aFolderEntry.iName); - return EFalse; - } - else if ( aFolderEntry.iName.CompareF(_L("resource")) == 0 ) - { - LOGGER_WRITE_1("folder '%S' not visible to user", &aFolderEntry.iName); - return EFalse; - } - } - return ETrue; - } - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/servers/pcconn/src/sconimsireader.cpp --- a/connectivitymodules/SeCon/servers/pcconn/src/sconimsireader.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,123 +0,0 @@ -/* -* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* 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: CSconImsiReader implementation -* -*/ - - -#include "sconimsireader.h" -#include "debug.h" - -TInt CSconImsiReader::GetImsiL( TDes& aImsi ) - { - TRACE_FUNC_ENTRY; - CTelephony::TRegistrationStatus temp; - CSconImsiReader* self = new (ELeave) CSconImsiReader(aImsi, temp); - CleanupStack::PushL(self); - self->ConstructL(); - - self->RequestImsi(); - - TInt err = self->iStatus.Int(); - CleanupStack::PopAndDestroy(self); - TRACE_FUNC_RET(err); - return err; - } - -TInt CSconImsiReader::GetNetworkStatusL( CTelephony::TRegistrationStatus& aRegistrationStatus ) - { - TRACE_FUNC_ENTRY; - TBuf temp; - CSconImsiReader* self = new (ELeave) CSconImsiReader(temp, aRegistrationStatus); - CleanupStack::PushL(self); - self->ConstructL(); - - self->RequestNetworkStatus(); - - TInt err = self->iStatus.Int(); - CleanupStack::PopAndDestroy(self); - TRACE_FUNC_RET(err); - return err; - } - -void CSconImsiReader::ConstructL() - { - TRACE_FUNC_ENTRY; - iTelephony = CTelephony::NewL(); - CActiveScheduler::Add(this); - TRACE_FUNC_EXIT; - } - -void CSconImsiReader::RequestImsi() - { - iImsiReaderStatus = ERequestingImsi; - iTelephony->GetSubscriberId(iStatus,iSubscriberIdV1Pckg); - SetActive(); - CActiveScheduler::Start(); - } - -void CSconImsiReader::RequestNetworkStatus() - { - iImsiReaderStatus = ERequestingNetworkStatus; - iTelephony->GetNetworkRegistrationStatus(iStatus, iNetworkRegistrationV1Pckg); - SetActive(); - CActiveScheduler::Start(); - } - -CSconImsiReader::~CSconImsiReader() - { - TRACE_FUNC_ENTRY; - delete iTelephony; - TRACE_FUNC_EXIT; - } - -CSconImsiReader::CSconImsiReader(TDes& aImsi, CTelephony::TRegistrationStatus& aRegistrationStatus): CActive(EPriorityStandard), - iImsi(aImsi), iNetworkStatus(aRegistrationStatus), iSubscriberIdV1Pckg(iSubscriberIdV1), iNetworkRegistrationV1Pckg(iNetworkRegistrationV1) - { - } - -void CSconImsiReader::RunL() - { - TRACE_FUNC_ENTRY; - LOGGER_WRITE_1("iStatus: %d", iStatus.Int() ); - if ( iStatus == KErrNone ) - { - if ( iImsiReaderStatus == ERequestingImsi ) - { - iImsi = iSubscriberIdV1.iSubscriberId; - LOGGER_WRITE_1("iImsi: %S", &iImsi); - } - else if ( iImsiReaderStatus == ERequestingNetworkStatus ) - { - iNetworkStatus = iNetworkRegistrationV1.iRegStatus; - LOGGER_WRITE_1( "iNetworkStatus: %d", (TInt)iNetworkStatus); - } - } - CActiveScheduler::Stop(); - TRACE_FUNC_EXIT; - } - -void CSconImsiReader::DoCancel() - { - TRACE_FUNC_ENTRY; - if ( iImsiReaderStatus == ERequestingImsi ) - { - iTelephony->CancelAsync( CTelephony::EGetSubscriberIdCancel ); - } - else if ( iImsiReaderStatus == ERequestingNetworkStatus ) - { - iTelephony->CancelAsync( CTelephony::EGetNetworkRegistrationStatusCancel ); - } - TRACE_FUNC_EXIT; - } diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/servers/pcconn/src/sconpcconnserver.cpp --- a/connectivitymodules/SeCon/servers/pcconn/src/sconpcconnserver.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3028 +0,0 @@ -/* -* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* 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: PC Connectivity server -* -*/ - - -#include // For RMemReadStream -#include -#include -#include - -#include "sconpcconnclientserver.h" -#include "sconpcconnserver.h" -#include "sconpcd.h" -#include "sconcsc.h" -#include "sconconmlhandler.h" -#include "sconimsireader.h" -#include "sconoviaccounthandler.h" -#include "sconfolderlister.h" -#include "sconbtengine.h" -#include "debug.h" - -#ifdef DEBUG_XML -#include -_LIT8( KTimeFormat, "%02d:%02d:%02d.%03d" ); -_LIT8( KXmlBegin, "\nXML:\n" ); -#endif - -_LIT( KSCONGetMetadataRequest, "METADATA:" ); -_LIT8( KSCONSyncRequest, "SYNC:" ); -_LIT( KSCONReadImsi, "READIMSI"); -_LIT( KSCONReadNetworkInfo, "READNETWORKINFO"); -_LIT( KSCONReadOviAccount, "READOVIACCOUNT"); -_LIT( KSCONListPath, "LISTP:"); -_LIT( KSCONReadBtInfo, "READBTINFO" ); -_LIT( KSCONSetBtPower, "SETBTPOWER:" ); -_LIT( KSCONSetBtName, "SETBTNAME:" ); -_LIT( KSCONSetBtAuthorized, "SETBTAUTHORIZED:" ); - -//------------------------------------------------------------ -// Global functions -//------------------------------------------------------------ - -// ----------------------------------------------------------------------------- -// E32Main() -// Entry point -// ----------------------------------------------------------------------------- -// -TInt E32Main() - { - TRACE_FUNC_ENTRY; - __UHEAP_MARK; - TInt error( KErrNone ); - error = CSConPCConnServer::RunServer(); - __UHEAP_MARKEND; - TRACE_FUNC_EXIT; - return error; - } - -// ----------------------------------------------------------------------------- -// PanicServer() -// Panics the server with panic reason aPanic -// ----------------------------------------------------------------------------- -// -GLDEF_C void PanicServer(TPCConnServPanic aPanic) - { - LOGGER_WRITE_1( "CSConPCConnSession::PanicServer() : Panic code %d", aPanic ); - _LIT(KTxtServerPanic,"PCConn server panic"); - User::Panic(KTxtServerPanic,aPanic); - } - -// ----------------------------------------------------------------------------- -// CSConPCConnServer::CSConPCConnServer () -// Default constructor - can not leave -// ----------------------------------------------------------------------------- -// -CSConPCConnServer::CSConPCConnServer () : CServer2( EPriorityStandard) - { - LOGGER_WRITE( "* * * * CSConPCConnServer * * * *" ); - } - -// ----------------------------------------------------------------------------- -// CSConPCConnServer::~CSConPCConnServer() -// Default destructor -// ----------------------------------------------------------------------------- -// -EXPORT_C CSConPCConnServer::~CSConPCConnServer() - { - TRACE_FUNC; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnServer::NewLC() -// Creates a new instance of CSConPCConnServer -// ----------------------------------------------------------------------------- -// -EXPORT_C CSConPCConnServer* CSConPCConnServer::NewLC() - { - TRACE_FUNC_ENTRY; - CSConPCConnServer* self = new (ELeave) CSConPCConnServer(); - CleanupStack::PushL( self ); - self->StartL( KSConPCConnServerName ); - TRACE_FUNC_EXIT; - return self; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnServer::NewSessionL() -// Creates a new session to the client -// ----------------------------------------------------------------------------- -// -CSession2* CSConPCConnServer::NewSessionL( - const TVersion &aVersion, const RMessage2& /*aMessage*/ ) const - { - TRACE_FUNC_ENTRY; - - // check version - TVersion version( KSConPCConnServerVersionMajor, - KSConPCConnServerVersionMinor, - KSConPCConnServerVersionBuild); - - if (!User::QueryVersionSupported(version, aVersion)) - { - User::Leave(KErrNotSupported); - } - - // check client identity - RThread client; - Message().Client( client ); - TSecureId clientId = client.SecureId(); - - if ( clientId != KSConPCConnClientSecureId ) - { - LOGGER_WRITE( "CSConPCConnServer::NewSessionL() : Secure ID does not match" ); -#ifndef __WINS__ - LOGGER_WRITE( "Leave KErrAccessDenied"); - User::Leave( KErrAccessDenied ); -#else - // does not leave on WINS environment. Easier to run module tests. - LOGGER_WRITE( "Not leaving on WINS environment" ); -#endif - } - - TRACE_FUNC_EXIT; - return CSConPCConnSession::NewL( *CONST_CAST( CSConPCConnServer*, this)); - } - -// ----------------------------------------------------------------------------- -// CSConPCConnServer::RunServer() -// Starts the server -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnServer::RunServer() - { - TRACE_FUNC_ENTRY; - - CTrapCleanup* cleanup = CTrapCleanup::New(); - TInt ret = KErrNoMemory; - if( cleanup ) - { - TRAP( ret, CSConPCConnServer::RunServerL( ) ); - delete cleanup; - } - if( ret != KErrNone ) - { - // Signal the client that server creation failed - RProcess::Rendezvous( ret ); - } - TRACE_FUNC_EXIT; - return ret; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnServer::RunServerL() -// Starts the server -// ----------------------------------------------------------------------------- -// -void CSConPCConnServer::RunServerL() - { - // Create and install the active scheduler we need - TRACE_FUNC_ENTRY; - CActiveScheduler *as=new (ELeave)CActiveScheduler; - CleanupStack::PushL( as ); - CActiveScheduler::Install( as ); - - // Create server - CSConPCConnServer* server = CSConPCConnServer::NewLC(); - - // Initialisation complete, now signal the client - User::LeaveIfError( RThread().RenameMe( KSConPCConnServerName ) ); - RProcess::Rendezvous( KErrNone ); - - // Ready to run - CActiveScheduler::Start(); - - // Cleanup the scheduler - CleanupStack::PopAndDestroy( 2, as ); - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnServer::IncSessionCount() -// Increments session count -// ----------------------------------------------------------------------------- -// -void CSConPCConnServer::IncSessionCount() - { - TRACE_FUNC_ENTRY; - iSessionCount++; - LOGGER_WRITE_1( "There are now %d sessions", iSessionCount ); - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnServer::DecSessionCount() -// Decrements session count -// ----------------------------------------------------------------------------- -// -void CSConPCConnServer::DecSessionCount() - { - TRACE_FUNC_ENTRY; - iSessionCount--; - LOGGER_WRITE_1( "There are still %d sessions", iSessionCount ); - if ( iSessionCount < 1 ) - { - Cancel(); - CActiveScheduler::Stop(); - } - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::CSConPCConnSession() -// Default constructor -// ----------------------------------------------------------------------------- -// -CSConPCConnSession::CSConPCConnSession ( - CSConPCConnServer& aServer ) : iServer (aServer) - { - TRACE_FUNC_ENTRY; - iServer.IncSessionCount(); - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::CSConPCConnSession() -// Default destructor - frees resources -// ----------------------------------------------------------------------------- -// -CSConPCConnSession::~CSConPCConnSession() - { - TRACE_FUNC_ENTRY; - - iServer.DecSessionCount(); - - if ( iConMLHandler ) - { - delete iConMLHandler; - iConMLHandler = NULL; - iConMLHandlerLib.Close(); - } - - if ( iPCDHandler ) - { - delete iPCDHandler; - iPCDHandler = NULL; - iPCDlib.Close(); - } - - if ( iCSCHandler ) - { - delete iCSCHandler; - iCSCHandler = NULL; - iCSClib.Close(); - } - - if ( iBuffer ) - { - delete iBuffer; - iBuffer = NULL; - } - - iChunk.Close(); - delete iFolderLister; - - iFs.Close(); - - delete iBtEngine; - - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::NewL() -// Creates a new instance of CSConPCConnSession -// ----------------------------------------------------------------------------- -// -EXPORT_C CSConPCConnSession *CSConPCConnSession::NewL( - CSConPCConnServer& aServer) - { - TRACE_FUNC_ENTRY; - CSConPCConnSession* self = new ( ELeave ) CSConPCConnSession(aServer); - CleanupStack::PushL( self ); - self->ConstructL(); - CleanupStack::Pop( self ); - TRACE_FUNC_EXIT; - return self; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::ConstructL() -// 2nd phase constructor -// ----------------------------------------------------------------------------- -// -void CSConPCConnSession::ConstructL() - { - TRACE_FUNC_ENTRY; - TInt ret ( KErrNone ); - iResult = KErrNone; - - User::LeaveIfError( iFs.Connect() ); - -#ifdef DEBUG_XML - // create log file - - RFile file; - TInt err = file.Create ( iFs, KSConConMLDebugFile, EFileWrite ); - if( err == KErrNone ) - { - // file created, close it - file.Close(); - } -#endif - - // initialize buffer - iBuffer = CBufFlat::NewL ( KSConPCConnBufferMaxSize ); - - // load handlers - if ( !iPCDHandler ) - { - TRAP( ret, LoadPCDDllL() ); - if ( ret != KErrNone) - { - LOGGER_WRITE_1( "CSConPCConnSession::ConstructL() : PCD load failed with error code %d", ret ); - User::Leave( ret ); - } - } - - if ( !iCSCHandler ) - { - TRAP( ret, LoadCSCDllL() ); - if ( ret != KErrNone) - { - LOGGER_WRITE_1( "CSConPCConnSession::ConstructL() : CSC dll load failed with error code %d", ret ); - User::Leave ( ret ); - } - } - - // Load parser - if ( !iConMLHandler ) - { - TRAPD( ret, LoadConMLHandlerDllL() ); - if ( ret != KErrNone) - { - LOGGER_WRITE_1( "CSConPCConnSession::ConstructL() : Parser dll load failed with error code %d", ret ); - User::Leave ( ret ); - } - } - - iFolderLister = CSconFolderLister::NewL( iFs ); - - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::ServiceL() -// Gets the client's request -// ----------------------------------------------------------------------------- -// -void CSConPCConnSession::ServiceL( const RMessage2 &aMessage) - { - TRACE_FUNC_ENTRY; - TRAPD(err,DispatchRequestL(aMessage) ); - if ( err != KErrNone ) - { - LOGGER_WRITE_1( "CSConPCConnSession::ServiceL() : leave code %d", err ); - PanicServer( E_DispatchRequest ); - } - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::DispatchRequestL() -// Identifies an IPC command from the client -// ----------------------------------------------------------------------------- -// -void CSConPCConnSession::DispatchRequestL(const RMessage2 &aMessage) - { - TRACE_FUNC_ENTRY; - - TInt ret (KErrNone); - - switch (aMessage.Function()) - { - case EPutMessage: - LOGGER_WRITE( "CSConPCConnSession::DispatchRequestL() : EPutMessage" ); - ret = HandlePutMessageL(); - break; - - case EGetMessage: - LOGGER_WRITE( "CSConPCConnSession::DispatchRequestL() : EGetMessage" ); - ret = HandleGetMessageL(); - break; - - case EResetMessage: - LOGGER_WRITE( "CSConPCConnSession::DispatchRequestL() : EResetMessage" ); - ret = HandleResetMessage(); - break; - - case EChunkMessage: - LOGGER_WRITE( "CSConPCConnSession::DispatchRequestL() : EChunkMessage" ); - ret = HandleChunkMessage( aMessage ); - break; - - default: - PanicServer (E_BadRequest); - break; - } - - aMessage.Complete( ret ); - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::HandlePutMessageL() -// Handles a PUT -type message from the client -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnSession::HandlePutMessageL() - { - TRACE_FUNC_ENTRY; - LOGGER_WRITE_1( "CSConPCConnSession::HandlePutMessageL() : begin : Heap count : %d", User::Heap().Count() ); - TInt ret ( KErrNone ); - - if ( !iPCDHandler ) - { - TRAP( ret, LoadPCDDllL() ); - if ( ret != KErrNone) - { - LOGGER_WRITE_1( "CSConPCConnSession::HandlePutMessageL (): PCD dll load failed with error code %d", ret ); - return ( ret ); - } - } - - if ( ! iConMLHandler ) - { - TRAP ( ret, LoadConMLHandlerDllL() ); - if ( ret != KErrNone ) - { - LOGGER_WRITE_1( "CSConPCConnSession::HandlePutMessageL (): ConML Handler dll load failed with error code %d", ret ); - return ( ret ); - } - } - - TInt length ( 0 ); - - RMemReadStream buf( iChunk.Base(), iChunk.Size() ); - - - iBuffer->Reset(); - - length = buf.ReadInt32L(); - HBufC8* name8 = HBufC8::NewLC( length ); - TPtr8 namePtr8 = name8->Des(); - buf.ReadL( namePtr8, length); - - const TUint8* ptr8 = namePtr8.Ptr(); - const TUint16* ptr16 = reinterpret_cast( ptr8 ); - TPtrC namePtr; - namePtr.Set( ptr16, length/2 ); - - length = buf.ReadInt32L(); - HBufC8* type = HBufC8::NewLC( length ); - TPtr8 typePtr = type->Des(); - buf.ReadL( typePtr, length); - - // WBXML Document - length = buf.ReadInt32L(); - HBufC8* data = HBufC8::NewLC( length ); - TPtr8 dataPtr = data->Des(); - - buf.ReadL( dataPtr, length ); - iBuffer->ResizeL( length ); - iBuffer->Write( 0, dataPtr ); - - buf.Close(); - -#ifdef DEBUG_XML - - RFile file; - if ( file.Open( iFs, KSConConMLDebugFile, EFileWrite ) == KErrNone ) - { - RFileWriteStream fws; - TInt fileSize; - file.Size( fileSize ); - - TTime now; - now.HomeTime(); - TDateTime time = now.DateTime(); - TBuf8<16> timeLine; - timeLine.Format (KTimeFormat, time.Hour(), time.Minute(), - time.Second(), time.MicroSecond() ); - - fws.Attach( file, fileSize ); - fws.PushL(); - fws.WriteL( timeLine ); - _LIT8( KPutMessage, "__________PUT-MESSAGE \nWBXML:\n" ); - fws.WriteL( KPutMessage ); - fws.WriteL( iBuffer->Ptr(0), iBuffer->Size() ); - TRAP_IGNORE( fws.CommitL() ); - fws.Close(); - - CleanupStack::PopAndDestroy( &fws ); - } - file.Close(); -#endif - if ( ( ( typePtr.CompareC( KSConPCDWBXMLObjectType)== KErrNone ) || - ( typePtr.CompareC( KSConPCDWBXMLObjectType2 )== KErrNone ) ) - && namePtr8.Find(KSCONSyncRequest) == 0 ) - { - LOGGER_WRITE_1("Sync request: %S", &namePtr); - RBufReadStream stream( *iBuffer ); - - CleanupClosePushL( stream ); - TRAP( ret, iPCDHandler->HandlePutSyncRequestL( namePtr8, stream )); - if ( ret ) - { - LOGGER_WRITE_1("HandlePutSyncRequestL() Leaved with %d", ret); - } - - CleanupStack::PopAndDestroy( &stream ); - } - else if ( ( typePtr.Compare( KSConPCDWBXMLObjectType ) == KErrNone) || - ( typePtr.Compare( KSConPCDWBXMLObjectType2 )== KErrNone) ) - { - LOGGER_WRITE( "CSConPCConnSession::HandlePutMessageL() : Object type PCD " ); - TRAPD( err, ret = iConMLHandler->ParseDocumentL( *iBuffer, this ) ); - if ( err != KErrNone ) - { - ret = err; - } - if ( ret == KErrNone ) - { - // Possible error code returned from PCCS - ret = iResult; - } - } - else - { - LOGGER_WRITE( "Object type not regognized " ); - ret = KErrNotSupported; - } - CleanupStack::PopAndDestroy( data ); - CleanupStack::PopAndDestroy( type ); - CleanupStack::PopAndDestroy( name8 ); - LOGGER_WRITE_1( "CSConPCConnSession::HandlePutMessageL() end : Heap count : %d", User::Heap().Count() ); - LOGGER_WRITE_1( "CSConPCConnSession::HandlePutMessageL() : returned %d", ret ); - return ret; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::HandleGetMessageL() -// Handles a GET -type message from the client -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnSession::HandleGetMessageL() - { - TRACE_FUNC_ENTRY; - TInt ret ( KErrNone ); - - if ( !iCSCHandler ) - { - TRAP( ret, LoadCSCDllL() ); - if ( ret != KErrNone) - { - LOGGER_WRITE_1( "CSConPCConnSession::HandleGetMessageL() : CSC dll load failed with error code %d", ret ); - return ret; - } - } - - TInt32 length ( 0 ); - RMemReadStream readBuf( iChunk.Base(), iChunk.Size() ); - iBuffer->Reset(); - - length = readBuf.ReadInt32L(); - HBufC8* name = HBufC8::NewLC( length ); - TPtr8 namePtr8 = name->Des(); - readBuf.ReadL( namePtr8, length); - namePtr8.SetLength( length ); - LOGGER_WRITE8_1("namePtr: %S", &namePtr8); - - const TUint8* ptr8 = namePtr8.Ptr(); - const TUint16* ptr16 = reinterpret_cast( ptr8 ); - TPtrC namePtr; - namePtr.Set( ptr16, length/2 ); - - length = readBuf.ReadInt32L(); - HBufC8* type = HBufC8::NewLC( length ); - TPtr8 typePtr = type->Des(); - readBuf.ReadL( typePtr, length); - - readBuf.Close(); - - if ( typePtr.Compare( KSConCapabilityObjectType ) == KErrNone ) - { - ret = iCSCHandler->CapabilityObject( *iBuffer ); - -#ifdef DEBUG_XML - - RFile file; - if ( file.Open(iFs, KSConConMLDebugFile, EFileWrite ) == KErrNone ) - { - RFileWriteStream fws; - TInt fileSize; - file.Size ( fileSize ); - TTime now; - now.HomeTime(); - TDateTime time = now.DateTime(); - TBuf8<16> timeLine; - timeLine.Format( KTimeFormat, time.Hour(), time.Minute(), - time.Second(), time.MicroSecond() ); - - fws.Attach ( file, fileSize); - fws.PushL(); - fws.WriteL( timeLine ); - _LIT8( KGetMessage, "__________GET -MESSAGE - Capability Object \n " ); - fws.WriteL( KGetMessage ); - fws.WriteL( iBuffer->Ptr(0), iBuffer->Size() ); - TRAP_IGNORE( fws.CommitL() ); - fws.Close(); - - CleanupStack::PopAndDestroy( &fws ); - } - file.Close(); -#endif - - } - else if ( typePtr.CompareC( KSConPCDWBXMLObjectType) == KErrNone ) - { - if ( namePtr8.Find(KSCONSyncRequest) == 0 ) // 8-bit search - { - LOGGER_WRITE("Sync request"); - - RBufWriteStream stream( *iBuffer ); - - CleanupClosePushL( stream ); - - TRAP( ret, iPCDHandler->HandleGetSyncRequestL( namePtr8, stream, iChunk.MaxSize() - sizeof(TInt32) )); - if ( ret ) - { - LOGGER_WRITE_1("HandleGetSyncRequestL() Leaved with %d", ret); - } - stream.CommitL(); - CleanupStack::PopAndDestroy( &stream ); - - LOGGER_WRITE_1("iBuffer size: %d", iBuffer->Size()); - - } - else if ( namePtr.Find(KSCONReadImsi) == 0 ) // 16-bit search - { - LOGGER_WRITE("Read IMSI"); - TBuf imsi; - ret = CSconImsiReader::GetImsiL( imsi ); - - if ( ret == KErrNone ) - { - TBuf8 imsi8; - User::LeaveIfError( CnvUtfConverter::ConvertFromUnicodeToUtf8(imsi8,imsi) ); - - iBuffer->ResizeL( imsi8.Length() ); - iBuffer->Write( 0, imsi8 ); - } - else - { - // Change error code more generic - ret = KErrNotFound; - } - } - else if ( namePtr.Find(KSCONReadNetworkInfo) == 0 ) // 16-bit search - { - LOGGER_WRITE("Read NetworkInfo"); - CTelephony::TRegistrationStatus regStatus; - ret = CSconImsiReader::GetNetworkStatusL( regStatus ); - - if ( ret == KErrNone ) - { - RBufWriteStream stream( *iBuffer ); - CleanupClosePushL( stream ); - stream.WriteInt8L( regStatus ); - stream.CommitL(); - CleanupStack::PopAndDestroy( &stream ); - } - else - { - // Change error code more generic - ret = KErrNotFound; - } - } - else if ( namePtr.Find(KSCONReadOviAccount) == 0 ) - { - LOGGER_WRITE("Read Ovi account"); - RBufWriteStream stream( *iBuffer ); - CleanupClosePushL( stream ); - - ret = ReadOviAccountInfoL( stream ); - stream.CommitL(); - CleanupStack::PopAndDestroy( &stream ); - - } - else if ( namePtr.Find(KSCONListPath) == 0 ) - { - LOGGER_WRITE("List path"); - // LISTP:0:pathname - if ( namePtr.Length() > KSCONListPath().Length()+2) - { - TPtrC pathname = namePtr.Mid( KSCONListPath().Length()+2 ); - - const TUint16 levelsChar = namePtr[ KSCONListPath().Length() ]; - TInt level(KErrNotFound); - if ( levelsChar >= TChar('0') ) - { - level = levelsChar - TChar('0'); - } - - RBufWriteStream stream( *iBuffer ); - CleanupClosePushL( stream ); - TRAP( ret, iFolderLister->GenerateFolderListL( stream, pathname, level )); - LOGGER_WRITE_1("GenerateFolderListL leaved with err: %d", ret); - stream.CommitL(); - CleanupStack::PopAndDestroy( &stream ); - } - else - { - ret = KErrArgument; - } - - } - else if ( namePtr.Find(KSCONReadBtInfo) == 0 ) - { - LOGGER_WRITE( "Read BT info"); - if ( !iBtEngine ) - { - iBtEngine = CSconBtEngine::NewL(); - } - RBufWriteStream stream( *iBuffer ); - CleanupClosePushL( stream ); - TRAP( ret, iBtEngine->ReadBTInfoL( stream ) ); - LOGGER_WRITE_1("ReadBTInfoL leaved with err: %d", ret); - stream.CommitL(); - CleanupStack::PopAndDestroy( &stream ); - } - else if ( namePtr.Find(KSCONSetBtPower) == 0 ) - { - LOGGER_WRITE( "Change BT Power state"); - if ( namePtr.Length() == KSCONSetBtPower().Length()+1 ) - { - const TUint16 lastChar = namePtr[ KSCONSetBtPower().Length() ]; - TBool changeBtOn; - if ( lastChar == TChar('0') ) - { - changeBtOn = EFalse; - } - else if ( lastChar == TChar('1') ) - { - changeBtOn = ETrue; - } - else - { - ret = KErrArgument; - } - - if ( !ret ) - { - if ( !iBtEngine ) - { - iBtEngine = CSconBtEngine::NewL(); - } - TInt err = iBtEngine->SetBtPowerState( changeBtOn ); - - RBufWriteStream stream( *iBuffer ); - CleanupClosePushL( stream ); - stream.WriteInt32L( err ); - stream.CommitL(); - CleanupStack::PopAndDestroy( &stream ); - } - } - else - { - ret = KErrArgument; - } - } - else if ( namePtr.Find(KSCONSetBtName) == 0 ) - { - LOGGER_WRITE( "Set BT Name"); - TPtrC btName = namePtr.Mid( KSCONSetBtName().Length() ); - TInt err = iBtEngine->SetBtName( btName ); - - RBufWriteStream stream( *iBuffer ); - CleanupClosePushL( stream ); - stream.WriteInt32L( err ); - stream.CommitL(); - CleanupStack::PopAndDestroy( &stream ); - } - else if ( namePtr.Find(KSCONSetBtAuthorized) == 0 ) - { - LOGGER_WRITE( "Set BT Authorized"); - ret = KErrArgument; - // SETBTAUTHORIZED:0:00245f8d6a26 - // 1. param = auth. state ("0"=off, "1"=true) - // 2. param = bt address (hex string) - - if ( namePtr.Length() > KSCONSetBtAuthorized().Length()+2) - { - TPtrC btAddr = namePtr.Mid( KSCONSetBtAuthorized().Length()+2 ); - - const TUint16 authStateChar = namePtr[ KSCONSetBtAuthorized().Length() ]; - TBool authorize(EFalse); - if ( authStateChar == TChar('0') ) - { - authorize = EFalse; - ret = KErrNone; - } - else if ( authStateChar == TChar('1') ) - { - authorize = ETrue; - ret = KErrNone; - } - - if ( !iBtEngine ) - { - iBtEngine = CSconBtEngine::NewL(); - } - TRAPD(err, iBtEngine->SetBtAuthorizedL( btAddr, authorize ) ); - - RBufWriteStream stream( *iBuffer ); - CleanupClosePushL( stream ); - stream.WriteInt32L( err ); - stream.CommitL(); - CleanupStack::PopAndDestroy( &stream ); - } - - } - else - { - ret = HandleWBXMLGetRequestL( namePtr ); - } - } - else - { - LOGGER_WRITE( "CSConPCConnSession::HandleGetMessageL() : Header type not regognized " ); - ret = KErrNotSupported; - } - - CleanupStack::PopAndDestroy( 2 ); // name, type - - if ( ret != KErrNone ) - { - return ret; - } - - length = iBuffer->Size(); - - if ( sizeof(TInt32) + length > iChunk.Size() ) - { - // need to resize chunk - TInt err = iChunk.Adjust( sizeof(TInt32) + length ); - LOGGER_WRITE_2("iChunk.Adjust( %d ) err: %d", sizeof(TInt32) + length, err); - if ( err ) - { - iBuffer->Reset(); - LOGGER_WRITE_1( "CSConPCConnSession::HandleGetMessageL() : returned %d", ret ); - return err; - } - } - - // copy data to chunk - RMemWriteStream writeBuf ( iChunk.Base(), iChunk.Size() ); - - if ( length > 0 ) - { - writeBuf.WriteInt32L( length ); - writeBuf.WriteL( iBuffer->Ptr(0), length ); - writeBuf.CommitL(); - } - else - { - writeBuf.WriteInt32L( 0 ); - } - writeBuf.CommitL(); - writeBuf.Close(); - iBuffer->Reset(); - LOGGER_WRITE_1( "CSConPCConnSession::HandleGetMessageL() : returned %d", ret ); - return ( ret ); - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::HandleWBXMLGetRequestL() -// Handles a ConML(wbxml) Get request from the client -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnSession::HandleWBXMLGetRequestL( const TDesC& aFileName ) - { - TRACE_FUNC_ENTRY; - TInt ret(KErrNone); - if ( aFileName.Find(KSCONGetMetadataRequest) == 0 ) - { - // ConML get metadata request --> Create metadata task - LOGGER_WRITE( "ConML GetMetadataRequest" ); - TPtrC filename = aFileName.Mid( KSCONGetMetadataRequest().Length() ); - - TSConMethodName method ( EGetMetadata ); - CSConTask* task = CSConTask::NewLC( method ); - - if ( filename.Length() > task->iGetMetadataParams->iFilename.MaxLength() ) - { - User::Leave( KErrTooBig ); - } - task->iGetMetadataParams->iFilename = filename; - - ret = iPCDHandler->PutTaskL( task ); - CleanupStack::Pop( task ); - LOGGER_WRITE_1("iPCDHandler->PutTaskL ret: %d", ret); - } - else if ( aFileName.Length() > 0 ) - { - LOGGER_WRITE("Error: aFilename does not match to any definitions"); - TRACE_FUNC_RET( KErrArgument ); - return KErrArgument; - } - - // Get reply - LOGGER_WRITE( "CSConPCConnSession::HandleGetMessageL() before ConML GetReplyL" ); - CSConStatusReply* reply = iPCDHandler->GetReply(); - CleanupStack::PushL( reply ); - - ConML_ConMLPtr_t content = new ( ELeave ) ConML_ConML_t(); - CleanupStack::PushL( content ); - - AppendStatusL( content, reply ); - ret = iConMLHandler->GenerateDocument( content ); - - CleanupStack::PopAndDestroy( content ); - CleanupStack::PopAndDestroy( reply ); - - TPtrC8 ptr( iConMLHandler->WBXMLDocument() ); - LOGGER_WRITE_1("ptr.Size(): %d", ptr.Size()); - iBuffer->ResizeL( ptr.Size() ); - iBuffer->Write( 0, ptr ); - -#ifdef DEBUG_XML - RFile file; - if ( file.Open( iFs, KSConConMLDebugFile, EFileWrite) == KErrNone ) - { - RFileWriteStream fws; - TInt fileSize; - file.Size ( fileSize ); - fws.Attach ( file, fileSize); - fws.PushL(); - TTime now; - now.HomeTime(); - TDateTime time = now.DateTime(); - TBuf8<16> timeLine; - timeLine.Format( KTimeFormat, time.Hour(), time.Minute(), - time.Second(), time.MicroSecond() ); - - fws.WriteL( timeLine ); - _LIT8( KGetMessage, "__________GET -MESSAGE" ); - fws.WriteL( KGetMessage ); - fws.WriteL(KXmlBegin); - fws.WriteL(iConMLHandler->XMLDocument().Ptr(), - iConMLHandler->XMLDocument().Length()); - fws.WriteL(_L("\n\n")); - TRAP_IGNORE( fws.CommitL() ); - fws.Close(); - CleanupStack::PopAndDestroy( &fws ); - } - - file.Close(); -#endif - TRACE_FUNC_RET(ret); - return ret; - } - - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::ReadOviAccountInfoL() -// Reads ovi account information to stream -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnSession::ReadOviAccountInfoL( RWriteStream& aAccountInfoStream ) - { - TRACE_FUNC_ENTRY; - RLibrary oviaccounthandlerLib; - CleanupClosePushL( oviaccounthandlerLib ); - // Dynamically load DLL - TInt err = oviaccounthandlerLib.Load( KSconOviAccountHandlerDllName ); - if ( err ) - { - LOGGER_WRITE_1("oviaccounthandlerLib.Load err: %d", err); - err = KErrNotSupported; - } - else if( oviaccounthandlerLib.Type()[1] != KSconOviAccountHandlerDllUid ) - { - LOGGER_WRITE_1( "KSconOviAccountHandlerDllUid incorrect... (0x%08X)",oviaccounthandlerLib.Type()[1].iUid ); - err = KErrNotSupported; - } - - if ( err == KErrNone ) - { - TSConCreateCSconOviAccountHandlerFunc CreateCSconOviAccountHandlerL = - (TSConCreateCSconOviAccountHandlerFunc)oviaccounthandlerLib.Lookup(1); - - CSconOviAccountHandler* oviAccountHandler = (CSconOviAccountHandler*)CreateCSconOviAccountHandlerL(); - - TRAP(err, oviAccountHandler->GetOviAccountDetailsL( aAccountInfoStream ) ); - LOGGER_WRITE_1("GetOviAccountDetailsL err: %d", err); - - delete oviAccountHandler; - oviAccountHandler = NULL; - - if ( err ) - { - // change error code - err = KErrNotFound; - } - } - else - { - err = KErrNotSupported; - } - - CleanupStack::PopAndDestroy( &oviaccounthandlerLib ); - TRACE_FUNC_EXIT; - return err; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::HandleResetMessage() -// Resets the PCCS service -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnSession::HandleResetMessage() - { - TRACE_FUNC_ENTRY; - TInt ret ( KErrNone ); - - // reset PCD - if ( iPCDHandler ) - { - iPCDHandler->ResetPCD(); - } - - LOGGER_WRITE_1( "CSConPCConnSession::HandleResetMessage() : ret %d", ret ); - return ret; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::HandleChunkMessage( const RMessage2& aMessage ) -// Receives the chunk handle from the client -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnSession::HandleChunkMessage( const RMessage2& aMessage ) - { - TRACE_FUNC_ENTRY; - TInt ret ( KErrNone ); - - ret = iChunk.Open( aMessage, 0, EFalse ); - - LOGGER_WRITE_1( "CSConPCConnSession::HandleChunkMessageL() : ret %d", ret ); - return ret; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::LoadPCDDllL() -// Loads the PCCS service -// ----------------------------------------------------------------------------- -// -void CSConPCConnSession::LoadPCDDllL() - { - TRACE_FUNC_ENTRY; - - // Dynamically load DLL - User::LeaveIfError( iPCDlib.Load( KSConPCDLibName ) ); - if( iPCDlib.Type()[1] != KSConPCDUid ) - { - LOGGER_WRITE( "CSConPCConnSession::LoadPCDDllL() : KSConPCDUidValue incorrect..." ); - iPCDlib.Close(); - User::Leave( KErrNotFound ); - } - TSConCreateCSConPCDFunc CreateCSConPCDL = - (TSConCreateCSConPCDFunc)iPCDlib.Lookup(1); - - iPCDHandler = (CSConPCD*)CreateCSConPCDL(); - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::LoadCSCDllL() -// Loads the CSC service -// ----------------------------------------------------------------------------- -// -void CSConPCConnSession::LoadCSCDllL() - { - TRACE_FUNC_ENTRY; - // Dynamically load DLL - User::LeaveIfError( iCSClib.Load( KSConCSCLibName ) ); - if( iCSClib.Type()[1] != KSConCSCUid ) - { - LOGGER_WRITE( "CSConPCConnSession::LoadCSCDllL() : KSConCSCUidValue incorrect" ); - iCSClib.Close(); - User::Leave( KErrNotFound ); - } - TSConCreateCSConCSCFunc CreateCSConCSCL = - (TSConCreateCSConCSCFunc)iCSClib.Lookup(1); - - iCSCHandler = (CSConCSC*)CreateCSConCSCL(); - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::LoadConMLHandlerDllL() -// Loads the ConML handler -// ----------------------------------------------------------------------------- -// -void CSConPCConnSession::LoadConMLHandlerDllL() - { - TRACE_FUNC_ENTRY; - // Dynamically load DLL - User::LeaveIfError( iConMLHandlerLib.Load( KSConConMLHandlerLibName ) ); - if ( iConMLHandlerLib.Type()[1] != KSConConMLHandlerUid ) - { - LOGGER_WRITE( "CSConPCConnSession::LoadConMLHandlerDllL() : KSConConMLHandlerUidValue incorrect" ); - iConMLHandlerLib.Close(); - User::Leave( KErrNotFound ); - } - TSConCreateCSConConMLHandlerFunc CreateCSConConMLHandlerL = - (TSConCreateCSConConMLHandlerFunc)iConMLHandlerLib.Lookup(1); - - iConMLHandler = (CSConConMLHandler*)CreateCSConConMLHandlerL(); - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::ConMLL() -// Callback function for ConML handler - parsed data processing starts -// ----------------------------------------------------------------------------- -// -void CSConPCConnSession::ConMLL( ConML_ConMLPtr_t aContent ) - { - TRACE_FUNC_ENTRY; - TInt ret ( KErrNone ); - -#ifdef DEBUG_XML - iConMLHandler->GenerateDocument( aContent ); - RFile file; - if ( file.Open(iFs, KSConConMLDebugFile, EFileWrite) == KErrNone ) - { - RFileWriteStream fws; - TInt fileSize; - file.Size( fileSize ); - fws.Attach ( file, fileSize ); - fws.PushL(); - - TTime now; - now.HomeTime(); - TDateTime time = now.DateTime(); - TBuf8<16> timeLine; - timeLine.Format (KTimeFormat, time.Hour(), time.Minute(), - time.Second(), time.MicroSecond() ); - - fws.WriteL( timeLine ); - _LIT8( KPutMessage, "__________PUT-MESSAGE" ); - fws.WriteL( KPutMessage ); - fws.WriteL( KXmlBegin ); - fws.WriteL( iConMLHandler->XMLDocument().Ptr(), - iConMLHandler->XMLDocument().Length()); - fws.WriteL(_L("\n\n")); - TRAP_IGNORE( fws.CommitL() ); - fws.Close(); - CleanupStack::PopAndDestroy( &fws ); - } - file.Close(); - -#endif - - - if ( aContent ) - { - if ( aContent->execute ) - { - ret = OptionsFromExecuteL( aContent->execute ); - } - else if ( aContent->cancel ) - { - ret = TaskCancelL( aContent->cancel ); - } - else if ( aContent->getStatus ) - { - ret = TaskGetStatusL ( aContent->getStatus ); - } - else - { - LOGGER_WRITE( "CSConPCConnSession::ConML() : No appropriate content in ConML -element " ); - ret = KErrArgument; - } - } - else - { - ret = KErrArgument; - } - - // store result for later use - iResult = ret; - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::OptionsFromExecuteL() -// Handles data of an execute -element -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnSession::OptionsFromExecuteL(ConML_ExecutePtr_t aContent ) - { - TRACE_FUNC_ENTRY; - - TInt ret ( KErrNone ); - if ( aContent->updateDeviceInfo ) - { - ret = TaskUpdateDeviceInfoL( aContent->updateDeviceInfo); - } - else if ( aContent->listInstalledApps ) - { - ret = TaskListInstalledAppsL( aContent->listInstalledApps); - } - else if ( aContent->install ) - { - ret = TaskInstallL( aContent->install ); - } - else if ( aContent->unInstall ) - { - ret = TaskUnInstallL( aContent->unInstall ); - } - else if ( aContent->listDataOwners ) - { - ret = TaskListDataOwnersL(); - } - else if ( aContent->setBurMode ) - { - ret = TaskSetBURModeL( aContent->setBurMode ); - } - else if ( aContent->getDataSize ) - { - ret = TaskGetDataSizeL( aContent->getDataSize ); - } - else if ( aContent->requestData ) - { - ret = TaskRequestDataL( aContent->requestData ); - } - else if ( aContent->listPublicFiles ) - { - ret = TaskListPublicFilesL( aContent->listPublicFiles ); - } - else if ( aContent->reboot ) - { - ret = TaskRebootL(); - } - else if ( aContent->getDataOwnerStatus ) - { - ret = TaskGetDataOwnerStatusL( aContent->getDataOwnerStatus ); - } - else if ( aContent->supplyData ) - { - ret = TaskSupplyDataL( aContent->supplyData ); - } - else if ( aContent->getMetadata ) - { - ret = TaskGetMetadataL( aContent->getMetadata ); - } - else - { - LOGGER_WRITE( "CSConPCConnSession::OptionsFromExecute() : No content " ); - ret = KErrNotSupported; - } - LOGGER_WRITE_1( "CSConPCConnSession::OptionsFromExecute() : returned %d", ret ); - return ret; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::TaskCancelL(ConML_CancelPtr_t aContent) -// Sends a Cancel -task to PCCS service -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnSession::TaskCancelL( ConML_CancelPtr_t aContent ) - { - TRACE_FUNC_ENTRY; - TInt ret ( KErrNone ); - TSConMethodName method ( ECancel ); - CSConTask* task = CSConTask::NewLC( method ); - if ( aContent->all ) - { - task->iCancelTaskAll = ETrue; - } - if ( aContent->id ) - { - task->iCancelTaskId = ( DesToInt( aContent->id->Data() )); - } - ret = iPCDHandler->PutTaskL( task ); - CleanupStack::Pop( task ); - LOGGER_WRITE_1( "CSConPCConnSession::TaskCancelL() : returned %d", ret ); - return ret; - } - - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::TaskGetStatusL() -// Sends a Get Status -task to PCCS service -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnSession::TaskGetStatusL( ConML_GetStatusPtr_t aContent ) - { - TRACE_FUNC_ENTRY; - TInt ret ( KErrNone ); - TSConMethodName method ( EGetStatus ); - CSConTask* task = CSConTask::NewLC( method ); - if ( aContent->all ) - { - task->iGetStatusParams->iAll = ETrue; - } - if ( aContent->id) - { - task->iGetStatusParams->iTaskId = ( DesToInt( aContent->id->Data() )); - } - ret = iPCDHandler->PutTaskL( task ); - CleanupStack::Pop( task ); - LOGGER_WRITE_1( "CSConPCConnSession::TaskGetStatusL() : returned %d", ret ); - return ret; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::TaskInstallL() -// Sends an Install -task to PCCS service -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnSession::TaskInstallL( ConML_InstallPtr_t aContent ) - { - TRACE_FUNC_ENTRY; - TInt ret ( KErrNone ); - TSConMethodName method ( EInstall ); - CSConTask* task = CSConTask::NewLC( method); - task->iInstallParams->iMode = EUnknown; - if ( aContent->name ) - { - // Unicode conversion from 8-bit to 16-bit - CnvUtfConverter::ConvertToUnicodeFromUtf8(task->iInstallParams->iPath, - aContent->name->Data()); - } - if ( aContent->instParams ) - { - if ( aContent->instParams->param ) - { - for ( ConML_ParamListPtr_t p = aContent->instParams->param; - p && p->data; p = p->next) - { - LOGGER_WRITE( "CSConPCConnSession::TaskInstallL() : Parameters found " ); - if ( p->data->name ) - { - LOGGER_WRITE( "CSConPCConnSession::TaskInstallL() : name param found " ); - TPtrC8 silent(KParamNameSilent); - - TInt comp = Mem::Compare((TUint8*)p->data->name->content, (TInt)p->data->name->length, silent.Ptr(), silent.Length()); - if( comp == 0) - { - // "Silent"-param found - LOGGER_WRITE( "CSConPCConnSession::TaskInstallL() : Silent-param found " ); - if ( p->data->value ) - { - TPtrC8 dataValue((TUint8*)p->data->value->content, (TInt)p->data->value->length); - TInt value = DesToInt( dataValue ); - if (value == 1) - { - LOGGER_WRITE( "CSConPCConnSession::TaskInstallL() : ESilentInstall " ); - task->iInstallParams->iMode = ESilentInstall; - } - else if( value == 0 ) - { - LOGGER_WRITE( "CSConPCConnSession::TaskInstallL() : EUnsilentInstall " ); - task->iInstallParams->iMode = EUnsilentInstall; - } - } - } - } - } - } - } - ret = iPCDHandler->PutTaskL( task ); - CleanupStack::Pop( task ); - LOGGER_WRITE_1( "CSConPCConnSession::TaskInstallL() : returned %d", ret ); - return ret; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::TaskUnInstallL() -// Sends an Uninstall -task to PCCS service -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnSession::TaskUnInstallL( ConML_UnInstallPtr_t aContent ) - { - TRACE_FUNC_ENTRY; - TInt ret ( KErrNone ); - TSConMethodName method ( EUninstall ); - CSConTask* task = CSConTask::NewLC( method ); - task->iUninstallParams->iMode = EUnknown; - - if ( aContent->applications->application) - { - for ( ConML_ApplicationListPtr_t p = - aContent->applications->application; p && p->data; p = p->next ) - { - if ( p->data ) - { - if ( p->data->name ) - { - // get application name - HBufC* nameBuf = CnvUtfConverter::ConvertToUnicodeFromUtf8L( p->data->name->Data() ); - task->iUninstallParams->iName.Copy( nameBuf->Des() ); - delete nameBuf; - nameBuf = NULL; - } - if ( p->data->uid ) - { - // parse uid: UID # Type # Size # Version # Vendor # Parent app. name # - // only UID and Vendor are needed from whole uid-field. - LOGGER_WRITE( "CSConPCConnSession::TaskUnInstallL() : start parsing uid " ); - - TPtrC8 buf( p->data->uid->Data() ); - - RArray arr(6); - CleanupClosePushL( arr ); - TBuf8<1> separator(KSConAppInfoSeparator); - - SplitL(buf, separator[0], arr); - if ( arr.Count() >= 5 ) - { - task->iUninstallParams->iUid = DesToUid( arr[0] ); - task->iUninstallParams->iType = (TSConAppType)DesToInt( arr[1] ); - HBufC* vendorBuf = CnvUtfConverter::ConvertToUnicodeFromUtf8L( arr[4] ); - task->iUninstallParams->iVendor.Copy( vendorBuf->Des() ); - delete vendorBuf; - vendorBuf = NULL; - } - CleanupStack::PopAndDestroy( &arr ); - - - } // endif p->data->uid - } - } - } - - if ( aContent->instParams) - { - if ( aContent->instParams->param ) - { - for ( ConML_ParamListPtr_t p = aContent->instParams->param; - p && p->data; p = p->next ) - { - LOGGER_WRITE( "CSConPCConnSession::TaskUnInstallL() : Parameters found " ); - if ( p->data->name ) - { - LOGGER_WRITE( "CSConPCConnSession::TaskUnInstallL() : name param found " ); - TPtrC8 silent(KParamNameSilent); - - TInt comp = Mem::Compare((TUint8*)p->data->name->content, (TInt)p->data->name->length, silent.Ptr(), silent.Length()); - if( comp == 0) - { - // "Silent"-param found - LOGGER_WRITE( "CSConPCConnSession::TaskUnInstallL() : Silent-param found " ); - if ( p->data->value ) - { - TPtrC8 dataValue((TUint8*)p->data->value->content, (TInt)p->data->value->length); - TInt value = DesToInt( dataValue ); - if ( value == 1 ) - { - LOGGER_WRITE( "CSConPCConnSession::TaskUnInstallL() : ESilentInstall " ); - task->iUninstallParams->iMode = ESilentInstall; - } - else if ( value == 0 ) - { - LOGGER_WRITE( "CSConPCConnSession::TaskUnInstallL() : EUnsilentInstall " ); - task->iUninstallParams->iMode = EUnsilentInstall; - } - } - } - } - } - } - } - ret = iPCDHandler->PutTaskL( task ); - CleanupStack::Pop( task ); - LOGGER_WRITE_1( "CSConPCConnSession::TaskUnInstallL() : returned %d", ret ); - return ret; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::SplitL(const TDesC& aText, const TChar aSeparator, -// RArray& aArray) -// Function splits string (eg "name1, name2, name3") into substrings. -// ----------------------------------------------------------------------------- -// -void CSConPCConnSession::SplitL(const TDesC8& aText, const TChar aSeparator, - RArray& aArray) - { - TRACE_FUNC_ENTRY; - TPtrC8 ptr; - ptr.Set(aText); - - for (;;) - { - TInt pos=ptr.Locate(aSeparator); - if (pos==KErrNotFound) - { - aArray.AppendL(ptr); - break; - } - - TPtrC8 subStr=ptr.Left(pos); // get pos characters starting from position 0 - aArray.AppendL(subStr); - - if (!(ptr.Length()>pos+1)) - { - break; - } - - ptr.Set(ptr.Mid(pos+1));// get all characters starting from position pos+1 - } - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::TaskListInstalledAppsL() -// Sends a List installed apps -task to PCCS service -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnSession::TaskListInstalledAppsL( - ConML_ListInstalledAppsPtr_t aContent ) - { - TRACE_FUNC_ENTRY; - TInt ret ( KErrNone ); - TSConMethodName method ( EListInstalledApps ); - CSConTask* task = CSConTask::NewLC( method ); - if( aContent-> drives ) - { - task->iListAppsParams->iDriveList = DriveList( aContent->drives->drive); - } - if ( aContent->all ) - { - task->iListAppsParams->iAllApps = ETrue; - } - ret = iPCDHandler->PutTaskL( task ); - CleanupStack::Pop( task ); - LOGGER_WRITE_1( "CSConPCConnSession::TaskListInstalledAppsL() : returned %d", ret); - return ret; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::TaskListDataOwnersL() -// Sends a List data owners -task to PCCS service -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnSession::TaskListDataOwnersL() - { - TRACE_FUNC_ENTRY; - TInt ret ( KErrNone ); - TSConMethodName method ( EListDataOwners ); - CSConTask* task = CSConTask::NewLC( method ); - ret = iPCDHandler->PutTaskL( task ); - CleanupStack::Pop( task ); - LOGGER_WRITE_1( "CSConPCConnSession::TaskListDataOwnersL() : returned %d", ret ); - return ret; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::TaskSetBURModeL() -// Sends a Set BUR mode -task to PCCS service -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnSession::TaskSetBURModeL(ConML_SetBURModePtr_t aContent ) - { - TRACE_FUNC_ENTRY; - TInt ret ( KErrNone ); - TSConMethodName method ( ESetBURMode ); - CSConTask* task = CSConTask::NewLC( method ); - if ( aContent->drives ) - { - task->iBURModeParams->iDriveList = DriveList( aContent->drives->drive); - } - if ( aContent->partialType ) - { - TInt intValue = DesToInt( aContent->partialType->Data() ); - task->iBURModeParams->iPartialType = static_cast (intValue) ; - } - if ( aContent->incType ) - { - TInt intValue = DesToInt( aContent->incType->Data() ); - task->iBURModeParams->iIncType = static_cast (intValue) ; - } - ret = iPCDHandler->PutTaskL( task ); - CleanupStack::Pop( task ); - LOGGER_WRITE_1( "CSConPCConnSession::TaskSetBURModeL() : returned %d", ret ); - return ret; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::TaskGetDataSizeL() -// Sends a Get data size -task to PCCS service -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnSession::TaskGetDataSizeL(ConML_GetDataSizePtr_t aContent ) - { - TRACE_FUNC_ENTRY; - TInt ret ( KErrNone ); - TSConMethodName method ( EGetDataSize ); - CSConTask* task = CSConTask::NewLC( method ); - if ( aContent->dataOwners ) - { - for ( ConML_SIDListPtr_t p = aContent->dataOwners->sid; - p && p->data; p=p->next ) - { - CSConDataOwner* dataOwner = new (ELeave) CSConDataOwner(); - CleanupStack::PushL( dataOwner ); - if ( p->data->type ) - { - dataOwner->iType = TSConDOType (DesToInt( - p->data->type->Data() )); - } - if (p->data->uid ) - { - if( !IsJavaHash( p->data->uid->Data() ) ) - { - dataOwner->iUid = DesToUid( p->data->uid->Data() ); - } - else - { - TPtr hashPtr = DesToHashLC( p->data->uid->Data() ); - dataOwner->iJavaHash = HBufC::NewL( hashPtr.Size() ); - dataOwner->iJavaHash->Des().Copy( hashPtr ); - CleanupStack::PopAndDestroy(); //DesToHashLC() - } - } - if ( p->data->drives ) - { - dataOwner->iDriveList = DriveList ( p->data->drives->drive ); - } - if ( p->data->transferDataType ) - { - TInt intValue = DesToInt( p->data->transferDataType->Data() ); - dataOwner->iTransDataType = static_cast (intValue); - } - task->iGetDataSizeParams->iDataOwners.AppendL( dataOwner ); - CleanupStack::Pop( dataOwner ); - } - } - ret = iPCDHandler->PutTaskL( task ); - CleanupStack::Pop( task ); - LOGGER_WRITE_1( "CSConPCConnSession::TaskGetDataSizeL() : returned %d", ret ); - return ret; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::TaskRequestDataL() -// Sends a Request data -task to PCCS service -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnSession::TaskRequestDataL(ConML_RequestDataPtr_t aContent ) - { - TRACE_FUNC_ENTRY; - TInt ret ( KErrNone ); - TSConMethodName method ( ERequestData ); - CSConTask* task = CSConTask::NewLC( method ); - if ( aContent ) - { - if ( aContent->sid ) - { - for ( ConML_SIDListPtr_t p=aContent->sid; p && p->data; p=p->next ) - { - if ( p->data->type ) - { - task->iRequestDataParams->iDataOwner->iType = - TSConDOType ( DesToInt ( p->data->type->Data() ) ); - } - if ( p->data->uid ) - { - if( !IsJavaHash( p->data->uid->Data() ) ) - { - task->iRequestDataParams->iDataOwner->iUid = DesToUid( - p->data->uid->Data() ); - } - else - { - TPtr hashPtr = DesToHashLC( p->data->uid->Data() ); - task->iRequestDataParams->iDataOwner->iJavaHash = HBufC::NewL( hashPtr.Size() ); - task->iRequestDataParams->iDataOwner->iJavaHash->Des().Copy( hashPtr ); - CleanupStack::PopAndDestroy(); //DesToHashLC() - } - } - if ( p->data->drives ) - { - task->iRequestDataParams->iDataOwner->iDriveList = - DriveList ( p->data->drives->drive ); - } - if ( p->data->transferDataType ) - { - TInt intValue = DesToInt( p->data->transferDataType->Data() ); - task->iRequestDataParams->iDataOwner->iTransDataType = - static_cast (intValue); - } - } - } - } - ret = iPCDHandler->PutTaskL( task ); - CleanupStack::Pop( task ); - LOGGER_WRITE_1( "CSConPCConnSession::TaskRequestDataL() : returned %d", ret ); - return ret; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::TaskUpdateDeviceInfoL() -// Sends a Update device info -task to PCCS service -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnSession::TaskUpdateDeviceInfoL( - ConML_UpdateDeviceInfoPtr_t aContent ) - { - TRACE_FUNC_ENTRY; - TInt ret ( KErrNone ); - TSConMethodName method ( EUpdateDeviceInfo ); - CSConTask* task = CSConTask::NewLC( method ); - - if ( aContent->deviceInfo) - { - ConML_DeviceInfoPtr_t dPtr = aContent->deviceInfo; - if ( dPtr->version ) - { - task->iDevInfoParams->iVersion.Copy( dPtr->version->Data()); - } - if ( dPtr->maxObjectSize ) - { - task->iDevInfoParams->iMaxObjectSize = DesToInt( - dPtr->maxObjectSize->Data()); - } - if ( dPtr->supportedMethods ) - { - ConML_SupportedMethodsPtr_t smPtr = dPtr->supportedMethods; - if ( smPtr->install ) - { - task->iDevInfoParams->iInstallSupp = ETrue; - } - if ( smPtr->unInstall ) - { - task->iDevInfoParams->iUninstallSupp = ETrue; - } - if ( smPtr->listInstalledApps ) - { - task->iDevInfoParams->iInstAppsSupp = ETrue; - } - if ( smPtr->listDataOwners ) - { - task->iDevInfoParams->iDataOwnersSupp = ETrue; - } - if ( smPtr->setBurMode ) - { - task->iDevInfoParams->iSetBURModeSupp = ETrue; - } - if ( smPtr->getDataSize ) - { - task->iDevInfoParams->iGetSizeSupp = ETrue; - } - if ( smPtr->requestData ) - { - task->iDevInfoParams->iReqDataSupp = ETrue; - } - if ( smPtr->supplyData ) - { - task->iDevInfoParams->iSupplyDataSupp = ETrue; - } - if ( smPtr->reboot ) - { - task->iDevInfoParams->iRebootSupp = ETrue; - } - } - } - ret = iPCDHandler->PutTaskL( task ); - CleanupStack::Pop( task ); - LOGGER_WRITE_1( "CSConPCConnSession::TaskUpdateDeviceInfoL() : returned %d", ret ); - return ret; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::TaskListPublicFilesL() -// Sends a List public files -task to PCCS service -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnSession::TaskListPublicFilesL( - ConML_ListPublicFilesPtr_t aContent ) - { - TRACE_FUNC_ENTRY; - TInt ret ( KErrNone ); - TSConMethodName method ( EListPublicFiles ); - CSConTask* task = CSConTask::NewLC( method ); - if ( aContent->sid ) - { - for ( ConML_SIDListPtr_t p = aContent->sid; p && p->data; p = p->next ) - { - CSConDataOwner* dataOwner = new (ELeave) CSConDataOwner(); - CleanupStack::PushL( dataOwner ); - if ( p->data->type ) - { - dataOwner->iType = TSConDOType ( DesToInt( - p->data->type->Data() ) ); - } - if ( p->data->uid ) - { - if( !IsJavaHash( p->data->uid->Data() ) ) - { - dataOwner->iUid = DesToUid( p->data->uid->Data() ); - } - else - { - TPtr hashPtr = DesToHashLC( p->data->uid->Data() ); - dataOwner->iJavaHash = HBufC::NewL( hashPtr.Size() ); - dataOwner->iJavaHash->Des().Copy( hashPtr ); - CleanupStack::PopAndDestroy(); //DesToHashLC() - } - } - if ( p->data->drives ) - { - dataOwner->iDriveList = DriveList ( p->data->drives->drive ); - } - if ( p->data->packageInfo && p->data->packageInfo->name ) - { - // Unicode conversion from 8-bit to 16-bit - CnvUtfConverter::ConvertToUnicodeFromUtf8( - dataOwner->iPackageName, - p->data->packageInfo->name->Data()); - } - task->iPubFilesParams->iDataOwners.AppendL( dataOwner ); - CleanupStack::Pop( dataOwner ); - } - } - ret = iPCDHandler->PutTaskL( task ); - CleanupStack::Pop( task ); - LOGGER_WRITE_1( "CSConPCConnSession::TaskListPublicFilesL() : returned %d", ret ); - return ret; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::TaskSupplyDataL() -// Sends a Supply data -task to PCCS service -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnSession::TaskSupplyDataL ( ConML_SupplyDataPtr_t aContent ) - { - TRACE_FUNC_ENTRY; - TInt ret ( KErrNone ); - TSConMethodName method ( ESupplyData ); - CSConTask* task = CSConTask::NewLC( method ); - if (aContent ) - { - for ( ConML_SIDListPtr_t p = aContent->sid; p && p->data; p = p->next ) - { - if ( p->data->type ) - { - task->iSupplyDataParams->iDataOwner->iType = - TSConDOType ( DesToInt( p->data->type->Data() ) ); - } - if ( p->data->uid ) - { - if( !IsJavaHash( p->data->uid->Data() ) ) - { - task->iSupplyDataParams->iDataOwner->iUid = DesToUid( - p->data->uid->Data() ); - } - else - { - TPtr hashPtr = DesToHashLC( p->data->uid->Data() ); - task->iSupplyDataParams->iDataOwner->iJavaHash = HBufC::NewL( hashPtr.Size() ); - task->iSupplyDataParams->iDataOwner->iJavaHash->Des().Copy( hashPtr ); - CleanupStack::PopAndDestroy(); //DesToHashLC() - } - } - if ( p->data->drives ) - { - task->iSupplyDataParams->iDataOwner->iDriveList = - DriveList ( p->data->drives->drive ); - } - if ( p->data->transferDataType ) - { - TInt intValue = DesToInt ( p->data->transferDataType->Data() ); - task->iSupplyDataParams->iDataOwner->iTransDataType = - static_cast (intValue); - } - if ( p->data->data ) - { - task->iSupplyDataParams->iRestoreData = HBufC8::NewL( - p->data->data->Data().Size() ); - *task->iSupplyDataParams->iRestoreData = p->data->data->Data(); - } - if ( p->data->moreData ) - { - task->iSupplyDataParams->iMoreData = ETrue; - } - else - { - task->iSupplyDataParams->iMoreData = EFalse; - } - } - } - ret = iPCDHandler->PutTaskL( task ); - CleanupStack::Pop( task ); - LOGGER_WRITE_1( "CSConPCConnSession::TaskSupplyDataL() : returned %d", ret ); - return ret; -} - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::TaskGetDataOwnerStatusL() -// Sends a Get data owner status -task to PCCS service -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnSession::TaskGetDataOwnerStatusL - ( ConML_GetDataOwnerStatusPtr_t aContent ) - { - TRACE_FUNC_ENTRY; - TInt ret ( KErrNone ); - TSConMethodName method ( EGetDataOwnerStatus ); - CSConTask* task = CSConTask::NewLC( method ); - - if ( aContent->dataOwners ) - { - for ( ConML_SIDListPtr_t p = aContent->dataOwners->sid; - p && p->data; p=p->next ) - { - CSConDataOwner* dataOwner = new (ELeave) CSConDataOwner(); - CleanupStack::PushL( dataOwner ); - if ( p->data->type ) - { - dataOwner->iType = TSConDOType (DesToInt( - p->data->type->Data() )); - } - if ( p->data->uid ) - { - if( !IsJavaHash( p->data->uid->Data() ) ) - { - dataOwner->iUid = DesToUid( p->data->uid->Data() ); - } - else - { - TPtr hashPtr = DesToHashLC( p->data->uid->Data() ); - dataOwner->iJavaHash = HBufC::NewL( hashPtr.Size() ); - dataOwner->iJavaHash->Des().Copy( hashPtr ); - CleanupStack::PopAndDestroy(); //DesToHashLC() - } - } - task->iGetDataOwnerParams->iDataOwners.AppendL( dataOwner ); - CleanupStack::Pop( dataOwner ); - } - } - ret = iPCDHandler->PutTaskL( task ); - CleanupStack::Pop( task ); - LOGGER_WRITE_1( "CSConPCConnSession::TaskGetDataOwnerStatusL() : returned %d", ret ); - return ret; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::TaskRebootL() -// Sends a Reboot -task to PCCS service -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnSession::TaskRebootL( ) - { - TRACE_FUNC_ENTRY; - TInt ret ( KErrNone ); - TSConMethodName method ( EReboot ); - CSConTask* task = CSConTask::NewLC( method ); - ret = iPCDHandler->PutTaskL( task ); - CleanupStack::Pop( task ); - LOGGER_WRITE_1( "CSConPCConnSession::TaskRebootL() : returned %d", ret ); - return ret; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::TaskGetMetadataL() -// Sends a GetMetadata -task to PCCS service -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnSession::TaskGetMetadataL( ConML_GetMetadataPtr_t aContent ) - { - TRACE_FUNC_ENTRY; - TInt ret ( KErrNone ); - TSConMethodName method ( EGetMetadata ); - CSConTask* task = CSConTask::NewLC( method ); - if( aContent ) - { - if ( aContent->filename ) - { - // Unicode conversion from 8-bit to 16-bit - CnvUtfConverter::ConvertToUnicodeFromUtf8(task->iGetMetadataParams->iFilename, - aContent->filename->Data()); - } - } - ret = iPCDHandler->PutTaskL( task ); - CleanupStack::Pop( task ); - LOGGER_WRITE_1( "CSConPCConnSession::TaskGetMetadataL() : returned %d", ret ); - return ret; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::TaskRebootL() -// Appends a status element from the reply data of PCCS -// ----------------------------------------------------------------------------- -// -void CSConPCConnSession::AppendStatusL( - ConML_ConMLPtr_t aContent, CSConStatusReply* reply ) - { - TRACE_FUNC_ENTRY; - - if ( !reply ) - { - LOGGER_WRITE( "CSConPCConnSession::AppendStatus() : No data in reply!" ); - return; - } - aContent->status = new ( ELeave ) ConML_Status_t(); - - if ( reply->iTasks.Count() > 0 ) - { - for ( TInt i=0; i < reply->iTasks.Count(); i ++) - { - ConML_TaskListPtr_t task = new ( ELeave ) ConML_TaskList_t(); - CleanupStack::PushL( task ); - GenericListAddL ( &aContent->status->task, task ); - CleanupStack::Pop(); // task - - task->data = new ( ELeave ) ConML_Task_t(); - task->data->id = new ( ELeave ) pcdata_t(); - task->data->id->SetDataL ( IntToDesLC(reply->iTasks[i]->iTaskId) ); - CleanupStack::PopAndDestroy(); // IntToDesLC - TSConMethodName method ( reply->iTasks[i]->iMethod ); - - switch ( method ) - { - case EUpdateDeviceInfo: - task->data->updateDeviceInfo = - new ( ELeave ) ConML_UpdateDeviceInfo_t(); - task->data->updateDeviceInfo->results = - new ( ELeave ) ConML_Results_t(); - AppendUpdateDeviceInfoResultsL( - task->data->updateDeviceInfo->results, - reply->iTasks[i]->iDevInfoParams ); - break; - - case ESetBURMode: - task->data->setBurMode = - new ( ELeave ) ConML_SetBURMode_t(); - task->data->setBurMode->results = - new ( ELeave) ConML_Results_t(); - AppendSetBURModeResultsL( - task->data->setBurMode->results, - reply->iTasks[i]->iBURModeParams ); - break; - - case EListInstalledApps: - task->data->listInstalledApps = - new ( ELeave ) ConML_ListInstalledApps_t(); - task->data->listInstalledApps->results = - new ( ELeave ) ConML_Results_t(); - AppendListInstalledAppsResultsL( - task->data->listInstalledApps->results, - reply->iTasks[i]->iListAppsParams); - break; - - case EInstall: - task->data->install = new ( ELeave ) ConML_Install_t(); - task->data->install->results = - new ( ELeave ) ConML_Results_t(); - AppendInstallResultsL( - task->data->install->results, - reply->iTasks[i]->iInstallParams ); - break; - - case EUninstall: - task->data->unInstall = new ( ELeave ) ConML_UnInstall_t(); - task->data->unInstall->results = - new ( ELeave ) ConML_Results_t(); - AppendUninstallResultsL( - task->data->unInstall->results, - reply->iTasks[i]->iUninstallParams ); - break; - - case EListDataOwners: - task->data->listDataOwners = - new ( ELeave ) ConML_ListDataOwners_t(); - task->data->listDataOwners->results = - new ( ELeave ) ConML_Results_t(); - AppendListDataOwnersResultsL( - task->data->listDataOwners->results, - reply->iTasks[i]->iListDataOwnersParams ); - break; - - case EGetDataOwnerStatus: - task->data->getDataOwnerStatus = - new ( ELeave ) ConML_GetDataOwnerStatus_t(); - task->data->getDataOwnerStatus->results = - new ( ELeave ) ConML_Results_t(); - AppendGetDataOwnerStatusResultsL( - task->data->getDataOwnerStatus->results, - reply->iTasks[i]->iGetDataOwnerParams); - break; - - case EGetDataSize: - task->data->getDataSize = - new ( ELeave ) ConML_GetDataSize_t(); - task->data->getDataSize->results = - new ( ELeave ) ConML_Results_t(); - AppendGetDataSizeResultsL( - task->data->getDataSize->results, - reply->iTasks[i]->iGetDataSizeParams ); - break; - - case EListPublicFiles: - task->data->listPublicFiles = - new ( ELeave ) ConML_ListPublicFiles_t(); - task->data->listPublicFiles->results = - new ( ELeave ) ConML_Results_t(); - AppendListPublicFilesResultsL ( - task->data->listPublicFiles->results, - reply->iTasks[i]->iPubFilesParams ); - break; - - case ERequestData: - task->data->requestData = - new ( ELeave ) ConML_RequestData_t(); - task->data->requestData->results = - new ( ELeave ) ConML_Results_t(); - AppendRequestDataResultsL( - task->data->requestData->results, - reply->iTasks[i]->iRequestDataParams ); - break; - - case ESupplyData: - task->data->supplyData = - new ( ELeave ) ConML_SupplyData_t(); - task->data->supplyData->results = - new ( ELeave ) ConML_Results_t(); - AppendSupplyDataResultsL ( - task->data->supplyData->results, - reply->iTasks[i]->iSupplyDataParams ); - break; - - case EGetMetadata: - task->data->getMetadata = - new ( ELeave ) ConML_GetMetadata_t(); - task->data->getMetadata->results = - new ( ELeave ) ConML_Results_t(); - AppendGetMetadataResultsL ( - task->data->getMetadata->results, - reply->iTasks[i]->iGetMetadataParams ); - break; - - default: - LOGGER_WRITE_1( "CSConPCConnSession:: AppendStatus() : Unknown method %d ", method ); - break; - } - } - } - else - { - LOGGER_WRITE( "CSConPCConnSession::AppendStatus() : No Task " ); - } - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::AppendUpdateDeviceInfoResultsL() -// Appends a update device info -element from the reply data of PCCS -// ----------------------------------------------------------------------------- -// -void CSConPCConnSession::AppendUpdateDeviceInfoResultsL - ( ConML_ResultsPtr_t aContent, CSConUpdateDeviceInfo* aResult ) - { - TRACE_FUNC_ENTRY; - if ( aResult ) - { - if ( aResult->iComplete ) - { - aContent->complete = new ( ELeave ) pcdata_t(); - } - AppendProgressL ( aContent, aResult->iProgress ); - - aContent->deviceInfo = new ( ELeave ) ConML_DeviceInfo_t(); - aContent->deviceInfo->version = new ( ELeave ) pcdata_t(); - aContent->deviceInfo->version->SetDataL ( aResult->iVersion ); - - aContent->deviceInfo->supportedMethods = - new ( ELeave ) ConML_SupportedMethods_t(); - - if ( aResult->iInstallSupp ) - { - aContent->deviceInfo->supportedMethods->install = - new ( ELeave ) pcdata_t(); - } - if ( aResult->iUninstallSupp ) - { - aContent->deviceInfo->supportedMethods->unInstall = - new ( ELeave ) pcdata_t(); - } - if ( aResult->iInstAppsSupp ) - { - aContent->deviceInfo->supportedMethods->listInstalledApps = - new ( ELeave ) pcdata_t(); - } - if ( aResult->iDataOwnersSupp ) - { - aContent->deviceInfo->supportedMethods->listDataOwners = - new ( ELeave ) pcdata_t(); - } - if ( aResult->iSetBURModeSupp ) - { - aContent->deviceInfo->supportedMethods->setBurMode = - new ( ELeave ) pcdata_t(); - } - if ( aResult->iGetSizeSupp ) - { - aContent->deviceInfo->supportedMethods->getDataSize = - new ( ELeave ) pcdata_t(); - } - if ( aResult->iReqDataSupp ) - { - aContent->deviceInfo->supportedMethods->requestData = - new (ELeave ) pcdata_t(); - } - if ( aResult->iSupplyDataSupp ) - { - aContent->deviceInfo->supportedMethods->supplyData = - new ( ELeave ) pcdata_t(); - } - if ( aResult->iRebootSupp ) - { - aContent->deviceInfo->supportedMethods->reboot = - new ( ELeave ) pcdata_t(); - } - aContent->deviceInfo->maxObjectSize = new ( ELeave ) pcdata_t(); - aContent->deviceInfo->maxObjectSize->SetDataL ( IntToDesLC( - aResult->iMaxObjectSize )); - CleanupStack::PopAndDestroy(); // IntToDesLC - } - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::AppendSetBURModeResultsL() -// Appends a Set BUR mode -element from the reply data of PCCS -// ----------------------------------------------------------------------------- -// -void CSConPCConnSession::AppendSetBURModeResultsL ( - ConML_ResultsPtr_t aContent, CSConSetBURMode* aResult ) - { - TRACE_FUNC_ENTRY; - if ( aResult ) - { - if ( aResult->iComplete ) - { - aContent->complete = new ( ELeave ) pcdata_t(); - } - AppendProgressL ( aContent, aResult->iProgress ); - } - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::AppendListInstalledAppsResultsL() -// Appends a List installed apps -element from the reply data of PCCS -// ----------------------------------------------------------------------------- -// -void CSConPCConnSession::AppendListInstalledAppsResultsL ( - ConML_ResultsPtr_t aContent, CSConListInstApps* aResult ) - { - TRACE_FUNC_ENTRY; - - if ( aResult ) - { - if ( aResult->iComplete ) - { - aContent->complete = new ( ELeave ) pcdata_t(); - } - AppendProgressL ( aContent, aResult->iProgress ); - - if ( aResult->iApps.Count() > 0 ) - { - // 6 * KMaxFileName should be enought - // ( 5 items of TFileName and uid + type + size + 7* "#" ) - HBufC8* buf = HBufC8::NewLC( 6 * KMaxFileName ); - TPtr8 ptrBuf = buf->Des(); - - aContent->applications = new ( ELeave ) ConML_Applications_t(); - for ( TInt i=0; iiApps.Count(); i++) - { - ConML_ApplicationListPtr_t app = - new ( ELeave )ConML_ApplicationList_t(); - CleanupStack::PushL ( app ); - GenericListAddL ( &aContent->applications->application, app ); - CleanupStack::Pop(); // app - - app->data = new ( ELeave ) ConML_Application_t(); - app->data->name = new ( ELeave ) pcdata_t(); - app->data->name->SetDataL( BufToDesLC( - aResult->iApps[i]->iName)); - CleanupStack::PopAndDestroy(); // BufToDesLC - - // create uid: UID # Type # Size # Version # Vendor # Parent app. name # WidgetBundleId # - LOGGER_WRITE( "CSConPCConnSession::AppendListInstalledAppsResultsL() : Create Uid" ); - - ptrBuf.Copy( UidToDesLC( aResult->iApps[i]->iUid ) ); - CleanupStack::PopAndDestroy(); // UidToDesLC - - ptrBuf.Append( KSConAppInfoSeparator ); - - ptrBuf.Append( IntToDesLC(aResult->iApps[i]->iType )); - CleanupStack::PopAndDestroy(); // IntToDesLC - - ptrBuf.Append( KSConAppInfoSeparator ); - - ptrBuf.Append( IntToDesLC(aResult->iApps[i]->iSize ) ); - CleanupStack::PopAndDestroy(); // IntToDesLC - - ptrBuf.Append( KSConAppInfoSeparator ); - ptrBuf.Append( aResult->iApps[i]->iVersion ); - - ptrBuf.Append( KSConAppInfoSeparator ); - ptrBuf.Append( BufToDesLC( aResult->iApps[i]->iVendor ) ); - CleanupStack::PopAndDestroy(); // BufToDesLC - - ptrBuf.Append( KSConAppInfoSeparator ); - ptrBuf.Append( BufToDesLC( aResult->iApps[i]->iParentName ) ); - CleanupStack::PopAndDestroy(); // BufToDesLC - - ptrBuf.Append( KSConAppInfoSeparator ); - if (aResult->iApps[i]->iWidgetBundleId) - { - ptrBuf.Append( BufToDesLC( *aResult->iApps[i]->iWidgetBundleId ) ); - CleanupStack::PopAndDestroy(); // BufToDesLC - } - - ptrBuf.Append( KSConAppInfoSeparator ); - - LOGGER_WRITE( "CSConPCConnSession::AppendListInstalledAppsResultsL() : set data" ); - app->data->uid = new ( ELeave ) pcdata_t(); - app->data->uid->SetDataL( *buf ); - - LOGGER_WRITE( "CSConPCConnSession::AppendListInstalledAppsResultsL() : Info added" ); - } - CleanupStack::PopAndDestroy(buf); - } - } - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::AppendListPublicFilesResultsL() -// Appends a List public files -element from the reply data of PCCS -// ----------------------------------------------------------------------------- -// -void CSConPCConnSession::AppendListPublicFilesResultsL ( - ConML_ResultsPtr_t aContent, CSConListPublicFiles* aResult ) - { - TRACE_FUNC_ENTRY; - if ( aResult ) - { - if ( aResult->iComplete ) - { - aContent->complete = new ( ELeave ) pcdata_t(); - } - AppendProgressL ( aContent, aResult->iProgress ); - - if ( aResult->iFiles.Count() > 0 ) - { - aContent->files = new ( ELeave ) ConML_Files_t(); - for ( TInt i=0;iiFiles.Count(); i++ ) - { - ConML_FileListPtr_t file = new ( ELeave ) ConML_FileList_t(); - CleanupStack::PushL( file ); - GenericListAddL ( &aContent->files->file, file ); - CleanupStack::Pop(); // file - - file->data = new ( ELeave ) ConML_File_t(); - file->data->name = new ( ELeave ) pcdata_t(); - file->data->name->SetDataL( BufToDesLC ( - aResult->iFiles[i]->iPath ) ); - CleanupStack::PopAndDestroy(); // BufToDesLC - - file->data->modified = new ( ELeave ) pcdata_t(); - file->data->modified->SetDataL( BufToDesLC ( - aResult->iFiles[i]->iModified ) ); - CleanupStack::PopAndDestroy(); // BufToDesLC - - file->data->size = new ( ELeave ) pcdata_t(); - file->data->size->SetDataL( IntToDesLC ( - aResult->iFiles[i]->iSize ) ); - CleanupStack::PopAndDestroy(); // IntToDesLC - - file->data->userPerm = new ( ELeave ) pcdata_t(); - switch ( aResult->iFiles[i]->iUserPerm ) - { - case EPermReadOnly: - file->data->userPerm->SetDataL ( KSConPermReadOnly ); - break; - - case EPermNormal: - file->data->userPerm->SetDataL ( KSConPermNormal ); - break; - - default: - LOGGER_WRITE( "CSConPCConnSession:: AppendListPublicFilesResultsL() : Unknown userPerm! " ); - break; - } - } - } - } - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::AppendRequestDataResultsL() -// Appends a Request data -element from the reply data of PCCS -// ----------------------------------------------------------------------------- -// -void CSConPCConnSession::AppendRequestDataResultsL( - ConML_ResultsPtr_t aContent, CSConRequestData* aResult ) - { - TRACE_FUNC_ENTRY; - if ( aResult ) - { - if ( aResult->iComplete ) - { - aContent->complete = new ( ELeave ) pcdata_t(); - } - AppendProgressL ( aContent, aResult->iProgress ); - - if ( aResult->iMoreData ) - { - aContent->moreData = new ( ELeave ) pcdata_t(); - } - if ( aResult->iBackupData ) - { - aContent->data = new ( ELeave ) pcdata_t(); - aContent->data->SetDataL( aResult->iBackupData->Des() ); - } - } - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::AppendSupplyDataResultsL() -// Appends a Supply data -element from the reply data of PCCS -// ----------------------------------------------------------------------------- -// -void CSConPCConnSession::AppendSupplyDataResultsL( - ConML_ResultsPtr_t aContent, CSConSupplyData* aResult ) - { - TRACE_FUNC_ENTRY; - if ( aResult ) - { - if ( aResult->iComplete ) - { - aContent->complete = new ( ELeave ) pcdata_t(); - } - AppendProgressL( aContent, aResult->iProgress ); - } - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::AppendInstallResultsL() -// Appends an Install -element from the reply data of PCCS -// ----------------------------------------------------------------------------- -// -void CSConPCConnSession::AppendInstallResultsL( - ConML_ResultsPtr_t aContent, CSConInstall* aResult ) - { - TRACE_FUNC_ENTRY; - if ( aResult ) - { - if ( aResult->iComplete ) - { - aContent->complete = new ( ELeave ) pcdata_t(); - } - AppendProgressL( aContent, aResult->iProgress ); - } - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::AppendUninstallResultsL() -// Appends an Uninstall -element from the reply data of PCCS -// ----------------------------------------------------------------------------- -// -void CSConPCConnSession::AppendUninstallResultsL( - ConML_ResultsPtr_t aContent, CSConUninstall* aResult ) - { - TRACE_FUNC_ENTRY; - if ( aResult ) - { - if ( aResult->iComplete ) - { - LOGGER_WRITE( "CSConPCConnSession::AppendUninstallResultsL() Complete" ); - aContent->complete = new ( ELeave ) pcdata_t(); - } - LOGGER_WRITE_1( "CSConPCConnSession::AppendUninstallResultsL() iProgress: %d", aResult->iProgress ); - AppendProgressL( aContent, aResult->iProgress ); - } - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::AppendListDataOwnersResultsL() -// Appends a List data owners -element from the reply data of PCCS -// ----------------------------------------------------------------------------- -// -void CSConPCConnSession::AppendListDataOwnersResultsL ( - ConML_ResultsPtr_t aContent, CSConListDataOwners* aResult ) - { - TRACE_FUNC_ENTRY; - if ( aResult ) - { - if ( aResult->iComplete ) - { - aContent->complete = new ( ELeave ) pcdata_t(); - } - AppendProgressL( aContent, aResult->iProgress ); - - if ( aResult->iDataOwners.Count() > 0 ) - { - aContent->dataOwners = new ( ELeave ) ConML_DataOwners_t(); - for ( TInt i=0; i < aResult->iDataOwners.Count(); i ++) - { - ConML_SIDListPtr_t sid = new ( ELeave ) ConML_SIDList_t(); - CleanupStack::PushL( sid ); - GenericListAddL ( &aContent->dataOwners->sid, sid ); - CleanupStack::Pop(); - - sid->data = new ( ELeave ) ConML_SID_t(); - - sid->data->type = new ( ELeave ) pcdata_t(); - sid->data->type->SetDataL ( IntToDesLC ( - aResult->iDataOwners[i]->iType) ); - CleanupStack::PopAndDestroy(); // IntToDesLC - - sid->data->uid = new ( ELeave ) pcdata_t(); - - if( aResult->iDataOwners[i]->iUid.iUid ) - { - sid->data->uid->SetDataL ( UidToDesLC ( - aResult->iDataOwners[i]->iUid ) ); - CleanupStack::PopAndDestroy(); // UidToDesLC - } - - if( aResult->iDataOwners[i]->iJavaHash ) - { - sid->data->uid->SetDataL ( HashToDesLC ( - aResult->iDataOwners[i]->iJavaHash->Des() ) ); - CleanupStack::PopAndDestroy(); // HashToDesLC - } - - if ( HasDrives ( aResult->iDataOwners[i]->iDriveList ) ) - { - sid->data->drives = new ( ELeave ) ConML_Drives_t(); - AppendDrivesL ( sid->data->drives, - aResult->iDataOwners[i]->iDriveList ); - } - - if ( aResult->iDataOwners[i]->iPackageName.Length() > 0 ) - { - sid->data->packageInfo = - new ( ELeave ) ConML_PackageInfo_t(); - sid->data->packageInfo->name = new ( ELeave ) pcdata_t(); - sid->data->packageInfo->name->SetDataL ( BufToDesLC ( - aResult->iDataOwners[i]->iPackageName ) ); - - CleanupStack::PopAndDestroy(); // BufToDesLC - } - - if ( aResult->iDataOwners[i]->iHasFiles || - aResult->iDataOwners[i]->iSupportsInc || - aResult->iDataOwners[i]->iDelayToPrep || - aResult->iDataOwners[i]->iReqReboot ) - { - sid->data->burOptions = new ( ELeave ) ConML_BUROptions_t(); - if ( aResult->iDataOwners[i]->iHasFiles ) - { - sid->data->burOptions->hasFiles = - new ( ELeave ) pcdata_t(); - sid->data->burOptions->hasFiles->SetDataL( IntToDesLC( - aResult->iDataOwners[i]->iHasFiles )); - - CleanupStack::PopAndDestroy(); // IntToDesLC - } - if ( aResult->iDataOwners[i]->iSupportsInc ) - { - sid->data->burOptions->supportsInc = - new ( ELeave ) pcdata_t(); - } - if ( aResult->iDataOwners[i]->iDelayToPrep ) - { - sid->data->burOptions->delayToPrepareData = - new ( ELeave ) pcdata_t(); - } - if ( aResult->iDataOwners[i]->iReqReboot ) - { - sid->data->burOptions->requiresReboot = - new ( ELeave ) pcdata_t(); - } - } - } - } - } - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::AppendGetDataOwnerStatusResultsL() -// Appends a Get data owner status -element from the reply data of PCCS -// ----------------------------------------------------------------------------- -// -void CSConPCConnSession::AppendGetDataOwnerStatusResultsL - ( ConML_ResultsPtr_t aContent, CSConGetDataOwnerStatus* aResult ) - { - TRACE_FUNC_ENTRY; - if ( aResult ) - { - if ( aResult->iComplete ) - { - aContent->complete = new ( ELeave ) pcdata_t(); - } - AppendProgressL( aContent, aResult->iProgress ); - - if ( aResult->iDataOwners.Count() > 0 ) - { - aContent->dataOwners = new ( ELeave ) ConML_DataOwners_t(); - for ( TInt i=0; i < aResult->iDataOwners.Count(); i ++) - { - ConML_SIDListPtr_t sid = new ( ELeave ) ConML_SIDList_t(); - CleanupStack::PushL( sid ); - GenericListAddL ( &aContent->dataOwners->sid, sid ); - CleanupStack::Pop(); - - sid->data = new ( ELeave ) ConML_SID_t(); - - sid->data->type = new ( ELeave ) pcdata_t(); - sid->data->type->SetDataL ( IntToDesLC ( - aResult->iDataOwners[i]->iType) ); - CleanupStack::PopAndDestroy(); // IntToDesLC - - sid->data->uid = new ( ELeave ) pcdata_t(); - sid->data->uid->SetDataL ( UidToDesLC ( - aResult->iDataOwners[i]->iUid ) ); - CleanupStack::PopAndDestroy(); // UidToDesLC - - sid->data->dataOwnerStatus = new ( ELeave ) pcdata_t(); - sid->data->dataOwnerStatus->SetDataL ( IntToDesLC( - aResult->iDataOwners[i]->iDataOwnStatus )); - - CleanupStack::PopAndDestroy(); // IntToDesLC - } - } - } - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::AppendGetDataSizeResultsL() -// Appends a Get data owner size -element from the reply data of PCCS -// ----------------------------------------------------------------------------- -// -void CSConPCConnSession::AppendGetDataSizeResultsL ( - ConML_ResultsPtr_t aContent, CSConGetDataSize* aResult ) - { - TRACE_FUNC_ENTRY; - if ( aResult ) - { - if ( aResult->iComplete ) - { - aContent->complete = new ( ELeave ) pcdata_t(); - } - AppendProgressL( aContent, aResult->iProgress ); - - if ( aResult->iDataOwners.Count() > 0 ) - { - aContent->dataOwners = new ( ELeave ) ConML_DataOwners_t(); - - for ( TInt i=0; i< aResult->iDataOwners.Count(); i++ ) - { - ConML_SIDListPtr_t sid = new ( ELeave ) ConML_SIDList_t(); - CleanupStack::PushL( sid ); - GenericListAddL ( &aContent->dataOwners->sid, sid ); - CleanupStack::Pop(); - - sid->data = new ( ELeave ) ConML_SID_t(); - - sid->data->type = new ( ELeave ) pcdata_t(); - sid->data->type->SetDataL ( IntToDesLC ( - aResult->iDataOwners[i]->iType) ); - CleanupStack::PopAndDestroy(); // IntToDesLC - - sid->data->uid = new ( ELeave ) pcdata_t(); - - if( aResult->iDataOwners[i]->iUid.iUid ) - { - sid->data->uid->SetDataL ( UidToDesLC ( - aResult->iDataOwners[i]->iUid ) ); - CleanupStack::PopAndDestroy(); // UidToDesLC - } - - if( aResult->iDataOwners[i]->iJavaHash ) - { - sid->data->uid->SetDataL ( HashToDesLC ( - aResult->iDataOwners[i]->iJavaHash->Des() ) ); - CleanupStack::PopAndDestroy(); // HashToDesLC - } - - if ( HasDrives ( aResult->iDataOwners[i]->iDriveList ) ) - { - sid->data->drives = new ( ELeave ) ConML_Drives_t(); - AppendDrivesL ( sid->data->drives, - aResult->iDataOwners[i]->iDriveList ); - } - - sid->data->size = new ( ELeave ) pcdata_t(); - sid->data->size->SetDataL( IntToDesLC( - aResult->iDataOwners[i]->iSize ) ); - CleanupStack::PopAndDestroy(); // IntToDesLC - - sid->data->transferDataType = new ( ELeave ) pcdata_t(); - sid->data->transferDataType->SetDataL( IntToDesLC( - aResult->iDataOwners[i]->iTransDataType ) ); - - CleanupStack::PopAndDestroy(); // IntToDesLC - } - } - } - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::AppendGetMetadataResultsL() -// Appends a GetMetadata -element from the reply data of PCCS -// ----------------------------------------------------------------------------- -// -void CSConPCConnSession::AppendGetMetadataResultsL( - ConML_ResultsPtr_t aContent, CSConGetMetadata* aResult ) - { - TRACE_FUNC_ENTRY; - - if ( aResult ) - { - if ( aResult->iComplete ) - { - aContent->complete = new ( ELeave ) pcdata_t(); - - // add filename only if task is completed - aContent->filename = new ( ELeave ) pcdata_t(); - aContent->filename->SetDataL( BufToDesLC(aResult->iFilename ) ); - CleanupStack::PopAndDestroy(); // BufToDesLC - } - AppendProgressL( aContent, aResult->iProgress ); - - if ( aResult->iData ) - { - aContent->data = new ( ELeave ) pcdata_t(); - aContent->data->SetDataL( aResult->iData->Des() ); - } - - if ( aResult->iMoreData ) - { - aContent->moreData = new ( ELeave ) pcdata_t(); - } - } - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::AppendProgressL() -// Appends a Progress -element from the reply data of PCCS -// ----------------------------------------------------------------------------- -// -void CSConPCConnSession::AppendProgressL ( - ConML_ResultsPtr_t aContent, TInt progress ) - { - TRACE_FUNC_ENTRY; - aContent->progress = new ( ELeave ) ConML_Progress_t(); - aContent->progress->value = new ( ELeave ) pcdata_t(); - aContent->progress->value->SetDataL ( IntToDesLC ( progress )); - CleanupStack::PopAndDestroy(); // IntToDesLC - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::AppendDrivesL() -// Appends a Drives -element from the reply data of PCCS -// ----------------------------------------------------------------------------- -// -void CSConPCConnSession::AppendDrivesL( - ConML_DrivesPtr_t aContent, TDriveList aDrives ) - { - TRACE_FUNC_ENTRY; - - for ( TInt i = 0; idrive, drive ); - CleanupStack::Pop(); // drive - - drive->data = new ( ELeave ) ConML_Drive_t(); - drive->data->name = new ( ELeave ) pcdata_t(); - drive->data->name->SetDataL( DriveNumToDesLC(i+KSConFirstDrive )); - CleanupStack::PopAndDestroy(); // IntToDesLC - } - } - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::DriveList() -// Converts an Drives -element to TDriveList -// ----------------------------------------------------------------------------- -// -TDriveList CSConPCConnSession::DriveList( ConML_DriveListPtr_t aContent ) - { - TBuf8 driveBuf; - TDriveList driveList; - - for ( ConML_DriveListPtr_t p = aContent; p && p->data; p = p->next ) - { - if ( p->data->name ) - { - driveBuf.Append( p->data->name->Data() ); - } - } - - for ( TInt i = 0; iDes(); - ptrBuf.Num(anInt); - return *buf; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::DriveNumToDesLC() -// Convers a drive number to equivalent drive letter -// ----------------------------------------------------------------------------- -// -TDesC8& CSConPCConnSession::DriveNumToDesLC( const TInt& anInt ) - { - TChar mark ( anInt ); - HBufC8* buf = HBufC8::NewLC(1); - TPtr8 ptrBuf = buf->Des(); - ptrBuf.Append(mark); - return *buf; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::BufToDesLC() -// converts a buffer to descriptor -// ----------------------------------------------------------------------------- -// -TDesC8& CSConPCConnSession::BufToDesLC( const TDesC& aBuf) - { - HBufC8* buf = CnvUtfConverter::ConvertFromUnicodeToUtf8L( aBuf ); - CleanupStack::PushL( buf ); - return *buf; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::UidToDesLC() -// converts an UID to a descriptor -// ----------------------------------------------------------------------------- -// -TDesC8& CSConPCConnSession::UidToDesLC( const TUid& aUid ) - { - HBufC8* buf = HBufC8::NewLC(10); - TPtr8 ptrBuf = buf->Des(); - ptrBuf.Copy (aUid.Name().Mid(1, 8) ); - return *buf; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::DesToUid() -// converts a descriptor to a UID value -// ----------------------------------------------------------------------------- -// -TUid CSConPCConnSession::DesToUid ( const TDesC8& aDes ) - { - TLex8 lex( aDes ); - TUint32 value; - lex.Val( value, EHex ); - TUid uid = TUid::Uid( value ); - return uid; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::DesToInt() -// converts a descriptor to a integer value -// ----------------------------------------------------------------------------- -// -TInt CSConPCConnSession::DesToInt( const TDesC8& aDes) - { - TLex8 lex(aDes); - TInt value = 0; - lex.Val(value); - return value; - } - -// ----------------------------------------------------------------------------- -// CSConPCConnSession::HasDrives() -// Returns ETrue if at least one drive is found from the given TDriveList -// ----------------------------------------------------------------------------- -// -TBool CSConPCConnSession::HasDrives( TDriveList& aDrive ) - { - TBool hasDrives ( EFalse ); - for ( TInt i = 0; iDes(); - // Unicode conversion from 16-bit to 8-bit - CnvUtfConverter::ConvertFromUnicodeToUtf8(ptrBuf, aBuf); - //Add JAVA_ identifier to the begining of the hash - ptrBuf.Insert(0, KSConJavaHashId); - return *buf; - } -// ----------------------------------------------------------------------------- -// CSConPCConnSession::DesToHashLC() -// converts descriptor to Java hash -// ----------------------------------------------------------------------------- -// -TPtr CSConPCConnSession::DesToHashLC( const TDesC8& aDes ) - { - HBufC* buf = HBufC::NewLC(aDes.Size()); - TPtr ptrBuf = buf->Des(); - // Unicode conversion from 8-bit to 16-bit - CnvUtfConverter::ConvertToUnicodeFromUtf8(ptrBuf, aDes); - //Delete JAVA_ - ptrBuf.Delete(0, KSConJavaHashId().Length()); - return ptrBuf; - } -// ----------------------------------------------------------------------------- -// CSConPCConnSession::IsJavaHash() -// Returns ETrue if descriptor is Java hash, else EFalse -// ----------------------------------------------------------------------------- -// -TBool CSConPCConnSession::IsJavaHash( const TDesC8& aDes ) - { - if ( aDes.FindC(KSConJavaHashId) == 0 ) - { - return ETrue; - } - else - { - return EFalse; - } - } - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/servers/syncserver/group/bld.inf --- a/connectivitymodules/SeCon/servers/syncserver/group/bld.inf Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -/* -* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* 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: Build information file for project SyncServer -* -*/ - - -PRJ_EXPORTS -../rom/sconsyncserver.iby CORE_APP_LAYER_IBY_EXPORT_PATH(sconsyncserver.iby) - -PRJ_PLATFORMS -DEFAULT - -PRJ_MMPFILES -sconsyncserver.mmp - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/servers/syncserver/group/sconsyncserver.mmp --- a/connectivitymodules/SeCon/servers/syncserver/group/sconsyncserver.mmp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: sconsyncserver mmp file -* -*/ - - -#include -#include - - -TARGET sconsyncserver.exe -TARGETTYPE exe - -// Same capabilities than in DS Ui application -CAPABILITY LocalServices ReadUserData WriteUserData ReadDeviceData WriteDeviceData NetworkServices UserEnvironment ProtServ SwEvent NetworkControl Location - -UID 0x0 0x2001A964 -VENDORID VID_DEFAULT - -EPOCSTACKSIZE 0x2000 -EPOCHEAPSIZE 0x500 0x800000 // minimum and maximum heap sizes - -SOURCEPATH ../src -SOURCE sconsyncserver.cpp -SOURCE sconsyncsession.cpp -SOURCE sconsyncrelationship.cpp -SOURCE sconasynchandler.cpp -SOURCE cscontimeout.cpp - -// common components (dataproviderinfo) -SOURCEPATH ../../../clients/syncclient/src -USERINCLUDE ../../../clients/syncclient/inc -SOURCE scondataproviderinfo.cpp - -USERINCLUDE ..\inc - -// Default system include paths for middleware layer modules. -MW_LAYER_SYSTEMINCLUDE - -DEBUGLIBRARY flogger.lib -LIBRARY euser.lib -LIBRARY efsrv.lib -LIBRARY bafl.lib -LIBRARY ecom.lib -LIBRARY estor.lib // CDictionaryFileStore -LIBRARY smldataprovider.lib -LIBRARY nsmlchangefinder.lib -LIBRARY smlstoreformat.lib -LIBRARY charconv.lib diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/servers/syncserver/inc/cscontimeout.h --- a/connectivitymodules/SeCon/servers/syncserver/inc/cscontimeout.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,79 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: CCSconTimeOut header file -* -*/ - - -#ifndef CSCONTIMEOUT_H -#define CSCONTIMEOUT_H - -#include // For CActive, link against: euser.lib -#include // For RTimer, link against: euser.lib - -class MTimeOutObserver - { -public: - virtual void TimeOut() = 0; - }; - -class CCSconTimeOut : public CActive - { -public: - // Cancel and destroy - ~CCSconTimeOut(); - - // Two-phased constructor. - static CCSconTimeOut* NewL( MTimeOutObserver& aTimeOutObserver ); - -public: - // New functions - // Function for making the timeout request - void Start(TTimeIntervalMicroSeconds32 aDelay); - -private: - // C++ constructor - CCSconTimeOut( MTimeOutObserver& aTimeOutObserver ); - - // Second-phase constructor - void ConstructL(); - -private: - // From CActive - // Handle completion - void RunL(); - - // How to cancel me - void DoCancel(); - - // Override to handle leaves from RunL(). Default implementation causes - // the active scheduler to panic. - TInt RunError(TInt aError); - -private: - enum TCSconTimeOutState - { - EUninitialized, // Uninitialized - EInitialized, // Initalized - EError - // Error condition - }; - -private: - TInt iState; // State of the active object - RTimer iTimer; // Provides async timing service - MTimeOutObserver& iTimeOutObserver; - }; - -#endif // CSCONTIMEOUT_H diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/servers/syncserver/inc/debug.h --- a/connectivitymodules/SeCon/servers/syncserver/inc/debug.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,130 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Debug utility for SyncServer -* -*/ - - -#ifndef _SECON_DEBUG_H -#define _SECON_DEBUG_H - -#ifdef _DEBUG - - // File logging - #define __FLOGGING__ - - #include - #ifdef __FLOGGING__ - #include - #include - #endif - - NONSHARABLE_CLASS(TOverflowTruncate16) : public TDes16Overflow - { - public: - void Overflow(TDes16& /*aDes*/) {} - }; - - NONSHARABLE_CLASS(TOverflowTruncate8) : public TDes8Overflow - { - public: - void Overflow(TDes8& /*aDes*/) {} - }; - - _LIT( KLogDir, "SECON" ); - _LIT( KLogFile, "SeconDebug.txt" ); - - _LIT(KTracePrefix16, "[SeConSync] "); - _LIT8(KTracePrefix8, "[SeConSync] "); - _LIT8(KFuncEntryFormat8, "%S : Begin"); - _LIT8(KFuncExitFormat8, "%S : End"); - _LIT8(KFuncFormat8, "><%S"); - - const TInt KMaxLogLineLength = 512; - - // old function loggin macros - #define FLOG(a) {FPrint(a);} - #define FLOG_1(a,b) {FPrint(a,b);} - #define FLOG_2(a,b,c) {FPrint(a,b,c);} - #define FTRACE(a) {a;} - #define LOGGER_ENTERFN( name ) {TRACE_FUNC_ENTRY;} - #define LOGGER_LEAVEFN( name ) {TRACE_FUNC_EXIT;} - - #define LOGGER_WRITE( text ) {_LIT( KTemp, text ); FPrint( KTemp );} - #define LOGGER_WRITE_1( text,par1 ) {_LIT( KTemp, text ); FPrint( KTemp, par1 );} - #define LOGGER_WRITE8_1( text,par1 ) {_LIT8( KTemp, text ); FPrint( KTemp, par1 );} - #define LOGGER_WRITE_2( text,par1,par2 ) {_LIT( KTemp, text ); FPrint( KTemp, par1, par2 );} - #define LOGGER_WRITE_3( text,par1,par2,par3 ) {_LIT( KTemp, text ); FPrint( KTemp, par1, par2, par3 );} - - // New function logging macros - #define TRACE_FUNC_ENTRY {TPtrC8 ptr8((TUint8*)__PRETTY_FUNCTION__); FPrint(KFuncEntryFormat8, &ptr8);} - #define TRACE_FUNC_EXIT {TPtrC8 ptr8((TUint8*)__PRETTY_FUNCTION__); FPrint(KFuncExitFormat8, &ptr8);} - #define TRACE_FUNC {TPtrC8 ptr8((TUint8*)__PRETTY_FUNCTION__); FPrint(KFuncFormat8, &ptr8);} - - // Declare the FPrint function - inline void FPrint( TRefByValue aFmt, ...) - { - VA_LIST list; - VA_START(list,aFmt); - #ifdef __FLOGGING__ - RFileLogger::WriteFormat( KLogDir, KLogFile, EFileLoggingModeAppend, aFmt, list ); - #endif - TBuf16 theFinalString; - theFinalString.Append(KTracePrefix16); - TOverflowTruncate16 overflow; - theFinalString.AppendFormatList(aFmt,list,&overflow); - RDebug::Print(theFinalString); - } - - // Declare the FPrint function - inline void FPrint(TRefByValue aFmt, ...) - { - VA_LIST list; - VA_START(list, aFmt); - #ifdef __FLOGGING__ - RFileLogger::WriteFormat(KLogDir, KLogFile, EFileLoggingModeAppend, aFmt, list); - #endif - TOverflowTruncate8 overflow; - TBuf8 buf8; - buf8.Append(KTracePrefix8); - buf8.AppendFormatList(aFmt, list, &overflow); - TBuf16 buf16(buf8.Length()); - buf16.Copy(buf8); - TRefByValue tmpFmt(_L("%S")); - RDebug::Print(tmpFmt, &buf16); - } -#else - - // No loggings --> reduced code size - #define FLOG(a) - #define FLOG_1(a,b) - #define FLOG_2(a,b,c) - #define FTRACE(a) - #define LOGGER_ENTERFN( name ) - #define LOGGER_LEAVEFN( name ) - #define LOGGER_WRITE( text ) - #define LOGGER_WRITE_1( text, par1 ) - #define LOGGER_WRITE8_1( text, par1 ) - #define LOGGER_WRITE_2( text, par1, par2 ) - #define LOGGER_WRITE_3( text, par1, par2, par3 ) - #define TRACE_FUNC_ENTRY - #define TRACE_FUNC_EXIT - #define TRACE_FUNC - -#endif //_DEBUG - -#endif // SECON_DEBUG_H - -// End of file - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/servers/syncserver/inc/logdatastoreformat.h --- a/connectivitymodules/SeCon/servers/syncserver/inc/logdatastoreformat.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,98 +0,0 @@ -/* -* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Simple class for tracing datastore format -* -*/ - -#ifndef LOGDATASTOREFORMAT_H_ -#define LOGDATASTOREFORMAT_H_ - -// -#include "debug.h" - -NONSHARABLE_CLASS(TLogDataStoreFormat) - { - public: -#ifndef _DEBUG -// does nothing on release version -static void TLogDataStoreFormat::LogDataStoreFormatL( const TDesC& /*aLogInfo*/, const CSmlDataStoreFormat& /*aDataStoreFormat*/ ) - { - } -#else -static void TLogDataStoreFormat::LogDataStoreFormatL( const TDesC& aLogInfo, const CSmlDataStoreFormat& aDataStoreFormat ) - { - LOGGER_WRITE_1("LogDataStoreFormatL, aLogInfo: %S", &aLogInfo); - LOGGER_WRITE_1("DisplayName: %S", &aDataStoreFormat.DisplayName()); - TBool hasMaxSize = aDataStoreFormat.IsSupported( CSmlDataStoreFormat::EOptionHasMaxSize ); - TBool hasMaxItems = aDataStoreFormat.IsSupported( CSmlDataStoreFormat::EOptionHasMaxItems ); - TBool hierarcial = aDataStoreFormat.IsSupported( CSmlDataStoreFormat::EOptionHierarchial ); - LOGGER_WRITE_1("hasMaxSize: %d", (TInt)hasMaxSize); - LOGGER_WRITE_1("hasMaxItems: %d", (TInt)hasMaxItems); - LOGGER_WRITE_1("hierarcial: %d", (TInt)hierarcial); - LOGGER_WRITE_1("MimeFormatCount: %d", aDataStoreFormat.MimeFormatCount()); - for ( TInt i = 0; i < aDataStoreFormat.MimeFormatCount(); i++) - { - LOGGER_WRITE_1(" MimeFormat(%d)",i); - const CSmlMimeFormat& mimeformat = aDataStoreFormat.MimeFormat(i); - LOGGER_WRITE8_1(" MimeType: %S", &mimeformat.MimeType().DesC()); - LOGGER_WRITE8_1(" MimeVersion: %S", &mimeformat.MimeVersion().DesC()); - LOGGER_WRITE_1( " FieldLevel, bool: %d", (TInt) mimeformat.FieldLevel()); - LOGGER_WRITE_1( " PropertyCount: %d", mimeformat.PropertyCount()); - for ( TInt j=0; j -#include - -#include -#include - -#include "cscontimeout.h" - -class CSmlDataStore; -class CSconSyncRelationship; -class CSmlDataProvider; -class CNSmlDataItemUidSet; -class CSmlDataStoreFormat; - -NONSHARABLE_CLASS ( CSconAsyncHandler ): public CActive, MTimeOutObserver -{ -public: - static CSconAsyncHandler* NewL(); - ~CSconAsyncHandler(); - void HandleServiceL( const RMessage2& aMessage ); - -private: // From CActive - void RunL(); - TInt RunError(TInt aError); - void DoCancel(); - -private: // From MTimeOutObserver - void TimeOut(); - -private: - - CSconAsyncHandler(); - void ConstructL(); - - void HandleChunkMessage(); - void ListAllImplementationsL(); - void OpenStoreL(); - - void OpenItemL(); - void OpenItemCompletedL( TInt aError ); - - void CreateItemL(); - void CreateItemCompletedL( TInt aError ); - void ReplaceItemL(); - void ReplaceItemCompletedL( TInt aError ); - void MoveItemL(); - void DeleteItemL(); - void SoftDeleteItemL(); - void DeleteAllItemsL(); - void ReadParentL(); - void ReadParentCompletedL( TInt aError ); - - void HasHistoryL(); - void AddedItemsL(); - void DeletedItemsL(); - void SoftDeletedItemsL(); - void ModifiedItemsL(); - void MovedItemsL(); - //void ListChangesL(); - void ResetChangeInfoL(); - void CommitChangeInfoL(); - void CloseStore(); - - void SetSyncTimeStampL(); - void GetSyncTimeStampL(); - - void ExportStoreFormatL(); - void SetRemoteStoreFormatL(); - - void LeaveIfNoInstanceL(); - - void DoCloseStore(); - - void CleanOldStoresL(); - void CompleteRequest( TInt aError ); -private: - RChunk iChunk; - - RStringPool iStringPool; - CSmlDataStoreFormat* iStoreFormat; - CSmlDataProvider* iDataProvider; - CSmlDataStore* iDataStore; - CSconSyncRelationship* iContext; - RFs iFs; - RMessage2 iMessage; - - // for committing changes - CNSmlDataItemUidSet* iItems; - - // for opening item - TBool iFieldChange; - TInt iSize; - TInt iParent; - TBuf8<64> iMimeType; - TBuf8<64> iMimeVer; - - // for creating item - TSmlDbItemUid iNewItem; - HBufC8* iWriteData; - TBool iCommitInProgress; - - CCSconTimeOut* iTimeOut; - TBool iForceCancel; -}; - -#endif /*SCONASYNCHANDLER_H_*/ diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/servers/syncserver/inc/sconsyncclientserver.h --- a/connectivitymodules/SeCon/servers/syncserver/inc/sconsyncclientserver.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Sync Client-Server header -* -*/ - - -#ifndef SCONSYNCCLIENTSERVER_H -#define SCONSYNCCLIENTSERVER_H - -#include - -_LIT(KSconSyncServerName, "sconsyncserver"); -_LIT(KSconSyncServerExe, "sconsyncserver.exe"); - - -enum TService -{ - ESendChunkHandle, - ECancelRequest, - EListImplementations, - - EOpenStore, - EOpenItem, - ECreateItem, - EReplaceItem, - EMoveItem, - EDeleteItem, - ESoftDeleteItem, - EDeleteAllItems, - EReadParent, - - EHasHistory, - EAddedItems, - EDeletedItems, - ESoftDeletedItems, - EModifiedItems, - EMovedItems, - - //EListChanges, - EResetChangeInfo, - ECommitChangeInfo, - - ECloseStore, - ESetSyncTimeStamp, - EGetSyncTimeStamp, - EExportStoreFormat, - ESetRemoteStoreFormat, - - EMaxService // Not an actual service -}; - -#endif // SCONSYNCCLIENTSERVER_H diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/servers/syncserver/inc/sconsyncrelationship.h --- a/connectivitymodules/SeCon/servers/syncserver/inc/sconsyncrelationship.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,90 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: CSconSyncRelationship header -* -*/ - - -#ifndef SCONSYNCRELATIONSHIP_H_ -#define SCONSYNCRELATIONSHIP_H_ - -#include -#include -#include -#include -#include - -class CDictionaryFileStore; - -NONSHARABLE_CLASS ( CSconSyncRelationship ) : public CBase, public MSmlSyncRelationship - { -public: - /** - * Creates CSconSyncRelationship object. - * @param aFs reference to open RFs connection - * @param aRelationUid uniqueID for each server-client pair - * @return new CSconSyncRelationship object - */ - static CSconSyncRelationship* NewL( RFs& aFs, TUid aRelationUid, TSmlDataProviderId aProviderId ); - ~CSconSyncRelationship(); - - static void SetTimeStampL( RFs& aFs, TUid aRelationUid, TSmlDataProviderId aId ); - static void GetTimeStampL( RFs& aFs, TUid aRelationUid, TSmlDataProviderId aId, TDateTime& aTimeStamp ); - -public: // From MSmlSyncRelationship - - /** - * Returns the unique identifier for the synchronisation relationship. - * - * @return A unique identifier for the sync relationship. - */ - TSmlSyncTaskKey SyncTaskKey() const; - - /** - * Opens a specified stream for reading, and places an item on the cleanup stack to close it. - * - * @param aReadStream On return, an open read stream - * @param aStreamUid The UID of the stream to open for reading. - */ - void OpenReadStreamLC(RReadStream& aReadStream, TUid aStreamUid); - - /** - * Opens the specified stream, or creates a new one if it does not exist, and places an item on the cleanup stack to close it. - * - * @param aWriteStream On return, an open write stream - * @param aStreamUid The UID of the stream to open or create - */ - void OpenWriteStreamLC(RWriteStream& aWriteStream, TUid aStreamUid); - - /** - * Tests if the specified stream identified exists in the store. - * - * @param aStreamUid The stream UID - * @return Non-zero if the stream exists, otherwise EFalse. - */ - TBool IsStreamPresentL(TUid aStreamUid) const; - -private: - CSconSyncRelationship( RFs& aFs, TUid aRelationUid, TSmlDataProviderId aProviderId ); - void ConstructL(); - -private: - - CDictionaryFileStore* iDictionaryStore; - RFs& iFs; - TUid iID; - TSmlDataProviderId iProviderId; - }; - -#endif /*SCONSYNCRELATIONSHIP_H_*/ diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/servers/syncserver/inc/sconsyncserver.h --- a/connectivitymodules/SeCon/servers/syncserver/inc/sconsyncserver.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: CSconSyncServer header -* -*/ - - -#ifndef __SCONSYNCSERVER_H__ -#define __SCONSYNCSERVER_H__ - -#include - -class CSconSyncServer : public CPolicyServer -{ -public: - static CSconSyncServer* NewL(); - static CSconSyncServer* NewLC(); - virtual ~CSconSyncServer(); - - void AddSession(); - void RemoveSession(); - -private: - CSconSyncServer(); - void ConstructL(); - - CSession2* NewSessionL(const TVersion& aVersion,const RMessage2& aMessage) const; - TInt RunError(TInt aError); - -private: - TInt iSessionCount; - -}; - -#endif // __SCONSYNCSERVER_H__ \ No newline at end of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/servers/syncserver/inc/sconsyncsession.h --- a/connectivitymodules/SeCon/servers/syncserver/inc/sconsyncsession.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: CSconSyncSession header -* -*/ - - -#ifndef __SCONSYNCSESSION_H__ -#define __SCONSYNCSESSION_H__ - -#include - - -class CSconSyncServer; -class CSconAsyncHandler; - -class CSconSyncSession : public CSession2 - { -public: - static CSconSyncSession* NewL(); - - void CreateL(); - -private: - CSconSyncSession(); - ~CSconSyncSession(); - void ConstructL(); - - CSconSyncServer& Server(); - void ServiceL(const RMessage2& aMessage); - -private: - CSconAsyncHandler* iAsyncHandler; - }; - -#endif // __SCONSYNCSESSION_H__ diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/servers/syncserver/rom/sconsyncserver.iby --- a/connectivitymodules/SeCon/servers/syncserver/rom/sconsyncserver.iby Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -/* -* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: IBY file for SconSyncServer -* -*/ - -#ifndef _SCONSYNCSERVER_IBY_ -#define _SCONSYNCSERVER_IBY_ - -#include - -//file content -file=ABI_DIR\BUILD_DIR\sconsyncserver.exe PROGRAMS_DIR\sconsyncserver.exe - -#endif diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/servers/syncserver/src/cscontimeout.cpp --- a/connectivitymodules/SeCon/servers/syncserver/src/cscontimeout.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,85 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: CCSconTimeOut implementation -* -*/ - -#include "cscontimeout.h" - -CCSconTimeOut::CCSconTimeOut( MTimeOutObserver& aTimeOutObserver ) : - CActive(EPriorityStandard), // Standard priority - iTimeOutObserver(aTimeOutObserver) - { - } - - -CCSconTimeOut* CCSconTimeOut::NewL( MTimeOutObserver& aTimeOutObserver ) - { - CCSconTimeOut* self = new (ELeave) CCSconTimeOut( aTimeOutObserver ); - CleanupStack::PushL( self ); - self->ConstructL(); - CleanupStack::Pop( self ); - return self; - } - -void CCSconTimeOut::ConstructL() - { - User::LeaveIfError(iTimer.CreateLocal()); // Initialize timer - CActiveScheduler::Add(this); // Add to scheduler - } - -CCSconTimeOut::~CCSconTimeOut() - { - Cancel(); // Cancel any request, if outstanding - iTimer.Close(); // Destroy the RTimer object - // Delete instance variables if any - } - -void CCSconTimeOut::DoCancel() - { - iTimer.Cancel(); - } - -void CCSconTimeOut::Start(TTimeIntervalMicroSeconds32 aDelay) - { - Cancel(); // Cancel any request, just to be sure - iState = EUninitialized; - iTimer.After(iStatus, aDelay); // Set for later - SetActive(); // Tell scheduler a request is active - } - -void CCSconTimeOut::RunL() - { - /*if (iState == EUninitialized) - { - // Do something the first time RunL() is called - iState = EInitialized; - } - else if (iState != EError) - { - // Do something - } - iTimer.After(iStatus, 1000000); // Set for 1 sec later - SetActive(); // Tell scheduler a request is active*/ - if ( iState == KErrNone ) - { - iTimeOutObserver.TimeOut(); - } - - } - -TInt CCSconTimeOut::RunError(TInt aError) - { - return aError; - } diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/servers/syncserver/src/sconasynchandler.cpp --- a/connectivitymodules/SeCon/servers/syncserver/src/sconasynchandler.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1179 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: CSconAsyncHandler implementation -* -*/ - - -#include "sconasynchandler.h" - -#include -#include -#include -#include -#include -#include -#include - -#include "sconsyncclientserver.h" -#include "sconsyncrelationship.h" -#include "scondataproviderinfo.h" -#include "debug.h" -#include "logdatastoreformat.h" - -// Data Store interface implementation Uid. -// Load all plugins with this uid. -const TUid KDSEcomIFUid = {0x101F4D3A}; - -const TInt KDefaultExpandSize = 1024; - -// one store per computer, max store count. -const TInt KMaxStoresCount = 10; - -const TInt KDefaultTimeOutInMicroSeconds = 30 * 1000000; // 30 seconds -const TInt KDeleteAllTimeOutInMicroSeconds = 300 * 1000000; // 5 minutes -const TInt KOpenStoreTimeOutInMicroSeconds = 180 * 1000000; // 180 seconds - -CSconAsyncHandler::~CSconAsyncHandler() - { - TRACE_FUNC_ENTRY; - Cancel(); - DoCloseStore(); - delete iItems; - delete iWriteData; - delete iDataStore; - delete iDataProvider; - delete iContext; - delete iStoreFormat; - iStringPool.Close(); - iFs.Close(); - REComSession::FinalClose(); - iChunk.Close(); - delete iTimeOut; - TRACE_FUNC_EXIT; - } - -CSconAsyncHandler::CSconAsyncHandler(): CActive( EPriorityStandard ) - { - TRACE_FUNC; - CActiveScheduler::Add( this ); - } - -CSconAsyncHandler* CSconAsyncHandler::NewL() - { - TRACE_FUNC; - CSconAsyncHandler* self = new(ELeave) CSconAsyncHandler(); - CleanupStack::PushL( self ); - self->ConstructL(); - CleanupStack::Pop( self ); - return self; - } - -void CSconAsyncHandler::ConstructL() - { - TRACE_FUNC; - User::LeaveIfError( iFs.Connect() ); - TInt err = iFs.CreatePrivatePath( EDriveC ); - LOGGER_WRITE_1("CreatePrivatePath err: %d", err); - iStringPool.OpenL(); - iTimeOut = CCSconTimeOut::NewL( *this ); - } - -// ----------------------------------------------------------------------------- -// CSconAsyncHandler::HandleServiceL() -// Handles the client request -// ----------------------------------------------------------------------------- -// -void CSconAsyncHandler::HandleServiceL( const RMessage2& aMessage ) - { - TRACE_FUNC_ENTRY; - if ( aMessage.Function() == ECancelRequest ) - { - LOGGER_WRITE("ECancelRequest"); - if ( IsActive() ) - { - Cancel(); - LOGGER_WRITE("iMessage.Complete( KErrCancel )"); - CompleteRequest( KErrCancel ); - } - - LOGGER_WRITE("aMessage.Complete( KErrNone )"); - aMessage.Complete( KErrNone ); - TRACE_FUNC_EXIT; - return; - } - - iTimeOut->Start( KDefaultTimeOutInMicroSeconds ); - - iMessage = aMessage; - switch ( aMessage.Function() ) - { - case ESendChunkHandle: - LOGGER_WRITE( "CSconSyncSession::ServiceL() : ESendChunkHandle" ); - HandleChunkMessage(); - break; - - case EListImplementations: - LOGGER_WRITE( "CSconSyncSession::ServiceL() : EListImplementations" ); - ListAllImplementationsL(); - break; - - case EOpenStore: - LOGGER_WRITE( "CSconSyncSession::ServiceL() : EOpenStore" ); - iTimeOut->Start( KOpenStoreTimeOutInMicroSeconds ); - OpenStoreL(); - break; - - case EOpenItem: - OpenItemL(); - break; - case ECreateItem: - CreateItemL(); - break; - case EReplaceItem: - ReplaceItemL(); - break; - case EMoveItem: - MoveItemL(); - break; - case EDeleteItem: - DeleteItemL(); - break; - case ESoftDeleteItem: - SoftDeleteItemL(); - break; - case EDeleteAllItems: - iTimeOut->Start( KDeleteAllTimeOutInMicroSeconds ); - DeleteAllItemsL(); - break; - case EReadParent: - ReadParentL(); - break; - - case EHasHistory: - HasHistoryL(); - break; - case EAddedItems: - AddedItemsL(); - break; - case EDeletedItems: - DeletedItemsL(); - break; - case ESoftDeletedItems: - SoftDeletedItemsL(); - break; - case EModifiedItems: - ModifiedItemsL(); - break; - case EMovedItems: - MovedItemsL(); - break; - case EResetChangeInfo: - ResetChangeInfoL(); - break; - case ECommitChangeInfo: - CommitChangeInfoL(); - break; - case ECloseStore: - CloseStore(); - break; - case ESetSyncTimeStamp: - SetSyncTimeStampL(); - break; - case EGetSyncTimeStamp: - GetSyncTimeStampL(); - break; - case EExportStoreFormat: - ExportStoreFormatL(); - break; - case ESetRemoteStoreFormat: - SetRemoteStoreFormatL(); - break; - - default: - aMessage.Complete(KErrNotSupported); - break; - } - TRACE_FUNC_EXIT; - } - - -void CSconAsyncHandler::RunL() - { - TRACE_FUNC_ENTRY; - LOGGER_WRITE_1("iStatus.Int(): %d", iStatus.Int()); - switch ( iMessage.Function() ) - { - case EOpenStore: - LOGGER_WRITE( "CSconAsyncHandler::RunL() : EOpenStore" ); - CompleteRequest( iStatus.Int() ); - break; - - case EOpenItem: - LOGGER_WRITE( "CSconAsyncHandler::RunL() : EOpenItem" ); - OpenItemCompletedL( iStatus.Int() ); - break; - - case ECreateItem: - LOGGER_WRITE( "CSconAsyncHandler::RunL() : ECreateItem" ); - if (!iCommitInProgress) - { - // Write data to item - CreateItemCompletedL( iStatus.Int() ); - } - else - { - // commit is done, all ready - LOGGER_WRITE( "CSconAsyncHandler::RunL() : ECreateItem, commit done" ); - TPckg pckg(iNewItem); - iMessage.WriteL( 0, pckg, 0); - CompleteRequest( iStatus.Int() ); - } - break; - - case EReplaceItem: - LOGGER_WRITE( "CSconAsyncHandler::RunL() : EReplaceItem" ); - if (!iCommitInProgress) - { - // Write data to item - ReplaceItemCompletedL( iStatus.Int() ); - } - else - { - // commit is done, all ready - LOGGER_WRITE( "CSconAsyncHandler::RunL() : EReplaceItem, commit done" ); - CompleteRequest( iStatus.Int() ); - } - break; - - case EMoveItem: - LOGGER_WRITE( "CSconAsyncHandler::RunL() : EMoveItem" ); - CompleteRequest( iStatus.Int() ); - break; - - case EDeleteItem: - LOGGER_WRITE( "CSconAsyncHandler::RunL() : EDeleteItem" ); - CompleteRequest( iStatus.Int() ); - break; - - case ESoftDeleteItem: - LOGGER_WRITE( "CSconAsyncHandler::RunL() : ESoftDeleteItem" ); - CompleteRequest( iStatus.Int() ); - break; - - case EDeleteAllItems: - LOGGER_WRITE( "CSconAsyncHandler::RunL() : EDeleteAllItems" ); - CompleteRequest( iStatus.Int() ); - break; - - case EReadParent: - LOGGER_WRITE( "CSconAsyncHandler::RunL() : EReadParent" ); - ReadParentCompletedL( iStatus.Int() ); - break; - - case EResetChangeInfo: - LOGGER_WRITE( "CSconAsyncHandler::RunL() : EResetChangeInfo" ); - CompleteRequest( iStatus.Int() ); - break; - - case ECommitChangeInfo: - LOGGER_WRITE( "CSconAsyncHandler::RunL() : ECommitChangeInfo" ); - delete iItems; - iItems = NULL; - CompleteRequest( iStatus.Int() ); - break; - - default: - LOGGER_WRITE("Not asynchronous function") - CompleteRequest( KErrNotSupported ); - break; - } - TRACE_FUNC_EXIT; - } - -TInt CSconAsyncHandler::RunError(TInt aError) - { - LOGGER_WRITE_1("CSconAsyncHandler::RunError() aError: %d", aError); - delete iItems; - iItems = NULL; - delete iWriteData; - iWriteData = NULL; - - if ( IsActive() ) - { - LOGGER_WRITE("IsActive"); - //iDataStore->CancelRequest(); - Cancel(); - } - - if ( iDataStore && iMessage.Function() == EOpenItem ) - { - LOGGER_WRITE( "CSconAsyncHandler::RunError() : EOpenItem" ); - iDataStore->CloseItem(); - } - - CompleteRequest( aError ); - aError = KErrNone; - LOGGER_WRITE_1("CSconAsyncHandler::RunError() : Return %d", aError); - return aError; - //return KErrNone;//aError; - } - -void CSconAsyncHandler::DoCancel() - { - TRACE_FUNC_ENTRY; - iDataStore->CancelRequest(); - iTimeOut->Cancel(); - - if ( iStatus == KRequestPending ) - { - LOGGER_WRITE( "iStatus == KRequestPending" ); - } - - if ( iDataStore && iMessage.Function() == EOpenItem ) - { - LOGGER_WRITE( "CSconAsyncHandler::RunError() : EOpenItem" ); - iDataStore->CloseItem(); - } - - TRACE_FUNC_EXIT; - } - -void CSconAsyncHandler::TimeOut() - { - TRACE_FUNC_ENTRY; - if ( IsActive() ) - { - Cancel(); - CompleteRequest( KErrCancel ); - } - TRACE_FUNC_EXIT; - } - - -void CSconAsyncHandler::HandleChunkMessage() - { - TRACE_FUNC_ENTRY; - TInt ret ( KErrNone ); - - ret = iChunk.Open( iMessage, 0, EFalse ); - - LOGGER_WRITE_1( "CSconAsyncHandler::HandleChunkMessageL() : ret %d", ret ); - CompleteRequest( ret ); - } - - - -void CSconAsyncHandler::ListAllImplementationsL() - { - TRACE_FUNC_ENTRY; - - RImplInfoPtrArray implInfoArray; - CleanupResetAndDestroyPushL( implInfoArray ); - REComSession::ListImplementationsL( KDSEcomIFUid, implInfoArray ); - - const TInt KDataproviderInfoSize = 250; // 250 bytes should be enought - TInt requiredSize = implInfoArray.Count() * KDataproviderInfoSize; - if ( iChunk.Size() < requiredSize ) - { - User::LeaveIfError( iChunk.Adjust( requiredSize ) ); - } - - RMemWriteStream stream ( iChunk.Base(), iChunk.Size() ); - CleanupClosePushL( stream ); - - RSconDataProviderInfoArray dpInfoArray; - CleanupResetAndDestroyPushL( dpInfoArray ); - - // Collect information from dataproviders - for ( TInt i=0; i < implInfoArray.Count(); i++ ) - { - LOGGER_WRITE_1("implInfoArray: %d",i); - CImplementationInformation& implInfo = *implInfoArray[i]; - - CSmlDataProvider* dp(NULL); - TRAPD( err, dp = CSmlDataProvider::NewL( implInfo.ImplementationUid().iUid ) ); - LOGGER_WRITE_2("CSmlDataProvider::NewL, uid(0x%08x) err: %d",implInfo.ImplementationUid().iUid, err ); - if ( !err ) - { - CleanupStack::PushL( dp ); - - CSconDataproviderInfo *dpInfo = CSconDataproviderInfo::NewL(); - CleanupStack::PushL( dpInfo ); - - dpInfo->SetImplementationUid( implInfo.ImplementationUid() ); - LOGGER_WRITE_1("ImplementationUid: 0x%08x", implInfo.ImplementationUid().iUid ); - dpInfo->SetDisplayNameL( implInfo.DisplayName() ); - LOGGER_WRITE_1("DisplayName: %S", &implInfo.DisplayName() ); - - dpInfo->SetDefaultStoreL( dp->DefaultStoreL() ); - LOGGER_WRITE_1("DefaultStoreL: %S", &dp->DefaultStoreL() ); - CDesCArray* stores = dp->ListStoresLC(); - dpInfo->SetStoresL( *stores ); - CleanupStack::PopAndDestroy( stores ); - - dpInfoArray.AppendL( dpInfo ); - CleanupStack::Pop( dpInfo ); - - CleanupStack::PopAndDestroy( dp ); - } - } - - // Wrtie to stream - stream.WriteUint16L( dpInfoArray.Count() ); - for ( TInt i = 0; i < dpInfoArray.Count(); i++ ) - { - CSconDataproviderInfo& dpInfo = *dpInfoArray[i]; - dpInfo.ExternalizeL( stream ); - } - - stream.CommitL(); - - CleanupStack::PopAndDestroy( &dpInfoArray ); - CleanupStack::PopAndDestroy( &stream ); - CleanupStack::PopAndDestroy( &implInfoArray ); - - CompleteRequest( KErrNone ); - TRACE_FUNC_EXIT; - } - -void CSconAsyncHandler::OpenStoreL() - { - TRACE_FUNC_ENTRY; - if ( iDataStore ) - { - LOGGER_WRITE("Warning: Previous DataStore was not closed properly."); - DoCloseStore(); - } - - // copy data from the chunk - RMemReadStream readStream( iChunk.Base(), iChunk.Size() ); - CleanupClosePushL( readStream ); - - TSmlDataProviderId providerId = readStream.ReadUint32L(); - LOGGER_WRITE_1("providerId: 0x%08x", providerId); - - TInt len = readStream.ReadUint32L(); - HBufC* storeName = HBufC::NewLC(len); - TPtr storeNamePtr = storeName->Des(); - readStream.ReadL(storeNamePtr, len); - LOGGER_WRITE_1("storeName: %S", &storeNamePtr); - - TInt contextUid = readStream.ReadUint32L(); - - LOGGER_WRITE_1("contextIdentifier: 0x%08x", contextUid); - - LOGGER_WRITE("Open provider"); - delete iDataProvider; - iDataProvider = NULL; - iDataProvider = CSmlDataProvider::NewL( providerId ); - - delete iContext; - iContext = NULL; - - delete iStoreFormat; - iStoreFormat = NULL; - - LOGGER_WRITE("Create context"); - iContext = CSconSyncRelationship::NewL( iFs, TUid::Uid(contextUid), providerId ); - - - LOGGER_WRITE("Create NewStoreInstanceLC"); - iDataStore = iDataProvider->NewStoreInstanceLC(); - CleanupStack::Pop( iDataStore ); - - SetActive(); - iStatus = KRequestPending; - LOGGER_WRITE("OpenL"); - TRAPD(err, iDataStore->OpenL(storeNamePtr,*iContext, iStatus)); - if ( err ) - { - // we are on active state, call request completed (RunL) - LOGGER_WRITE_1("iDataStore->OpenL leaved with err: %d", err); - TRequestStatus* status = &iStatus; - User::RequestComplete( status, err ); - } - - CleanupStack::PopAndDestroy( storeName ); - CleanupStack::PopAndDestroy( &readStream ); - - TRACE_FUNC_EXIT; - } - - -void CSconAsyncHandler::OpenItemL() - { - TRACE_FUNC_ENTRY; - LeaveIfNoInstanceL(); - if ( IsActive() ) - { - LOGGER_WRITE("Was still in Active"); - Cancel(); - } - - TSmlDbItemUid itemUid = iMessage.Int0(); - LOGGER_WRITE_1("Open item: %d", itemUid); - - // set default values - iFieldChange = EFalse; - iSize = 0; - iParent = 0; - iMimeType.Copy(KNullDesC); - iMimeVer.Copy(KNullDesC); - - SetActive(); - LOGGER_WRITE("iDataStore->OpenItemL"); - iStatus = KRequestPending; - TRAPD( err, iDataStore->OpenItemL(itemUid,iFieldChange,iSize,iParent,iMimeType,iMimeVer,iStatus)); - if ( err ) - { - // we are on active state, call request completed (RunL) - LOGGER_WRITE_1("iDataStore->OpenItemL leaved with err: %d", err); - TRequestStatus* status = &iStatus; - User::RequestComplete( status, err ); - } - - TRACE_FUNC_EXIT; - } - -void CSconAsyncHandler::OpenItemCompletedL( TInt aError ) - { - TRACE_FUNC_ENTRY; - // item opened, now read it - if ( aError ) - { - CompleteRequest( aError ); - return; - } - LeaveIfNoInstanceL(); - - LOGGER_WRITE_1("item size: %d", iSize); - - TInt totalObjectSize( 0 ); - totalObjectSize+= sizeof(TInt32); // data length - totalObjectSize+= iSize; // data - totalObjectSize+= sizeof(TInt8); // iFieldChange - totalObjectSize+= sizeof(TInt32); // iParent - totalObjectSize+= sizeof(TInt32); // iMimeType - totalObjectSize+= iMimeType.Length(); // iMimeType - totalObjectSize+= sizeof(TInt32); // iMimeVer - totalObjectSize+= iMimeVer.Length(); // iMimeType - - LOGGER_WRITE_1("iChunk.Size(): %d", iChunk.Size()); - LOGGER_WRITE_1("iChunk.MaxSize(): %d", iChunk.MaxSize()); - LOGGER_WRITE_1("totalObjectSize: %d", totalObjectSize); - - if ( iChunk.Size() < totalObjectSize ) - { - LOGGER_WRITE("adjust chunk"); - TInt err = iChunk.Adjust( totalObjectSize ); - LOGGER_WRITE_1("Chunk.Adjust err: %d", err); - User::LeaveIfError( err ); - } - LOGGER_WRITE_1("new Chunk size: %d", iChunk.Size()); - LOGGER_WRITE_1("new ChunkMaxSize(): %d", iChunk.MaxSize()); - RMemWriteStream stream ( iChunk.Base(), iChunk.Size() ); - CleanupClosePushL( stream ); - - LOGGER_WRITE("ReadItemL"); - HBufC8* tempBuf = HBufC8::NewLC(iSize); - TPtr8 tempPtr = tempBuf->Des(); - - TUint8* ptr = (TUint8*) tempPtr.Ptr(); - - TPtr8 tempPtr2( ptr, 0, iSize ); - LOGGER_WRITE_1( "tempPtr2.Size(): %d", tempPtr2.Size()); - iDataStore->ReadItemL( tempPtr2 ); - LOGGER_WRITE("ReadItemL -ok"); - - LOGGER_WRITE_1("readed Length: %d", tempPtr2.Length() ); - LOGGER_WRITE_1("readed Size: %d", tempPtr2.Size() ); - - LOGGER_WRITE8_1("iMimeType: %S", &iMimeType ); - LOGGER_WRITE_1("iMimeType.Length(): %d", iMimeType.Length() ); - LOGGER_WRITE_1("iMimeType Size: %d", iMimeType.Size() ); - - LOGGER_WRITE8_1("iMimeVer: %S", &iMimeVer ); - LOGGER_WRITE_1("iMimeVer.Length(): %d", iMimeVer.Length() ); - LOGGER_WRITE_1("iMimeVer Size: %d", iMimeVer.Size() ); - - iDataStore->CloseItem(); - LOGGER_WRITE("Write to chunk"); - stream.WriteInt32L( tempPtr2.Length() ); - stream.WriteL( tempPtr2 ); - CleanupStack::PopAndDestroy( tempBuf ); - - stream.WriteInt8L( (TInt)iFieldChange ); - stream.WriteInt32L( iParent ); - stream.WriteInt32L( iMimeType.Length() ); - stream.WriteL( iMimeType ); - stream.WriteInt32L( iMimeVer.Length() ); - stream.WriteL( iMimeVer ); - - stream.CommitL(); - LOGGER_WRITE("Writed ok"); - CleanupStack::PopAndDestroy( &stream ); - CompleteRequest( KErrNone ); - TRACE_FUNC_EXIT; - } - -void CSconAsyncHandler::CreateItemL() - { - TRACE_FUNC_ENTRY; - LeaveIfNoInstanceL(); - iCommitInProgress = EFalse; - RMemReadStream readStream( iChunk.Base(), iChunk.Size() ); - CleanupClosePushL( readStream ); - - TSmlDbItemUid parent = readStream.ReadUint32L(); - TInt len = readStream.ReadUint32L(); - readStream.ReadL(iMimeType, len); - len = readStream.ReadUint32L(); - readStream.ReadL(iMimeVer, len); - len = readStream.ReadUint32L(); - delete iWriteData; - iWriteData = NULL; - iWriteData = HBufC8::New(len); - TPtr8 dataPtr = iWriteData->Des(); - readStream.ReadL(dataPtr, len); - CleanupStack::PopAndDestroy( &readStream ); - SetActive(); - iStatus = KRequestPending; - TRAPD(err, iDataStore->CreateItemL( iNewItem, dataPtr.Size(), parent, iMimeType, iMimeVer, iStatus )); - if ( err ) - { - // we are on active state, call request completed (RunL) - LOGGER_WRITE_1("iDataStore->CreateItemL leaved with err: %d", err); - TRequestStatus* status = &iStatus; - User::RequestComplete( status, err ); - } - TRACE_FUNC_EXIT; - } - -void CSconAsyncHandler::CreateItemCompletedL( TInt aError ) - { - TRACE_FUNC_ENTRY; - User::LeaveIfError( aError ); - LeaveIfNoInstanceL(); - // CreateItem completed, now we must write the data to the created item and commit it. - - iDataStore->WriteItemL( iWriteData->Des() ); - delete iWriteData; - iWriteData = NULL; - SetActive(); - iStatus = KRequestPending; - TRAPD(err, iDataStore->CommitItemL( iStatus )); - if ( err ) - { - // we are on active state, call request completed (RunL) - LOGGER_WRITE_1("iDataStore->CommitItemL leaved with err: %d", err); - TRequestStatus* status = &iStatus; - User::RequestComplete( status, err ); - } - iCommitInProgress = ETrue; - - TRACE_FUNC_EXIT; - } - -void CSconAsyncHandler::ReplaceItemL() - { - TRACE_FUNC_ENTRY; - LeaveIfNoInstanceL(); - - iCommitInProgress = EFalse; - RMemReadStream readStream( iChunk.Base(), iChunk.Size() ); - CleanupClosePushL( readStream ); - - TSmlDbItemUid uid = readStream.ReadUint32L(); - TSmlDbItemUid parent = readStream.ReadUint32L(); - TBool fieldChange = readStream.ReadUint8L(); - TInt len = readStream.ReadUint32L(); - delete iWriteData; - iWriteData = NULL; - iWriteData = HBufC8::New(len); - TPtr8 dataPtr = iWriteData->Des(); - readStream.ReadL(dataPtr, len); - - CleanupStack::PopAndDestroy( &readStream ); - SetActive(); - iStatus = KRequestPending; - TRAPD(err,iDataStore->ReplaceItemL( uid,dataPtr.Size(),parent,fieldChange, iStatus )); - if ( err ) - { - // we are on active state, call request completed (RunL) - LOGGER_WRITE_1("iDataStore->CommitItemL leaved with err: %d", err); - TRequestStatus* status = &iStatus; - User::RequestComplete( status, err ); - } - TRACE_FUNC_EXIT; - } - -void CSconAsyncHandler::ReplaceItemCompletedL( TInt aError ) - { - TRACE_FUNC_ENTRY; - User::LeaveIfError( aError ); - LeaveIfNoInstanceL(); - // CreateItem completed, now we must write the data to the created item and commit it. - - iDataStore->WriteItemL( iWriteData->Des() ); - delete iWriteData; - iWriteData = NULL; - - SetActive(); - iStatus = KRequestPending; - TRAPD(err, iDataStore->CommitItemL( iStatus )); - if ( err ) - { - // we are on active state, call request completed (RunL) - LOGGER_WRITE_1("iDataStore->CommitItemL leaved with err: %d", err); - TRequestStatus* status = &iStatus; - User::RequestComplete( status, err ); - } - iCommitInProgress = ETrue; - TRACE_FUNC_EXIT; - } - -void CSconAsyncHandler::MoveItemL() - { - TRACE_FUNC_ENTRY; - LeaveIfNoInstanceL(); - TSmlDbItemUid uid = iMessage.Int0(); - TSmlDbItemUid newParent = iMessage.Int1(); - LOGGER_WRITE_1( "uid: %d", uid ); - LOGGER_WRITE_1( "newParent: %d", newParent ); - - SetActive(); - iStatus = KRequestPending; - TRAPD(err, iDataStore->MoveItemL( uid, newParent, iStatus )); - if ( err ) - { - // we are on active state, call request completed (RunL) - LOGGER_WRITE_1("iDataStore->MoveItemL leaved with err: %d", err); - TRequestStatus* status = &iStatus; - User::RequestComplete( status, err ); - } - TRACE_FUNC_EXIT; - } - -void CSconAsyncHandler::DeleteItemL() - { - TRACE_FUNC_ENTRY; - LeaveIfNoInstanceL(); - - TSmlDbItemUid uid = iMessage.Int0(); - LOGGER_WRITE_1( "uid: %d", uid ); - - SetActive(); - iStatus = KRequestPending; - TRAPD(err, iDataStore->DeleteItemL( uid, iStatus )); - if ( err ) - { - // we are on active state, call request completed (RunL) - LOGGER_WRITE_1("iDataStore->DeleteItemL leaved with err: %d", err); - TRequestStatus* status = &iStatus; - User::RequestComplete( status, err ); - } - TRACE_FUNC_EXIT; - } - -void CSconAsyncHandler::SoftDeleteItemL() - { - TRACE_FUNC_ENTRY; - LeaveIfNoInstanceL(); - - TSmlDbItemUid uid = iMessage.Int0(); - LOGGER_WRITE_1( "uid: %d", uid ); - - SetActive(); - iStatus = KRequestPending; - TRAPD(err, iDataStore->SoftDeleteItemL( uid, iStatus )); - if ( err ) - { - // we are on active state, call request completed (RunL) - LOGGER_WRITE_1("iDataStore->SoftDeleteItemL leaved with err: %d", err); - TRequestStatus* status = &iStatus; - User::RequestComplete( status, err ); - } - TRACE_FUNC_EXIT; - } - -void CSconAsyncHandler::DeleteAllItemsL() - { - TRACE_FUNC_ENTRY; - LeaveIfNoInstanceL(); - - SetActive(); - iStatus = KRequestPending; - TRAPD(err, iDataStore->DeleteAllItemsL( iStatus )); - if ( err ) - { - // we are on active state, call request completed (RunL) - LOGGER_WRITE_1("iDataStore->DeleteAllItemsL leaved with err: %d", err); - TRequestStatus* status = &iStatus; - User::RequestComplete( status, err ); - } - TRACE_FUNC_EXIT; - } - -void CSconAsyncHandler::ReadParentL() - { - TRACE_FUNC_ENTRY; - OpenItemL(); - - TRACE_FUNC_EXIT; - } - -void CSconAsyncHandler::ReadParentCompletedL( TInt aError ) - { - TRACE_FUNC_ENTRY; - // item opened, now read it - if ( aError ) - { - CompleteRequest( aError ); - return; - } - LeaveIfNoInstanceL(); - - iDataStore->CloseItem(); - - TPckg pckg(iParent); - iMessage.WriteL( 1, pckg, 0); - CompleteRequest( KErrNone ); - TRACE_FUNC_EXIT; - } - -void CSconAsyncHandler::HasHistoryL() - { - TRACE_FUNC_ENTRY; - LeaveIfNoInstanceL(); - TBool hasHistory = iDataStore->HasSyncHistory(); - - TPckgC pckg(hasHistory); - iMessage.WriteL( 0, pckg, 0); - CompleteRequest( KErrNone ); - TRACE_FUNC_EXIT; - } - -void CSconAsyncHandler::AddedItemsL() - { - TRACE_FUNC_ENTRY; - LeaveIfNoInstanceL(); - const MSmlDataItemUidSet& items = iDataStore->AddedItems(); - - RMemWriteStream stream ( iChunk.Base(), iChunk.Size() ); - CleanupClosePushL( stream ); - items.ExternalizeL( stream ); - CleanupStack::PopAndDestroy( &stream ); - - CompleteRequest( KErrNone ); - TRACE_FUNC_EXIT; - } - -void CSconAsyncHandler::DeletedItemsL() - { - TRACE_FUNC_ENTRY; - LeaveIfNoInstanceL(); - const MSmlDataItemUidSet& items = iDataStore->DeletedItems(); - - RMemWriteStream stream ( iChunk.Base(), iChunk.Size() ); - CleanupClosePushL( stream ); - items.ExternalizeL( stream ); - CleanupStack::PopAndDestroy( &stream ); - - CompleteRequest( KErrNone ); - TRACE_FUNC_EXIT; - } - -void CSconAsyncHandler::SoftDeletedItemsL() - { - TRACE_FUNC_ENTRY; - LeaveIfNoInstanceL(); - const MSmlDataItemUidSet& items = iDataStore->SoftDeletedItems(); - - RMemWriteStream stream ( iChunk.Base(), iChunk.Size() ); - CleanupClosePushL( stream ); - items.ExternalizeL( stream ); - CleanupStack::PopAndDestroy( &stream ); - - CompleteRequest( KErrNone ); - TRACE_FUNC_EXIT; - } - -void CSconAsyncHandler::ModifiedItemsL() - { - TRACE_FUNC_ENTRY; - LeaveIfNoInstanceL(); - const MSmlDataItemUidSet& items = iDataStore->ModifiedItems(); - - RMemWriteStream stream ( iChunk.Base(), iChunk.Size() ); - CleanupClosePushL( stream ); - items.ExternalizeL( stream ); - CleanupStack::PopAndDestroy( &stream ); - - CompleteRequest( KErrNone ); - TRACE_FUNC_EXIT; - } - -void CSconAsyncHandler::MovedItemsL() - { - TRACE_FUNC_ENTRY; - LeaveIfNoInstanceL(); - const MSmlDataItemUidSet& items = iDataStore->MovedItems(); - - RMemWriteStream stream ( iChunk.Base(), iChunk.Size() ); - CleanupClosePushL( stream ); - items.ExternalizeL( stream ); - CleanupStack::PopAndDestroy( &stream ); - - CompleteRequest( KErrNone ); - TRACE_FUNC_EXIT; - } - -void CSconAsyncHandler::ResetChangeInfoL() - { - TRACE_FUNC_ENTRY; - LeaveIfNoInstanceL(); - SetActive(); - iStatus = KRequestPending; - TRAPD(err, iDataStore->ResetChangeInfoL( iStatus )); - if ( err ) - { - // we are on active state, call request completed (RunL) - LOGGER_WRITE_1("iDataStore->ResetChangeInfoL leaved with err: %d", err); - TRequestStatus* status = &iStatus; - User::RequestComplete( status, err ); - } - TRACE_FUNC_EXIT; - } - -void CSconAsyncHandler::CommitChangeInfoL() - { - TRACE_FUNC_ENTRY; - LeaveIfNoInstanceL(); - RMemReadStream readStream( iChunk.Base(), iChunk.Size() ); - CleanupClosePushL( readStream ); - - if ( iItems ) - { - delete iItems; - iItems = NULL; - } - iItems = new (ELeave) CNSmlDataItemUidSet(); - iItems->InternalizeL( readStream ); - - CleanupStack::PopAndDestroy( &readStream ); - - SetActive(); - iStatus = KRequestPending; - TRAPD(err, iDataStore->CommitChangeInfoL( iStatus, *iItems )); - if ( err ) - { - // we are on active state, call request completed (RunL) - LOGGER_WRITE_1("iDataStore->CommitChangeInfoL leaved with err: %d", err); - TRequestStatus* status = &iStatus; - User::RequestComplete( status, err ); - } - TRACE_FUNC_EXIT; - } - -void CSconAsyncHandler::CloseStore() - { - TRACE_FUNC_ENTRY; - DoCloseStore(); - REComSession::FinalClose(); - CompleteRequest( KErrNone ); - TRACE_FUNC_EXIT; - } - -void CSconAsyncHandler::SetSyncTimeStampL() - { - TRACE_FUNC_ENTRY; - RMemReadStream readStream( iChunk.Base(), iChunk.Size() ); - CleanupClosePushL( readStream ); - TInt relationId = readStream.ReadInt32L(); - TInt providerId = readStream.ReadInt32L(); - CleanupStack::PopAndDestroy( &readStream ); - - CSconSyncRelationship::SetTimeStampL( iFs, TUid::Uid(relationId), providerId); - - CompleteRequest( KErrNone ); - TRACE_FUNC_EXIT; - } - -void CSconAsyncHandler::GetSyncTimeStampL() - { - TRACE_FUNC_ENTRY; - TInt providerId = iMessage.Int0(); - TInt relationId = iMessage.Int1(); - - TDateTime time; - CSconSyncRelationship::GetTimeStampL( iFs, TUid::Uid(relationId), providerId, time); - - // write timestamp - TPckgC timeBuf(time); - iMessage.WriteL( 2, timeBuf, 0); - - CompleteRequest( KErrNone ); - TRACE_FUNC_EXIT; - } - -void CSconAsyncHandler::ExportStoreFormatL() - { - TRACE_FUNC_ENTRY; - LeaveIfNoInstanceL(); - if ( !iDataProvider ) - { - User::Leave( KErrNotReady ); - } - CBufFlat* buffer = CBufFlat::NewL( KDefaultExpandSize ); - CleanupStack::PushL( buffer ); - RBufWriteStream stream( *buffer ); - CleanupClosePushL( stream ); - - const CSmlDataStoreFormat& storeFormat = iDataProvider->StoreFormatL(); - TRAP_IGNORE( TLogDataStoreFormat::LogDataStoreFormatL( _L("iDataProvider->StoreFormatL()"), storeFormat )); - - storeFormat.ExternalizeL( stream ); - - stream.CommitL(); - CleanupStack::PopAndDestroy( &stream ); - buffer->Compress(); - - RMemWriteStream chunkStream( iChunk.Base(), iChunk.Size() ); - CleanupClosePushL( chunkStream ); - - chunkStream.WriteInt32L( buffer->Size() ); - chunkStream.WriteL( buffer->Ptr(0), buffer->Size()); - chunkStream.CommitL(); - CleanupStack::PopAndDestroy( &chunkStream ); - - CleanupStack::PopAndDestroy( buffer ); - - CompleteRequest( KErrNone ); - TRACE_FUNC_EXIT; - } - -void CSconAsyncHandler::SetRemoteStoreFormatL() - { - TRACE_FUNC_ENTRY; - LeaveIfNoInstanceL(); - - RMemReadStream readStream( iChunk.Base(), iChunk.Size() ); - CleanupClosePushL( readStream ); - - if ( iStoreFormat ) - { - delete iStoreFormat; - iStoreFormat = NULL; - } - iStoreFormat = CSmlDataStoreFormat::NewLC( iStringPool, readStream); - CleanupStack::Pop( iStoreFormat ); - TRAP_IGNORE( TLogDataStoreFormat::LogDataStoreFormatL( _L("iDataProvider->SetRemoteStoreFormatL()"), *iStoreFormat )); - iDataStore->SetRemoteStoreFormatL( *iStoreFormat ); - - CleanupStack::PopAndDestroy( &readStream ); - - CompleteRequest( KErrNone ); - TRACE_FUNC_EXIT; - } - -void CSconAsyncHandler::LeaveIfNoInstanceL() - { - if ( !iDataStore ) - { - LOGGER_WRITE("DataStore instance was not ready, leaving KErrNotReady"); - User::Leave( KErrNotReady ); - } - } - -void CSconAsyncHandler::DoCloseStore() - { - TRACE_FUNC_ENTRY; - delete iItems; - iItems = NULL; - delete iWriteData; - iWriteData = NULL; - if ( iDataProvider && iContext ) - { - TInt providerId = iDataProvider->Identifier(); - TInt contextId = iContext->SyncTaskKey(); - TRAP_IGNORE( CSconSyncRelationship::SetTimeStampL( iFs, TUid::Uid(contextId), providerId) ); - } - delete iDataStore; - iDataStore = NULL; - delete iDataProvider; - iDataProvider = NULL; - delete iContext; - iContext = NULL; - delete iStoreFormat; - iStoreFormat = NULL; - - CleanOldStoresL(); - - TRACE_FUNC_EXIT; - } - -void CSconAsyncHandler::CleanOldStoresL() - { - TRACE_FUNC_ENTRY; - TFileName path; - User::LeaveIfError( iFs.PrivatePath( path ) ); - CDir* dir; - iFs.GetDir( path, KEntryAttNormal, ESortByDate, dir ); - CleanupStack::PushL( dir ); - TInt storesCount(0); - LOGGER_WRITE_1("count: %d", dir->Count() ); - for ( TInt i=dir->Count()-1; i >= 0; i-- ) - { - LOGGER_WRITE_1("dir[%d]", i); - TEntry entry = (*dir)[i]; - LOGGER_WRITE_1("file: %S", &entry.iName); - _LIT(KContextStoreName, "contextstore"); - _LIT(KTimeStoreName, "timestore"); - if ( entry.iName.Find(KContextStoreName) == 0 ) - { - storesCount++; - LOGGER_WRITE_1("storeNro: %d", storesCount); -#ifdef _DEBUG - TTime time = entry.iModified; - TDateTime dt = time.DateTime(); - _LIT(KFormat, "%d.%d %02d:%02d"); - TFileName mod; - mod.Format(KFormat, dt.Day()+1, dt.Month()+1, dt.Hour()+1,dt.Minute() ); - LOGGER_WRITE_1("time: %S", &mod); -#endif - if ( storesCount > KMaxStoresCount ) - { - LOGGER_WRITE_1("delete contextstore: '%S'", &entry.iName ); - iFs.Delete( entry.iName ); - TFileName timeStoreFile; - timeStoreFile = entry.iName.Right(15); - timeStoreFile.Insert(0, KTimeStoreName); - LOGGER_WRITE_1("delete timeStoreFile: %S", &timeStoreFile); - iFs.Delete( timeStoreFile ); - } - } - - } - CleanupStack::PopAndDestroy( dir ); - TRACE_FUNC_EXIT; - } - -void CSconAsyncHandler::CompleteRequest( TInt aError ) - { - TRACE_FUNC; - iTimeOut->Cancel(); - LOGGER_WRITE_1("iMessage.Complete( %d )", aError); - iMessage.Complete( aError ); - } diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/servers/syncserver/src/sconsyncrelationship.cpp --- a/connectivitymodules/SeCon/servers/syncserver/src/sconsyncrelationship.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,181 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: CSconSyncRelationship implementation -* -*/ - - -#include "sconsyncrelationship.h" -#include -#include - -#include "debug.h" - -_LIT(KContextStore, "contextstore_0x%08x.dat"); -_LIT(KTimeStore, "timestore_0x%08x.dat"); - -CSconSyncRelationship::~CSconSyncRelationship() - { - TRACE_FUNC_ENTRY; - if ( iDictionaryStore ) - { - iDictionaryStore->Commit(); - delete iDictionaryStore; - } - TRACE_FUNC_EXIT; - } - -CSconSyncRelationship::CSconSyncRelationship( RFs& aFs, TUid aRelationUid, TSmlDataProviderId aProviderId ) - : iFs(aFs), iID(aRelationUid), iProviderId(aProviderId) - { - TRACE_FUNC; - - } - -CSconSyncRelationship* CSconSyncRelationship::NewL( RFs& aFs, TUid aRelationUid, TSmlDataProviderId aProviderId ) - { - TRACE_FUNC_ENTRY; - CSconSyncRelationship* self = new (ELeave) CSconSyncRelationship( aFs, aRelationUid, aProviderId ); - CleanupStack::PushL( self ); - self->ConstructL(); - CleanupStack::Pop( self ); - TRACE_FUNC_EXIT; - return self; - } - -void CSconSyncRelationship::SetTimeStampL( RFs& aFs, TUid aRelationUid, TSmlDataProviderId aId ) - { - TRACE_FUNC_ENTRY; - LOGGER_WRITE_1("aRelationUid: 0x%08x", aRelationUid.iUid ); - LOGGER_WRITE_1("aId: 0x%08x", aId ); - aFs.SetSessionToPrivate( EDriveC ); - TFileName file; - file.Format(KTimeStore, aRelationUid.iUid); - CDictionaryFileStore* dictionaryStore = CDictionaryFileStore::OpenLC(aFs, file, TUid::Uid(0x0001)); - - RDictionaryWriteStream stream; - stream.AssignLC( *dictionaryStore, TUid::Uid(aId) ); - - TTime time; - time.UniversalTime(); - - TDateTime dateTime = time.DateTime(); - TPckgBuf timeBuf(dateTime); - - stream.WriteL( timeBuf ); - stream.CommitL(); - - CleanupStack::PopAndDestroy( &stream ); //AssingLC - dictionaryStore->Commit(); - CleanupStack::PopAndDestroy( dictionaryStore ); - TRACE_FUNC_EXIT; - } - -void CSconSyncRelationship::GetTimeStampL( RFs& aFs, TUid aRelationUid, TSmlDataProviderId aId, TDateTime& aTimeStamp ) - { - TRACE_FUNC_ENTRY; - LOGGER_WRITE_1("aRelationUid: 0x%08x", aRelationUid.iUid ); - LOGGER_WRITE_1("aId: 0x%08x", aId ); - User::LeaveIfError( aFs.SetSessionToPrivate( EDriveC ) ); - TFileName file; - file.Format(KTimeStore, aRelationUid.iUid); - CDictionaryFileStore* dictionaryStore = CDictionaryFileStore::OpenLC(aFs, file, TUid::Uid(0x0001)); - TBool present = dictionaryStore->IsPresentL( TUid::Uid(aId) ); - if ( !present ) - { - LOGGER_WRITE("Stream was not present"); - User::Leave(KErrNotFound); - } - RDictionaryReadStream stream; - stream.OpenLC( *dictionaryStore, TUid::Uid(aId) ); - TPckgBuf timeBuf; - stream.ReadL( timeBuf ); - aTimeStamp = timeBuf(); - CleanupStack::PopAndDestroy(); //OpenLC - CleanupStack::PopAndDestroy( dictionaryStore ); - - TRACE_FUNC_EXIT; - } - -void CSconSyncRelationship::ConstructL() - { - TRACE_FUNC_ENTRY; - iFs.SetSessionToPrivate( EDriveC ); - TFileName file; - file.Format(KContextStore, iID.iUid); - iDictionaryStore = CDictionaryFileStore::OpenL( - iFs, file, TUid::Uid(0x0001)); - - TRACE_FUNC_EXIT; - } - - -TSmlSyncTaskKey CSconSyncRelationship::SyncTaskKey() const - { - TRACE_FUNC; - return static_cast(iID.iUid); - } - -void CSconSyncRelationship::OpenReadStreamLC(RReadStream& aReadStream, TUid aStreamUid) - { - TRACE_FUNC_ENTRY; - LOGGER_WRITE_1("aStreamUid: 0x%08x", aStreamUid); - TUid streamUid(aStreamUid); - if ( aStreamUid.iUid == KNSmlDefaultSnapshotStreamUID ) - { - LOGGER_WRITE_1(" Default stream uid was used, use provider uid (0x%08x) as stream uid", iProviderId); - streamUid.iUid = iProviderId; - } - if ( !IsStreamPresentL( streamUid ) ) - { - LOGGER_WRITE("Stream was not present"); - User::Leave(KErrNotFound); - } - - - static_cast(aReadStream).OpenLC( - *iDictionaryStore, streamUid ); - TRACE_FUNC_EXIT; - } - -void CSconSyncRelationship::OpenWriteStreamLC(RWriteStream& aWriteStream, TUid aStreamUid) - { - TRACE_FUNC_ENTRY; - - LOGGER_WRITE_1("aStreamUid: 0x%08x", aStreamUid); - TUid streamUid(aStreamUid); - if ( aStreamUid.iUid == KNSmlDefaultSnapshotStreamUID ) - { - LOGGER_WRITE_1(" Default stream uid was used, use provider uid (0x%08x) as stream uid", iProviderId); - streamUid.iUid = iProviderId; - } - static_cast(aWriteStream).AssignLC( - *iDictionaryStore, streamUid ); - TRACE_FUNC_EXIT; - } - -TBool CSconSyncRelationship::IsStreamPresentL(TUid aStreamUid) const - { - TRACE_FUNC_ENTRY; - LOGGER_WRITE_1("aStreamUid: 0x%08x", aStreamUid.iUid ); - TUid streamUid(aStreamUid); - if ( aStreamUid.iUid == KNSmlDefaultSnapshotStreamUID ) - { - LOGGER_WRITE_1(" Default stream uid was used, use provider uid (0x%08x) as stream uid", iProviderId); - streamUid.iUid = iProviderId; - } - TBool present = iDictionaryStore->IsPresentL( streamUid ); - LOGGER_WRITE_1("CSconSyncRelationship::IsStreamPresentL() return: %d",(TInt)present); - return present; - } diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/servers/syncserver/src/sconsyncserver.cpp --- a/connectivitymodules/SeCon/servers/syncserver/src/sconsyncserver.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,177 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: CSconSyncServer implementation -* -*/ - - -#include "sconsyncserver.h" -#include "sconsyncclientserver.h" - -#include "sconsyncsession.h" -#include "debug.h" - -const TInt KSConPCConnServerUid = 0x101F99F6; - -// Security policy -const TUint KServerPolicyRangeCount = 2; - -const TInt KServerPolicyRanges[KServerPolicyRangeCount] = - { - 0, // range is 0 inclusive - EMaxService // range is 1-KMaxTInt inclusive - }; - -const TUint8 KServerPolicyElementsIndex[KServerPolicyRangeCount] = - { - 0, // applies to 0th range - CPolicyServer::ENotSupported // applies to 1st range - }; - -const CPolicyServer::TPolicyElement KServerPolicyElements[] = - { - { _INIT_SECURITY_POLICY_S0(KSConPCConnServerUid) /*_INIT_SECURITY_POLICY_C1(ECapabilityReadDeviceData)*/, CPolicyServer::EFailClient } - }; - -const CPolicyServer::TPolicy KServerPolicy = - { - 0 /*CPolicyServer::EAlwaysPass*/, // specifies all connect attempts should pass - KServerPolicyRangeCount, - KServerPolicyRanges, - KServerPolicyElementsIndex, - KServerPolicyElements - }; - - -CSconSyncServer* CSconSyncServer::NewL() - { - CSconSyncServer* self = NewLC(); - CleanupStack::Pop(self); - return self; - } - -CSconSyncServer* CSconSyncServer::NewLC() - { - CSconSyncServer* self = new(ELeave) CSconSyncServer(); - CleanupStack::PushL(self); - self->ConstructL(); - return self; - } - -CSconSyncServer::CSconSyncServer() : - CPolicyServer(EPriorityStandard, KServerPolicy, ESharableSessions) - { - } - -void CSconSyncServer::ConstructL() - { - TRACE_FUNC_ENTRY; - TInt error = Start(KSconSyncServerName); - - if (error != KErrNone) - { - User::Panic(KSconSyncServerName, error); - } - TRACE_FUNC_EXIT; - } - -CSconSyncServer::~CSconSyncServer() - { - TRACE_FUNC; - } - -CSession2* CSconSyncServer::NewSessionL(const TVersion& aVersion, const RMessage2& /*aMessage*/) const - { - TRACE_FUNC; - TVersion v(1,0,0); - if ( !User::QueryVersionSupported(v,aVersion) ) - { - TVersionName vname = aVersion.Name(); - LOGGER_WRITE_1("Client has wrong version: %S", &vname); - User::Leave( KErrNotSupported ); - } - - return CSconSyncSession::NewL(); - } - -TInt CSconSyncServer::RunError(TInt aError) - { - TRACE_FUNC_ENTRY; - LOGGER_WRITE_1("aError: %d", aError); - // Bad descriptor implies bad client - if (aError == KErrBadDescriptor) - { - Message().Panic(KSconSyncServerName, aError); - } - else - { - Message().Complete(aError); - } - - // Continue handling requests - ReStart(); - TRACE_FUNC_EXIT; - return KErrNone; - } - -void CSconSyncServer::AddSession() - { - ++iSessionCount; - LOGGER_WRITE_1("CSconSyncServer::AddSession(), iSessionCount: %d", iSessionCount); - } - -void CSconSyncServer::RemoveSession() - { - --iSessionCount; - LOGGER_WRITE_1("CSconSyncServer::RemoveSession(), iSessionCount: %d", iSessionCount); - if (iSessionCount == 0) - { - CActiveScheduler::Stop(); - } - } - -LOCAL_C void ExeMainL() - { - TRACE_FUNC_ENTRY; - // Install active scheduler - CActiveScheduler* scheduler = new(ELeave) CActiveScheduler; - CleanupStack::PushL(scheduler); - CActiveScheduler::Install(scheduler); - - CSconSyncServer::NewLC(); - - User::LeaveIfError(User::RenameThread(KSconSyncServerName)); - RProcess::Rendezvous(KErrNone); - - CActiveScheduler::Start(); - - CleanupStack::PopAndDestroy(); // CSconSyncServer - CleanupStack::PopAndDestroy(); // CActiveScheduler - TRACE_FUNC_EXIT; - } - -GLDEF_C TInt E32Main() - { - TRACE_FUNC_ENTRY; - __UHEAP_MARK; - CTrapCleanup* cleanup = CTrapCleanup::New(); - - TRAPD(error, ExeMainL()); - __ASSERT_ALWAYS(!error, User::Panic(KSconSyncServerName, error)); - - delete cleanup; - __UHEAP_MARKEND; - TRACE_FUNC_EXIT; - return 0; - } diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/servers/syncserver/src/sconsyncsession.cpp --- a/connectivitymodules/SeCon/servers/syncserver/src/sconsyncsession.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,96 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: CSconSyncSession implementation -* -*/ - - -#include "sconsyncsession.h" - -#include "sconsyncserver.h" -#include "sconsyncclientserver.h" -#include "sconasynchandler.h" -#include "debug.h" - - -CSconSyncSession::CSconSyncSession() - { - TRACE_FUNC; - } - -CSconSyncSession* CSconSyncSession::NewL() - { - TRACE_FUNC; - CSconSyncSession* self = new(ELeave) CSconSyncSession(); - CleanupStack::PushL( self ); - self->ConstructL(); - CleanupStack::Pop( self ); - return self; - } - -void CSconSyncSession::ConstructL() - { - TRACE_FUNC_ENTRY; - iAsyncHandler = CSconAsyncHandler::NewL(); - TRACE_FUNC_EXIT; - } - -void CSconSyncSession::CreateL() - { - TRACE_FUNC; - Server().AddSession(); - } - -CSconSyncSession::~CSconSyncSession() - { - TRACE_FUNC_ENTRY; - delete iAsyncHandler; - - Server().RemoveSession(); - - TRACE_FUNC_EXIT; - } - -CSconSyncServer& CSconSyncSession::Server() - { - return *static_cast(const_cast(CSession2::Server())); - } - - -// ----------------------------------------------------------------------------- -// CSconSyncSession::ServiceL() -// Handles the client request -// ----------------------------------------------------------------------------- -// -void CSconSyncSession::ServiceL(const RMessage2& aMessage) - { - TRACE_FUNC_ENTRY; - - TRAPD( err, iAsyncHandler->HandleServiceL( aMessage )); - if ( err ) - { - LOGGER_WRITE_1("iAsyncHandler->HandleServiceL leaved: %d", err); - if ( iAsyncHandler->IsActive() ) - { - LOGGER_WRITE(" and it was active -> Cancel it"); - iAsyncHandler->Cancel(); - } - // do server error processing - User::Leave( err ); - } - - TRACE_FUNC_EXIT; - } - - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/services/csc/bld/101F9698.xml Binary file connectivitymodules/SeCon/services/csc/bld/101F9698.xml has changed diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/services/csc/bld/101F99F6.xml Binary file connectivitymodules/SeCon/services/csc/bld/101F99F6.xml has changed diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/services/csc/bld/bld.inf --- a/connectivitymodules/SeCon/services/csc/bld/bld.inf Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -/* -* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* 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: Capability Object Module bld.inf file -* -*/ - - -#include - -PRJ_PLATFORMS -DEFAULT - -PRJ_EXPORTS -./101F9698.xml Z:/private/101F99F6/capability/101F9698.xml -./fwdcomp.xml Z:/private/101F99F6/capability/fwdcomp.xml -./101F99F6.xml Z:/private/101F99F6/capability/101F99F6.xml - -PRJ_MMPFILES -sconcsc.mmp diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/services/csc/bld/def/bwinscwu.def --- a/connectivitymodules/SeCon/services/csc/bld/def/bwinscwu.def Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -EXPORTS - ?CreateCSConCSCL@@YAPAVCSConCSC@@XZ @ 1 NONAME ; class CSConCSC * CreateCSConCSCL(void) - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/services/csc/bld/def/eabiuu.def --- a/connectivitymodules/SeCon/services/csc/bld/def/eabiuu.def Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -EXPORTS - _Z15CreateCSConCSCLv @ 1 NONAME - _ZTI8CSConCSC @ 2 NONAME ; ## - _ZTV8CSConCSC @ 3 NONAME ; ## - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/services/csc/bld/fwdcomp.xml Binary file connectivitymodules/SeCon/services/csc/bld/fwdcomp.xml has changed diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/services/csc/bld/sconcsc.mmp --- a/connectivitymodules/SeCon/services/csc/bld/sconcsc.mmp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,79 +0,0 @@ -/* -* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* 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: Capability Object Module mmp file -* -*/ - - -// To get the MW_LAYER_SYSTEMINCLUDE-definition -#include -#include - -VENDORID VID_DEFAULT - -CAPABILITY CAP_GENERAL_DLL - -TARGETPATH sys/bin - -TARGET sconcsc.dll -TARGETTYPE DLL -UID 0x10009D8D 0x101F9698 - -#if defined(ARMCC) -DEFFILE ./def/eabiu -#elif defined(WINSCW) -DEFFILE ./def/bwinscw -#elif defined(WINS) -DEFFILE ./def/bwins -#elif defined(ARM) -DEFFILE ./def/bmarm -#endif - -SOURCEPATH ../src -SOURCE sconcsc.cpp -SOURCE capinfo.cpp -SOURCE caputils.cpp -SOURCE caplist.cpp -SOURCE stringlist.cpp -SOURCE capparser.cpp -SOURCE sconsyncservice.cpp -SOURCE sconversioninfo.cpp - -USERINCLUDE ../inc -USERINCLUDE ../../../inc - -// Default system include paths for middleware layer modules. -//MW_LAYER_SYSTEMINCLUDE -APP_LAYER_SYSTEMINCLUDE - -DEBUGLIBRARY flogger.lib -LIBRARY euser.lib -LIBRARY efsrv.lib -LIBRARY bafl.lib -LIBRARY sysutil.lib -LIBRARY etel.lib -LIBRARY etelmm.lib -LIBRARY hal.lib -LIBRARY platformenv.lib -LIBRARY charconv.lib -LIBRARY centralrepository.lib -LIBRARY apgrfx.lib -LIBRARY apparc.lib -LIBRARY sisregistryclient.lib -LIBRARY SyncMLClientAPI.lib -LIBRARY javaregistryclient.lib -LIBRARY sysversioninfo.lib -LIBRARY Etel3rdParty.lib -LIBRARY platformver.lib - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/services/csc/inc/capability.h --- a/connectivitymodules/SeCon/services/csc/inc/capability.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,483 +0,0 @@ -/* -* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "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: Capability service controller -* -*/ - - -#ifndef _CAPABILITY_H_ -#define _CAPABILITY_H_ - -#include - -// -// string sizes -// -const TInt KBufSize(128); -const TInt KTagSize(64); -const TInt KMaxSize(512); - -const TInt KNestingLimit(10); - -// -// this directory contains xml-format files for -// Service-elements -// -_LIT(KCapabilityDirC, "c:\\private\\101F99F6\\capability\\"); -_LIT(KCapabilityDirCImport, "c:\\private\\101F99F6\\import\\"); -_LIT(KCapabilityDirZ, "z:\\private\\101F99F6\\capability\\"); - -// -// folder service constants -// -_LIT(KFolderServiceName, "Folder-Browsing"); -_LIT(KFolderServiceUid, "F9EC7BC4-953c-11d2-984E-525400DC9E09"); -_LIT(KFolderServiceVersion, "1.0"); -_LIT(KFolderServiceType, "x-obex/folder-listing"); -_LIT(KFolderMemoryTypeTag, "MemType"); -_LIT(KFolderNameTag, "Folder"); - -_LIT(KFolderImages, "Images"); -_LIT(KFolderGraphics, "Graphics"); -_LIT(KFolderTones, "Tones"); -_LIT(KFolderMusic, "Music"); -_LIT(KFolderVideos, "Videos"); -_LIT(KFolderInstalls, "Installs"); - -_LIT( KSyncSolutionsServiceName, "SyncSolutions" ); -_LIT( KSyncSolutionsServiceVersion, "1.0" ); -_LIT( KSyncCalendar, "Calendar" ); -_LIT( KSyncContacts, "Contacts" ); -_LIT( KSyncSms, "Sms" ); -_LIT( KSyncBookmark, "Bookmark" ); - -_LIT( KDesktopSync, "DesktopSync" ); - -enum TFolderTypes - { - EFolderImages, - EFolderGraphics, - EFolderTones, - EFolderMusic, - EFolderVideos, - EFolderInstalls - }; - - -// -// misc capabily document strings -// -_LIT(KServiceHeader, ""); -_LIT(KXmlVersion, ""); -_LIT(KComment1, ""); -_LIT(KDocType, ""); -_LIT(KRootBegin, ""); -_LIT(KRootEnd, ""); -_LIT(KCommentBegin, ""); -_LIT(KFormatText, " "); -_LIT(KXmlExtension, ".xml"); - - -// -// manufacturers -// -_LIT(KManufacturerNokia, "Nokia"); -_LIT(KManufacturerEricsson, "Ericsson"); -_LIT(KManufacturerMotorola, "Motorola"); -_LIT(KManufacturerPanasonic, "Panasonic"); -_LIT(KManufacturerPsion, "Psion"); -_LIT(KManufacturerIntel, "Intel"); -_LIT(KManufacturerCogent, "Cogent"); -_LIT(KManufacturerCirrus, "Cirrus"); -_LIT(KManufacturerLinkup, "Linkup"); -_LIT(KManufacturerTexasInstruments, "TexasInstruments"); - - -// -// media types (TMediaType in e32std.h) -// -_LIT(KMediaMMC, "MMC"); // memory card -_LIT(KMediaFlash, "DEV"); // device memory - -// -// TElementType contains all element types used in -// capabilty xml document -// -// -enum TElementType - { - ECapability, - EGeneral, - EManufacturer, - EModel, - ESN, - EOEM, - ESW, - EFW, - EHW, - ELanguage, - EMemory, - EMemType, - ELocation, - EFree, - EUsed, - EShared, - EFileSize, - EFolderSize, - EFileNLen, - EFolderNLen, - ECaseSenN, - - EExt, - EXNam, - EXVal, - - EObject, - EType, - EName_Ext, - ESize, - - EAccess, - EProtocol, - EEndpoint, - ETarget, - - EInbox, - EService, - EName, - EUUID, - EVersion, - - EAttVersion, - EAttDate, - - EAttCurrentNetwork, - EAttHomeNetwork, - EAttCountryCode - }; - - - - -// -// KXmlTokens contains all tokens (=tags) used in -// capabilty xml document -// -// - -typedef const TText* TTag; -NONSHARABLE_STRUCT( TXmlToken ) - { - TInt id; - TTag tag; - }; - -const TXmlToken KXmlTokens[] = - { - {ECapability, _S("Capability")}, - {EGeneral, _S("General")}, - {EManufacturer, _S("Manufacturer")}, - {EModel, _S("Model")}, - {ESN, _S("SN")}, - {EOEM, _S("OEM")}, - {ESW, _S("SW")}, - {EFW, _S("FW")}, - {EHW, _S("HW")}, - {ELanguage, _S("Language")}, - {EMemory, _S("Memory")}, - {EMemType, _S("MemType")}, - {ELocation, _S("Location")}, - {EFree, _S("Free")}, - {EUsed, _S("Used")}, - {EShared, _S("Shared")}, - {EFileSize, _S("FileSize")}, - {EFolderSize, _S("FolderSize")}, - {EFileNLen, _S("FileNLen")}, - {EFolderNLen, _S("FolderNLen")}, - {ECaseSenN, _S("CaseSenN")}, - {EExt, _S("Ext")}, - {EXNam, _S("XNam")}, - {EXVal, _S("XVal")}, - {EObject, _S("Object")}, - {EType, _S("Type")}, - {EName_Ext, _S("Name_Ext")}, - {ESize, _S("Size")}, - {EAccess, _S("Access")}, - {EProtocol, _S("Protocol")}, - {EEndpoint, _S("Endpoint")}, - {ETarget, _S("Target")}, - {EInbox, _S("Inbox")}, - {EService, _S("Service")}, - {EName, _S("Name")}, - {EUUID, _S("UUID")}, - {EVersion, _S("Version")}, - {EXNam, _S("XNam")}, - {EXVal, _S("XVal")}, - {EAttVersion, _S("Version")}, - {EAttDate, _S("Date")}, - {EAttCurrentNetwork,_S("CurrentNetwork")}, - {EAttHomeNetwork, _S("HomeNetwork")}, - {EAttCountryCode, _S("CountryCode")} - }; - -#define NUMXMLTOKENS (sizeof(KXmlTokens)/sizeof(TXmlToken)) - - - - -// -// string array to convert symbian TLanguage enums to -// ISO 639 language codes -// -// See "http://www.sil.org/iso639-3/default.asp" -// - -typedef const TText* TLangString; -NONSHARABLE_STRUCT( TLangStringStruct ) - { - TInt id; - TLangString lang; - }; - -/** - * Language mapping table. - */ -const TLangStringStruct KLangStrings[] = - { - {ELangEnglish, _S("en")}, - {ELangFrench, _S("fr")}, - {ELangGerman, _S("de")}, - {ELangSpanish, _S("es")}, - {ELangItalian, _S("it")}, - {ELangSwedish, _S("sv")}, - {ELangDanish, _S("da")}, - {ELangNorwegian, _S("no")}, - {ELangFinnish, _S("fi")}, - - {ELangAmerican, _S("en_US")}, - {ELangSwissFrench, _S("fr_CH")}, - {ELangSwissGerman, _S("de_CH")}, - {ELangPortuguese, _S("pt")}, - {ELangTurkish, _S("tr")}, - {ELangIcelandic, _S("is")}, - {ELangRussian, _S("ru")}, - {ELangHungarian, _S("hu")}, - {ELangDutch, _S("nl")}, - - {ELangBelgianFlemish, _S("nl_BE")}, - {ELangAustralian, _S("aus")}, - {ELangBelgianFrench, _S("fr_BE")}, - {ELangAustrian, _S("de_AT")}, - {ELangNewZealand, _S("en_NZ")}, - {ELangInternationalFrench, _S("fr")}, - {ELangCzech, _S("cs")}, - {ELangSlovak, _S("sk")}, - {ELangPolish, _S("pl")}, - - {ELangSlovenian, _S("sl")}, - {ELangTaiwanChinese, _S("zh_TW")}, - {ELangHongKongChinese, _S("zh_HK")}, - {ELangPrcChinese, _S("zh_CN")}, - {ELangJapanese, _S("ja")}, - {ELangThai, _S("th")}, - {ELangAfrikaans, _S("af")}, - {ELangAlbanian, _S("sq")}, - {ELangAmharic, _S("am")}, - - {ELangArabic, _S("ar")}, - {ELangArmenian, _S("hy")}, - {ELangTagalog, _S("tl")}, - {ELangBelarussian, _S("be")}, - {ELangBengali, _S("bn")}, - {ELangBulgarian, _S("bg")}, - {ELangBurmese, _S("my")}, - {ELangCatalan, _S("ca")}, - {ELangCroatian, _S("hr")}, - - {ELangCanadianEnglish, _S("en_CA")}, - {ELangInternationalEnglish, _S("en")}, - {ELangSouthAfricanEnglish, _S("en_ZA")}, - {ELangEstonian, _S("et")}, - {ELangFarsi, _S("fa")}, - {ELangCanadianFrench, _S("fr_CA")}, - {ELangScotsGaelic, _S("gd")}, - {ELangGeorgian, _S("ka")}, - {ELangGreek, _S("el")}, - - {ELangCyprusGreek, _S("el_CY")}, - {ELangGujarati, _S("gu")}, - {ELangHebrew, _S("he")}, - {ELangHindi, _S("hi")}, - {ELangIndonesian, _S("id")}, - {ELangIrish, _S("ga")}, - {ELangSwissItalian, _S("it_CH")}, - {ELangKannada, _S("kn")}, - {ELangKazakh, _S("kk")}, - - {ELangKhmer, _S("km")}, - {ELangKorean, _S("ko")}, - {ELangLao, _S("lo")}, - {ELangLatvian, _S("lv")}, - {ELangLithuanian, _S("lt")}, - {ELangMacedonian, _S("mk")}, - {ELangMalay, _S("ms")}, - {ELangMalayalam, _S("ml")}, - {ELangMarathi, _S("mr")}, - - {ELangMoldavian, _S("mo")}, - {ELangMongolian, _S("mn")}, - {ELangNorwegianNynorsk, _S("nn")}, - {ELangBrazilianPortuguese, _S("pt_BR")}, - {ELangPunjabi, _S("pa")}, - {ELangRomanian, _S("ro")}, - {ELangSerbian, _S("sr")}, - {ELangSinhalese, _S("si")}, - {ELangSomali, _S("so")}, - - {ELangInternationalSpanish, _S("es")}, - {ELangLatinAmericanSpanish, _S("es_US")}, - {ELangSwahili, _S("sw")}, - {ELangFinlandSwedish, _S("sv_FI")}, - {ELangReserved1, _S("en")}, - {ELangTamil, _S("ta")}, - {ELangTelugu, _S("te")}, - {ELangTibetan, _S("bo")}, - {ELangTigrinya, _S("ti")}, - - {ELangCyprusTurkish, _S("tr_CY")}, - {ELangTurkmen, _S("tk")}, - {ELangUkrainian, _S("uk")}, - {ELangUrdu, _S("ur")}, - {ELangReserved2, _S("en")}, - {ELangVietnamese, _S("vi")}, - {ELangWelsh, _S("cy")}, - {ELangZulu, _S("zu")}, - {ELangOther, _S("other")}, - - {ELangManufacturerEnglish, _S("en")}, - {ELangSouthSotho, _S("st")}, - {ELangBasque, _S("eu")}, - {ELangGalician, _S("gl")}, - {ELangJavanese, _S("jv")}, - {ELangMaithili, _S("bh")}, - {ELangAzerbaijani_Latin, _S("az")}, - {ELangAzerbaijani_Cyrillic, _S("az")}, - {ELangOriya, _S("or")}, - {ELangBhojpuri, _S("bh")}, - {ELangSundanese, _S("su")}, - {ELangKurdish_Latin, _S("ku")}, - {ELangKurdish_Arabic, _S("ku")}, - {ELangPashto, _S("ps")}, - {ELangHausa, _S("ha")}, - {ELangOromo, _S("om")}, - {ELangUzbek_Latin, _S("uz")}, - {ELangUzbek_Cyrillic, _S("uz")}, - {ELangSindhi_Arabic, _S("sd")}, - {ELangSindhi_Devanagari, _S("sd")}, - {ELangYoruba, _S("yo")}, - {ELangCebuano, _S("ceb")}, - {ELangIgbo, _S("ig")}, - {ELangMalagasy, _S("mg")}, - {ELangNepali, _S("ne")}, - {ELangAssamese, _S("as")}, - {ELangShona, _S("sn")}, - {ELangZhuang, _S("za")}, - {ELangMadurese, _S("mad")}, - - {ELangEnglish_Apac, _S("en")}, - {ELangEnglish_Taiwan, _S("en")}, - {ELangEnglish_HongKong, _S("en")}, - {ELangEnglish_Prc, _S("en")}, - {ELangEnglish_Japan, _S("en")}, - {ELangEnglish_Thailand, _S("en")}, - - {ELangFulfulde, _S("ff")}, - {ELangTamazight, _S("ber")}, - {ELangBolivianQuechua, _S("qu")}, - {ELangPeruQuechua, _S("qu")}, - {ELangEcuadorQuechua, _S("qu")}, - {ELangTajik_Cyrillic, _S("tg")}, - {ELangTajik_PersoArabic, _S("tg")}, - {ELangNyanja, _S("ny")}, - {ELangHaitianCreole, _S("ht")}, - {ELangLombard, _S("lmo")}, - {ELangKoongo, _S("kg")}, - {ELangAkan, _S("ak")}, - {ELangHmong, _S("hmn")}, - {ELangYi, _S("ii")}, - {ELangTshiluba, _S("lu")}, - {ELangIlocano, _S("ilo")}, - {ELangUyghur, _S("ug")}, - {ELangNeapolitan, _S("nap")}, - {ELangRwanda, _S("rw")}, - {ELangXhosa, _S("xh")}, - {ELangBalochi, _S("bal")}, - {ElangHiligaynon, _S("hil")}, - {ELangMinangkabau, _S("min")}, - {ELangMakhuwa, _S("vmw")}, - {ELangSantali, _S("sat")}, - {ELangGikuyu, _S("ki")}, - {ELangMoore, _S("mos")}, - {ELangGuarani, _S("gnHI")}, - {ELangRundi, _S("ru")}, - {ELangRomani_Latin, _S("rom")}, - {ELangRomani_Cyrillic, _S("rom")}, - {ELangTswana, _S("tn")}, - {ELangKanuri, _S("kr")}, - {ELangKashmiri_Devanagari, _S("ks")}, - {ELangKashmiri_PersoArabic, _S("ks")}, - {ELangUmbundu, _S("umb")}, - {ELangKonkani, _S("kok")}, - {ELangBalinese, _S("ban")}, - {ELangNorthernSotho, _S("nso")}, - {ELangWolof, _S("wo")}, - {ELangBemba, _S("bmy")}, - {ELangTsonga, _S("ts")}, - {ELangYiddish, _S("yi")}, - {ELangKirghiz, _S("ky")}, - {ELangGanda, _S("lg")}, - {ELangSoga, _S("xog")}, - {ELangMbundu, _S("kmb")}, - {ELangBambara, _S("bm")}, - {ELangCentralAymara, _S("ay")}, - {ELangZarma, _S("dje")}, - {ELangLingala, _S("ln")}, - {ELangBashkir, _S("ba")}, - {ELangChuvash, _S("cv")}, - {ELangSwati, _S("ss")}, - {ELangTatar, _S("tt")}, - {ELangSouthernNdebele, _S("nr")}, - {ELangSardinian, _S("sc")}, - {ELangScots, _S("sco")}, - {ELangMeitei, _S("mni")}, - {ELangWalloon, _S("wa")}, - {ELangKabardian, _S("kbd")}, - {ELangMazanderani, _S("mzn")}, - {ELangGilaki, _S("glk")}, - {ELangShan, _S("shn")}, - {ELangLuyia, _S("luy")}, - {ELanguageLuo, _S("luo")}, - {ELangSukuma, _S(" suk")}, - {ELangAceh, _S("ace")}, - {ELangMalay_Apac, _S("ms")} - }; - -#define NUMLANGSTRINGS (sizeof(KLangStrings)/sizeof(TLangStringStruct)) - - - - -#endif // capability.h - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/services/csc/inc/capinfo.h --- a/connectivitymodules/SeCon/services/csc/inc/capinfo.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,94 +0,0 @@ -/* -* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "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: Capability service controller -* -*/ - - -#ifndef _CAPINFO_H_ -#define _CAPINFO_H_ - -#include -#include - -#include "caputils.h" - -// -// CCapInfo creates capability document -// -// - -class CCapList; -class CStringList; -class TSConSolutionInfo; -class CSconVersionInfo; - -NONSHARABLE_CLASS( CCapInfo ) : public CBase -{ -public: - static CCapInfo* NewL(); - ~CCapInfo(); -private: - CCapInfo(); - void ConstructL(); - -public: - void CapabilityDocumentL( CBufFlat* aBuf ); - -private: - CCapList* CapList(); - void SetCapabilityBuf( CBufFlat* aBuf ); - - void GeneralInfoL(); - void MemoryInfoL(); - void WriteMemoryInfoL( TMemoryInfo& aInfo ); - void ServiceInfoL( const TDesC& aDir, const RArray& aExcludeList, - RArray& aFilesAdded ); - void FolderServiceL(); - - void SyncSolutionsServiceL(); - void WriteSyncSolutionsServiceL( const TSConSolutionInfo& aCalendar, - const TSConSolutionInfo& aContact, - const TSConSolutionInfo& aSms, - const TSConSolutionInfo& aBookmark ); - void WriteSolutionTagL( const TDesC& aContentName, const TSConSolutionInfo& aSolution ); - - void WriteFolderL( const TDesC& aType, const TDesC& aFullName, const TDesC& aMemory ); - - void WriteValueL( TInt aId, const TDesC& aValue ); - void WriteBigValueL( TInt aId, const TDesC& aValue ); - void WriteValueL( TInt aId, TInt64 aValue ); - void WriteTagL( TInt aId, TInt aType ); - void WriteAttributeL( TInt aId, const TDesC& aVersion, const TDesC& aDate ); - void WriteL( const TDesC& aText ); - - void WriteFromListL( CStringList* aList ); - void WriteNewLineL(); - - void FormatElement( TDes& aText ); - void AddFormatText( TDes& aText, TInt aNum ) const; - -private: - RFs iFsSession; // has - CCapList* iCapList; // has - HBufC8* iHeapBuf; // has - TBuf iBuf; - TIdStack iIdStack; - - CBufFlat* iCapabilityBuf; // uses - CSconVersionInfo* iSconInfo; -}; - -#endif // CCapability - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/services/csc/inc/caplist.h --- a/connectivitymodules/SeCon/services/csc/inc/caplist.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,107 +0,0 @@ -/* -* Copyright (c) 2005-2007 Nokia Corporation and/or 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: CCapList header file. -* -*/ - - -#ifndef _CAPLIST_H_ -#define _CAPLIST_H_ - -// INCLUDES - -#include -#include -#include "stringlist.h" - -// -// Class CCapList -// -NONSHARABLE_CLASS( CCapList ) : public CBase -{ -public: - /** - * Two-phase constructor. - * @return CCapList instance - */ - static CCapList* NewL(); - /** - * Destructor - * @return none - */ - ~CCapList(); - -private: - /** - * Constructor - * @return none - */ - CCapList(); - /** - * Initializes the member data - * @return none - */ - void ConstructL(); - /** - * Operator = - * @param aList The data to be copied - * @return none - */ - void operator=(const CCapList& aList); // not allowed - -public: - /** - * Returns the list - * @return The CStringList object - */ - CStringList* List(); - -public: - /** - * Find element - * @param aId - * @param aType - * @param aIndex (Default=0) - * @return position - */ - TInt Find(TInt aId, TInt aType, TInt aIndex=0); - /** - * Find from mark - * @param aId - * @param aType - * @return position - */ - TInt FindFromMark(TInt aId, TInt aType); - /** - * Finds service xml-file identification header. This header must be the first - * line in every service file. - * @return ETrue if service header found - */ - TBool FindServiceHeader(); - /** - * Find service - * @param aList The source list - * @return ETrue if Service is found - */ - TBool FindServiceL(CStringList* aList); - -private: - CStringList* iList; // has -}; - -#endif - -// End of file - - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/services/csc/inc/capparser.h --- a/connectivitymodules/SeCon/services/csc/inc/capparser.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,296 +0,0 @@ -/* -* Copyright (c) 2005-2008 Nokia Corporation and/or 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: CapParser header file -* -*/ - - - -#ifndef _CAPPARSER_H_ -#define _CAPPARSER_H_ - -// INCLUDES - -#include -#include - -// -// Class CapParser -// -NONSHARABLE_CLASS( CapParser ) - { - -public: - /** - * Parses element's id and type (eg. "" -> EMemory, EElementBegin) - * @param aText - * @param aId - * @param aType - * @return none - */ - static void ParseElement(const TDesC& aText, TInt& aId, TInt& aType); - -public: - /** - * Constructs element with value (eg. "23456"). - * @param aText - * @param aId - * @param aValue - * @return none - */ - static void MakeElementL(TDes& aText, TInt aId, const TDesC& aValue); - /** - * Constructs element without value (eg. "" or ""). - * @param aText - * @param aId - * @param aType - * @return none - */ - static void MakeElementL(TDes& aText, TInt aId, TInt aType); - /** - * Constructs element with attributes "Version" and "Date"(eg. - * ""). - * @param aText - * @param aId - * @param aVersion - * @param aDate - * @return none - */ - static void MakeElementL(TDes& aText, TInt aId, const TDesC& aVersion, - const TDesC& aDate); - /** - * Constructs element with attributes - * @param aText - * @param aId - * @param aAttributes - * @return none - */ - static void MakeElementL(TDes& aText, TInt aId, CDesCArrayFlat* aAttributes); - -public: - /** - * Returns capability element id (eg. EMemory). - * @param aText - * @return none - */ - static TInt ElementId(const TDesC& aText); - /** - * Returns capability element tag (eg. "Memory"). - * @param aText - * @param aId - * @return none - */ - static void GetTagL(TDes& aText, TInt aId); - -private: - /** - * Replaces special characters to xml compliant. - * @param aText - * @param aValue - * @return none - */ - static void ReplaceSpecialCharsL( TDes& aText, const TDesC& aValue ); - }; - - -// -// Class TXmlParser -// -NONSHARABLE_CLASS( TXmlParser ) - { - -public: - enum TElementType - { - EElementValue, - EElementBegin, - EElementEnd, - EElementEmpty, - EElementAtt, - EElementComment, - EElementVersion, - EElementDocType, - EElementUnknown - }; - - -public: - /** - * Sets a tag - * @param aText The tag - * @return none - */ - void Set(const TDesC& aText); - /** - * Returns type - * @return type - */ - TInt Type() const; - /** - * Returns a pointer to a tag - * @return The tag pointer - */ - TPtrC Tag() const; - /** - * Gets the tag - * @param aText The tag buffer - * @return none - */ - void GetTag(TDes& aText) const; - -private: - /** - * Parses value (eg. en) - * @return Operation success - */ - TBool ElementValue(); - /** - * Parses beginning tag (eg. ) - * @return Operation success - */ - TBool ElementBegin(); - /** - * Parses ending tag (eg. ) - * @return Operation success - */ - TBool ElementEnd(); - /** - * Parses empty element (eg. ) - * @return Operation success - */ - TBool ElementEmpty(); - /** - * Parses attribute element (eg. ) - * Note: Attribute values cannot contain equals (=) or quotations (") - * @return Operation success - */ - TBool ElementAtt(); - /** - * Identifies comment element (""). - * @return Operation success - */ - TBool ElementComment(); - /** - * Parses unknown elements - * @return Operation success - */ - TBool ElementUnknown(); - /** - * Identifies version element ("") - * @return Operation success - */ - TBool ElementVersion(); - /** - * Identifies document type element - * (""). - * @return Operation success - */ - TBool ElementDocType(); - -private: - /** - * Inits the parser - * @return none - */ - void Init(); - /** - * Parses xml-element. - * @return none - */ - void Parse(); - -public: - /** - * Validates the character - * @param aChar The char to be validated. - * @return ETrue if the char is valid - */ - static TBool ValidChar(const TChar aChar); - /** - * Validates the tag - * @param aText The tag to be validated. - * @return ETrue if the tag is valid - */ - static TBool ValidTag(const TDesC& aText); - /** - * Returns the number of characters (aChar) - * @param aText The buffer - * @param aChar The character - * @return The number of characters - */ - static TInt Count(const TDesC& aText, const TChar aChar); - /** - * Returns the position of the first non space character - * @param aText The buffer - * @return The position - */ - static TInt FirstNonSpace(const TDesC& aText); - /** - * Returns the position of the last non space character - * @param aText The buffer - * @return The position - */ - static TInt LastNonSpace(const TDesC& aText); - /** - * Function returns a sub-string between aPos1 and aPos2 - * @param aText The buffer - * @param aText Start position - * @param aText End position - * @return The pointer to the substring - */ - static TPtrC SubStr(const TDesC& aText, TInt aPos1, TInt aPos2); - /** - * Function performs string copy with length checking. - * @param aTarget Target buffer - * @param aSource Source buffer - * @return none - */ - static void StrCopy(TDes& aTarget, const TDesC& aSource); - -private: - /** - * Returns a string - * @return A pointer to a string - */ - TPtrC Str() const; - /** - * Trimmer function - * @return none - */ - void TrimOriginal(); - /** - * Function returns sub string between aPos1 and aPos2 - * @param aPos1 Start position - * @param aPos2 End posiotion - * @return none - */ - TPtrC SubStr(TInt pos1, TInt pos2); - -private: - TPtrC iOriginal; - TPtrC iText; - TPtrC iTag; - TPtrC iValue; - TInt iType; - - TInt iSlash; - TInt iFirst; - TInt iLast; - }; - -#endif - -// End of file - - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/services/csc/inc/caputils.h --- a/connectivitymodules/SeCon/services/csc/inc/caputils.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,252 +0,0 @@ -/* -* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* 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: CapUtil header file -* -*/ - - -// INCLUDES - -#ifndef _CAPUTILS_H_ -#define _CAPUTILS_H_ - -#include "capability.h" - -class RFs; - -// -// TMemoryInfo -// -NONSHARABLE_CLASS( TMemoryInfo ) - { -public: - TChar iDriveLetter; - TInt iDriveNum; - TBuf<16> iLocation; - TInt64 iFree; - TInt64 iUsed; - TBool iShared; - TInt64 iFileSize; - TInt64 iFolderSize; - TInt iFileNameSize; - TInt iFolderNameSize; - TBool iCaseSensitivity; - TUint iDriveStatus; - TInt iMemNr; - }; - -// -// CapUtil -// -NONSHARABLE_CLASS( CapUtil ) - { -public: - /** - * Gets default root path from pathinfo. - * @param aText - * @param aType - * @return none - */ - static void GetDefaultRootPathL( RFs& aFs, TDes& aRootPath ); - - /** - * Gets memory type. - * @param aFs - * @param aMemoryType - * @param aDrive - * @return none - */ - static void GetMemoryType( RFs& aFs, TDes& aMemoryType, const TInt aDrive ); - - /** - * Gets language - * @param aText - * @return none - */ - static void GetLanguage( TDes& aText ); - - /** - * Gets SW version, SW version date and device model from SysUtil. - * @param aVersion SW version - * @param aDate SW date - * @param aModel Device model - * @return none - */ - static void GetSWVersionL( TDes& aVersion, TDes& aDate, TDes& aModel ); - - /** - * Gets phone manufacturer from HAL. In case manufacturer is not known, - * empty value is used. - * @param aText Manufacturer - * @return none - */ - static void GetManufacturer( TDes& aText ); - - /** - * Get memory information for one drive. - * @param aFs RFs handle - * @param aDriveNumber drive number - * @param aInfo Memory information - * @return none - */ - static void GetMemoryInfoL( const RFs& aFs, const TInt aDriveNumber, TMemoryInfo& aInfo ); - - /** - * Initializes TMemoryInfo. - * @param aInfo TMemoryInfo to be initialized - * @return none - */ - static void InitMemoryInfo( TMemoryInfo& aInfo ); - - /** - * Get language string for aId. - * @param aId Language id - * @param aText Language text - * @return none - */ - static void GetLanguageString( TLanguage aId, TDes& aText ); - - /** - * Finds all files in aDir. - * @param aFs RFs handle - * @param aDir Directory - * @param aList List of files in directory - * @return none - */ - static void GetFileListL( const RFs& aFs, const TDesC& aDir, - RArray& aList ); - - - /** - * Gets operator name, country code, network ID - * @param aLongName - * @param aCountryCode - * @param aNetworkID - * @return none - */ - static void GetOperatorNameL( TDes& aLongName, TDes& aCountryCode, TDes& aNetworkID ); - - /** - * Creates a panic - * @param aReason Panic code - * @return none - */ - static void Panic( TInt aReason ); - - /** - * String copy with lenght check. - * @param aTarget Target string - * @param aSource Source string - * @return none - */ - static void StrCopy( TDes& aTarget, const TDesC& aSource ); - - /** - * Function converts �nteger to string. - * @param aText string - * @param aNum integer - * @return none - */ - static void IntToStr( TDes& aText, TInt64 aNum ); - - /** - * Function converts string to integer. If string cannot be converted, - * error code is returned. - * @param aText string - * @param aNum integer - * @return error code - */ - static TInt StrToInt( const TDesC& aText, TInt& aNum ); - - /** - * Function splits string (eg "name1, name2, name3") into substrings. - * @param aText string - * @param aSeparator separator character - * @param aArray substrings - * @return none - */ - static void SplitL( const TDesC& aText, const TChar aSeparator, - RArray& aArray ); - - /** - * Constructs capability date as string - * @param aText string - * @param aTime time object - * @return none - */ - static void CapabilityDate( TDes& aText, const TTime aTime ); - - /** - * Function parses date string of the format "dd-mm-yy". - * @param aText string - * @return time object - */ - static TTime ParseDateL( const TDesC& aText ); - - /** - * Function return TMonth presentation of integer - * @param aNum - * @return TMonth object - */ - static TMonth Month( TInt aNum ); - - /** - * Function checks file extension. - * @param aFile File name - * @param aExt extension - * @return boolean - */ - static TBool CheckFileType( const TDesC& aFile, const TDesC& aExt ); - }; - -// -// TIdStack -// -NONSHARABLE_CLASS( TIdStack ) - { -public: - - /** - * Push id to the stack - * @param aId Id number - * @return none - */ - void Push( TInt aId ); - - /** - * Pop id from the stack - * @return id - */ - TInt Pop(); - - /** - * Size of the stack - * @return size - */ - TInt Size() const; - - /** - * Reset the stack. - * @return none - */ - void Reset(); - -private: - TInt iPos; - TFixedArray iArray; - }; - -#endif // CapUtils.h - -// End of file diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/services/csc/inc/sconcsc.h --- a/connectivitymodules/SeCon/services/csc/inc/sconcsc.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -/* -* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* 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: CSConCSC header file -* -*/ - - -// INCLUDES - -#ifndef _SCONCSC_H_ -#define _SCONCSC_H_ - -#include - -class CCapInfo; - -//============================================================ -// Class CSConCSC declaration -//============================================================ -class CSConCSC : public CBase -{ -public: - static CSConCSC* NewL(); - ~CSConCSC(); - -public: - // Creates capability object and places it into aBuf. - // Returns system error code - virtual TInt CapabilityObject( CBufFlat& aBuf ); - -private: - void CapabilityObjectL( CBufFlat& aBuf ); - - CSConCSC(); - virtual void ConstructL(); - -private: // data - CCapInfo* iCapInfo; - -}; - -IMPORT_C CSConCSC* CreateCSConCSCL(); -typedef CSConCSC* (*TSConCreateCSConCSCFunc) (); - - -#endif // SCONCSC - -// End of file - - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/services/csc/inc/sconsyncservice.h --- a/connectivitymodules/SeCon/services/csc/inc/sconsyncservice.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,116 +0,0 @@ -/* -* Copyright (c) 2007 Nokia Corporation and/or 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: CSConSyncService header file. -* -*/ - - -#ifndef _SCONSYNCSERVICE_H_ -#define _SCONSYNCSERVICE_H_ - -#include -#include // RApaLsSession -#include - - -class TApaAppInfo; -class RApaLsSession; -class CRepository; - - -class TSConSolutionInfo - { - public: - TSConSolutionInfo():iTime(0){} - public: - TFileName iSolutionName; - TUint iUid; - TTime iTime; - }; - -/** - * This class provides information about active sync solutions. - * - * @code - * CSConSyncService *syncService = CSConSyncService::NewLC(); - * SConSolutionInfo solutionInfo; - * syncService->GetSolutionL( KSeconCalendarUid, solutionInfo ); - * CleanupStack::PopAndDestroy( syncService ); - * @endcode - * - * @since S60 v5.0 - */ -NONSHARABLE_CLASS( CSConSyncService ) : public CBase - { - public: - static CSConSyncService* NewLC(); - ~CSConSyncService(); - - /** - * Populate SolutionInfo according to content type. - * - * @since S60 v5.0 - * @param aSeconContentType Contenttype to be readed - * @param aSolutionInfo contains founded solution info, - * solution info is empty if not found - * @return none - */ - void GetSolutionL( const TUint aSeconContentType, TSConSolutionInfo& aSolutionInfo ); - - private: - - CSConSyncService(); - void ConstructL(); - - // Return correct providerId according to content type. - TSmlDataProviderId ProviderId( const TUint32 aSeconContentType ) const; - - // Parse time from text - TInt ParseTimestamp( TTime& aTime, const TDesC& aTimestamp ) const; - - // Get application caption. - void GetApplicationCaptionL( TDes& aCaption, const TUid aAppUid ); - - // Search UID from installed applications, return app caption - void GetInstPackageCaptionL( TDes& aCaption, const TUid aPackageUid ); - - // Gets last used profile for selected provider - void GetLastUsedProfileNameL( TDes& aProfileName, TTime& aTime, - const TSmlDataProviderId& aDataProviderId ); - - // Gets last sync time for certain profile and provider. - void GetLastSyncTimeL( TTime& aTime, const TSmlProfileId aSyncProfileId, - const TSmlDataProviderId aDataProviderId ); - - // Gets provider task id from profile - void GetProviderTaskL( TSmlTaskId& aProviderTask, - RSyncMLDataSyncProfile& aSyncProfile, - const TSmlDataProviderId aDataProviderId ) const; - - // Gets latest historyJob where task is correct. - const CSyncMLHistoryJob* LatestHistoryJob( RSyncMLHistoryLog& aHistoryLog, - TInt aTaskId ) const; - - // Returns ETrue if task exists in HistoryJob. - TBool TaskExist( const CSyncMLHistoryJob* aHistoryJob, TInt aTaskId ) const; - - private: // data - TBool iApaSessionConnected; - RApaLsSession iApaSession; - TBool iSyncSessionOpened; - RSyncMLSession iSyncSession; - CRepository* iRepository; - }; - -#endif // _SCONSYNCSERVICE_H_ diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/services/csc/inc/sconversioninfo.h --- a/connectivitymodules/SeCon/services/csc/inc/sconversioninfo.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,116 +0,0 @@ -/* -* Copyright (c) 2008-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: Handles version fetching -* -*/ - - -#ifndef SCONVERSIONINFO_H_ -#define SCONVERSIONINFO_H_ - -#include -#include -#include -#include -#include - -const TInt KSconSWVersionSize = 50; -const TInt KSconDateSize = 16; -const TInt KMaxLangSize = 5; - -NONSHARABLE_CLASS( CSconVersionInfo ) : public CBase -{ -public: - CSconVersionInfo(); - ~CSconVersionInfo(); - - static CSconVersionInfo* NewL(); - - /** - * - * @param aFs RFs session - * @return none. - */ - void FetchInfoL( RFs& aFs ); - - /** - * Is all data ready. - * @return ETrue if FetchInfoL has been called succesfully. - */ - TBool IsReady(); - - /** - * Get symbian version. FetchInfoL must be called first - * @param aSymbianVersion symbian version - * @return error code. - */ - TInt GetSymbianVersion( SysVersionInfo::TSymbianOSVersion& aSymbianVersion ); - - /** - * Get S60 platform version. FetchInfoL must be called first - * @param aS60Version S60 platform version - * @return error code. - */ - TInt GetS60Version( VersionInfo::TPlatformVersion& aS60Version ); - -public: // data - - /** Contains the manufacturer name. For example "Nokia". */ - HBufC* iManufacturer; - - /** Contains the phone model sales name. For example "N01". */ - HBufC* iModel; - - /** Contains the product code name. For example "RM-1". */ - HBufC* iProduct; - - /** Contains the product revision. For example "01". */ - HBufC* iRevision; - - TBuf< KSconDateSize > iDate; - - HBufC* iSWVersion; - - /** Phone serial number (IMEI or ESN), in character string format. */ - HBufC* iSerialNumber; - - TBuf iLanguage; - - HBufC* iSysVersionInfo; - - HBufC* iLangVersion; - - HBufC* iLangSWVersion; - - HBufC* iOPVersion; - - TSize iScreenSize; - - HBufC* iProductCode; - - TInt iDesktopSyncError; - TInt iDesktopSync; - -private: - TBool iInfoFetched; // ETrue if FetchInfoL has been called succesfully. - - TInt iSymbianVersionError; - SysVersionInfo::TSymbianOSVersion iSymbianVersion; - - TInt iS60VersionError; - VersionInfo::TPlatformVersion iS60Version; - -}; - -#endif /*SCONVERSIONINFO_H_*/ diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/services/csc/inc/stringlist.h --- a/connectivitymodules/SeCon/services/csc/inc/stringlist.h Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,142 +0,0 @@ -/* -* Copyright (c) 2005-2007 Nokia Corporation and/or 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: CStringList header file -* -*/ - - -#ifndef _STRINGLIST_H_ -#define _STRINGLIST_H_ - -// INCLUDES - -#include -#include // for CDesCArrayFlat -#include - -// -// CStringList is used for storing lines of text. -// -NONSHARABLE_CLASS( CStringList ) : public CBase -{ -public: - /** - * Two-phase constructor. The created instance is placed to cleanup stack - * @param aFileName Default KNullDesC - * @return CStringList instance - */ - static CStringList* NewLC(); - /** - * Two-phase constructor. - * @param aFileName Default KNullDesC - * @return CStringList instance - */ - static CStringList* NewL(); - /** - * Destructor - * @return none - */ - ~CStringList(); - -public: - /** - * Returns the count of lines - * @return The count - */ - TInt Count() const; - /** - * Returns pointer to the string - * @param aIndex The position - * @return String pointer - */ - TPtrC16 ReadPtr(TInt aIndex); - /** - * Copies a string / strings - * @param aSource Source buffer - * @param aStart A start position - * @param aStop A stop position - * @return none - */ - void CopyL(CStringList* aSource, TInt aStart, TInt aStop); - /** - * Resets iLines - * @return none - */ - void Reset(); - /** - * Returns the mark - * @return Mark value - */ - TInt Mark() const; - /** - * Sets mark - * @param aMark The mark value - * @return none - */ - void SetMark(TInt aMark); - /** - * Read strings from file. - * @param aText The tag buffer - * @return none - */ - void ReadFromFileL( RFs& aFs, const TDesC& aName ); - -private: - /** - * Default constuctor - * @return none - */ - CStringList(); - /** - * Initializes member data - * @param aFileName The file name - * @return none - */ - void ConstructL(); - /** - * Creates a panic - * @param aPanic Panic code - * @return none - */ - void Panic(TInt aPanic) const; - /** - * Copies the string - * @param aTarget Target string - * @param aSource Source string - * @return ETrue if successful - */ - TBool StrCopy(TDes& aTarget, const TDesC& aSource) const; - /** - * Writes a string - * @param aText The string - * @return none - */ - void WriteL(const TDesC& aText); - /** - * Internalizes from file - * @param aFileName The name of the file - * @return none - */ - void InternalizeL( RFs& aFs, const TDesC& aFileName ); - -private: - TInt iMark; - CDesCArrayFlat* iLines; -}; - -#endif - -// End of file - - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/services/csc/src/capinfo.cpp --- a/connectivitymodules/SeCon/services/csc/src/capinfo.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1031 +0,0 @@ -/* -* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* 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: CCapInfo implementation -* -*/ - - -// INCLUDE FILES - -#include -#include -#include // for PathInfo::SoundsPath -#include -#include "sconsyncservice.h" -#include "capinfo.h" -#include "caplist.h" -#include "capparser.h" -#include "caputils.h" -#include "stringlist.h" -#include "sconversioninfo.h" -#include "debug.h" - - -_LIT8( KLineFeed, "\r\n" ); - -const TInt KDefaultArrayGranularity = 5; - - -// ============================= MEMBER FUNCTIONS =============================== - -// ----------------------------------------------------------------------------- -// CCapInfo::NewL() -// Two-phase constructor -// ----------------------------------------------------------------------------- -// -CCapInfo* CCapInfo::NewL() - { - TRACE_FUNC_ENTRY; - CCapInfo* self = new (ELeave) CCapInfo(); - CleanupStack::PushL( self ); - self->ConstructL(); - CleanupStack::Pop(self); - TRACE_FUNC_EXIT; - return self; - } - -// ----------------------------------------------------------------------------- -// CCapInfo::~CCapInfo() -// Destructor -// ----------------------------------------------------------------------------- -// -CCapInfo::~CCapInfo() - { - TRACE_FUNC_ENTRY; - iFsSession.Close(); - delete iHeapBuf; - delete iCapList; - delete iSconInfo; - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CCapInfo::CapabilityDocumentL(CBufFlat* aBuf) -// Creates capability xml document end places it in aBuf -// ----------------------------------------------------------------------------- -// -void CCapInfo::CapabilityDocumentL(CBufFlat* aBuf) - { - TRACE_FUNC_ENTRY; - TInt err( KErrNone ); - - // set buffer where capability document is written - SetCapabilityBuf( aBuf ); - - WriteL( KXmlVersion ); - WriteL( KComment1 ); - WriteL( KDocType ); - WriteL( KRootBegin ); - - - // - // general - // - TRAP( err, GeneralInfoL() ); - if ( err != KErrNone ) - { - LOGGER_WRITE_1( "GeneralInfoL failed : %d", err ); - User::Leave( err ); - } - - - // - // services - // - // Search service files first from C-drive, and then from Z - // Do not add same files twice. - - RArray excludeList( KDefaultArrayGranularity ); - CleanupClosePushL( excludeList ); - RArray filesAdded( KDefaultArrayGranularity ); - CleanupClosePushL( filesAdded ); - - //read service files from C Import folder - TRAP( err, ServiceInfoL( KCapabilityDirCImport, excludeList, filesAdded ) ); - LOGGER_WRITE_1( "ServiceInfoL(KCapabilityDirCImport) returned : %d", err ); - for ( TInt i=0; iFetchInfoL( iFsSession )); - LOGGER_WRITE_1("sconInfo->FetchInfoL() Leaved: %d", err); - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CCapInfo::CCapInfo() -// Constuctor -// ----------------------------------------------------------------------------- -// -CCapInfo::CCapInfo() - { - } - -// ----------------------------------------------------------------------------- -// CCapInfo::CapList() -// Returns caplist -// ----------------------------------------------------------------------------- -// -CCapList* CCapInfo::CapList() - { - TRACE_FUNC; - __ASSERT_DEBUG(iCapList, CapUtil::Panic(KErrGeneral)); - return iCapList; - } - -// ----------------------------------------------------------------------------- -// CCapInfo::SetCapabilityBuf( CBufFlat* aBuf ) -// Set capability buffer -// ----------------------------------------------------------------------------- -// -void CCapInfo::SetCapabilityBuf( CBufFlat* aBuf ) - { - TRACE_FUNC; - iCapabilityBuf=aBuf; - } - -// ----------------------------------------------------------------------------- -// CCapInfo::GeneralInfoL() -// Write general device capability information. -// ----------------------------------------------------------------------------- -// -void CCapInfo::GeneralInfoL() - { - TRACE_FUNC_ENTRY; - TInt err( KErrNone ); - TBuf buf; - TBuf longName; - TBuf coutryCode; - TBuf networkID; - - WriteTagL(EGeneral, TXmlParser::EElementBegin); - - if ( !iSconInfo->IsReady() ) - { - LOGGER_WRITE("iSconInfo wasn't ready, call iSconInfo->FetchInfoL"); - iSconInfo->FetchInfoL( iFsSession ); - } - - if ( iSconInfo->iManufacturer ) - { - WriteValueL( EManufacturer, *iSconInfo->iManufacturer ); - } - - if ( iSconInfo->iProduct ) - { - WriteValueL( EModel, *iSconInfo->iProduct ); - } - - // serial number - if ( iSconInfo->iSerialNumber ) - { - WriteValueL( ESN, *iSconInfo->iSerialNumber ); - } - - // software version - if ( iSconInfo->iSWVersion ) - { - WriteAttributeL( ESW, *iSconInfo->iSWVersion, iSconInfo->iDate ); - } - - // language - WriteValueL( ELanguage, iSconInfo->iLanguage ); - - // this must succeed - do not trap - MemoryInfoL(); - - // Operator - TRAP( err, CapUtil::GetOperatorNameL( longName, coutryCode, networkID ) ); - LOGGER_WRITE_1( "CapUtil::GGetOperatorNameL returned : %d", err ); - if( err == KErrNone ) - { - LOGGER_WRITE_3( "CSConFsHandler::GetOperatorNameL longName = %S coutryCode = %S networkID = %S", &longName, &coutryCode, &networkID ); - _LIT( KNetworkInfo, "NetworkInfo" ); - _LIT( KCurrentNetwork, "CurrentNetwork=" ); - _LIT( KCountryCode, "CountryCode=" ); - _LIT( KNetworkID, "NetworkID=" ); - - WriteTagL( EExt, TXmlParser::EElementBegin ); - WriteValueL( EXNam, KNetworkInfo ); - - // write CurrentNetwork - buf.Copy( KCurrentNetwork ); - buf.Append( longName ); - WriteValueL( EXVal, buf ); - - // write CountryCode - buf.Copy( KCountryCode ); - buf.Append( coutryCode ); - WriteValueL( EXVal, buf ); - - // write NetworkID - buf.Copy( KNetworkID ); - buf.Append( networkID ); - WriteValueL( EXVal, buf ); - - WriteTagL( EExt, TXmlParser::EElementEnd ); - } - - if ( iSconInfo->iModel ) - { - // print modelname (phone model sales name. For example "N01".) - WriteTagL( EExt, TXmlParser::EElementBegin ); - _LIT(KModelName, "ModelName"); - WriteValueL( EXNam, KModelName ); - WriteValueL( EXVal, *iSconInfo->iModel ); - WriteTagL( EExt, TXmlParser::EElementEnd ); - } - - if ( iSconInfo->iProductCode ) - { - // print productcode - WriteTagL( EExt, TXmlParser::EElementBegin ); - _LIT( KProductCode, "ProductCode" ); - WriteValueL( EXNam, KProductCode ); - WriteValueL( EXVal, *iSconInfo->iProductCode ); - WriteTagL( EExt, TXmlParser::EElementEnd ); - } - - - // print advanced info - WriteTagL( EExt, TXmlParser::EElementBegin ); - _LIT(KAdvancedDeviceInfo, "AdvancedDeviceInfo"); - WriteValueL( EXNam, KAdvancedDeviceInfo ); - - TBuf temp; - - if ( iSconInfo->iRevision ) - { - // product revision. For example "01" - _LIT( KRevision, "Revision=" ); - temp.Copy( KRevision ); - temp.Append( *iSconInfo->iRevision ); - LOGGER_WRITE_1( "CCapInfo::GeneralInfoL() : %S ", &temp ); - WriteValueL( EXVal, temp ); - } - - - if ( iSconInfo->iSysVersionInfo ) - { - _LIT( KFWVersion, "FWVersion=" ); - temp.Copy( KFWVersion ); - temp.Append( *iSconInfo->iSysVersionInfo ); - LOGGER_WRITE_1( "CCapInfo::GeneralInfoL() : %S ", &temp ); - WriteValueL( EXVal, temp ); - } - - SysVersionInfo::TSymbianOSVersion osVersion; - err = iSconInfo->GetSymbianVersion( osVersion ); - LOGGER_WRITE_1("TSymbianOSVersion info error: %d", err) - if ( !err ) - { - // Now osVersion contains the Symbian OS version information - _LIT( KSymbianOSVersion, "SymbianOSVersion=%d.%d" ); - temp.Format( KSymbianOSVersion, - osVersion.iMajorVersion, - osVersion.iMinorVersion ); - LOGGER_WRITE_1( "CCapInfo::GeneralInfoL() : %S ", &temp ); - - WriteValueL( EXVal, temp ); - } - - VersionInfo::TPlatformVersion platformVersion; - err = iSconInfo->GetS60Version( platformVersion ); - if ( !err ) - { - _LIT( KS60Version, "S60PlatformVersion=%d.%d" ); - temp.Format( KS60Version, - platformVersion.iMajorVersion, - platformVersion.iMinorVersion ); - LOGGER_WRITE_1( "CCapInfo::GeneralInfoL() : %S ", &temp ); - WriteValueL( EXVal, temp ); - } - - - if ( iSconInfo->iLangVersion ) - { - _LIT( KLangVersion, "LangVersion=" ); - temp.Copy( KLangVersion ); - temp.Append( *iSconInfo->iLangVersion ); - LOGGER_WRITE_1( "CCapInfo::GeneralInfoL() : %S ", &temp ); - WriteValueL( EXVal, temp ); - } - - if ( iSconInfo->iLangSWVersion ) - { - _LIT( KLangSWVersion, "LangSWVersion=" ); - temp.Copy( KLangSWVersion ); - temp.Append( *iSconInfo->iLangSWVersion ); - LOGGER_WRITE_1( "CCapInfo::GeneralInfoL() : %S ", &temp ); - WriteValueL( EXVal, temp ); - } - - if ( iSconInfo->iOPVersion ) - { - // CustomerVersion - _LIT( KOPVersion, "OPVersion=" ); - temp.Copy( KOPVersion ); - temp.Append( *iSconInfo->iOPVersion ); - LOGGER_WRITE_1( "CCapInfo::GeneralInfoL() : %S ", &temp ); - WriteValueL( EXVal, temp ); - } - - // screen size - LOGGER_WRITE_2("Size, width: %d, height: %d", - iSconInfo->iScreenSize.iWidth, - iSconInfo->iScreenSize.iHeight ); - _LIT( KWidth, "ScreenWidth=%d" ); - _LIT( KHeight, "ScreenHeight=%d" ); - - temp.Format( KWidth, iSconInfo->iScreenSize.iWidth ); - WriteValueL( EXVal, temp ); - - temp.Format( KHeight, iSconInfo->iScreenSize.iHeight ); - WriteValueL( EXVal, temp ); - - WriteTagL( EExt, TXmlParser::EElementEnd ); - // end of advanced info - - WriteTagL(EGeneral, TXmlParser::EElementEnd); - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CCapInfo::MemoryInfoL() -// Create memory info for all drives (RAM excluded). -// ----------------------------------------------------------------------------- -// -void CCapInfo::MemoryInfoL() - { - TRACE_FUNC_ENTRY; - - TMemoryInfo info; - TInt devDriveCount = 0; - TInt mmcDriveCount = 0; - - //Write all drivers to folderlisting object - TDriveList driveList; - // Get all drives that are visible to the user. - TInt driveCount; - User::LeaveIfError( DriveInfo::GetUserVisibleDrives( iFsSession, driveList, driveCount ) ); - - for( TInt i = EDriveA; i < KMaxDrives; i++ ) - { - if( driveList[i] ) - { - TUint driveStatus; - TInt err = DriveInfo::GetDriveStatus( iFsSession, i, driveStatus ); - if( err ) - { - LOGGER_WRITE_1( "CCapInfo::MemoryInfoL() : DriveInfo::GetDriveStatus: %d", i); - continue; - } - - if( !(driveStatus & DriveInfo::EDrivePresent ) - || driveStatus & DriveInfo::EDriveCorrupt - || (driveStatus & DriveInfo::EDriveRemote) ) - { - LOGGER_WRITE_1( "skip drive %d", i); - continue; - } - - TRAP( err, CapUtil::GetMemoryInfoL( iFsSession, i, info )); - if ( err ) - { - LOGGER_WRITE_1( "CapUtil::GetMemoryInfoL() : Leaved with: %d", err); - continue; - } - - info.iDriveStatus = driveStatus; - if( driveStatus & DriveInfo::EDriveInternal ) - { - // if internal (DEV) drive, save drive number - devDriveCount++; - info.iMemNr = devDriveCount; - } - else if ( driveStatus & DriveInfo::EDriveRemovable ) - { - // if removable (MMC) drive, save drive number - mmcDriveCount++; - info.iMemNr = mmcDriveCount; - } - else - { - // was not internal or removable, skip. - LOGGER_WRITE( "CCapInfo::MemoryInfoL() : not internal or removable, skip." ); - continue; - } - - WriteMemoryInfoL(info); - - } - } - - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CCapInfo::MemoryInfoL(TMemoryInfo& aInfo) -// Create memory info for all drives (RAM excluded). -// ----------------------------------------------------------------------------- -// -void CCapInfo::WriteMemoryInfoL(TMemoryInfo& aInfo) - { - TRACE_FUNC_ENTRY; - TBuf buf; - - WriteTagL(EMemory, TXmlParser::EElementBegin); - - if( aInfo.iDriveStatus & DriveInfo::EDriveInternal ) - { - buf = KMediaFlash; - } - else - { - buf = KMediaMMC; // memory card (MMC) - } - - if( aInfo.iMemNr > 1 ) - { - // append memory number DEV2, MMC2.. - buf.AppendNum( aInfo.iMemNr ); - } - - WriteValueL(EMemType, buf); - WriteValueL(ELocation, aInfo.iLocation); - WriteValueL(EFree, aInfo.iFree); - WriteValueL(EUsed, aInfo.iUsed); - - WriteValueL(EFileNLen, aInfo.iFileNameSize); - - WriteTagL(EMemory, TXmlParser::EElementEnd); - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CCapInfo::ServiceInfoL(const TDesC& aDir) -// Reads service xml-files from directory and writes them into capability -// document. -// ----------------------------------------------------------------------------- -// -void CCapInfo::ServiceInfoL(const TDesC& aDir, const RArray& aExcludeList, - RArray& aFilesAdded) - { - TRACE_FUNC_ENTRY; - CCapList* capList=CapList(); - - RArray array( KDefaultArrayGranularity ); - CleanupClosePushL(array); - - CStringList* stringList=CStringList::NewLC(); - - CapUtil::GetFileListL(iFsSession, aDir, array); - - _LIT(KFormat, "%S%S"); - TFileName name; - TInt count=array.Count(); - for (TInt i=0; iList()->Reset(); - capList->List()->ReadFromFileL( iFsSession, name ); - if (capList->FindServiceL(stringList)) - { - WriteNewLineL(); - WriteFromListL(stringList); - - User::LeaveIfError( aFilesAdded.Append(array[i]) ); - LOGGER_WRITE_1( "File '%S' added to list", &array[i] ); - } - } - } - - CleanupStack::PopAndDestroy(stringList); - CleanupStack::PopAndDestroy(&array); - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CCapInfo::FolderServiceL() -// Writes folder service. Notice that this service is created in code because -// pathinfo component is used to get folder names. -// ----------------------------------------------------------------------------- -// -void CCapInfo::FolderServiceL() - { - TRACE_FUNC_ENTRY; - TBuf rootPath; - TBuf memoryType(KNullDesC); - TFileName folderName; - _LIT( KFormat, "%S%S" ); - - WriteNewLineL(); - WriteTagL(EService, TXmlParser::EElementBegin); - - WriteValueL(EName, KFolderServiceName); - WriteValueL(EUUID, KFolderServiceUid); - WriteValueL(EVersion, KFolderServiceVersion); - - WriteTagL(EObject, TXmlParser::EElementBegin); - WriteValueL(EType, KFolderServiceType); - WriteTagL(EObject, TXmlParser::EElementEnd); - TInt drive; - TInt err; - - CapUtil::GetDefaultRootPathL( iFsSession, rootPath ); - if( rootPath.Length() > 0 ) - { - err = iFsSession.CharToDrive( rootPath[0], drive ); - if( err == KErrNone ) - { - CapUtil::GetMemoryType( iFsSession, memoryType, drive ); - } - } - - // EFolderImages - folderName.Format( KFormat, &rootPath, &PathInfo::ImagesPath() ); - WriteFolderL( KFolderImages, folderName, memoryType ); - - // EFolderGraphics - folderName.Format( KFormat, &rootPath, &PathInfo::ImagesPath() ); - WriteFolderL(KFolderGraphics, folderName, memoryType); - - // EFolderTones - folderName.Format( KFormat, &rootPath, &PathInfo::DigitalSoundsPath() ); - WriteFolderL(KFolderTones, folderName, memoryType); - - // EFolderMusic - folderName.Format( KFormat, &rootPath, &PathInfo::SoundsPath() ); - WriteFolderL(KFolderMusic, folderName, memoryType); - - // EFolderVideos - folderName.Format( KFormat, &rootPath, &PathInfo::VideosPath() ); - WriteFolderL(KFolderVideos, folderName, memoryType); - - // EFolderInstalls - folderName.Format( KFormat, &rootPath, &PathInfo::InstallsPath() ); - WriteFolderL(KFolderInstalls, folderName, memoryType); - - - WriteTagL(EService, TXmlParser::EElementEnd); - WriteNewLineL(); - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CCapInfo::SyncSolutionsServiceL() -// Reads last used syncSolutions from cenrep and writes to capability object -// ----------------------------------------------------------------------------- -// -void CCapInfo::SyncSolutionsServiceL() - { - TRACE_FUNC_ENTRY; - TSConSolutionInfo calendar; - TSConSolutionInfo contact; - TSConSolutionInfo sms; - TSConSolutionInfo bookmark; - - CSConSyncService *syncService = CSConSyncService::NewLC(); - syncService->GetSolutionL( KSeconCalendarUid, calendar ); - syncService->GetSolutionL( KSeconContactsUid, contact ); - syncService->GetSolutionL( KSeconSmsUid, sms ); - syncService->GetSolutionL( KSeconBookmarkUid, bookmark ); - CleanupStack::PopAndDestroy( syncService ); - - WriteSyncSolutionsServiceL( calendar, contact, sms, bookmark ); - - TRACE_FUNC_EXIT; - } - - -// ----------------------------------------------------------------------------- -// CCapInfo::WriteSyncSolutionsServiceL() -// Writes SyncSolutionsService data to capability object. -// ----------------------------------------------------------------------------- -// -void CCapInfo::WriteSyncSolutionsServiceL( const TSConSolutionInfo& aCalendar, - const TSConSolutionInfo& aContact, - const TSConSolutionInfo& aSms, - const TSConSolutionInfo& aBookmark) - { - TRACE_FUNC_ENTRY; - - WriteTagL( EService, TXmlParser::EElementBegin ); - - WriteValueL( EName, KSyncSolutionsServiceName ); - WriteValueL( EVersion, KSyncSolutionsServiceVersion ); - - if ( aCalendar.iUid != 0 ) - { - WriteSolutionTagL( KSyncCalendar, aCalendar ); - } - - if ( aContact.iUid != 0 ) - { - WriteSolutionTagL( KSyncContacts, aContact ); - } - - if ( aSms.iUid != 0 ) - { - WriteSolutionTagL( KSyncSms, aSms ); - } - - if ( aBookmark.iUid != 0 ) - { - WriteSolutionTagL( KSyncBookmark, aBookmark ); - } - - /* - * - * DesktopSync - * - * - * - */ - if ( !iSconInfo->iDesktopSyncError ) - { - WriteTagL( EExt, TXmlParser::EElementBegin ); - WriteValueL( EXNam, KDesktopSync ); - - TBuf buffer; - buffer.AppendNum( iSconInfo->iDesktopSync ); - - WriteValueL( EXVal, buffer ); - WriteTagL( EExt, TXmlParser::EElementEnd ); - } - - - - WriteTagL( EService, TXmlParser::EElementEnd ); - TRACE_FUNC_EXIT; - } - - - -// ----------------------------------------------------------------------------- -// CCapInfo::WriteSolutionTagL() -// Writes SyncSolutionsService solution data to capability object. -// ----------------------------------------------------------------------------- -// -void CCapInfo::WriteSolutionTagL( const TDesC& aContentName, - const TSConSolutionInfo& aSolution ) - { - TRACE_FUNC_ENTRY; - _LIT( KFormatUID, "UID=0x%08x" ); - _LIT( KFormatName, "Name=%S" ); - _LIT( KFormatDate, "Timestamp=%04d%02d%02dT%02d%02d%02dZ" ); - - WriteTagL( EExt, TXmlParser::EElementBegin ); - WriteValueL( EXNam, aContentName ); - - TFileName temp; - temp.Format( KFormatUID, aSolution.iUid ); - WriteValueL( EXVal, temp ); - - temp.Format( KFormatName, &aSolution.iSolutionName ); - WriteValueL( EXVal, temp ); - - if ( aSolution.iTime.Int64() != 0 ) - { - // write time - TDateTime time = aSolution.iTime.DateTime(); - temp.Format( KFormatDate, time.Year(), time.Month() + 1, - time.Day() + 1, time.Hour(), time.Minute(), time.Second() ); - WriteValueL( EXVal, temp ); - - } - - - WriteTagL( EExt, TXmlParser::EElementEnd ); - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CCapInfo::WriteFolderL(const TDesC& aType, const TDesC& aFullName, -// const TDesC& aMemory) -// Writes one folder name element. -// ----------------------------------------------------------------------------- -// -void CCapInfo::WriteFolderL(const TDesC& aType, const TDesC& aFullName, - const TDesC& aMemory) - { - TRACE_FUNC_ENTRY; - _LIT(KFormat, "%S=%S"); - - TBuf buf; - const TInt KReservedSize = 10; - if ( aFullName.Length() + KReservedSize > KBufSize ) - { - return; - } - buf.Format(KFormat, &KFolderNameTag, &aFullName); - - - WriteTagL(EExt, TXmlParser::EElementBegin); - - WriteValueL(EXNam, aType); - WriteValueL(EXVal, buf); - - buf.Format(KFormat, &KFolderMemoryTypeTag, &aMemory); - WriteValueL(EXVal, buf); - - - WriteTagL(EExt, TXmlParser::EElementEnd); - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CCapInfo::WriteL(const TDesC& aText) -// Writes one element to capability buffer. -// ----------------------------------------------------------------------------- -// -void CCapInfo::WriteL(const TDesC& aText) - { - if (aText.Length() > iBuf.MaxLength()) - { - User::Leave(KErrTooBig); - } - - - iBuf=aText; - iBuf.Trim(); - FormatElement(iBuf); - TPtr8 ptr = iHeapBuf->Des(); - - if ( iBuf.Length()+2 > ptr.MaxLength() ) - { - User::Leave(KErrTooBig); - } - - //unicode conversion - HBufC8* convBuf = HBufC8::NewLC( iBuf.Size() ); - TPtr8 convPtr = convBuf->Des(); - - CnvUtfConverter::ConvertFromUnicodeToUtf8(convPtr, iBuf); - - ptr.Copy(convPtr); - ptr.Append( KLineFeed ); // linefeed - - CleanupStack::PopAndDestroy( convBuf ); - - TInt pos=iCapabilityBuf->Size(); - iCapabilityBuf->InsertL(pos, ptr); - - iBuf=KNullDesC; - } - -void CCapInfo::WriteNewLineL() - { - TInt pos=iCapabilityBuf->Size(); - iCapabilityBuf->InsertL(pos, KLineFeed ); - } - -// ----------------------------------------------------------------------------- -// CCapInfo::WriteValueL(TInt aId, const TDesC& aValue) -// Constructs element with value (eg en) -// ----------------------------------------------------------------------------- -// -void CCapInfo::WriteValueL(TInt aId, const TDesC& aValue) - { - // empty values not written to capability object - if (aValue.Length()<1) - { - LOGGER_WRITE( "WriteValueL: value is empty" ); - return; - } - - TBuf buf; - - TRAPD(err, CapParser::MakeElementL(buf, aId, aValue)); - if (err==KErrNone) - { - WriteL(buf); - } - else if (err==KErrTooBig) - { - WriteBigValueL(aId, aValue); - } - else - { - User::Leave(err); - } - - } - -// ----------------------------------------------------------------------------- -// CCapInfo::WriteBigValueL(TInt aId, const TDesC& aValue) -// Constructs element with value -// ----------------------------------------------------------------------------- -// -void CCapInfo::WriteBigValueL(TInt aId, const TDesC& aValue) - { - HBufC* hBuf=HBufC::NewL(aValue.Length()+KBufSize); - CleanupStack::PushL(hBuf); - - TPtr pBuf(hBuf->Des()); - CapParser::MakeElementL(pBuf, aId, aValue); - WriteL(*hBuf); - - CleanupStack::PopAndDestroy(hBuf); - } - -// ----------------------------------------------------------------------------- -// CCapInfo::WriteValueL(TInt aId, TInt64 aValue) -// Constructs element with integer value -// ----------------------------------------------------------------------------- -// -void CCapInfo::WriteValueL(TInt aId, TInt64 aValue) - { - TBuf buf; - TBuf value; - CapUtil::IntToStr(value, aValue); - CapParser::MakeElementL(buf, aId, value); - WriteL(buf); - } - -// ----------------------------------------------------------------------------- -// CCapInfo::WriteTagL(TInt aId, TInt aType) -// Constructs element without value (eg ) -// ----------------------------------------------------------------------------- -// -void CCapInfo::WriteTagL(TInt aId, TInt aType) - { - TBuf buf; - CapParser::MakeElementL(buf, aId, aType); - WriteL(buf); - } - -// ----------------------------------------------------------------------------- -// CCapInfo::WriteAttributeL(TInt aId, const TDesC& aVersion, const TDesC& aDate) -// Constructs element with attributes "Version" and "Date" -// (eg ) -// ----------------------------------------------------------------------------- -// -void CCapInfo::WriteAttributeL(TInt aId, const TDesC& aVersion, - const TDesC& aDate) - { - // empty values not written to capability object - if (aVersion.Length()<1 && aDate.Length()<1) - { - LOGGER_WRITE( "WriteAttributeL: attributes are empty" ); - return; - } - - TBuf buf; - CapParser::MakeElementL(buf, aId, aVersion, aDate); - WriteL(buf); - } - -// ----------------------------------------------------------------------------- -// CCapInfo::WriteFromListL(CStringList* aList) -// Writes elements from list to capability buffer. -// ----------------------------------------------------------------------------- -// -void CCapInfo::WriteFromListL(CStringList* aList) - { - TInt count=aList->Count(); - - for (TInt i=0; iReadPtr(i)); - } - } - -// ----------------------------------------------------------------------------- -// CCapInfo::FormatElement(TDes& aText) -// Function adds indentation spaces to capability elements to improve -// readability. -// ----------------------------------------------------------------------------- -// -void CCapInfo::FormatElement(TDes& aText) - { - TXmlParser parser; - - parser.Set(aText); - TInt type=parser.Type(); - TBuf tag; - parser.GetTag(tag); - - if (type==TXmlParser::EElementEnd) - { - TInt id1=CapParser::ElementId(tag); - TInt id2=iIdStack.Pop(); - - __ASSERT_DEBUG(id1==id2, CapUtil::Panic(KErrGeneral)); - id1=0; - id2=0; - } - - AddFormatText(aText, iIdStack.Size()); - - if (type==TXmlParser::EElementBegin) - { - TInt id1=CapParser::ElementId(tag); - iIdStack.Push(id1); - } - } - -// ----------------------------------------------------------------------------- -// CCapInfo::AddFormatText( TDes& aText, TInt aNum ) const -// Adds format text -// ----------------------------------------------------------------------------- -// -void CCapInfo::AddFormatText( TDes& aText, TInt aNum ) const - { - TBuf buf; - buf = KNullDesC; - - if ( aNum > KNestingLimit ) - { - aNum = KNestingLimit; - } - - for ( TInt i=0; ibuf.Length() ) - { - aText.Insert( 0, buf ); - } - } - -// End of file - - diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/services/csc/src/caplist.cpp --- a/connectivitymodules/SeCon/services/csc/src/caplist.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,219 +0,0 @@ -/* -* Copyright (c) 2005-2008 Nokia Corporation and/or 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: CCapList implementation -* -*/ - - -// INCLUDE FILES - -#include "caplist.h" -#include "caputils.h" -#include "capparser.h" -#include "capability.h" -#include "debug.h" - -// ============================= MEMBER FUNCTIONS =============================== - - -// ----------------------------------------------------------------------------- -// CCapList::NewL() -// Two-phase constructor. -// ----------------------------------------------------------------------------- -// -CCapList* CCapList::NewL() - { - CCapList* self = new(ELeave) CCapList(); - CleanupStack::PushL( self ); - self->ConstructL(); - CleanupStack::Pop( self ); - return self; - } - -// ----------------------------------------------------------------------------- -// CCapList::~CCapList() -// Gets phone serial number from etel. -// ----------------------------------------------------------------------------- -// -CCapList::~CCapList() - { - delete iList; - } - -// ----------------------------------------------------------------------------- -// CCapList::CCapList() -// Constructor -// ----------------------------------------------------------------------------- -// -CCapList::CCapList() - { - } - -// ----------------------------------------------------------------------------- -// CCapList::ConstructL() -// Initializes the member data -// ----------------------------------------------------------------------------- -// -void CCapList::ConstructL() - { - iList = CStringList::NewL(); - } - -// ----------------------------------------------------------------------------- -// CCapList::List() -// Returns the list -// ----------------------------------------------------------------------------- -// -CStringList* CCapList::List() - { - __ASSERT_DEBUG(iList, CapUtil::Panic(KErrGeneral)); - return iList; - } - -// ----------------------------------------------------------------------------- -// CCapList::FindFromMark(TInt aId, TInt aType) -// Find from mark -// ----------------------------------------------------------------------------- -// -TInt CCapList::FindFromMark(TInt aId, TInt aType) - { - TInt mark = List()->Mark(); - TInt count= List()->Count(); - - if ( mark >= count ) - { - return KErrNotFound; - } - - TInt index=Find(aId, aType, mark); - if ( index == KErrNotFound ) - { - return KErrNotFound; - } - - - __ASSERT_DEBUG(index>=mark, CapUtil::Panic(KErrGeneral)); - - List()->SetMark(index+1); - return index; - } - -// ----------------------------------------------------------------------------- -// CCapList::FindServiceHeader() -// Finds service xml-file identification header. This header must be the first -// line in every service file. -// ----------------------------------------------------------------------------- -// -TBool CCapList::FindServiceHeader() - { - TRACE_FUNC_ENTRY; - if (List()->Count()<1) - { - LOGGER_WRITE( "CCapList::FindServiceHeader() : returned EFalse" ); - return EFalse; - } - - TBuf buf; - TPtrC ptr=List()->ReadPtr(0); - CapUtil::StrCopy(buf, ptr); - buf.Trim(); - if (buf.Compare(KServiceHeader)==0) - { - LOGGER_WRITE( "CCapList::FindServiceHeader() : returned ETrue" ); - return ETrue; - } - else - { - LOGGER_WRITE( "CCapList::FindServiceHeader() : returned EFalse" ); - return EFalse; - } - } - -// ----------------------------------------------------------------------------- -// CCapList::FindServiceL(CStringList* aList) -// Find service -// ----------------------------------------------------------------------------- -// -TBool CCapList::FindServiceL(CStringList* aList) - { - TRACE_FUNC_ENTRY; - aList->Reset(); - List()->SetMark(0); - - if (!FindServiceHeader()) - { - LOGGER_WRITE( "CCapList::FindServiceL(CStringList* aList) : returned EFalse" ); - return EFalse; - } - - - for (;;) - { - TInt start=FindFromMark(EService, TXmlParser::EElementBegin); - TInt stop=FindFromMark(EService, TXmlParser::EElementEnd); - - if (start==KErrNotFound || stop==KErrNotFound || start>=stop) - { - break; - } - - aList->CopyL(List(), start, stop); - } - - if (aList->Count()>0) - { - LOGGER_WRITE( "CCapList::FindServiceL(CStringList* aList) : returned ETrue" ); - return ETrue; - } - - LOGGER_WRITE( "CCapList::FindServiceL(CStringList* aList) : returned EFalse" ); - return EFalse; - } - -// ----------------------------------------------------------------------------- -// CCapList::Find(TInt aId, TInt aType, TInt aIndex) -// Find element -// ----------------------------------------------------------------------------- -// -TInt CCapList::Find(TInt aId, TInt aType, TInt aIndex) - { - TInt count=List()->Count(); - if (aIndex<0 || aIndex>=count) - { - CapUtil::Panic(KErrArgument); - } - - for (TInt i=aIndex; iReadPtr(i); - - TInt id=0; - TInt type=0; - - CapParser::ParseElement(ptr, id, type); - if (type==TXmlParser::EElementUnknown) - { - continue; // invalid capability element - } - - if (id==aId && aType==type) - { - return i; - } - } - return KErrNotFound; - } - - -// End of files diff -r 453dfc402455 -r 0aa8cc770c8a connectivitymodules/SeCon/services/csc/src/capparser.cpp --- a/connectivitymodules/SeCon/services/csc/src/capparser.cpp Thu Aug 19 10:44:03 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,766 +0,0 @@ -/* -* Copyright (c) 2005-2008 Nokia Corporation and/or 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: CapParser implementation -* -*/ - - -// INCLUDE FILES - -#include "capparser.h" -#include "caputils.h" - -const char KFind1 = '&'; -const char KFind2 = '<'; -const char KFind3 = '>'; -const char KFind4 = '"'; -const char KFind5 = '\''; - -_LIT( KReplace1, "&" ); -_LIT( KReplace2, "<" ); -_LIT( KReplace3, ">" ); -_LIT( KReplace4, """ ); -_LIT( KReplace5, "'" ); - -// ============================= MEMBER FUNCTIONS =============================== - -// ----------------------------------------------------------------------------- -// CapParser::GetTagL(TDes& aText, TInt aId) -// Returns capability element tag (eg. "Memory") -// ----------------------------------------------------------------------------- -// -void CapParser::GetTagL(TDes& aText, TInt aId) - { - aText=KNullDesC; - - TInt count=NUMXMLTOKENS; - for (TInt i=0; ibuf; - TInt count=NUMXMLTOKENS; - for (TInt i=0; i" -> EMemory, EElementBegin) -// ----------------------------------------------------------------------------- -// -void CapParser::ParseElement(const TDesC& aText, TInt& aId, TInt& aType) - { - TXmlParser parse; - aId=KErrNotFound; - - parse.Set(aText); - aType=parse.Type(); - if (aType==TXmlParser::EElementUnknown) - { - return; - } - - TPtrC ptr=parse.Tag(); - aId=ElementId(ptr); - } - -// ----------------------------------------------------------------------------- -// CapParser::MakeElementL(TDes& aText, TInt aId, const TDesC& aValue) -// Constructs element with value (eg. "23456"). -// ----------------------------------------------------------------------------- -// -void CapParser::MakeElementL(TDes& aText, TInt aId, const TDesC& aValue) - { - aText=KNullDesC; - ReplaceSpecialCharsL( aText, aValue ); - - TBuf buf; - MakeElementL( buf, aId, TXmlParser::EElementBegin ); - - TInt len = aText.Length() + buf.Length() + buf.Length() + 1; - if ( len > aText.MaxLength()) - { - User::Leave(KErrTooBig); - } - - aText.Insert( 0, buf ); - MakeElementL( buf, aId, TXmlParser::EElementEnd ); - aText.Append( buf ); - } - -// ----------------------------------------------------------------------------- -// CapParser::MakeElementL(TDes& aText, TInt aId, TInt aType) -// Constructs element without value (eg. "" or ""). -// ----------------------------------------------------------------------------- -// -void CapParser::MakeElementL(TDes& aText, TInt aId, TInt aType) - { - _LIT(KFormat1, "<%S>"); - _LIT(KFormat2, ""); - _LIT(KFormat3, "<%S/>"); - - aText=KNullDesC; - TBuf buf; - GetTagL(buf, aId); - - switch(aType) - { - case TXmlParser::EElementBegin: - aText.Format(KFormat1, &buf); - break; - case TXmlParser::EElementEnd: - aText.Format(KFormat2, &buf); - break; - case TXmlParser::EElementEmpty: - aText.Format(KFormat3, &buf); - break; - default: - CapUtil::Panic(KErrArgument); - break; - } - } - -// ----------------------------------------------------------------------------- -// CapParser::MakeElementL(TDes& aText, TInt aId, const TDesC& aVersion, -// const TDesC& aDate) -// Constructs element with attributes "Version" and "Date"(eg. -// ""). -// ----------------------------------------------------------------------------- -// -void CapParser::MakeElementL(TDes& aText, TInt aId, const TDesC& aVersion, - const TDesC& aDate) - { - _LIT(KFormat1, "<%S %S=\"%S\" %S=\"%S\"/>"); - _LIT(KFormat2, "<%S %S=\"%S\"/>"); - - aText=KNullDesC; - - TBuf element; - TBuf versionTag; - TBuf dateTag; - - GetTagL(element, aId); - GetTagL(versionTag, EAttVersion); - GetTagL(dateTag, EAttDate); - - if (aDate.Length()>0) - { - aText.Format(KFormat1, &element, &versionTag, &aVersion, &dateTag, - &aDate); - } - else - { - aText.Format(KFormat2, &element, &versionTag, &aVersion); - } - } - -// ----------------------------------------------------------------------------- -// CapParser::ReplaceSpecialCharsL( TDes& aText, const TDesC& aValue ) -// Replaces special characters to xml compliant. -// ----------------------------------------------------------------------------- -// -void CapParser::ReplaceSpecialCharsL( TDes& aText, const TDesC& aValue ) - { - if ( aValue.Length() > aText.MaxLength() ) - { - User::Leave(KErrTooBig); - } - aText.Copy( aValue ); - - //Replace special characters - for( TInt i = 0; i < aText.Length(); i++ ) - { - switch( aText[i] ) - { - case KFind1: - if ( aText.Length()+KReplace1().Length()-1 > aText.MaxLength() ) - { - User::Leave(KErrTooBig); - } - aText.Replace( i, 1, KReplace1 ); - i+=KReplace1().Length()-1; - break; - case KFind2: - if ( aText.Length()+KReplace2().Length()-1 > aText.MaxLength() ) - { - User::Leave(KErrTooBig); - } - aText.Replace( i, 1, KReplace2 ); - i+=KReplace2().Length()-1; - break; - case KFind3: - if ( aText.Length()+KReplace3().Length()-1 > aText.MaxLength() ) - { - User::Leave(KErrTooBig); - } - aText.Replace( i, 1, KReplace3 ); - i+=KReplace3().Length()-1; - break; - case KFind4: - if ( aText.Length()+KReplace4().Length()-1 > aText.MaxLength() ) - { - User::Leave(KErrTooBig); - } - aText.Replace( i, 1, KReplace4 ); - i+=KReplace4().Length()-1; - break; - case KFind5: - if ( aText.Length()+KReplace5().Length()-1 > aText.MaxLength() ) - { - User::Leave(KErrTooBig); - } - aText.Replace( i, 1, KReplace5 ); - i+=KReplace5().Length()-1; - break; - default: - break; - } - } - } - -// ----------------------------------------------------------------------------- -// TXmlParser::Set(const TDesC& aText) -// Sets a tag -// ----------------------------------------------------------------------------- -// -void TXmlParser::Set(const TDesC& aText) - { - iOriginal.Set(aText); - TrimOriginal(); - Init(); - Parse(); - } - -// ----------------------------------------------------------------------------- -// TXmlParser::Init() -// Inits the parser -// ----------------------------------------------------------------------------- -// -void TXmlParser::Init() - { - iType=EElementUnknown; - iTag.Set(KNullDesC); - iValue.Set(KNullDesC); - } - -// ----------------------------------------------------------------------------- -// TXmlParser::GetTag(TDes& aText) const -// Gets the tag -// ----------------------------------------------------------------------------- -// -void TXmlParser::GetTag(TDes& aText) const - { - StrCopy(aText, iTag); - } - -// ----------------------------------------------------------------------------- -// TXmlParser::Tag() const -// Returns a pointer to a tag -// ----------------------------------------------------------------------------- -// -TPtrC TXmlParser::Tag() const - { - return iTag; - } - -// ----------------------------------------------------------------------------- -// TXmlParser::Type() const -// Returns type -// ----------------------------------------------------------------------------- -// -TInt TXmlParser::Type() const - { - return iType; - } - -// ----------------------------------------------------------------------------- -// TXmlParser::Parse() -// Parses xml-element. -// ----------------------------------------------------------------------------- -// -void TXmlParser::Parse() - { - iType=EElementUnknown; - - // this must be the first check - if (ElementUnknown()) - { - return; - } - - if (ElementBegin()) - { - return; - } - - if (ElementEnd()) - { - return; - } - - if (ElementValue()) - { - return; - } - - if (ElementComment()) - { - return; - } - - if (ElementDocType()) - { - return; - } - - if (ElementVersion()) - { - return; - } - - if (ElementEmpty()) - { - return; - } - - if (ElementAtt()) - { - return; - } - } - -// ----------------------------------------------------------------------------- -// TXmlParser::ElementUnknown() -// Parses unknown elements -// ----------------------------------------------------------------------------- -// -TBool TXmlParser::ElementUnknown() - { - TPtrC str=Str(); - TInt len=str.Length(); - const TInt KXmlElementMinLength = 3; - if ( len < KXmlElementMinLength ) - { - return ETrue; // too short to be xml element - } - - - iFirst=str.Locate('<'); - iLast=str.LocateReverse('>'); - iSlash=str.LocateReverse('/'); - - if (iFirst!=0 || iLast!=len-1) - { - return ETrue; // first char must be "<" and last ">" - } - - return EFalse; - } - -// ----------------------------------------------------------------------------- -// TXmlParser::ElementBegin() -// Parses beginning tag (eg. ) -// ----------------------------------------------------------------------------- -// -TBool TXmlParser::ElementBegin() - { - TPtrC str=Str(); - - if (iSlash!=KErrNotFound) - { - return EFalse; - } - - // remove possible attributes - TInt pos=str.Locate(' '); - if (pos==KErrNotFound) - { - pos=iLast; - } - - TPtrC ptr=SubStr(iFirst, pos); - - if (!ValidTag(ptr)) - { - return EFalse; - } - - iType=EElementBegin; - iTag.Set(ptr); - - return ETrue; - } - -// ----------------------------------------------------------------------------- -// TXmlParser::ElementEnd() -// Parses ending tag (eg. ) -// ----------------------------------------------------------------------------- -// -TBool TXmlParser::ElementEnd() - { - if (iSlash!=iFirst+1) - { - return EFalse; - } - - TPtrC ptr=SubStr(iSlash, iLast); - if (!ValidTag(ptr)) - { - return EFalse; - } - - iType=EElementEnd; - iTag.Set(ptr); - return ETrue; - } - -// ----------------------------------------------------------------------------- -// TXmlParser::ElementValue() -// Parses value (eg. en) -// ----------------------------------------------------------------------------- -// -TBool TXmlParser::ElementValue() - { - TPtrC str=Str(); - - TInt pos1=str.Locate('>'); - TInt pos2=str.LocateReverse('<'); - - if (pos1) -// ----------------------------------------------------------------------------- -// -TBool TXmlParser::ElementEmpty() - { - if (iSlash!=iLast-1) - { - return EFalse; - } - - TPtrC ptr=SubStr(iFirst, iSlash); - if (!ValidTag(ptr)) - { - return EFalse; - } - - iType=EElementEmpty; - iTag.Set(ptr); - return ETrue; - } - -// ----------------------------------------------------------------------------- -// TXmlParser::ElementVersion() -// Identifies version element ("") -// ----------------------------------------------------------------------------- -// -TBool TXmlParser::ElementVersion() - { - TPtrC str=Str(); - - if ( str.Length()>=3 && str[1]=='?' && str[2]=='x') - { - iType=EElementVersion; - return ETrue; - } - return EFalse; - } - -// ----------------------------------------------------------------------------- -// TXmlParser::ElementDocType() -// Identifies document type element -// (""). -// ----------------------------------------------------------------------------- -// -TBool TXmlParser::ElementDocType() - { - TPtrC str=Str(); - const TInt KElementMinLength = 10; - if ( str.Length() < KElementMinLength ) - { - return EFalse; - } - - if (str[1]=='!' && str[2]=='D' && str[3]=='O' && str[4]=='C') - { - iType=EElementDocType; - return ETrue; - } - return EFalse; - } - -// ----------------------------------------------------------------------------- -// TXmlParser::ElementComment() -// Identifies comment element (""). -// ----------------------------------------------------------------------------- -// -TBool TXmlParser::ElementComment() - { - TPtrC str=Str(); - - if (str.Length()<7) - { - return EFalse; - } - - if (str[1]=='!' && str[2]=='-' && str[3]=='-') - { - iType=EElementComment; - return ETrue; - } - - return EFalse; - } - -// ----------------------------------------------------------------------------- -// TXmlParser::ElementAtt() -// Parses attribute element (eg. ) -// Note: Attribute values cannot contain equals (=) or quotations (") -// ----------------------------------------------------------------------------- -// -TBool TXmlParser::ElementAtt() - { - TPtrC str=Str(); - TInt num1=Count(str, '='); - TInt num2=Count(str, '"'); - TInt pos=str.Locate(' '); // find end of tag - - if (iSlash==iLast-1 && num1>0 && num2==(2*num1) && pos!=KErrNotFound) - { - TPtrC ptr1=SubStr(iFirst, pos); - if (!ValidTag(ptr1)) - { - return EFalse; - } - - iType=EElementAtt; - iTag.Set(ptr1); - TPtrC ptr2=SubStr(pos, iSlash); - iValue.Set(ptr2); - return ETrue; - } - return EFalse; - } - -// ----------------------------------------------------------------------------- -// TXmlParser::Str() const -// Locates the position of the given character -// ----------------------------------------------------------------------------- -// -TPtrC TXmlParser::Str() const - { - return iText; - } - -// ----------------------------------------------------------------------------- -// TXmlParser::FirstNonSpace(const TDesC& aText) -// Returns the position of the first non space character -// ----------------------------------------------------------------------------- -// -TInt TXmlParser::FirstNonSpace(const TDesC& aText) - { - TInt len=aText.Length(); - for (TInt i=0; i=0; i--) - { - TChar c=aText[i]; - if (!c.IsSpace()) - { - return i; - } - } - return KErrNotFound; - } - -// ----------------------------------------------------------------------------- -// TXmlParser::SubStr(const TDesC& aText, TInt pos1, TInt pos2) -// Function returns a sub-string between aPos1 and aPos2 -// ----------------------------------------------------------------------------- -// -TPtrC TXmlParser::SubStr(const TDesC& aText, TInt pos1, TInt pos2) - { - if (pos1<0 || pos2>=aText.Length() || pos1>=pos2) - { - return TPtrC(); // return empty descriptor - } - - TInt len=pos2-pos1; - return aText.Mid(pos1+1, len-1); - } - -// ----------------------------------------------------------------------------- -// TXmlParser::SubStr(TInt pos1, TInt pos2) -// Function returns a sub-string between aPos1 and aPos2 -// ----------------------------------------------------------------------------- -// -TPtrC TXmlParser::SubStr(TInt pos1, TInt pos2) - { - TPtrC str=Str(); - return SubStr(str, pos1, pos2); - } - -// ----------------------------------------------------------------------------- -// TXmlParser::StrCopy(TDes& aTarget, const TDesC& aSource) -// Function performs string copy with length checking. -// ----------------------------------------------------------------------------- -// -void TXmlParser::StrCopy(TDes& aTarget, const TDesC& aSource) - { - TInt len=aTarget.MaxLength(); - if(lenfirst+1) - { - TPtrC ptr=iOriginal.Mid(first, last-first+1); - iText.Set(ptr); - } - } - -// ----------------------------------------------------------------------------- -// TXmlParser::ValidChar(const TChar aChar) -// Validates the character -// ----------------------------------------------------------------------------- -// -TBool TXmlParser::ValidChar(const TChar aChar) - { - if (aChar >= 'A' && aChar <= 'Z') - { - return ETrue; - } - if (aChar >= 'a' && aChar <= 'z') - { - return ETrue; - } - - return EFalse; - } - -// ----------------------------------------------------------------------------- -// TXmlParser::ValidTag(const TDesC& aText) -// Validates the tag -// ----------------------------------------------------------------------------- -// -TBool TXmlParser::ValidTag(const TDesC& aText) - { - TInt len=aText.Length(); - for (TInt i=0; i -#include -#include -#include -#include // for etel -#include // for etel -#include -#include -#include -#include -#include - -#include "caputils.h" -#include "capability.h" -#include "debug.h" - -const TInt KPackageSize = 65536; -const TInt KDefaultArrayGranularity = 5; -// ============================= MEMBER FUNCTIONS =============================== - -// ----------------------------------------------------------------------------- -// CapUtil::GetDefaultRootPathL( RFs& aFs, TDes& aRootPath ) -// Gets default root path -// ----------------------------------------------------------------------------- -// -void CapUtil::GetDefaultRootPathL( RFs& aFs, TDes& aRootPath ) - { - TRACE_FUNC_ENTRY; - // Use the default mass storage if it is internal drive - TInt msDrive; - User::LeaveIfError( DriveInfo::GetDefaultDrive( DriveInfo::EDefaultMassStorage, msDrive ) ); - LOGGER_WRITE_1("drive: %d", msDrive); - - TUint msStatus( 0 ); - TInt err = DriveInfo::GetDriveStatus( aFs, msDrive, msStatus ); - LOGGER_WRITE_1("DriveInfo::GetDriveStatus err: %d", err); - - // if no errors, also check drive status - if( !err && !( msStatus & DriveInfo::EDrivePresent ) - || msStatus & DriveInfo::EDriveCorrupt ) - { - LOGGER_WRITE( "Internal mass storage not present or corrupted" ); - err = KErrNotFound; - } - - if ( !err && ( msStatus & DriveInfo::EDriveInternal ) ) - { - // Use internal mass storage - LOGGER_WRITE( "Use internal mass storage" ); - User::LeaveIfError( PathInfo::GetRootPath( aRootPath, msDrive ) ); - } - else - { - // Use phone memory - LOGGER_WRITE( "Use phone memory" ); - StrCopy( aRootPath, PathInfo::PhoneMemoryRootPath() ); - } - LOGGER_WRITE_1( "rootPath: %S", &aRootPath ); - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CapUtil::GetMemoryType( RFs& aFs, TDes& aMemoryType, const TInt aDrive ) -// Gets drive memory type -// ----------------------------------------------------------------------------- -// -void CapUtil::GetMemoryType( RFs& aFs, TDes& aMemoryType, const TInt aDrive ) - { - TRACE_FUNC_ENTRY; - LOGGER_WRITE_1("aDrive: %d", aDrive); - aMemoryType = KNullDesC; - TUint driveStatus; - TInt err = DriveInfo::GetDriveStatus( aFs, aDrive, driveStatus ); - if( err ) - { - LOGGER_WRITE_1( "CapUtil::GetMemoryType() : DriveInfo::GetDriveStatus err: %d", err ); - return; - } - // search internal or removable drives - TBool searchInternalDrives; - if( driveStatus & DriveInfo::EDriveInternal ) - { - aMemoryType = KMediaFlash; - searchInternalDrives = ETrue; - } - else - { - aMemoryType = KMediaMMC; - searchInternalDrives = EFalse; - } - - TInt typeNumber(0); - TInt driveCount; - TDriveList driveList; - - err = DriveInfo::GetUserVisibleDrives( aFs, driveList, driveCount ); - if( err ) - { - LOGGER_WRITE_1( "CapUtil::GetMemoryType() : DriveInfo::GetUserVisibleDrives err: %d", err ); - return; - } - - for( TInt i = EDriveA; i <= aDrive; i++ ) - { - if( driveList[i] ) - { - TUint driveStatus; - err = DriveInfo::GetDriveStatus( aFs, i, driveStatus ); - if( err ) - { - LOGGER_WRITE_1( "CapUtil::GetMemoryType() : DriveInfo::GetDriveStatus err: %d", err ); - continue; - } - - if( !(driveStatus & DriveInfo::EDrivePresent ) - || driveStatus & DriveInfo::EDriveCorrupt ) - { - LOGGER_WRITE( "not present or corrupted" ); - continue; - } - - if( driveStatus & DriveInfo::EDriveInternal ) - { - if( searchInternalDrives ) - { - typeNumber++; - } - } - else if( driveStatus & DriveInfo::EDriveRemovable ) - { - if( !searchInternalDrives ) - { - typeNumber++; - } - } - } - } - - if( typeNumber > 1 ) - { - aMemoryType.AppendNum( typeNumber ); - } - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CapUtil::GetOperatornameL(TDes& aLongName, TDes& aCountryCode, TDes& aNetworkID) -// Gets phone operator name, country code, networkID. -// ----------------------------------------------------------------------------- -// -void CapUtil::GetOperatorNameL(TDes& aLongName, TDes& aCountryCode, TDes& aNetworkID) - { - TRACE_FUNC_ENTRY; - TUint32 networkCaps; - RTelServer::TPhoneInfo phoneInfo; - - RTelServer server; - RMobilePhone mobilePhone; - User::LeaveIfError( server.Connect() ); - CleanupClosePushL( server ); - - TInt numPhones; - User::LeaveIfError( server.EnumeratePhones( numPhones ) ); - server.GetPhoneInfo( 0, phoneInfo ); - - User::LeaveIfError( mobilePhone.Open( server, phoneInfo.iName ) ); - CleanupClosePushL( mobilePhone ); - User::LeaveIfError( mobilePhone.GetNetworkCaps( networkCaps ) ); - - RMobilePhone::TMobilePhoneNetworkInfoV1 mobilePhoneNetworkInfo; - RMobilePhone::TMobilePhoneNetworkInfoV1Pckg mobilePhoneNetworkInfoPckg( - mobilePhoneNetworkInfo ); - RMobilePhone::TMobilePhoneLocationAreaV1 mobilePhoneLocationArea; - - if (networkCaps & RMobilePhone::KCapsGetCurrentNetwork) - { - TRequestStatus status; - mobilePhone.GetCurrentNetwork( - status, mobilePhoneNetworkInfoPckg, mobilePhoneLocationArea ); - User::WaitForRequest( status ); - User::LeaveIfError( status.Int() ); - } - - CleanupStack::PopAndDestroy( &mobilePhone ); - CleanupStack::PopAndDestroy( &server ); - if ( mobilePhoneNetworkInfo.iLongName.Length() > 0 ) - { - StrCopy( aLongName, mobilePhoneNetworkInfo.iLongName ); - } - else if ( mobilePhoneNetworkInfo.iShortName.Length() > 0 ) - { - StrCopy( aLongName, mobilePhoneNetworkInfo.iShortName ); - } - else - { - StrCopy( aLongName, mobilePhoneNetworkInfo.iDisplayTag ); - } - StrCopy( aCountryCode, mobilePhoneNetworkInfo.iCountryCode ); - StrCopy( aNetworkID, mobilePhoneNetworkInfo.iNetworkId ); - - TRACE_FUNC_EXIT; - } -// ----------------------------------------------------------------------------- -// CapUtil::GetManufacturer(TDes& aText) -// Gets phone manufacturer from HAL. In case manufacturer is not known, -// ----------------------------------------------------------------------------- -// -void CapUtil::GetManufacturer(TDes& aText) - { - TRACE_FUNC_ENTRY; - TInt num(KErrNotFound); - - HAL::Get(HALData::EManufacturer, num); - - switch (num) - { - case HALData::EManufacturer_Ericsson: - aText=KManufacturerEricsson; - break; - case HALData::EManufacturer_Motorola: - aText=KManufacturerMotorola; - break; - case HALData::EManufacturer_Nokia: - aText=KManufacturerNokia; - break; - case HALData::EManufacturer_Panasonic: - aText=KManufacturerPanasonic; - break; - case HALData::EManufacturer_Psion: - aText=KManufacturerPsion; - break; - case HALData::EManufacturer_Intel: - aText=KManufacturerIntel; - break; - case HALData::EManufacturer_Cogent: - aText=KManufacturerCogent; - break; - case HALData::EManufacturer_Cirrus: - aText=KManufacturerCirrus; - break; - case HALData::EManufacturer_Linkup: - aText=KManufacturerLinkup; - break; - case HALData::EManufacturer_TexasInstruments: - aText=KManufacturerTexasInstruments; - break; - default: - aText=KNullDesC; - break; - } - - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CapUtil::GetLanguage(TDes& aText) -// Gets language -// ----------------------------------------------------------------------------- -// -void CapUtil::GetLanguage(TDes& aText) - { - TRACE_FUNC_ENTRY; - TLanguage lang=User::Language(); - GetLanguageString(lang, aText); - TRACE_FUNC_EXIT; - } - -// ----------------------------------------------------------------------------- -// CapUtil::GetSWVersionL(TDes& aVersion, TDes& aDate, TDes& aModel) -// Gets SW version, SW version date and device model from SysUtil. -// ----------------------------------------------------------------------------- -// -void CapUtil::GetSWVersionL(TDes& aVersion, TDes& aDate, TDes& aModel) - { - TRACE_FUNC_ENTRY; - TBuf