mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add carp support for OpenVPN. Ticket #69

Browse Source
This commit is contained in:
pierrepomes 2009-12-02 22:31:26 -05:00
parent 7998c3f280
commit 3d06e8f02f
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etc/inc/openvpn.inc
View File

@ -302,7 +302,13 @@ function openvpn_reconfigure($mode,& $settings) {
if (!$interface)
$interface = 'WAN';
$iface = convert_friendly_interface_to_real_interface_name($interface);
/* For a carp interface, the name is well known:vip1, vip2, ...*/
if (!strncmp($interface, "vip", 3)) {
$iface=$interface;
} else {
$iface=convert_friendly_interface_to_real_interface_name($interface);
}
$lines = explode(' ', trim(shell_exec("ifconfig {$iface} | grep inet | grep -v inet6")));
$iface_ip = $lines[1];

5
usr/local/www/vpn_openvpn_client.php
View File

@ -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";

3
usr/local/www/vpn_openvpn_server.php
View File

@ -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'])