From 1eb8247e2fcb28efca38d0d0d26b4e9c9f36ca32 Mon Sep 17 00:00:00 2001 From: http Date: Mon, 6 Feb 2017 23:01:39 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=B2=20max-limit=20=D1=81=D0=BA=D0=BE=D1=80=D0=BE=D1=81=D1=82?= =?UTF-8?q?=D1=8C=20+=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- agent/mod_mikrotik.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/agent/mod_mikrotik.py b/agent/mod_mikrotik.py index 398b42b..48f9169 100644 --- a/agent/mod_mikrotik.py +++ b/agent/mod_mikrotik.py @@ -172,7 +172,8 @@ class MikrotikTransmitter(BaseTransmitter): return self._exec_cmd(['/queue/simple/add', '=name=uid%d' % user.uid, '=target-addresses=%s/32' % user.ip.get_str(), - '=max-limit=%fM/%fM' % (user.tariff.speedOut, user.tariff.speedIn) + '=limit-at=%fM/%fM' % (user.tariff.speedIn, user.tariff.speedOut), + '=max-limit=%fM/%fM' % (user.tariff.speedIn + 1, user.tariff.speedOut + 1) ]) # удаляем правило шейпера по имени правила @@ -185,7 +186,8 @@ class MikrotikTransmitter(BaseTransmitter): assert isinstance(user.tariff, TariffStruct) assert isinstance(user.ip, IpStruct) self._exec_cmd(['/queue/simple/set', '=.id=uid%d' % user.uid, - '=max-limit=%fM/%fM' % (user.tariff.speedOut, user.tariff.speedIn), + '=limit-at=%fM/%fM' % (user.tariff.speedIn, user.tariff.speedOut), + '=max-limit=%fM/%fM' % (user.tariff.speedIn + 1, user.tariff.speedOut + 1), '=target-addresses=%s/32' % user.ip.get_str() ])