refactor get_contact_method

2022-10-12 22:53:40 -04:00
parent a06c2fb5a3
commit 2d526674a5
8 changed files with 424 additions and 222 deletions
--- a/veilid-core/src/veilid_api/debug.rs
+++ b/veilid-core/src/veilid_api/debug.rs
@@ -341,7 +341,9 @@ impl VeilidAPI {
            nr.merge_filter(NodeRefFilter::new().with_routing_domain(routing_domain))
        }

-        let cm = network_manager.get_contact_method(nr);
+        let cm = routing_table
+            .get_node_contact_method(nr)
+            .map_err(VeilidAPIError::internal)?;

        Ok(format!("{:#?}", cm))
    }
--- a/veilid-core/src/veilid_api/mod.rs
+++ b/veilid-core/src/veilid_api/mod.rs
@@ -926,7 +926,7 @@ impl FromStr for SocketAddress {

 //////////////////////////////////////////////////////////////////

-#[derive(Clone, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub struct DialInfoFilter {
    pub protocol_type_set: ProtocolTypeSet,
    pub address_type_set: AddressTypeSet,