should be min($bits1, $bits2) for 'largest subnet'
5 or 6
fix $subnet1 should be $subnet2, thanks rbgarba
fix 4 should be 6 (thanks, good catch)
Fix logic for subnet overlap check + canonical for IPv6
The subnet overlap functions came up as a concern while fixing redmine 5702.Specifically - The "canonical" function check_subnets_overlap() doesn't handle IPv6 (util.inc has standardised on v4/v6/agnostic versions, but this doesn't fit). Fixed by adding transparent detection of v4/v6 and a specific IPv4-only version...
This broke things again. Revert "data sanitising: ip2long32, ip2ulong, long2ip32 (FIXED RESUBMIT of #2152)"
This reverts commit 4557e3fba627c91c37afba04681cdabf71eccf57.
data sanitising: ip2long32, ip2ulong, long2ip32 (FIXED RESUBMIT of #2152)
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....
Silence array_map() call to avoid getting unlink errors for directories
Reverts PR2152 reported as causing OpenVPN issues here: https://forum.pfsense.org/index.php?topic=104175.0
Fix gen_subnetv4_max
and use it in services_dhcp rather than trying to do the similarcalculation in-line.Should fix redmine #5654 and probably a bunch of other things that usegen_subnet_max
util.inc syntax error and code style
Line 578 of the previous commit had a bonus ")".Code style also fixed up.
Merge pull request #2151 from stilez/patch-11
Merge pull request #2152 from stilez/patch-12
Remove all pfSense_MODULE and pfSense_BUILDER_BINARIES definitions, whatever was the reason they were added, it was never finished and it's not being used
Retire verify_digital_signature() and pubkey.pem
Code style and white space in etc
unlink_if_exists() : minor enhancement
two minor enhancements -
1) add a comment for skim-readers, that patterns are allowed (but not arrays?) and that no error is returned2) use array_map rather than foreach loop
data sanitising: ip2long32, ip2ulong, long2ip32 (Resubmit of #1789)
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.
IPv6-ify and rewrite ip_range_to_subnet_array() [resubmit of #1709 (was #974)]
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....
Type up SCRIPT tags
Simplify get_configured_carp_interface_list().
No functional changes.
Convert CARP interface name to uniqid notation. Ticket #4858
Copyright updates ( 3 of 3)
Completed #5333
Merge pull request #1572 from stilez/patch-5
Fixed is_domain method call
Added the possibility to use wildcard hostnames in certificate manager SAN fields
Move main pfSense content to src/