diff options
| author | Seth Mos <seth.mos@dds.nl> | 2011-04-28 11:33:48 +0200 |
|---|---|---|
| committer | Seth Mos <seth.mos@dds.nl> | 2011-04-28 11:33:48 +0200 |
| commit | fcdc894353c77f527c209bbb966c71b7ea20dd13 (patch) | |
| tree | 9a92684249810a9f00b659ef877a1f641fa99134 /etc/inc/openvpn.inc | |
| parent | 753bd64dffb8352ea273c1bf1f00aa099ec38634 (diff) | |
| parent | 1dfb77950b9cc50158292b4590f22bd186ab6448 (diff) | |
| download | pfsense-fcdc894353c77f527c209bbb966c71b7ea20dd13.zip pfsense-fcdc894353c77f527c209bbb966c71b7ea20dd13.tar.gz | |
Merge remote branch 'upstream/master'
Conflicts:
etc/inc/pfsense-utils.inc
Diffstat (limited to 'etc/inc/openvpn.inc')
| -rw-r--r-- | etc/inc/openvpn.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc index a444185..acb3d58 100644 --- a/etc/inc/openvpn.inc +++ b/etc/inc/openvpn.inc @@ -397,13 +397,15 @@ 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); $ip2 = long2ip32($baselong + 2); $conf .= "ifconfig $ip1 $ip2\n"; break; - case 'p2p_tls': case 'server_tls': case 'server_user': case 'server_tls_user': |
