summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2011-11-16 16:38:27 -0500
committerjim-p <jimp@pfsense.org>2011-11-16 16:38:27 -0500
commit002cacab57caab1923be6b4b75b96ac3aae7a65f (patch)
treeefeedfc6fe6019f8b03a737b42b8674272eb924d /etc
parent459e93330b130531f2a59b58b24a9effb8bfa48f (diff)
downloadpfsense-002cacab57caab1923be6b4b75b96ac3aae7a65f.zip
pfsense-002cacab57caab1923be6b4b75b96ac3aae7a65f.tar.gz
Fix this ifconfig-push to also account for tap.
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/openvpn.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc
index d478c53..9729217 100644
--- a/etc/inc/openvpn.inc
+++ b/etc/inc/openvpn.inc
@@ -737,7 +737,10 @@ function openvpn_resync_csc(& $settings) {
$serverip = long2ip32($baselong + 1);
$clientip = long2ip32($baselong + 2);
/* Because this is being pushed, the order from the client's point of view. */
- $conf .= "ifconfig-push {$clientip} {$serverip}\n";
+ if ($settings['dev_mode'] == 'tun')
+ $conf .= "ifconfig-push {$clientip} {$serverip}\n";
+ else
+ $conf .= "ifconfig-push {$clientip} {$mask}\n";
}
openvpn_add_dhcpopts($settings, $conf);
OpenPOWER on IntegriCloud