Merge branch 'naffanya-dev'

[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 b463e328e093453738767a01aa1c3145980f1a33..b34f832e5ea5b7706a762edb7ba92b38aeb3b84c 100644 (file)
--- a/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.h
+++ b/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.h
@@ -31,8 +31,9 @@ $Date: 2009/06/23 11:32:27 $
 
 #include <string>
 
 
 #include <string>
 

-#include "plugin.h"
-#include "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,20 +41,13 @@ 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();


@@ -63,11 +57,14 @@ public:
     void                SetSettings(const MODULE_SETTINGS & s) { settings = s; }
     int                 ParseSettings();
     const std::string & GetStrError() const { return errorStr; }
     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();


@@ -76,11 +73,10 @@ private:
     int                 DivertCapRead(char * buffer, int blen, char ** iface, int n);
     int                 DivertCapClose();
 
     int                 DivertCapRead(char * buffer, int blen, char ** iface, int n);
     int                 DivertCapClose();
 

-    int                 ParseIntInRange(const std::string & str, int min, int max, int * val);
-

     MODULE_SETTINGS     settings;
 
     int                 port;
     MODULE_SETTINGS     settings;
 
     int                 port;

+    bool                disableForwarding;

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


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

+
+    PLUGIN_LOGGER       logger;

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