FCL/sf/os/bt: comparison bluetooth/btstack/l2cap/l2capSigStates.cpp

equal deleted inserted replaced

-:14e279d2bbb7
+:22de2e391156
 void TL2CAPSigStateClosed::OpenChannel(CL2CapSAPSignalHandler& aSignalHandler) const
 	{
 	LOG_FUNC
 	// The SAP has requested a channel be opened.
+	// Override all LPMs to try and avoid signalling timeouts
+	aSignalHandler.OverrideLPM();
 	TInt err = aSignalHandler.ChannelConfig().UpdateLocalConfigWithEntityCapabilities();
 	if (err == KErrNone)
 		{
 		// Get a free source CID for this channel to use.
 		if(err == KErrNone)
 			{
 			// Update local Port.
 			aSignalHandler.SetLocalPort(port);
-			// Override park to allow the connection to be made.
-			aSignalHandler.OverrideParkMode();
 			// Active connection.  Send a Connect Request command.
 			err = aSignalHandler.ConstructConnectionRequest();
 			if(err == KErrNone)
 				{
 				aSignalHandler.SetState(iFactory.GetState(CL2CAPSignalStateFactory::EWaitConnectRsp));
 	if(err == KErrNone)
 		{
 		// Update local Port.
 		aSignalHandler.SetLocalPort(port);
-		// Override park to allow the connection to be made.
+		// Override all LPMs to try and avoid signalling timeouts
-		aSignalHandler.OverrideParkMode();
+		aSignalHandler.OverrideLPM();
-		// Override all LPMs (if timeout not set to zero)
-		aSignalHandler.OverrideLPMWithTimeout();
 		// Send a response with a 'pending' result and start security procedure.
 		err = aSignalHandler.ConstructConnectionResponse(aSignalHandler.GetOutstandingRequestID(),
 	                                                     EConnectPending,
 		                                                 EConnectPendAuthorization);
 	// Cancel the configuration timer.
 	aSignalHandler.CancelTimer();
 	aSignalHandler.iOpenChannelRequestAwaitingPeerEntityConfig = EFalse;
-	// If Park mode has been overridden during either channel establishment or
+	// Depending where we came from we may have applied either a
-	// channel disconnect, remove the override.
+	// park override or an all LPM override.  We remove both these
-	// NB It is safe to call this method multiple times.
+	// overrides because it's safe to remove an override that
+	// hasn't been applied.
+	// Note that although park is one of the LPMs the different
+	// levels of override are managed separately, so an
+	// UndoOverrideLPM does not remove an explicit park only
+	// override.
 	aSignalHandler.UndoOverrideParkMode();
+	aSignalHandler.UndoOverrideLPM();
 	// If the signal handler has left the closed state, it will have been added
 	// to the SH list in the Muxer.  Now that the closed state is being
 	// re-entered, remove the handler from the Muxer queue.
 	// NB It is safe to call this method multiple times.
 // Change of state events
 void TL2CAPSigStateWaitConfig::Enter(CL2CapSAPSignalHandler& aSignalHandler) const
 	{
 	LOG_FUNC
+	// Cancel the Config timer if it's running
+	aSignalHandler.CancelTimer();
 	// First start the ConfigReq sending delay timer (see DelayConfigRequest() for why).
 	// It's short lived, we'll start the proper L2CAP config timer when it expires.
 	aSignalHandler.StartConfigRequestDelayTimer();
 	}
 		aSignalHandler.SetState(iFactory.GetState(CL2CAPSignalStateFactory::EWaitConfig));
 		aSignalHandler.ConfigureChannel();
 		}
 	else
 		{
-		// Remove and park override.
+		// Depending where we came from we may have applied either a
+		// park override or an all LPM override.  We remove both these
+		// overrides because it's safe to remove an override that
+		// hasn't been applied.
+		// Note that although park is one of the LPMs the different
+		// levels of override are managed separately, so an
+		// UndoOverrideLPM does not remove an explicit park only
+		// override.
 		aSignalHandler.UndoOverrideParkMode();
+		aSignalHandler.UndoOverrideLPM();
 		// Cancel the configuration timer.
 		aSignalHandler.CancelTimer();
 		// Inform the SAP that the channel is now configured and ready to use.
 	}
 void TL2CAPSigStateWaitDisconnect::DisconnectResponse(CL2CapSAPSignalHandler& aSignalHandler) const
 	{
 	LOG_FUNC
-	aSignalHandler.DrainPendingCommands();
+	// We've got a disconnect response, we're done.  Any remaing stuff on the queue
-	}
+	// is redundant, so ditch it and close synchronously.
+	aSignalHandler.FlushAllQueues();
-// "Artificial" state events
-void TL2CAPSigStateWaitDisconnect::PendingCommandsDrained(CL2CapSAPSignalHandler& aSignalHandler) const
-	{
-	LOG_FUNC
 	// If an error condition has been recorded forward the error
 	// to the SAP.
 	if(aSignalHandler.SignalHandlerErrorCode() != KErrNone)
 		{
 		Error(aSignalHandler, aSignalHandler.SignalHandlerErrorCode(), aSignalHandler.SignalHandlerErrorAction());
 		{
 		// This will delete the signal handler if the SAP has detached.
 		aSignalHandler.SetState(iFactory.GetState(CL2CAPSignalStateFactory::EClosed));
 		aSignalHandler.SignalHandlerDisconnectedCanClose();
 		}
+	}
+// "Artificial" state events
+void TL2CAPSigStateWaitDisconnect::PendingCommandsDrained(CL2CapSAPSignalHandler& aSignalHandler) const
+	{
+	LOG_FUNC
+	// If an error condition has been recorded forward the error
+	// to the SAP.
+	if(aSignalHandler.SignalHandlerErrorCode() != KErrNone)
+		{
+		Error(aSignalHandler, aSignalHandler.SignalHandlerErrorCode(), aSignalHandler.SignalHandlerErrorAction());
+		}
+	else
+		{
+		// This will delete the signal handler if the SAP has detached.
+		aSignalHandler.SetState(iFactory.GetState(CL2CAPSignalStateFactory::EClosed));
+		aSignalHandler.SignalHandlerDisconnectedCanClose();
+		}
 	}
 void TL2CAPSigStateWaitDisconnect::Enter(CL2CapSAPSignalHandler& aSignalHandler) const
 	{
 	LOG_FUNC
-	// Override park to allow the disconnect to continue.
+	// Only override park for disconnect.  We need to be able
+	// to send the signalling, but we don't care if it takes
+	// ages.  No point starting a sniff bun-fight.
 	aSignalHandler.OverrideParkMode();
 	// Cancel the configuration timer.
 	aSignalHandler.CancelTimer();
 	}

changeset 48	22de2e391156
parent 33	4e80e1b997a8