From 3d06e8f02f7df1a18350eebc86c35b1dfd1a9499 Mon Sep 17 00:00:00 2001
From: pierrepomes <pierre.pomes@interface-tech.com>
Date: Wed, 2 Dec 2009 22:31:26 -0500
Subject: Add carp support for OpenVPN. Ticket #69

---
 usr/local/www/vpn_openvpn_client.php | 5 ++++-
 usr/local/www/vpn_openvpn_server.php | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'usr')

diff --git a/usr/local/www/vpn_openvpn_client.php b/usr/local/www/vpn_openvpn_client.php
index 42f1de7..970efd2 100644
--- a/usr/local/www/vpn_openvpn_client.php
+++ b/usr/local/www/vpn_openvpn_client.php
@@ -387,7 +387,10 @@ function autotls_change() {
 							<select name="interface" class="formselect">
 								<?php
 									$interfaces = get_configured_interface_with_descr();
-										foreach ($interfaces as $iface => $ifacename):
+									$carplist = get_configured_carp_interface_list();
+									foreach ($carplist as $cif => $carpip)
+										$interfaces[$cif] = strtoupper($cif) . " ({$carpip})";
+									foreach ($interfaces as $iface => $ifacename):
 										$selected = "";
 										if ($iface == $pconfig['interface'])
 											$selected = "selected";
diff --git a/usr/local/www/vpn_openvpn_server.php b/usr/local/www/vpn_openvpn_server.php
index 4524731..008fd47 100644
--- a/usr/local/www/vpn_openvpn_server.php
+++ b/usr/local/www/vpn_openvpn_server.php
@@ -548,6 +548,9 @@ function netbios_change() {
 							<select name="interface" class="formselect">
 								<?php
 									$interfaces = get_configured_interface_with_descr();
+									$carplist = get_configured_carp_interface_list();
+									foreach ($carplist as $cif => $carpip)
+										$interfaces[$cif] = strtoupper($cif) . " ({$carpip})";
 									foreach ($interfaces as $iface => $ifacename):
 										$selected = "";
 										if ($iface == $pconfig['interface'])
-- 
cgit v1.1