Add name to anonymous union

[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..432ee4b1a27ea55c37a0d18aaed7bb52fe3b77e7 100644 (file)
--- a/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.h
+++ b/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.h
@@ -27,42 +27,40 @@ $Date: 2009/06/23 11:32:27 $
 #ifndef DIVERT_CAP_H
 #define DIVERT_CAP_H
 
-#include <string>
 #include <pthread.h>
 
-#include "base_plugin.h"
-#include "base_settings.h"
-#include "../../../traffcounter.h"
+#include <string>
+
+#include "stg/plugin.h"
+#include "stg/module_settings.h"
 
-using namespace std;
+class USERS;
+class TARIFFS;
+class ADMINS;
+class TRAFFCOUNTER;
+class SETTINGS;
 
-extern "C" BASE_PLUGIN * GetPlugin();
+extern "C" PLUGIN * GetPlugin();
 
 //-----------------------------------------------------------------------------
-class DIVERT_CAP :public BASE_PLUGIN
-{
+class DIVERT_CAP : public PLUGIN {
 public:
     DIVERT_CAP();
-    virtual ~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 *){};
+    void                SetTraffcounter(TRAFFCOUNTER * tc) { traffCnt = tc; }
 
     int                 Start();
     int                 Stop();
-    int                 Reload() { return 0; };
-    bool                IsRunning();
+    int                 Reload() { return 0; }
+    bool                IsRunning() { return isRunning; }
 
-    void                SetSettings(const MODULE_SETTINGS & s);
+    void                SetSettings(const MODULE_SETTINGS & s) { settings = s; }
     int                 ParseSettings();
-    const string      & GetStrError() const;
-    const string        GetVersion() const;
-    uint16_t            GetStartPosition() const;
-    uint16_t            GetStopPosition() const;
+    const std::string & GetStrError() const { return errorStr; }
+    const std::string   GetVersion() const;
+    uint16_t            GetStartPosition() const { return 10; }
+    uint16_t            GetStopPosition() const { return 10; }
 
 private:
     static void *       Run(void *);
@@ -73,24 +71,19 @@ private:
     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;
 
     int                 port;
 
-    mutable string      errorStr;
+    mutable std::string errorStr;
 
     pthread_t           thread;
 
     bool                nonstop;
     bool                isRunning;
 
-    //int                 capSock;
-
     TRAFFCOUNTER *      traffCnt;
 };
 //-----------------------------------------------------------------------------
 
-
 #endif