Fix compilation issues on FreeBSD4

[stg.git] / projects / stargazer / plugins / capture / ipq_linux / ipq_cap.h

diff --git a/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.h b/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.h
index 3b088ada51a9a8e61721eac9bbd9d3a7a11b364a..6253fe3a21ab10cc26574f7f9d6dd0bc8987368a 100644 (file)
--- a/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.h
+++ b/projects/stargazer/plugins/capture/ipq_linux/ipq_cap.h
@@ -1,41 +1,67 @@
+/*
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/*
+* Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
+*/
+
+#ifndef IPQ_CAP_H
+#define IPQ_CAP_H
+

 #include <string>
 
 #include <string>
 

-#include "base_plugin.h"
-#include "base_settings.h"
-#include "../../../traffcounter.h"
+#include "stg/plugin.h"
+#include "stg/module_settings.h"
+#include "stg/os_int.h"

 
 #define BUFSIZE     (256)
 #define PAYLOAD_LEN (96)
 
 
 #define BUFSIZE     (256)
 #define PAYLOAD_LEN (96)
 

-using namespace std;
+class USERS;
+class TARIFFS;
+class ADMINS;
+class TRAFFCOUNTER;
+class SETTINGS;

 
 

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

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

-class IPQ_CAP :public BASE_PLUGIN
-{
+class IPQ_CAP :public PLUGIN {

 public:
     IPQ_CAP();
 public:
     IPQ_CAP();

-    virtual ~IPQ_CAP(){};
+    virtual ~IPQ_CAP() {}

 
 

-    void SetUsers(USERS *){};
-    void SetTariffs(TARIFFS *){};
-    void SetAdmins(ADMINS *){};
-    void SetTraffcounter(TRAFFCOUNTER * tc);
-    void SetStore(BASE_STORE *){};
-    void SetStgSettings(const SETTINGS *){};
+    void SetUsers(USERS *) {}
+    void SetTariffs(TARIFFS *) {}
+    void SetAdmins(ADMINS *) {}
+    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; };
-    bool IsRunning();
+    int Reload() { return 0; }
+    bool IsRunning() { return isRunning; }

 
 

-    void  SetSettings(const MODULE_SETTINGS &){};
-    int  ParseSettings(){ return 0; };
-    const string & GetStrError() const;
-    const string GetVersion() const;
-    uint16_t GetStartPosition() const;
-    uint16_t GetStopPosition() const;
+    void  SetSettings(const MODULE_SETTINGS &) {}
+    int  ParseSettings() { return 0; }
+    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 *);
 
 private:
     static void * Run(void *);


@@ -43,8 +69,8 @@ private:
     int IPQCapClose();
     int IPQCapRead(void * buffer, int blen);
 
     int IPQCapClose();
     int IPQCapRead(void * buffer, int blen);
 

-    struct ipq_handle *ipq_h;
-    mutable string errorStr;
+    struct ipq_handle * ipq_h;
+    mutable std::string errorStr;

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


@@ -54,3 +80,5 @@ private:
     TRAFFCOUNTER * traffCnt;
     unsigned char buf[BUFSIZE];
 };
     TRAFFCOUNTER * traffCnt;
     unsigned char buf[BUFSIZE];
 };

+
+#endif