# HG changeset patch
# User hgs
# Date 1287656601 -19800
# Node ID 36ea1f90a3d8a2ca2f1eb2984ac6799a629fcef3
# Parent  e4420734a2a08b2982da42c7b043cd4fd87d56df
201041_01

diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/rtp/cfrtp/src/rtcpflow.cpp
--- a/realtimenetprots/rtp/cfrtp/src/rtcpflow.cpp	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/rtp/cfrtp/src/rtcpflow.cpp	Thu Oct 21 15:53:21 2010 +0530
@@ -65,6 +65,7 @@
 	{
 	iRtcpBuffer.Close();
 	iRtcpTempBuffer.Close();
+	delete iRtcpHandler;
 	LOG_NODE_DESTROY(KESockFlowTag, CRtcpFlow);
 	LOG( ESockLogExternal::Printf(KESockFlowTag,KRtcpFlowSubTag,_L8(" ~CRtcpFlow %08x:\t "), this));
 	}
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/rtp/cfrtp/src/rtpflow.cpp
--- a/realtimenetprots/rtp/cfrtp/src/rtpflow.cpp	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/rtp/cfrtp/src/rtpflow.cpp	Thu Oct 21 15:53:21 2010 +0530
@@ -65,6 +65,7 @@
 	{
 	delete iRtpSession;
 	iRtpBuffer.Close();
+	delete iRtpHandler;
 	LOG_NODE_DESTROY(KESockFlowTag, CRtpFlow);
 	}
 	
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/ClientResolver/Group/crclient.mmp
--- a/realtimenetprots/sipfw/ClientResolver/Group/crclient.mmp	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/ClientResolver/Group/crclient.mmp	Thu Oct 21 15:53:21 2010 +0530
@@ -37,7 +37,9 @@
 USERINCLUDE       ../common/inc
 USERINCLUDE       ../Server/inc
 USERINCLUDE       ../../SIP/Codec/inc
+USERINCLUDE       ../traces
 
+OS_LAYER_SYSTEMINCLUDE
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 LIBRARY           euser.lib
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/ClientResolver/Group/crresolver.mmp
--- a/realtimenetprots/sipfw/ClientResolver/Group/crresolver.mmp	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/ClientResolver/Group/crresolver.mmp	Thu Oct 21 15:53:21 2010 +0530
@@ -56,7 +56,9 @@
 USERINCLUDE   ../Resolver/src
 USERINCLUDE   ../common/inc
 USERINCLUDE   ../../SIP/Codec/inc
+USERINCLUDE   ../traces
 
+OS_LAYER_SYSTEMINCLUDE
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 LIBRARY       euser.lib
@@ -70,7 +72,6 @@
 LIBRARY       sipcodec.lib
 LIBRARY       sdpcodec.lib
 LIBRARY       centralrepository.lib
-LIBRARY       flogger.lib
 LIBRARY       efsrv.lib
 
 VENDORID 0x70000001
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/ClientResolver/Group/crserver.mmp
--- a/realtimenetprots/sipfw/ClientResolver/Group/crserver.mmp	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/ClientResolver/Group/crserver.mmp	Thu Oct 21 15:53:21 2010 +0530
@@ -42,7 +42,9 @@
 USERINCLUDE       ../Resolver/inc
 USERINCLUDE       ../Client/inc
 USERINCLUDE       ../../SIP/Codec/inc
+USERINCLUDE       ../traces
 
+OS_LAYER_SYSTEMINCLUDE
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 LIBRARY           ecom.lib
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/ClientResolver/common/inc/SIPCRLogs.h
--- a/realtimenetprots/sipfw/ClientResolver/common/inc/SIPCRLogs.h	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/ClientResolver/common/inc/SIPCRLogs.h	Thu Oct 21 15:53:21 2010 +0530
@@ -30,9 +30,12 @@
 
 #include <e32std.h>
 
-#ifdef _DEBUG 
-    // Comment the following line to turn off all kind of logging:
-    #define USE_SIP_CR_LOGS
+#ifdef _DEBUG
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "SIPCRLogsTraces.h"
+#define USE_SIP_CR_LOGS
+#endif
 #endif
 
 
@@ -49,10 +52,7 @@
 
 	        inline static void Print(const TDesC16& aStr,
 	                                 TInt aValue);
-			private:
-					inline static TBool LogDirExists( const TDesC& aPath );
-			
-					inline static void WriteToFile( const TDesC& aStr );
+
 	    };
 	    
 	#include "SIPCRLogs.inl"    
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/ClientResolver/common/inc/SIPCRLogs.inl
--- a/realtimenetprots/sipfw/ClientResolver/common/inc/SIPCRLogs.inl	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/ClientResolver/common/inc/SIPCRLogs.inl	Thu Oct 21 15:53:21 2010 +0530
@@ -25,123 +25,17 @@
  @internalComponent
 */
 
-#include <e32base.h>
-#include <e32svr.h>
-#include <utf.h>
-#include <flogger.h>
-#include <bautils.h>
-
-_LIT(KSipLogFileDir, "Sip");
-_LIT(KSipLogFileName, "SipLog.txt");
-_LIT(KSeparator, "---------------");
-_LIT(KSipLogPath, "C:\\logs\\sip\\");
-
 inline void SIPCRLog::Print(const TDesC16& aStr)
 	{
-	_LIT( KLogFormat, "SIP Client Resolver: %S" );
-	TBuf<256> str;
-	str.Format( KLogFormat, &aStr );
-    
-	if ( LogDirExists( KSipLogPath ) )
-		{
-		WriteToFile( str );
-		}
-	else
-		{
-		RDebug::RawPrint( str );
-		}
+    OstTraceExt1( TRACE_NORMAL, SIPCRLOG_PRINT_TEXT16, "SIP Client Resolver: %S", aStr );
 	}
 
 inline void SIPCRLog::Print(const TDesC16& aStr, TInt aValue) 
 	{
-	_LIT( KLogFormat, "SIP Client Resolver: %S: %d" );
-	TBuf<256> str;
-	str.Format( KLogFormat, &aStr, aValue );
-	
-	if ( LogDirExists( KSipLogPath ) )
-		{
-		WriteToFile( str );
-		}
-	else
-		{
-		_LIT(KLogFormat, "SIP Client Resolver: %S: %d");
-		TBuf<256> str;
-		str.Format(KLogFormat, &aStr, aValue);
-		RDebug::RawPrint(str);
-		}
+    OstTraceExt2( TRACE_NORMAL, SIPCRLOG_PRINT_TEXT16_TINT, "SIP Client Resolver: %S: %d", aStr, aValue );
 	}
 
 inline void SIPCRLog::Print(const TDesC16& aStr1, const TDesC8& aStr2) 
 	{
-	_LIT(KLogFormat, "SIP Client Resolver: %S: %S");
-	TBuf<100> str2;
-	CnvUtfConverter::ConvertToUnicodeFromUtf8(str2, aStr2);
-	TBuf<256> str;
-	str.Format(KLogFormat, &aStr1, &str2);
-	
-	if ( LogDirExists( KSipLogPath ) )
-		{
-		WriteToFile( str );
-		}
-	else
-		{
-		RDebug::RawPrint(str);    	
-		}
+    OstTraceExt2( TRACE_NORMAL, SIPCRLOG_PRINT_TEXT16_TEXT8, "SIP Client Resolver: %S: %s", aStr1, aStr2 );
 	}
