MCL/sf/os/cellularsrv: comparison telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketservicetsy.cpp

equal deleted inserted replaced

-:fc69e1e37771
+:fe8b59ab9fa0
 #include "cmmmbmscontextlist.h"
 #include "cmmmbmsmonitoredlist.h"
 // ======== MEMBER FUNCTIONS ========
-CMmPacketServiceTsy::CMmPacketServiceTsy()
+CMmPacketServiceTsy::CMmPacketServiceTsy():
+iReqHandleType(EMultimodePacketServiceReqHandleUnknown)
 {
 }
 CMmPacketServiceTsy* CMmPacketServiceTsy::NewL(
 CMmPhoneTsy* const aMmPhone,
 CMmPacketServiceTsy::ReqCompleted( reqHandle, aError );
 }
 if ( RPacketService::EAttachWhenPossible == iAttachMode )
 {
 SetAttachModeL( &iAttachMode );
+iReqHandleType = EMultimodePacketServiceReqHandleUnknown;
 }
 }
 //----------------------------------------------------------------------------
 // CMmPacketServiceTsy::EnumerateContexts
 TFLOGSTRING2("TSY: CMmPacketServiceTsy::ExtFunc. IPC: %d", aIpc );
 TInt ret( KErrNone );
 TInt trapError( KErrNone );
-// Reset request handle type
+// Ensure the ReqHandleType is unset.
-iReqHandleType = EMultimodePacketServiceReqHandleUnknown;
+// This will detect cases where this method indirectly calls itself
+// (e.g. servicing a client call that causes a self-reposting notification to complete and thus repost).
+// Such cases are not supported because iReqHandleType is in the context of this class instance,
+// not this request, and we don't want the values set by the inner request and the outer request
+// interfering with each other.
+__ASSERT_DEBUG(iReqHandleType==EMultimodePacketServiceReqHandleUnknown, User::Invariant());
 // Set tsy request handle
 iTsyReqHandle = aTsyReqHandle;
 // Call DoExtFuncL()
 TRAP( trapError, ret = DoExtFuncL( aIpc, aPackage ); );
 #ifdef REQHANDLE_TIMER
 SetTypeOfResponse( iReqHandleType );
 #else
 iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, iTsyReqHandle );
 #endif // REQHANDLE_TIMER
+// We've finished with this value now. Clear it so it doesn't leak
+//  up to any other instances of this method down the call stack
+iReqHandleType = EMultimodePacketServiceReqHandleUnknown;
 }
 return KErrNone;
 }
 {
 TFLOGSTRING3("TSY: CMmPacketServiceTsy::CancelService. IPC: %d Tsy Req Handle:%d", aIpc, aTsyReqHandle);
 TInt ret( KErrNone );
-// Reset last tsy request type
+// Ensure the ReqHandleType is unset.
-iReqHandleType = EMultimodePacketServiceReqHandleUnknown;
+// This will detect cases where this method indirectly calls itself
+// (e.g. servicing a client call that causes a self-reposting notification to complete and thus repost).
+// Such cases are not supported because iReqHandleType is in the context of this class instance,
+// not this request, and we don't want the values set by the inner request and the outer request
+// interfering with each other.
+__ASSERT_DEBUG(iReqHandleType==EMultimodePacketServiceReqHandleUnknown, User::Invariant());
 // When the clients close their sub-sessions (eg. by calling
 // RPacketService::Close), they may not have cancelled all their
 // outstanding asynchronous requests before closing.  It is up to the ETel
 // server to clean up in this situation, so the server will find the list
 // these outstanding IPC request numbers, one at a time, to the
 // CancelService method in the TSY.
 switch ( aIpc )
 {
 case EPacketNotifyContextAdded:
 iNotifyDataPointers.iContextAdded = NULL;
 iReqHandleType = EMultimodePacketServiceNotifyContextAdded;
 break;
 case EPacketNotifyStatusChange:
 // Reset tsy request handle
 iTsyReqHandleStore->ResetTsyReqHandle( iReqHandleType );
 // Complete request with KErrCancel
 CMmPacketServiceTsy::ReqCompleted( aTsyReqHandle, KErrCancel );
+// We've finished with this value now. Clear it so it doesn't leak
+//  up to any other instances of this method down the call stack
+iReqHandleType = EMultimodePacketServiceReqHandleUnknown;
 }
 return ret;
 }
 	return ret;
 }
 //----------------------------------------------------------------------------
-// CMmPacketServiceTsy::CompleteUpdateMbmsMonitorServiceListL
+// CMmPacketServiceTsy::CompleteUpdateMbmsMonitorServiceList
 // Completes update monitored service list request
 //----------------------------------------------------------------------------
 //
 void CMmPacketServiceTsy::CompleteUpdateMbmsMonitorServiceList(
 CMmDataPackage* aDataPackage,
 const TInt aResult)
 	{
 	TFLOGSTRING( "TSY: CMmPacketServiceTsy::CompleteUpdateMbmsMonitorServiceListL." );
 	TInt result= aResult;
+	TInt err(KErrNone);
 	// Reset request handle. Returns the deleted request handle
 	const TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle(
 	        EMultimodePacketServiceUpdateMBMSMonitorServiceList ) );
 	if( aResult == KErrNone )
 		{
-		result = iMBMSMonitoredList->ProcessEntriesL(NULL, iActionType);
+		TRAP( err, result = iMBMSMonitoredList->ProcessEntriesL( NULL, iActionType ) );
-CompleteNotifyMbmsServiceAvailabilityChangeL( NULL, aResult );
+		if ( !err )
+		    TRAP( err, CompleteNotifyMbmsServiceAvailabilityChangeL( NULL, aResult ) );
 		}
 	//there were problem managing entries
 	else if( (aResult == KErrMbmsImpreciseServiceEntries) && (aDataPackage != NULL) )
 		{
 		CPcktMbmsMonitoredServiceList* failedMonitorEntries = NULL;
 		aDataPackage->UnPackData( &failedMonitorEntries );
 		// there were a problems with some entries,
 		// Check failed entries exists and add succesful entries to main list
 		if( failedMonitorEntries != NULL )
 			{
-			iMBMSMonitoredList->ProcessEntriesL( failedMonitorEntries, iActionType );
+			TRAP( err, iMBMSMonitoredList->ProcessEntriesL( failedMonitorEntries, iActionType ) );
 			}
 		else // There was a general error, don't add anything to main list
 			{
-			iMBMSMonitoredList->ResetTempListL();
+			TRAP( err, iMBMSMonitoredList->ResetTempListL() );
 			}
 		}
 	 if( EMultimodePacketServiceReqHandleUnknown != reqHandle )
 		 {
+// If there was an error due to a function leaving, complete to the client with that error.
+if (err)
+{
+result = err;
+}
 		 //complete with error to client
 		 CMmPacketServiceTsy::ReqCompleted( reqHandle, result );
 		 }
 	}

branch	RCL_3
changeset 7	fe8b59ab9fa0
parent 0	3553901f7fa8
child 9	2492a6e4aed7