diff options
author | Ermal Luçi <eri@pfsense.org> | 2009-10-01 15:18:17 +0000 |
---|---|---|
committer | Ermal Luçi <eri@pfsense.org> | 2009-10-01 15:19:42 +0000 |
commit | abcb2bed927c18f29b12972f023b253c703132d1 (patch) | |
tree | e06b5f0da200a6694b2d3a5ba79907fb6de06b46 /usr/local/www/vpn_ipsec_phase1.php | |
parent | 6b0c587976d5941bce0b7e569a519f7e7fcbc62a (diff) | |
download | pfsense-abcb2bed927c18f29b12972f023b253c703132d1.zip pfsense-abcb2bed927c18f29b12972f023b253c703132d1.tar.gz |
* Convert carp/vips code to behave the same as other interfaces.
* Make optimizations around it.
* Make sure when we reload teh underlying interface we reload carp too.
* Some fixes around the code.
Reviewed-by: scott@ and billm@
Diffstat (limited to 'usr/local/www/vpn_ipsec_phase1.php')
-rw-r--r-- | usr/local/www/vpn_ipsec_phase1.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/usr/local/www/vpn_ipsec_phase1.php b/usr/local/www/vpn_ipsec_phase1.php index b1f7a1a..e45948f 100644 --- a/usr/local/www/vpn_ipsec_phase1.php +++ b/usr/local/www/vpn_ipsec_phase1.php @@ -471,11 +471,9 @@ function dpdchkbox_change() { <select name="interface" class="formselect"> <?php $interfaces = get_configured_interface_with_descr(); - $carpips = find_number_of_needed_carp_interfaces(); - for ($i=0; $i<$carpips; $i++) { - $carpip = find_interface_ip("carp" . $i); - $interfaces['carp' . $i] = "CARP{$i} ({$carpip})"; - } + $carplist = get_configured_carp_interface_list(); + foreach ($carplist as $cif => $carpip) + $interfaces[$cif] = strtoupper($cif) . " ({$carpip})"; foreach ($interfaces as $iface => $ifacename): ?> <option value="<?=$iface;?>" <?php if ($iface == $pconfig['interface']) echo "selected"; ?>> |