-
-inline TBool SIPCRLog::LogDirExists( const TDesC& aFolderName )
-	{
-	RFs fs;
-	TInt ret = fs.Connect();
-	
-	if ( ret != KErrNone )
-		{
-		fs.Close();
-		return EFalse;
-		}
-	
-	if ( aFolderName.Length() == 0 )
-		{
-		fs.Close();
-		return EFalse;
-		}
-	
-	TParse parse;
-	
-	TInt retcode = parse.SetNoWild( aFolderName, NULL, NULL );
- 	
-	if ( retcode != KErrNone )
-		{
-		fs.Close();
-		return EFalse;
-		}
- 			
-	if ( parse.NameOrExtPresent() )
-		{
-		if ( !fs.IsValidName( aFolderName ) )
-			{
-			fs.Close();
-			return EFalse;
-			}
-		}
- 	
-	TPtrC dirName = parse.DriveAndPath();
-	RDir dir;
-	retcode = dir.Open( fs, dirName, 0 );
-	
-	if ( retcode == KErrNone )
-		{
-		dir.Close();
-		}
-	fs.Close();
-	
-	return ( retcode == KErrNone );
-	}
-
-inline void SIPCRLog::WriteToFile( const TDesC& aStr )
-	{
-	RFileLogger::Write( KSipLogFileDir, KSipLogFileName, 
-		EFileLoggingModeAppend, aStr );
-	RFileLogger::Write (KSipLogFileDir, KSipLogFileName, 
-		EFileLoggingModeAppend, KSeparator);		
-	}
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/ClientResolver/common/inc/sipCRclientserver.h
--- a/realtimenetprots/sipfw/ClientResolver/common/inc/sipCRclientserver.h	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/ClientResolver/common/inc/sipCRclientserver.h	Thu Oct 21 15:53:21 2010 +0530
@@ -37,11 +37,6 @@
 
 const TUid KServerUid3 = { 0x1020334f };
 
-#if (defined (__WINS__) || defined(__WINSCW__))
-static const TUint KServerMinHeapSize =  0x1000;  //   4K
-static const TUint KServerMaxHeapSize = 0x80000;  // 512K (Should be enough)
-#endif
-
 // The server version.
 // A version must be specifyed when creating a session with the server
 const TUint KSipCRServerMajorVersionNumber=0;
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/Group/bld.inf
--- a/realtimenetprots/sipfw/Group/bld.inf	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/Group/bld.inf	Thu Oct 21 15:53:21 2010 +0530
@@ -233,11 +233,6 @@
 ../ProfileAgent/Group/sipprofilefsm.mmp
 ../ProfileAgent/Group/sipietfagent.mmp
 ../ProfileAgent/Group/sipimsagent.mmp
-
-// SIP H2LanBearerMonitor plugin is build only in HW environments
-// since it would distract emulator unit testing
-#if ( !defined( WINS ) && !defined( WINSCW ) )
 ../SIP/Group/h2lanbearermonitor.mmp
-#endif
 PRJ_TESTMMPFILES
 #include "../Test/CapTests/Te_Cap_SipServerSource/bld.inf" 
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/ProfileAgent/Group/sipietfagent.mmp
--- a/realtimenetprots/sipfw/ProfileAgent/Group/sipietfagent.mmp	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/ProfileAgent/Group/sipietfagent.mmp	Thu Oct 21 15:53:21 2010 +0530
@@ -38,7 +38,9 @@
 USERINCLUDE 	../profile_fsm/inc
 //SIP Proxy Resolver
 USERINCLUDE 	../ProxyResolver/inc
+USERINCLUDE 	../traces
 
+OS_LAYER_SYSTEMINCLUDE
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 START RESOURCE 101F4139.rss
@@ -55,7 +57,6 @@
 LIBRARY sipprofilefsm.lib
 LIBRARY sipproxyrsv.lib
 LIBRARY inetprotutil.lib
-LIBRARY flogger.lib
 LIBRARY efsrv.lib
 
 VENDORID 0x70000001
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/ProfileAgent/Group/sipimsagent.mmp
--- a/realtimenetprots/sipfw/ProfileAgent/Group/sipimsagent.mmp	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/ProfileAgent/Group/sipimsagent.mmp	Thu Oct 21 15:53:21 2010 +0530
@@ -50,6 +50,7 @@
 
 USERINCLUDE 	../IMS_Agent/Inc
 USERINCLUDE 	../IMS_Agent/Src
+USERINCLUDE 	../traces
 
 //SIP Profile Agent
 USERINCLUDE 	../Client/Api
@@ -60,6 +61,7 @@
 //SIP Proxy Resolver
 USERINCLUDE 	../ProxyResolver/inc
 
+OS_LAYER_SYSTEMINCLUDE
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 START RESOURCE 10203358.rss
@@ -81,7 +83,6 @@
 LIBRARY etel.lib
 LIBRARY etelmm.lib
 LIBRARY commsdat.lib
-LIBRARY flogger.lib
 LIBRARY efsrv.lib
 LIBRARY satclient.lib
 
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/ProfileAgent/Group/sipprofile.mmp
--- a/realtimenetprots/sipfw/ProfileAgent/Group/sipprofile.mmp	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/ProfileAgent/Group/sipprofile.mmp	Thu Oct 21 15:53:21 2010 +0530
@@ -35,7 +35,9 @@
 
 USERINCLUDE   ../Profile/api
 USERINCLUDE   ../Profile/Inc
+USERINCLUDE   ../traces
 
+OS_LAYER_SYSTEMINCLUDE
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 LIBRARY       euser.lib
@@ -45,7 +47,6 @@
 LIBRARY       random.lib
 LIBRARY 	  commsdat.lib 
 LIBRARY 	  charconv.lib 
-LIBRARY       flogger.lib
 LIBRARY 	  efsrv.lib
 
 VENDORID 0x70000001
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/ProfileAgent/Group/sipprofileclient.mmp
--- a/realtimenetprots/sipfw/ProfileAgent/Group/sipprofileclient.mmp	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/ProfileAgent/Group/sipprofileclient.mmp	Thu Oct 21 15:53:21 2010 +0530
@@ -40,7 +40,9 @@
 USERINCLUDE       ../Client/Api
 USERINCLUDE       ../Client/Inc
 USERINCLUDE       ../Profile/Inc
+USERINCLUDE       ../traces
 
+OS_LAYER_SYSTEMINCLUDE
 MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY           euser.lib
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/ProfileAgent/Group/sipprofilefsm.mmp
--- a/realtimenetprots/sipfw/ProfileAgent/Group/sipprofilefsm.mmp	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/ProfileAgent/Group/sipprofilefsm.mmp	Thu Oct 21 15:53:21 2010 +0530
@@ -42,7 +42,9 @@
 USERINCLUDE 	../Client/Api
 USERINCLUDE 	../Profile/Inc
 USERINCLUDE 	../PluginMgr/Inc
