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

added BUILD for nearby sharing client and fixed Wifi DIrect issues.

Browse Source
This commit is contained in:
kidfromjupiter
2026-02-01 06:03:04 +00:00
parent 0b2a8eca1e
commit d0c406dd7a
5 changed files with 63 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/platform/implementation/linux/utils.cc
+1 -1
View File
@@ -86,7 +86,7 @@ std::string RandSSID() {
"abcdefghijklmnopqrstuvwxyz"
"0123456789";
return absl::StrCat("DIRECT-", RandString(allowed_chars, 25));
return absl::StrCat("DIRECT-", RandString(allowed_chars, 24));
}
std::string RandWPAPassphrase() {
internal/platform/implementation/linux/utils_test.cc
+1 -1
View File
@@ -43,7 +43,7 @@ TEST(UtilsTests, GenNewUuid) {
TEST(UtilsTests, GenRandSSID) {
std::string ssid = RandSSID();
EXPECT_EQ(ssid.length(), 32);
EXPECT_EQ(ssid.length(), 31);
EXPECT_EQ(ssid.find("DIRECT-"), 0);
}
internal/platform/implementation/linux/wifi_direct.cc
+1
View File
@@ -121,6 +121,7 @@ bool NetworkManagerWifiDirectMedium::StartWifiDirect(
wifi_direct_credentials->SetSSID(hotspot_creds.GetSSID());
wifi_direct_credentials->SetPassword(hotspot_creds.GetPassword());
wifi_direct_credentials->SetFrequency(hotspot_creds.GetFrequency());
return true;
}
internal/platform/implementation/linux/wifi_hotspot.cc
+19
View File
@@ -21,6 +21,7 @@
#include "internal/platform/implementation/linux/dbus.h"
#include "internal/platform/implementation/linux/network_manager.h"
#include "internal/platform/implementation/linux/network_manager_access_point.h"
#include "internal/platform/implementation/linux/utils.h"
#include "internal/platform/implementation/linux/wifi_hotspot.h"
#include "internal/platform/implementation/linux/wifi_hotspot_server_socket.h"
@@ -199,6 +200,24 @@ bool NetworkManagerWifiHotspotMedium::StartWifiHotspot(
return false;
}
// Get the frequency of the active hotspot
try {
sdbus::ObjectPath active_ap_path = wireless_device_->ActiveAccessPoint();
if (!active_ap_path.empty()) {
auto access_point = NetworkManagerAccessPoint(*system_bus_, active_ap_path);
uint32_t frequency = access_point.Frequency();
hotspot_credentials->SetFrequency(static_cast<int>(frequency));
LOG(INFO) << __func__ << ": Hotspot frequency set to " << frequency
<< " MHz";
} else {
LOG(WARNING) << __func__
<< ": Could not get active access point to retrieve frequency";
}
} catch (const sdbus::Error &e) {
LOG(WARNING) << __func__ << ": Could not retrieve hotspot frequency: "
<< e.what();
}
LOG(INFO) << __func__ << ": Started a WiFi hotspot on device "
<< wireless_device_->getObjectPath() << " at "
<< active_conn->getObjectPath();
sharing/linux/BUILD
+41 -39
View File
@@ -19,47 +19,47 @@ cc_library(
srcs = [
"nearby_sharing_service_linux.cc",
"//sharing:nearby_sharing_service.cc",
"//sharing:nearby_sharing_settings.cc",
"//sharing:thread_timer.cc",
"//sharing:transfer_metadata.cc",
"//sharing:transfer_metadata_builder.cc",
'//sharing/certificates:nearby_share_certificate_manager.cc',
'//sharing/certificates:nearby_share_decrypted_public_certificate.cc',
'//sharing/certificates:nearby_share_encrypted_metadata_key.cc',
'//sharing/certificates:nearby_share_private_certificate.cc',
'//sharing/local_device_data:nearby_share_local_device_data_manager.cc',
'//sharing:nearby_sharing_settings.cc',
'//sharing/analytics:analytics_recorder.cc',
'//sharing:thread_timer.cc',
'//sharing/certificates:common.cc',
'//sharing/common:nearby_share_prefs.cc',
"//sharing/analytics:analytics_recorder.cc",
"//sharing/certificates:common.cc",
"//sharing/certificates:nearby_share_certificate_manager.cc",
"//sharing/certificates:nearby_share_decrypted_public_certificate.cc",
"//sharing/certificates:nearby_share_encrypted_metadata_key.cc",
"//sharing/certificates:nearby_share_private_certificate.cc",
"//sharing/common:nearby_share_prefs.cc",
"//sharing/local_device_data:nearby_share_local_device_data_manager.cc",
],
hdrs = [
"nearby_sharing_service_linux.h",
"//sharing:nearby_sharing_service.h",
"//sharing:nearby_sharing_settings.h",
"//sharing:share_target_discovered_callback.h",
"//sharing:thread_timer.h",
"//sharing:transfer_metadata.h",
"//sharing:transfer_metadata_builder.h",
'//sharing:nearby_sharing_service.h',
'//sharing/common:nearby_share_prefs.h',
'//sharing/certificates:nearby_share_certificate_manager.h',
'//sharing/certificates:nearby_share_decrypted_public_certificate.h',
'//sharing/certificates:nearby_share_encrypted_metadata_key.h',
'//sharing/certificates:nearby_share_private_certificate.h',
'//sharing/internal/api:private_certificate_data.h',
'//sharing/local_device_data:nearby_share_local_device_data_manager.h',
'//sharing:nearby_sharing_settings.h',
'//sharing/analytics:analytics_recorder.h',
'//sharing/analytics:analytics_device_settings.h',
'//sharing/analytics:analytics_information.h',
'//sharing/internal/api:preference_manager.h',
'//sharing/internal/public:context.h',
'//sharing/internal/public:pref_names.h',
'//sharing/internal/api:bluetooth_adapter.h',
'//sharing/internal/api:fast_initiation_manager.h',
'//sharing/internal/api:fast_init_ble_beacon.h',
'//sharing/internal/public:connectivity_manager.h',
'//sharing:thread_timer.h',
'//sharing:share_target_discovered_callback.h',
'//sharing:transfer_update_callback.h',
'//sharing/certificates:common.h',
'//sharing/certificates:constants.h',
"//sharing:transfer_update_callback.h",
"//sharing/analytics:analytics_device_settings.h",
"//sharing/analytics:analytics_information.h",
"//sharing/analytics:analytics_recorder.h",
"//sharing/certificates:common.h",
"//sharing/certificates:constants.h",
"//sharing/certificates:nearby_share_certificate_manager.h",
"//sharing/certificates:nearby_share_decrypted_public_certificate.h",
"//sharing/certificates:nearby_share_encrypted_metadata_key.h",
"//sharing/certificates:nearby_share_private_certificate.h",
"//sharing/common:nearby_share_prefs.h",
"//sharing/internal/api:bluetooth_adapter.h",
"//sharing/internal/api:fast_init_ble_beacon.h",
"//sharing/internal/api:fast_initiation_manager.h",
"//sharing/internal/api:preference_manager.h",
"//sharing/internal/api:private_certificate_data.h",
"//sharing/internal/public:connectivity_manager.h",
"//sharing/internal/public:context.h",
"//sharing/internal/public:pref_names.h",
"//sharing/local_device_data:nearby_share_local_device_data_manager.h",
],
visibility = ["//visibility:public"],
deps = [
@@ -69,10 +69,12 @@ cc_library(
"//internal/platform:comm",
"//internal/platform:types",
"//internal/platform/implementation:platform",
"//internal/platform/implementation/linux:linux",
"//internal/platform/implementation/linux",
"//internal/platform/implementation/linux:crypto",
"//sharing:attachments",
"//sharing:types",
"//sharing/proto:share_cc_proto",
"@boringssl//:crypto",
"@com_google_absl//absl/strings",
],
)
@@ -80,25 +82,25 @@ cc_library(
cc_binary(
name = "nearby_sharing_app",
srcs = ["nearby_sharing_app.cc"],
visibility = ["//visibility:public"],
deps = [
":nearby_sharing_service_linux",
"//internal/platform:base",
"//sharing:attachments",
"//sharing:types",
"//internal/platform:base",
"@com_google_absl//absl/strings",
],
visibility = ["//visibility:public"],
)
cc_binary(
name = "simple_example",
srcs = ["simple_example.cc"],
visibility = ["//visibility:public"],
deps = [
":nearby_sharing_service_linux",
"//internal/platform:base",
"//sharing:attachments",
"//sharing:types",
"//internal/platform:base",
"@com_google_absl//absl/strings",
],
visibility = ["//visibility:public"],
)