From 6c9cf4662eaa2db6cd8eea770f7364aaa9feae99 Mon Sep 17 00:00:00 2001 From: jim-p Date: Mon, 18 Apr 2011 18:27:47 -0400 Subject: Slightly different fix for #1417 that doesn't mess up other parameters needed by p2p_tls --- etc/inc/openvpn.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'etc/inc/openvpn.inc') diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc index 56f6cf5..c82735c 100644 --- a/etc/inc/openvpn.inc +++ b/etc/inc/openvpn.inc @@ -382,13 +382,14 @@ function openvpn_reconfigure($mode, $settings) { // configure p2p/server modes switch($settings['mode']) { + case 'p2p_tls': + $conf .= "client-config-dir {$g['varetc_path']}/openvpn-csc\n"; case 'p2p_shared_key': $baselong = ip2long32($ip) & ip2long($mask); $ip1 = long2ip32($baselong + 1); $ip2 = long2ip32($baselong + 2); $conf .= "ifconfig $ip1 $ip2\n"; break; - case 'p2p_tls': case 'server_tls': case 'server_user': case 'server_tls_user': -- cgit v1.1 From bd24573bb00fcc385587cf87d1d455d000a17ff0 Mon Sep 17 00:00:00 2001 From: jim-p Date: Tue, 19 Apr 2011 19:59:29 -0400 Subject: Backing out changes from ticket #1417, it was not a valid openvpn config that the user was trying to make. --- etc/inc/openvpn.inc | 1 - 1 file changed, 1 deletion(-) (limited to 'etc/inc/openvpn.inc') diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc index c82735c..df531c7 100644 --- a/etc/inc/openvpn.inc +++ b/etc/inc/openvpn.inc @@ -383,7 +383,6 @@ function openvpn_reconfigure($mode, $settings) { // configure p2p/server modes switch($settings['mode']) { case 'p2p_tls': - $conf .= "client-config-dir {$g['varetc_path']}/openvpn-csc\n"; case 'p2p_shared_key': $baselong = ip2long32($ip) & ip2long($mask); $ip1 = long2ip32($baselong + 1); -- cgit v1.1 From 0cc5ab42269a5aa1588ac2f862b0201917569ada Mon Sep 17 00:00:00 2001 From: jim-p Date: Thu, 21 Apr 2011 09:59:09 -0400 Subject: Confirmed working fix for ticket #1417 - with this change I have two-way connectivity on Site-to-Site (SSL/TLS) with iroutes. --- etc/inc/openvpn.inc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'etc/inc/openvpn.inc') diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc index df531c7..4115784 100644 --- a/etc/inc/openvpn.inc +++ b/etc/inc/openvpn.inc @@ -383,6 +383,8 @@ function openvpn_reconfigure($mode, $settings) { // configure p2p/server modes switch($settings['mode']) { case 'p2p_tls': + $conf .= "server {$ip} {$mask}\n"; + $conf .= "client-config-dir {$g['varetc_path']}/openvpn-csc\n"; case 'p2p_shared_key': $baselong = ip2long32($ip) & ip2long($mask); $ip1 = long2ip32($baselong + 1); -- cgit v1.1