+USERINCLUDE       ../traces
 
+OS_LAYER_SYSTEMINCLUDE
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 LIBRARY euser.lib
@@ -53,7 +55,6 @@
 LIBRARY sipprofile.lib
 LIBRARY sipcodec.lib
 LIBRARY	inetprotutil.lib
-LIBRARY flogger.lib
 LIBRARY efsrv.lib
 
 VENDORID 0x70000001
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/ProfileAgent/Group/sipprofileserver.mmp
--- a/realtimenetprots/sipfw/ProfileAgent/Group/sipprofileserver.mmp	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/ProfileAgent/Group/sipprofileserver.mmp	Thu Oct 21 15:53:21 2010 +0530
@@ -74,7 +74,9 @@
 USERINCLUDE       ../Store/Inc
 USERINCLUDE       ../AlrMonitor/inc
 USERINCLUDE       ../ApnManager/inc
+USERINCLUDE       ../traces
 
+OS_LAYER_SYSTEMINCLUDE
 MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY           euser.lib
@@ -87,7 +89,6 @@
 LIBRARY           inetprotutil.lib
 LIBRARY           sipprofile.lib
 LIBRARY           random.lib
-LIBRARY           flogger.lib
 LIBRARY           netmeta.lib
 LIBRARY           centralrepository.lib
 LIBRARY 	  cmmanager.lib
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/ProfileAgent/Profile/Inc/SipProfileLog.h
--- a/realtimenetprots/sipfw/ProfileAgent/Profile/Inc/SipProfileLog.h	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/ProfileAgent/Profile/Inc/SipProfileLog.h	Thu Oct 21 15:53:21 2010 +0530
@@ -33,14 +33,11 @@
 #include <e32std.h>    
 
 #ifdef _DEBUG
-    // RFileLogger has been redefined in Commsdebugutility.H
-    // This is a bug in Symbian 9.5.
-    // Using __FLOG_ACTIVE from Commsdebugutility.H to avoid build break
-   #if !defined(CPPUNIT_TEST)
-        // Comment the following line to turn off all kind of logging:
-        #define USE_SIP_PROFILE_LOGS
-    #endif
- 
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "SipProfileLogTraces.h"
+#define USE_SIP_PROFILE_LOGS
+#endif
 #endif
 
 
@@ -69,12 +66,7 @@
 
 			inline static void Print(const TDesC16& aStr1,
 				const TDesC8& aStr2);
-			private:
-			inline static TBool LogDirExists( const TDesC& aPath );
 
-			inline static void WriteToFile( const TDesC& aStr );
-	
-			inline static void WriteLog( const TDesC& aStr );
 	    };
 
 	#include "SipProfileLog.inl"
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/ProfileAgent/Profile/Inc/SipProfileLog.inl
--- a/realtimenetprots/sipfw/ProfileAgent/Profile/Inc/SipProfileLog.inl	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/ProfileAgent/Profile/Inc/SipProfileLog.inl	Thu Oct 21 15:53:21 2010 +0530
@@ -20,151 +20,38 @@
 *
 */
 
-
-#include <flogger.h>
-
-#include <e32base.h>
-#include <bautils.h>
-#include <utf.h>
-
-_LIT(KSipLogFileDir, "Sip");
-_LIT(KSipLogFileName, "SipLog.txt");
-_LIT(KSipLogPath, "C:\\logs\\sip\\");
-_LIT(KSeparator, "---------------");
-
 inline void TSIPProfileDebug::Print(const TDesC16& aStr) 
 	{
-	_LIT(KProfileFormat, "SIPProfile: %S");
-	TBuf<256> str;
-
-	str.Format(KProfileFormat, &aStr);
-		
-	WriteLog( str );
+    OstTraceExt1( TRACE_NORMAL, TSIPPROFILEDEBUG_PRINT, "SIPProfile: %S", aStr );
 	}
 
 
 inline void TSIPProfileDebug::Print(const TDesC16& aStr1, const TDesC16& aStr2) 
 	{
-	_LIT(KProfileFormat, "SIPProfile: %S, %S");
-	TBuf<256> str;
-
-	str.Format(KProfileFormat, &aStr1, &aStr2);
-		
-	WriteLog( str );
+    OstTraceExt2( TRACE_NORMAL, TSIPPROFILEDEBUG_PRINT_TWO_ARG, "SIPProfile: %S, %S", aStr1, aStr2 );
 	}
 
 
 inline void TSIPProfileDebug::Print(const TDesC16& aStr, TUint32 aValue) 
 	{
-	_LIT(KProfileFormat, "SIPProfile: %S, %d");
-	TBuf<256> str;
-
-	str.Format(KProfileFormat, &aStr, aValue);
-		
-	WriteLog( str );
+    OstTraceExt2( TRACE_NORMAL, DUP1_TSIPPROFILEDEBUG_PRINT, "SIPProfile: %S, %u", aStr, aValue );
 	}
 
 inline void TSIPProfileDebug::Print(const TDesC16& aStr, TUint32 aValue1,
 	TUint32 aValue2) 
 	{
-	_LIT(KProfileFormat, "SIPProfile: %S, %d, %d");
-	TBuf<256> str;
-
-	str.Format(KProfileFormat, &aStr, aValue1, aValue2);
-		
-	WriteLog( str );
+    OstTraceExt3( TRACE_NORMAL, DUP2_TSIPPROFILEDEBUG_PRINT, "SIPProfile: %S, %u, %u", aStr, aValue1, aValue2 );
 	}
 
 
 inline void TSIPProfileDebug::Print(const TDesC16& aStr, TUint32 aValue1, 
 	TUint32 aValue2, TUint32 aValue3) 
 	{
-	_LIT(KProfileFormat, "SIPProfile: %S, %d, %d, %d");
-	TBuf<256> str;
-
-	str.Format(KProfileFormat, &aStr, aValue1, aValue2, aValue3);
-		
-	WriteLog( str );
+    OstTraceExt4( TRACE_NORMAL, DUP3_TSIPPROFILEDEBUG_PRINT, "SIPProfile: %S, %u, %u, %u", aStr, aValue1, aValue2, aValue3 );
 	}
 
 
 inline void TSIPProfileDebug::Print(const TDesC16& aStr1, const TDesC8& aStr2) 
 	{
-	_LIT(KProfileFormat, "SIPProfile: %S, %S");
-	TBuf<100> str2;
-	CnvUtfConverter::ConvertToUnicodeFromUtf8(str2, aStr2);
-	TBuf<256> str;
-
-	str.Format(KProfileFormat, &aStr1, &str2);
-		
-	WriteLog( str );
+    OstTraceExt2( TRACE_NORMAL, DUP4_TSIPPROFILEDEBUG_PRINT, "SIPProfile: %S, %s", aStr1, aStr2 );
 	}
