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

Add more log information during decrypting frame

Browse Source 
PiperOrigin-RevId: 748449749
This commit is contained in:
Guogang Li
2025-04-16 15:49:06 -07:00
committed by Copybara-Service
parent eeedf9f9c4
commit d0f014e0b4
4 changed files with 54 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/implementation/client_proxy.cc
+2 -1
View File
@@ -1033,7 +1033,8 @@ void ClientProxy::OnPayload(const std::string& endpoint_id, Payload payload) {
if (item != nullptr) {
NEARBY_LOGS(INFO) << "ClientProxy [reporting onPayloadReceived]: client="
<< GetClientId() << "; endpoint_id=" << endpoint_id
<< " ; payload_id=" << payload.GetId();
<< " ; payload {id:" << payload.GetId()
<< ", type:" << payload.GetType() << "}";
item->second.payload_cb(endpoint_id, std::move(payload));
}
}
connections/implementation/endpoint_manager.cc
+6 -2
View File
@@ -214,10 +214,14 @@ ExceptionOr<OfflineFrame> EndpointManager::TryDecryptFrame(
}
auto elapsed = SystemClock::ElapsedRealtime() - start_time;
if (elapsed > kDecryptRetryTimeout) {
LOG(WARNING) << "Can't decrypt the message. Timeout after " << elapsed;
LOG(WARNING) << "Can't decrypt the message with size = " << data.size()
<< " from "
<< location::nearby::proto::connections::Medium_Name(
endpoint_channel->GetMedium())
<< ". Timeout after " << elapsed;
return Exception::kTimeout;
}
SystemClock::Sleep(absl::Milliseconds(1));
SystemClock::Sleep(absl::Milliseconds(10));
}
}
connections/implementation/offline_service_controller.cc
+3 -3
View File
@@ -178,9 +178,9 @@ void OfflineServiceController::SendPayload(
Payload payload) {
if (stop_) return;
NEARBY_LOGS(INFO) << "Client " << client->GetClientId()
<< " is sending payload " << payload.GetId()
<< " to endpoint_ids {" << absl::StrJoin(endpoint_ids, ",")
<< "}";
<< " is sending payload {id:" << payload.GetId()
<< ", type:" << payload.GetType() << "} to endpoint_ids {"
<< absl::StrJoin(endpoint_ids, ",") << "}";
payload_manager_.SendPayload(client, endpoint_ids, std::move(payload));
}
connections/payload_type.h
+43
View File
@@ -15,16 +15,59 @@
#ifndef CORE_PAYLOAD_TYPE_H_
#define CORE_PAYLOAD_TYPE_H_
#include <ostream>
namespace nearby {
namespace connections {
enum class PayloadType { kUnknown = 0, kBytes = 1, kFile = 2, kStream = 3 };
enum class PayloadDirection {
UNKNOWN_DIRECTION_PAYLOAD = 0,
INCOMING_PAYLOAD = 1,
OUTGOING_PAYLOAD = 2,
};
inline std::ostream& operator<<(std::ostream& os, PayloadType payload_type) {
switch (payload_type) {
case PayloadType::kUnknown:
os << "kUnknown";
break;
case PayloadType::kBytes:
os << "kBytes";
break;
case PayloadType::kFile:
os << "kFile";
break;
case PayloadType::kStream:
os << "kStream";
break;
default:
os << "Invalid PayloadType";
break;
}
return os;
}
inline std::ostream& operator<<(std::ostream& os,
PayloadDirection payload_direction) {
switch (payload_direction) {
case PayloadDirection::UNKNOWN_DIRECTION_PAYLOAD:
os << "UNKNOWN_DIRECTION_PAYLOAD";
break;
case PayloadDirection::INCOMING_PAYLOAD:
os << "INCOMING_PAYLOAD";
break;
case PayloadDirection::OUTGOING_PAYLOAD:
os << "OUTGOING_PAYLOAD";
break;
default:
os << "Invalid PayloadDirection";
break;
}
return os;
}
} // namespace connections
} // namespace nearby