pfBlocker - fix alias array check before loop, fix duplicates on autmatic rules and update country lists

1 files changed, 120 insertions, 59 deletions

diff --git a/config/pf-blocker/lists/Africa_cidr.txt b/config/pf-blocker/lists/Africa_cidr.txt
index b164063f..3ef0ce10 100755
--- a/config/pf-blocker/lists/Africa_cidr.txt
+++ b/config/pf-blocker/lists/Africa_cidr.txt
@@ -3,11 +3,13 @@
 # Total Subnets: 24,124,672
 # Country: ALGERIA
 # ISO Code: DZ
-# Total Networks: 28
-# Total Subnets:  2,618,880
+# Total Networks: 30
+# Total Subnets:  2,620,928
+41.77.176.0/21
 41.96.0.0/12
 41.191.252.0/22
-41.200.0.0/15
+41.200.0.0/16
+41.201.0.0/16
 41.209.128.0/18
 41.210.64.0/18
 41.220.144.0/20
@@ -35,8 +37,8 @@
 213.179.160.0/19
 # Country: ANGOLA
 # ISO Code: AO
-# Total Networks: 31
-# Total Subnets:  114,176
+# Total Networks: 32
+# Total Subnets:  179,712
 41.63.160.0/19
 41.70.128.0/17
 41.72.0.0/18
@@ -54,6 +56,7 @@
 41.223.100.0/22
 41.223.156.0/22
 41.223.164.0/22
+193.236.0.0/16
 196.29.192.0/20
 196.32.192.0/21
 196.43.197.0/24
@@ -236,22 +239,26 @@
 196.201.192.0/20
 # Country: EGYPT
 # ISO Code: EG
-# Total Networks: 128
-# Total Subnets:  8,453,120
+# Total Networks: 134
+# Total Subnets:  8,454,144
 41.32.0.0/12
-41.64.0.0/15
+41.64.0.0/16
+41.65.0.0/16
 41.67.64.0/18
-41.68.0.0/15
+41.68.0.0/16
+41.69.0.0/16
 41.72.64.0/19
 41.77.136.0/21
 41.77.248.0/21
 41.78.20.0/22
 41.78.60.0/22
 41.78.148.0/22
+41.79.208.0/22
 41.88.0.0/16
 41.91.0.0/16
 41.128.0.0/14
-41.152.0.0/15
+41.152.0.0/16
+41.153.0.0/16
 41.155.128.0/17
 41.176.0.0/16
 41.178.0.0/16
@@ -340,7 +347,8 @@
 196.216.240.0/23
 196.216.246.0/24
 196.216.252.0/24
-196.218.0.0/15
+196.218.0.0/16
+196.219.0.0/16
 196.221.0.0/16
 196.223.7.0/24
 196.223.16.0/23
@@ -349,7 +357,8 @@
 197.132.0.0/14
 197.160.0.0/13
 197.192.0.0/13
-197.222.0.0/15
+197.222.0.0/16
+197.223.0.0/16
 197.246.0.0/16
 212.12.224.0/19
 212.103.160.0/19
@@ -385,7 +394,7 @@
 213.55.64.0/18
 # Country: GABON
 # ISO Code: GA
-# Total Networks: 12
+# Total Networks: 13
 # Total Subnets:  169,472
 41.72.224.0/19
 41.76.120.0/21
@@ -393,7 +402,8 @@
 41.78.96.0/22
 41.78.152.0/22
 41.78.240.0/22
-41.158.0.0/15
+41.158.0.0/16
+41.159.0.0/16
 41.211.128.0/18
 192.188.164.0/22
 192.189.139.0/23
@@ -410,8 +420,8 @@
 212.60.64.0/19
 # Country: GHANA
 # ISO Code: GH
-# Total Networks: 58
-# Total Subnets:  348,928
+# Total Networks: 57
+# Total Subnets:  332,544
 41.57.192.0/18
 41.66.192.0/18
 41.74.80.0/20
@@ -467,23 +477,24 @@
 197.221.64.0/19
 197.251.128.0/17
 197.253.64.0/18
-197.255.64.0/18
 212.85.192.0/19
 212.96.0.0/19
 # Country: GUINEA
 # ISO Code: GN