-
-inline TBool TSIPProfileDebug::LogDirExists( const TDesC& aFolderName )
-	{
-	RFs fs;
-	TInt ret = fs.Connect();
-	
-	if ( ret != KErrNone )
-		{
-		fs.Close();
-		return EFalse;
-		}
-	
-	if ( aFolderName.Length() == 0 )
-		{
-		fs.Close();
-		return EFalse;
-		}
-	
-	TParse parse;
-	
-	TInt retcode = parse.SetNoWild( aFolderName, NULL, NULL );
- 	
-	if ( retcode != KErrNone )
-		{
-		fs.Close();
-		return EFalse;
-		}
- 			
-	if ( parse.NameOrExtPresent() )
-		{
-		if ( !fs.IsValidName( aFolderName ) )
-			{
-			fs.Close();
-			return EFalse;
-			}
-		}
- 	
-	TPtrC dirName = parse.DriveAndPath();
-	RDir dir;
-	retcode = dir.Open( fs, dirName, 0 );
-	
-	if ( retcode == KErrNone )
-		{
-		dir.Close();
-		}
-	fs.Close();
-	
-	return ( retcode == KErrNone );
-	}
-
-inline void TSIPProfileDebug::WriteToFile( const TDesC& aStr )
-	{
-	RFileLogger::Write ( KSipLogFileDir, KSipLogFileName, 
-		EFileLoggingModeAppend, aStr );
-	RFileLogger::Write (KSipLogFileDir, KSipLogFileName, 
-		EFileLoggingModeAppend, KSeparator);		
-	}
-	
-inline void TSIPProfileDebug::WriteLog( const TDesC& aStr )
-	{
-	if ( LogDirExists( KSipLogPath ) )
-		{
-		WriteToFile( aStr );
-		}
-	else
-		{
-		RDebug::RawPrint( aStr );
-		}
-	}
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/ProfileAgent/Profile/Inc/sipprofilecs.h
--- a/realtimenetprots/sipfw/ProfileAgent/Profile/Inc/sipprofilecs.h	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/ProfileAgent/Profile/Inc/sipprofilecs.h	Thu Oct 21 15:53:21 2010 +0530
@@ -38,11 +38,6 @@
 
 const TUid KServerUid3 = {0x101F413C};
 
-#if (defined (__WINS__) || defined(__WINSCW__))
-static const TUint KServerMinHeapSize =  0x1000;  //   4K
-static const TUint KServerMaxHeapSize = 0x80000;  // 512K 
-#endif
-
 // The server version.
 // A version must be specifyed when creating a session with the server
 const TUint KSipProfileServerMajorVersionNumber=0;
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/ProfileAgent/Server/Inc/SipProfileServerCore.h
--- a/realtimenetprots/sipfw/ProfileAgent/Server/Inc/SipProfileServerCore.h	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/ProfileAgent/Server/Inc/SipProfileServerCore.h	Thu Oct 21 15:53:21 2010 +0530
@@ -788,6 +788,11 @@
          */ 
         static TBool Compare(const TSIPProfileTypeInfo& first,
                         const TSIPProfileTypeInfo& second);
+	public:
+		/**
+         * Returns the count of profiles in the cache
+         */
+        TInt GetProfileCacheCount() const;
 		
         
 	private: // Data
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/ProfileAgent/Server/Src/SipProfileServerCore.cpp
--- a/realtimenetprots/sipfw/ProfileAgent/Server/Src/SipProfileServerCore.cpp	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/ProfileAgent/Server/Src/SipProfileServerCore.cpp	Thu Oct 21 15:53:21 2010 +0530
@@ -2361,7 +2361,7 @@
     {
     PROFILE_DEBUG1("CSIPProfileServerCore::CheckApnSwitchEnabledL" )
     TUint32 profileId = aProfile.Id();
-    
+    TBool result = EFalse;
     PROFILE_DEBUG3("CSIPProfileServerCore::CheckApnSwitchEnabledL, IapId", profileId )
     
     CSIPProfileCacheItem* item = ProfileCacheItem(profileId); 
@@ -2380,10 +2380,11 @@
             if (isIapGPRS)
             item->SetApnSwitchStatus(ETrue); //  Set Switch APN Enabled
             }
+            result = item->IsApnSwitchEnabled();
         } 
     PROFILE_DEBUG3("CSIPProfileServerCore::CheckApnSwitchEnabledL returns"
-                                                ,item->IsApnSwitchEnabled())
-    return item->IsApnSwitchEnabled(); 
+                                                ,result)
+    return result; 
     }
 
 // -----------------------------------------------------------------------------
@@ -2483,3 +2484,12 @@
         }
     return allowed;
     }
+
+// ----------------------------------------------------------------------------
+// CSIPProfileServerCore::GetProfileCacheCount() const
+// ----------------------------------------------------------------------------
+//
+TInt CSIPProfileServerCore::GetProfileCacheCount() const
+    {
+    return iProfileCache.Count();
+    }
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/ProfileAgent/Store/Src/SIPProfileStorageIndex.cpp
--- a/realtimenetprots/sipfw/ProfileAgent/Store/Src/SIPProfileStorageIndex.cpp	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/ProfileAgent/Store/Src/SIPProfileStorageIndex.cpp	Thu Oct 21 15:53:21 2010 +0530
@@ -198,10 +198,16 @@
 	TUint32 profileID = iProfileIdArray.Count()+1;
 	
 	iProfileIdArray.SortUnsigned();
-	for (TUint32 i = 0; i < iProfileIdArray.Count(); i++)
+	TInt profilescount;
+	if(iCore->GetProfileCacheCount() > iProfileIdArray.Count())
+	    profilescount = iCore->GetProfileCacheCount();
+	else
+	    profilescount = iProfileIdArray.Count();
+	
+	for (TUint32 i = 0; i <profilescount ; i++)
 	    {
 	    TRAPD(err, iCore->ProfileCacheItemL(i+1));
-	    if (i+1 != iProfileIdArray[i] && KErrNotFound == err)
+	    if(KErrNotFound == err && !ProfileExists(i+1))
 	        {
 	        profileID = i+1;
 	        break;
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/SIP/Common/inc/sipclientserver.h
--- a/realtimenetprots/sipfw/SIP/Common/inc/sipclientserver.h	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/SIP/Common/inc/sipclientserver.h	Thu Oct 21 15:53:21 2010 +0530
@@ -37,11 +37,6 @@
 
 const TUid KServerUid3 = {0x101f5d36};
 
-#if (defined (__WINS__) || defined(__WINSCW__))
-static const TUint KServerMinHeapSize =  0x1000;  //   4K
-static const TUint KServerMaxHeapSize = 0x80000;  // 512K !?!?
-#endif
-
 // The server version.
 // A version must be specifyed when creating a session with the server
 const TUint KSipServerMajorVersionNumber=0;
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/SIP/ConnectionMgr/src/CSipConnection.cpp
--- a/realtimenetprots/sipfw/SIP/ConnectionMgr/src/CSipConnection.cpp	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/SIP/ConnectionMgr/src/CSipConnection.cpp	Thu Oct 21 15:53:21 2010 +0530
@@ -627,6 +627,7 @@
 	            	domainName = viaHeader->SentByHostPort().Host().AllocL();	
 	            	}            
 	        }
+		CleanupStack:: PushL(domainName);
 	        transport = static_cast<CTransportTls*>(FindTransport( aParams, 
 	        	        								SIPStrings::StringF( SipStrConsts::ETLS ),
 	        	        								aAddress));
@@ -634,7 +635,7 @@
 			//TLS object.
 			if ( ( UriUtils::HostType( *domainName ) == UriUtils::ETextHost ))
 		        transport->SetDomainNameL(domainName->Des());
-		    delete domainName;	
+			CleanupStack:: PopAndDestroy(); //delete domainName;	
 	        break;
 	        }
 	    default:
@@ -1676,10 +1677,7 @@
 
     if ( aReleaseAllResources )
         {
-#if ( !defined( __WINS__ ) && !defined( __WINSCW__ ) )
-	    // In HW RConnection must be closed when network coverage is lost	
    	    CloseConnection();      
-#endif
         }
 	}
 
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/SIP/Group/digestplugin.mmp
--- a/realtimenetprots/sipfw/SIP/Group/digestplugin.mmp	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/SIP/Group/digestplugin.mmp	Thu Oct 21 15:53:21 2010 +0530
@@ -56,7 +56,8 @@
 USERINCLUDE     ../LightWeightTimer/inc
 USERINCLUDE     ../sipapi/api
 USERINCLUDE     ../sipapi/inc
-USERINCLUDE     ../Logging/inc	
+USERINCLUDE     ../Logging/inc
+USERINCLUDE     ../traces	
 
 
 SOURCEPATH      ../SIPSec/DigestPlugin/resource
@@ -66,6 +67,7 @@
 
 // MW_LAYER_SYSTEMINCLUDE_SYMBIAN Illigal dependency on imcvcodc.h. Needs to be fixed
 APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+OS_LAYER_SYSTEMINCLUDE
 
 
 LIBRARY       euser.lib
@@ -81,7 +83,6 @@
 LIBRARY       etel.lib
 LIBRARY       etelmm.lib
 LIBRARY       commsdat.lib
-LIBRARY       flogger.lib
 LIBRARY       charconv.lib
 LIBRARY       centralrepository.lib
 LIBRARY       efsrv.lib
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/SIP/Group/ipsecplugin.mmp
--- a/realtimenetprots/sipfw/SIP/Group/ipsecplugin.mmp	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/SIP/Group/ipsecplugin.mmp	Thu Oct 21 15:53:21 2010 +0530
@@ -57,6 +57,7 @@
 USERINCLUDE     ../LightWeightTimer/inc
 USERINCLUDE     ../ConnectionMgr/inc
 USERINCLUDE     ../Logging/inc
+USERINCLUDE     ../traces
 
 
 SOURCEPATH		../SIPSec/IpSecPlugin/resource
@@ -64,6 +65,7 @@
 TARGET 			sipipsec.rsc                                          
 END
 
+OS_LAYER_SYSTEMINCLUDE
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 
@@ -75,7 +77,6 @@
 LIBRARY       esock.lib 
 LIBRARY       insock.lib
 LIBRARY       commdb.lib
-LIBRARY       flogger.lib
 LIBRARY       charconv.lib
 
 LIBRARY		    lib_pfkey.lib
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/SIP/Group/packetbearermonitor.mmp
--- a/realtimenetprots/sipfw/SIP/Group/packetbearermonitor.mmp	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/SIP/Group/packetbearermonitor.mmp	Thu Oct 21 15:53:21 2010 +0530
@@ -38,9 +38,11 @@
 
 USERINCLUDE     ../NetworkMonitor/api
 USERINCLUDE 	../NetworkMonitor/Plugins/Packet/Src
-USERINCLUDE	../Common/inc
-USERINCLUDE       ../Logging/inc
+USERINCLUDE		../Common/inc
+USERINCLUDE     ../Logging/inc
+USERINCLUDE     ../traces
 
+OS_LAYER_SYSTEMINCLUDE
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 START RESOURCE 102010D9.rss 
@@ -54,7 +56,6 @@
 LIBRARY		etelmm.lib
 LIBRARY		etelpckt.lib
 LIBRARY		esock.lib
-LIBRARY     flogger.lib
 LIBRARY     efsrv.lib
 LIBRARY 	featmgr.lib
 
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/SIP/Group/sipservercore.mmp
--- a/realtimenetprots/sipfw/SIP/Group/sipservercore.mmp	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/SIP/Group/sipservercore.mmp	Thu Oct 21 15:53:21 2010 +0530
@@ -43,10 +43,6 @@
 SOURCE            CSIPRoutingRequest.cpp
 SOURCE            CSIPRoutingRequestStore.cpp
 
-#if (defined(WINS)||defined(WINSCW))
-SOURCE            TSIPMemAllocFailureSimulation.cpp
-#endif
-
 SOURCEPATH        ../Refreshes/src
 SOURCE            CSipRefreshMgr.cpp
 SOURCE            CSipRefreshBase.cpp
@@ -284,7 +280,9 @@
 USERINCLUDE       ../NetworkMonitor/inc
 USERINCLUDE       ../SIPSec/Framework/inc
 USERINCLUDE       ../RequestHandler/inc
+USERINCLUDE     ../traces
 
+OS_LAYER_SYSTEMINCLUDE
 MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY           ecom.lib
@@ -298,7 +296,6 @@
 LIBRARY           commsdat.lib
 LIBRARY           inetprotutil.lib
 LIBRARY           centralrepository.lib
-LIBRARY           flogger.lib
 LIBRARY           sipcodec.lib
 LIBRARY           securesocket.lib
 LIBRARY           efsrv.lib
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/SIP/LightWeightTimer/src/singletimer.cpp
--- a/realtimenetprots/sipfw/SIP/LightWeightTimer/src/singletimer.cpp	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/SIP/LightWeightTimer/src/singletimer.cpp	Thu Oct 21 15:53:21 2010 +0530
@@ -95,12 +95,8 @@
 
 	iTimerId = aTimerId;
 
-	//If the duration is very short, expire immediately for better performance.
-#ifdef __WINSCW__
-	if (aDelay < KEmulatorDelay)
-#else
 	if (aDelay < KTargetHwDelay)
-#endif
+
 		{
 		ExpireImmediately();
 		}
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/SIP/Logging/inc/SipLogs.h
--- a/realtimenetprots/sipfw/SIP/Logging/inc/SipLogs.h	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/SIP/Logging/inc/SipLogs.h	Thu Oct 21 15:53:21 2010 +0530
@@ -30,16 +30,17 @@
 #define SIPLOGS_H
 
 #include <e32std.h>
+#include <in_sock.h>
 
-#ifdef _DEBUG 
-    // Comment the following line to turn off all kind of logging:
-    #define USE_SIP_LOGS
-    
-    // Comment the following line to switch from RFileLogger to RDebug logging:
-    #define USE_SIP_FILE_LOGS
-
-    // Comment the following line to switch off SIP message logging
-    #define USE_SIP_MESSAGE_LOG
+#ifdef _DEBUG
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "TSIPLoggerTraces.h"
+// Comment the following line to turn off all kind of logging:
+#define USE_SIP_LOGS
+// Comment the following line to switch off SIP message logging
+#define USE_SIP_MESSAGE_LOG
+#endif
 #endif
 
 
@@ -49,7 +50,10 @@
     
     #define __SIP_LOG(aStr)\
         TSIPLogger::Print(_L(aStr));
-    
+
+    #define __SIP_TXT8_LOG(aStr)\
+        TSIPLogger::Print(aStr);
+   
     #define __SIP_DES8_LOG(aStr,aMsg)\
         TSIPLogger::Print(_L(aStr), aMsg);    
 
@@ -76,6 +80,7 @@
 #else // _USE_SIP_LOGS
 
     #define __SIP_LOG(aStr)
+    #define __SIP_TXT8_LOG(aStr)
     #define __SIP_DES8_LOG(aStr,aMsg)
     #define __SIP_DES16_LOG(aStr,aMsg)
     #define __SIP_INT_LOG1(aStr,aValue)
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/SIP/Logging/inc/TSIPLogger.h
--- a/realtimenetprots/sipfw/SIP/Logging/inc/TSIPLogger.h	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/SIP/Logging/inc/TSIPLogger.h	Thu Oct 21 15:53:21 2010 +0530
@@ -28,15 +28,13 @@
 #ifndef TSIPLOGGER_H
 #define TSIPLOGGER_H
 
-#include <e32std.h>
-#include <in_sock.h>
-
 class TSIPLogger
 	{
 	public:
 	
 	    inline static void Print(const TDesC& aStr);
 	    
+	    inline static void Print(const TDesC8& aStr);
 	    
 	    inline static void Print(const TDesC& aStr, 
 		                         const TDesC8& aMsg);
@@ -59,6 +57,7 @@
 		inline static TBool LogDirExists( const TDesC& aFolderName );                                    
     };
 
+
 #include "TSIPLogger.inl"
 
 #endif // TSIPLOGGER_H
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/SIP/Logging/inc/TSIPLogger.inl
--- a/realtimenetprots/sipfw/SIP/Logging/inc/TSIPLogger.inl	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/SIP/Logging/inc/TSIPLogger.inl	Thu Oct 21 15:53:21 2010 +0530
@@ -14,115 +14,39 @@
 * Description:
 * Name          : TSIPLogger.inl
 * Part of       : SIP Logging
-* Version       :  
+* Version       :
 *
 */
 
-
-
-#include <e32std.h>
-#include <utf.h>
-#include <e32svr.h>
-#include <flogger.h>
-#include <f32file.h>
-
-#include "SipLogs.h"
-#include "TSIPLogger.h"
-
-_LIT(KSipLogFileDir, "Sip");
-_LIT(KSipLogFileName, "SipLog.txt");
-_LIT(KSeparator, "---------------");
-_LIT(KIntMessageFormat,"%S: %d");
-_LIT(KTwoIntMessageFormat,"%S: %d, %d");
-_LIT(KAddrMessageFormat,"%S: %S port %d");
-_LIT(KSipLogPath, "C:\\logs\\sip\\");
-
 inline void TSIPLogger::Print(const TDesC& aStr)
 	{
-	if ( LogDirExists( KSipLogPath ) )
-		{
-		RFileLogger::Write (KSipLogFileDir, KSipLogFileName, 
-			EFileLoggingModeAppend,aStr);                                  
-		RFileLogger::Write (KSipLogFileDir, KSipLogFileName, 
-			EFileLoggingModeAppend, KSeparator);
-		}
-	else
-		{
-		_LIT(KSIPFormat, "SIP: %S");
-		TBuf<256> log;
-		log.Format(KSIPFormat, &aStr);
-		RDebug::RawPrint(log);
-		}
+    OstTraceExt1( TRACE_NORMAL, TSIPLOGGER_PRINT_TEXT16, "SIP: %S", aStr );
+	}
+
+inline void TSIPLogger::Print(const TDesC8& aStr)
+    {
+    //OstTraceExt1( TRACE_NORMAL, TSIPLOGGER_PRINT_TEXT16, "SIP: %S", aStr );
+    OstTraceExt1( TRACE_NORMAL, TSIPLOGGER_PRINT_TEXT8, "SIP: %s", aStr );
+    }
+
+inline void TSIPLogger::Print(const TDesC& aStr,
+		                      const TDesC8& aMsg)
+	{
+    OstTraceExt2( TRACE_NORMAL, TSIPLOGGER_PRINT_TEXT16_TEXT8, "SIP: %S: %s", aStr, aMsg );
 	}
 
 
-inline void TSIPLogger::Print(const TDesC& aStr, 
-		                      const TDesC8& aMsg)
-	{
-	if ( LogDirExists( KSipLogPath ) )
-		{
-		RFileLogger::Write (KSipLogFileDir, KSipLogFileName,
-			EFileLoggingModeAppend, aStr);
-
-		RFileLogger::Write (KSipLogFileDir, KSipLogFileName, 
-				EFileLoggingModeAppend, aMsg);
-
-		RFileLogger::Write (KSipLogFileDir, KSipLogFileName, 
-			EFileLoggingModeAppend, KSeparator);
-		}
-	else
-		{
-		TBuf<100> msg;
-		TBuf<256> log;
-		TInt err = CnvUtfConverter::ConvertToUnicodeFromUtf8(msg, aMsg.Left(99));
-
-		_LIT(KSIPFormat, "SIP: %S: %S");
-		log.Format(KSIPFormat, &aStr, &msg);
-
-		RDebug::RawPrint(log);
-		}
-	}
-
-
-inline void TSIPLogger::Print(const TDesC& aStr, 
+inline void TSIPLogger::Print(const TDesC& aStr,
 		                      const TDesC16& aMsg)
 	{
-	if ( LogDirExists( KSipLogPath ) )
-		{
-		RFileLogger::Write (KSipLogFileDir, KSipLogFileName, 
-			EFileLoggingModeAppend, aStr);
-		RFileLogger::Write (KSipLogFileDir, KSipLogFileName, 
-			EFileLoggingModeAppend, aMsg);                                 
-		RFileLogger::Write (KSipLogFileDir, KSipLogFileName, 
-			EFileLoggingModeAppend, KSeparator);
-		}
-	else
-		{
-		_LIT(KSIPFormat, "SIP: %S: %S");
-		TBuf<256> log;
-		log.Format(KSIPFormat, &aStr, &aMsg);
-		RDebug::RawPrint(log);
-		}
+    OstTraceExt2( TRACE_NORMAL, TSIPLOGGER_PRINT_TEXT16_TEXT16, "SIP: %S: %S", aStr, aMsg );
 	}
 
 
 inline void TSIPLogger::Print(const TDesC& aStr,
 		                      TUint32 aValue)
 	{
-	if ( LogDirExists( KSipLogPath ) )
-		{
-		RFileLogger::WriteFormat (KSipLogFileDir, KSipLogFileName, 
-			EFileLoggingModeAppend, KIntMessageFormat, &aStr, aValue);
-		RFileLogger::Write (KSipLogFileDir, KSipLogFileName, 
-			EFileLoggingModeAppend, KSeparator);
-		}
-	else
-		{
-		_LIT(KSIPFormat, "SIP: %S: %d");
-		TBuf<256> log;
-		log.Format(KSIPFormat, &aStr, aValue);
-		RDebug::RawPrint(log);
-		}
+    OstTraceExt2( TRACE_NORMAL, TSIPLOGGER_PRINT_TEXT16_UINT32, "SIP: %S: %u", aStr, aValue );
 	}
 
 
@@ -130,57 +54,17 @@
 		                      TUint32 aValue1,
 		                      TUint32 aValue2)
 	{
-	if ( LogDirExists( KSipLogPath ) )
-		{
-		RFileLogger::WriteFormat (KSipLogFileDir, KSipLogFileName, 
-			EFileLoggingModeAppend, KTwoIntMessageFormat, &aStr, 
-			aValue1, aValue2);                                
-		RFileLogger::Write (KSipLogFileDir, KSipLogFileName, 
-			EFileLoggingModeAppend, KSeparator);
-		}
-	else
-		{
-		_LIT(KSIPFormat, "SIP: %S: %d, %d");
-		TBuf<256> log;
-		log.Format(KSIPFormat, &aStr, aValue1, aValue2);
-		RDebug::RawPrint(log);
-		}
+    OstTraceExt3( TRACE_NORMAL, TSIPLOGGER_PRINT_TEXT16_UINT32_UINT32, "SIP: %S: %u, %u", aStr, aValue1, aValue2 );
 	}
 
-  
+
 inline void TSIPLogger::Print(const TDesC& aStr,
-                              const TInetAddr& aAddr) 
+                              const TInetAddr& aAddr)
 	{
 	const TInt KIPv6AddrMaxLen = 39;
 	TBuf<KIPv6AddrMaxLen> addrBuf;
 	aAddr.Output(addrBuf);
 
-	if ( LogDirExists( KSipLogPath ) )
-		{
-		RFileLogger::WriteFormat (KSipLogFileDir, KSipLogFileName, 
-			EFileLoggingModeAppend, KAddrMessageFormat, &aStr,
-			&addrBuf, aAddr.Port());                                 
-		RFileLogger::Write (KSipLogFileDir, KSipLogFileName, 
-			EFileLoggingModeAppend, KSeparator);
-		}
-	else
-		{
-		_LIT(KSIPFormat, "SIP: %S: %S port %d");
-		TBuf<256> log;
-		log.Format(KSIPFormat, &aStr, &addrBuf, aAddr.Port());
-		RDebug::RawPrint(log);
-		}
+	OstTraceExt3( TRACE_NORMAL, TSIPLOGGER_PRINT_TEXT16_TEXT16_UINT32, "SIP: %S: %S port %u", aStr, addrBuf, aAddr.Port() );
 	}
 
-inline TBool TSIPLogger::LogDirExists( const TDesC& aFolderName )
-	{
-    TBool exists( EFalse );
-    RFs fs;
-    if ( KErrNone == fs.Connect() )
-        {
-        TEntry entry;
-        exists = ( fs.Entry( aFolderName, entry ) == KErrNone );
-        fs.Close();        
-        }
-    return exists;
-	}
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/SIP/Logging/inc/TSIPMessageLogger.h
--- a/realtimenetprots/sipfw/SIP/Logging/inc/TSIPMessageLogger.h	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/SIP/Logging/inc/TSIPMessageLogger.h	Thu Oct 21 15:53:21 2010 +0530
@@ -54,7 +54,6 @@
 
     static void WriteSipMessage (const TDesC8& aSIPMessage);
 
-		static TBool LogDirExists( const TDesC& aFolderName );
 		
 #ifdef WRITE_EXTRA_LOGS
 	static void WriteExtraLogs(const TDesC8& aSipMessage);
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/SIP/Logging/src/TSIPMessageLogger.cpp
--- a/realtimenetprots/sipfw/SIP/Logging/src/TSIPMessageLogger.cpp	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/SIP/Logging/src/TSIPMessageLogger.cpp	Thu Oct 21 15:53:21 2010 +0530
@@ -22,20 +22,14 @@
 
 #ifdef USE_SIP_MESSAGE_LOG
 
-#include <flogger.h>
 #include "TSIPMessageLogger.h"
 #include "TSIPLogLineParser.h"
 #include "sipmessage.h"
 
-_LIT(KSIPMessageLogFileDir, "Sip");
-_LIT(KSIPMessageLogFileName, "SipLog.txt");
-//_LIT(KSipLogPath, "C:\\logs\\sip\\");
 
-_LIT8(KFormatParseError, "    SIP Codec parse error: %d!");
-_LIT8(KFooter, "-----");
 
 // Leave some space for date and time:
-const TInt KMaxLineLength = KLogBufferSize-50;
+const TInt KMaxLineLength = 100;
 
 #ifdef WRITE_EXTRA_LOGS
 const TInt KSensibleLineLength = 60;
@@ -71,42 +65,20 @@
     const TDesC8& aSubsystemName,
     const TDesC8& aSIPMessage)
     {
-    TBool exists = LogDirExists( KSipLogPath );
-    
-    if ( exists )
-        {
-        RFileLogger::Write( KSIPMessageLogFileDir,KSIPMessageLogFileName,
-                            EFileLoggingModeAppend, aSubsystemName);
-        }
-    else
-        {
-        RDebug::RawPrint( aSubsystemName );
-        }
-  
+
+    __SIP_TXT8_LOG(aSubsystemName)
+
     WriteSipMessage (aSIPMessage);
-    
+
 #ifdef WRITE_EXTRA_LOGS
-    if ( exists )
-        {
-        RFileLogger::Write( KSIPMessageLogFileDir,KSIPMessageLogFileName,
-                            EFileLoggingModeAppend,KShortFooter);
-      }
-    else
-        {
-        RDebug::RawPrint( KShortFooter );
-        }
+
+    __SIP_LOG("---")
+
     WriteExtraLogs(aSIPMessage);
 #endif
 
-    if ( exists )
-        {
-        RFileLogger::Write( KSIPMessageLogFileDir,KSIPMessageLogFileName,
-                            EFileLoggingModeAppend,KFooter);
-        }
-    else
-        {
-        RDebug::RawPrint( KFooter );
-        }
+    __SIP_LOG("---")
+
     }
 
 // -----------------------------------------------------------------------------
@@ -117,28 +89,11 @@
     const TDesC8& aSubsystemName,
     TInt aError)
     {
-    if ( LogDirExists( KSipLogPath ) )
-        {
-        RFileLogger::Write( KSIPMessageLogFileDir,KSIPMessageLogFileName,
-                            EFileLoggingModeAppend,
-                            aSubsystemName);
-
-        RFileLogger::WriteFormat( KSIPMessageLogFileDir,KSIPMessageLogFileName,
-                                  EFileLoggingModeAppend,
-                                  KFormatParseError, aError);
+    __SIP_TXT8_LOG(aSubsystemName)
+    __SIP_INT_LOG1("    SIP Codec parse error: %d", aError )
 
-        RFileLogger::Write( KSIPMessageLogFileDir,KSIPMessageLogFileName,
-                            EFileLoggingModeAppend,KFooter);
-        }
-    else
-        {
-        _LIT8( KFmt, "%d" );
-        TBuf8<32> buf;
-        buf.Format( KFmt, aError );
-        RDebug::RawPrint( aSubsystemName );
-        RDebug::RawPrint( buf );
-        RDebug::RawPrint( KFooter );
-        }
+
+
     }
 
 // -----------------------------------------------------------------------------
@@ -148,42 +103,17 @@
 void TSIPMessageLogger::WriteSipMessage (const TDesC8& aSIPMessage)
     {
     TSIPLogLineParser lineParser( aSIPMessage, KMaxLineLength );
-    
-    if ( LogDirExists( KSipLogPath ) )
-        { 
-        while ( !lineParser.End())
-            {
-            RFileLogger::Write( KSIPMessageLogFileDir,KSIPMessageLogFileName, 
-                                EFileLoggingModeAppend,
-                                lineParser.GetLine());
-            }
-        }
-    else
-        {
-        while ( !lineParser.End() )
-            {
-            RDebug::RawPrint( lineParser.GetLine() );
-            }
-        }
+
+    while ( !lineParser.End() )
+    {
+        TPtrC8 ptr = lineParser.GetLine();
+        __SIP_DES8_LOG("%s", ptr)
     }
 
-// -----------------------------------------------------------------------------
-// TSIPMessageLogger::LogDirExists
-// -----------------------------------------------------------------------------
-//
-TBool TSIPMessageLogger::LogDirExists( const TDesC& aFolderName )
-    {
-    TBool exists( EFalse );
-    RFs fs;
-    if ( KErrNone == fs.Connect() )
-        {
-        TEntry entry;
-        exists = ( fs.Entry( aFolderName, entry ) == KErrNone );
-        fs.Close();        
-        }
-    return exists;
     }
-    
+
+
+
 // -----------------------------------------------------------------------------
 // TSIPMessageLogger::WriteExtraLogs
 // -----------------------------------------------------------------------------
@@ -220,27 +150,18 @@
                 }
 
             }
-        
+
         if (buf.Length() >= KSensibleLineLength)
             {
             //Buffer full, write it to log file
-            RFileLogger::Write (KSIPMessageLogFileDir,KSIPMessageLogFileName,
-                                EFileLoggingModeAppend, buf);
+            __SIP_TXT8_LOG(buf)
             buf.Zero();
             }
         }
 
     if (buf.Length() > 0)
         {
-        if ( LogDirExists( KSipLogPath ) )
-            {
-            RFileLogger::Write (KSIPMessageLogFileDir,KSIPMessageLogFileName, 
-                            EFileLoggingModeAppend, buf);
-          }
-        else
-            {
-            RDebug::RawPrint( buf );
-            }
+        __SIP_TXT8_LOG(buf)
         }
     }
 #endif // WRITE_EXTRA_LOGS
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/SIP/NetworkMonitor/src/CNetworkManager.cpp
--- a/realtimenetprots/sipfw/SIP/NetworkMonitor/src/CNetworkManager.cpp	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/SIP/NetworkMonitor/src/CNetworkManager.cpp	Thu Oct 21 15:53:21 2010 +0530
@@ -103,14 +103,6 @@
 										 TInt aError )
 	{
 	__SIP_LOG("CNetworkManager::RegisterObserverL, Start")
-	// A bearer monitor plugin is not needed on emulator, except when doing
-	// unit testing
-#if ((defined (__WINS__) || defined(__WINSCW__)) && !defined(CPPUNIT_TEST) )
-
-	aError++; aIapId++; aObserver; // Avoid compiler warnings
-	return;
-
-#else
 
 	// Try to find an existing observer entry from the registry
 	TInt index = FindRegistryEntry( aObserver );
@@ -138,7 +130,6 @@
    		iObservers.AppendL( entry );
     	CleanupStack::Pop( bearer );	
 		}
-#endif
 	}
 
 // -----------------------------------------------------------------------------
@@ -495,19 +486,8 @@
 const TSIPAccessNetworkInfo& CNetworkManager::RegisterAccessNetworkObserver(
     MSIPNetworkInfoObserver& aObserver )
 	{
-	// A bearer monitor plugin is not needed on emulator, except when doing
-	// unit testing
-#if ((defined (__WINS__) || defined(__WINSCW__)) && !defined(CPPUNIT_TEST) )
-	aObserver; // Avoid compiler warnings
-	
-	//Since the real plugin is not started in emulator, pass hardcoded values
-	//to ConnectionMgr so that the P-Access-Network-Info header can be tested.
-	iAccessNetworkInfo = DummyAccessNetworkValues();
-	
-#else
+    
 	iNetworkInfoObserver = &aObserver;
-#endif
-
 	return iAccessNetworkInfo;
 	}
 	
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/SIP/Server/src/CSipServerCore.cpp
--- a/realtimenetprots/sipfw/SIP/Server/src/CSipServerCore.cpp	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/SIP/Server/src/CSipServerCore.cpp	Thu Oct 21 15:53:21 2010 +0530
@@ -39,16 +39,11 @@
 #include "CSIPRegistrationMgr.h"
 #include "CSipRefreshMgr.h"
 #include "CSipConnectionMgr.h"
-#include "TSIPLogger.h"
 #include "SipLogs.h"
 #include "sipstrings.h"
 #include "SIPHeaderLookup.h"
 
 
-#if (defined (__WINS__) || defined(__WINSCW__))
-#include "TSIPMemAllocFailureSimulation.h"
-#endif
-
 const TUint KServerCloseWaitTime = 500; // milliseconds
 
 
@@ -107,10 +102,6 @@
 	                                 SIPSec(),SigComp());
 	iTU->SetDialogs (iDialogMgr);
 
-#if (defined (__WINS__) || defined(__WINSCW__))
-	TSIPMemAllocFailureSimulation::Start();
-#endif
-
 	iServer = CSipCSServer::NewL(*this);
 
     __SIP_LOG("SIP Server Created")
@@ -135,10 +126,6 @@
 	// list of servers asap.
 	delete iServer;
 
-#if (defined (__WINS__) || defined(__WINSCW__))
-	TSIPMemAllocFailureSimulation::Stop();
-#endif
-
     delete iDialogMgr;
     delete iRegistrationMgr;
     delete iRefreshMgr;
diff -r e4420734a2a0 -r 36ea1f90a3d8 realtimenetprots/sipfw/SigComp/SigCompEngine/src/SigComp.cpp
--- a/realtimenetprots/sipfw/SigComp/SigCompEngine/src/SigComp.cpp	Tue Oct 19 05:33:24 2010 +0530
+++ b/realtimenetprots/sipfw/SigComp/SigCompEngine/src/SigComp.cpp	Thu Oct 21 15:53:21 2010 +0530
@@ -82,10 +82,8 @@
     User::LeaveIfError(rfs.Connect());
     CleanupClosePushL(rfs);
 
-#if !defined(__WINS__) && !defined(__WINSCW__)
     TParsePtrC parser(RProcess().FileName());
-    User::LeaveIfError(rfs.SetSessionPath(parser.Drive()));
-#endif    
+    User::LeaveIfError(rfs.SetSessionPath(parser.Drive()));   
 
     TInt stateLen = 0;
     RFile file;