liz/veilid
liz/veilid
1
0
Fork 0
Code Pull Requests Packages Releases Activity

eliminate race condition

Browse Source
This commit is contained in:
John Smith 2022-08-25 19:58:47 -04:00
parent f83e1d2680
commit 75094bb6be
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
veilid-core/src/rpc_processor/mod.rs
View File

@ -769,14 +769,6 @@ impl RPCProcessor {
Ok(NetworkResult::value(())) Ok(NetworkResult::value(()))
} }
async fn generate_sender_info(peer_noderef: NodeRef) -> SenderInfo {
let socket_address = peer_noderef
.last_connection()
.await
.map(|c| c.remote_address().clone());
SenderInfo { socket_address }
}
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#[instrument(level = "trace", skip(self, encoded_msg), err)] #[instrument(level = "trace", skip(self, encoded_msg), err)]
async fn process_rpc_message_version_0( async fn process_rpc_message_version_0(

9
veilid-core/src/rpc_processor/rpc_status.rs
View File

@ -84,7 +84,6 @@ impl RPCProcessor {
#[instrument(level = "trace", skip(self, msg), fields(msg.operation.op_id, res), err)] #[instrument(level = "trace", skip(self, msg), fields(msg.operation.op_id, res), err)]
pub(crate) async fn process_status_q(&self, msg: RPCMessage) -> Result<(), RPCError> { pub(crate) async fn process_status_q(&self, msg: RPCMessage) -> Result<(), RPCError> {
let peer_noderef = msg.header.peer_noderef.clone();
let connection_descriptor = msg.header.connection_descriptor; let connection_descriptor = msg.header.connection_descriptor;
// Get the question // Get the question
@ -106,11 +105,11 @@ impl RPCProcessor {
// Make status answer // Make status answer
let node_status = self.network_manager().generate_node_status(); let node_status = self.network_manager().generate_node_status();
// Filter the noderef down to the protocol used by the incoming connection
let filtered_peer_noderef =
peer_noderef.filtered_clone(connection_descriptor.make_dial_info_filter());
// Get the peer address in the returned sender info // Get the peer address in the returned sender info
let sender_info = Self::generate_sender_info(filtered_peer_noderef).await; let sender_info = SenderInfo {
socket_address: Some(*connection_descriptor.remote_address()),
};
let status_a = RPCOperationStatusA { let status_a = RPCOperationStatusA {
node_status, node_status,