Some more BSD-related issues.

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

diff --git a/stargazer/plugins/capture/nfqueue/nfqueue.h b/stargazer/plugins/capture/nfqueue/nfqueue.h
index fe40bc500ddaf9e88a058304759e1273a71cc64e..7d71bcd23e38885547b093c10bd7e84cbc3caed1 100644 (file)
--- a/stargazer/plugins/capture/nfqueue/nfqueue.h
+++ b/stargazer/plugins/capture/nfqueue/nfqueue.h
@@ -18,8 +18,7 @@
 * Author : Maxim Mamontov <faust@stargazer.dp.ua>
 */
 
 * Author : Maxim Mamontov <faust@stargazer.dp.ua>
 */
 

-#ifndef NFQ_CAP_H
-#define NFQ_CAP_H
+#pragma once

 
 #include "stg/plugin.h"
 #include "stg/module_settings.h"
 
 #include "stg/plugin.h"
 #include "stg/module_settings.h"


@@ -30,39 +29,41 @@
 
 #include <pthread.h>
 
 
 #include <pthread.h>
 

-class USERS;
-class TARIFFS;
-class ADMINS;
-class TRAFFCOUNTER;
-class SETTINGS;
-struct RAW_PACKET;
+namespace STG
+{

 
 

-class TRAFFCOUNTER;
+struct Users;
+struct Tariffs;
+struct Admins;
+struct TraffCounter;
+struct Settings;
+struct RawPacket;
+
+}

 
 struct nfq_handle;
 struct nfq_q_handle;
 
 
 struct nfq_handle;
 struct nfq_q_handle;
 

-class NFQ_CAP : public PLUGIN {
+class NFQ_CAP : public STG::Plugin {

 public:
     NFQ_CAP();
 public:
     NFQ_CAP();

-    virtual ~NFQ_CAP() {}

 
 

-    void                SetTraffcounter(TRAFFCOUNTER * tc) { traffCnt = tc; }
+    void                SetTraffcounter(STG::TraffCounter * tc) override { traffCnt = tc; }

 
 

-    int                 Start();
-    int                 Stop();
-    int                 Reload(const MODULE_SETTINGS & /*ms*/) { return 0; }
-    bool                IsRunning() { return isRunning; }
+    int                 Start() override;
+    int                 Stop() override;
+    int                 Reload(const STG::ModuleSettings & /*ms*/) override { return 0; }
+    bool                IsRunning() override { return isRunning; }

 
 

-    void                SetSettings(const MODULE_SETTINGS & s) { settings = s; }
-    int                 ParseSettings();
+    void                SetSettings(const STG::ModuleSettings & s) override { settings = s; }
+    int                 ParseSettings() override;

 
 

-    const std::string & GetStrError() const { return errorStr; }
-    std::string         GetVersion() const;
-    uint16_t            GetStartPosition() const { return 40; }
-    uint16_t            GetStopPosition() const { return 40; }
+    const std::string & GetStrError() const override { return errorStr; }
+    std::string         GetVersion() const override;
+    uint16_t            GetStartPosition() const override { return 40; }
+    uint16_t            GetStopPosition() const override { return 40; }

 
 

-    void                Process(const RAW_PACKET & packet);
+    void                Process(const STG::RawPacket & packet);

 
 private:
     NFQ_CAP(const NFQ_CAP & rvalue);
 
 private:
     NFQ_CAP(const NFQ_CAP & rvalue);


@@ -75,17 +76,14 @@ private:
     pthread_t           thread;
     bool                nonstop;
     bool                isRunning;
     pthread_t           thread;
     bool                nonstop;
     bool                isRunning;

-    MODULE_SETTINGS     settings;
+    STG::ModuleSettings     settings;

 
     size_t              queueNumber;
 
     struct nfq_handle * nfqHandle;
     struct nfq_q_handle * queueHandle;
 
 
     size_t              queueNumber;
 
     struct nfq_handle * nfqHandle;
     struct nfq_q_handle * queueHandle;
 

-    TRAFFCOUNTER *      traffCnt;
+    STG::TraffCounter *      traffCnt;

 
 

-    PLUGIN_LOGGER       logger;
+    STG::PluginLogger       logger;

 };
 };

-//-----------------------------------------------------------------------------
-
-#endif