summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/inc/openvpn.auth-user.php18
1 files changed, 8 insertions, 10 deletions
diff --git a/etc/inc/openvpn.auth-user.php b/etc/inc/openvpn.auth-user.php
index 3a077b7..b753f71 100644
--- a/etc/inc/openvpn.auth-user.php
+++ b/etc/inc/openvpn.auth-user.php
@@ -181,17 +181,15 @@ if (is_array($attributes['routes'])) {
}
if (isset($attributes['framed_ip'])) {
-/* XXX: only use when TAP windows driver >= 8.2.x */
-/* if (isset($attributes['framed_mask'])) {
- $content .= "topology subnet\n";
- $content .= "ifconfig-push {$attributes['framed_ip']} {$attributes['framed_mask']}";
- } else {
-*/
- $content .= "topology net30\n";
- $content .= "ifconfig-push {$attributes['framed_ip']} ". long2ip((ip2long($attributes['framed_ip']) + 1));
-// }
+ if (isset($attributes['framed_mask'])) {
+ $content .= "topology subnet\n";
+ $content .= "ifconfig-push {$attributes['framed_ip']} {$attributes['framed_mask']}";
+ } else {
+ $content .= "topology net30\n";
+ $content .= "ifconfig-push {$attributes['framed_ip']} ". long2ip((ip2long($attributes['framed_ip']) - 1));
+ }
}
-
+
if (!empty($content))
@file_put_contents("{$g['tmp_path']}/{$username}", $content);
OpenPOWER on IntegriCloud