Verbose test reports on failures.

[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 8423421938d7d454ce82c206875c999ab6be1ca3..290754fd6a8d19196ceaa9bfa9495d80dfe19051 100644 (file)
--- a/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.h
+++ b/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.h
@@ -19,52 +19,48 @@
  Author : Boris Mikhailenko <stg34@stg.dp.ua>
 */
 
  Author : Boris Mikhailenko <stg34@stg.dp.ua>
 */
 

-/*
-$Revision: 1.6 $
-$Date: 2009/06/23 11:32:27 $
-*/
+#pragma once

 
 

-#ifndef DIVERT_CAP_H
-#define DIVERT_CAP_H
+#include "stg/plugin.h"
+#include "stg/module_settings.h"
+#include "stg/logger.h"

 
 #include <string>
 
 #include <string>

-#include <pthread.h>
-
-#include "base_plugin.h"
-#include "base_settings.h"
-#include "../../../traffcounter.h"

 
 

-using namespace std;
+#include <pthread.h>

 
 

-extern "C" BASE_PLUGIN * GetPlugin();
+namespace STG
+{
+struct Users;
+struct Tariffs;
+struct Admins;
+struct TraffCounter;
+struct Settings;
+}

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-class DIVERT_CAP :public BASE_PLUGIN
-{
+class DIVERT_CAP : public STG::Plugin {

 public:
     DIVERT_CAP();
 public:
     DIVERT_CAP();

-    virtual ~DIVERT_CAP(){};
-
-    void                SetUsers(USERS *){};
-    void                SetTariffs(TARIFFS *){};
-    void                SetAdmins(ADMINS *){};
-    void                SetTraffcounter(TRAFFCOUNTER * tc);
-    void                SetStore(BASE_STORE *){};
-    void                SetStgSettings(const SETTINGS *){};
-
-    int                 Start();
-    int                 Stop();
-    int                 Reload() { return 0; };
-    bool                IsRunning();
-
-    void                SetSettings(const MODULE_SETTINGS & s);
-    int                 ParseSettings();
-    const string      & GetStrError() const;
-    const string        GetVersion() const;
-    uint16_t            GetStartPosition() const;
-    uint16_t            GetStopPosition() const;
+
+    void                SetTraffcounter(STG::TraffCounter * tc) override { traffCnt = tc; }
+
+    int                 Start() override;
+    int                 Stop() override;
+    int                 Reload(const STG::ModuleSettings & /*ms*/) override { return 0; }
+    bool                IsRunning() override { return isRunning; }
+
+    void                SetSettings(const STG::ModuleSettings & s) override { settings = s; }
+    int                 ParseSettings() override;
+    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; }

 
 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();


@@ -73,24 +69,19 @@ 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 string & str, int min, int max, int * val);
-
-    MODULE_SETTINGS     settings;
+    STG::ModuleSettings     settings;

 
     int                 port;
 
     int                 port;

+    bool                disableForwarding;

 
 

-    mutable string      errorStr;
+    mutable std::string errorStr;

 
     pthread_t           thread;
 
     bool                nonstop;
     bool                isRunning;
 
 
     pthread_t           thread;
 
     bool                nonstop;
     bool                isRunning;
 

-    //int                 capSock;
+    STG::TraffCounter *      traffCnt;

 
 

-    TRAFFCOUNTER *      traffCnt;
+    STG::PluginLogger       logger;

 };
 };

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