MCL/sf/os/bt: comparison bluetooth/btstack/linkmgr/physicallinks.cpp

equal deleted inserted replaced

-:28479eeba3fb
+:2b6718f05bdb
 			{
 			TBTBasebandEventNotification event(ENotifySynchronousLinkUp);
 			NotifyStateChange(event);
 			}
+		if (iACLLogicalLinks.Count() == 0)
+			{
+			// We don't already have an ACL logical link associated with this phy,
+			// so, in order to not miss ACL data from the remote, associate this
+			// phy with an ACL listener if there is one.
+			TLogicalLinkListener* listener = iLinksMan.FindListener(EACLLink);
+			if (listener)
+				{
+				TBTConnect conn;
+				conn.iBdaddr = iDevice.Address();
+				conn.iCoD = iDevice.DeviceClass().DeviceClass();
+				conn.iLinkType = EACLLink;
+				// Ignore the return from ConnectRequest, if not accepted then we are in no
+				// worse situation than if we didn't try.
+				ASSERT_DEBUG(listener->iObserver);
+				(void)listener->iObserver->ConnectRequest(conn, *this);
+				}
+			}
 		// tell the logical links
 		NotifyLogicalLinkUp(aConn);
 		iLinksMan.ArbitrateAllPhysicalLinks();
 		// Check to see if we got a disconnect request during the period before the link was
 			CBTPairingsCache::TPairingState pairingState = iLinksMan.PairingsCache().IsPaired(aConn.iBdaddr);
 			if(pairingState == CBTPairingsCache::EDeferred)
 				{
 				// We're still waiting for the Pairing Caches paired device list to be filled.
 				// We'll respond when this is complete, so store details away for then.
 				LOG(_L("CPhysicalLink: Waiting for physical link manager's paired device list from Registry!"))
 				iPendingConnection = ETrue;
-			iLastPendingConnection.iConnH = aConn.iConnH;
+				iLastPendingConnection.iConnH = aConn.iConnH;
-			    iLastPendingConnection.iBdaddr = aConn.iBdaddr;
+				iLastPendingConnection.iBdaddr = aConn.iBdaddr;
-			    iLastPendingConnection.iCoD = aConn.iCoD;
+				iLastPendingConnection.iCoD = aConn.iCoD;
-			    iLastPendingConnection.iLinkType = aConn.iLinkType;
+				iLastPendingConnection.iLinkType = aConn.iLinkType;
-			    iLastPendingConnection.iEncryptMode = aConn.iEncryptMode;
+				iLastPendingConnection.iEncryptMode = aConn.iEncryptMode;
-			    // Return now as we are waiting and don't want to 'RejectConnection'
+				// Return now as we are waiting and don't want to 'RejectConnection'
 				return;
 				}
 			// If here then the cache has either informed us that the device is paired
 			// or not.  We only accept paired connections.
 				if (aOption.Length() != sizeof(TBasebandTime))
 					{
 					return KErrArgument;
 					}
 				aOption = TPtrC8(reinterpret_cast<const TUint8*>(&iSniffInterval), sizeof(TBasebandTime));
-			    return KErrNone;
+				return KErrNone;
 			default:
 				return KErrNotSupported;
 			}
 		}
 		return KErrDisconnected;
 	if ( aImmediately )
 		{
 		iArbitrationDelay->Cancel();
-return DoArbitrate(aLocalPriority);
+		return DoArbitrate(aLocalPriority);
 		}
 	else if (iArbitrationDelay->IsActive())
 		{
 		return KErrNone;
 		}
-else
+	else
-{
+		{
-iArbitrationDelay->Start(aLocalPriority);
+		iArbitrationDelay->Start(aLocalPriority);
-return KErrNone;
+		return KErrNone;
-}
+		}
-}
+	}
 TInt CPhysicalLink::DoArbitrate(TBool aLocalPriority)
-{
+	{
-if (!IsConnected())
+	if (!IsConnected())
-{
+		{
-return KErrDisconnected;
+		return KErrDisconnected;
-}
+		}
 	//start arbitrate process with what our local controller supports
 	TUint8 allowedModesMask = EHoldMode | EParkMode | ESniffMode; // local features sorted out later
 	TBool roleSwitchAllowed = EFalse;
 	if (iLinksMan.LinkManagerProtocol().IsRoleSwitchSupportedLocally() && iLinksMan.RoleSwitchAllowed())
 	// However, in UDEB we panic to raise awareness that the hardware is behaving incorrectly.
 	__ASSERT_DEBUG(!iPinRequester, Panic(EBTConnectionPINRequestedTwice));
 	SetAuthenticationPending(EPinRequestPending); // if not already set (because the remote initiated authentication).
+	__ASSERT_DEBUG(iSimplePairingMode != EPhySimplePairingEnabled, Panic(EBTSSPModeChangedDuringConnection));
+	if (iSimplePairingMode == EPhySimplePairingUndefined)
+		{
+		iSimplePairingMode = EPhySimplePairingDisabled;
+		}
+	if (!IsConnected())
+		{
+		iPeerInSecurityMode3 = ETrue;
+		}
 	if (iPinRequester)
 		{
 		return;
 		}
 	CleanupStack::Pop(self);
 	return self;
 	}
 void CArbitrationDelayTimer::Start(TBool aLocalPriority)
-{
+	{
-LOG_FUNC
+	LOG_FUNC
-// Work out what the local priority will be now
+	// Work out what the local priority will be now
-TBool localPriority = iLocalPriority || aLocalPriority;
+	TBool localPriority = iLocalPriority || aLocalPriority;
-Cancel(); // cancel current timer (will also reset priority so ...
+	Cancel(); // cancel current timer (will also reset priority so ...
-iLocalPriority = localPriority; // set the new priority)
+	iLocalPriority = localPriority; // set the new priority)
 	After(KBTArbitrationDelay);
 	}
 void CArbitrationDelayTimer::RunL()
 **/
 	{
 	LOG_FUNC
 	if (iParent)
 		{
-iParent->DoArbitrate(iLocalPriority);
+		iParent->DoArbitrate(iLocalPriority);
 		}
 	}
 void CArbitrationDelayTimer::DoCancel()
-{
+	{
-LOG_FUNC
+	LOG_FUNC
-CTimer::DoCancel();
+	CTimer::DoCancel();
-iLocalPriority = EFalse;
+	iLocalPriority = EFalse;
-}
+	}
 TInt CPhysicalLink::GetNumPendingHandles(TInt& aConnectionHandles, TLinkType aLinkType) const
 	{
 	LOG_FUNC
 	aConnectionHandles = 0;

branch	RCL_3
changeset 8	2b6718f05bdb
parent 3	4e39398d58ed
child 10	8a27654f7b62