crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[firewall] Erreur sur les appartements corrigée

Browse source
This commit is contained in:
Pierre-Elliott Bécue 2014-06-17 23:42:26 +02:00
parent 19847201d2
commit 650991d32c
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gestion/config/firewall.py
View file

@ -53,10 +53,16 @@ else:
#: Est-ce qu'on est en connexion de jour ou de nuit/week-end ? #: Est-ce qu'on est en connexion de jour ou de nuit/week-end ?
debit_jour = False debit_jour = False
upload_debit_max = 60 #kbytes per second #Débit max en upload pour les déconnectés pour upload.
bl_upload_debit_max = 60 #kbytes per second
# Débit pour upload des gens en appartement ens
appt_upload_max = 1 # mbytes per second appt_upload_max = 1 # mbytes per second
# Debit appartement down max
# TODO : mettre en place dans komaz.py
appt_download_max = debit_max/10
#: Liste des réseaux non routables #: Liste des réseaux non routables
reseaux_non_routables = [ '10.0.0.0/8', '172.16.0.0/12','198.18.0.0/15', reseaux_non_routables = [ '10.0.0.0/8', '172.16.0.0/12','198.18.0.0/15',
'169.254.0.0/16', '192.168.0.0/16', '224.0.0.0/4', '100.64.0.0/10', '169.254.0.0/16', '192.168.0.0/16', '224.0.0.0/4', '100.64.0.0/10',

6
gestion/gen_confs/firewall4/komaz.py
View file

@ -464,7 +464,7 @@ class firewall(base.firewall_routeur):
chain = 'LIMITATION-DEBIT' chain = 'LIMITATION-DEBIT'
debit_max = base.config.firewall.debit_max debit_max = base.config.firewall.debit_max
upload_debit_max = base.config.firewall.upload_debit_max bl_upload_debit_max = base.config.firewall.bl_upload_debit_max
appt_upload_max = base.config.firewall.appt_upload_max appt_upload_max = base.config.firewall.appt_upload_max
uplink_speed = '1024mbit' uplink_speed = '1024mbit'
@ -527,7 +527,7 @@ class firewall(base.firewall_routeur):
#Classe des decos upload #Classe des decos upload
utils.tc('class add dev %s parent 1:2 classid 1:11 ' utils.tc('class add dev %s parent 1:2 classid 1:11 '
'htb rate %skbps ceil %skbps prio 1' % (dev['out'], upload_debit_max, upload_debit_max)) 'htb rate %skbps ceil %skbps prio 1' % (dev['out'], bl_upload_debit_max, bl_upload_debit_max))
utils.tc('qdisc add dev %s parent 1:11 ' utils.tc('qdisc add dev %s parent 1:11 '
'handle 11: sfq perturb 10' % dev['out']) 'handle 11: sfq perturb 10' % dev['out'])
@ -549,7 +549,7 @@ class firewall(base.firewall_routeur):
# Classe pour le download des apparetments # Classe pour le download des apparetments
utils.tc("class add dev %s parent 1: classid 1:3 " utils.tc("class add dev %s parent 1: classid 1:3 "
"htb rate %skbps ceil %skbps" % (dev[int_key], debit_max/10, debit_max/2)) "htb rate %smbit ceil %smbit" % (dev[int_key], debit_max/10, debit_max/2))
utils.tc('qdisc add dev %s parent 1:3 ' utils.tc('qdisc add dev %s parent 1:3 '
'handle 3: sfq perturb 10' % dev[int_key]) 'handle 3: sfq perturb 10' % dev[int_key])