Revision 4936ff53
Added by Jim Pingle over 14 years ago
| etc/inc/openvpn.inc | ||
|---|---|---|
| 295 | 295 |
$vpnid = $settings['vpnid']; |
| 296 | 296 |
$mode_id = $mode.$vpnid; |
| 297 | 297 |
|
| 298 |
if (isset($settings['device_mode']))
|
|
| 299 |
$tunname = "{$settings['device_mode']}{$vpnid}";
|
|
| 298 |
if (isset($settings['dev_mode'])) |
|
| 299 |
$tunname = "{$settings['dev_mode']}{$vpnid}";
|
|
| 300 | 300 |
else { /* defaults to tun */
|
| 301 | 301 |
$tunname = "tun{$vpnid}";
|
| 302 |
$settings['device_mode'] = "tun";
|
|
| 302 |
$settings['dev_mode'] = "tun"; |
|
| 303 | 303 |
} |
| 304 | 304 |
|
| 305 | 305 |
if ($mode == "server") |
| ... | ... | |
| 323 | 323 |
|
| 324 | 324 |
$pfile = $g['varrun_path'] . "/openvpn_{$mode_id}.pid";
|
| 325 | 325 |
$proto = ($settings['protocol'] == 'UDP' ? 'udp' : "tcp-{$mode}");
|
| 326 |
$device_mode = $settings['device_mode'];
|
|
| 326 |
$dev_mode = $settings['dev_mode'];
|
|
| 327 | 327 |
$cipher = $settings['crypto']; |
| 328 | 328 |
|
| 329 | 329 |
$interface = $settings['interface']; |
| ... | ... | |
| 341 | 341 |
} |
| 342 | 342 |
|
| 343 | 343 |
$conf = "dev {$devname}\n";
|
| 344 |
$conf .= "dev-type {$settings['device_mode']}\n";
|
|
| 344 |
$conf .= "dev-type {$settings['dev_mode']}\n";
|
|
| 345 | 345 |
$conf .= "dev-node /dev/{$tunname}\n";
|
| 346 | 346 |
$conf .= "writepid {$pfile}\n";
|
| 347 | 347 |
$conf .= "#user nobody\n"; |
Also available in: Unified diff
Switch back to dev_mode so existing configs aren't broken by the other changes.