dhcp - allow multiple subnets on ipv4 dhcp #816
Conversation
| @@ -779,6 +779,28 @@ function is_valid_shaperbw($val) { | |||
| } | |||
|
|
|||
| /* returns true if $test is in the range between $start and $end */ | |||
| function is_innet_v4 ($CIDR,$IP) { | |||
There was a problem hiding this comment.
There is already ip_in_subnet() that does the same, including IPv6
There was a problem hiding this comment.
OK, fixed it. The other functions I've included are fine?
There was a problem hiding this comment.
You didn't push the commit with the fix, at least I cannot see it here.
|
Is there any special reason to use the mask instead of bitmask? It's kind of standard on most of the configuration screens on pfSense to use a drop down with bitmask instead of a text field for mask. |
|
It's used just to match dhcp screen options, it lists current network and mask. So I've included it to avoid two types of network description on same tab. |
|
It cannot be automatically merge, could you please resubmit? |
netgate-git-updates
force-pushed
the
master
branch
from
73ffc25
to
095707f
Compare
Conflicts: etc/inc/services.inc usr/local/www/services_dhcp.php usr/local/www/status_dhcp_leases.php
|
Patch has conflicts and cannot be merged. Can you please re-submit and I'll take care of testing and get it merged. Sorry for the long delay |
No description provided.