FCL/sf/os/commsfw: comparison datacommsserver/esockserver/ssock/ss

equal deleted inserted replaced

-:68ef71f0cd72
+:77effd21b2c9
 void CTransportFlowShim::Unbind( MUpperDataReceiver* /*aReceiver*/, MUpperControl* aControl)
 {
 (void)aControl;
 __ASSERT_DEBUG(aControl == iHostResolverNotify, User::Panic(KSpecAssert_ESockSSocksspshm, 1));
-__ASSERT_DEBUG(iDCIdle <= EClientsPresent, User::Panic(KSpecAssert_ESockSSocksspshm, 2));
+__ASSERT_DEBUG(!(Idle() || IdleSent()), User::Panic(KSpecAssert_ESockSSocksspshm, 2));
-iDCIdle = EIdle;
+SetIdle();
 iHostResolverNotify = NULL;
 if(iSubConnectionProvider.IsOpen())	// legacy flows have no control side
 	{
 	ProcessDCIdleState();
 	}
 	if(iListenerControlNotify)
 		{
 		iListenerControlNotify->DisconnectFromListener(*this);
 		}
-	if(!iDetaching)
+	if(!Detaching())
 		{
 		delete iProvider;
 		iProvider = NULL;
 		}
 	// Legacy support for host resolvers
 	if(iHostResolverNotify)
 		{
 		__ASSERT_DEBUG(!iProvider, User::Panic(KSpecAssert_ESockSSocksspshm, 9));	// can't have both HR & SAP
-		LOG( ESockLog::Printf(_L8("CTransportFlowShim %08x:\tUnbind(): iBearerExpected %d"), this, iBearerExpected) );
+		LOG( ESockLog::Printf(_L8("CTransportFlowShim %08x:\tUnbind(): iBearerExpected %d"), this, BearerExpected()) );
-		if (!iBearerExpected)
+		if (!BearerExpected())
 			{
 			delete this;
 			}
 		else
 			{
-			iDeleteUponBearerReception = ETrue;
+			SetDeleteUponBearerReception();
 			iHostResolverNotify = NULL;
 			}
 		return;
 		}
 	if (iProvider)
 		{
 		iProvider->SetNotify(NULL);
-		if (!iDetaching)
+		if (!Detaching())
 			{
 			delete iProvider;
 			iProvider = NULL;
 			}
 		}
 Do the actual no Bearer call.
 @return ETrue if the NoBearer post was actually done, EFalse otherwise
 */
 	{
 	TInt ret = EFalse;
-	if(!iIsStopped)
+	if(!Stopped())
 		{ // Prevent sending NoBearer if DataClientStop was received
 		if (LockToConnectionInfo() != KErrNone)
 		    {
 	        __ASSERT_DEBUG(iSubConnectionProvider.IsOpen(), User::Panic(KSpecAssert_ESockSSocksspshm, 66));
 			PostNoBearer();
 			ret = ETrue;
 		    }
-		iUseBearerErrors = EFalse;
+		ClearUseBearerErrors();
 		ClearDataClientRoutedGuard();
 		}
 	return ret;
 	}
 @param option The shutdown type. */
 	{
 	__ASSERT_DEBUG(iProvider, User::Panic(KSpecAssert_ESockSSocksspshm, 24));
 	if (aOption == MSessionControl::EImmediate)
 		{
-		iShuttingDown = ETrue;
+		SetShuttingDown();
 		}
 	// It is possible for the provider to be null if an error occurs immediatly
 	// after socket creation before the flow is bound and the provider is received
 	// from the protocol.
 	{
 	LOG( ESockLog::Printf(_L("CTransportFlowShim %08x:\tCanClose() aDelete %d"), this, aDelete) );
 	if(iSessionControlNotify)
 		{
-		iDetaching = aDelete == MSocketNotify::EDetach;
+		aDelete == MSocketNotify::EDetach ? SetDetaching() : ClearDetaching();
 		iSessionControlNotify->CanClose(MSessionControlNotify::TDelete(aDelete));
 if(aDelete==MSocketNotify::EDetach)
 {
 iProvider = NULL;
 }
 	{
 	LOG( ESockLog::Printf(_L("CTransportFlowShim %08x:\tCanClose() aDisconnectData %08x, aDelete %d"), this, aDisconnectData.Ptr(), aDelete) );
 	if(iSessionControlNotify)
 		{
-iDetaching = aDelete == MSocketNotify::EDetach;
+		aDelete == MSocketNotify::EDetach ? SetDetaching() : ClearDetaching();
 		iSessionControlNotify->CanClose(aDisconnectData, MSessionControlNotify::TDelete(aDelete));
 		if(aDelete==MSocketNotify::EDetach)
 			{
 			iProvider = NULL;
 			}
 		{
 		LOG( ESockLog::Printf(_L("CTransportFlowShim %08x:\tError() no control above us to notify (open was likely passive and has not been accepted yet) so simply unbinding"), this) );
 		// No control above us - likely cause is that we're the result of a passive open that
 		// hasn't yet been accepted.
-		iDetaching = MSocketNotify::EDetach;
+		SetDetaching();
 		Unbind();
 		}
 	}
 void CTransportFlowShim::Disconnect(void)
 		{
 		LOG( ESockLog::Printf(_L("CTransportFlowShim %08x:\tDisconnect() no control above us to notify (open was likely passive and has not been accepted yet) so simply unbinding"), this) );
 		// No control above us - likely cause is that we're the result of a passive open that
 		// hasn't yet been accepted.
-		iDetaching = MSocketNotify::EDetach;
+		SetDetaching();
 		Unbind();
 		}
 	}
 void CTransportFlowShim::Disconnect(TDesC8& aDisconnectData)
 		{
 		LOG( ESockLog::Printf(_L("CTransportFlowShim %08x:\tDisconnect() no control above us to notify (open was likely passive and has not been accepted yet) so simply unbinding"), this) );
 		// No control above us - likely cause is that we're the result of a passive open that
 		// hasn't yet been accepted.
-		iDetaching = MSocketNotify::EDetach;
+		SetDetaching();
 		Unbind();
 		}
 	}
 void CTransportFlowShim::IoctlComplete(TDesC8 *aBuf)
 	if (TConnectionInfo::IsLocalBearer(aConnectionInfo))
 		{
 		return;
 		}
-	iUseBearerErrors = ETrue;
+	SetUseBearerErrors();
 	LocalName(iLocalAddress);
-	iLocalAddressSet = ETrue;
+	SetLocalAddressSet();
 	RemName(iRemoteAddress);
-	iRemoteAddressSet = ETrue;
+	SetRemoteAddressSet();
 	__ASSERT_DEBUG(iSubConnectionProvider.IsOpen(), User::Panic(KSpecAssert_ESockSSocksspshm, 41));	// legacy flows have no control side; should never get here
 	PostDataClientRouted();
 	}
 				//we complete the start here as well
 				if (iStartRequest.IsOpen())
 					{
 					CompleteStart(err);
 					}
-iBearerExpected = ETrue;
+				SetBearerExpected();
 				}
 			else
 		    	{
 				// If we get a TBindTo message then the TNoBearer request has succeeded
 				// and we can inform the client.
 		//we complete the start here as well
 		if (iStartRequest.IsOpen())
 			{
 			CompleteStart(KErrNone);
 			}
-		LOG( ESockLog::Printf(_L8("CTransportFlowShim %08x:\tReceivedL(): TBearer: iDeleteUponBearerReception %d"), this, iDeleteUponBearerReception) );
+		LOG( ESockLog::Printf(_L8("CTransportFlowShim %08x:\tReceivedL(): TBearer: iDeleteUponBearerReception %d"), this, DeleteUponBearerReception()));
 		ClearNoBearerGuard();
 		ProcessDCIdleState();
 		NoBearerCompletion();		// may delete this !
 		}
 		}
 }
 void CTransportFlowShim::NoBearerCompletion()
 	{
-	iBearerExpected = EFalse;
+	ClearBearerExpected();
-	if (iDeleteUponBearerReception)
+	if (DeleteUponBearerReception())
 		{
 		delete this;
 		}
 	}
 void CTransportFlowShim::CompleteStart(TInt aError)
 	{
 	if (aError==KErrNone)
 		{
 		iStartRequest.ReplyTo(Id(), TCFDataClient::TStarted().CRef());
-		iIsStarted = ETrue;
+		SetStarted();
-		iIsStopped = EFalse;
+		ClearStopped();
 		}
 	else
 		{
 		iStartRequest.ReplyTo(Id(), TEBase::TError(TCFDataClient::TStart::Id(),aError).CRef());
 		}
 	//the sub-connection
 	NM_LOG((KESockServerTag, _L8("CTransportFlowShim %08x:\tSynchronous call: From=%08x To=%08x Func=BindToL"),
 			this, static_cast<Messages::ANode*>(this), &aBindTo.iNodeId.Node()) )
-	if (iShuttingDown)
+	if (ShuttingDown())
 		{
 		User::Leave(KErrCancel);
 		return;
 		}
 	CNetworkFlow::BindToL(aBindTo);
 	if (iLowerFlow && IsBoundToSession())
 		{
 		LockToConnectionInfo();
 		LocalName(iLocalAddress);
-		iLocalAddressSet = ETrue;
+		SetLocalAddressSet();
 		RemName(iRemoteAddress);
-		iRemoteAddressSet = ETrue;
+		SetRemoteAddressSet();
 		__ASSERT_DEBUG(iSubConnectionProvider.IsOpen(), User::Panic(KSpecAssert_ESockSSocksspshm, 48));	// legacy flows have no control side; should never get here
 		}
 	else if (iHostResolverNotify)
 	    {//workaroud to indicate to CHostResolver we've got connection info
 	    if (aBindTo.iNodeId.Ptr())
 }
 }
 void CTransportFlowShim::StartFlowL(const TRuntimeCtxId& aSender)
 	{
-	__ASSERT_DEBUG(!iIsStarted, User::Panic(KSpecAssert_ESockSSocksspshm, 49));
+	__ASSERT_DEBUG(!Started(), User::Panic(KSpecAssert_ESockSSocksspshm, 49));
 	__ASSERT_DEBUG(iSubConnectionProvider.IsOpen(), User::Panic(KSpecAssert_ESockSSocksspshm, 50));	// legacy flows have no control side; should never get here
 	//We will wait for it and complete the start after we have received it
 	User::LeaveIfError(iStartRequest.Open(iSubConnectionProvider, aSender));
-	if (iDCIdle != EClientsPresent)
+	if (Idle())
 		{
 		iStartRequest.ReplyTo(Id(), TEBase::TError(TCFDataClient::TStart::Id(), KErrNotReady).CRef());
 		iStartRequest.Close();
 		return;
 		}
 	if (iLowerFlow)
 		{
 		iStartRequest.ReplyTo(Id(), TCFDataClient::TStarted().CRef());
 		iStartRequest.Close();
-		iIsStarted = ETrue;
+		SetStarted();
-		iIsStopped = EFalse;
+		ClearStopped();
 		return;
 		}
 	//We need a bearer
 		PostNoBearer(); //Ask for bearer if not requested already
 	}
 void CTransportFlowShim::StopFlow(TCFDataClient::TStop& aMessage)
 	{
-	__ASSERT_DEBUG(iIsStarted, User::Panic(KSpecAssert_ESockSSocksspshm, 51)); //Must be started now
 	__ASSERT_DEBUG(iSubConnectionProvider.IsOpen(), User::Panic(KSpecAssert_ESockSSocksspshm, 52));	// legacy flows have no control side; should never get here
 	// We need to error the socket if the lower protocol stack is not going to do this.  Once a
 	// Bearer() upcall has been received, the lower protocol will call Error() if the connection
 	// goes down.  Before this point, the lower protocol will not call Error(), so StopFlow() calls
 	// has attached a flow to a route (and hence an interface) which, in turn, only occurs once the
 	// interface is up and data has been sent over the socket.  Note that opening an RSocket on an
 	// RConnection but not transferring any data will not cause the TCP/IP stack to attach the flow
 	// to the route and hence not call Error() if the interface comes down.
-	if (IsBoundToSession() && !iUseBearerErrors)
+	if (IsBoundToSession() && aMessage.iValue == KErrForceDisconnected)
+		{
+		Error(KErrDisconnected, EErrorAllOperations);
+		}
+	else if (IsBoundToSession() && !UseBearerErrors())
 	    {
 	Error(aMessage.iValue, EErrorAllOperations);
 	    }
 	if (iLowerFlow)
 		iLowerFlow = NULL;
 		}
 	iLowerControl = NULL;
 	iSubConnectionProvider.PostMessage(Id(), TCFDataClient::TStopped(aMessage.iValue).CRef());
