Skip to content
Snippets Groups Projects
Commit 29a35642 authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

Blocked IP addresses in ip-silent.can weren't filtered from QWK and REP pkts

The "from_ip" header field of QWK messages is checked against blocked IP
addresses, but was only checking against IP addresses from ip.can, not any
addresses listed in ip-silent.can. These 2 list files are now merged together
for the purposes of filtering during QWK/REP packet import.
parent d84b8e3d
No related branches found
No related tags found
No related merge requests found
Pipeline #6598 passed
......@@ -137,6 +137,9 @@ bool sbbs_t::unpack_qwk(char *packet,uint hubnum)
msg_filters.host_can = trashcan_list(&cfg,"host");
msg_filters.subject_can = trashcan_list(&cfg,"subject");
msg_filters.twit_list = list_of_twits(&cfg);
str_list_t ip_silent_list = trashcan_list(&cfg, "ip-silent");
strListMerge(&msg_filters.ip_can, ip_silent_list);
strListFree(&ip_silent_list);
for(l=QWK_BLOCK_LEN;l<size;l+=blocks*QWK_BLOCK_LEN) {
if(terminated) {
......
......@@ -172,8 +172,10 @@ bool sbbs_t::unpack_rep(char* repfile)
msg_filters.ip_can = trashcan_list(&cfg,"ip");
msg_filters.host_can = trashcan_list(&cfg,"host");
msg_filters.subject_can = trashcan_list(&cfg,"subject");
msg_filters.twit_list = list_of_twits(&cfg);
str_list_t ip_silent_list = trashcan_list(&cfg, "ip-silent");
strListMerge(&msg_filters.ip_can, ip_silent_list);
strListFree(&ip_silent_list);
now=time(NULL);
for(l=QWK_BLOCK_LEN;l<size;l+=blocks*QWK_BLOCK_LEN) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment