X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/53536f012e78a3d28ca1290109667ce2aba794d7..11c19b3afd4aa6a215d95b34de23213e113226d9:/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.cpp?ds=inline

diff --git a/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.cpp b/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.cpp
index 36159fed..aa10327c 100644
--- a/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.cpp
+++ b/projects/stargazer/plugins/capture/ether_freebsd/ether_cap.cpp
@@ -28,12 +28,23 @@ $Date: 2009/03/24 11:20:15 $
 $Author: faust $
 */
 
+#include "ether_cap.h"
+
+#include "stg/common.h"
+#include "stg/raw_ip_packet.h"
+#include "stg/traffcounter.h"
+
+#include <cerrno>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
+#include <csignal>
+
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/ioctl.h>
-#include <sys/poll.h>
 
 #include <net/bpf.h>
 #include <net/if.h>
@@ -42,41 +53,17 @@ $Author: faust $
 #include <fcntl.h>
 #include <unistd.h>
 
-#include <cerrno>
-#include <cstdio>
-#include <cstring>
-#include <cstdlib>
-#include <csignal>
-
-#include "stg/common.h"
-#include "stg/raw_ip_packet.h"
-#include "stg/traffcounter.h"
-#include "stg/plugin_creator.h"
-
-#include "ether_cap.h"
-
 //#define CAP_DEBUG 1
 
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-namespace
+extern "C" STG::Plugin* GetPlugin()
 {
-PLUGIN_CREATOR<BPF_CAP> bcc;
+    static BPF_CAP plugin;
+    return &plugin;
 }
-
-extern "C" PLUGIN * GetPlugin();
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-PLUGIN * GetPlugin()
-{
-return bcc.GetPlugin();
-}
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-int BPF_CAP_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
+int BPF_CAP_SETTINGS::ParseSettings(const STG::ModuleSettings & s)
 {
 iface.erase(iface.begin(), iface.end());
 
@@ -121,11 +108,10 @@ return "cap_bpf v.1.0";
 }
 //-----------------------------------------------------------------------------
 BPF_CAP::BPF_CAP()
-    : nonstop(false),
-      isRunning(false),
+    : isRunning(false),
       capSock(-1),
       traffCnt(NULL),
-      logger(GetPluginLogger(GetStgLogger(), "cap_bpf"))
+      logger(STG::PluginLogger::get("cap_bpf"))
 {
 }
 //-----------------------------------------------------------------------------
@@ -151,15 +137,7 @@ if (BPFCapOpen() < 0)
     return -1;
     }
 
-nonstop = true;
-
-if (pthread_create(&thread, NULL, Run, this))
-    {
-    errorStr = "Cannot create thread.";
-    logger("Cannot create thread.");
-    printfd(__FILE__, "Cannot create thread\n");
-    return -1;
-    }
+m_thread = std::jthread([this](auto token){ Run(std::move(token)); });
 
 return 0;
 }
@@ -171,7 +149,7 @@ if (!isRunning)
 
 BPFCapClose();
 
-nonstop = false;
+m_thread.request_stop();
 
 //5 seconds to thread stops itself
 int i;
@@ -186,50 +164,41 @@ for (i = 0; i < 25; i++)
 
 //after 5 seconds waiting thread still running. now killing it
 if (isRunning)
-    {
-    //TODO pthread_cancel()
-    if (pthread_kill(thread, SIGINT))
-        {
-        errorStr = "Cannot kill thread.";
-        logger("Cannot send signal to thread.");
-        printfd(__FILE__, "Cannot kill thread\n");
-        return -1;
-        }
-    }
+    m_thread.detach();
+else
+    m_thread.join();
 
 return 0;
 }
 //-----------------------------------------------------------------------------
-void * BPF_CAP::Run(void * d)
+void BPF_CAP::Run(std::stop_token token)
 {
 sigset_t signalSet;
 sigfillset(&signalSet);
 pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
 
-BPF_CAP * dc = static_cast<BPF_CAP *>(d);
-dc->isRunning = true;
+isRunning = true;
 
 uint8_t hdr[96]; //68 + 14 + 4(size) + 9(SYS_IFACE) + 1(align to 4) = 96
 
-RAW_PACKET *  rpp = (RAW_PACKET *)&hdr[14];
+STG::RawPacket *  rpp = (STG::RawPacket *)&hdr[14];
 memset(hdr, 0, sizeof(hdr));
 
 rpp->dataLen = -1;
 char * iface;
 
-while (dc->nonstop)
+while (!token.stop_requested())
     {
-    if (dc->BPFCapRead((char*)&hdr, 68 + 14, &iface))
+    if (BPFCapRead((char*)&hdr, 68 + 14, &iface))
         continue;
 
     if (!(hdr[12] == 0x8 && hdr[13] == 0x0))
         continue;
 
-    dc->traffCnt->Process(*rpp);
+    traffCnt->process(*rpp);
     }
 
-dc->isRunning = false;
-return NULL;
+isRunning = false;
 }
 //-----------------------------------------------------------------------------
 int BPF_CAP::BPFCapOpen()