Merge branch 'master' into full-month-stats

[stg.git] / projects / stargazer / plugins / capture / cap_nf / cap_nf.h

diff --git a/projects/stargazer/plugins/capture/cap_nf/cap_nf.h b/projects/stargazer/plugins/capture/cap_nf/cap_nf.h
index 7712f76145d004eccb7006c25323118cd76ad6b7..bf45cfea8b6dd64e56a0682621d8c9a5c8984184 100644 (file)
--- a/projects/stargazer/plugins/capture/cap_nf/cap_nf.h
+++ b/projects/stargazer/plugins/capture/cap_nf/cap_nf.h
@@ -34,13 +34,14 @@ $Author: faust $
 
 #include <string>
 
 
 #include <string>
 

-#include "os_int.h"
-#include "plugin.h"
-#include "module_settings.h"
+#include "stg/os_int.h"
+#include "stg/plugin.h"
+#include "stg/module_settings.h"
+#include "stg/logger.h"

 
 #define VERSION "CAP_NF v. 0.4"
 
 #define VERSION "CAP_NF v. 0.4"

-#define START_POS 10
-#define STOP_POS 10
+#define START_POS 40
+#define STOP_POS 40

 
 class USERS;
 class USER;
 
 class USERS;
 class USER;


@@ -92,12 +93,7 @@ public:
     NF_CAP();
     ~NF_CAP();
 
     NF_CAP();
     ~NF_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 *) {}

     void            SetSettings(const MODULE_SETTINGS & s) { settings = s; }
     int             ParseSettings();
 
     void            SetSettings(const MODULE_SETTINGS & s) { settings = s; }
     int             ParseSettings();
 


@@ -111,6 +107,9 @@ public:
     uint16_t        GetStopPosition() const { return STOP_POS; }
 
 private:
     uint16_t        GetStopPosition() const { return STOP_POS; }
 
 private:

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

     TRAFFCOUNTER * traffCnt;
     MODULE_SETTINGS settings;
     pthread_t tidTCP;
     TRAFFCOUNTER * traffCnt;
     MODULE_SETTINGS settings;
     pthread_t tidTCP;


@@ -124,6 +123,7 @@ private:
     int sockTCP;
     int sockUDP;
     mutable std::string errorStr;
     int sockTCP;
     int sockUDP;
     mutable std::string errorStr;

+    PLUGIN_LOGGER logger;

 
     static void * RunUDP(void *);
     static void * RunTCP(void *);
 
     static void * RunUDP(void *);
     static void * RunTCP(void *);


@@ -133,8 +133,6 @@ private:
     bool OpenUDP();
     void CloseTCP() { close(sockTCP); }
     void CloseUDP() { close(sockUDP); }
     bool OpenUDP();
     void CloseTCP() { close(sockTCP); }
     void CloseUDP() { close(sockUDP); }

-
-    bool WaitPackets(int sd) const;

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