Limiter error

[jimp]

Merged it in.

[eri--]

Next snapshots should have limiters back and working with and without schedules.

[phil.davis]

2.1-BETA0 (i386)
built on Tue Oct 23 20:55:01 EDT 2012
I can add new limiters, with and without schedules, put them in rules, apply them and they work.
No PHP errors, no errors in the system log.
Looks good - for those who need limiters and are waiting to update, this snapshot seems like a good thing.
Thanks Ermal.

[xbipin]

i can also confirm the same, its working fine, need to check schedules overlap situation

[eri--]

The first in line wins, that is the behaviour.

[xbipin]

one problme i noticed that when a schedule expires the config file ends up like this and that client looses complete internet access

pipe 5 config 

isnt it better to skip the whole line only so his connectivity doesnt break

[xbipin]

also noticed with 6th nov snap that if u have a limiter and schedule set to none then it results in this config and doesnt limit anything

pipe 5 config  bw 120Kb bw 0

[eri--]

Should be fixed on next snapshot.

Thank you for reporting it.

[xbipin]

@ermal:

Should be fixed on next snapshot.

Thank you for reporting it.

tried the snap after the patch but still same, config shows as below and limiter doesnt limit with schedule set as none

pipe 5 config  bw 120Kb bw 0

pipe 6 config  bw 400Kb bw 0

[eri--]

You really should have a strange config.xml there.
I pushed another tuning to the code so test that out.

[bardelot]

@ermal: There is no '$found = true;' before breaking out of the foreach loop, leading to the additional 'bw 0'.

[xbipin]

config seems all fine

	 <dnshaper><queue><name>ashishup</name>
			<number>5</number>
			 <qlimit><plr><description><bandwidth><bw>120</bw>
					<bwscale>Kb</bwscale>
					<bwsched>none</bwsched></bandwidth> 
			<bandwidthtype>Kb</bandwidthtype>
			<enabled>on</enabled>
			 <buckets><mask>none</mask>
			<delay>0</delay></buckets></description></plr></qlimit></queue> 
		 <queue><name>ashishdown</name>
			<number>6</number>
			 <qlimit><plr><description><bandwidth><bw>400</bw>
					<bwscale>Kb</bwscale>
					<bwsched>none</bwsched></bandwidth> 
			<bandwidthtype>Kb</bandwidthtype>
			<enabled>on</enabled>
			 <buckets><mask>none</mask>
			<delay>0</delay></buckets></description></plr></qlimit></queue></dnshaper> 

[xbipin]

even after the latest patch, the situation is same

[eri--]

Oh found the issue.
Thank you xbipin for the persistence.

[phil.davis]

I had just made the same change to fix my system and was about to submit it. The fix Ermal has just committed is exactly what I did, and it is working.
/tmp/rules.limiter on a test system:
Before:

pipe 1 config  bw 64Kb bw 0 mask src-ip 0xffffffff

pipe 3 config  bw 16Kb bw 0

pipe 4 config  bw 16Kb bw 0

After:

pipe 1 config  bw 64Kb mask src-ip 0xffffffff

pipe 3 config  bw 16Kb

pipe 4 config  bw 16Kb

[xbipin]

works fine now, thanks ermal