diff options
| author | Ermal Luçi <eri@pfsense.org> | 2009-02-15 21:34:00 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2009-02-15 21:34:00 +0000 |
| commit | a56120f2793bf778b171784f7ebac4d624f8d494 (patch) | |
| tree | 52daf5c640ceabff665d47fa3c1e9148c14194ac /etc | |
| parent | eff29d62c50803fe5eaf3b3d9089ac428c8811ad (diff) | |
| download | pfsense-a56120f2793bf778b171784f7ebac4d624f8d494.zip pfsense-a56120f2793bf778b171784f7ebac4d624f8d494.tar.gz | |
Remove all global decalarations regarding pptp/pppoe/l2tp they are no more needed.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/config.inc | 13 | ||||
| -rw-r--r-- | etc/inc/globals.inc | 6 | ||||
| -rw-r--r-- | etc/inc/vpn.inc | 9 | ||||
| -rwxr-xr-x | etc/rc.banner | 2 |
4 files changed, 3 insertions, 27 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc index 3f81ab0..6bd22c8 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -317,19 +317,6 @@ function parse_config($parse = false) { update_filter_reload_status("Plugins completed."); } - /* override some global configuration parms if they exist - * instead of hard coding these checks into the codebase - */ - if($config['pptp']['n_pptp_units']) - $g['n_pptp_units'] = $config['pptp']['n_pptp_units']; - if($config['pptp']['pptp_subnet']) - $g['pptp_subnet'] = $config['pptp']['pptp_subnet']; - - if($config['pppoe']['n_pppoe_units']) - $g['n_pppoe_units'] = $config['pppoe']['n_pppoe_units']; - if($config['pppoe']['pppoe_subnet']) - $g['pppoe_subnet'] = $config['pppoe']['pppoe_subnet']; - return $config; } diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index a2207bf..054ce31 100644 --- a/etc/inc/globals.inc +++ b/etc/inc/globals.inc @@ -57,12 +57,6 @@ $g = array( "product_website" => "www.pfsense.org", "product_website_footer" => "http://www.pfsense.org/?gui20", "product_email" => "coreteam@pfsense.org", - "pppoe_interface" => "ng0", - "n_pptp_units" => 16, /* this value can be overriden in pptp->n_pptp_units */ - "pptp_subnet" => 28, /* this value can be overriden in pptp->pptp_subnet */ - "n_pppoe_units" => 16, /* this value can be overriden in pppoe->n_pppoe_units */ - "pppoe_subnet" => 28, /* this value can be overriden in pppoe->pppoe_subnet */ - "l2tp_subnet" => 28, /* this value can be overriden in l2tp->l2tp_subnet */ "debug" => false, "latest_config" => "5.5", "nopkg_platforms" => array("cdrom"), diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 232fdc9..2167eac 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -926,11 +926,11 @@ pptpd: EOD; - for ($i = 0; $i < $g['n_pptp_units']; $i++) { + for ($i = 0; $i < $pptpdcfg['n_pptp_units']; $i++) { $mpdconf .= " load pt{$i}\n"; } - for ($i = 0; $i < $g['n_pptp_units']; $i++) { + for ($i = 0; $i < $pptpdcfg['n_pptp_units']; $i++) { $clientip = long2ip(ip2long($pptpdcfg['remoteip']) + $i); @@ -1029,7 +1029,7 @@ EOD; $mpdlinks = ""; - for ($i = 0; $i < $g['n_pptp_units']; $i++) { + for ($i = 0; $i < $pptpdcfg['n_pptp_units']; $i++) { $mpdlinks .=<<<EOD pt{$i}: @@ -1310,9 +1310,6 @@ function vpn_l2tp_configure() { switch ($l2tpcfg['mode']) { case 'server' : - - $l2tp_interface = filter_translate_type_to_real_interface($l2tpcfg['interface']); - if ($l2tpcfg['paporchap'] == "chap") $paporchap = "set link enable chap"; else diff --git a/etc/rc.banner b/etc/rc.banner index fe3d914..dc7e257 100755 --- a/etc/rc.banner +++ b/etc/rc.banner @@ -71,11 +71,9 @@ break; case "pppoe": $ifinfo['class'] = "(PPPoE)"; - //$ifinfo['ipaddr'] = $iflist[$g['pppoe_interface']]['ipaddr']; break; case "pptp": $ifinfo['class'] = "(PPTP)"; - //$ifinfo['ipaddr'] = $iflist[$g['pppoe_interface']]['ipaddr']; break; } $ifinfo['ipaddr'] = get_interface_ip($ifinfo['friendly']); |
