git.stg.codes
/
stg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added a function to check user existance.
[stg.git]
/
projects
/
stargazer
/
plugins
/
capture
/
ether_freebsd
/
ether_cap.h
diff --git
a/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.h
b/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.h
index 6e651d35696a50d25e0d1e4f03a1ec32d7f42708..76785ed293ebb55f2116cf2549920371cc21ed39 100644
(file)
--- a/
projects/stargazer/plugins/capture/ether_freebsd/ether_cap.h
+++ b/
projects/stargazer/plugins/capture/ether_freebsd/ether_cap.h
@@
-27,31
+27,22
@@
#ifndef ETHER_CAP_H
#define ETHER_CAP_H
#ifndef ETHER_CAP_H
#define ETHER_CAP_H
-#include <string>
-#include <vector>
#include <pthread.h>
#include <pthread.h>
-#ifdef FREE_BSD5
-#include <inttypes.h>
-#endif
-
-#ifdef FREE_BSD
-#include <sys/inttypes.h>
-#endif
-
-#include "base_plugin.h"
-#include "base_settings.h"
-#include "../../../traffcounter.h"
+#include <string>
+#include <vector>
-using namespace std;
+#include "stg/os_int.h"
+#include "stg/plugin.h"
+#include "stg/module_settings.h"
+#include "stg/logger.h"
-extern "C" BASE_PLUGIN * GetPlugin();
+#define BUFF_LEN (128)
-#define BUFF_LEN (128)
+class TRAFFCOUNTER;
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-struct BPF_DATA
-{
+struct BPF_DATA {
BPF_DATA()
{
fd = 0;
BPF_DATA()
{
fd = 0;
@@
-62,7
+53,6
@@
struct BPF_DATA
bh = NULL;
canRead = 1;
iface = "";
bh = NULL;
canRead = 1;
iface = "";
- //memset(&polld, 0, sizeof(pollfd));
};
BPF_DATA(const BPF_DATA & bd)
};
BPF_DATA(const BPF_DATA & bd)
@@
-75,84
+65,78
@@
struct BPF_DATA
bh = bd.bh;
canRead = bd.canRead;
iface = bd.iface;
bh = bd.bh;
canRead = bd.canRead;
iface = bd.iface;
- //memcpy(&polld, &bd.polld, sizeof(pollfd));
};
};
-int fd;
-uint8_t * p;
-int r;
-int sum;
-uint8_t buffer[BUFF_LEN];
+int
fd;
+uint8_t *
p;
+int
r;
+int
sum;
+uint8_t
buffer[BUFF_LEN];
struct bpf_hdr * bh;
struct bpf_hdr * bh;
-int canRead;
-string iface;
-//pollfd polld;
+int canRead;
+std::string iface;
};
//-----------------------------------------------------------------------------
};
//-----------------------------------------------------------------------------
-class BPF_CAP_SETTINGS
-{
+class BPF_CAP_SETTINGS {
public:
public:
- virtual ~BPF_CAP_SETTINGS()
{};
- const st
ring&
GetStrError() const { return errorStr; }
+ virtual ~BPF_CAP_SETTINGS()
{}
+ const st
d::string &
GetStrError() const { return errorStr; }
int ParseSettings(const MODULE_SETTINGS & s);
int ParseSettings(const MODULE_SETTINGS & s);
- st
ring
GetIface(unsigned int num);
+ st
d::string
GetIface(unsigned int num);
private:
private:
-
vector<string>
iface;
- mutable st
ring
errorStr;
+
std::vector<std::string>
iface;
+ mutable st
d::string
errorStr;
};
//-----------------------------------------------------------------------------
};
//-----------------------------------------------------------------------------
-class BPF_CAP :public BASE_PLUGIN
-{
+class BPF_CAP : public PLUGIN {
public:
BPF_CAP();
public:
BPF_CAP();
- virtual ~BPF_CAP()
{};
+ virtual ~BPF_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 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();
int ParseSettings();
- const st
ring & GetStrError() const;
-
const string
GetVersion() const;
- uint16_t GetStartPosition() const
;
- uint16_t GetStopPosition() const
;
+ const st
d::string & GetStrError() const { return errorStr; }
+
std::string
GetVersion() const;
+ uint16_t GetStartPosition() const
{ return 40; }
+ uint16_t GetStopPosition() const
{ return 40; }
private:
private:
+ BPF_CAP(const BPF_CAP & rvalue);
+ BPF_CAP & operator=(const BPF_CAP & rvalue);
+
static void * Run(void *);
int BPFCapOpen();
static void * Run(void *);
int BPFCapOpen();
- //int BPFCapOpen(int n);
int BPFCapOpen(BPF_DATA * bd);
int BPFCapClose();
int BPFCapRead(char * buffer, int blen, char ** iface);
int BPFCapRead(char * buffer, int blen, char ** iface, BPF_DATA * bd);
int BPFCapOpen(BPF_DATA * bd);
int BPFCapClose();
int BPFCapRead(char * buffer, int blen, char ** iface);
int BPFCapRead(char * buffer, int blen, char ** iface, BPF_DATA * bd);
- BPF_CAP_SETTINGS capSettings;
+ BPF_CAP_SETTINGS
capSettings;
- mutable st
ring
errorStr;
+ mutable st
d::string
errorStr;
-
vector<BPF_DATA>
bpfData;
-
vector<pollfd>
polld;
+
std::vector<BPF_DATA>
bpfData;
+
std::vector<pollfd>
polld;
- pthread_t thread;
- bool nonstop;
- bool isRunning;
- int capSock;
- MODULE_SETTINGS settings;
+ pthread_t
thread;
+ bool
nonstop;
+ bool
isRunning;
+ int
capSock;
+ MODULE_SETTINGS
settings;
- TRAFFCOUNTER * traffCnt;
+ TRAFFCOUNTER * traffCnt;
+
+ PLUGIN_LOGGER logger;
};
//-----------------------------------------------------------------------------
};
//-----------------------------------------------------------------------------
-#endif //ETHER_CAP_H
-
+#endif