Project

General

Profile

« Previous | Next » 

Revision dcf68058

Added by Ermal LUÇI over 12 years ago

Give a minimum bucket paramter of 16 since it does not need much. To avoid those console warnings

View differences:

etc/inc/captiveportal.inc
939 939

  
940 940
	$rules = "";
941 941
	$pipeup = $pipeno;
942
	$rules .= "pipe {$pipeup} config bw {$bwUp}Kbit/s queue 100\n";
942
	$rules .= "pipe {$pipeup} config bw {$bwUp}Kbit/s queue 100 buckets 16\n";
943 943
	$pipedown = $pipeno + 1;
944
	$rules .= "pipe {$pipedown} config bw {$bwDown}Kbit/s queue 100\n";
944
	$rules .= "pipe {$pipedown} config bw {$bwDown}Kbit/s queue 100 buckets 16\n";
945 945
	$rules .= "add {$ruleno} pipe {$pipeup} ip from any to any MAC {$macent['mac']} any\n";
946 946
	$ruleno++;
947 947
	$rules .= "add {$ruleno} pipe {$pipedown} ip from any to any MAC any {$macent['mac']}\n";
......
1002 1002
	$enBwdown = empty($ipent['bw_down']) ? 0 : intval($ipent['bw_down']);
1003 1003

  
1004 1004
	$pipeno = captiveportal_get_next_dn_ruleno();
1005
	$rules .= "pipe {$pipeno} config bw {$ipent['bw_up']}Kbit/s queue 100\n";
1005
	$rules .= "pipe {$pipeno} config bw {$ipent['bw_up']}Kbit/s queue 100 buckets 16\n";
1006 1006
	$pipedown = $pipeno + 1;
1007
	$rules .= "pipe {$pipedown} config bw {$ipent['bw_down']}Kbit/s queue 100\n";
1007
	$rules .= "pipe {$pipedown} config bw {$ipent['bw_down']}Kbit/s queue 100 buckets 16\n";
1008 1008
	$subnet = "";
1009 1009
	if (!empty($ipent['sn']))
1010 1010
		$subnet = "/{$ipent['sn']}";
......
1672 1672
        $bw_up_pipeno = $cpentry[1];
1673 1673
        $bw_down_pipeno = $cpentry[1]+1;
1674 1674

  
1675
	pfSense_pipe_action("pipe {$bw_up_pipeno} config bw {$bw_up}Kbit/s queue 100");
1676
	pfSense_pipe_action("pipe {$bw_down_pipeno} config bw {$bw_down}Kbit/s queue 100");
1675
	pfSense_pipe_action("pipe {$bw_up_pipeno} config bw {$bw_up}Kbit/s queue 100 buckets 16");
1676
	pfSense_pipe_action("pipe {$bw_down_pipeno} config bw {$bw_down}Kbit/s queue 100 buckets 16");
1677 1677
	//captiveportal_logportalauth($cpentry[4], $cpentry[3], $cpentry[2], "RADIUS_BANDWIDTH_REAPPLY", "{$bw_up}/{$bw_down}");
1678 1678

  
1679 1679
        unset($bw_up_pipeno, $bw_down_pipeno, $bw_up, $bw_down);
......
1839 1839
			$bw_up_pipeno = $pipeno;
1840 1840
			$bw_down_pipeno = $pipeno + 1;
1841 1841
			//$bw_up /= 1000; // Scale to Kbit/s
1842
			pfSense_pipe_action("pipe {$bw_up_pipeno} config bw {$bw_up}Kbit/s queue 100");
1843
			pfSense_pipe_action("pipe {$bw_down_pipeno} config bw {$bw_down}Kbit/s queue 100");
1842
			pfSense_pipe_action("pipe {$bw_up_pipeno} config bw {$bw_up}Kbit/s queue 100 buckets 16");
1843
			pfSense_pipe_action("pipe {$bw_down_pipeno} config bw {$bw_down}Kbit/s queue 100 buckets 16");
1844 1844

  
1845 1845
			captiveportal_ipfw_set_context($cpzone);
1846 1846
			if (!isset($config['captiveportal'][$cpzone]['nomacfilter']))

Also available in: Unified diff