--- a/Msrp/MsrpClient/inc/RMSRPSession.h	Sat Jun 12 14:30:11 2010 +0530
+++ b/Msrp/MsrpClient/inc/RMSRPSession.h	Thu Nov 25 13:59:42 2010 +0200
@@ -34,87 +34,84 @@
 
 class RMSRPSession : public RSubSessionBase, public MMSRPServerInterface
     {
-public:
-    /**
-      * constructor.
-      */
-    RMSRPSession();
-    
-public: // New functions
-    /**
-      * Opens a Sub-Session to MSRP Server
-      * @return Status of the operation
-      */
-    TInt CreateServerSubSession( RMSRP& aRMSRP, 
-                                 const TUint32 aIapId );
-    
-    void CloseServerSubSession( );
-   
-    
-public: // From base class
+    public:
+        /**
+          * constructor.
+          */
+        RMSRPSession();
+        
+    public: // New functions
+        /**
+          * Opens a Sub-Session to MSRP Server
+          * @param aRMSRP reference to main server session
+          * @param aIapId internet accesss point identifier
+          * @param aSession session id from invite
+          * @return Status of the operation
+          */
+        TInt CreateServerSubSession( RMSRP& aRMSRP, 
+                                     const TUint32 aIapId,
+                                     const TDesC8& aSessionId );
+        
+        void CloseServerSubSession( );
+        
+        /**
+          * Send a request to server whether to receive 
+          * or not to receive progress reports
+          * @param aProgress True if user wants to receive progress
+          *                  reports
+          * @return system-wide error code
+          */
+        TInt SetProgressReports( TBool aProgress );        
+        
+    public: // From MMSRPServerInterface
+        
+        void GetLocalPathL( TDes8 &aLocalHost );
+        void Connect( const TDesC8& aRemoteHost,
+                      const TUint aRemotePort,
+                      const TDesC8& aRemoteSessionID,
+                      TRequestStatus& aStatus );
+        void ListenConnections( const TDesC8& aRemoteHost,
+                                const TUint aRemotePort,
+                                const TDesC8& aRemoteSessionID,
+                                TBool aIsMessage,
+                                TRequestStatus& aStatus );
+        void ListenMessages( TBool aIsMessage,
+                             TRequestStatus& aStatus );
+        void ListenSendResult( const TDesC8& aSessionID,
+                               TRequestStatus& aStatus );
+        TInt SendMessage( TDesC8& aMessageBuffer );
+        TInt CancelSending( const TDesC8& aMessageId );
+        TInt CancelReceiving( const TDesC8& aMessageId );
+        void CancelSendResultListening( );
+        const TDesC8& GetMessageIdOfSentMessage( ) const;
+        TInt GetStatusOfSentMessage( ) const;
+        TInt GetStatusOfReceivedMessage( ) const;
+        const TDesC8& GetReceivedMessage( ) const;
+        TBool GetListenProgress() const;
+        TInt GetBytesReceived() const;
+        TInt GetTotalBytesReceived() const;
+        TBool GetSendProgress() const;
+        TInt GetBytesSent() const;
+        TInt GetTotalBytes() const;
+        TDesC8& ListenMessageId();
+        TDesC8& SendMessageId();
     
-    // From MMSRPServerInterface
-    
-    void GetLocalPathL( TDes8 &aLocalHost,
-                       TDes8 &aSessionID );
-    
-    void Connect( const TDesC8& aRemoteHost,
-                  const TUint aRemotePort,
-                  const TDesC8& aRemoteSessionID,
-                  TRequestStatus& aStatus );
+    private: //variables
         
-    void ListenConnections( const TDesC8& aRemoteHost,
-                            const TUint aRemotePort,
-                            const TDesC8& aRemoteSessionID,
-                            TBool aIsMessage,
-                            TRequestStatus& aStatus );
-    
-    void ListenMessages( TBool aIsMessage,
-                         TRequestStatus& aStatus );
-    
-    void ListenSendResult( const TDesC8& aSessionID,
-                           TRequestStatus& aStatus );
+        // Local path data to be recived from the server
+        TPckgBuf< TLocalPathMSRPData > iLocalPathMSRPDataPckg;
             
-    TInt SendMessage( TDesC8& aMessageBuffer );
-        
-    TInt CancelSending( TDesC8& aMessageId );
-    
-    void CancelReceiving( );
-    void CancelSendResultListening( );
+        // Connection data to be sent to server
+        TPckgBuf< TConnectMSRPData > iConnectMSRPDataPckg;
         
-    const TDesC8& GetMessageIdOfSentMessage( ) const;
-    TInt GetStatusOfSentMessage( ) const;
-    TInt GetStatusOfReceivedMessage( ) const;
-    const TDesC8& GetReceivedMessage( ) const;
-    
-    TBool GetListenProgress() const;
-    TInt GetBytesReceived() const;
-    TInt GetTotalBytesReceived() const;
+        // Message sending data to be sent to server
+        TPckgBuf< TSendMSRPData > iSendMSRPDataPckg;
     
-    TBool GetSendProgress() const;
-    TInt GetBytesSent() const;
-    TInt GetTotalBytes() const;
-
-    
-    TInt SendFileL(TDesC8& aFileParamBuffer);
-    TInt ReceiveFileL(TDesC8& aFileParamBuffer);
-private: //variables
+        // Listen for incoming messages data package
+        TPckgBuf< TListenMSRPData > iListenMSRPDataPckg;
     
-    // Local path data to be recived from the server
-    TPckgBuf< TLocalPathMSRPData > iLocalPathMSRPDataPckg;
-        
-    // Connection data to be sent to server
-    TPckgBuf< TConnectMSRPData > iConnectMSRPDataPckg;
-    
-    // Message sending data to be sent to server
-    TPckgBuf< TSendMSRPData > iSendMSRPDataPckg;
-
-    // Listen for incoming messages data package
-    TPckgBuf< TListenMSRPData > iListenMSRPDataPckg;
-
-    // Listen for response to sent messages data package
-    TPckgBuf< TListenSendResultMSRPData > iSendResultListenMSRPDataPckg;
-        
+        // Listen for response to sent messages data package
+        TPckgBuf< TListenSendResultMSRPData > iSendResultListenMSRPDataPckg;
     };
 
 #endif /* RMSRPSESSION_H_ */