From: Maxim Mamontov <faust.madf@gmail.com>
Date: Sun, 8 Jun 2014 10:57:57 +0000 (+0300)
Subject: Fixed build.
X-Git-Tag: 2.409~313
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/d188e71c0b1175978dd4dbb97e61167ca6d163ce?hp=857374a7ffc62eb40940b00d58c57a03703f3a46

Fixed build.
---

diff --git a/projects/stargazer/build b/projects/stargazer/build
index d844bca7..686d781f 100755
--- a/projects/stargazer/build
+++ b/projects/stargazer/build
@@ -446,7 +446,7 @@ printf "CHECK_XMLRPC=$CHECK_XMLRPC\n" >> $CONFFILE
 printf "CHECK_NFNETLINK=$CHECK_NFNETLINK\n" >> $CONFFILE
 printf "CHECK_NFQ=$CHECK_NFQ\n" >> $CONFFILE
 printf "DEFS=$DEFS\n" >> $CONFFILE
-printf "NFQ_LIBS=$NFQ_LIBS" >> $CONFFILE
+printf "NFQ_LIBS=$NFQ_LIBS\n" >> $CONFFILE
 printf "STG_LIBS=" >> $CONFFILE
 for lib in $STG_LIBS
 do
diff --git a/projects/stargazer/plugins/capture/nfqueue/nfqueue.cpp b/projects/stargazer/plugins/capture/nfqueue/nfqueue.cpp
index 245fc649..6a339523 100644
--- a/projects/stargazer/plugins/capture/nfqueue/nfqueue.cpp
+++ b/projects/stargazer/plugins/capture/nfqueue/nfqueue.cpp
@@ -32,8 +32,12 @@ extern "C" {
 
 }
 
+#include <cerrno>
+#include <csignal>
+
 #include <arpa/inet.h> // ntohl
-#include <signal.h>
+
+#include <unistd.h> // read
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
@@ -43,7 +47,7 @@ namespace
 
 PLUGIN_CREATOR<NFQ_CAP> ncc;
 
-int callback(struct nfq_q_handle * /*queueHandle*/, struct nfgenmsg * /*msg*/,
+int Callback(struct nfq_q_handle * queueHandle, struct nfgenmsg * /*msg*/,
              struct nfq_data * nfqData, void *data)
 {
 int id = 0;
@@ -56,18 +60,18 @@ id = ntohl(packetHeader->packet_id);
 
 unsigned char * payload = NULL;
 
-if (nfq_get_payload(nfqData) < 0)
+if (nfq_get_payload(nfqData, &payload) < 0 || payload == NULL)
     return id;
 
 RAW_PACKET packet;
 
-memcpy(&packet.rawPacket, payload, sizeof(ip.rawPacket));
+memcpy(&packet.rawPacket, payload, sizeof(packet.rawPacket));
 
 NFQ_CAP * cap = static_cast<NFQ_CAP *>(data);
 
 cap->Process(packet);
 
-return nfq_set_verdict(qh, id, NF_ACCEPT, 0, NULL);
+return nfq_set_verdict(queueHandle, id, NF_ACCEPT, 0, NULL);
 }
 
 }
@@ -93,6 +97,7 @@ NFQ_CAP::NFQ_CAP()
       thread(),
       nonstop(false),
       isRunning(false),
+      queueNumber(0),
       traffCnt(NULL),
       logger(GetPluginLogger(GetStgLogger(), "cap_nfqueue"))
 {
@@ -100,6 +105,14 @@ NFQ_CAP::NFQ_CAP()
 //-----------------------------------------------------------------------------
 int NFQ_CAP::ParseSettings()
 {
+for (size_t i = 0; i < settings.moduleParams.size(); i++)
+    if (settings.moduleParams[i].param == "queueNumber")
+        if (str2x(settings.moduleParams[i].param, queueNumber) < 0)
+            {
+            errorStr = "Queue number should be a number. Got: '" + settings.moduleParams[i].param + "'";
+            logger(errorStr);
+            return -1;
+            }
 return 0;
 }
 //-----------------------------------------------------------------------------
@@ -211,7 +224,7 @@ pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
 NFQ_CAP * dc = static_cast<NFQ_CAP *>(d);
 dc->isRunning = true;
 
-int fd = nfq_fd(nfqHandle);
+int fd = nfq_fd(dc->nfqHandle);
 char buf[4096];
 
 while (dc->nonstop)
@@ -219,16 +232,21 @@ while (dc->nonstop)
         if (!WaitPackets(fd))
             continue;
 
-        int rv = read(fd, buf, sizeof(buf), 0);
+        int rv = read(fd, buf, sizeof(buf));
         if (rv < 0)
             {
-            errorStr = "Read error: " + strerror(errno);
-            logger(errorStr);
+            dc->errorStr = std::string("Read error: ") + strerror(errno);
+            dc->logger(dc->errorStr);
             break;
             }
-        nfq_handle_packet(nfqHandle, buf, rv);
+        nfq_handle_packet(dc->nfqHandle, buf, rv);
     }
 
 dc->isRunning = false;
 return NULL;
 }
+//-----------------------------------------------------------------------------
+void NFQ_CAP::Process(const RAW_PACKET & packet)
+{
+traffCnt->Process(packet);
+}
diff --git a/projects/stargazer/plugins/capture/nfqueue/nfqueue.h b/projects/stargazer/plugins/capture/nfqueue/nfqueue.h
index 45342be0..87124784 100644
--- a/projects/stargazer/plugins/capture/nfqueue/nfqueue.h
+++ b/projects/stargazer/plugins/capture/nfqueue/nfqueue.h
@@ -35,6 +35,7 @@ class TARIFFS;
 class ADMINS;
 class TRAFFCOUNTER;
 class SETTINGS;
+class RAW_PACKET;
 
 class TRAFFCOUNTER;
 
@@ -61,7 +62,7 @@ public:
     uint16_t            GetStartPosition() const { return 40; }
     uint16_t            GetStopPosition() const { return 40; }
 
-    void                Process(const RAW_PACKET & packet) { traffCnt->Process(packet); }
+    void                Process(const RAW_PACKET & packet);
 
 private:
     NFQ_CAP(const NFQ_CAP & rvalue);
@@ -76,6 +77,8 @@ private:
     bool                isRunning;
     MODULE_SETTINGS     settings;
 
+    size_t              queueNumber;
+
     struct nfq_handle * nfqHandle;
     struct nfq_q_handle * queueHandle;