Skip to content
Snippets Groups Projects
Commit 0cda1e16 authored by rswindell's avatar rswindell
Browse files

Using smb_faddrtoa() and support new(er) NET_FIDO_ASCII net type.

parent d676d34d
No related branches found
No related tags found
No related merge requests found
...@@ -1074,11 +1074,11 @@ void alter_config(faddr_t addr, char *old, char *new, int option) ...@@ -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(option==1 && !strcmp(tmp,"AREAFIX")) { /* Change Password */
if(!*p) if(!*p)
continue; continue;
taddr=atofaddr(p); taddr=smb_atofaddr(&sys_faddr,p);
if(!memcmp(&cfg.nodecfg[i].faddr,&taddr,sizeof(faddr_t))) { 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 */ SKIP_WHITESPACE(p); /* Skip over whitespace */
FIND_WHITESPACE(p); /* Skip over password */ FIND_WHITESPACE(p); /* Skip over password */
SKIP_WHITESPACE(p); /* Skip over whitespace */ SKIP_WHITESPACE(p); /* Skip over whitespace */
fprintf(outfile,"%-10s %s %s %s\n",tmp fprintf(outfile,"%-10s %s %s %s\n",tmp
,smb_faddrtoa(&cfg.nodecfg[i].faddr,NULL),new,p); ,smb_faddrtoa(&cfg.nodecfg[i].faddr,NULL),new,p);
...@@ -3653,13 +3653,15 @@ void export_echomail(char *sub_code,faddr_t addr) ...@@ -3653,13 +3653,15 @@ void export_echomail(char *sub_code,faddr_t addr)
continue; } } continue; } }
if((!addr.zone && !(misc&EXPORT_ALL) 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 */ || !strnicmp(msg.subj,"NE:",3)) { /* no echo */
smb_unlockmsghdr(&smb[cur_smb],&msg); smb_unlockmsghdr(&smb[cur_smb],&msg);
smb_freemsgmem(&msg); smb_freemsgmem(&msg);
continue; } /* From a Fido node, ignore it */ 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)) { && !(scfg.sub[i]->misc&SUB_GATE)) {
smb_unlockmsghdr(&smb[cur_smb],&msg); smb_unlockmsghdr(&smb[cur_smb],&msg);
smb_freemsgmem(&msg); smb_freemsgmem(&msg);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment