diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-05-31 19:29:10 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-05-31 19:29:10 +0000 |
| commit | 7ce3fb1812eb977395b111ce70911633fc5c5025 (patch) | |
| tree | a4c3ea328e0c02be2793b273265722d8747badbc /etc | |
| parent | 88481a774eadcb5ede73569bd2ac9263458c65b6 (diff) | |
| download | pfsense-7ce3fb1812eb977395b111ce70911633fc5c5025.zip pfsense-7ce3fb1812eb977395b111ce70911633fc5c5025.tar.gz | |
Remove commented out code in preperation for pure pf altq switchover
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/filter.inc | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 4abda14..87b531d 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -3,6 +3,7 @@ /* filter.inc Copyright (C) 2004 Scott Ullrich + Copyright (C) 2005 Bill Marquette All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) @@ -76,8 +77,6 @@ function filter_configure() { /* generate altq queues */ $altq_queues = filter_generate_altq_queues($altq_ints); /* generate altq rules */ - // $ipfw_altq_rules = filter_generate_ipfw_altq_rules(); - /* pf/altq rules */ $pf_altq_rules = filter_generate_pf_altq_rules(); } @@ -136,32 +135,6 @@ function filter_configure() { } } -/* XXX - billm - if (isset($config['shaper']['enable'])) { - mute_kernel_msgs(); - mwexec("/sbin/kldload ipfw"); - unmute_kernel_msgs(); - - - mwexec("/sbin/sysctl net.inet.ip.fw.one_pass=1"); - - mwexec("/sbin/ipfw -f delete set 4"); - $fd = fopen("{$g['tmp_path']}/ipfw.rules", "w"); - if (!$fd) { - printf("Cannot open ipfw.rules in filter_configure()\n"); - return 1; - } - fwrite($fd, $ipfw_altq_rules); - fclose($fd); - mwexec("/sbin/ipfw {$g['tmp_path']}/ipfw.rules"); - mwexec("/sbin/ipfw enable altq"); - mwexec("/bin/mv {$g['tmp_path']}/ipfw.rules {$g['tmp_path']}/ipfw.rules_old"); - } else { - mwexec("/sbin/ipfw -f flush"); - mwexec("/sbin/kldunload ipfw.ko"); - } -*/ - /* check for a error while loading the rules file. if an error has occured then output the contents of the error to the caller */ if($rules_loading <> 0) { |
