diff -r cbb19216b74d -r 00c6709d25aa datacommsserver/esockserver/inc/ss_connstates.h --- a/datacommsserver/esockserver/inc/ss_connstates.h Thu Jul 15 20:01:43 2010 +0300 +++ b/datacommsserver/esockserver/inc/ss_connstates.h Thu Aug 19 11:05:47 2010 +0300 @@ -84,10 +84,6 @@ virtual void DoL(); DECLARE_SMELEMENT_FOOTER( TSelectMetaPlane ) -DECLARE_SMELEMENT_HEADER( TJoinReceivedCpr, SubSessStates::TECABStateTransitionBase, NetStateMachine::MStateTransition, TContext ) - virtual void DoL(); -DECLARE_SMELEMENT_FOOTER( TJoinReceivedCpr ) - DECLARE_SMELEMENT_HEADER( TSendFinishedSelectionStateChange, SubSessStates::TECABStateTransitionBase, NetStateMachine::MStateTransition, TContext ) virtual void DoL(); DECLARE_SMELEMENT_FOOTER( TSendFinishedSelectionStateChange ) @@ -118,12 +114,6 @@ virtual void DoL(); DECLARE_SMELEMENT_FOOTER( TStartConnection ) -DECLARE_AGGREGATED_TRANSITION2( - TSendFinishedSelectionAndJoinReceivedCpr, - ConnStates::TSendFinishedSelectionStateChange, - ConnStates::TJoinReceivedCpr - ) - DECLARE_SMELEMENT_HEADER( TErrorOrCancel, MeshMachine::TStateFork, NetStateMachine::MStateFork, ConnStates::TContext ) virtual TInt TransitionTag(); DECLARE_SMELEMENT_FOOTER( TErrorOrCancel ) @@ -525,6 +515,8 @@ public: static MeshMachine::CNodeActivityBase* NewL(const MeshMachine::TNodeActivity& aActivitySig, MeshMachine::AMMNodeBase& aNode); + void InterfaceStateChangeNotification(const TDesC8& aInfo); + ESock::CCommsFactoryBase* IpProtoCprFactory() const; private: CAllInterfaceNotificationActivity(const MeshMachine::TNodeActivity& aActivitySig, MeshMachine::AMMNodeBase& aNode) : @@ -535,11 +527,16 @@ } virtual ~CAllInterfaceNotificationActivity(); + const Factories::TAnyFn& GetVTable() { return iInterfaceVTableF[0]; }; private: TUid iTierUid; Messages::TNodeId iTierManager; const CAllInterfaceNotificationWorker* iAllInterfaceNotificationWorker; + TBool iRegisteredForInterfaceStateChanges:1; // Registered with IpProtoCpr factory + +private: + static const ESock::TAnyFn iInterfaceVTableF[]; }; /**