FCL/sf/mw/mmappfw: comparison mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/crequestchecker.cpp

equal deleted inserted replaced

-:a05c44bc3c61
+:d881023c13eb
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
 *
 * Description:
 *
 */
-#include <mtp/cmtpobjectmetadata.h>
 #include <mtp/mmtpconnection.h>
 #include <mtp/mmtpdataproviderframework.h>
 #include <mtp/mmtpobjectmgr.h>
 #include <mtp/mmtpstoragemgr.h>
 iFramework( aFramework ),
 iConnection( aConnection ),
 iHandles( KMTPRequestCheckerHandleGranularity ),
 iObjectArray( KMTPRequestCheckerHandleGranularity )
 {
+// Do nothing
 }
 // -----------------------------------------------------------------------------
 // CRequestChecker::ConstructL
 // Two-phase construction method
 // -----------------------------------------------------------------------------
 //
 void CRequestChecker::ConstructL()
 {
+// Do nothing
 }
 // -----------------------------------------------------------------------------
 // CRequestChecker::~CRequestChecker
 // Destructor
 iObjectArray.ResetAndDestroy();
 }
 // -----------------------------------------------------------------------------
 // CRequestChecker::VerifyRequestL
-// Verfiy the request
+// Verify the request
 // -----------------------------------------------------------------------------
 //
 TMTPResponseCode CRequestChecker::VerifyRequestL( const TMTPTypeRequest& aRequest,
 TInt aCount,
 const TMTPRequestElementInfo* aElementInfo )
 {
 TMTPResponseCode result = EMTPRespCodeOK;
 iHandles.Close();
 iObjectArray.ResetAndDestroy();
 result = CheckRequestHeader( aRequest );
 for ( TInt i = 0; i < aCount && EMTPRespCodeOK == result; i++ )
 {
 TUint32 parameter = aRequest.Uint32( aElementInfo[i].iElementIndex );
 PRINT3( _L( "MM MTP <> CRequestChecker parameter %d/%d = %d" ),
-i + 1, aCount, parameter );
+i + 1,
+aCount,
+parameter );
 if ( !IsSpecialValue( parameter, aElementInfo[i] ) )
 {
 switch ( aElementInfo[i].iElementType )
 {
 case EMTPElementTypeSessionID:
 else if ( !iConnection.SessionWithMTPIdExists( sessionId ) )
 {
 ret = EMTPRespCodeSessionNotOpen;
 }
 }
 return ret;
 }
 // -----------------------------------------------------------------------------
 // CRequestChecker::VerifySessionId
 // Check the session id in the request parameter (NOTE the session id is different from the one in the request header),
 // this usually only applies to the OpenSession request
 // -----------------------------------------------------------------------------
 //
 TMTPResponseCode CRequestChecker::VerifySessionId( TUint32 aSessionId,
 const TMTPRequestElementInfo& /*aElementInfo*/ ) const
 {
 TMTPResponseCode ret = EMTPRespCodeOK;
 if ( aSessionId != 0 )
 {
 }
 else
 {
 ret = EMTPRespCodeInvalidParameter;
 }
 return ret;
 }
 // -----------------------------------------------------------------------------
 // CRequestChecker::VerifyObjectHandleL
 // Check the object handle in the request parameter, whether the handle is in the object store,
 // read/write, file/dir
 // -----------------------------------------------------------------------------
 //
 TMTPResponseCode CRequestChecker::VerifyObjectHandleL( TUint32 aHandle,
 const TMTPRequestElementInfo& aElementInfo )
 {
 PRINT1( _L("MM MTP => CRequestChecker::VerifyObjectHandleL aHandle = 0x%x"), aHandle );
 TMTPResponseCode ret = EMTPRespCodeOK;
 CMTPObjectMetaData* object( CMTPObjectMetaData::NewLC() );
 if ( result )
 {
 const TDesC& suid( object->DesC( CMTPObjectMetaData::ESuid ) );
 TEntry entry;
 TInt err = iFramework.Fs().Entry( suid, entry );
-if ( object->Uint( CMTPObjectMetaData::EFormatCode ) == EMTPFormatCodeAssociation )
+if ( err == KErrNotFound )
-//            && ( object->Uint( CMTPObjectMetaData::EFormatSubCode ) == EMTPAssociationTypeGenericFolder ) )
+{
-{
+iFramework.ObjectMgr().RemoveObjectL( suid );
-// Special association type .. not always present on the filesystem.
+// TODO: workaround for abstractalbumart
-return ret;
+// ret = EMTPRespCodeInvalidObjectHandle;
 }
-else
+else if ( err != KErrNone )
-{
+ret = EMTPRespCodeGeneralError;
-User::LeaveIfError( err );
+else if ( object->Uint( CMTPObjectMetaData::EFormatCode ) != EMTPFormatCodeAssociation )
+{
 if ( iFramework.ObjectMgr().ObjectOwnerId( aHandle ) != iFramework.DataProviderId() )
-{
-PRINT( _L(" ewrwe ret = EMTPRespCodeInvalidObjectHandle;"));
 ret = EMTPRespCodeInvalidObjectHandle;
-}
-}
+if ( ( aElementInfo.iElementAttr & EMTPElementAttrWrite ) && entry.IsReadOnly() )
-if ( aElementInfo.iElementAttr & EMTPElementAttrWrite )
-{
-if ( entry.IsReadOnly() )
-{
 ret = EMTPRespCodeObjectWriteProtected;
-}
-}
+if ( ( EMTPRespCodeOK == ret ) && ( aElementInfo.iElementAttr & EMTPElementAttrFile ) && entry.IsDir() )
-//((EMTPRespCodeOK == ret) && (aElementInfo.iElementAttr & EMTPElementAttrFileOrDir)) is
-// covered implicitly here, EMTPRespCodeOK will be returned. It is a valid case for an object to be either a folder or file
-// for certain operation's request parameter, for instance the first parameter of copyObject or
-// moveObject can be either a file or a directory.
-// Other cases.
-if ( ( EMTPRespCodeOK == ret ) && ( aElementInfo.iElementAttr & EMTPElementAttrFile) )
-{
-if ( entry.IsDir() )
-{
 ret = EMTPRespCodeInvalidObjectHandle;
-}
-}
+if ( ( EMTPRespCodeOK == ret ) && ( aElementInfo.iElementAttr & EMTPElementAttrDir ) && !entry.IsDir() )
-if ( ( EMTPRespCodeOK == ret ) && ( aElementInfo.iElementAttr & EMTPElementAttrDir ) )
-{
-if (!entry.IsDir())
-{
 ret = EMTPRespCodeInvalidParentObject;
-}
 }
 }
 else
-{
-PRINT( _L( "MM MTP <> CRequestChecker::VerifyObjectHandleL, Object does not exist." ) );
 ret = EMTPRespCodeInvalidObjectHandle;
-}
 PRINT1( _L( "MM MTP <= CRequestChecker::VerifyObjectHandleL ret = 0x%x" ), ret );
 return ret;
 }
 // -----------------------------------------------------------------------------
 // CRequestChecker::VerifyStorageIdL
 // Check the storage id parameter in the request, read/write attributes
 // -----------------------------------------------------------------------------
 //
 TMTPResponseCode CRequestChecker::VerifyStorageIdL( TUint32 aStorageId,
 const TMTPRequestElementInfo& aElementInfo ) const
 {
 MMTPStorageMgr& mgr( iFramework.StorageMgr() );
 TMTPResponseCode ret( EMTPRespCodeOK );
 if ( !mgr.ValidStorageId( aStorageId ) )
 {
 ret = EMTPRespCodeStoreReadOnly;
 }
 }
 }
 }
 return ret;
 }
 // -----------------------------------------------------------------------------
 // CRequestChecker::VerifyFormatCode
 // Check the format code parameter in the request
 // -----------------------------------------------------------------------------
 //
 TMTPResponseCode CRequestChecker::VerifyFormatCode( TUint32 aFormatCode,
 const TMTPRequestElementInfo& aElementInfo ) const
 {
 PRINT1( _L( "MM MTP => CRequestChecker::VerifyFormatCode aFormatCode = 0x%x" ), aFormatCode );
 TMTPResponseCode ret = EMTPRespCodeInvalidObjectFormatCode;
 if ( aElementInfo.iElementAttr == EMTPElementAttrFormatEnums )
 ret = EMTPRespCodeOK;
 }
 }
 PRINT1( _L( "MM MTP => CRequestChecker::VerifyFormatCode ret = 0x%x" ), ret );
 return ret;
 }
 // -----------------------------------------------------------------------------
 // CRequestChecker::IsSpecialValue
 // Check if the parameter is one of the special values
 // -----------------------------------------------------------------------------
 //
 TBool CRequestChecker::IsSpecialValue( TUint32 aParameter,
 const TMTPRequestElementInfo& aElementInfo ) const
 {
 TBool result = EFalse;
 switch ( aElementInfo.iCount )
 {
 case 1:
 result = ( aParameter == aElementInfo.iValue1 );
 break;
 case 2:
 result = ( aParameter == aElementInfo.iValue1
 || aParameter == aElementInfo.iValue2 );
 break;
 default:
 break;
 }
 return result;
 }
 // end of file

changeset 25	d881023c13eb
parent 0	a2952bb97e68
child 50	762d760dcfdf