summaryrefslogtreecommitdiffstats
path: root/usr/local/www/system_gateway_groups_edit.php
diff options
context:
space:
mode:
authorErmal LUÇI <eri@pfsense.org>2015-01-15 20:17:46 +0100
committerErmal LUÇI <eri@pfsense.org>2015-01-15 20:17:46 +0100
commit89f171b052fbe72aed654d2a1c3d5a24e9bf9902 (patch)
tree88099045c1b9056bd469f156c28e0015c811980e /usr/local/www/system_gateway_groups_edit.php
parent98bf4991dc31f97fc7315a6b8aba433de9d39cea (diff)
downloadpfsense-89f171b052fbe72aed654d2a1c3d5a24e9bf9902.zip
pfsense-89f171b052fbe72aed654d2a1c3d5a24e9bf9902.tar.gz
Ticket #3997, teach code to track carp through uniqids(). Missing carp GUI changes and upgrade code
Diffstat (limited to 'usr/local/www/system_gateway_groups_edit.php')
-rw-r--r--usr/local/www/system_gateway_groups_edit.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/usr/local/www/system_gateway_groups_edit.php b/usr/local/www/system_gateway_groups_edit.php
index 11b4dd5..01dede2 100644
--- a/usr/local/www/system_gateway_groups_edit.php
+++ b/usr/local/www/system_gateway_groups_edit.php
@@ -51,7 +51,6 @@ if (!is_array($config['gateways']['gateway_group']))
$a_gateway_groups = &$config['gateways']['gateway_group'];
$a_gateways = return_gateways_array();
-$carplist = get_configured_carp_interface_list();
$categories = array('down' => gettext("Member Down"),
'downloss' => gettext("Packet Loss"),
@@ -248,6 +247,7 @@ jQuery(function ($) {
<td class="listhdrr">Description</td>
</tr>
<?php
+ $carplist = get_configured_carp_interface_list($interface);
foreach($a_gateways as $gwname => $gateway) {
if(!empty($pconfig['item'])) {
$af = explode("|", $pconfig['item'][0]);
@@ -296,8 +296,6 @@ jQuery(function ($) {
echo "<option value='address' {$selected['address']} >" . gettext("Interface Address") . "</option>\n";
foreach($carplist as $vip => $address) {
echo "<!-- $vip - $address - $interface -->\n";
- if(!preg_match("/^{$interface}_/i", $vip))
- continue;
if(($gateway['ipprotocol'] == "inet") && (!is_ipaddrv4($address)))
continue;
if(($gateway['ipprotocol'] == "inet6") && (!is_ipaddrv6($address)))
OpenPOWER on IntegriCloud