Check IP in USERS_IMPL::Authorize as early as possible

[stg.git] / projects / stargazer / plugins / capture / cap_nf / cap_nf.cpp

diff --git a/projects/stargazer/plugins/capture/cap_nf/cap_nf.cpp b/projects/stargazer/plugins/capture/cap_nf/cap_nf.cpp
index 3d6c55b5b7139b2ac037db4f25a65266a1dfaa01..a572e8a17af9efc02ab86c8c28e11a79a20302ea 100644 (file)
--- a/projects/stargazer/plugins/capture/cap_nf/cap_nf.cpp
+++ b/projects/stargazer/plugins/capture/cap_nf/cap_nf.cpp
@@ -248,7 +248,7 @@ socklen_t slen;
 cap->stoppedUDP = false;
 while (cap->runningUDP)
     {
 cap->stoppedUDP = false;
 while (cap->runningUDP)
     {

-    if (!cap->WaitPackets(cap->sockUDP))
+    if (!WaitPackets(cap->sockUDP))

         {
         continue;
         }
         {
         continue;
         }


@@ -291,7 +291,7 @@ socklen_t slen;
 cap->stoppedTCP = false;
 while (cap->runningTCP)
     {
 cap->stoppedTCP = false;
 while (cap->runningTCP)
     {

-    if (!cap->WaitPackets(cap->sockTCP))
+    if (!WaitPackets(cap->sockTCP))

         {
         continue;
         }
         {
         continue;
         }


@@ -312,7 +312,7 @@ while (cap->runningTCP)
         continue;
         }
 
         continue;
         }
 

-    if (!cap->WaitPackets(sd))
+    if (!WaitPackets(sd))

         {
         close(sd);
         continue;
         {
         close(sd);
         continue;


@@ -385,31 +385,3 @@ for (int i = 0; i < packets; ++i)
     traffCnt->Process(ip);
     }
 }
     traffCnt->Process(ip);
     }
 }

-
-bool NF_CAP::WaitPackets(int sd) const
-{
-fd_set rfds;
-FD_ZERO(&rfds);
-FD_SET(sd, &rfds);
-
-struct timeval tv;
-tv.tv_sec = 0;
-tv.tv_usec = 500000;
-
-int res = select(sd + 1, &rfds, NULL, NULL, &tv);
-if (res == -1) // Error
-    {
-    if (errno != EINTR)
-        {
-        printfd(__FILE__, "Error on select: '%s'\n", strerror(errno));
-        }
-    return false;
-    }
-
-if (res == 0) // Timeout
-    {
-    return false;
-    }
-
-return true;
-}