Synchronet now requires the libarchive development package (e.g. libarchive-dev on Debian-based Linux distros, libarchive.org for more info) to build successfully.

Commit 47bb6691 authored by Rob Swindell's avatar Rob Swindell 💬
Browse files

Add support for "name@address" syntax in twitlist.cfg

where "address" is a QWKnet ID or path or a FidoNet originating address. Wildcards can be used (e.g. "*@VERT").

For Trikester.
parent d1705535
Pipeline #2466 passed with stage
in 14 minutes and 31 seconds
......@@ -1204,5 +1204,17 @@ bool sbbs_t::qwk_msg_filtered(smbmsg_t* msg, str_list_t ip_can, str_list_t host_
,msg->to);
return true;
}
if(msg->from_net.type != NET_NONE) {
char fidoaddr[64];
char str[128];
SAFEPRINTF2(str, "%s@%s", msg->from, smb_netaddrstr(&msg->from_net, fidoaddr));
if(findstr_in_list(str, twit_list)) {
lprintf(LOG_NOTICE,"!Filtering QWK message from '%s' to '%s'"
,str
,msg->to);
return true;
}
}
return false;
}
......@@ -3514,6 +3514,14 @@ int fmsgtosmsg(char* fbuf, fmsghdr_t* hdr, uint usernumber, uint subnum)
return IMPORT_FILTERED_EMPTY;
}
SAFEPRINTF2(str, "%s@%s", hdr->from, smb_faddrtoa(&origaddr, NULL));
if(findstr_in_list(str, twit_list)) {
lprintf(LOG_INFO,"Filtering message from %s to %s", str, hdr->to);
smb_freemsgmem(&msg);
free(sbody);
return IMPORT_FILTERED_TWIT;
}
if(!origaddr.zone && subnum==INVALID_SUB)
net=NET_NONE; /* Message from SBBSecho */
else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment