Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | pfBlocker allow list ranges that are not exact subnets | Phil Davis | 2013-03-28 | 1 | -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. | ||||
* | fix typos in pfblocker | Chris Buechler | 2013-01-14 | 1 | -4/+4 |
| | |||||
* | Small cleanup for readability | Vince | 2012-10-10 | 1 | -1/+1 |
| | | | Small cleanup for readability | ||||
* | Net masking math was off by 1 | Vince | 2012-10-10 | 1 | -1/+1 |
| | | | Net masking math was off by 1 | ||||
* | Fixing duplicate IP/Range entries | darkain | 2012-10-09 | 1 | -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 properly | darkain | 2012-10-09 | 1 | -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 loading | Phil Davis | 2012-10-02 | 1 | -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 twice | Phil Davis | 2012-09-29 | 1 | -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. | ||||
* | Make the donation text read more naturally - Marcello, hopefully you get ↵ | Phil Davis | 2012-06-23 | 1 | -2/+2 |
| | | | | lots of donations, thanks for the work. | ||||
* | pfblocker - Include boot process check | marcelloc | 2012-06-04 | 2 | -154/+165 |
| | |||||
* | Revert "pfBlocker - Include boot process check" | marcelloc | 2012-06-04 | 2 | -423/+473 |
| | | | | This reverts commit 4149a349b894688723810e4886c95205dc34058f. | ||||
* | pfBlocker - Include boot process check | Marcello Coutinho | 2012-06-04 | 2 | -473/+423 |
| | |||||
* | pfblocker - update continent lists | Marcello Coutinho | 2012-03-29 | 6 | -19910/+10407 |
| | |||||
* | Merge pull request #232 from phil-davis/master | Marcello Coutinho | 2012-03-28 | 1 | -406/+452 |
|\ | | | | | Code formatting of pfblocker.inc | ||||
| * | Add bracketing to "if" and "foreach" statements. Make tab indenting ↵ | Phil Davis | 2012-03-28 | 1 | -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 references | jim-p | 2012-03-27 | 3 | -5/+5 |
| | | |||||
* | | Merge pull request #231 from phil-davis/master | Marcello Coutinho | 2012-03-26 | 1 | -2/+8 |
|\| | | | | | Prevent duplicated pfblocker rules on some interfaces | ||||
| * | Avoid getting pfBlocker rules duplicated on some interfaces if there are ↵ | Phil Davis | 2012-03-27 | 1 | -2/+8 |
| | | | | | | | | floating rules with interface="" mixed in the config filter rule list. | ||||
* | | pfblocker - updated country lists | Marcello Coutinho | 2012-03-16 | 6 | -11801/+29198 |
|/ | |||||
* | When called with the 'cron' parameter, add config.inc to the require_once ↵ | Phil Davis | 2012-03-15 | 1 | -0/+1 |
| | | | | list. config.inc will set date.timezone, thus avoiding PHP messages about use of the date() and mktime() functions. | ||||
* | Include foreach loop in "if (is_array($config['aliases']['alias']))" test, ↵ | Phil Davis | 2012-03-15 | 1 | -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 Davis | 2012-03-14 | 1 | -18/+17 |
| | |||||
* | Update config/pf-blocker/pfblocker.inc | Phil Davis | 2012-03-14 | 1 | -17/+18 |
| | |||||
* | pfBlocker - include php memory limit set to 250Mb when amd64 is detected | marcelloc | 2012-02-20 | 2 | -0/+8 |
| | |||||
* | pfBlocker - fix alias array check before loop, fix duplicates on autmatic ↵ | marcelloc | 2012-02-19 | 7 | -3752/+6762 |
| | | | | rules and update country lists | ||||
* | fix menu url in pfblocker,postfix and mailscanner xml file | marcelloc | 2012-01-02 | 1 | -1/+1 |
| | |||||
* | pfblocker - remove illegal character from javascript | marcelloc | 2011-12-20 | 1 | -1/+0 |
| | | | | | postfix - remove illegal character from javascript varnish - remove illegal character from javascript | ||||
* | pfblocker - remove widget scroll | marcelloc | 2011-12-20 | 1 | -2/+2 |
| | | | | | varnish - remove widget scroll postfix - remove widget scroll | ||||
* | pfblocker - update country lists | marcelloc | 2011-12-19 | 6 | -6073/+6844 |
| | |||||
* | pfblocker - version 1.0.1 with minor fixes | Marcello Coutinho | 2011-12-19 | 4 | -18/+54 |
| | |||||
* | pfBlocker - Fix update_frequency cron call | marcelloc | 2011-11-11 | 1 | -11/+20 |
| | |||||
* | pfBlocker - version 0.1.4.6 with fixes in float rules check and about gui info | marcelloc | 2011-11-11 | 2 | -3/+24 |
| | |||||
* | pfBlocker - Copy continent lists to www.pfsense.org | Marcello Coutinho | 2011-11-11 | 7 | -6/+117712 |
| | |||||
* | pfBlocker - minor fix in text display | Marcello Coutinho | 2011-11-11 | 1 | -1/+1 |
| | |||||
* | pfBlocker - version 0.1.4.5 is out with lists update frequency and widget ↵ | Marcello Coutinho | 2011-11-11 | 4 | -31/+109 |
| | | | | rule package count | ||||
* | pfBlocker - include connection timeout to fetch calls | Marcello Coutinho | 2011-11-06 | 1 | -0/+6 |
| | |||||
* | pfBlocker - fixes in boot process, embedded platform and url table get file ↵ | Marcello Coutinho | 2011-11-05 | 2 | -17/+30 |
| | | | | package function | ||||
* | pfBlocker - fix widget | Marcello Coutinho | 2011-11-01 | 1 | -1/+0 |
| | |||||
* | pfBlocker - version 0.1.4 changes alias/lists/rules engine and gui | Marcello Coutinho | 2011-11-01 | 7 | -457/+697 |
| | |||||
* | pfBlocker - fix table reload and txt load file | Marcello Coutinho | 2011-10-30 | 1 | -2/+14 |
| | |||||
* | pfBlocker - include table-entries size validation check | marcelloc | 2011-10-29 | 3 | -10/+41 |
| | |||||
* | pfBlocker - fix bug in get_countries | marcelloc | 2011-10-28 | 1 | -3/+3 |
| | |||||
* | pfBlocker - version 0.1.2 with widget and more fixes | marcelloc | 2011-10-28 | 3 | -11/+99 |
| | |||||
* | pfblocker - refix missing topspammers call in pfBlocker.xml | marcelloc | 2011-10-28 | 1 | -4/+4 |
| | |||||
* | pfBlocker - fix whitelist check | marcelloc | 2011-10-28 | 1 | -2/+2 |
| | |||||
* | pfBlocker - more improvements | marcelloc | 2011-10-28 | 2 | -17/+43 |
| | |||||
* | pfBlocker-dev - fix alias creation check for outbound traffic | marcelloc | 2011-10-28 | 5 | -977/+1 |
| | |||||
* | pfBlocker-dev - fix missing xml call to tospammers.xml | marcelloc | 2011-10-27 | 1 | -2/+2 |
| | |||||
* | pfBlocker-dev - version 0.1.1 with countryblock and ipblocklist together | marcelloc | 2011-10-27 | 5 | -98/+425 |
| | |||||
* | pfBlocker-dev - fix additional_files_needed reference | marcelloc | 2011-10-27 | 1 | -3/+3 |
| |