-# Total Networks: 1
-# Total Subnets:  1,024
+# Total Networks: 2
+# Total Subnets:  2,048
+41.79.200.0/22
 41.79.236.0/22
 # Country: GUINEA-BISSAU
 # ISO Code: GW
-# Total Networks: 1
-# Total Subnets:  1,024
+# Total Networks: 2
+# Total Subnets:  5,120
 196.22.12.0/22
+197.159.80.0/20
 # Country: KENYA
 # ISO Code: KE
-# Total Networks: 103
-# Total Subnets:  1,637,376
+# Total Networks: 108
+# Total Subnets:  1,650,944
 41.72.160.0/19
 41.72.192.0/19
 41.75.32.0/20
@@ -495,9 +506,11 @@
 41.78.176.0/22
 41.79.8.0/22
 41.79.140.0/22
+41.79.168.0/22
 41.79.228.0/22
 41.79.252.0/22
-41.80.0.0/15
+41.80.0.0/16
+41.81.0.0/16
 41.84.128.0/19
 41.87.32.0/19
 41.89.0.0/16
@@ -532,6 +545,7 @@
 41.223.148.0/22
 62.8.64.0/19
 62.24.96.0/19
+62.128.160.0/19
 77.220.0.0/19
 80.72.96.0/20
 80.240.192.0/20
@@ -558,6 +572,7 @@
 196.43.218.0/24
 196.43.220.0/24
 196.43.222.0/24
+196.43.228.0/24
 196.46.16.0/24
 196.200.16.0/20
 196.200.32.0/20
@@ -576,6 +591,7 @@
 196.223.21.0/24
 197.136.0.0/14
 197.156.128.0/18
+197.159.96.0/20
 197.176.0.0/13
 197.220.96.0/19
 197.237.0.0/16
@@ -602,8 +618,9 @@
 197.254.128.0/18
 # Country: LIBERIA
 # ISO Code: LR
-# Total Networks: 2
-# Total Subnets:  9,216
+# Total Networks: 3
+# Total Subnets:  13,312
+41.57.80.0/20
 41.86.0.0/19
 41.191.104.0/22
 # Country: LIBYAN ARAB JAMAHIRIYA
@@ -678,8 +695,8 @@
 82.151.64.0/19
 # Country: MAURITIUS
 # ISO Code: MU
-# Total Networks: 34
-# Total Subnets:  475,136
+# Total Networks: 35
+# Total Subnets:  491,520
 41.76.40.0/21
 41.87.96.0/19
 41.136.0.0/16
@@ -712,6 +729,7 @@
 196.216.254.0/24
 196.223.0.0/24
 197.224.0.0/14
+197.255.64.0/18
 202.60.0.0/21
 202.123.0.0/19
 # Country: MAYOTTE
@@ -754,7 +772,7 @@
 212.217.0.0/17
 # Country: MOZAMBIQUE
 # ISO Code: MZ
-# Total Networks: 25
+# Total Networks: 26
 # Total Subnets:  326,656
 41.76.0.0/21
 41.76.144.0/21
@@ -779,7 +797,8 @@
 196.28.224.0/20
 196.32.96.0/20
 196.46.0.0/20
-197.218.0.0/15
+197.218.0.0/16
+197.219.0.0/16
 197.249.0.0/16
 # Country: NAMIBIA
 # ISO Code: NA
@@ -817,8 +836,8 @@
 46.231.240.0/21
 # Country: NIGERIA
 # ISO Code: NG
-# Total Networks: 121
-# Total Subnets:  982,784
+# Total Networks: 126
+# Total Subnets:  995,328
 41.58.0.0/16
 41.67.128.0/18
 41.71.128.0/17
@@ -851,6 +870,8 @@
 41.79.116.0/22
 41.79.144.0/22
 41.79.152.0/22
+41.79.176.0/22
+41.79.204.0/22
 41.84.160.0/19
 41.86.128.0/19
 41.87.64.0/19
@@ -890,6 +911,7 @@
 41.223.168.0/22
 62.173.32.0/19
 62.193.160.0/19
+77.73.184.0/21
 80.248.0.0/20
 80.250.32.0/20
 82.128.0.0/17
@@ -897,6 +919,7 @@
 193.189.64.0/23
 193.189.128.0/24
 195.166.224.0/19
+195.216.245.0/24
 196.1.133.0/24
 196.1.176.0/20
 196.3.60.0/22
