New style tut-headers

[stg.git] / projects / stargazer / plugins / capture / ipq_linux / ipq_cap.cpp

diff --git a/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.cpp b/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.cpp
index de5cd0ed2cdde2bfb23efc3caaccb54167fc0102..d0192e0ab65075dec4afeb209d223519c359b497 100644 (file)
--- a/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.cpp
+++ b/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.cpp
@@ -18,14 +18,16 @@
 * Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
 */
 
 * Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
 */
 

-#include <signal.h>
-#include <cerrno>

 #include <netinet/in.h>
 #include <linux/netfilter.h>
 
 #include <netinet/in.h>
 #include <linux/netfilter.h>
 

+#include <csignal>
+#include <cerrno>
+

 #include "stg/raw_ip_packet.h"
 #include "stg/traffcounter.h"
 #include "stg/plugin_creator.h"
 #include "stg/raw_ip_packet.h"
 #include "stg/traffcounter.h"
 #include "stg/plugin_creator.h"

+

 #include "ipq_cap.h"
 
 extern "C"
 #include "ipq_cap.h"
 
 extern "C"


@@ -54,10 +56,13 @@ return "ipq_cap v.1.2";
 //-----------------------------------------------------------------------------
 IPQ_CAP::IPQ_CAP()
     : ipq_h(NULL),
 //-----------------------------------------------------------------------------
 IPQ_CAP::IPQ_CAP()
     : ipq_h(NULL),

+      errorStr(),
+      thread(),

       nonstop(false),
       isRunning(false),
       capSock(-1),
       nonstop(false),
       isRunning(false),
       capSock(-1),

-      traffCnt(NULL)
+      traffCnt(NULL),
+      buf()

 {
 memset(buf, 0, BUFSIZE);
 }
 {
 memset(buf, 0, BUFSIZE);
 }


@@ -92,7 +97,8 @@ for (int i = 0; i < 25; i++)
     {
     if (!isRunning)
         break;
     {
     if (!isRunning)
         break;

-    usleep(200000);
+    struct timespec ts = {0, 200000000};
+    nanosleep(&ts, NULL);

     }
 //after 5 seconds waiting thread still running. now killing it
 if (isRunning)
     }
 //after 5 seconds waiting thread still running. now killing it
 if (isRunning)


@@ -104,7 +110,8 @@ if (isRunning)
         }
     for (int i = 0; i < 25 && isRunning; ++i)
         {
         }
     for (int i = 0; i < 25 && isRunning; ++i)
         {

-        usleep(200000);
+        struct timespec ts = {0, 200000000};
+        nanosleep(&ts, NULL);

         }
     if (isRunning)
         {
         }
     if (isRunning)
         {


@@ -121,9 +128,13 @@ return 0;
 //-----------------------------------------------------------------------------
 void * IPQ_CAP::Run(void * d)
 {
 //-----------------------------------------------------------------------------
 void * IPQ_CAP::Run(void * d)
 {

+sigset_t signalSet;
+sigfillset(&signalSet);
+pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
+

 RAW_PACKET raw_packet;
 
 RAW_PACKET raw_packet;
 

-IPQ_CAP * dc = (IPQ_CAP *)d;
+IPQ_CAP * dc = static_cast<IPQ_CAP *>(d);

 dc->isRunning = true;
 memset(&raw_packet, 0, sizeof(raw_packet));
 raw_packet.dataLen = -1;
 dc->isRunning = true;
 memset(&raw_packet, 0, sizeof(raw_packet));
 raw_packet.dataLen = -1;