-	iIsStarted = EFalse;
+	ClearStarted();
-	iIsStopped = ETrue;
+	SetStopped();
 	}
 void CTransportFlowShim::InitDestroy()
 	{
-__ASSERT_DEBUG(iDCIdle <= EClientsPresent, User::Panic(KSpecAssert_ESockSSocksspshm, 53));
+	__ASSERT_DEBUG(!(Idle() || IdleSent()), User::Panic(KSpecAssert_ESockSSocksspshm, 53));
-iDCIdle = EIdle;
+SetIdle();
 if(iSubConnectionProvider.IsOpen())	// legacy flows have no control side
 	{
 	ProcessDCIdleState();
 	}
 		}
 	}
 void CTransportFlowShim::PostDataClientRouted()
 	{
-	if (iLocalAddressSet && iRemoteAddressSet
+	if (LocalAddressSet() && RemoteAddressSet()
-	&& iRemoteAddress.Family() != KAFUnspec && !iDataClientRoutedGuard)
+		&& iRemoteAddress.Family() != KAFUnspec && !DataClientRoutedGuard())
 		{
 		iSubConnectionProvider.PostMessage(
 			Id(),
 			TCFIPMessages::TDataClientRouted(
 				TAddrUpdate(
 					iRemoteAddress,
 					iFlowParams.iProtocol,
 					iIfInfo.iIAPId)
 				).CRef()
 			);
-		iDataClientRoutedGuard = ETrue;
+		SetDataClientRoutedGuard();
 		}
 	}
