From 88f4c8dd087cb96860fbbeddc661b3aa461a11c9 Mon Sep 17 00:00:00 2001
From: "Rob Swindell (on Windows 11)" <rob@synchro.net>
Date: Sun, 31 Dec 2023 16:43:02 -0800
Subject: [PATCH] Don't use wildcard node packet password (if one exists)
This also addresses the addresses with 65535 in them in the new debug-level
log messages "New packet (type x) created for linked-node" .
---
src/sbbs3/sbbsecho.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/sbbs3/sbbsecho.c b/src/sbbs3/sbbsecho.c
index ce36daa55e..2137542814 100644
--- a/src/sbbs3/sbbsecho.c
+++ b/src/sbbs3/sbbsecho.c
@@ -927,10 +927,15 @@ bool new_pkthdr(fpkthdr_t* hdr, fidoaddr_t orig, fidoaddr_t dest, const nodecfg_
if(nodecfg != NULL) {
pkt_type = nodecfg->pkt_type;
- if(nodecfg->pktpwd[0] != 0)
- strncpy((char*)hdr->type2.password, nodecfg->pktpwd, sizeof(hdr->type2.password));
- lprintf(LOG_DEBUG, "New %spacket (type %s) created for linked-node: %s"
- ,nodecfg->pktpwd[0] == '\0' ? "" : "password-protected ", pktTypeStringList[pkt_type], smb_faddrtoa(&nodecfg->addr, NULL));
+ if(faddr_contains_wildcard(&nodecfg->addr)) {
+ lprintf(LOG_DEBUG, "New packet (type %s) created for unlinked-node: %s matching wildcard pattern (%s)"
+ ,pktTypeStringList[pkt_type], smb_faddrtoa(&dest, NULL), faddrtoa(&nodecfg->addr));
+ } else {
+ if(nodecfg->pktpwd[0] != 0)
+ strncpy((char*)hdr->type2.password, nodecfg->pktpwd, sizeof(hdr->type2.password));
+ lprintf(LOG_DEBUG, "New %spacket (type %s) created for linked-node: %s"
+ ,nodecfg->pktpwd[0] == '\0' ? "" : "password-protected ", pktTypeStringList[pkt_type], smb_faddrtoa(&nodecfg->addr, NULL));
+ }
}
else
lprintf(LOG_DEBUG, "New packet (type %s) created for unlinked-node: %s", pktTypeStringList[pkt_type], smb_faddrtoa(&dest, NULL));
--
GitLab