--- a/Msrp/MsrpServer/inc/CMSRPConnectionManager.h	Sat Jun 12 14:30:11 2010 +0530
+++ b/Msrp/MsrpServer/inc/CMSRPConnectionManager.h	Thu Nov 25 13:59:42 2010 +0200
@@ -18,13 +18,14 @@
 #define CMSRPCONNECTIONMANAGER_H
 
 // INCLUDES
+#include <CommDbConnPref.h>
+
 #include "MMSRPConnectionManager.h"
 #include "MMSRPConnectionManagerObserver.h"
 #include "MMSRPListenerObserver.h"
 #include "MMSRPListener.h"
 #include "MMSRPConnection.h"
 
-
 // FORWARD DECLARATIONS
 class MMSRPConnectionManagerObserver;
 class MMSRPConnection;
@@ -47,33 +48,21 @@
         virtual ~CMSRPConnectionManager();
 
 
-    /*Functions from base classes*/   
-        /* from MMSRPConnectionManager*/
-        
-        virtual void ResolveLocalIPAddressL( TInetAddr& aLocalAddr );
-       
-        virtual MMSRPConnection& getConnectionL( TDesC8& aHost, TUint aPort );
-          
-        
-     //called by conn   
-        virtual void ListenL(MMSRPConnection* aConnection);
+    public: // from MMSRPConnectionManager
         
-        virtual void ListenCancel(MMSRPConnection* aConnection);
+        void ResolveLocalIPAddressL( TInetAddr& aLocalAddr );
+        MMSRPConnection& getConnectionL( TDesC8& aHost, TUint aPort );
+        void ListenL(MMSRPConnection* aConnection);
+        void ListenCancel(MMSRPConnection* aConnection);
+        void Remove(MMSRPConnection* aConnection);
+        RSocketServ& SocketServer();	            
+        RConnection& SocketServerConn() ;        
+        TInt ReStartInterface();
         
-        virtual void Remove(MMSRPConnection* aConnection);
-	    
-        virtual RSocketServ& SocketServer();	            
-	    
-        virtual RConnection& SocketServerConn() ;        
-        
-        //virtual TBool MatchIapId(TUint32 aIapID);
-        
-        
-        /* from MMSRPListenerObserver  */
+    public: // from MMSRPListenerObserver
+    
         virtual void ListenerStateL( TInt aNewState, RSocket* aDataSocket, TInt aStatus );
                 
-        
-
 	private: 
 	    
     // internal functions
@@ -92,8 +81,7 @@
 	     */
 	    TInt StartInterface();
 	    
-
-	// constructors
+	private: // constructors
 
 	    CMSRPConnectionManager( const TUint32 aIapID, MMSRPConnectionManagerObserver& aServer );
         
@@ -110,6 +98,9 @@
 		TUint32           iIapID;
 		TInetAddr         iLocalAddr;
 		
+		// connection preferences
+        TCommDbConnPref iConnectionPreferences;
+		
 		MMSRPConnectionManagerObserver& iObserver;
     };