From b28df10f14f16593d75ae05fe82a99ace636b16e Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Tue, 7 Dec 2010 12:31:41 +0200 Subject: [PATCH] =?utf8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5?= =?utf8?q?=D0=BD=D0=B0=20=D1=82=D1=83=D0=BF=D0=B0=D1=8F=20=D0=B8=20=D1=83?= =?utf8?q?=D0=B6=D0=B5=20=D1=83=D1=81=D0=BF=D0=B5=D0=B2=D1=88=D0=B0=D1=8F?= =?utf8?q?=20=D0=B7=D0=B0=D0=BF=D0=B0=D1=80=D0=B8=D1=82=D1=8C=20=D0=BE?= =?utf8?q?=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20(=D0=BE=D0=BF=D0=B5=D1=87=D0=B0?= =?utf8?q?=D1=82=D0=BA=D0=B0)=20=D0=B2=D1=8B=D1=80=D0=B0=D0=B6=D0=B0=D1=8E?= =?utf8?q?=D1=89=D0=B0=D1=8F=D1=81=D1=8F=20=D0=B2=20=D1=81=D0=BE=D0=B7?= =?utf8?q?=D0=B4=D0=B0=D0=BD=D0=B8=D0=B8=20=D0=B2=D1=80=D0=B5=D0=BC=D0=B5?= =?utf8?q?=D0=BD=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA?= =?utf8?q?=D1=82=D0=B0-=D0=BC=D1=8C=D1=8E=D1=82=D0=B5=D0=BA=D1=81=D0=B0=20?= =?utf8?q?=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=BE=20=D0=BE=D0=B1=D1=8B=D1=87?= =?utf8?q?=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=81=D1=82=D0=B5=D0=BA=D0=BE=D0=B2?= =?utf8?q?=D0=BE=D0=B3=D0=BE,=20=D0=B2=20=D1=81=D0=BB=D0=B5=D0=B4=D1=81?= =?utf8?q?=D1=82=D0=B2=D0=B8=D0=B8=20=D1=87=D0=B5=D0=B3=D0=BE=20=D0=BC?= =?utf8?q?=D1=8C=D1=8E=D1=82=D0=B5=D0=BA=D1=81=20=D0=BD=D0=B5=20=D0=B2?= =?utf8?q?=D1=8B=D0=BF=D0=BE=D0=BB=D0=BD=D1=8F=D0=B5=D1=82=20=D1=81=D0=B2?= =?utf8?q?=D0=BE=D0=B5=D0=B9=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=B8.?= =?utf8?q?=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D1=8F=D1=8E=20?= =?utf8?q?=D1=83=D0=B6=D0=B5=20=D0=B2=204-=D0=B9=20=D0=B8=D0=BB=D0=B8=205-?= =?utf8?q?=D0=B9=20=D1=80=D0=B0=D0=B7,=20=D0=BD=D0=BE=20=D0=BE=D0=BD=D0=B0?= =?utf8?q?=20=D0=B2=D1=81=D0=B5=20=D1=80=D0=B0=D0=B2=D0=BD=D0=BE=20=D0=BF?= =?utf8?q?=D0=BE=D1=87=D0=B5=D0=BC=D1=83-=D1=82=D0=BE=20=D0=B2=D1=8B=D0=BB?= =?utf8?q?=D0=B0=D0=B7=D0=B8=D1=82.=20=D0=9F=D1=80=D0=B8=20=D1=87=D0=B5?= =?utf8?q?=D0=BC=20=D0=B2=20=D0=BE=D0=B4=D0=BD=D0=BE=D0=BC=20=D0=B8=20?= =?utf8?q?=D1=82=D0=BE=D0=BC-=D0=B6=D0=B5=20=D0=BC=D0=B5=D1=81=D1=82=D0=B5?= =?utf8?q?.=20=D0=95=D1=81=D0=BB=D0=B8=20=D0=B2=D1=8B=D0=BB=D0=B5=D0=B7?= =?utf8?q?=D0=B5=D1=82=20=D0=B5=D1=89=D0=B5=20=D1=80=D0=B0=D0=B7=20-=20?= =?utf8?q?=D0=BF=D0=BE=D0=B2=D0=B5=D1=88=D1=83=D1=81=D1=8C.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- projects/stargazer/actions.inl.h | 2 +- projects/stargazer/traffcounter.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/stargazer/actions.inl.h b/projects/stargazer/actions.inl.h index c29a63cd..37c7e86e 100644 --- a/projects/stargazer/actions.inl.h +++ b/projects/stargazer/actions.inl.h @@ -26,7 +26,7 @@ ACTIONS_LIST::~ACTIONS_LIST() { { - STG_LOCKER(&mutex, __FILE__, __LINE__); + STG_LOCKER lock(&mutex, __FILE__, __LINE__); parent::iterator it(parent::begin()); while (it != parent::end()) diff --git a/projects/stargazer/traffcounter.cpp b/projects/stargazer/traffcounter.cpp index e834b81f..72c1295b 100644 --- a/projects/stargazer/traffcounter.cpp +++ b/projects/stargazer/traffcounter.cpp @@ -409,7 +409,7 @@ printfd(__FILE__, "AddUser: %s\n", user->GetLogin().c_str()); uint32_t uip = user->GetCurrIP(); pair pi; -STG_LOCKER(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex, __FILE__, __LINE__); // Find all packets with IP belongs to this user pi = ip2packets.equal_range(uip); @@ -446,7 +446,7 @@ void TRAFFCOUNTER::DelUser(uint32_t uip) printfd(__FILE__, "DelUser: %s \n", inet_ntostring(uip).c_str()); pair pi; -STG_LOCKER(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex, __FILE__, __LINE__); pi = ip2packets.equal_range(uip); while (pi.first != pi.second) -- 2.44.2