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

equal deleted inserted replaced

-:b564fb5fd78b
+:5ebd530e523b
 	}
 }
 MLowerDataSender::TSendResult CTransportFlowShim::Send(RMBufChain& /*aData*/)
 {
-__ASSERT_DEBUG(iHostResolverNotify, User::Panic(KSpecAssert_ESockSSocksspshm, 3));
+__ASSERT_DEBUG(IsHostResolver(), User::Panic(KSpecAssert_ESockSSocksspshm, 3));
 TBuf8<sizeof(TConnectionInfo)> buf;
 if (Control(KSOLProvider, static_cast<TUint>(KSoConnectionInfo), buf) == KErrNone)
 {
 iHostResolverNotify->StartSending();
 	return this;
 }
 void CTransportFlowShim::HostResolverSpecificUnbind()
 	{
-	// Can't have both HR & SAP
 	__ASSERT_DEBUG(!iProvider, User::Panic(KSpecAssert_ESockSSocksspshm, 9));
 	if(iSubConnectionProvider.IsOpen())
 		{
 		iSessionControlNotify = NULL;
 		iSessionDataNotify = NULL;
 		iHostResolverNotify = NULL;
 	else
 		{
 		DeleteThisFlow();
 		}
 	}
 void CTransportFlowShim::Unbind()
 {
 	LOG( ESockLog::Printf(_L8("CTransportFlowShim %08x:\tUnbind()"), this) );
 	// Infant mortality case in which binding never completed,
 		{
 		delete this;
 		return;
 		}
-	// Legacy support for host resolvers involves a separate north bound MUpperControl interface
+	// Legacy support for host resolvers
-	if(iHostResolverNotify)
+	if(IsHostResolver())
 		{
 		HostResolverSpecificUnbind();
-		}
-	else
-		{
-		if (iProvider)
-			{
-			iProvider->SetNotify(NULL);
-			if (!Detaching())
-				{
-				delete iProvider;
-				iProvider = NULL;
-				}
 			}
+		else
+			{
+	if (iProvider)
+		{
+		iProvider->SetNotify(NULL);
+		if (!Detaching())
+			{
+			delete iProvider;
+			iProvider = NULL;
+			}
+		}
 #ifdef SYMBIAN_NETWORKING_UPS
-		// Hook for derived classes to do cleanup before unbind occurs
+	// Hook for derived classes to do cleanup before unbind occurs
-		PreUnbind();
+	PreUnbind();
 #endif
-		CNetworkFlow::Unbind();
+	CNetworkFlow::Unbind();
 		}
 }
 ESock::CSubConnectionFlowBase& CTransportFlowShim::CloneFlowL()
 {
 	if (IsBoundToSession())
 	    {
 		LOG( ESockLog::Printf(_L("CTransportFlowShim %08x:\tSubConnectionError() - calling Error() function"), this) );
 	Error(errorMsg.iValue, anOperationMask);
 	    }
-	else if (iHostResolverNotify)
+	else if (IsHostResolver())
 	    {
 		LOG( ESockLog::Printf(_L("CTransportFlowShim %08x:\tSubConnectionError() - passing to host resolver's Error() function"), this) );
 	    iHostResolverNotify->Error(errorMsg.iValue);
 	    }
 	}
 		RemName(iRemoteAddress);
 		SetRemoteAddressSet();
 		__ASSERT_DEBUG(iSubConnectionProvider.IsOpen(), User::Panic(KSpecAssert_ESockSSocksspshm, 48));	// legacy flows have no control side; should never get here
 		}
-	else if (iHostResolverNotify)
+	else if (IsHostResolver())
 	    {//workaroud to indicate to CHostResolver we've got connection info
 	    if (!aBindTo.iNodeId.Ptr())
 	        {
 iHostResolverNotify->Error(KErrDisconnected);
 	        }
 		SetStarted();
 		ClearStopped();
 // A held-over implicit resolution request will now work (if it ever will).
 		// Explicit host resolver requests have already been re-issued in BindToL().
-if (iHostResolverNotify && (iFlowParams.iFlowRequestType != TFlowParams::EExplicitConnection))
+if (IsHostResolver() && (iFlowParams.iFlowRequestType != TFlowParams::EExplicitConnection))
 	        {
 	    iHostResolverNotify->StartSending();
 	        }
 		return;
 	// 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() && aMessage.iValue == KErrForceDisconnected)
+	TInt err = (aMessage.iValue == KErrForceDisconnected) ? KErrDisconnected : aMessage.iValue;
-		{
+	if (IsBoundToSession() && (aMessage.iValue == KErrForceDisconnected || !UseBearerErrors()))
-		Error(KErrDisconnected, EErrorAllOperations);
+		{
-		}
+		Error(err, EErrorAllOperations);
-	else if (IsBoundToSession() && !UseBearerErrors())
+		}
+	else if (IsHostResolver())
 	    {
-	Error(aMessage.iValue, EErrorAllOperations);
+__ASSERT_DEBUG(err != KErrNone, User::Panic(KSpecAssert_ESockSSocksspshm, 67));
+LOG( ESockLog::Printf(_L("CTransportFlowShim %08x:\tStopFlow() - passing to host resolver's Error() function"), this) );
+iHostResolverNotify->Error(err);
 	    }
 	if (iLowerFlow)
 		{
 		iLowerFlow->Unbind(NULL,NULL);

branch	RCL_3
changeset 27	5ebd530e523b
parent 26	b564fb5fd78b