-void CTransportFlowShim::ClearDataClientRoutedGuard()
-	{
-	iDataClientRoutedGuard = EFalse;
-	}
 /*
 Store the provision information passed from the Control side.
 @param TProvisionConfig Message recd.
 */
 			Error(result, MSocketNotify::EErrorSend | MSocketNotify::EErrorConnect);
 			return;
 			}
 		}
-	if(!IsStopped())
+	if(!Stopped())
 		{ // Prevent sending NoBearer if DataClientStop was received
 		ParseNoBearerParams(aConnectionParams);
 		if (iIsScoped)
 		    {
 		    if (!disableUpsCheck && UpsEnabled())
 				{
 				PopulateUpsExtension(result);
 				}
 	        PostNoBearer();
 		    }
-		ClearUseBearerErrors();
 		ClearDataClientRoutedGuard();
 		}
 	else
 	    {
 	    // Return an error on an attempt to issue a SendTo() on an explicit socket (datagram) whose corresponding
 @param aResponse TPolicyCheckResponse message
 */
 	{
 	SetPolicyCheckRequestPending(EFalse);
-	if (iDCIdle == EIdle)
+	if (Idle() && !IdleSent())
 		{
 		ProcessDCIdleState();
 		}
 	else
 		{

branch	RCL_3
changeset 9	77effd21b2c9
parent 2	dee179edb159
child 14	8b5d60ce1e94