datacommsserver/esockserver/MobilityCoreProviders/inc/mobilitymcpractivities.h.rej
changeset 2 dee179edb159
parent 1 21d2ab05f085
child 3 b6139031a239
equal deleted inserted replaced
1:21d2ab05f085 2:dee179edb159
     1 ***************
       
     2 *** 9,21 ****
       
     3   // Nokia Corporation - initial contribution.
       
     4   //
       
     5   // Contributors:
       
     6   //
       
     7   // Description:
       
     8   // Mobility Meta Connection Provider Activities
       
     9 - //
       
    10   //
       
    11   
       
    12   /**
       
    13    @file
       
    14    @internalComponent
       
    15   */
       
    16 --- 9,21 ----
       
    17   // Nokia Corporation - initial contribution.
       
    18   //
       
    19   // Contributors:
       
    20   //
       
    21   // Description:
       
    22   // Mobility Meta Connection Provider Activities
       
    23 + // 
       
    24   //
       
    25   
       
    26   /**
       
    27    @file
       
    28    @internalComponent
       
    29   */
       
    30 ***************
       
    31 *** 46,92 ****
       
    32       static MeshMachine::CNodeActivityBase* NewL(const MeshMachine::TNodeActivity& aActivitySig, MeshMachine::AMMNodeBase& aNode);
       
    33   
       
    34   protected:
       
    35   	CMobilityActivity(const MeshMachine::TNodeActivity& aActivitySig, MeshMachine::AMMNodeBase& aNode);
       
    36   	virtual ~CMobilityActivity();
       
    37   	typedef MeshMachine::TNodeContext<CMobilityMetaConnectionProvider, MCprStates::TContext> TContext;
       
    38 - 
       
    39   private:
       
    40   	TBool EvaluatePreference(TContext& aContext);
       
    41       void SetHandshakingFlag();
       
    42       void ClearHandshakingFlag();
       
    43   
       
    44   private:
       
    45   	ESock::RMetaServiceProviderInterface* iCurrent;
       
    46 - 	ESock::RMetaServiceProviderInterface* iAvailable;
       
    47 - 	ESock::RMetaServiceProviderInterface* iCandidate;
       
    48   	const TUint iAvailabilityScoreTreshold;
       
    49   
       
    50   
       
    51   public:
       
    52 - 
       
    53   	DECLARE_SMELEMENT_HEADER(TAwaitingCurrentCarrierRejectedOrAvailabilityChange, MeshMachine::TState<TContext>, NetStateMachine::MState, TContext)
       
    54   		virtual TBool Accept();
       
    55   	DECLARE_SMELEMENT_FOOTER(TAwaitingCurrentCarrierRejectedOrAvailabilityChange)
       
    56 - 
       
    57   	DECLARE_SMELEMENT_HEADER(TNoTagOrAwaitMobility, MeshMachine::TStateFork<TContext>, NetStateMachine::MStateFork, CMobilityActivity::TContext)
       
    58   		virtual TInt TransitionTag();
       
    59 - 	DECLARE_SMELEMENT_FOOTER(TNoTagOrAwaitMobility)
       
    60   
       
    61 - 	DECLARE_SMELEMENT_HEADER(TNoTagOrReConnectOrStartMobilityHandshakeBackwards, MeshMachine::TStateFork<TContext>, NetStateMachine::MStateFork, CMobilityActivity::TContext)
       
    62 - 		virtual TInt TransitionTag();
       
    63 - 	DECLARE_SMELEMENT_FOOTER(TNoTagOrReConnectOrStartMobilityHandshakeBackwards)
       
    64 - 
       
    65   	DECLARE_SMELEMENT_HEADER(TNoTagOrStartMobilityHandshakeBackwards, MeshMachine::TStateFork<TContext>, NetStateMachine::MStateFork, CMobilityActivity::TContext)
       
    66   		virtual TInt TransitionTag();
       
    67   	DECLARE_SMELEMENT_FOOTER(TNoTagOrStartMobilityHandshakeBackwards)
       
    68 - 
       
    69   	DECLARE_SMELEMENT_HEADER(TNoTagOrAwaitMobilityBackwardsOnMobilityTrigger, MeshMachine::TStateFork<TContext>, NetStateMachine::MStateFork, CMobilityActivity::TContext)
       
    70   		virtual TInt TransitionTag();
       
    71   	DECLARE_SMELEMENT_FOOTER(TNoTagOrAwaitMobilityBackwardsOnMobilityTrigger)
       
    72 - 
       
    73   	DECLARE_SMELEMENT_HEADER(TClearHandshakingFlag, MeshMachine::TStateTransition<TContext>, NetStateMachine::MStateTransition, CMobilityActivity::TContext)
       
    74   		virtual void DoL();
       
    75   	DECLARE_SMELEMENT_FOOTER(TClearHandshakingFlag)
       
    76   
       
    77   	DECLARE_SMELEMENT_HEADER(TSendAvailabilityRequest, MeshMachine::TStateTransition<TContext>, NetStateMachine::MStateTransition, CMobilityActivity::TContext)
       
    78   		virtual void DoL();
       
    79 --- 46,87 ----
       
    80       static MeshMachine::CNodeActivityBase* NewL(const MeshMachine::TNodeActivity& aActivitySig, MeshMachine::AMMNodeBase& aNode);
       
    81   
       
    82   protected:
       
    83   	CMobilityActivity(const MeshMachine::TNodeActivity& aActivitySig, MeshMachine::AMMNodeBase& aNode);
       
    84   	virtual ~CMobilityActivity();
       
    85   	typedef MeshMachine::TNodeContext<CMobilityMetaConnectionProvider, MCprStates::TContext> TContext;
       
    86 + 	
       
    87   private:
       
    88   	TBool EvaluatePreference(TContext& aContext);
       
    89       void SetHandshakingFlag();
       
    90       void ClearHandshakingFlag();
       
    91   
       
    92   private:
       
    93   	ESock::RMetaServiceProviderInterface* iCurrent;
       
    94 + 	ESock::RMetaServiceProviderInterface* iPreferred;
       
    95   	const TUint iAvailabilityScoreTreshold;
       
    96   
       
    97   
       
    98   public:
       
    99 + 		
       
   100   	DECLARE_SMELEMENT_HEADER(TAwaitingCurrentCarrierRejectedOrAvailabilityChange, MeshMachine::TState<TContext>, NetStateMachine::MState, TContext)
       
   101   		virtual TBool Accept();
       
   102   	DECLARE_SMELEMENT_FOOTER(TAwaitingCurrentCarrierRejectedOrAvailabilityChange)
       
   103 + 	
       
   104   	DECLARE_SMELEMENT_HEADER(TNoTagOrAwaitMobility, MeshMachine::TStateFork<TContext>, NetStateMachine::MStateFork, CMobilityActivity::TContext)
       
   105   		virtual TInt TransitionTag();
       
   106 + 	DECLARE_SMELEMENT_FOOTER(TNoTagOrAwaitMobility)	
       
   107   
       
   108   	DECLARE_SMELEMENT_HEADER(TNoTagOrStartMobilityHandshakeBackwards, MeshMachine::TStateFork<TContext>, NetStateMachine::MStateFork, CMobilityActivity::TContext)
       
   109   		virtual TInt TransitionTag();
       
   110   	DECLARE_SMELEMENT_FOOTER(TNoTagOrStartMobilityHandshakeBackwards)
       
   111 + 	
       
   112   	DECLARE_SMELEMENT_HEADER(TNoTagOrAwaitMobilityBackwardsOnMobilityTrigger, MeshMachine::TStateFork<TContext>, NetStateMachine::MStateFork, CMobilityActivity::TContext)
       
   113   		virtual TInt TransitionTag();
       
   114   	DECLARE_SMELEMENT_FOOTER(TNoTagOrAwaitMobilityBackwardsOnMobilityTrigger)
       
   115 + 	
       
   116   	DECLARE_SMELEMENT_HEADER(TClearHandshakingFlag, MeshMachine::TStateTransition<TContext>, NetStateMachine::MStateTransition, CMobilityActivity::TContext)
       
   117   		virtual void DoL();
       
   118   	DECLARE_SMELEMENT_FOOTER(TClearHandshakingFlag)
       
   119   
       
   120   	DECLARE_SMELEMENT_HEADER(TSendAvailabilityRequest, MeshMachine::TStateTransition<TContext>, NetStateMachine::MStateTransition, CMobilityActivity::TContext)
       
   121   		virtual void DoL();
       
   122 ***************
       
   123 *** 102,127 ****
       
   124   		virtual void DoL();
       
   125   	DECLARE_SMELEMENT_FOOTER(TRequestReConnect)
       
   126   
       
   127   	DECLARE_SMELEMENT_HEADER(TInformMigrationCompleted, MeshMachine::TStateTransition<TContext>, NetStateMachine::MStateTransition, CMobilityActivity::TContext)
       
   128   		virtual void DoL();
       
   129   	DECLARE_SMELEMENT_FOOTER(TInformMigrationCompleted)
       
   130 - 
       
   131 - 	typedef MeshMachine::TActivitiesIdMutex<ESock::ECFActivityConnectionStartRecovery,
       
   132   											ESock::ECFActivityConnectionGoneDownRecovery> TActivityErrorRecoveryMutex;
       
   133   	DECLARE_SERIALIZABLE_STATE(
       
   134   	    TNoTagOrAwaitMobilityBackwardsOnMobilityTriggerBlockedByErrorRecovery,
       
   135   		TActivityErrorRecoveryMutex,
       
   136   		TNoTagOrAwaitMobilityBackwardsOnMobilityTrigger
       
   137 - 		)
       
   138 - 
       
   139   	DECLARE_SERIALIZABLE_STATE(
       
   140   		TNoTagOrAwaitMobilityBlockedByErrorRecovery,
       
   141   		TActivityErrorRecoveryMutex,
       
   142   		TNoTagOrAwaitMobility
       
   143 - 		)
       
   144   	};
       
   145   
       
   146   ///////////////////////////////////////////////////////////////////////////////
       
   147   //CConnectionRecoveryActivity
       
   148   class CConnectionRecoveryActivity : public MeshMachine::CNodeRetryActivity
       
   149   	{
       
   150 --- 97,122 ----
       
   151   		virtual void DoL();
       
   152   	DECLARE_SMELEMENT_FOOTER(TRequestReConnect)
       
   153   
       
   154   	DECLARE_SMELEMENT_HEADER(TInformMigrationCompleted, MeshMachine::TStateTransition<TContext>, NetStateMachine::MStateTransition, CMobilityActivity::TContext)
       
   155   		virtual void DoL();
       
   156   	DECLARE_SMELEMENT_FOOTER(TInformMigrationCompleted)
       
   157 + 	
       
   158 + 	typedef MeshMachine::TActivitiesIdMutex<ESock::ECFActivityConnectionStartRecovery, 
       
   159   											ESock::ECFActivityConnectionGoneDownRecovery> TActivityErrorRecoveryMutex;
       
   160   	DECLARE_SERIALIZABLE_STATE(
       
   161   	    TNoTagOrAwaitMobilityBackwardsOnMobilityTriggerBlockedByErrorRecovery,
       
   162   		TActivityErrorRecoveryMutex,
       
   163   		TNoTagOrAwaitMobilityBackwardsOnMobilityTrigger
       
   164 + 		)	
       
   165 + 	
       
   166   	DECLARE_SERIALIZABLE_STATE(
       
   167   		TNoTagOrAwaitMobilityBlockedByErrorRecovery,
       
   168   		TActivityErrorRecoveryMutex,
       
   169   		TNoTagOrAwaitMobility
       
   170 + 		)		
       
   171   	};
       
   172   
       
   173   ///////////////////////////////////////////////////////////////////////////////
       
   174   //CConnectionRecoveryActivity
       
   175   class CConnectionRecoveryActivity : public MeshMachine::CNodeRetryActivity
       
   176   	{