lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-19 19:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

openvpn: untie server-ipv6 from server directive

Browse Source 
PR: https://forum.opnsense.org/index.php?topic=24094.0
This commit is contained in:
Franco Fichtner 2021-07-30 13:24:36 +02:00
parent 51e7ba17d5
commit c5c622fd77
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/etc/inc/plugins.inc.d/openvpn.inc
View File

@ -587,15 +587,17 @@ function openvpn_reconfigure($mode, $settings, $device_only = false)
// configure p2p/server modes
switch ($settings['mode']) {
case 'p2p_tls':
// If the CIDR is less than a /30, OpenVPN will complain if you try to
// use the server directive. It works for a single client without it.
// See ticket #1417
if (!empty($ip) && !empty($mask) && ($cidr < 30)) {
$conf .= "server {$ip} {$mask}\n";
$conf .= "client-config-dir /var/etc/openvpn-csc/" . $vpnid . "\n";
if (is_ipaddr($ipv6)) {
if (!empty($ip) || !empty($ipv6)) {
// If the CIDR is less than a /30, OpenVPN will complain if you try to
// use the server directive. It works for a single client without it.
// See ticket #1417
if (is_ipaddrv4($ip) && !empty($mask) && $cidr < 30) {
$conf .= "server {$ip} {$mask}\n";
}
if (is_ipaddrv6($ipv6) && !empty($prefix)) {
$conf .= "server-ipv6 {$ipv6}/{$prefix}\n";
}
$conf .= "client-config-dir /var/etc/openvpn-csc/" . $vpnid . "\n";
}
/* XXX FALLTHROUGH */
case 'p2p_shared_key':
@ -619,9 +621,11 @@ function openvpn_reconfigure($mode, $settings, $device_only = false)
case 'server_tls':
case 'server_user':
case 'server_tls_user':
if (!empty($ip) && !empty($mask)) {
$conf .= "server {$ip} {$mask}\n";
if (is_ipaddr($ipv6)) {
if (!empty($ip) || !empty($ipv6)) {
if (is_ipaddrv4($ip) && !empty($mask)) {
$conf .= "server {$ip} {$mask}\n";
}
if (is_ipaddrv6($ipv6) && !empty($prefix)) {
$conf .= "server-ipv6 {$ipv6}/{$prefix}\n";
}
$conf .= "client-config-dir /var/etc/openvpn-csc/" . $vpnid . "\n";