From 35af71416e19868fd09ec6701114c208fa4a1c4d Mon Sep 17 00:00:00 2001 From: smos Date: Sun, 15 Jan 2012 12:40:38 +0100 Subject: Fix for ticket 2071, this allows link local addresses for gateways. Backend already added the interface scope for link local addresses, hurrah. --- usr/local/www/system_gateways_edit.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/usr/local/www/system_gateways_edit.php b/usr/local/www/system_gateways_edit.php index c7cb10a..86cb0c8 100755 --- a/usr/local/www/system_gateways_edit.php +++ b/usr/local/www/system_gateways_edit.php @@ -128,9 +128,12 @@ if ($_POST) { if(empty($parent_ip) || empty($parent_sn)) { $input_errors[] = gettext("You can not use a IPv4 Gateway Address on a IPv6 only interface."); } else { - $subnet = gen_subnetv6($parent_ip, $parent_sn) . "/" . $parent_sn; - if(!ip_in_subnet($_POST['gateway'], $subnet)) - $input_errors[] = sprintf(gettext("The gateway address %1\$s does not lie within the chosen interface's subnet '%2\$s'."), $_POST['gateway'],$subnet); + /* do not do a subnet match on a link local address, it's valid */ + if(! preg_match("/fe80::/", $_POST['gateway'])) { + $subnet = gen_subnetv6($parent_ip, $parent_sn) . "/" . $parent_sn; + if(!ip_in_subnet($_POST['gateway'], $subnet)) + $input_errors[] = sprintf(gettext("The gateway address %1\$s does not lie within the chosen interface's subnet '%2\$s'."), $_POST['gateway'],$subnet); + } } } -- cgit v1.1