From e3b057f915e69fcedefd9f7c6bf50f5e7037abfb Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Thu, 3 Aug 2023 18:08:34 +0700 Subject: [PATCH] Ensure port is non zero in discovery --- .../src/bc_protocol/connection/discovery.rs | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/crates/core/src/bc_protocol/connection/discovery.rs b/crates/core/src/bc_protocol/connection/discovery.rs index e0f1c59..e015480 100644 --- a/crates/core/src/bc_protocol/connection/discovery.rs +++ b/crates/core/src/bc_protocol/connection/discovery.rs @@ -445,9 +445,18 @@ impl Discoverer { }), .. }, - } if (dev.as_ref().map(|d| !d.ip.is_empty()).unwrap_or(false) - || dmap.as_ref().map(|d| !d.ip.is_empty()).unwrap_or(false) - || relay.as_ref().map(|d| !d.ip.is_empty()).unwrap_or(false)) + } if (dev + .as_ref() + .map(|d| !d.ip.is_empty() && d.port > 0) + .unwrap_or(false) + || dmap + .as_ref() + .map(|d| !d.ip.is_empty() && d.port > 0) + .unwrap_or(false) + || relay + .as_ref() + .map(|d| !d.ip.is_empty() && d.port > 0) + .unwrap_or(false)) && rsp != -1 => { Some(Ok((sid, dev, dmap, relay))) @@ -466,9 +475,18 @@ impl Discoverer { }), .. }, - } if (dev.as_ref().map(|d| !d.ip.is_empty()).unwrap_or(false) - || dmap.as_ref().map(|d| !d.ip.is_empty()).unwrap_or(false) - || relay.as_ref().map(|d| !d.ip.is_empty()).unwrap_or(false)) + } if (dev + .as_ref() + .map(|d| !d.ip.is_empty() && d.port > 0) + .unwrap_or(false) + || dmap + .as_ref() + .map(|d| !d.ip.is_empty() && d.port > 0) + .unwrap_or(false) + || relay + .as_ref() + .map(|d| !d.ip.is_empty() && d.port > 0) + .unwrap_or(false)) && rsp == -1 => { Some(Err(Error::RegisterError))