Skip to content

Commit

Permalink
Openvpn fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@apollo13
apollo13 committed May 24, 2015
1 parent e2c20d5 commit 137498b
Showing 1 changed file with 27 additions and 2 deletions.
29 changes: 27 additions & 2 deletions etc/inc/openvpn.inc
View file
Expand Up @@ -582,8 +582,33 @@ function openvpn_reconfigure($mode, $settings) {
case 'server_user':
case 'server_tls_user':
if (!empty($ip) && !empty($mask)) {
$conf .= "server {$ip} {$mask}\n";
if(is_ipaddr($ipv6))
$conf .= "mode server\n";
$baselong = ip2long32($ip) & gen_subnet_mask_long($mask);
$subnetsize = subnet_size($settings['tunnel_network']);
if ($settings['dev_mode'] == "tap" or $settings['topology_subnet']) {
$serverip = long2ip32($baselong + 1);
$dynamic_start = long2ip32($baselong + 2);
$dynamic_end = long2ip32($baselong + $subnetsize - 2);
$conf .= "ifconfig {$serverip} {$mask}\n";
$conf .= "push \"route-gateway {$serverip}\"\n";
if ($settings['pool_enable']) {
$conf .= "ifconfig-pool {$dynamic_start} {$dynamic_end} {$mask}\n";
}
} else {
$serverip1 = long2ip32($baselong + 1);
$serverip2 = long2ip32($baselong + 2);
$dynamic_start = long2ip32($baselong + 4);
$dynamic_end = long2ip32($baselong + $subnetsize - 4);
$conf .= "ifconfig {$serverip1} {$serverip2}\n";
if ($settings['pool_enable']) {
$conf .= "ifconfig-pool {$dynamic_start} {$dynamic_end}\n";
}
$conf .= "route {$ip} {$mask}\n";
if (!$settings['client-to-client']) {
$conf .= "push \"route {$serverip1}\"\n";
}
}
if (is_ipaddr($ipv6))
$conf .= "server-ipv6 {$ipv6}/{$prefix}\n";
$conf .= "client-config-dir {$g['varetc_path']}/openvpn-csc\n";
} else {
Expand Down

2 comments on commit 137498b

@jcasale
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As per the manpage, the existing server directive can have a 'nopool' appended which then does exactly what the pfsense web ui check box suggests it might do. This leaves the assignment in the ccd for the appropriate client.

@apollo13
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jcasale Oh, that would probably the easier solution :D

Please sign in to comment.