mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

DHCP4 Relay must relay to an IPv4 address

Browse Source 
This code would accept an IPv6 address, but that causes an error to be reported by the DHCP (v4) Relay service on startup.
Validate the destination server IP address(es) to ensure they are IPv4.
This commit is contained in:
Phil Davis 2016-12-13 11:24:39 +05:45 committed by GitHub
parent c165a17e02
commit bdda1446ca
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/usr/local/www/services_dhcp_relay.php
View File

@ -84,8 +84,8 @@ if ($_POST) {
if ($_POST['server']) {
foreach ($_POST['server'] as $checksrv => $srv) {
if (!empty($srv[0])) { // Filter out any empties
if (!is_ipaddr($srv[0])) {
$input_errors[] = sprintf(gettext("Destination Server IP address %s is not a valid IP address."), $srv[0]);
if (!is_ipaddrv4($srv[0])) {
$input_errors[] = sprintf(gettext("Destination Server IP address %s is not a valid IPv4 address."), $srv[0]);
}
if (!empty($svrlist)) {
@ -175,9 +175,10 @@ function createDestinationServerInputGroup($value = null) {
$group->add(new Form_IpAddress(
'server',
'Destination server',
$value
$value,
'V4'
))->setWidth(4)
->setHelp('This is the IP address of the server to which DHCP requests are relayed.')
->setHelp('This is the IPv4 address of the server to which DHCP requests are relayed.')
->setIsRepeated();
$group->enableDuplication(null, true); // Buttons are in-line with the input