diff options
| author | Ermal Luçi <eri@pfsense.org> | 2008-04-14 17:15:16 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2008-04-14 17:15:16 +0000 |
| commit | 85ff97a7ac35580eb10168d5da01fc622382dd84 (patch) | |
| tree | b935505282599087e364c9abb97139358aa1a1bd /etc | |
| parent | 7e4329edd4aa707d2e2e8a52ac441e091a7292ea (diff) | |
| download | pfsense-85ff97a7ac35580eb10168d5da01fc622382dd84.zip pfsense-85ff97a7ac35580eb10168d5da01fc622382dd84.tar.gz | |
Change the renaming of openvpn tun devices to ovpnX so netstat copes with the names.
Better do this than patch netstat to allow space for IFNAMSIZ in the interface column.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/filter.inc | 2 | ||||
| -rw-r--r-- | etc/inc/openvpn.inc | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index f97dd4e..07fb879 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -3115,7 +3115,7 @@ function create_firewall_outgoing_rules_to_itself() { update_filter_reload_status("Setting up tun interfaces (openvpn)"); /* openvpn tun interfaces. check for 100. */ for($x=0; $x<100; $x++) { - if(does_interface_exist("openvpn{$x}") == true) { + if(does_interface_exist("ovpn{$x}") == true) { /* If the interface has a gateway we do not add a pass in rule. */ /* Some people use a TUN tunnel with public IP as a Multiwan interface */ if(interface_has_gateway("openvpn{$x}")) { diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc index 1348dc0..ff2cfdd 100644 --- a/etc/inc/openvpn.inc +++ b/etc/inc/openvpn.inc @@ -304,15 +304,15 @@ function openvpn_reconfigure($mode, $id) { * openvpn_restart() function. */ if (!$g['booting']) - mwexec("/sbin/ifconfig openvpn{$id} destroy"); + mwexec("/sbin/ifconfig ovpn{$id} destroy"); mwexec("/sbin/ifconfig tun{$id} create"); - mwexec("/sbin/ifconfig tun{$id} name openvpn{$id}"); - mwexec("/sbin/ifconfig openvpn{$id} group openvpn"); + mwexec("/sbin/ifconfig tun{$id} name ovpn{$id}"); + mwexec("/sbin/ifconfig ovpn{$id} group openvpn"); $pidfile = $g['varrun_path'] . "/openvpn_{$mode}{$id}.pid"; $proto = ($settings['protocol'] == 'UDP' ? 'udp' : "tcp-{$mode}"); $cipher = $settings['crypto']; - $openvpn_conf = "dev openvpn{$id}\n"; + $openvpn_conf = "dev ovpn{$id}\n"; $openvpn_conf .= "dev-type tun\n"; $openvpn_conf .= "dev-node /dev/tun{$id}\n"; $openvpn_conf .= <<<EOD |
