git.stg.codes
/
stg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Documentation update
[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 7f60c7eb7123bc7578bd011de08eabc7d0e21d5f..1dc22b4cff9e330579a902c693fe83e1bf05ec12 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,17
@@
* 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 "stg/common.h"
+
#include "ipq_cap.h"
extern "C"
#include "ipq_cap.h"
extern "C"
@@
-95,7
+98,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)
@@
-107,7
+111,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)
{
@@
-124,9
+129,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;