aboutsummaryrefslogtreecommitdiffstats
path: root/config/pf-blocker/pfblocker.inc
Commit message (Collapse)AuthorAgeFilesLines
* pfBlocker allow list ranges that are not exact subnetsPhil Davis2013-03-281-27/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2892 I made a "nasty" list as follows: 192.168.100.0-192.168.101.255 192.168.103.8-192.168.103.23 192.168.104.1-192.168.104.254 192.168.105.22-192.168.106.66 192.168.107.3-192.168.107.33 And this code turns it into: 192.168.100.0/23 192.168.103.8/29 192.168.103.16/29 192.168.104.1/32 192.168.104.2/31 192.168.104.4/30 192.168.104.8/29 192.168.104.16/28 192.168.104.32/27 192.168.104.64/26 192.168.104.128/26 192.168.104.192/27 192.168.104.224/28 192.168.104.240/29 192.168.104.248/30 192.168.104.252/31 192.168.104.254/32 192.168.105.22/31 192.168.105.24/29 192.168.105.32/27 192.168.105.64/26 192.168.105.128/25 192.168.106.0/26 192.168.106.64/31 192.168.106.66/32 192.168.107.3/32 192.168.107.4/30 192.168.107.8/29 192.168.107.16/28 192.168.107.32/31 Which is the correct group of CIDRs to represent the given ranges.
* Small cleanup for readabilityVince2012-10-101-1/+1
| | | Small cleanup for readability
* Net masking math was off by 1Vince2012-10-101-1/+1
| | | Net masking math was off by 1
* Fixing duplicate IP/Range entriesdarkain2012-10-091-10/+10
| | | | | | | | | | | | | | | | | | | Because all three cases (CIDR, IP Range, and Single IP Address) are always tested, it is possible that more than one will have a positive match. Examples: 172.16.0.0/12 matches both for CIDR and Individual IP Address 169.254.0.0-169.254.255.255 matches for both Address Range and Individual IP By doing if, elseif, elseif instead of if, if, if testing, the later tests will only be performed if the former tests fail. Because the Individual IP Address test will return a result, even for CIDRs and IP Ranges, that test has been moved to the end of the elseif list.
* IP Range to CIDRs not calculating properlydarkain2012-10-091-2/+2
| | | | | | | | | | | | | | | | | Several IP address ranges were being calculated improperly. Examples: 10.0.0.0-10.255.255.255 became 160.0.0.0/8 65.113.241.0-65.113.241.255 became 130.227.226.0/24 72.165.61.0-72.165.61.255 became 145.74.122.0/24 The use of complicated string and regular expressions to calculate netmasks has been replaced with basic and proper bit masking.
* Fix equals check for pfblocker rule loadingPhil Davis2012-10-021-1/+1
| | | Sorry guys - I missed out an equals sign here, the logic ended up only applying rules to the first interface, and not for others.
* Stop pfblocker rules being added twicePhil Davis2012-09-291-9/+18
| | | | If users move rules around in the GUI, the the rules for 1 interface can end up in separate blocks in config.xml. This causes pfBlocker code to put a set of pfBlocker rules before each separate block of rules for an interface, as they are processed out of config.xml. The code here fixes that, ensuring that pfBlocker rules are only added once to an interface, the first time the interface is found in a rule.
* pfblocker - Include boot process checkmarcelloc2012-06-041-148/+159
|
* Revert "pfBlocker - Include boot process check"marcelloc2012-06-041-422/+472
| | | | This reverts commit 4149a349b894688723810e4886c95205dc34058f.
* pfBlocker - Include boot process checkMarcello Coutinho2012-06-041-472/+422
|
* Merge pull request #232 from phil-davis/masterMarcello Coutinho2012-03-281-406/+452
|\ | | | | Code formatting of pfblocker.inc
| * Add bracketing to "if" and "foreach" statements. Make tab indenting ↵Phil Davis2012-03-281-406/+452
| | | | | | | | consistent throughout. This should make it easier to debug in future, as it is now easy to see which code is nested in which loops.
* | Generalize more referencesjim-p2012-03-271-2/+2
|/
* Avoid getting pfBlocker rules duplicated on some interfaces if there are ↵Phil Davis2012-03-271-2/+8
| | | | floating rules with interface="" mixed in the config filter rule list.
* Include foreach loop in "if (is_array($config['aliases']['alias']))" test, ↵Phil Davis2012-03-151-17/+18
| | | | otherwise warnings are reported when the array is empty.
* Put pfblocker.inc back the way it was. I didn't mean to change it in this fork.Phil Davis2012-03-141-18/+17
|
* Update config/pf-blocker/pfblocker.incPhil Davis2012-03-141-17/+18
|
* pfBlocker - include php memory limit set to 250Mb when amd64 is detectedmarcelloc2012-02-201-0/+4
|
* pfBlocker - fix alias array check before loop, fix duplicates on autmatic ↵marcelloc2012-02-191-36/+38
| | | | rules and update country lists
* pfblocker - version 1.0.1 with minor fixesMarcello Coutinho2011-12-191-0/+23
|
* pfBlocker - Fix update_frequency cron callmarcelloc2011-11-111-11/+20
|
* pfBlocker - version 0.1.4.6 with fixes in float rules check and about gui infomarcelloc2011-11-111-2/+5
|
* pfBlocker - version 0.1.4.5 is out with lists update frequency and widget ↵Marcello Coutinho2011-11-111-15/+38
| | | | rule package count
* pfBlocker - include connection timeout to fetch callsMarcello Coutinho2011-11-061-0/+6
|
* pfBlocker - fixes in boot process, embedded platform and url table get file ↵Marcello Coutinho2011-11-051-16/+29
| | | | package function
* pfBlocker - version 0.1.4 changes alias/lists/rules engine and guiMarcello Coutinho2011-11-011-275/+327
|
* pfBlocker - fix table reload and txt load fileMarcello Coutinho2011-10-301-2/+14
|
* pfBlocker - include table-entries size validation checkmarcelloc2011-10-291-5/+38
|
* pfBlocker - version 0.1.2 with widget and more fixesmarcelloc2011-10-281-10/+12
|
* pfBlocker - fix whitelist checkmarcelloc2011-10-281-2/+2
|
* pfBlocker - more improvementsmarcelloc2011-10-281-5/+7
|
* pfBlocker-dev - fix alias creation check for outbound trafficmarcelloc2011-10-281-1/+1
|
* pfBlocker-dev - version 0.1.1 with countryblock and ipblocklist togethermarcelloc2011-10-271-41/+149
|
* pfBlocker-dev - update files and dir referencesmarcelloc2011-10-271-85/+85
|
* pfblocker-dev - rename filesmarcelloc2011-10-271-0/+402
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-16 18:49:03 +0000