MCL/sf/mw/remoteconn: comparison connectivitymodules/SeCon/services/pcd/src/sconsbeclient.cpp

equal deleted inserted replaced

-:dbd1c5e08735
+:453dfc402455
 /*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #include <mmf/common/mmfcontrollerpluginresolver.h>
 #include "sconsbeclient.h"
 #include "debug.h"
+const TInt KDataBufExpandSize( 1024 );
+const TInt KMaxObjectSize( 1048576 - 1024 ); // Max chunk size is 1MB, but give some space for ConML wbxml
 _LIT( KSConNoDrive, "\x0" );
 _LIT( KSConDriveExists, "\x1" );
 // ============================= MEMBER FUNCTIONS ==============================
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // CSConSBEClient::CSConSBEClient( const TInt aMaxObjectSize )
 // Constructor
 // -----------------------------------------------------------------------------
 //
-CSConSBEClient::CSConSBEClient( const TInt aMaxObjectSize, RFs& aFs ) :
+CSConSBEClient::CSConSBEClient( const TInt /*aMaxObjectSize*/, RFs& aFs ) :
-CActive( EPriorityStandard ), iSBEClient(NULL),
+CActive( EPriorityStandard ), iBURModeNormal( ETrue ), iFs( aFs )
-iProcessComplete(EFalse), iProcessIndex( 0 ), iDataPos( 0 ),
+{
-iDataLeft( EFalse ), iBURModeNormal( ETrue ),
-iRestoreMode( EFalse ), iFs( aFs )
-{
-iMaxObjectSize = aMaxObjectSize;
 }
 // -----------------------------------------------------------------------------
 // CSConSBEClient::~CSConSBEClient()
 // Initializes member data
 if( iSBEClient )
 {
 delete iSBEClient;
 iSBEClient = NULL;
 }
+delete iDataBuffer;
 TRACE_FUNC_EXIT;
 }
 // -----------------------------------------------------------------------------
 // CSConSBEClient::SetBURMode( TRequestStatus& aStatus, CSConTask*& aTask )
 {
 case ESetBURMode :
 LOGGER_WRITE( "CSConSBEClient::RunL() : ESetBURMode" );
 TRAP( err, ProcessSetBURModeL() );
 LOGGER_WRITE_1( "CSConSBEClient::RunL() : ProcessSetBURModeL() : returned %d", err );
-HandleSBEErrorL( err );
-User::RequestComplete( iCallerStatus, err );
 break;
 case EListPublicFiles :
 LOGGER_WRITE( "CSConSBEClient::RunL() : EListPublicFiles" );
 TRAP( err, ProcessListPublicFilesL() );
 LOGGER_WRITE_1( "CSConSBEClient::RunL() : ProcessListPublicFilesL() : returned %d", err );
-HandleSBEErrorL( err );
-User::RequestComplete( iCallerStatus, err );
 break;
 case EListDataOwners :
 LOGGER_WRITE( "CSConSBEClient::RunL() : EListDataOwners" );
 TRAP( err, ProcessListDataOwnersL() );
 LOGGER_WRITE_1( "CSConSBEClient::RunL() : ProcessListDataOwnersL() : returned %d", err );
-HandleSBEErrorL( err );
-User::RequestComplete( iCallerStatus, err );
 break;
 case EGetDataSize :
 LOGGER_WRITE( "CSConSBEClient::RunL() : EGetDataSize" );
 TRAP( err, ProcessGetDataSizeL() );
 LOGGER_WRITE_1( "CSConSBEClient::RunL() : ProcessGetDataSizeL() : returned %d", err );
-HandleSBEErrorL( err );
-User::RequestComplete( iCallerStatus, err );
 break;
 case ERequestData :
 LOGGER_WRITE( "CSConSBEClient::RunL() : ERequestData" );
 TRAP( err, ret = ProcessRequestDataL() );
 LOGGER_WRITE_1( "CSConSBEClient::RunL() : ProcessRequestDataL() : returned %d", err );
-HandleSBEErrorL( err );
-if( err == KErrNone )
-{
-err = ret;
-}
-User::RequestComplete( iCallerStatus, err );
 break;
 case EGetDataOwnerStatus :
 LOGGER_WRITE( "CSConSBEClient::RunL() : EGetDataOwnerStatus" );
 TRAP( err, ProcessGetDataOwnerStatusL() );
 LOGGER_WRITE_1( "CSConSBEClient::RunL() : ProcessGetDataOwnerStatusL() : returned %d", err );
-HandleSBEErrorL( err );
-User::RequestComplete( iCallerStatus, err );
 break;
 case ESupplyData :
 LOGGER_WRITE( "CSConSBEClient::RunL() : ESupplyData" );
 TRAP( err, ret = ProcessSupplyDataL() );
 LOGGER_WRITE_1( "CSConSBEClient::RunL() : SupplyDataL() : returned %d", err );
-HandleSBEErrorL( err );
-if( err == KErrNone )
-{
-err = ret;
-}
-User::RequestComplete( iCallerStatus, err );
 break;
 default :
+err = KErrNotSupported;
 LOGGER_WRITE( "CSConSBEClient::RunL() : ERROR! Unknown!" );
 break;
 }
