Post-merge fixes.

[stg.git] / projects / stargazer / plugins / capture / nfqueue / nfqueue.h

diff --git a/projects/stargazer/plugins/capture/nfqueue/nfqueue.h b/projects/stargazer/plugins/capture/nfqueue/nfqueue.h
index 45342be012db250273f002bffe78fb3ff6ab1c12..27198073cfc255951df2b920f852e55481d8f6ac 100644 (file)
--- 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 ADMINS;
 class TRAFFCOUNTER;
 class SETTINGS;

+class RAW_PACKET;

 
 class TRAFFCOUNTER;
 
 
 class TRAFFCOUNTER;
 


@@ -50,7 +51,7 @@ public:
 
     int                 Start();
     int                 Stop();
 
     int                 Start();
     int                 Stop();

-    int                 Reload() { return 0; }
+    int                 Reload(const MODULE_SETTINGS & /*ms*/) { return 0; }

     bool                IsRunning() { return isRunning; }
 
     void                SetSettings(const MODULE_SETTINGS & s) { settings = s; }
     bool                IsRunning() { return isRunning; }
 
     void                SetSettings(const MODULE_SETTINGS & s) { settings = s; }


@@ -61,7 +62,7 @@ public:
     uint16_t            GetStartPosition() const { return 40; }
     uint16_t            GetStopPosition() const { return 40; }
 
     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);
 
 private:
     NFQ_CAP(const NFQ_CAP & rvalue);


@@ -76,6 +77,8 @@ private:
     bool                isRunning;
     MODULE_SETTINGS     settings;
 
     bool                isRunning;
     MODULE_SETTINGS     settings;
 

+    size_t              queueNumber;
+

     struct nfq_handle * nfqHandle;
     struct nfq_q_handle * queueHandle;
 
     struct nfq_handle * nfqHandle;
     struct nfq_q_handle * queueHandle;