summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Code style v wPhil Davis2015-12-1714-176/+251
|
* add these three strongswan libs to the obsoletedfiles list. They haven't ↵Chris Buechler2015-12-161-0/+3
| | | | been included in any releases, but were briefly included in snapshots in mid April 2015.
* Merge pull request #2254 from phil-davis/patch-2Stephen Beaver2015-12-161-4/+5
|\
| * Code style index.phpPhil Davis2015-12-171-4/+5
|/ | | Couple of little bits here.
* Further refinement to widget configStephen Beaver2015-12-161-1/+1
|
* Fixed the broken widget config action (again)Stephen Beaver2015-12-161-1/+1
|
* no longer usedJared Dillard2015-12-161-1/+0
|
* fixed issue where if all widgets were in col2, no col1 was createdJared Dillard2015-12-161-41/+44
|
* Reverted commit 677d8bdfebace3321da677a57a0756a27332d505, PR 2218Stephen Beaver2015-12-161-12/+11
| | | | because it broke all of the widget configuration actions.
* move tree.css to main css filesJared Dillard2015-12-166-139/+138
|
* Fixed table apeparance, headers, button placement and row drag/drop/moveStephen Beaver2015-12-161-13/+18
|
* clean up common colorsJared Dillard2015-12-162-66/+67
|
* Corrected movable/sortble table row handlingStephen Beaver2015-12-161-12/+15
|
* improve firewall rules table (WIP)Jared Dillard2015-12-163-29/+33
|
* Fixed #4915Stephen Beaver2015-12-161-0/+5
|
* Merge pull request #2252 from phil-davis/r013Stephen Beaver2015-12-1611-167/+206
|\
| * Code style services dhcp dnsmasq dyndnsPhil Davis2015-12-1611-167/+206
| |
* | Support <savehelp> package tag to allow adding help text to the save button.Stephen Beaver2015-12-161-2/+13
| |
* | Merge pull request #2251 from phil-davis/patch-2Stephen Beaver2015-12-161-1/+1
|\ \
| * | services_dyndns_edit requestif key namePhil Davis2015-12-161-1/+1
|/ / | | | | This probably fixes forum thread https://forum.pfsense.org/index.php?topic=104076.0
* | Merge pull request #2250 from phil-davis/r012Stephen Beaver2015-12-1612-52/+76
|\ \ | |/ |/|
| * Code style services captive portalPhil Davis2015-12-1612-52/+76
| |
* | Merge pull request #2249 from phil-davis/patch-2Stephen Beaver2015-12-162-4/+3
|\ \
| * | services_captiveportal text changesPhil Davis2015-12-161-3/+3
| |/
| * No need to set LANG env var hereRenato Botelho2015-12-161-1/+0
|/
* Whitesapce changeStephen Beaver2015-12-161-2/+2
|
* Remove bogus radio buttonStephen Beaver2015-12-161-7/+1
|
* Fixed #5617Stephen Beaver2015-12-161-4/+6
| | | | Added ID and style to routing table
* Merge pull request #2248 from NOYB/HTML_Compliance_-_Log_WidgetStephen Beaver2015-12-161-2/+2
|\
| * HTML Compliance - Log WidgetNOYB2015-12-161-2/+2
| | | | | | | | | | The for attribute of the label element must refer to a non-hidden form control. Added id tag to form control.
* | Merge pull request #2247 from NOYB/HTML_Compliance_-_Services_Status_WidgetStephen Beaver2015-12-161-1/+1
|\ \
| * | HTML Compliance - Services Status WidgetNOYB2015-12-161-1/+1
| |/ | | | | | | | | | | | | | | Attribute height not allowed on element select at this point. The for attribute of the label element must refer to a non-hidden form control. '<label for="inputPassword3" class="col-sm-3 control-label">Hidden services</label>' Can't find an "inputPassword3" form element this binds too. Maybe it's a placeholder for future feature. Leaving it for now.
* | Merge pull request #2246 from NOYB/HTML_Compliance_-_Interfaces_WidgetStephen Beaver2015-12-161-2/+2
|\ \
| * | HTML Compliance - Interfaces WidgetNOYB2015-12-161-2/+2
| |/ | | | | | | | | Replace status indicator icon alt tag with title tag. Add space between td tag and attributes.
* | Merge pull request #2245 from NOYB/HTML_Compliance_-_System_-_General_SetupStephen Beaver2015-12-161-2/+5
|\ \
| * | HTML Compliance - System - General SetupNOYB2015-12-161-2/+5
| |/ | | | | | | | | Remove placeholder from dns gateway selector. Close container div tag.
* | Merge pull request #2244 from NOYB/Consolidate_conv_log_filter_RegEx_PatternsStephen Beaver2015-12-161-45/+32
|\ \
| * | Consolidate conv_log_filter RegEx PatternsNOYB2015-12-151-46/+32
| |/ | | | | | | | | Consolidate common regex patterns. Use pattern globally in parse functions.
* | Merge pull request #2243 from NOYB/Remove_PPTPSStephen Beaver2015-12-161-1/+0
|\ \ | |/ |/|
| * Remove PPTPS from conv_log_filterNOYB2015-12-151-1/+0
|/
* Merge pull request #2242 from phil-davis/r011Chris Buechler2015-12-151-29/+32
|\
| * util.inc syntax error and code stylePhil Davis2015-12-161-29/+32
|/ | | | | Line 578 of the previous commit had a bonus ")". Code style also fixed up.
* Merge pull request #2151 from stilez/patch-11Chris Buechler2015-12-151-55/+104
|\
| * IPv6-ify and rewrite ip_range_to_subnet_array() [resubmit of #1709 (was #974)]stilez2015-12-031-55/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Function cannot handle IPv6 ranges, and is horribly inefficient, because it uses splitting+function call recursion for each "half". Even if extended for IPv6, it is probably far too inefficient for IPv6 on low power hardware. As written it's simply unable to handle an IPv6 environment or IPv6 ranges. As a result, if used in an IPv6 context, it would fail. It has other problematic issues: Validates both IPv4 and IPv6 as valid args, but then tries to process any IPv6 subnet bitwise as x32 LONG without further checking, potentially causing very incorrect return values. Doesn't detect if the start/end IPs are of same type (eg when validating user input related to an IP range), so a range such as "1.1.1.1-fe00::" is not detected as invalid. I've rewritten this function, but have had to effectively produce a better algorithm not just a code rewrite. The updated algorithm is extremely fast and gives identical results as far as I can tell from extensive testing. It also handles IPv6 much faster than the old code handled IPv4, and appears very robust. The algorithm is explained below. Changes: 1) IPv4/IPv6 works correctly. 2) detects mismatched start-end IP types 3) the algorithm written seems very robust (tested on 1 million random IPv4/IPv6 ranges and a number of edge cases, gives same results as existing code) 4) execution time is linear or better to number of bits, rather than exponential (due to lack of split+recurse). So it runs in about 4 - 6% of the time as the existing code for IPv4 (1ms vs. 20ms). On 128-bit IPv6 this would be a much greater saving. 5) it uses simple string pattern matching of low bit(s) to test needed subnets, so it's very efficient. (ip2long, or BCMATH, etc, don't actually add much if anything) 6) 3 functions never used anywhere else are removed (find_smallest_cidr(), ip_before() and ip_after()). Checked using Github search, can't find any other place using these, so removed and left a comment. RESUBMITTED FROM PR #1709 (WAS #974) TO ALLOW MERGING - NO CODE CHANGE. ALGORITHM DETAILS BELOW CHANGES SINCE PR #1709: (1) PHP bug related to "long numeric string compare" has been fixed for over a year now, since October 2014, which means all the === and strcmp() can revert to normal == and <. See https://bugs.php.net/bug.php?id=54547 (2) haven't removed redundant function "find_smallest_cidr_v4()" which can be done separately ALGORITHM: Documented on pfsense dev list 19-20 May 2013. PD'd by Stilez - please use as you like! A quick consideration of what subnets have to be present to span the endpoints of a range, shows that this can be done much faster, can be made to handle IPv6 (which present code never will!), and avoid function call recursion. SUMMARY: Algorithm looks at patterns of 0's and 1's in the least significant bit (or bits). These are all that needs checking, to identify the (guaranteed) correct, minimal and optimal subnet array. As a result, string/binary, with pattern matching built-in, is very efficient. It uses just 2 pattern-matching rules to chop off subnets at both ends, until nothing's left. (a) If any range has low bit 1 (in startip) or 0 (in endip), these endpoints are _always_ optimally represented by their own 'single IP' CIDR; the remaining range then shrinks by one IP up or down. Only one edge case needs checking: if the range contained exactly 2 adjacent IPs then these CIDRs will now exactly span it, and we're done. (b) Otherwise, if any range has low bits 0 (in ip1) _and_ 1 (in ip2), these low bits can *always* be ignored for subnet spanning. So provided we remember the bits we've place-shifted, we can _always_ right-shift and chop off those bits, and loop to span the remaining (place shifted) range as above, until after a few loops, the remaining (place shifted) range has become just one IP (ip1==ip2).
* | Merge pull request #2152 from stilez/patch-12Chris Buechler2015-12-151-6/+11
|\ \
| * | data sanitising: ip2long32, ip2ulong, long2ip32 (Resubmit of #1789)stilez2015-12-031-6/+11
| |/ | | | | Self explanatory. If these functions find themselves trying to convert non-int data (or an x64 int with non-zeros in any bits >32) to dotted IPv4, or non-dotted IPv4 to integer IPv4 values, something's wrong and they shouldn't return a value that looks like they succeeded.
* | Fixed #5617Stephen Beaver2015-12-151-2/+5
| | | | | | | | Table columns corrected
* | Merge pull request #2241 from BBcan177/patch-3Stephen Beaver2015-12-157-237/+38
|\ \
| * | Add breadcrumb to pkg.phpBBcan1772015-12-151-1/+18
| | |
| * | Fix handling of 0-byte files uploaded to the CP file manager.jim-p2015-12-151-1/+5
| | |
OpenPOWER on IntegriCloud