X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/a9b057b8c963da58cd4b40ed2cb5cc4b89bc203e..2196a3a0cdc5384c082febb7f4aa5994cc7d80db:/projects/stargazer/plugins/capture/cap_nf/cap_nf.h?ds=sidebyside

diff --git a/projects/stargazer/plugins/capture/cap_nf/cap_nf.h b/projects/stargazer/plugins/capture/cap_nf/cap_nf.h
index ae0b3763..ed07bd59 100644
--- a/projects/stargazer/plugins/capture/cap_nf/cap_nf.h
+++ b/projects/stargazer/plugins/capture/cap_nf/cap_nf.h
@@ -27,112 +27,79 @@ $Revision: 1.5 $
 $Date: 2009/12/13 12:56:07 $
 $Author: faust $
 */
-#ifndef __CAP_NF_H__
-#define __CAP_NF_H__
+#pragma once
 
-#include <pthread.h>
-
-#include <string>
-
-#include "stg/os_int.h"
 #include "stg/plugin.h"
 #include "stg/module_settings.h"
 #include "stg/logger.h"
 
+#include <string>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+#include <jthread.hpp>
+#pragma GCC diagnostic pop
+#include <cstdint>
+
+#include <unistd.h> // close
+
 #define VERSION "cap_nf v. 0.4"
 #define START_POS 40
 #define STOP_POS 40
 
-class USERS;
-class USER;
-class TARIFFS;
-class ADMINS;
-class TRAFFCOUNTER;
-class STORE;
-class SETTINGS;
-
-struct NF_HEADER {
-    uint16_t version;   // Protocol version
-    uint16_t count;     // Flows count
-    uint32_t uptime;    // System uptime
-    uint32_t timestamp; // UNIX timestamp
-    uint32_t nsecs;     // Residual nanoseconds
-    uint32_t flowSeq;   // Sequence counter
-    uint8_t  eType;     // Engine type
-    uint8_t  eID;       // Engine ID
-    uint16_t sInterval; // Sampling mode and interval
-};
-
-struct NF_DATA {
-    uint32_t srcAddr;   // Flow source address
-    uint32_t dstAddr;   // Flow destination address
-    uint32_t nextHop;   // IP addres on next hop router
-    uint16_t inSNMP;    // SNMP index of input iface
-    uint16_t outSNMP;   // SNMP index of output iface
-    uint32_t packets;   // Packets in flow
-    uint32_t octets;    // Total number of bytes in flow
-    uint32_t timeStart; // Uptime on first packet in flow
-    uint32_t timeFinish;// Uptime on last packet in flow
-    uint16_t srcPort;   // Flow source port
-    uint16_t dstPort;   // Flow destination port
-    uint8_t  pad1;      // 1-byte padding
-    uint8_t  TCPFlags;  // Cumulative OR of TCP flags
-    uint8_t  proto;     // IP protocol type (tcp, udp, etc.)
-    uint8_t  tos;       // IP Type of Service (ToS)
-    uint16_t srcAS;     // Source BGP autonomous system number
-    uint16_t dstAS;     // Destination BGP autonomus system number
-    uint8_t  srcMask;   // Source address mask in "slash" notation
-    uint8_t  dstMask;   // Destination address mask in "slash" notation
-    uint16_t pad2;      // 2-byte padding
-};
-
-#define BUF_SIZE (sizeof(NF_HEADER) + 30 * sizeof(NF_DATA))
-
-class NF_CAP : public PLUGIN {
-public:
-    NF_CAP();
-    ~NF_CAP();
-
-    void            SetTraffcounter(TRAFFCOUNTER * tc) { traffCnt = tc; }
-    void            SetSettings(const MODULE_SETTINGS & s) { settings = s; }
-    int             ParseSettings();
-
-    int             Start();
-    int             Stop();
-    int             Reload(const MODULE_SETTINGS & ms) { return 0; }
-    bool            IsRunning() { return runningTCP || runningUDP; }
-    const std::string & GetStrError() const { return errorStr; }
-    std::string     GetVersion() const { return VERSION; }
-    uint16_t        GetStartPosition() const { return START_POS; }
-    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;
-    pthread_t tidUDP;
-    bool runningTCP;
-    bool runningUDP;
-    bool stoppedTCP;
-    bool stoppedUDP;
-    uint16_t portT;
-    uint16_t portU;
-    int sockTCP;
-    int sockUDP;
-    mutable std::string errorStr;
-    PLUGIN_LOGGER logger;
-
-    static void * RunUDP(void *);
-    static void * RunTCP(void *);
-    void ParseBuffer(uint8_t * buf, ssize_t size);
-
-    bool OpenTCP();
-    bool OpenUDP();
-    void CloseTCP() { close(sockTCP); }
-    void CloseUDP() { close(sockUDP); }
+namespace STG
+{
+
+class Users;
+class Tariffs;
+struct Admins;
+struct TraffCounter;
+struct Store;
+struct Settings;
+
+class NF_CAP : public Plugin
+{
+    public:
+        NF_CAP();
+
+        void            SetTraffcounter(TraffCounter * tc) override { traffCnt = tc; }
+        void            SetSettings(const ModuleSettings & s) override { settings = s; }
+        int             ParseSettings() override;
+
+        int             Start() override;
+        int             Stop() override;
+        int             Reload(const ModuleSettings & /*ms*/) override { return 0; }
+
+        bool            IsRunning() override { return m_threadTCP.joinable() || m_threadUDP.joinable(); }
+        const std::string & GetStrError() const override { return errorStr; }
+        std::string     GetVersion() const override { return VERSION; }
+        uint16_t        GetStartPosition() const override { return START_POS; }
+        uint16_t        GetStopPosition() const override { return STOP_POS; }
+
+    private:
+        NF_CAP(const NF_CAP & rvalue);
+        NF_CAP & operator=(const NF_CAP & rvalue);
+
+        TraffCounter * traffCnt;
+        ModuleSettings settings;
+        std::jthread m_threadTCP;
+        std::jthread m_threadUDP;
+        bool stoppedTCP;
+        bool stoppedUDP;
+        uint16_t portT;
+        uint16_t portU;
+        int sockTCP;
+        int sockUDP;
+        mutable std::string errorStr;
+        PluginLogger logger;
+
+        void RunUDP(std::stop_token token) noexcept;
+        void RunTCP(std::stop_token token) noexcept;
+        void ParseBuffer(uint8_t * buf, ssize_t size);
+
+        bool OpenTCP();
+        bool OpenUDP();
+        void CloseTCP() { close(sockTCP); }
+        void CloseUDP() { close(sockUDP); }
 };
 
-#endif
+}