Mercurial Mercurial > oss > FCL > sf > os > commsfw / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
datacommsserver/esockserver/MobilityCoreProviders/inc/mobilitymcpractivities.h.rej
changeset 1 21d2ab05f085 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/datacommsserver/esockserver/MobilityCoreProviders/inc/mobilitymcpractivities.h.rej	Thu Jan 07 13:34:53 2010 +0200
@@ -0,0 +1,176 @@
+***************
+*** 9,21 ****
+  // Nokia Corporation - initial contribution.
+  //
+  // Contributors:
+  //
+  // Description:
+  // Mobility Meta Connection Provider Activities
+- //
+  //
+  
+  /**
+   @file
+   @internalComponent
+  */
+--- 9,21 ----
+  // Nokia Corporation - initial contribution.
+  //
+  // Contributors:
+  //
+  // Description:
+  // Mobility Meta Connection Provider Activities
++ // 
+  //
+  
+  /**
+   @file
+   @internalComponent
+  */
+***************
+*** 46,92 ****
+      static MeshMachine::CNodeActivityBase* NewL(const MeshMachine::TNodeActivity& aActivitySig, MeshMachine::AMMNodeBase& aNode);
+  
+  protected:
+  	CMobilityActivity(const MeshMachine::TNodeActivity& aActivitySig, MeshMachine::AMMNodeBase& aNode);
+  	virtual ~CMobilityActivity();
+  	typedef MeshMachine::TNodeContext<CMobilityMetaConnectionProvider, MCprStates::TContext> TContext;
+- 
+  private:
+  	TBool EvaluatePreference(TContext& aContext);
+      void SetHandshakingFlag();
+      void ClearHandshakingFlag();
+  
+  private:
+  	ESock::RMetaServiceProviderInterface* iCurrent;
+- 	ESock::RMetaServiceProviderInterface* iAvailable;
+- 	ESock::RMetaServiceProviderInterface* iCandidate;
+  	const TUint iAvailabilityScoreTreshold;
+  
+  
+  public:
+- 
+  	DECLARE_SMELEMENT_HEADER(TAwaitingCurrentCarrierRejectedOrAvailabilityChange, MeshMachine::TState<TContext>, NetStateMachine::MState, TContext)
+  		virtual TBool Accept();
+  	DECLARE_SMELEMENT_FOOTER(TAwaitingCurrentCarrierRejectedOrAvailabilityChange)
+- 
+  	DECLARE_SMELEMENT_HEADER(TNoTagOrAwaitMobility, MeshMachine::TStateFork<TContext>, NetStateMachine::MStateFork, CMobilityActivity::TContext)
+  		virtual TInt TransitionTag();
+- 	DECLARE_SMELEMENT_FOOTER(TNoTagOrAwaitMobility)
+  
+- 	DECLARE_SMELEMENT_HEADER(TNoTagOrReConnectOrStartMobilityHandshakeBackwards, MeshMachine::TStateFork<TContext>, NetStateMachine::MStateFork, CMobilityActivity::TContext)
+- 		virtual TInt TransitionTag();
+- 	DECLARE_SMELEMENT_FOOTER(TNoTagOrReConnectOrStartMobilityHandshakeBackwards)
+- 
+  	DECLARE_SMELEMENT_HEADER(TNoTagOrStartMobilityHandshakeBackwards, MeshMachine::TStateFork<TContext>, NetStateMachine::MStateFork, CMobilityActivity::TContext)
+  		virtual TInt TransitionTag();
+  	DECLARE_SMELEMENT_FOOTER(TNoTagOrStartMobilityHandshakeBackwards)
+- 
+  	DECLARE_SMELEMENT_HEADER(TNoTagOrAwaitMobilityBackwardsOnMobilityTrigger, MeshMachine::TStateFork<TContext>, NetStateMachine::MStateFork, CMobilityActivity::TContext)
+  		virtual TInt TransitionTag();
+  	DECLARE_SMELEMENT_FOOTER(TNoTagOrAwaitMobilityBackwardsOnMobilityTrigger)
+- 
+  	DECLARE_SMELEMENT_HEADER(TClearHandshakingFlag, MeshMachine::TStateTransition<TContext>, NetStateMachine::MStateTransition, CMobilityActivity::TContext)
+  		virtual void DoL();
+  	DECLARE_SMELEMENT_FOOTER(TClearHandshakingFlag)
+  
+  	DECLARE_SMELEMENT_HEADER(TSendAvailabilityRequest, MeshMachine::TStateTransition<TContext>, NetStateMachine::MStateTransition, CMobilityActivity::TContext)
+  		virtual void DoL();
+--- 46,87 ----
+      static MeshMachine::CNodeActivityBase* NewL(const MeshMachine::TNodeActivity& aActivitySig, MeshMachine::AMMNodeBase& aNode);
+  
+  protected:
+  	CMobilityActivity(const MeshMachine::TNodeActivity& aActivitySig, MeshMachine::AMMNodeBase& aNode);
+  	virtual ~CMobilityActivity();
+  	typedef MeshMachine::TNodeContext<CMobilityMetaConnectionProvider, MCprStates::TContext> TContext;
++ 	
+  private:
+  	TBool EvaluatePreference(TContext& aContext);
+      void SetHandshakingFlag();
+      void ClearHandshakingFlag();
+  
+  private:
+  	ESock::RMetaServiceProviderInterface* iCurrent;
++ 	ESock::RMetaServiceProviderInterface* iPreferred;
+  	const TUint iAvailabilityScoreTreshold;
+  
+  
+  public:
++ 		
+  	DECLARE_SMELEMENT_HEADER(TAwaitingCurrentCarrierRejectedOrAvailabilityChange, MeshMachine::TState<TContext>, NetStateMachine::MState, TContext)
+  		virtual TBool Accept();
+  	DECLARE_SMELEMENT_FOOTER(TAwaitingCurrentCarrierRejectedOrAvailabilityChange)
++ 	
+  	DECLARE_SMELEMENT_HEADER(TNoTagOrAwaitMobility, MeshMachine::TStateFork<TContext>, NetStateMachine::MStateFork, CMobilityActivity::TContext)
+  		virtual TInt TransitionTag();
++ 	DECLARE_SMELEMENT_FOOTER(TNoTagOrAwaitMobility)	
+  
+  	DECLARE_SMELEMENT_HEADER(TNoTagOrStartMobilityHandshakeBackwards, MeshMachine::TStateFork<TContext>, NetStateMachine::MStateFork, CMobilityActivity::TContext)
+  		virtual TInt TransitionTag();
+  	DECLARE_SMELEMENT_FOOTER(TNoTagOrStartMobilityHandshakeBackwards)
++ 	
+  	DECLARE_SMELEMENT_HEADER(TNoTagOrAwaitMobilityBackwardsOnMobilityTrigger, MeshMachine::TStateFork<TContext>, NetStateMachine::MStateFork, CMobilityActivity::TContext)
+  		virtual TInt TransitionTag();
+  	DECLARE_SMELEMENT_FOOTER(TNoTagOrAwaitMobilityBackwardsOnMobilityTrigger)
++ 	
+  	DECLARE_SMELEMENT_HEADER(TClearHandshakingFlag, MeshMachine::TStateTransition<TContext>, NetStateMachine::MStateTransition, CMobilityActivity::TContext)
+  		virtual void DoL();
+  	DECLARE_SMELEMENT_FOOTER(TClearHandshakingFlag)
+  
+  	DECLARE_SMELEMENT_HEADER(TSendAvailabilityRequest, MeshMachine::TStateTransition<TContext>, NetStateMachine::MStateTransition, CMobilityActivity::TContext)
+  		virtual void DoL();
+***************
+*** 102,127 ****
+  		virtual void DoL();
+  	DECLARE_SMELEMENT_FOOTER(TRequestReConnect)
+  
+  	DECLARE_SMELEMENT_HEADER(TInformMigrationCompleted, MeshMachine::TStateTransition<TContext>, NetStateMachine::MStateTransition, CMobilityActivity::TContext)
+  		virtual void DoL();
+  	DECLARE_SMELEMENT_FOOTER(TInformMigrationCompleted)
+- 
+- 	typedef MeshMachine::TActivitiesIdMutex<ESock::ECFActivityConnectionStartRecovery,
+  											ESock::ECFActivityConnectionGoneDownRecovery> TActivityErrorRecoveryMutex;
+  	DECLARE_SERIALIZABLE_STATE(
+  	    TNoTagOrAwaitMobilityBackwardsOnMobilityTriggerBlockedByErrorRecovery,
+  		TActivityErrorRecoveryMutex,
+  		TNoTagOrAwaitMobilityBackwardsOnMobilityTrigger
+- 		)
+- 
+  	DECLARE_SERIALIZABLE_STATE(
+  		TNoTagOrAwaitMobilityBlockedByErrorRecovery,
+  		TActivityErrorRecoveryMutex,
+  		TNoTagOrAwaitMobility
+- 		)
+  	};
+  
+  ///////////////////////////////////////////////////////////////////////////////
+  //CConnectionRecoveryActivity
+  class CConnectionRecoveryActivity : public MeshMachine::CNodeRetryActivity
+  	{
+--- 97,122 ----
+  		virtual void DoL();
+  	DECLARE_SMELEMENT_FOOTER(TRequestReConnect)
+  
+  	DECLARE_SMELEMENT_HEADER(TInformMigrationCompleted, MeshMachine::TStateTransition<TContext>, NetStateMachine::MStateTransition, CMobilityActivity::TContext)
+  		virtual void DoL();
+  	DECLARE_SMELEMENT_FOOTER(TInformMigrationCompleted)
++ 	
++ 	typedef MeshMachine::TActivitiesIdMutex<ESock::ECFActivityConnectionStartRecovery, 
+  											ESock::ECFActivityConnectionGoneDownRecovery> TActivityErrorRecoveryMutex;
+  	DECLARE_SERIALIZABLE_STATE(
+  	    TNoTagOrAwaitMobilityBackwardsOnMobilityTriggerBlockedByErrorRecovery,
+  		TActivityErrorRecoveryMutex,
+  		TNoTagOrAwaitMobilityBackwardsOnMobilityTrigger
++ 		)	
++ 	
+  	DECLARE_SERIALIZABLE_STATE(
+  		TNoTagOrAwaitMobilityBlockedByErrorRecovery,
+  		TActivityErrorRecoveryMutex,
+  		TNoTagOrAwaitMobility
++ 		)		
+  	};
+  
+  ///////////////////////////////////////////////////////////////////////////////
+  //CConnectionRecoveryActivity
+  class CConnectionRecoveryActivity : public MeshMachine::CNodeRetryActivity
+  	{
FCL/sf/os/commsfw