Merge remote-tracking branch 'origin/stg-2.409' into ticket37

[stg.git] / projects / stargazer / plugins / capture / divert_freebsd / divert_cap.h

diff --git a/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.h b/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.h
index f5bb432b96b171ae70c9152f1fc2d6852e4fc894..d8f4d6f82428db536a72503e1d45401587b9a538 100644 (file)
--- a/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.h
+++ b/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.h
@@ -33,6 +33,7 @@ $Date: 2009/06/23 11:32:27 $
 
 #include "stg/plugin.h"
 #include "stg/module_settings.h"
 
 #include "stg/plugin.h"
 #include "stg/module_settings.h"

+#include "stg/logger.h"

 
 class USERS;
 class TARIFFS;
 
 class USERS;
 class TARIFFS;


@@ -40,34 +41,30 @@ class ADMINS;
 class TRAFFCOUNTER;
 class SETTINGS;
 
 class TRAFFCOUNTER;
 class SETTINGS;
 

-extern "C" PLUGIN * GetPlugin();
-

 //-----------------------------------------------------------------------------
 class DIVERT_CAP : public PLUGIN {
 public:
     DIVERT_CAP();
     virtual ~DIVERT_CAP() {}
 
 //-----------------------------------------------------------------------------
 class DIVERT_CAP : public PLUGIN {
 public:
     DIVERT_CAP();
     virtual ~DIVERT_CAP() {}
 

-    void                SetUsers(USERS *) {}
-    void                SetTariffs(TARIFFS *) {}
-    void                SetAdmins(ADMINS *) {}

     void                SetTraffcounter(TRAFFCOUNTER * tc) { traffCnt = tc; }
     void                SetTraffcounter(TRAFFCOUNTER * tc) { traffCnt = tc; }

-    void                SetStore(STORE *) {}
-    void                SetStgSettings(const SETTINGS *) {}

 
     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; }
     int                 ParseSettings();
     const std::string & GetStrError() const { return errorStr; }
     bool                IsRunning() { return isRunning; }
 
     void                SetSettings(const MODULE_SETTINGS & s) { settings = s; }
     int                 ParseSettings();
     const std::string & GetStrError() const { return errorStr; }

-    const std::string   GetVersion() const;
-    uint16_t            GetStartPosition() const { return 10; }
-    uint16_t            GetStopPosition() const { return 10; }
+    std::string         GetVersion() const;
+    uint16_t            GetStartPosition() const { return 40; }
+    uint16_t            GetStopPosition() const { return 40; }

 
 private:
 
 private:

+    DIVERT_CAP(const DIVERT_CAP & rvalue);
+    DIVERT_CAP & operator=(const DIVERT_CAP & rvalue);
+

     static void *       Run(void *);
 
     int                 DivertCapOpen();
     static void *       Run(void *);
 
     int                 DivertCapOpen();


@@ -79,6 +76,7 @@ private:
     MODULE_SETTINGS     settings;
 
     int                 port;
     MODULE_SETTINGS     settings;
 
     int                 port;

+    bool                disableForwarding;

 
     mutable std::string errorStr;
 
 
     mutable std::string errorStr;
 


@@ -88,6 +86,8 @@ private:
     bool                isRunning;
 
     TRAFFCOUNTER *      traffCnt;
     bool                isRunning;
 
     TRAFFCOUNTER *      traffCnt;

+
+    PLUGIN_LOGGER       logger;

 };
 //-----------------------------------------------------------------------------
 
 };
 //-----------------------------------------------------------------------------