TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-14 22:56:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Apply real PSM value in DCT advertising

Browse Source 
PiperOrigin-RevId: 778914950
This commit is contained in:
Guogang Li
2025-07-03 10:06:06 -07:00
committed by Copybara-Service
parent fdd764babb
commit ca8e70f613
5 changed files with 65 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/implementation/mediums/advertisements/dct_advertisement.cc
+3 -3
View File
@@ -117,9 +117,9 @@ std::optional<DctAdvertisement> DctAdvertisement::Parse(
LOG(WARNING) << "Invalid PSM.";
return std::nullopt;
}
std::string psm_str = psm->value().data();
dct_advertisement.psm_ =
(static_cast<uint16_t>(psm_str[0]) << 8) | psm_str[1];
StreamReader psm_reader(ByteArray(psm->value()));
dct_advertisement.psm_ = psm_reader.ReadUint16().value_or(0);
// Read device information
std::optional<DataElement> device_information =
connections/implementation/mediums/advertisements/dct_advertisement_test.cc
+10
View File
@@ -103,5 +103,15 @@ TEST(DctAdvertisementTest, GenerateEndpointIdWithInvalidParameters) {
DctAdvertisement::GenerateEndpointId(0x10, "device\xff").has_value());
}
TEST(DctAdvertisementTest, ParseData) {
std::optional<DctAdvertisement> dct_advertisement =
DctAdvertisement::Parse(std::string("\x20\x25\x6d\xfd\x24\x00\xc0\x88\x07"
"\x96\x74\x65\x73\x74\x64\x65\x76",
17));
EXPECT_TRUE(dct_advertisement.has_value());
EXPECT_EQ(dct_advertisement->GetDeviceName(), "testdev");
EXPECT_EQ(dct_advertisement->GetPsm(), 192);
}
} // namespace
} // namespace nearby::connections::advertisements::ble
connections/implementation/mediums/ble_v2.cc
+44 -39
View File
@@ -663,7 +663,7 @@ ErrorOr<bool> BleV2::StartAcceptingConnections(
}
// TODO(mingshiouwu): Add unit test for ble_l2cap flow
ErrorOr<bool> BleV2::StartAcceptingL2capConnections(
ErrorOr<int> BleV2::StartAcceptingL2capConnections(
const std::string& service_id, AcceptedL2capConnectionCallback callback) {
MutexLock lock(&mutex_);
if (service_id.empty()) {
@@ -696,50 +696,55 @@ ErrorOr<bool> BleV2::StartAcceptingL2capConnections(
BleL2capServerSocket server_socket =
medium_.OpenL2capServerSocket(service_id);
if (server_socket.IsValid()) {
// Mark the fact that there's an in-progress Ble server accepting
// connections.
auto owned_server_socket =
l2cap_server_sockets_.insert({service_id, std::move(server_socket)})
.first->second;
// Start the accept loop on a dedicated thread - this stays alive and
// listening for new incoming connections until StopAcceptingConnections()
// is invoked.
accept_loops_runner_.Execute(
"ble-l2cap-accept",
[this, service_id, callback = std::move(callback),
server_socket = std::move(owned_server_socket)]() mutable {
while (true) {
BleL2capSocket client_socket = server_socket.Accept();
if (!client_socket.IsValid()) {
LOG(WARNING) << "The client L2CAP socket to accept is invalid.";
server_socket.Close();
break;
} else {
LOG(INFO) << "The client L2CAP socket has been accepted.";
}
{
MutexLock lock(&mutex_);
client_socket.SetCloseNotifier([this, service_id]() {
MutexLock lock(&mutex_);
incoming_sockets_.erase(service_id);
});
l2cap_incoming_service_id_to_sockets_.insert(
{service_id, client_socket});
}
if (callback) {
callback(std::move(client_socket), service_id);
}
}
});
} else {
if (!server_socket.IsValid()) {
LOG(INFO)
<< "Failed to start accepting Ble L2CAP connections for service_id="
<< service_id;
return {Error(OperationResultCode::
CONNECTIVITY_L2CAP_SERVER_SOCKET_CREATION_FAILURE)};
}
int psm = server_socket.GetPSM();
// Mark the fact that there's an in-progress Ble server accepting
// connections.
auto owned_server_socket =
l2cap_server_sockets_.insert({service_id, std::move(server_socket)})
.first->second;
// Start the accept loop on a dedicated thread - this stays alive and
// listening for new incoming connections until StopAcceptingConnections()
// is invoked.
accept_loops_runner_.Execute(
"ble-l2cap-accept",
[this, service_id, callback = std::move(callback),
server_socket = std::move(owned_server_socket)]() mutable {
while (true) {
BleL2capSocket client_socket = server_socket.Accept();
if (!client_socket.IsValid()) {
LOG(WARNING) << "The client L2CAP socket to accept is invalid.";
server_socket.Close();
break;
} else {
LOG(INFO) << "The client L2CAP socket has been accepted.";
}
{
MutexLock lock(&mutex_);
client_socket.SetCloseNotifier([this, service_id]() {
MutexLock lock(&mutex_);
incoming_sockets_.erase(service_id);
});
l2cap_incoming_service_id_to_sockets_.insert(
{service_id, client_socket});
}
if (callback) {
callback(std::move(client_socket), service_id);
}
}
});
LOG(INFO) << "Start accepting Ble L2CAP connections for service_id="
<< service_id;
return {true};
return {psm};
}
bool BleV2::StopAcceptingConnections(const std::string& service_id) {
connections/implementation/mediums/ble_v2.h
+4 -3
View File
@@ -121,8 +121,7 @@ class BleV2 final {
// service UUID16 may be used to trigger a GATT connection to retrieve GATT
// characteristics for the Nearby service
// These alternate uuids are active until the next call to `StopScanning`.
void AddAlternateUuidForService(
uint16_t uuid, const std::string& service_id);
void AddAlternateUuidForService(uint16_t uuid, const std::string& service_id);
// Enables BLE scanning for a service ID. Will report any discoverable
// advertisement data through a callback.
@@ -163,7 +162,9 @@ class BleV2 final {
// Starts a worker thread, creates a Ble L2CAP socket, associates it with a
// service id.
ErrorOr<bool> StartAcceptingL2capConnections(
// Returns the PSM of the L2CAP channel on success, or an error code on
// failure.
ErrorOr<int> StartAcceptingL2capConnections(
const std::string& service_id,
AcceptedL2capConnectionCallback l2cap_callback)
ABSL_LOCKS_EXCLUDED(mutex_);
connections/implementation/p2p_cluster_pcp_handler.cc
+4 -3
View File
@@ -2737,6 +2737,9 @@ ErrorOr<Medium> P2pClusterPcpHandler::StartBleV2Advertising(
// Bluetooth Classic.
LOG(INFO) << "P2pClusterPcpHandler::StartBleV2Advertising: service_id="
<< service_id << " : start";
ErrorOr<int> ble_l2cap_result = 0;
if (!ble_v2_medium_.IsAcceptingConnections(service_id)) {
// TODO(b/380411884): Remove this check since we shouldn't enable radio by
// NC.
@@ -2750,7 +2753,6 @@ ErrorOr<Medium> P2pClusterPcpHandler::StartBleV2Advertising(
<< service_id;
return {Error(OperationResultCode::DEVICE_STATE_RADIO_ENABLING_FAILURE)};
}
ErrorOr<bool> ble_l2cap_result = true;
if (NearbyFlags::GetInstance().GetBoolFlag(
config_package_nearby::nearby_connections_feature::
kEnableBleL2cap)) {
@@ -2864,8 +2866,7 @@ ErrorOr<Medium> P2pClusterPcpHandler::StartBleV2Advertising(
// Try to read device name from local_endpoint_info.
std::optional<std::string> device_name =
advertisements::ReadDeviceName(local_endpoint_info);
// TODO(b/399740422): Get the real PSM from the L2CAP medium.
uint16_t psm = 0x11;
uint16_t psm = ble_l2cap_result.value();
if (device_name.has_value()) {
std::optional<advertisements::ble::DctAdvertisement> dct_advertisement =
advertisements::ble::DctAdvertisement::Create(