diff options
| author | jim-p <jimp@pfsense.org> | 2012-05-14 11:04:59 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2012-05-14 11:09:55 -0400 |
| commit | d9c96fb1edad9c437019b813818fbb6fcd723cbb (patch) | |
| tree | 13b217c4bb604a7eef5f546d79fede9437d80c9b | |
| parent | e32cb5d08d313f8265038e66a91ac96d4232ec53 (diff) | |
| download | pfsense-d9c96fb1edad9c437019b813818fbb6fcd723cbb.zip pfsense-d9c96fb1edad9c437019b813818fbb6fcd723cbb.tar.gz | |
Flip this test around since it's safer to assume the dev mode is tun. Ticket #2432
| -rw-r--r-- | etc/inc/openvpn.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc index 04b07d7..b0a41dc 100644 --- a/etc/inc/openvpn.inc +++ b/etc/inc/openvpn.inc @@ -741,10 +741,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. */ - if ($settings['dev_mode'] == 'tun') - $conf .= "ifconfig-push {$clientip} {$serverip}\n"; - else + if ($settings['dev_mode'] != 'tap') $conf .= "ifconfig-push {$clientip} {$mask}\n"; + else + $conf .= "ifconfig-push {$clientip} {$serverip}\n"; } openvpn_add_dhcpopts($settings, $conf); |