@@ -937,6 +960,7 @@
 197.255.0.0/18
 197.255.160.0/20
 197.255.208.0/20
+212.21.32.0/19
 212.100.64.0/19
 217.14.80.0/20
 217.117.0.0/20
@@ -947,8 +971,8 @@
 41.213.128.0/17
 # Country: RWANDA
 # ISO Code: RW
-# Total Networks: 12
-# Total Subnets:  163,072
+# Total Networks: 13
+# Total Subnets:  195,840
 41.74.160.0/20
 41.77.160.0/21
 41.138.80.0/21
@@ -961,6 +985,7 @@
 196.12.128.0/19
 196.44.240.0/20
 196.223.12.0/24
+197.243.0.0/17
 # Country: SAINT HELENA
 # ISO Code: SH
 # Total Networks: 0
@@ -973,13 +998,16 @@
 197.159.160.0/19
 # Country: SENEGAL
 # ISO Code: SN
-# Total Networks: 16
-# Total Subnets:  289,024
+# Total Networks: 19
+# Total Subnets:  293,248
 41.62.0.0/16
-41.82.0.0/15
+41.82.0.0/16
+41.83.0.0/16
 41.208.128.0/18
 41.214.0.0/17
 41.219.0.0/18
+92.39.112.0/20
+194.117.53.0/25
 196.1.92.0/24
 196.1.93.0/24
 196.1.94.0/24
@@ -993,8 +1021,8 @@
 213.154.64.0/19
 # Country: SEYCHELLES
 # ISO Code: SC
-# Total Networks: 11
-# Total Subnets:  26,624
+# Total Networks: 14
+# Total Subnets:  28,160
 41.79.60.0/22
 41.86.32.0/19
 41.191.120.0/22
@@ -1003,13 +1031,16 @@
 41.222.204.0/22
 41.223.204.0/22
 41.223.216.0/22
+91.217.178.0/24
+91.233.20.0/24
+193.107.16.0/22
 196.1.120.0/21
 196.32.216.0/21
 196.46.148.0/22
 # Country: SIERRA LEONE
 # ISO Code: SL
-# Total Networks: 8
-# Total Subnets:  17,664
+# Total Networks: 9
+# Total Subnets:  17,920
 41.78.68.0/22
 41.78.84.0/22
 41.191.248.0/22
@@ -1017,17 +1048,19 @@
 41.220.80.0/20
 41.223.88.0/22
 41.223.132.0/22
+196.43.229.0/24
 196.223.10.0/24
 # Country: SOMALIA
 # ISO Code: SO
-# Total Networks: 2
-# Total Subnets:  9,216
+# Total Networks: 3
+# Total Subnets:  10,240
 41.78.72.0/22
+41.79.196.0/22
 197.220.64.0/19
 # Country: SOUTH AFRICA
 # ISO Code: ZA
-# Total Networks: 1,000
-# Total Subnets:  20,415,488
+# Total Networks: 1,021
+# Total Subnets:  20,377,344
 41.0.0.0/11
 41.48.0.0/13
 41.56.0.0/16
@@ -1094,6 +1127,10 @@
 41.79.148.0/22
 41.79.156.0/22
 41.79.160.0/22
+41.79.164.0/22
+41.79.172.0/22
+41.79.180.0/22
+41.79.192.0/22
 41.79.240.0/22
 41.79.248.0/22
 41.84.0.0/17
@@ -1110,7 +1147,8 @@
 41.138.64.0/21
 41.144.0.0/13
 41.154.0.0/16
-41.156.0.0/15
+41.156.0.0/16
+41.157.0.0/16
 41.160.0.0/12
 41.177.0.0/16
 41.180.0.0/16
@@ -1225,14 +1263,16 @@
 165.25.0.0/16
 165.143.0.0/16
 165.144.0.0/14
-165.148.0.0/15
+165.148.0.0/16
+165.149.0.0/16
 165.165.0.0/16
 165.180.0.0/16
 165.231.0.0/16
 165.233.0.0/16
 166.85.0.0/16
 168.76.0.0/16
-168.80.0.0/15
+168.80.0.0/16
+168.81.0.0/16
 168.89.0.0/16
 168.128.0.0/16
 168.142.0.0/16
