From c1d5659a9ac9fecd2847ad0a0874f7edf258ade5 Mon Sep 17 00:00:00 2001 From: Gisle Vanem Date: Sat, 18 Jan 2025 11:56:58 +0100 Subject: [PATCH] EDROP.txt file was removed from SpamHaus. --- CI/appveyor-script.bat | 2 - README.md | 1 - drop.txt | 169 ++++++++++++++++++++++++----------------- dropv6.txt | 10 +-- edrop.txt | 6 -- src/dnsbl.c | 46 ++--------- wsock_trace | 2 - 7 files changed, 112 insertions(+), 124 deletions(-) delete mode 100644 edrop.txt diff --git a/CI/appveyor-script.bat b/CI/appveyor-script.bat index 680a21f..17bae7e 100644 --- a/CI/appveyor-script.bat +++ b/CI/appveyor-script.bat @@ -127,10 +127,8 @@ echo [dnsbl] >> echo enable = 1 >> wsock_trace.appveyor echo max_days = 1 >> wsock_trace.appveyor echo drop_file = %CD%\DROP.txt >> wsock_trace.appveyor -echo edrop_file = %CD%\EDROP.txt >> wsock_trace.appveyor echo dropv6_file = %CD%\DROPv6.txt >> wsock_trace.appveyor echo drop_url = http://www.spamhaus.org/drop/drop.txt >> wsock_trace.appveyor -echo edrop_url = http://www.spamhaus.org/drop/edrop.txt >> wsock_trace.appveyor echo dropv6_url = http://www.spamhaus.org/drop/dropv6.txt >> wsock_trace.appveyor echo [firewall] >> wsock_trace.appveyor diff --git a/README.md b/README.md index df8a648..b66c1ce 100644 --- a/README.md +++ b/README.md @@ -158,7 +158,6 @@ to your `%APPDATA%` directory: IPv4-address-space.csv IPv6-unicast-address-assignments.csv DROP.txt - EDROP.txt DROPv6.txt IPFire-database.db ``` diff --git a/drop.txt b/drop.txt index 8aad177..d36038d 100644 --- a/drop.txt +++ b/drop.txt @@ -1,13 +1,12 @@ -; Spamhaus DROP List 2024/10/17 - (c) 2024 The Spamhaus Project SLU +; Spamhaus DROP List 2025/01/17 - (c) 2025 The Spamhaus Project SLU ; https://www.spamhaus.org/drop/drop.txt -; Last-Modified: Thu, 17 Oct 2024 15:41:48 GMT -; Expires: Thu, 17 Oct 2024 17:22:39 GMT +; Last-Modified: Fri, 17 Jan 2025 17:03:47 GMT +; Expires: Fri, 17 Jan 2025 18:07:54 GMT 1.10.16.0/20 ; SBL256894 1.19.0.0/16 ; SBL434604 1.32.128.0/18 ; SBL286275 2.56.192.0/22 ; SBL459831 2.57.122.0/24 ; SBL636050 -2.57.149.0/24 ; SBL636508 2.57.168.0/24 ; SBL628448 2.57.232.0/23 ; SBL538946 2.57.234.0/23 ; SBL538947 @@ -16,14 +15,14 @@ 5.105.220.0/24 ; SBL627956 5.134.128.0/19 ; SBL270738 5.182.112.0/24 ; SBL654749 -5.182.210.0/24 ; SBL613252 -5.182.211.0/24 ; SBL610601 5.183.60.0/22 ; SBL463004 5.188.10.0/23 ; SBL402741 5.188.11.0/24 ; SBL402809 5.188.236.0/23 ; SBL544034 +14.128.32.0/20 ; SBL657011 14.152.94.0/24 ; SBL656012 23.129.252.0/23 ; SBL630797 +23.228.118.0/24 ; SBL664694 24.137.16.0/20 ; SBL502541 24.170.208.0/20 ; SBL502917 24.233.0.0/19 ; SBL210084 @@ -35,6 +34,7 @@ 27.124.41.0/24 ; SBL613196 27.126.160.0/20 ; SBL257064 27.146.0.0/16 ; SBL326434 +31.13.224.0/24 ; SBL663951 31.24.81.0/24 ; SBL618812 31.41.244.0/24 ; SBL610672 31.210.20.0/24 ; SBL545365 @@ -45,13 +45,11 @@ 36.116.0.0/16 ; SBL303895 36.119.0.0/16 ; SBL303894 36.255.236.0/22 ; SBL395332 -37.9.4.0/24 ; SBL657368 37.77.144.0/24 ; SBL625432 37.140.251.0/24 ; SBL618815 37.156.64.0/23 ; SBL493556 37.156.173.0/24 ; SBL493557 37.220.87.0/24 ; SBL618895 -38.87.148.0/22 ; SBL656119 38.200.178.0/23 ; SBL620300 41.71.128.0/17 ; SBL647149 41.71.139.0/24 ; SBL652385 @@ -77,7 +75,7 @@ 43.236.0.0/16 ; SBL240624 43.248.40.0/22 ; SBL287975 43.250.116.0/22 ; SBL240942 -45.9.148.0/22 ; SBL640911 +45.9.156.0/24 ; SBL668925 45.9.168.0/24 ; SBL655464 45.14.226.0/24 ; SBL631682 45.65.32.0/22 ; SBL462997 @@ -104,12 +102,12 @@ 45.135.232.0/24 ; SBL634456 45.137.20.0/22 ; SBL654989 45.139.104.0/24 ; SBL636771 -45.139.105.0/24 ; SBL595652 45.140.17.0/24 ; SBL634459 45.141.56.0/24 ; SBL635065 45.141.58.0/23 ; SBL632422 45.141.87.0/24 ; SBL656496 45.142.155.0/24 ; SBL640405 +45.142.193.0/24 ; SBL671783 45.143.201.0/24 ; SBL625748 45.143.252.0/22 ; SBL623840 45.145.176.0/22 ; SBL639689 @@ -117,6 +115,7 @@ 45.148.121.0/24 ; SBL520237 45.148.123.0/24 ; SBL656497 45.148.148.0/22 ; SBL619746 +45.149.241.0/24 ; SBL663952 45.150.180.0/22 ; SBL626269 45.176.184.0/22 ; SBL624751 45.186.152.0/22 ; SBL540824 @@ -124,17 +123,16 @@ 45.200.148.0/23 ; SBL657027 45.202.32.0/22 ; SBL656002 46.21.16.0/21 ; SBL635788 -46.21.28.0/24 ; SBL634449 46.21.31.0/24 ; SBL635790 46.148.112.0/24 ; SBL394634 46.148.120.0/24 ; SBL394635 46.148.127.0/24 ; SBL394636 +46.173.214.0/24 ; SBL664170 46.173.218.0/24 ; SBL608382 46.173.219.0/24 ; SBL548705 46.173.223.0/24 ; SBL548850 46.173.240.0/20 ; SBL266465 46.174.204.0/22 ; SBL463014 -46.183.223.0/24 ; SBL653976 46.232.0.0/24 ; SBL619558 49.88.112.0/24 ; SBL619151 49.89.240.0/22 ; SBL641952 @@ -146,11 +144,11 @@ 60.233.0.0/16 ; SBL266791 61.11.224.0/19 ; SBL221384 61.45.251.0/24 ; SBL209995 -61.111.129.0/24 ; SBL602621 61.177.172.0/23 ; SBL618060 62.60.186.0/24 ; SBL656005 62.60.188.0/22 ; SBL657458 62.60.224.0/24 ; SBL654928 +62.60.226.0/24 ; SBL671779 62.112.16.0/21 ; SBL237227 62.122.184.0/24 ; SBL636082 62.204.41.0/24 ; SBL617789 @@ -160,19 +158,26 @@ 63.106.68.0/22 ; SBL624888 64.15.0.0/20 ; SBL530365 64.92.224.0/20 ; SBL503523 +64.116.200.0/21 ; SBL635859 64.137.39.0/24 ; SBL620067 64.250.144.0/20 ; SBL502906 64.254.80.0/20 ; SBL546729 65.205.64.0/22 ; SBL623899 65.216.208.0/21 ; SBL623885 66.54.232.0/22 ; SBL630033 +66.63.187.0/24 ; SBL664720 66.227.20.0/24 ; SBL622859 66.227.21.0/24 ; SBL622866 66.227.29.0/24 ; SBL622860 66.227.31.0/24 ; SBL622867 +66.238.42.0/23 ; SBL673039 +66.238.44.0/24 ; SBL673040 +66.238.76.0/22 ; SBL673041 +67.107.196.0/22 ; SBL664671 67.213.112.0/20 ; SBL287739 67.219.208.0/20 ; SBL634338 69.8.96.0/20 ; SBL503524 +69.36.44.0/24 ; SBL669055 72.46.24.0/22 ; SBL542446 74.80.191.0/24 ; SBL622026 74.114.148.0/22 ; SBL288405 @@ -185,15 +190,18 @@ 77.90.185.0/24 ; SBL654925 77.91.76.0/24 ; SBL639582 77.105.163.0/24 ; SBL640800 +77.220.92.0/24 ; SBL664727 +77.220.93.0/24 ; SBL664728 +77.220.94.0/24 ; SBL664729 78.40.143.0/24 ; SBL627920 79.110.22.0/24 ; SBL394646 79.110.49.0/24 ; SBL649873 -79.110.62.0/24 ; SBL617990 79.137.192.0/24 ; SBL618893 80.64.30.0/24 ; SBL654066 80.66.75.0/24 ; SBL619693 80.66.77.0/24 ; SBL622840 80.76.49.0/24 ; SBL648229 +80.76.51.0/24 ; SBL663953 80.94.92.0/24 ; SBL636056 80.94.95.0/24 ; SBL620743 80.208.192.0/20 ; SBL594333 @@ -201,16 +209,15 @@ 81.94.150.0/24 ; SBL639765 81.94.159.0/24 ; SBL639846 81.161.230.0/24 ; SBL638353 +81.161.238.0/24 ; SBL663954 82.115.223.0/24 ; SBL654081 82.135.156.0/23 ; SBL619774 82.135.228.0/22 ; SBL496439 83.97.73.0/24 ; SBL640079 -83.137.153.0/24 ; SBL654750 -83.137.156.0/24 ; SBL642395 83.175.0.0/18 ; SBL241020 83.218.218.0/24 ; SBL528002 83.222.190.0/23 ; SBL654966 -84.238.160.0/22 ; SBL339089 +85.31.47.0/24 ; SBL663955 85.114.120.0/21 ; SBL639443 85.121.39.0/24 ; SBL111502 85.158.148.0/24 ; SBL619554 @@ -218,7 +225,6 @@ 85.158.151.0/24 ; SBL618383 85.203.26.0/24 ; SBL635066 85.209.11.0/24 ; SBL636083 -85.209.133.0/24 ; SBL646256 86.104.195.0/24 ; SBL625429 86.104.222.0/23 ; SBL461195 86.104.224.0/23 ; SBL461196 @@ -248,14 +254,19 @@ 86.107.72.0/24 ; SBL493628 86.107.193.0/24 ; SBL493629 86.107.194.0/23 ; SBL493630 -87.120.84.0/24 ; SBL639585 -87.121.105.0/24 ; SBL643133 +87.120.93.0/24 ; SBL671784 +87.120.112.0/22 ; SBL664735 +87.120.116.0/23 ; SBL664736 +87.120.120.0/23 ; SBL663946 +87.120.125.0/24 ; SBL664738 +87.120.126.0/23 ; SBL664739 +87.121.86.0/24 ; SBL663956 +87.229.14.0/24 ; SBL656243 87.229.22.0/24 ; SBL649945 -87.229.70.0/24 ; SBL649944 87.229.110.0/24 ; SBL642520 -87.246.7.0/24 ; SBL489408 87.247.158.0/23 ; SBL636084 87.251.79.0/24 ; SBL654217 +88.209.228.0/24 ; SBL656234 89.32.43.0/24 ; SBL493631 89.32.170.0/24 ; SBL493632 89.32.202.0/24 ; SBL493882 @@ -302,11 +313,8 @@ 89.45.82.0/24 ; SBL493676 89.46.47.0/24 ; SBL493677 89.190.156.0/24 ; SBL635688 -91.92.240.0/20 ; SBL636229 91.109.176.0/20 ; SBL547173 -91.132.164.0/22 ; SBL494323 91.194.192.0/22 ; SBL618502 -91.200.12.0/22 ; SBL190623 91.200.81.0/24 ; SBL394648 91.200.83.0/24 ; SBL394650 91.200.133.0/24 ; SBL494045 @@ -346,20 +354,20 @@ 93.119.120.0/23 ; SBL493682 93.123.39.0/24 ; SBL657473 93.123.85.0/24 ; SBL637219 +93.123.109.0/24 ; SBL663960 +94.103.125.0/24 ; SBL663961 94.131.220.0/24 ; SBL619745 94.131.221.0/24 ; SBL454135 94.131.228.0/22 ; SBL504860 -94.141.120.0/24 ; SBL655096 94.154.35.0/24 ; SBL653866 -94.156.64.0/21 ; SBL636230 -94.156.78.0/24 ; SBL652286 94.156.104.0/23 ; SBL657476 94.156.166.0/23 ; SBL657477 94.156.177.0/24 ; SBL656499 +94.156.227.0/24 ; SBL664722 95.138.194.0/23 ; SBL649943 95.161.128.0/24 ; SBL562112 95.161.128.0/23 ; SBL579025 -95.214.27.0/24 ; SBL656045 +95.164.117.0/24 ; SBL669562 98.98.195.0/24 ; SBL656003 101.99.92.0/24 ; SBL630248 101.99.95.0/24 ; SBL629939 @@ -367,7 +375,7 @@ 101.203.128.0/19 ; SBL257142 101.248.0.0/15 ; SBL204948 102.211.56.0/22 ; SBL638491 -102.221.75.0/24 ; SBL631318 +102.219.4.0/22 ; SBL664308 102.240.0.0/16 ; SBL434609 103.1.43.0/24 ; SBL654731 103.3.212.0/22 ; SBL638808 @@ -375,6 +383,7 @@ 103.4.248.0/22 ; SBL635220 103.5.116.0/22 ; SBL137266 103.7.198.0/23 ; SBL213945 +103.12.220.0/22 ; SBL657661 103.13.140.0/22 ; SBL175620 103.19.116.0/22 ; SBL183284 103.20.72.0/22 ; SBL175926 @@ -382,6 +391,7 @@ 103.23.12.0/22 ; SBL339751 103.23.124.0/22 ; SBL402303 103.25.88.0/22 ; SBL213941 +103.28.90.0/23 ; SBL657614 103.29.120.0/22 ; SBL641023 103.30.12.0/22 ; SBL295418 103.32.0.0/16 ; SBL434611 @@ -396,6 +406,7 @@ 103.58.68.0/22 ; SBL275172 103.61.92.0/22 ; SBL261306 103.75.36.0/22 ; SBL322513 +103.76.255.0/24 ; SBL668926 103.80.132.0/22 ; SBL519241 103.81.44.0/22 ; SBL618908 103.81.230.0/23 ; SBL638299 @@ -403,33 +414,32 @@ 103.92.145.0/24 ; SBL632064 103.95.180.0/22 ; SBL395338 103.97.2.0/24 ; SBL656015 +103.105.240.0/22 ; SBL664307 103.107.20.0/22 ; SBL588964 103.109.107.0/24 ; SBL618902 103.110.104.0/22 ; SBL647022 103.116.44.0/24 ; SBL656016 +103.116.60.0/22 ; SBL664309 103.130.147.0/24 ; SBL639193 -103.134.226.0/23 ; SBL623681 -103.142.120.0/23 ; SBL634831 -103.143.77.0/24 ; SBL648338 +103.135.207.0/24 ; SBL669237 +103.140.44.0/23 ; SBL669174 103.143.248.0/23 ; SBL623830 103.146.208.0/23 ; SBL648396 103.148.42.0/24 ; SBL537291 -103.151.172.0/23 ; SBL623255 103.153.254.0/23 ; SBL616176 103.157.75.0/24 ; SBL620261 103.167.40.0/23 ; SBL618439 103.171.236.0/23 ; SBL626777 103.174.130.0/23 ; SBL637444 103.178.236.0/23 ; SBL654990 -103.184.172.0/23 ; SBL628201 103.186.116.0/23 ; SBL649986 103.192.228.0/22 ; SBL310419 103.193.184.0/22 ; SBL650046 103.195.144.0/22 ; SBL387220 +103.196.11.0/24 ; SBL668928 103.198.26.0/24 ; SBL657618 103.199.88.0/22 ; SBL456876 103.214.56.0/22 ; SBL448866 -103.215.80.0/22 ; SBL337302 103.224.214.0/23 ; SBL621055 103.228.60.0/22 ; SBL261012 103.228.196.0/22 ; SBL259697 @@ -452,11 +462,9 @@ 107.150.5.0/24 ; SBL649990 107.155.224.0/22 ; SBL616009 107.182.240.0/20 ; SBL390277 -109.61.104.0/21 ; SBL631577 109.107.146.0/24 ; SBL625425 -109.196.166.0/23 ; SBL640080 109.206.237.0/24 ; SBL657478 -109.248.150.0/23 ; SBL655992 +110.44.104.0/22 ; SBL664310 110.44.144.0/20 ; SBL635340 111.68.64.0/24 ; SBL619015 111.68.69.0/24 ; SBL618846 @@ -481,6 +489,7 @@ 117.18.0.0/24 ; SBL628723 117.58.0.0/17 ; SBL279124 117.60.11.0/24 ; SBL641284 +118.107.16.0/20 ; SBL657508 119.13.179.0/24 ; SBL652308 119.58.0.0/16 ; SBL286278 119.82.12.0/22 ; SBL419661 @@ -499,26 +508,25 @@ 121.234.236.0/24 ; SBL641953 122.129.0.0/18 ; SBL221386 123.136.80.0/20 ; SBL620843 -124.20.0.0/16 ; SBL201390 +123.253.88.0/22 ; SBL671668 +123.253.204.0/22 ; SBL664306 124.68.0.0/16 ; SBL211387 124.157.0.0/18 ; SBL221387 124.242.0.0/16 ; SBL262407 125.31.192.0/18 ; SBL233458 125.58.0.0/18 ; SBL221388 -125.169.0.0/16 ; SBL242253 128.24.0.0/16 ; SBL388093 130.148.0.0/16 ; SBL257919 130.196.0.0/16 ; SBL257914 130.222.0.0/16 ; SBL101196 131.0.152.0/22 ; SBL544018 131.108.16.0/22 ; SBL276764 -131.143.0.0/16 ; SBL101198 -132.255.0.0/22 ; SBL544021 134.18.0.0/16 ; SBL221372 134.33.0.0/16 ; SBL7097 134.122.168.0/24 ; SBL630283 134.122.188.0/24 ; SBL629132 134.122.189.0/24 ; SBL637586 +136.0.121.0/24 ; SBL669142 137.19.0.0/16 ; SBL312493 137.31.0.0/16 ; SBL101324 137.42.0.0/16 ; SBL624889 @@ -526,7 +534,6 @@ 137.72.0.0/16 ; SBL101329 137.105.0.0/16 ; SBL268209 137.218.0.0/16 ; SBL278657 -138.31.0.0/16 ; SBL307104 138.36.92.0/22 ; SBL249351 138.36.136.0/22 ; SBL296343 138.52.0.0/16 ; SBL307426 @@ -542,7 +549,6 @@ 139.188.0.0/16 ; SBL221373 140.82.64.0/19 ; SBL502921 140.82.96.0/20 ; SBL502920 -140.167.0.0/16 ; SBL212527 141.98.10.0/24 ; SBL619633 141.98.11.0/24 ; SBL620221 141.178.0.0/16 ; SBL268203 @@ -551,7 +557,6 @@ 142.102.0.0/16 ; SBL307428 143.0.236.0/22 ; SBL286070 143.49.0.0/16 ; SBL7182 -143.63.0.0/16 ; SBL648101 143.92.43.0/24 ; SBL612606 144.215.0.0/16 ; SBL641808 145.231.0.0/16 ; SBL268204 @@ -577,6 +582,8 @@ 148.178.0.0/16 ; SBL79700 148.185.0.0/16 ; SBL272522 148.248.0.0/16 ; SBL84763 +149.57.11.0/24 ; SBL671785 +149.57.16.0/24 ; SBL671786 150.10.0.0/16 ; SBL222568 150.22.128.0/17 ; SBL235649 150.25.0.0/16 ; SBL268451 @@ -595,10 +602,13 @@ 153.93.0.0/16 ; SBL268208 154.0.64.0/18 ; SBL504849 154.73.200.0/21 ; SBL504850 +154.203.197.0/24 ; SBL672357 154.209.190.0/24 ; SBL637315 154.211.12.0/24 ; SBL636079 154.213.184.0/21 ; SBL656006 154.213.192.0/24 ; SBL656007 +154.213.200.0/24 ; SBL669058 +154.213.201.0/24 ; SBL669059 154.216.16.0/22 ; SBL656008 154.216.20.0/24 ; SBL656009 154.216.188.0/24 ; SBL655979 @@ -610,6 +620,10 @@ 155.233.0.0/16 ; SBL530025 155.249.0.0/16 ; SBL257915 156.96.0.0/16 ; SBL461359 +156.233.225.0/24 ; SBL672493 +156.236.32.0/19 ; SBL668989 +156.236.34.0/24 ; SBL668987 +156.236.63.0/24 ; SBL668988 157.115.0.0/16 ; SBL268212 157.119.64.0/22 ; SBL395347 157.148.116.0/24 ; SBL656014 @@ -629,7 +643,6 @@ 160.121.0.0/16 ; SBL458199 160.122.0.0/16 ; SBL457567 160.180.0.0/16 ; SBL272081 -160.181.0.0/16 ; SBL654392 160.188.0.0/16 ; SBL331922 160.240.0.0/16 ; SBL253946 161.0.0.0/19 ; SBL233406 @@ -654,9 +667,12 @@ 164.215.103.0/24 ; SBL634681 165.3.0.0/16 ; SBL457564 165.102.0.0/16 ; SBL229889 +165.154.192.0/18 ; SBL636305 +165.154.252.0/24 ; SBL652278 167.74.0.0/18 ; SBL178647 167.82.144.0/20 ; SBL502908 167.158.0.0/16 ; SBL325621 +167.160.189.0/24 ; SBL648357 167.224.0.0/19 ; SBL106073 167.224.48.0/21 ; SBL502895 167.249.200.0/22 ; SBL286077 @@ -707,7 +723,6 @@ 168.151.254.0/24 ; SBL477394 168.181.52.0/22 ; SBL291135 168.195.76.0/22 ; SBL379851 -168.196.232.0/22 ; SBL642237 168.196.236.0/22 ; SBL405273 168.196.240.0/22 ; SBL424251 168.198.0.0/16 ; SBL458174 @@ -715,7 +730,6 @@ 168.227.140.0/22 ; SBL396809 169.129.0.0/16 ; SBL530031 169.136.224.0/19 ; SBL530361 -169.239.48.0/22 ; SBL622306 169.239.152.0/22 ; SBL463216 169.245.0.0/16 ; SBL533789 169.246.0.0/15 ; SBL533788 @@ -732,7 +746,7 @@ 172.247.38.0/24 ; SBL608973 173.44.141.0/24 ; SBL652366 175.103.64.0/18 ; SBL221380 -176.111.174.0/24 ; SBL636087 +176.53.146.0/23 ; SBL671782 176.113.115.0/24 ; SBL618086 176.119.147.0/24 ; SBL650671 176.126.192.0/23 ; SBL493684 @@ -740,9 +754,11 @@ 176.223.116.0/23 ; SBL493686 176.223.118.0/24 ; SBL493687 177.234.136.0/21 ; SBL291134 +178.20.211.0/24 ; SBL668986 178.159.97.0/24 ; SBL394681 178.159.100.0/24 ; SBL419882 178.159.107.0/24 ; SBL419883 +178.215.224.0/24 ; SBL663962 178.215.236.0/24 ; SBL648570 178.215.238.0/24 ; SBL656596 179.43.162.0/24 ; SBL619700 @@ -760,10 +776,12 @@ 185.30.168.0/22 ; SBL448551 185.36.80.0/24 ; SBL619176 185.36.82.0/23 ; SBL619177 +185.38.142.0/24 ; SBL641943 185.42.12.0/24 ; SBL654067 185.51.120.0/24 ; SBL622215 185.56.83.0/24 ; SBL594400 185.64.23.0/24 ; SBL492825 +185.69.18.0/23 ; SBL635856 185.71.0.0/22 ; SBL394689 185.77.248.0/24 ; SBL476631 185.80.112.0/22 ; SBL493689 @@ -776,7 +794,6 @@ 185.116.175.0/24 ; SBL310727 185.120.8.0/22 ; SBL493891 185.122.128.0/22 ; SBL310728 -185.122.204.0/24 ; SBL619864 185.127.44.0/22 ; SBL461184 185.127.56.0/22 ; SBL310729 185.127.68.0/22 ; SBL300243 @@ -790,32 +807,32 @@ 185.144.180.0/22 ; SBL463001 185.145.80.0/22 ; SBL639358 185.147.140.0/22 ; SBL303516 +185.155.186.0/24 ; SBL635791 185.156.72.0/24 ; SBL648356 185.161.148.0/22 ; SBL463010 185.165.24.0/22 ; SBL391308 185.189.73.0/24 ; SBL618811 185.192.36.0/22 ; SBL412029 -185.193.90.0/24 ; SBL499529 185.196.8.0/23 ; SBL640354 185.196.8.0/22 ; SBL640645 185.196.10.0/24 ; SBL640464 -185.198.69.0/24 ; SBL636089 185.208.156.0/22 ; SBL640646 185.212.240.0/22 ; SBL635928 185.215.113.0/24 ; SBL508313 185.215.132.0/22 ; SBL448554 185.222.56.0/22 ; SBL654991 +185.228.232.0/24 ; SBL664527 185.230.44.0/22 ; SBL494342 185.232.19.0/24 ; SBL619620 185.232.45.0/24 ; SBL618810 -185.234.216.0/24 ; SBL636090 -185.237.104.0/22 ; SBL504769 185.237.226.0/23 ; SBL494344 185.238.176.0/22 ; SBL463012 185.239.44.0/22 ; SBL641968 185.242.0.0/22 ; SBL618822 +185.242.84.0/22 ; SBL664844 185.244.249.0/24 ; SBL619773 185.248.168.0/23 ; SBL618818 +185.248.192.0/22 ; SBL618708 185.255.38.0/24 ; SBL618386 185.255.98.0/23 ; SBL625438 185.255.192.0/22 ; SBL424022 @@ -851,7 +868,6 @@ 191.243.84.0/24 ; SBL619797 192.5.103.0/24 ; SBL212979 192.12.131.0/24 ; SBL226062 -192.22.0.0/16 ; SBL287442 192.35.52.0/23 ; SBL636031 192.35.54.0/24 ; SBL636032 192.40.29.0/24 ; SBL210095 @@ -882,6 +898,8 @@ 192.152.194.0/24 ; SBL221768 192.154.11.0/24 ; SBL226063 192.160.44.0/24 ; SBL9493 +192.161.58.0/24 ; SBL664705 +192.161.161.0/24 ; SBL655386 192.190.49.0/24 ; SBL210175 192.190.97.0/24 ; SBL223556 192.195.150.0/24 ; SBL223555 @@ -905,40 +923,40 @@ 192.252.16.0/20 ; SBL502925 192.253.224.0/20 ; SBL239266 193.3.164.0/24 ; SBL618824 -193.25.216.0/24 ; SBL654714 193.30.144.0/20 ; SBL618910 193.32.66.0/23 ; SBL493700 193.32.162.0/24 ; SBL636059 193.58.122.0/24 ; SBL618402 -193.68.88.0/24 ; SBL648240 193.124.185.0/24 ; SBL655370 193.139.0.0/16 ; SBL268277 -193.142.59.0/24 ; SBL637049 193.142.146.0/24 ; SBL648581 193.143.1.0/24 ; SBL634458 193.151.160.0/22 ; SBL494028 193.163.101.0/24 ; SBL625442 +193.222.96.0/24 ; SBL668929 193.233.81.0/24 ; SBL602061 193.233.200.0/24 ; SBL619587 193.233.255.0/24 ; SBL625301 193.243.0.0/17 ; SBL241018 193.254.48.0/20 ; SBL493701 +194.0.234.0/24 ; SBL654211 +194.26.18.0/24 ; SBL619103 194.26.135.0/24 ; SBL629041 +194.38.20.0/22 ; SBL657675 194.41.60.0/23 ; SBL493702 194.48.251.0/24 ; SBL657479 -194.49.94.0/24 ; SBL634920 194.54.145.0/24 ; SBL641967 -194.55.186.0/24 ; SBL638774 194.55.227.0/24 ; SBL625098 194.59.30.0/24 ; SBL649874 194.59.31.0/24 ; SBL648536 -194.87.200.0/24 ; SBL612917 -194.169.175.0/24 ; SBL622135 +194.62.244.0/22 ; SBL672495 +194.79.8.0/22 ; SBL620479 +194.145.227.0/24 ; SBL668825 195.14.98.0/24 ; SBL625430 195.22.149.0/24 ; SBL552932 195.49.128.0/22 ; SBL618823 195.88.146.0/23 ; SBL618861 -195.178.140.0/23 ; SBL648102 +195.177.92.0/24 ; SBL672494 195.181.224.0/20 ; SBL594334 195.210.96.0/19 ; SBL369604 196.1.109.0/24 ; SBL209998 @@ -947,6 +965,8 @@ 196.10.64.0/19 ; SBL458171 196.15.64.0/18 ; SBL458198 196.16.0.0/14 ; SBL364590 +197.10.88.0/21 ; SBL671692 +198.6.208.0/21 ; SBL642238 198.20.16.0/20 ; SBL107773 198.37.0.0/22 ; SBL624890 198.45.32.0/20 ; SBL110170 @@ -1012,7 +1032,6 @@ 199.60.102.0/24 ; SBL9159 199.71.139.0/24 ; SBL521504 199.71.192.0/20 ; SBL147763 -199.73.60.0/22 ; SBL623686 199.73.64.0/20 ; SBL502551 199.84.16.0/20 ; SBL503515 199.84.55.0/24 ; SBL210094 @@ -1025,6 +1044,7 @@ 199.103.64.0/22 ; SBL647171 199.106.8.0/21 ; SBL642241 199.107.96.0/22 ; SBL635119 +199.107.152.0/21 ; SBL672877 199.108.212.0/22 ; SBL624891 199.108.236.0/22 ; SBL624892 199.120.163.0/24 ; SBL6658 @@ -1051,8 +1071,11 @@ 199.184.82.0/24 ; SBL210159 199.184.223.0/24 ; SBL522828 199.185.144.0/20 ; SBL503521 +199.186.26.0/23 ; SBL673042 199.187.16.0/21 ; SBL578949 199.187.24.0/22 ; SBL578950 +199.187.32.0/20 ; SBL668423 +199.187.48.0/21 ; SBL668424 199.196.192.0/19 ; SBL106606 199.198.160.0/20 ; SBL96701 199.198.176.0/21 ; SBL109341 @@ -1061,7 +1084,6 @@ 199.201.212.0/24 ; SBL521508 199.223.0.0/20 ; SBL180441 199.230.64.0/19 ; SBL97024 -199.230.96.0/21 ; SBL97026 199.231.8.0/21 ; SBL533523 199.233.78.0/24 ; SBL521509 199.233.85.0/24 ; SBL212984 @@ -1101,7 +1123,9 @@ 202.46.96.0/20 ; SBL655235 202.52.38.0/24 ; SBL213943 202.61.141.0/24 ; SBL648580 +202.61.144.0/20 ; SBL664842 202.79.173.0/24 ; SBL613433 +202.95.8.0/21 ; SBL664724 202.131.208.0/20 ; SBL641025 202.148.32.0/20 ; SBL264045 202.152.192.0/20 ; SBL641026 @@ -1121,6 +1145,7 @@ 204.27.155.0/24 ; SBL521496 204.27.222.0/24 ; SBL613547 204.44.32.0/20 ; SBL104258 +204.44.65.0/24 ; SBL648179 204.44.208.0/20 ; SBL503530 204.44.224.0/20 ; SBL110044 204.52.184.0/24 ; SBL521497 @@ -1132,7 +1157,6 @@ 204.74.32.0/19 ; SBL532252 204.75.147.0/24 ; SBL223550 204.75.228.0/24 ; SBL210096 -204.76.203.0/24 ; SBL640085 204.80.164.0/24 ; SBL521780 204.80.180.0/24 ; SBL521781 204.80.198.0/24 ; SBL217200 @@ -1150,6 +1174,7 @@ 204.107.132.0/24 ; SBL521499 204.107.208.0/24 ; SBL96699 204.107.237.0/24 ; SBL521500 +204.110.8.0/21 ; SBL672878 204.110.144.0/20 ; SBL530313 204.115.0.0/22 ; SBL613549 204.115.4.0/23 ; SBL613548 @@ -1183,6 +1208,8 @@ 204.187.192.0/19 ; SBL641809 204.187.224.0/20 ; SBL641810 204.187.240.0/21 ; SBL641811 +204.194.16.0/22 ; SBL668425 +204.194.40.0/21 ; SBL668426 204.194.64.0/21 ; SBL249621 204.225.159.0/24 ; SBL113128 204.225.210.0/24 ; SBL113129 @@ -1263,6 +1290,10 @@ 206.41.160.0/19 ; SBL209495 206.51.29.0/24 ; SBL210090 206.72.160.0/19 ; SBL613553 +206.121.28.0/22 ; SBL673043 +206.121.32.0/23 ; SBL673044 +206.121.136.0/22 ; SBL673045 +206.121.184.0/22 ; SBL673046 206.124.104.0/21 ; SBL325532 206.125.16.0/20 ; SBL503526 206.130.188.0/24 ; SBL212986 @@ -1286,7 +1317,6 @@ 206.221.192.0/20 ; SBL530328 206.223.17.0/24 ; SBL338924 206.223.33.0/24 ; SBL521783 -206.223.48.0/24 ; SBL521473 206.224.160.0/19 ; SBL96697 206.226.0.0/19 ; SBL177387 206.226.32.0/19 ; SBL177459 @@ -1295,7 +1325,6 @@ 207.45.224.0/20 ; SBL89255 207.70.192.0/19 ; SBL641800 207.70.224.0/20 ; SBL503527 -207.90.0.0/18 ; SBL209121 207.105.108.0/22 ; SBL624906 207.110.64.0/18 ; SBL177484 207.110.96.0/19 ; SBL177485 @@ -1338,13 +1367,13 @@ 212.237.152.0/21 ; SBL594332 213.21.232.0/24 ; SBL657052 213.21.237.0/24 ; SBL655369 -213.109.202.0/24 ; SBL640081 213.130.88.0/22 ; SBL391310 216.63.240.0/22 ; SBL624913 216.93.96.0/19 ; SBL641801 216.137.144.0/20 ; SBL530314 216.147.192.0/20 ; SBL530360 216.179.128.0/17 ; SBL103083 +216.207.112.0/21 ; SBL672881 216.211.192.0/22 ; SBL640853 216.240.96.0/20 ; SBL546730 216.250.16.0/20 ; SBL530358 diff --git a/dropv6.txt b/dropv6.txt index 38bad27..c23293b 100644 --- a/dropv6.txt +++ b/dropv6.txt @@ -1,7 +1,7 @@ -; Spamhaus IPv6 DROP List 2024/10/17 - (c) 2024 The Spamhaus Project SLU +; Spamhaus IPv6 DROP List 2025/01/15 - (c) 2025 The Spamhaus Project SLU ; https://www.spamhaus.org/drop/dropv6.txt -; Last-Modified: Sun, 15 Sep 2024 12:00:34 GMT -; Expires: Thu, 17 Oct 2024 09:52:39 GMT +; Last-Modified: Wed, 08 Jan 2025 22:38:36 GMT +; Expires: Wed, 15 Jan 2025 18:37:54 GMT 2001:678:6c4::/48 ; SBL626637 2001:678:724::/48 ; SBL631364 2001:678:738::/48 ; SBL635837 @@ -22,7 +22,6 @@ 2405:b480::/32 ; SBL341597 2405:e880::/32 ; SBL327648 2602:f915:1::/48 ; SBL654212 -2602:f91d::/40 ; SBL640085 2602:ffa0::/36 ; SBL262027 2607:d100::/32 ; SBL347495 2607:f2d0::/32 ; SBL287940 @@ -65,10 +64,10 @@ 2a0e:b107:1574::/48 ; SBL635656 2a0e:b107:1a10::/44 ; SBL647147 2a0e:d601:7220::/48 ; SBL618313 -2a0e:fa00::/29 ; SBL640911 2a10:2f01:215::/48 ; SBL647148 2a10:9700::/29 ; SBL635189 2a10:cc45:100::/44 ; SBL624089 +2a11:9c00::/40 ; SBL672496 2a12:2640::/29 ; SBL639454 2a12:6740::/30 ; SBL654214 2a12:dd47:8500::/40 ; SBL639453 @@ -80,4 +79,5 @@ 2a14:7c0:1e00::/40 ; SBL643208 2a14:7c2::/32 ; SBL648565 2a14:7c3::/32 ; SBL641930 +2c0f:6c0::/28 ; SBL668932 ; EOF diff --git a/edrop.txt b/edrop.txt deleted file mode 100644 index 2926fa7..0000000 --- a/edrop.txt +++ /dev/null @@ -1,6 +0,0 @@ -; This list has been merged into https://www.spamhaus.org/drop/drop.txt -; Spamhaus EDROP List 2024/10/18 - (c) 2024 The Spamhaus Project SLU -; https://www.spamhaus.org/drop/edrop.txt -; Last-Modified: Fri, 18 Oct 2024 10:22:39 GMT -; Expires: Sat, 19 Oct 2024 10:22:39 GMT -; EOF diff --git a/src/dnsbl.c b/src/dnsbl.c index f0a2224..7445a31 100644 --- a/src/dnsbl.c +++ b/src/dnsbl.c @@ -3,7 +3,7 @@ * * \brief * A simple DNSBL (Domain Name System Blacklist) implementation. - * Parses and uses the the Spamhaus DROP / EDROP / DROPv6 files to + * Parses and uses the the Spamhaus DROP / DROPv6 files to * check an IPv4/IPv6-address for membership of a "spam network". * Used in dump.c to print the SBL (Spamhaus Block Reference) * if found in the `DNSBL_list` smartlist. @@ -42,7 +42,6 @@ typedef enum { DNSBL_DROP, - DNSBL_EDROP, DNSBL_DROPv6, DNSBL_MAX } DNSBL_type; @@ -68,12 +67,10 @@ static smartlist_t *DNSBL_list = NULL; static void DNSBL_parse_DROP (smartlist_t *sl, const char *line); static void DNSBL_parse_DROPv6 (smartlist_t *sl, const char *line); -static void DNSBL_parse_EDROP (smartlist_t *sl, const char *line); static const char *DNSBL_type_name (DNSBL_type type) { return (type == DNSBL_DROP ? "DROP" : - type == DNSBL_EDROP ? "EDROP" : type == DNSBL_DROPv6 ? "DROPv6" : "?"); } @@ -213,11 +210,10 @@ static int DNSBL_compare_is_on_net6 (const void *key, const void **member) * \note An IPv4/IPv6 address can have more than 1 SBL reference. * This is currently unsupported. * \eg{.}: - * Currently (as of August 2018), the IPv4 block `24.233.0.0/19` - * is listed in both `drop.txt` and `edrop.txt` as: + * Currently (as of January 2025), the IPv4 block `24.233.0.0/19` + * is listed in `drop.txt` as: * ``` * 24.233.0.0/19 ; SBL210084 - * 24.233.0.0/21 ; SBL356227 * ``` */ static bool DNSBL_check_common (const struct in_addr *ip4, const struct in6_addr *ip6, const char **sbl_ref) @@ -336,10 +332,6 @@ static int DNSBL_test_single (const char *addr_str) * Verify that Google's NS is not in any DNSBL * 8.8.8.8/xx * - * Test some lines from edrop.txt: - * 120.46.0.0/15 ; SBL262362 - * 208.12.64.0/19 ; SBL201196 - * * Test some lines from dropv6.txt: * 2a06:5280::/29 ; SBL334219 * 2607:d100::/32 ; SBL347495 @@ -362,8 +354,6 @@ static int DNSBL_test (const char *addr_str) { AF_INET, "24.233.0.21", "210084" }, { AF_INET, "8.8.8.8", "" }, /* Google's NS */ { AF_INET, "193.25.48.3", "211796" }, - { AF_INET, "120.46.4.1", "262362" }, /* in edrop.txt */ - { AF_INET, "208.12.64.5", "201196" }, { AF_INET6, "2a06:e480::1", "301771" }, /* in dropv6.txt */ { AF_INET6, "2a06:e480::ff", "301771" }, { AF_INET6, "2607:d100::1", "347495" } @@ -478,10 +468,9 @@ void DNSBL_init (void) } DNSBL_parse_and_add (&DNSBL_list, g_cfg.DNSBL.drop_file, DNSBL_parse_DROP); - DNSBL_parse_and_add (&DNSBL_list, g_cfg.DNSBL.edrop_file, DNSBL_parse_EDROP); DNSBL_parse_and_add (&DNSBL_list, g_cfg.DNSBL.dropv6_file, DNSBL_parse_DROPv6); - /* Each of the 'drop.txt', 'edrop.txt' and 'dropv6.txt' are already sorted. + /* Each of the 'drop.txt', 'dropv6.txt' are already sorted. * But after merging them into one list, we must sort them ourself. */ if (DNSBL_list) @@ -573,9 +562,6 @@ int DNSBL_update_files (bool force_update) snprintf (tmp_file, sizeof(tmp_file), "%s\\%s", g_data.ws_tmp_dir, basename(g_cfg.DNSBL.drop_file)); num += DNSBL_update_file (g_cfg.DNSBL.drop_file, tmp_file, g_cfg.DNSBL.drop_url, now, expiry); - snprintf (tmp_file, sizeof(tmp_file), "%s\\%s", g_data.ws_tmp_dir, basename(g_cfg.DNSBL.edrop_file)); - num += DNSBL_update_file (g_cfg.DNSBL.edrop_file, tmp_file, g_cfg.DNSBL.edrop_url, now, expiry); - snprintf (tmp_file, sizeof(tmp_file), "%s\\%s", g_data.ws_tmp_dir, basename(g_cfg.DNSBL.dropv6_file)); num += DNSBL_update_file (g_cfg.DNSBL.dropv6_file, tmp_file, g_cfg.DNSBL.dropv6_url, now, expiry); @@ -583,9 +569,9 @@ int DNSBL_update_files (bool force_update) } /** - * Parser for "drop.txt" and "edrop.txt" files. + * Parser for "drop.txt" file. */ -static void DNSBL_parse4 (smartlist_t *sl, const char *line, DNSBL_type type) +static void DNSBL_parse_DROP (smartlist_t *sl, const char *line) { struct DNSBL_info *dnsbl; int bits = 0; @@ -605,29 +591,13 @@ static void DNSBL_parse4 (smartlist_t *sl, const char *line, DNSBL_type type) INET_util_get_mask4 (&dnsbl->u.ip4.mask, bits); dnsbl->bits = bits; - dnsbl->type = type; + dnsbl->type = DNSBL_DROP; dnsbl->family = AF_INET; str_ncpy (dnsbl->SBL_ref, strchr(line, 'L') + 1, sizeof(dnsbl->SBL_ref)); smartlist_add (sl, dnsbl); } -/** - * Parser for a "drop.txt" file. - */ -static void DNSBL_parse_DROP (smartlist_t *sl, const char *line) -{ - DNSBL_parse4 (sl, line, DNSBL_DROP); -} - -/** - * Parser for a "edrop.txt" file. - */ -static void DNSBL_parse_EDROP (smartlist_t *sl, const char *line) -{ - DNSBL_parse4 (sl, line, DNSBL_EDROP); -} - /** * Parser for a "dropv6.txt" file. */ @@ -668,7 +638,7 @@ static int show_help (void) " -f: force an update with the '-u' option.\n" " -t: run 'DNSBL_test()' for a simple test.\n" " if an
is specified, test that.\n" - " -u: update the SpamHaus' 'DROP.txt', 'DROPv6.txt' and 'EDROP.txt' files.\n", + " -u: update the SpamHaus' 'DROP.txt' and 'DROPv6.txt' files.\n", g_data.program_name); return (0); } diff --git a/wsock_trace b/wsock_trace index 5e59c0b..b183639 100644 --- a/wsock_trace +++ b/wsock_trace @@ -326,11 +326,9 @@ enable = 0 max_days = 10 # max allowed age (in days) for an update check (not automatic). drop_file = %APPDATA%\drop.txt - edrop_file = %APPDATA%\edrop.txt dropv6_file = %APPDATA%\dropv6.txt drop_url = http://www.spamhaus.org/drop/drop.txt - edrop_url = http://www.spamhaus.org/drop/edrop.txt dropv6_url = http://www.spamhaus.org/drop/dropv6.txt #