--- a/Msrp/MsrpServer/inc/TStates.h Sat Jun 12 14:30:11 2010 +0530
+++ b/Msrp/MsrpServer/inc/TStates.h Thu Nov 25 13:59:42 2010 +0200
@@ -25,14 +25,11 @@
enum TStates
{
- EIdle = 0,
+ EIdle,
EConnecting,
EWaitForClient,
EActive,
- EActiveSend,
- EFileShare,
- EError,
- EEndLine
+ EError
};
@@ -43,6 +40,10 @@
virtual TStateBase* HandleStateErrorL(CMSRPServerSubSession *aContext);
virtual TStateBase * processIncommingMessageL(CMSRPServerSubSession *aContext, CMSRPMessageHandler* incommingMsg = NULL);
TStateBase * processPendingMessageQL( CMSRPServerSubSession *aContext );
+ TStateBase * processCompletedMessageL( CMSRPServerSubSession *aContext );
+ TStateBase * processCompletedIncomingMessageL( CMSRPServerSubSession *aContext );
+ TStateBase * processReceiveReportL( CMSRPServerSubSession *aContext );
+ TStateBase * processSendReportL( CMSRPServerSubSession *aContext );
virtual TStateBase * handlesResponseL(CMSRPServerSubSession *aContext,
CMSRPMessageHandler *incommingMsgHandler);
@@ -51,13 +52,14 @@
TStateBase* handleClientListnerCancelL(CMSRPServerSubSession * aContext,
TMSRPFSMEvent aEvent);
+ TStateBase* HandleClientCancelSendingL(CMSRPServerSubSession * aContext );
TStateBase* handleConnectionStateChangedL(CMSRPServerSubSession *aContext);
TStateBase* handleQueuesL(CMSRPServerSubSession *aContext);
TStateBase* handleConnectionErrorsL(CMSRPServerSubSession *aContext);
virtual TStates identity()=0;
TStateBase* handleInCommingMessagesL(CMSRPServerSubSession *aContext);
- TStateBase* handleSendFileL(CMSRPServerSubSession *aContext);
- TStateBase* handleReceiveFileL(CMSRPServerSubSession *aContext);
+ TStateBase* handleCancelFileSendingL(CMSRPServerSubSession *aContext);
+ TStateBase* MessageSendCompleteL(CMSRPServerSubSession *aContext);
};
@@ -91,11 +93,6 @@
public:
TStateBase* EventL(TMSRPFSMEvent aEvent, CMSRPServerSubSession *aContext);
TStates identity();
-
-private:
- TStateBase* fileSendCompleteL(CMSRPServerSubSession *aContext);
- TStateBase * handleResponseSentL( CMSRPServerSubSession *aContext);
-
};
@@ -106,47 +103,11 @@
TStates identity();
private:
- TStateBase* handleSendDataL(CMSRPServerSubSession *aContext);
-
+ TStateBase* handleSendDataL( CMSRPServerSubSession* aContext );
+ TStateBase* handleResponseSentL( CMSRPServerSubSession* aContext);
+ TStateBase* handleReportSentL( CMSRPServerSubSession* aContext);
};
-
-class TStateFileShare : public TStateBase
-{
-public:
- TStateBase* EventL(TMSRPFSMEvent aEvent, CMSRPServerSubSession *aContext);
- TStates identity();
-
-private:
- TStateBase * processIncommingMessageL(CMSRPServerSubSession *aContext, CMSRPMessageHandler* incommingMsg = NULL);
-
- TStateBase* fileSendCompleteL(CMSRPServerSubSession *aContext);
- TStateBase * handlesResponseL(CMSRPServerSubSession *aContext,
- CMSRPMessageHandler *incommingMsgHandler);
-
- TStateBase* handleRequestsL(CMSRPServerSubSession *aContext,
- CMSRPMessageHandler *incommingMsgHandler);
- TStateBase * handleResponseSentL( CMSRPServerSubSession *aContext);
-
- TStateBase * handleSendProgressL( CMSRPServerSubSession *aContext);
-
- TStateBase * handleReceiveProgressL( CMSRPServerSubSession *aContext);
-
-};
-
-
-class TStateActiveSend : public TStateBase
-{
-public:
- TStateBase* EventL(TMSRPFSMEvent aEvent, CMSRPServerSubSession *aContext);
- TStates identity();
-
-private:
- TStateBase * MessageSendCompleteL(CMSRPServerSubSession *aContext);
-
-};
-
-
class TStateError : public TStateBase
{
public: