--- a/datacommsserver/esockserver/ssock/ss_sap.cpp	Tue Feb 02 00:53:00 2010 +0200
+++ b/datacommsserver/esockserver/ssock/ss_sap.cpp	Sat Feb 20 00:01:55 2010 +0200
@@ -63,7 +63,7 @@
 @return Returns KErrNone if the local name is correctly set or, if this is
 not the case, an informative error number. */
 	{
-	iLocalAddressSet = ETrue;
+	SetLocalAddressSet();
 	iLocalAddress = anAddr;
 	
 	}
@@ -76,7 +76,7 @@
 @return Returns KErrNone if the remote name is correctly set or, if this is
 not the case, an informative error number. */
 	{
-	iRemoteAddressSet = ETrue;
+	SetRemoteAddressSet();
 	iRemoteAddress = anAddr;
 	return KErrNone;
 	}
@@ -84,7 +84,7 @@
 void CNetworkFlow::UpdateDestinationAddress(const TSockAddr& aDest)
 	{
 	iRemoteAddress = aDest;
-	iRemoteAddressSet = ETrue;
+	SetRemoteAddressSet();
 	}
 
 TUint CNetworkFlow::Write(const TDesC8& /*aDesc*/, TUint /*aOptions*/, TSockAddr* anAddr)
@@ -223,9 +223,9 @@
 		iSessionDataNotify = NULL;
 		if(iSubConnectionProvider.IsOpen())
 			{
-			if(iDCIdle < EIdle)
+			if (!Idle())
 				{
-				iDCIdle = EIdle;
+				SetIdle();
 		    	ProcessDCIdleState();
 				}
 			}
@@ -250,12 +250,12 @@
 void CNetworkFlow::ProcessDCIdleState()
 	{
 #ifdef SYMBIAN_NETWORKING_UPS
-	if(iDCIdle == EIdle && !ActivityRunning())
+	if (Idle() && !IdleSent() && !ActivityRunning())
 #else
-	if(iDCIdle == EIdle && !iNoBearerRunning)
+	if (Idle() && !IdleSent() && !NoBearerGuard())
 #endif
 		{
-		iDCIdle = EIdleSent;
+		SetIdleSent();
 		iSubConnectionProvider.PostMessage(Id(), TCFControlProvider::TIdle().CRef());
 		}
 	}