From 650991d32c408413b2a6d4ea1acd806859ff82b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= Date: Tue, 17 Jun 2014 23:42:26 +0200 Subject: [PATCH] =?UTF-8?q?[firewall]=20Erreur=20sur=20les=20appartements?= =?UTF-8?q?=20corrig=C3=A9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gestion/config/firewall.py | 8 +++++++- gestion/gen_confs/firewall4/komaz.py | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/gestion/config/firewall.py b/gestion/config/firewall.py index 84a3cb7e..2ceaf0e6 100644 --- a/gestion/config/firewall.py +++ b/gestion/config/firewall.py @@ -53,10 +53,16 @@ else: #: Est-ce qu'on est en connexion de jour ou de nuit/week-end ? 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 +# Debit appartement down max +# TODO : mettre en place dans komaz.py +appt_download_max = debit_max/10 + #: Liste des réseaux non routables 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', diff --git a/gestion/gen_confs/firewall4/komaz.py b/gestion/gen_confs/firewall4/komaz.py index 64c87d40..f84dd765 100644 --- a/gestion/gen_confs/firewall4/komaz.py +++ b/gestion/gen_confs/firewall4/komaz.py @@ -464,7 +464,7 @@ class firewall(base.firewall_routeur): chain = 'LIMITATION-DEBIT' 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 uplink_speed = '1024mbit' @@ -527,7 +527,7 @@ class firewall(base.firewall_routeur): #Classe des decos upload 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 ' 'handle 11: sfq perturb 10' % dev['out']) @@ -549,7 +549,7 @@ class firewall(base.firewall_routeur): # Classe pour le download des apparetments 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 ' 'handle 3: sfq perturb 10' % dev[int_key])