summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2012-12-17 10:55:50 +0000
committerErmal <eri@pfsense.org>2012-12-17 10:55:50 +0000
commitdcf68058e6b439c44ba46b654043a3b6c0407487 (patch)
tree700282c6ddd5e4716b132e8b3bfa61629259ab93
parent5c600edde7b1109f0b08327642f9096e35207fb5 (diff)
downloadpfsense-dcf68058e6b439c44ba46b654043a3b6c0407487.zip
pfsense-dcf68058e6b439c44ba46b654043a3b6c0407487.tar.gz
Give a minimum bucket paramter of 16 since it does not need much. To avoid those console warnings
-rw-r--r--etc/inc/captiveportal.inc16
1 files changed, 8 insertions, 8 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc
index c6706b3..d40a34e 100644
--- a/etc/inc/captiveportal.inc
+++ b/etc/inc/captiveportal.inc
@@ -939,9 +939,9 @@ function captiveportal_passthrumac_configure_entry($macent) {
$rules = "";
$pipeup = $pipeno;
- $rules .= "pipe {$pipeup} config bw {$bwUp}Kbit/s queue 100\n";
+ $rules .= "pipe {$pipeup} config bw {$bwUp}Kbit/s queue 100 buckets 16\n";
$pipedown = $pipeno + 1;
- $rules .= "pipe {$pipedown} config bw {$bwDown}Kbit/s queue 100\n";
+ $rules .= "pipe {$pipedown} config bw {$bwDown}Kbit/s queue 100 buckets 16\n";
$rules .= "add {$ruleno} pipe {$pipeup} ip from any to any MAC {$macent['mac']} any\n";
$ruleno++;
$rules .= "add {$ruleno} pipe {$pipedown} ip from any to any MAC any {$macent['mac']}\n";
@@ -1002,9 +1002,9 @@ function captiveportal_allowedip_configure_entry($ipent) {
$enBwdown = empty($ipent['bw_down']) ? 0 : intval($ipent['bw_down']);
$pipeno = captiveportal_get_next_dn_ruleno();
- $rules .= "pipe {$pipeno} config bw {$ipent['bw_up']}Kbit/s queue 100\n";
+ $rules .= "pipe {$pipeno} config bw {$ipent['bw_up']}Kbit/s queue 100 buckets 16\n";
$pipedown = $pipeno + 1;
- $rules .= "pipe {$pipedown} config bw {$ipent['bw_down']}Kbit/s queue 100\n";
+ $rules .= "pipe {$pipedown} config bw {$ipent['bw_down']}Kbit/s queue 100 buckets 16\n";
$subnet = "";
if (!empty($ipent['sn']))
$subnet = "/{$ipent['sn']}";
@@ -1672,8 +1672,8 @@ function captiveportal_reapply_attributes($cpentry, $attributes) {
$bw_up_pipeno = $cpentry[1];
$bw_down_pipeno = $cpentry[1]+1;
- pfSense_pipe_action("pipe {$bw_up_pipeno} config bw {$bw_up}Kbit/s queue 100");
- pfSense_pipe_action("pipe {$bw_down_pipeno} config bw {$bw_down}Kbit/s queue 100");
+ pfSense_pipe_action("pipe {$bw_up_pipeno} config bw {$bw_up}Kbit/s queue 100 buckets 16");
+ pfSense_pipe_action("pipe {$bw_down_pipeno} config bw {$bw_down}Kbit/s queue 100 buckets 16");
//captiveportal_logportalauth($cpentry[4], $cpentry[3], $cpentry[2], "RADIUS_BANDWIDTH_REAPPLY", "{$bw_up}/{$bw_down}");
unset($bw_up_pipeno, $bw_down_pipeno, $bw_up, $bw_down);
@@ -1839,8 +1839,8 @@ function portal_allow($clientip,$clientmac,$username,$password = null, $attribut
$bw_up_pipeno = $pipeno;
$bw_down_pipeno = $pipeno + 1;
//$bw_up /= 1000; // Scale to Kbit/s
- pfSense_pipe_action("pipe {$bw_up_pipeno} config bw {$bw_up}Kbit/s queue 100");
- pfSense_pipe_action("pipe {$bw_down_pipeno} config bw {$bw_down}Kbit/s queue 100");
+ pfSense_pipe_action("pipe {$bw_up_pipeno} config bw {$bw_up}Kbit/s queue 100 buckets 16");
+ pfSense_pipe_action("pipe {$bw_down_pipeno} config bw {$bw_down}Kbit/s queue 100 buckets 16");
captiveportal_ipfw_set_context($cpzone);
if (!isset($config['captiveportal'][$cpzone]['nomacfilter']))
OpenPOWER on IntegriCloud