From fd6515585521e24a01a4399eb8651e052a059dcc Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 6 Feb 2017 15:10:27 +0000 Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B0=D0=B7=D0=BD=D1=8B=D0=B9=20=D1=81?= =?UTF-8?q?=D0=B8=D0=BD=D1=82=D0=B0=D0=BA=D1=81=D0=B8=D1=81=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BC=D0=BC=D0=B0=D0=BD=D0=B4=20=D0=BD=D0=B0=20=D1=80=D0=B0?= =?UTF-8?q?=D0=B7=D0=BD=D1=8B=D1=85=20=D0=BC=D0=B8=D0=BA=D1=80=D0=BE=D1=82?= =?UTF-8?q?=D0=B8=D0=BA=D0=B0=D1=85,=D0=BF=D0=BE=D0=BA=D0=B0=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=B4=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D1=8E,=20=D0=BD?= =?UTF-8?q?=D0=BE=20=D0=B5=D1=81=D0=BB=D0=B8=20=D0=B1=D1=83=D0=B4=D0=B5?= =?UTF-8?q?=D1=82=20=D1=87=D0=B0=D1=81=D1=82=D0=BE=20=D1=82=D0=B0=D0=BA?= =?UTF-8?q?=D0=BE=D0=B5,=20=D0=BF=D1=80=D0=B8=D0=B4=D1=91=D1=82=D1=81?= =?UTF-8?q?=D1=8F=20=D0=B4=D0=B5=D0=BB=D0=B0=D1=82=D1=8C=20=D0=BC=D0=BE?= =?UTF-8?q?=D0=B4=D1=83=D0=BB=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D1=80=D0=B0?= =?UTF-8?q?=D0=B7=D0=BD=D1=8B=D1=85=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B9?= =?UTF-8?q?=20=D0=BC=D0=B8=D0=BA=D1=80=D0=BE=D1=82=D0=B8=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- agent/mod_mikrotik.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/agent/mod_mikrotik.py b/agent/mod_mikrotik.py index 626006c..398b42b 100644 --- a/agent/mod_mikrotik.py +++ b/agent/mod_mikrotik.py @@ -114,10 +114,10 @@ class ApiRos: c += self.readBytes(1)[0] return c - def writeBytes(self, str): - n = 0; - while n < len(str): - r = self.sk.send(str[n:]) + def writeBytes(self, s): + n = 0 + while n < len(s): + r = self.sk.send(s[n:]) if r == 0: raise RuntimeError("connection closed by remote end") n += r @@ -171,7 +171,7 @@ class MikrotikTransmitter(BaseTransmitter): assert isinstance(user.ip, IpStruct) return self._exec_cmd(['/queue/simple/add', '=name=uid%d' % user.uid, - '=target=%s/32' % user.ip.get_str(), + '=target-addresses=%s/32' % user.ip.get_str(), '=max-limit=%fM/%fM' % (user.tariff.speedOut, user.tariff.speedIn) ]) @@ -186,7 +186,7 @@ class MikrotikTransmitter(BaseTransmitter): 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), - '=target=%s/32' % user.ip.get_str() + '=target-addresses=%s/32' % user.ip.get_str() ]) # приостановливаем обслуживание абонента