diff options
| author | Pierre POMES <pierre.pomes@gmail.com> | 2010-12-10 20:42:45 -0500 |
|---|---|---|
| committer | Pierre POMES <pierre.pomes@gmail.com> | 2010-12-10 20:42:55 -0500 |
| commit | 25f6730aed1e6af32c0cf4d628ece458e20b0094 (patch) | |
| tree | 34b32ecf5fa8285e01f422cac918238493dc9060 /usr | |
| parent | 2c6b0d67b439623dbeca5bec6c4a5660822a7b41 (diff) | |
| download | pfsense-25f6730aed1e6af32c0cf4d628ece458e20b0094.zip pfsense-25f6730aed1e6af32c0cf4d628ece458e20b0094.tar.gz | |
Add IPSec 'ipalias' VIP support. Ticket #1041
Diffstat (limited to 'usr')
| -rwxr-xr-x | usr/local/www/vpn_ipsec.php | 5 | ||||
| -rw-r--r-- | usr/local/www/vpn_ipsec_phase1.php | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/usr/local/www/vpn_ipsec.php b/usr/local/www/vpn_ipsec.php index f9d374d..40879f6 100755 --- a/usr/local/www/vpn_ipsec.php +++ b/usr/local/www/vpn_ipsec.php @@ -191,7 +191,10 @@ include("head.inc"); $iflabels = get_configured_interface_with_descr(); $carplist = get_configured_carp_interface_list(); foreach ($carplist as $cif => $carpip) - $iflabels[$cif] = strtoupper($cif) . " ({$carpip})"; + $iflabels[$cif] = $carpip." (".get_vip_descr($carpip).")"; + $aliaslist = get_configured_ip_aliases_list(); + foreach ($aliaslist as $aliasip => $aliasif) + $iflabels[$aliasip] = $aliasip." (".get_vip_descr($aliasip).")"; $if = htmlspecialchars($iflabels[$ph1ent['interface']]); } else diff --git a/usr/local/www/vpn_ipsec_phase1.php b/usr/local/www/vpn_ipsec_phase1.php index bb0d103..aef07f3 100644 --- a/usr/local/www/vpn_ipsec_phase1.php +++ b/usr/local/www/vpn_ipsec_phase1.php @@ -510,6 +510,9 @@ function dpdchkbox_change() { $carplist = get_configured_carp_interface_list(); foreach ($carplist as $cif => $carpip) $interfaces[$cif] = $carpip." (".get_vip_descr($carpip).")"; + $aliaslist = get_configured_ip_aliases_list(); + foreach ($aliaslist as $aliasip => $aliasif) + $interfaces[$aliasip] = $aliasip." (".get_vip_descr($aliasip).")" = $aliasip." (".get_vip_descr($aliasip).")" = $aliasip." (".get_vip_descr($aliasip).")"; foreach ($interfaces as $iface => $ifacename): ?> <option value="<?=$iface;?>" <?php if ($iface == $pconfig['interface']) echo "selected"; ?>> |