+if ( err )
+{
+HandleSBEErrorL( err );
+}
+else
+{
+err = ret;
+}
+User::RequestComplete( iCallerStatus, err );
 TRACE_FUNC_EXIT;
 }
 // -----------------------------------------------------------------------------
 void CSConSBEClient::ProcessSetBURModeL()
 {
 TRACE_FUNC_ENTRY;
 iAllSnapshotsSuppliedCalled = EFalse;
+iLastChunk = EFalse;
 TDriveList driveList = iCurrentTask->iBURModeParams->iDriveList;
 TBURPartType partialType = EBURUnset;
 iRestoreMode = EFalse;
 iRestoreMode = ETrue;
 break;
 default :
 partialType = EBURUnset;
 break;
+}
+if ( partialType == EBURBackupFull || partialType == ESConBurBackupPartial )
+{
+// initialize buffer
+if ( !iDataBuffer )
+iDataBuffer = CBufFlat::NewL( KDataBufExpandSize );
+else
+iDataBuffer->Reset();
+iDataBufferSize=0;
+}
+else
+{
+delete iDataBuffer;
+iDataBuffer = 0;
 }
 TBackupIncType incType = ENoBackup;
 switch( iCurrentTask->iBURModeParams->iIncType )
 for( TInt i = 0; i < dataOwners.Count(); i++ )
 {
 LOGGER_WRITE_2("handling do: %d, count: %d", i, dataOwners.Count());
 CSConDataOwner* dataOwner = new (ELeave) CSConDataOwner();
+CleanupStack::PushL( dataOwner );
 // default values
 TSecureId sid( 0 );
 includeToList = ETrue;
 TCommonBURSettings commonOptions = dataOwners[i]->CommonSettings();
 }
 if( includeToList )
 {
 LOGGER_WRITE_1( "Appending to list, uid: 0x%08x", dataOwner->iUid.iUid );
-iCurrentTask->iListDataOwnersParams->iDataOwners.Append( dataOwner );
+iCurrentTask->iListDataOwnersParams->iDataOwners.AppendL( dataOwner );
+CleanupStack::Pop( dataOwner );
 }
 if( sid )
 {
 LOGGER_WRITE_1( "Appending package sid to list, sid: 0x%08x", sid.iId );
 CSConDataOwner* packageDataOwner = dataOwner->CopyL();
+CleanupStack::PushL( packageDataOwner );
 //Clear package name
 packageDataOwner->iPackageName = KNullDesC();
 //Add sid
 packageDataOwner->iUid.iUid = sid.iId;
-iCurrentTask->iListDataOwnersParams->iDataOwners.Append( packageDataOwner );
+iCurrentTask->iListDataOwnersParams->iDataOwners.AppendL( packageDataOwner );
+CleanupStack::Pop( packageDataOwner );
 }
 if( !includeToList )
 {
 //Not included to list => delete memory allocation
-delete dataOwner;
+CleanupStack::PopAndDestroy( dataOwner );
 }
 }
 packageArray.Reset();
 CleanupStack::PopAndDestroy( &packageArray );
 //
 TInt CSConSBEClient::ProcessRequestDataL()
 {
 TRACE_FUNC_ENTRY;
 TInt ret( KErrNone );
-if( iMaxObjectSize <= 1 )
-{
-User::Leave( KErrGeneral );
-}
 TBool packageData = EFalse;
 TTransferDataType transferDataType( ERegistrationData );
 TPackageDataType packageDataType( ESystemSnapshotData );
 LOGGER_WRITE_1("CSConSBEClient::ProcessRequestDataL() iTransDataType: %d",
 else if( !iCurrentTask->iRequestDataParams->iDataOwner->iJavaHash )
 {
 sid = iCurrentTask->iRequestDataParams->iDataOwner->iUid;
 LOGGER_WRITE_1("CSConSBEClient::ProcessRequestDataL() sid: 0x%08x", sid.iId);
 }
-CSBPackageTransferType* ptt( NULL );
-CSBSIDTransferType* stt( NULL );
-CSBJavaTransferType* jtt( NULL );
-LOGGER_WRITE_1( "CSConSBEClient::ProcessRequestDataL() : \
-Begin - Data left: %d", iDataLeft );
 LOGGER_WRITE_1( "CSConSBEClient::ProcessRequestDataL() : \
 Begin - Package data: %d", packageData );
-LOGGER_WRITE_1( "CSConSBEClient::ProcessRequestDataL() : \
-Begin - iDataPos: %d", iDataPos );
+LOGGER_WRITE_1("iLastChunk: %d", (TInt) iLastChunk );
+LOGGER_WRITE_1("iDataBufferSize: %d", iDataBufferSize );
-//Are there old data left to be transfered?
-if( !iDataLeft )
+// if was't last chunk and there are free space left on our packet
+if( !iLastChunk && iDataBufferSize < KMaxObjectSize )
 {
 //No data left, request more from the server
 if( packageData && !iCurrentTask->iRequestDataParams->iDataOwner->iJavaHash )
 {
-ptt = CSBPackageTransferType::NewL( uid, driveNumber,
+CSBPackageTransferType* ptt = CSBPackageTransferType::NewL(
-packageDataType );
+uid, driveNumber, packageDataType );
 CleanupStack::PushL( ptt );
-LOGGER_WRITE( "iSBEClient->RequestDataL( ptt ) : start" );
-TRequestStatus status;
+RequestDataL( *ptt );
-iSBEClient->RequestDataL( *ptt, status );
-User::WaitForRequest( status );
-LOGGER_WRITE( "iSBEClint->RequestDataL( ptt ) : stop" );
-LOGGER_WRITE_1( "CSConSBEClient::ProcessRequestDataL() : status.Int() %d", status.Int() );
-User::LeaveIfError( status.Int() );
-//Get the data and store the handle
-CSBGenericTransferType* gtt = NULL;
-LOGGER_WRITE( "iDataPtr.Set( iSBEClient->TransferDataInfoL( gtt, iSBEDataLeft ) : start" );
-iDataPtr.Set( iSBEClient->TransferDataInfoL( gtt, iLastChunk ) );
-LOGGER_WRITE( "iDataPtr.Set( iSBEClient->TransferDataInfoL( gtt, iSBEDataLeft ) : stop" );
-LOGGER_WRITE_1( "CSConSBEClient::ProcessRequestDataL() :\
-Received data size %d", iDataPtr.Length() );
-LOGGER_WRITE_1( "CSConSBEClient::ProcessRequestDataL() :\
-Received from DO 0x%08x", uid );
-LOGGER_WRITE_1( "CSConSBEClient::ProcessRequestDataL() :\
-Is last chunk %d", iLastChunk );
-LOGGER_WRITE_1( "CSConSBEClient::ProcessRequestDataL() :\
-Transfertype %d", iCurrentTask->iRequestDataParams->iDataOwner->iTransDataType );
-if( gtt )
-{
-delete gtt;
-}
 CleanupStack::PopAndDestroy( ptt );
 }
 else if( !iCurrentTask->iRequestDataParams->iDataOwner->iJavaHash )
 {
-stt = CSBSIDTransferType::NewL( sid, driveNumber, transferDataType );
+CSBSIDTransferType* stt = CSBSIDTransferType::NewL(
+sid, driveNumber, transferDataType );
 CleanupStack::PushL( stt );
-LOGGER_WRITE( "iSBEClient->RequestDataL( stt ) : start" );
-TRequestStatus status;
+RequestDataL( *stt );
-iSBEClient->RequestDataL( *stt, status );
-User::WaitForRequest( status );
-LOGGER_WRITE( "iSBEClient->RequestDataL( stt ) : stop" );
-LOGGER_WRITE_1( "CSConSBEClient::ProcessRequestDataL() :\
-status.Int() %d", status.Int() );
-User::LeaveIfError( status.Int() );
-//Get the data and store the handle
-CSBGenericTransferType* gtt = NULL;
-LOGGER_WRITE( "iDataPtr.Set( iSBEClient->TransferDataInfoL( gtt, iSBEDataLeft ) : start" );
-iDataPtr.Set( iSBEClient->TransferDataInfoL( gtt, iLastChunk ) );
-LOGGER_WRITE( "iDataPtr.Set( iSBEClient->TransferDataInfoL( gtt, iSBEDataLeft ) : stop" );
-LOGGER_WRITE_1( "CSConSBEClient::ProcessRequestDataL() :\
-Received data size %d", iDataPtr.Length() );
-LOGGER_WRITE_1( "CSConSBEClient::ProcessRequestDataL() :\
-Is last chunk %d", iLastChunk );
-LOGGER_WRITE_1( "CSConSBEClient::ProcessRequestDataL() :\
-Transfertype %d",
-iCurrentTask->iRequestDataParams->iDataOwner->iTransDataType );
-if( gtt )
-{
-delete gtt;
-}
 CleanupStack::PopAndDestroy( stt );
 }
 else
 {
 TPtr javaHashPtr = iCurrentTask->iRequestDataParams->iDataOwner->iJavaHash->Des();
+CSBJavaTransferType* jtt( NULL );
 //When ESystemData is requested, request EJavaMIDlet
 if( packageDataType == ESystemData )
 {
 jtt = CSBJavaTransferType::NewL( javaHashPtr, driveNumber, EJavaMIDlet );
 }
 }
 if( packageDataType == ESystemData || transferDataType == EPassiveBaseData )
 {
 CleanupStack::PushL( jtt );
-LOGGER_WRITE( "iSBEClient->RequestDataL( jtt ) : start" );
-TRequestStatus status;
-iSBEClient->RequestDataL( *jtt, status );
-User::WaitForRequest( status );
-LOGGER_WRITE( "iSBEClient->RequestDataL( jtt ) : stop" );
-LOGGER_WRITE_1( "CSConSBEClient::ProcessRequestDataL() :\
+RequestDataL( *jtt );
-status.Int() %d", status.Int() );
-User::LeaveIfError( status.Int() );
-//Get the data and store the handle
-CSBGenericTransferType* gtt = NULL;
-LOGGER_WRITE( "iDataPtr.Set( iSBEClient->TransferDataInfoL( gtt, iSBEDataLeft ) : start" );
-iDataPtr.Set( iSBEClient->TransferDataInfoL( gtt, iLastChunk ) );
-LOGGER_WRITE( "iDataPtr.Set( iSBEClient->TransferDataInfoL( gtt, iSBEDataLeft ): stop" );
-LOGGER_WRITE_1( "CSConSBEClient::ProcessRequestDataL() :\
-Received data size %d", iDataPtr.Length() );
-LOGGER_WRITE_1( "CSConSBEClient::ProcessRequestDataL() :\
-Is last chunk %d", iLastChunk );
-LOGGER_WRITE_1( "CSConSBEClient::ProcessRequestDataL() :\
-Transfertype %d",
-iCurrentTask->iRequestDataParams->iDataOwner->iTransDataType );
-if( gtt )
-{
-delete gtt;
-}
 CleanupStack::PopAndDestroy( jtt );
 }
 else
 {
 //No data
-iDataPtr.Set( KNullDesC8 );
+iDataBuffer->Reset();
+iDataBufferSize = 0;
 iLastChunk = ETrue;
 }
 }
 }
-TInt dataBufLength = iDataPtr.Length();
+LOGGER_WRITE_1("readed iLastChunk: %d", (TInt) iLastChunk );
-LOGGER_WRITE_1( "CSConSBEClient::ProcessRequestDataL() : \
+LOGGER_WRITE_1("readed iDataBufferSize: %d", iDataBufferSize );
-Data received: %d", dataBufLength );
-TInt maxLength = iMaxObjectSize - 1024;
-LOGGER_WRITE_1( "CSConSBEClient::ProcessRequestDataL() : \
-Max length: %d", maxLength );
 if( iCurrentTask->iRequestDataParams->iBackupData )
 {
 delete iCurrentTask->iRequestDataParams->iBackupData;
 iCurrentTask->iRequestDataParams->iBackupData = NULL;
 }
+TInt dataToRead = KMaxObjectSize;
+if ( dataToRead > iDataBufferSize )
+dataToRead = iDataBufferSize;
 //Initialize the task data buffer
-iCurrentTask->iRequestDataParams->iBackupData = HBufC8::NewL( maxLength );
+iCurrentTask->iRequestDataParams->iBackupData = HBufC8::NewL( dataToRead );
 //Get descriptor task's buffer
 TPtr8 backupDataPtr = iCurrentTask->iRequestDataParams->iBackupData->Des();
-TInt copyPos = 0;
+iDataBuffer->Read(0, backupDataPtr, dataToRead );
-//Copy data to task buffer
+iDataBuffer->Delete(0, dataToRead);
-for( ; iDataPos < dataBufLength && copyPos < maxLength;
+iDataBufferSize -= dataToRead;
-iDataPos++ )
-{
+if ( !iLastChunk || iDataBufferSize>0 )
-backupDataPtr.Append( iDataPtr[iDataPos] );
+{
-copyPos++;
+LOGGER_WRITE( "CSConSBEClient::ProcessRequestDataL() : There are more data available" );
-}
-LOGGER_WRITE_1( "CSConSBEClient::ProcessRequestDataL() : \
-End - copyPos: %d", copyPos );
-LOGGER_WRITE_1( "CSConSBEClient::ProcessRequestDataL() : \
-End - iDataPos: %d", iDataPos );
-//Are there more data left in the buffer
-if( iDataPos < dataBufLength )
-{
-LOGGER_WRITE( "iSBEClient->RequestDataL( stt ) : There is more data in buffer" );
-iDataLeft = ETrue;
 iCurrentTask->iRequestDataParams->iMoreData = ETrue;
 //Another task is needed to transfer the data to the client
 ret = KErrCompletion;
 }
 else
 {
-//Check if the backup server has more data from the dataowner
+LOGGER_WRITE( "CSConSBEClient::ProcessRequestDataL() : All data readed" );
-if( !iLastChunk )
+iDataBuffer->Reset();
-{
+iDataBufferSize = 0;
-iCurrentTask->iRequestDataParams->iMoreData = ETrue;
+// task will be completed, initialize iLastChunk value for next operation
-//Another task is needed to transfer the data to the client
+iLastChunk = EFalse;
-ret = KErrCompletion;
+}
-LOGGER_WRITE( "iSBEClient->RequestDataL( stt ) : There are more data available from SBE" );
-}
-else
-{
-iCurrentTask->iRequestDataParams->iMoreData = EFalse;
-}
-iDataPos = 0;
-iDataLeft = EFalse;
-}
 LOGGER_WRITE_1( "CSConSBEClient::ProcessRequestDataL() :  returned %d", ret );
 return ret;
+}
+void CSConSBEClient::RequestDataL( CSBGenericTransferType& aGenericTransferType )
+{
+TRACE_FUNC_ENTRY;
+if ( !iDataBuffer )
+User::Leave( KErrArgument );
+do
+{
+LOGGER_WRITE( "iSBEClient->RequestDataL() : start" );
+TRequestStatus status;
+iSBEClient->RequestDataL( aGenericTransferType, status );
+User::WaitForRequest( status );
+LOGGER_WRITE_1( "iSBEClient->RequestDataL() : status.Int() %d", status.Int() );
+User::LeaveIfError( status.Int() );
+//Get the data and store the handle
+CSBGenericTransferType* gtt = NULL;
+const TPtrC8& dataPtr = iSBEClient->TransferDataInfoL( gtt, iLastChunk );
+LOGGER_WRITE_1("data size: %d", dataPtr.Length());
+delete gtt;
+iDataBuffer->ExpandL( iDataBufferSize, dataPtr.Length() );
+iDataBuffer->Write(iDataBufferSize, dataPtr);
+iDataBufferSize += dataPtr.Length();
+LOGGER_WRITE_1("total buffer size: %d", iDataBufferSize);
+}
+// Continue if there are more data, and our packet is not full
+while ( !iLastChunk && iDataBufferSize < KMaxObjectSize );
+TRACE_FUNC_EXIT;
 }
 // -----------------------------------------------------------------------------
 // CSConSBEClient::ProcessGetDataOwnerStatusL()
 // Executes GetDataOwnerStatus task
 LOGGER_WRITE( "Re-connecting to SBE..." );
 //Session has been terminated, recreate it..
 delete iSBEClient;
 iSBEClient = NULL;
 iSBEClient = CSBEClient::NewL();
+}
+else if ( aErr ) // error
+{
+if ( iDataBuffer )
+{
+iDataBuffer->Reset();
+iDataBufferSize = 0;
+}
+iLastChunk = EFalse;
 }
 TRACE_FUNC_EXIT;
 }
 // -----------------------------------------------------------------------------

branch	RCL_3
changeset 18	453dfc402455
parent 0	d0791faffa3f