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

Switch ConnectionOptions to use MacAddress class.

Browse Source 
PiperOrigin-RevId: 802210252
This commit is contained in:
Francis Tsui
2025-09-02 10:56:48 -07:00
committed by Copybara-Service
parent c4d770bb27
commit 77ce859862
9 changed files with 46 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/implementation/base_pcp_handler.cc
+12 -22
View File
@@ -859,19 +859,14 @@ Status BasePcpHandler::RequestConnection(
return;
}
MacAddress remote_bluetooth_mac_address;
MacAddress::FromBytes(
absl::MakeSpan(
reinterpret_cast<const uint8_t*>(
connection_options.remote_bluetooth_mac_address.data()),
connection_options.remote_bluetooth_mac_address.size()),
remote_bluetooth_mac_address);
if (remote_bluetooth_mac_address.IsSet()) {
if (connection_options.remote_bluetooth_mac_address.IsSet()) {
if (AppendRemoteBluetoothMacAddressEndpoint(
endpoint_id, remote_bluetooth_mac_address,
endpoint_id, connection_options.remote_bluetooth_mac_address,
client->GetDiscoveryOptions()))
LOG(INFO) << "Appended remote Bluetooth MAC Address endpoint ["
<< remote_bluetooth_mac_address.ToString() << "]";
LOG(INFO)
<< "Appended remote Bluetooth MAC Address endpoint ["
<< connection_options.remote_bluetooth_mac_address.ToString()
<< "]";
}
if (AppendWebRTCEndpoint(endpoint_id, client->GetDiscoveryOptions()))
@@ -1004,19 +999,14 @@ Status BasePcpHandler::RequestConnectionV3(
return;
}
MacAddress remote_bluetooth_mac_address;
MacAddress::FromBytes(
absl::MakeSpan(
reinterpret_cast<const uint8_t*>(
connection_options.remote_bluetooth_mac_address.data()),
connection_options.remote_bluetooth_mac_address.size()),
remote_bluetooth_mac_address);
if (remote_bluetooth_mac_address.IsSet()) {
if (connection_options.remote_bluetooth_mac_address.IsSet()) {
if (AppendRemoteBluetoothMacAddressEndpoint(
endpoint_id, remote_bluetooth_mac_address,
endpoint_id, connection_options.remote_bluetooth_mac_address,
client->GetDiscoveryOptions()))
LOG(INFO) << "Appended remote Bluetooth MAC Address endpoint ["
<< remote_bluetooth_mac_address.ToString() << "]";
LOG(INFO)
<< "Appended remote Bluetooth MAC Address endpoint ["
<< connection_options.remote_bluetooth_mac_address.ToString()
<< "]";
}
if (AppendWebRTCEndpoint(endpoint_id, client->GetDiscoveryOptions()))
connections/implementation/base_pcp_handler_test.cc
+8 -7
View File
@@ -63,6 +63,7 @@
#include "internal/platform/future.h"
#include "internal/platform/input_stream.h"
#include "internal/platform/logging.h"
#include "internal/platform/mac_address.h"
#include "internal/platform/medium_environment.h"
#include "internal/platform/output_stream.h"
#include "internal/platform/pipe.h"
@@ -433,6 +434,7 @@ class BasePcpHandlerTest
NearbyFlags::GetInstance().OverrideBoolFlagValue(
config_package_nearby::nearby_connections_feature::kEnableInstantOnLost,
false);
MacAddress::FromString("12:34:56:78:9a:bc", remote_mac_address_);
}
void StartAdvertising(ClientProxy* client, MockPcpHandler* pcp_handler,
@@ -626,8 +628,7 @@ class BasePcpHandlerTest
.listener = connection_listener_,
};
ConnectionOptions connection_options{
.remote_bluetooth_mac_address =
ByteArray{std::string("\x12\x34\x56\x78\x9a\xbc")},
.remote_bluetooth_mac_address = remote_mac_address_,
.keep_alive_interval_millis =
FeatureFlags::GetInstance().GetFlags().keep_alive_interval_millis,
.keep_alive_timeout_millis =
@@ -700,7 +701,7 @@ class BasePcpHandlerTest
.listener = connection_listener_,
};
ConnectionOptions connection_options{
.remote_bluetooth_mac_address = ByteArray{"\x12\x34\x56\x78\x9a\xbc"},
.remote_bluetooth_mac_address = remote_mac_address_,
.keep_alive_interval_millis =
FeatureFlags::GetInstance().GetFlags().keep_alive_interval_millis,
.keep_alive_timeout_millis =
@@ -775,8 +776,7 @@ class BasePcpHandlerTest
.listener = connection_listener_,
};
ConnectionOptions connection_options{
.remote_bluetooth_mac_address =
ByteArray{std::string("\x12\x34\x56\x78\x9a\xbc")},
.remote_bluetooth_mac_address = remote_mac_address_,
.keep_alive_interval_millis =
FeatureFlags::GetInstance().GetFlags().keep_alive_interval_millis,
.keep_alive_timeout_millis =
@@ -878,6 +878,7 @@ class BasePcpHandlerTest
SetSafeToDisconnect set_safe_to_disconnect_{true};
MediumEnvironment& env_ = MediumEnvironment::Instance();
NiceMock<MockNearbyDevice> mock_device_;
MacAddress remote_mac_address_;
};
TEST_P(BasePcpHandlerTest, ConstructorDestructorWorks) {
@@ -1323,7 +1324,7 @@ TEST_P(BasePcpHandlerTest, RequestConnectionV3_ConnectImplFailure) {
.listener = connection_listener_,
};
ConnectionOptions connection_options{
.remote_bluetooth_mac_address = ByteArray{"\x12\x34\x56\x78\x9a\xbc"},
.remote_bluetooth_mac_address = remote_mac_address_,
.keep_alive_interval_millis =
FeatureFlags::GetInstance().GetFlags().keep_alive_interval_millis,
.keep_alive_timeout_millis =
@@ -1399,7 +1400,7 @@ TEST_P(BasePcpHandlerTest, RequestConnection_ConnectImplFailure) {
.listener = connection_listener_,
};
ConnectionOptions connection_options{
.remote_bluetooth_mac_address = ByteArray{"\x12\x34\x56\x78\x9a\xbc"},
.remote_bluetooth_mac_address = remote_mac_address_,
.keep_alive_interval_millis =
FeatureFlags::GetInstance().GetFlags().keep_alive_interval_millis,
.keep_alive_timeout_millis =