From 0cda1e1609bb73ff442d5446f1463e8adfe8d987 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Wed, 17 Nov 2004 21:10:05 +0000
Subject: [PATCH] Using smb_faddrtoa() and support new(er) NET_FIDO_ASCII net
type.
---
src/sbbs3/sbbsecho.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/sbbs3/sbbsecho.c b/src/sbbs3/sbbsecho.c
index 6441694f4a..525cd04846 100644
--- a/src/sbbs3/sbbsecho.c
+++ b/src/sbbs3/sbbsecho.c
@@ -1074,11 +1074,11 @@ void alter_config(faddr_t addr, char *old, char *new, int option)
if(option==1 && !strcmp(tmp,"AREAFIX")) { /* Change Password */
if(!*p)
continue;
- taddr=atofaddr(p);
+ taddr=smb_atofaddr(&sys_faddr,p);
if(!memcmp(&cfg.nodecfg[i].faddr,&taddr,sizeof(faddr_t))) {
- FIND_WHITESPACE(p); /* Skip over address */
+ FIND_WHITESPACE(p); /* Skip over address */
SKIP_WHITESPACE(p); /* Skip over whitespace */
- FIND_WHITESPACE(p); /* Skip over password */
+ FIND_WHITESPACE(p); /* Skip over password */
SKIP_WHITESPACE(p); /* Skip over whitespace */
fprintf(outfile,"%-10s %s %s %s\n",tmp
,smb_faddrtoa(&cfg.nodecfg[i].faddr,NULL),new,p);
@@ -3653,13 +3653,15 @@ void export_echomail(char *sub_code,faddr_t addr)
continue; } }
if((!addr.zone && !(misc&EXPORT_ALL)
- && msg.from_net.type==NET_FIDO)
+ && (msg.from_net.type==NET_FIDO || msg.from_net.type==NET_FIDO_ASCII))
|| !strnicmp(msg.subj,"NE:",3)) { /* no echo */
smb_unlockmsghdr(&smb[cur_smb],&msg);
smb_freemsgmem(&msg);
continue; } /* From a Fido node, ignore it */
- if(msg.from_net.type && msg.from_net.type!=NET_FIDO
+ if(msg.from_net.type!=NET_NONE
+ && msg.from_net.type!=NET_FIDO
+ && msg.from_net.type!=NET_FIDO_ASCII
&& !(scfg.sub[i]->misc&SUB_GATE)) {
smb_unlockmsghdr(&smb[cur_smb],&msg);
smb_freemsgmem(&msg);
--
GitLab