try fix

1 files changed, 6 insertions, 2 deletions

diff --git a/src/netapp.rs b/src/netapp.rs
index 8c0b50c..acaed62 100644
--- a/src/netapp.rs
+++ b/src/netapp.rs
@@ -24,7 +24,7 @@ use crate::proto::*;
 use crate::server::*;
 use crate::util::*;
 
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Debug)]
 pub(crate) struct HelloMessage {
 	pub server_addr: Option<IpAddr>,
 	pub server_port: u16,
@@ -243,13 +243,16 @@ impl NetApp {
 			.log_err("Failed to await for connection collector");
 	}
 
-	/// Drop all endpoint handlers
+	/// Drop all endpoint handlers, as well as handlers for connection/disconnection
+	/// events. (This disables the peering strategy)
 	///
 	/// Use this when terminating to break reference cycles
 	pub fn drop_all_handlers(&self) {
 		for (_, endpoint) in self.endpoints.read().unwrap().iter() {
 			endpoint.drop_handler();
 		}
+		self.on_connected_handler.store(None);
+		self.on_disconnected_handler.store(None);
 	}
 
 	/// Attempt to connect to a peer, given by its ip:port and its public key.
@@ -411,6 +414,7 @@ impl NetApp {
 #[async_trait]
 impl EndpointHandler<HelloMessage> for NetApp {
 	async fn handle(self: &Arc<Self>, msg: &HelloMessage, from: NodeID) {
+		debug!("Hello from {:?}: {:?}", hex::encode(from), msg);
 		if let Some(h) = self.on_connected_handler.load().as_ref() {
 			if let Some(c) = self.server_conns.read().unwrap().get(&from) {
 				let remote_ip = msg.server_addr.unwrap_or_else(|| c.remote_addr.ip());