From b9505c031c7ec18f55ef4ca6b210a8298ad9ba93 Mon Sep 17 00:00:00 2001
From: Christien Rioux <chris@veilid.org>
Date: Thu, 28 Sep 2023 12:52:49 -0400
Subject: [PATCH] xfer

---
 veilid-core/src/network_manager/native/discovery_context.rs | 4 +++-
 .../src/network_manager/native/network_class_discovery.rs   | 1 +
 veilid-core/src/routing_table/route_spec_store/mod.rs       | 6 +++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/veilid-core/src/network_manager/native/discovery_context.rs b/veilid-core/src/network_manager/native/discovery_context.rs
index 04101c70..81c5ea3c 100644
--- a/veilid-core/src/network_manager/native/discovery_context.rs
+++ b/veilid-core/src/network_manager/native/discovery_context.rs
@@ -244,7 +244,9 @@ impl DiscoveryContext {
             }
         }
         if external_address_infos.len() < 2 {
-            log_net!(debug "not enough peers responded with an external address");
+            log_net!(debug "not enough peers responded with an external address for type {:?}:{:?}",
+                protocol_type,
+                address_type);
             return false;
         }
 
diff --git a/veilid-core/src/network_manager/native/network_class_discovery.rs b/veilid-core/src/network_manager/native/network_class_discovery.rs
index 94db7ece..adcdb92d 100644
--- a/veilid-core/src/network_manager/native/network_class_discovery.rs
+++ b/veilid-core/src/network_manager/native/network_class_discovery.rs
@@ -22,6 +22,7 @@ impl Network {
 
                     editor.clear_dial_info_details(None, None);
                     editor.set_network_class(Some(NetworkClass::OutboundOnly));
+                    editor.clear_relay_node();
                     editor.commit(true).await;
                 }
             }
diff --git a/veilid-core/src/routing_table/route_spec_store/mod.rs b/veilid-core/src/routing_table/route_spec_store/mod.rs
index 9cee1340..93ecca12 100644
--- a/veilid-core/src/routing_table/route_spec_store/mod.rs
+++ b/veilid-core/src/routing_table/route_spec_store/mod.rs
@@ -1285,7 +1285,11 @@ impl RouteSpecStore {
 
         // Ensure our network class is valid before attempting to assemble any routes
         if !rti.has_valid_network_class(RoutingDomain::PublicInternet) {
-            bail!("can't make private routes until our node info is valid");
+            let peer_info = rti.get_own_peer_info(RoutingDomain::PublicInternet);
+            bail!(
+                "can't make private routes until our node info is valid: {:?}",
+                peer_info
+            );
         }
 
         // Make innermost route hop to our own node