@@ -1240,7 +1280,8 @@
 168.164.0.0/16
 168.172.0.0/16
 168.206.0.0/16
-168.209.0.0/15
+168.209.0.0/16
+168.210.0.0/16
 169.129.0.0/16
 169.202.0.0/16
 192.33.10.0/24
@@ -1506,6 +1547,15 @@
 196.4.0.0/20
 196.4.16.0/22
 196.4.20.0/24
+196.4.21.0/24
+196.4.22.0/24
+196.4.23.0/24
+196.4.24.0/24
+196.4.25.0/24
+196.4.26.0/24
+196.4.27.0/24
+196.4.28.0/24
+196.4.29.0/24
 196.4.30.0/22
 196.4.34.0/23
 196.4.36.0/21
@@ -1809,7 +1859,8 @@
 196.32.230.0/23
 196.32.232.0/21
 196.33.0.0/16
-196.34.0.0/15
+196.34.0.0/16
+196.35.0.0/16
 196.36.0.0/14
 196.40.96.0/20
 196.41.0.0/19
@@ -1824,6 +1875,8 @@
 196.43.204.0/24
 196.43.208.0/24
 196.43.209.0/24
+196.43.227.0/24
+196.43.231.0/24
 196.44.0.0/19
 196.44.32.0/20
 196.44.64.0/19
@@ -1873,13 +1926,14 @@
 197.96.0.0/13
 197.104.0.0/13
 197.156.0.0/18
+197.157.64.0/19
+197.159.32.0/19
 197.168.0.0/13
 197.221.0.0/18
 197.221.96.0/19
 197.221.160.0/19
 197.236.0.0/16
 197.238.0.0/16
-197.239.0.0/16
 197.245.0.0/16
 197.255.144.0/20
 198.54.1.0/24
@@ -2030,10 +2084,12 @@
 216.236.176.0/20
 # Country: SUDAN
 # ISO Code: SD
-# Total Networks: 17
-# Total Subnets:  281,856
+# Total Networks: 19
+# Total Subnets:  283,904
 41.67.0.0/18
 41.78.108.0/22
+41.79.24.0/22
+41.79.120.0/22
 41.95.0.0/16
 41.202.160.0/19
 41.209.64.0/18
@@ -2064,8 +2120,8 @@
 196.28.7.0/24
 # Country: TANZANIA, UNITED REPUBLIC OF
 # ISO Code: TZ
-# Total Networks: 55
-# Total Subnets:  334,336
+# Total Networks: 57
+# Total Subnets:  335,616
 41.59.0.0/16
 41.73.64.0/19
 41.73.160.0/19
@@ -2079,6 +2135,7 @@
 41.78.168.0/22
 41.79.68.0/22
 41.79.100.0/22
+41.79.184.0/22
 41.86.160.0/19
 41.93.0.0/17
 41.138.92.0/22
@@ -2107,6 +2164,7 @@
 196.41.32.0/19
 196.43.64.0/19
 196.43.221.0/24
+196.43.230.0/24
 196.44.160.0/20
 196.45.32.0/20
 196.45.128.0/19
@@ -2141,8 +2199,8 @@
 213.150.160.0/19
 # Country: UGANDA
 # ISO Code: UG
-# Total Networks: 27
-# Total Subnets:  192,000
+# Total Networks: 29
+# Total Subnets:  208,640
 41.75.160.0/20
 41.76.160.0/21
 41.77.72.0/21
@@ -2166,8 +2224,10 @@
 193.108.252.0/22
 196.0.0.0/16
 196.43.128.0/18
+196.43.226.0/24
 196.216.176.0/22
 196.223.25.0/24
+197.157.0.0/18
 197.221.128.0/19
 212.88.96.0/19
 # Country: WESTERN SAHARA
@@ -2203,8 +2263,8 @@
 197.220.192.0/18
 # Country: ZIMBABWE
 # ISO Code: ZW
-# Total Networks: 27
-# Total Subnets:  83,968
+# Total Networks: 28
+# Total Subnets:  84,992
 41.57.64.0/20
 41.76.232.0/21
 41.78.44.0/22
@@ -2216,6 +2276,7 @@
 41.79.56.0/22
 41.79.112.0/22
 41.79.132.0/22
+41.79.188.0/22
 41.85.192.0/19
 41.190.32.0/19
 41.191.232.0/21