From 11c19d1bad312fefe032d3d9e39cc58204d1b079 Mon Sep 17 00:00:00 2001 From: Christien Rioux Date: Sat, 28 Oct 2023 17:46:26 -0400 Subject: [PATCH] wasm warnings --- veilid-core/src/network_manager/send_data.rs | 3 ++- veilid-core/src/network_manager/types/dial_info/mod.rs | 3 +++ veilid-core/src/network_manager/types/socket_address.rs | 1 + veilid-core/src/routing_table/bucket_entry.rs | 1 + veilid-core/src/routing_table/mod.rs | 3 +++ veilid-core/src/routing_table/routing_domain_editor.rs | 1 + veilid-core/src/routing_table/routing_domains.rs | 1 + veilid-core/src/routing_table/routing_table_inner.rs | 2 ++ veilid-core/src/rpc_processor/mod.rs | 1 + veilid-core/src/rpc_processor/rpc_validate_dial_info.rs | 1 + 10 files changed, 16 insertions(+), 1 deletion(-) diff --git a/veilid-core/src/network_manager/send_data.rs b/veilid-core/src/network_manager/send_data.rs index c90add8f..a00c06ec 100644 --- a/veilid-core/src/network_manager/send_data.rs +++ b/veilid-core/src/network_manager/send_data.rs @@ -9,7 +9,8 @@ impl NetworkManager { /// in this case, if it matches the node ref's filters and no more permissive connection /// could be established. /// - /// Sending to a node requires determining a NetworkClass compatible mechanism + /// Sending to a node requires determining a NetworkClass compatible contact method + /// between the source and destination node pub(crate) fn send_data( &self, destination_node_ref: NodeRef, diff --git a/veilid-core/src/network_manager/types/dial_info/mod.rs b/veilid-core/src/network_manager/types/dial_info/mod.rs index 4e948f5e..60032b9f 100644 --- a/veilid-core/src/network_manager/types/dial_info/mod.rs +++ b/veilid-core/src/network_manager/types/dial_info/mod.rs @@ -259,6 +259,7 @@ impl DialInfo { Self::WSS(di) => di.socket_address.ip_addr(), } } + #[cfg_attr(target_arch = "wasm32", allow(dead_code))] pub fn port(&self) -> u16 { match self { Self::UDP(di) => di.socket_address.port(), @@ -267,6 +268,7 @@ impl DialInfo { Self::WSS(di) => di.socket_address.port(), } } + #[cfg_attr(target_arch = "wasm32", allow(dead_code))] pub fn set_port(&mut self, port: u16) { match self { Self::UDP(di) => di.socket_address.set_port(port), @@ -275,6 +277,7 @@ impl DialInfo { Self::WSS(di) => di.socket_address.set_port(port), } } + #[cfg_attr(target_arch = "wasm32", allow(dead_code))] pub fn to_socket_addr(&self) -> SocketAddr { match self { Self::UDP(di) => di.socket_address.socket_addr(), diff --git a/veilid-core/src/network_manager/types/socket_address.rs b/veilid-core/src/network_manager/types/socket_address.rs index ad30bbdf..097023cc 100644 --- a/veilid-core/src/network_manager/types/socket_address.rs +++ b/veilid-core/src/network_manager/types/socket_address.rs @@ -30,6 +30,7 @@ impl SocketAddress { pub fn port(&self) -> u16 { self.port } + #[cfg_attr(target_arch = "wasm32", allow(dead_code))] pub fn set_port(&mut self, port: u16) { self.port = port } diff --git a/veilid-core/src/routing_table/bucket_entry.rs b/veilid-core/src/routing_table/bucket_entry.rs index 02a33d86..c6fbcb47 100644 --- a/veilid-core/src/routing_table/bucket_entry.rs +++ b/veilid-core/src/routing_table/bucket_entry.rs @@ -240,6 +240,7 @@ impl BucketEntryInner { move |e1, e2| Self::cmp_fastest_reliable(cur_ts, e1, e2) } + #[cfg_attr(target_arch = "wasm32", allow(dead_code))] pub fn clear_signed_node_info(&mut self, routing_domain: RoutingDomain) { // Get the correct signed_node_info for the chosen routing domain let opt_current_sni = match routing_domain { diff --git a/veilid-core/src/routing_table/mod.rs b/veilid-core/src/routing_table/mod.rs index da54619b..9770d51b 100644 --- a/veilid-core/src/routing_table/mod.rs +++ b/veilid-core/src/routing_table/mod.rs @@ -461,6 +461,7 @@ impl RoutingTable { } /// Set up the local network routing domain with our local routing table configuration + #[cfg_attr(target_arch = "wasm32", allow(dead_code))] pub fn configure_local_network_routing_domain(&self, local_networks: Vec<(IpAddr, IpAddr)>) { log_net!(debug "configure_local_network_routing_domain: {:#?}", local_networks); self.inner @@ -501,6 +502,7 @@ impl RoutingTable { .all_filtered_dial_info_details(routing_domain_set, filter) } + #[cfg_attr(target_arch = "wasm32", allow(dead_code))] pub fn ensure_dial_info_is_valid(&self, domain: RoutingDomain, dial_info: &DialInfo) -> bool { self.inner .read() @@ -755,6 +757,7 @@ impl RoutingTable { } /// Makes a filter that finds nodes with a matching inbound dialinfo + #[cfg_attr(target_arch = "wasm32", allow(dead_code))] pub fn make_inbound_dial_info_entry_filter<'a>( routing_domain: RoutingDomain, dial_info_filter: DialInfoFilter, diff --git a/veilid-core/src/routing_table/routing_domain_editor.rs b/veilid-core/src/routing_table/routing_domain_editor.rs index 90a052fb..d5ff715f 100644 --- a/veilid-core/src/routing_table/routing_domain_editor.rs +++ b/veilid-core/src/routing_table/routing_domain_editor.rs @@ -13,6 +13,7 @@ enum RoutingDomainChange { SetRelayNodeKeepalive { ts: Option, }, + #[cfg_attr(target_arch = "wasm32", allow(dead_code))] AddDialInfoDetail { dial_info_detail: DialInfoDetail, }, diff --git a/veilid-core/src/routing_table/routing_domains.rs b/veilid-core/src/routing_table/routing_domains.rs index ae5f0ed7..10df7502 100644 --- a/veilid-core/src/routing_table/routing_domains.rs +++ b/veilid-core/src/routing_table/routing_domains.rs @@ -536,6 +536,7 @@ impl Default for LocalNetworkRoutingDomainDetail { } impl LocalNetworkRoutingDomainDetail { + #[cfg_attr(target_arch = "wasm32", allow(dead_code))] pub fn set_local_networks(&mut self, mut local_networks: Vec<(IpAddr, IpAddr)>) -> bool { local_networks.sort(); if local_networks == self.local_networks { diff --git a/veilid-core/src/routing_table/routing_table_inner.rs b/veilid-core/src/routing_table/routing_table_inner.rs index 4ab370cf..e8663703 100644 --- a/veilid-core/src/routing_table/routing_table_inner.rs +++ b/veilid-core/src/routing_table/routing_table_inner.rs @@ -111,6 +111,7 @@ impl RoutingTableInner { self.with_routing_domain(domain, |rd| rd.common().dial_info_details().clone()) } + #[cfg_attr(target_arch = "wasm32", allow(dead_code))] pub fn first_filtered_dial_info_detail( &self, routing_domain_set: RoutingDomainSet, @@ -323,6 +324,7 @@ impl RoutingTableInner { } } + #[cfg_attr(target_arch = "wasm32", allow(dead_code))] pub fn configure_local_network_routing_domain( &mut self, local_networks: Vec<(IpAddr, IpAddr)>, diff --git a/veilid-core/src/rpc_processor/mod.rs b/veilid-core/src/rpc_processor/mod.rs index dbcd637a..288d1167 100644 --- a/veilid-core/src/rpc_processor/mod.rs +++ b/veilid-core/src/rpc_processor/mod.rs @@ -279,6 +279,7 @@ struct RPCProcessorUnlockedInner { queue_size: u32, concurrency: u32, max_route_hop_count: usize, + #[cfg_attr(target_arch = "wasm32", allow(dead_code))] validate_dial_info_receipt_time_ms: u32, update_callback: UpdateCallback, waiting_rpc_table: OperationWaiter>, diff --git a/veilid-core/src/rpc_processor/rpc_validate_dial_info.rs b/veilid-core/src/rpc_processor/rpc_validate_dial_info.rs index db5e8ef2..44e16711 100644 --- a/veilid-core/src/rpc_processor/rpc_validate_dial_info.rs +++ b/veilid-core/src/rpc_processor/rpc_validate_dial_info.rs @@ -6,6 +6,7 @@ impl RPCProcessor { feature = "verbose-tracing", instrument(level = "trace", skip(self), ret, err) )] + #[cfg_attr(target_arch = "wasm32", allow(dead_code))] pub async fn rpc_call_validate_dial_info( self, peer: NodeRef,