pcktSize -> packetSize

[stg.git] / stargazer / plugins / capture / pcap / pcap_cap.cpp

diff --git a/stargazer/plugins/capture/pcap/pcap_cap.cpp b/stargazer/plugins/capture/pcap/pcap_cap.cpp
index d085df6623f9b3b51ba7b606c80f70f53ca9ba8b..394487f37ab3b45946e41ad93f25e65108e756c1 100644 (file)
--- a/stargazer/plugins/capture/pcap/pcap_cap.cpp
+++ b/stargazer/plugins/capture/pcap/pcap_cap.cpp
@@ -21,7 +21,6 @@
 #include "pcap_cap.h"
 
 #include "stg/traffcounter.h"
 #include "pcap_cap.h"
 
 #include "stg/traffcounter.h"

-#include "stg/plugin_creator.h"

 #include "stg/common.h"
 #include "stg/raw_ip_packet.h"
 
 #include "stg/common.h"
 #include "stg/raw_ip_packet.h"
 


@@ -32,7 +31,6 @@
 //-----------------------------------------------------------------------------
 namespace
 {
 //-----------------------------------------------------------------------------
 namespace
 {

-PLUGIN_CREATOR<PCAP_CAP> pcc;

 
 const size_t SNAP_LEN = 1518;
 const size_t ETHER_ADDR_LEN = 6;
 
 const size_t SNAP_LEN = 1518;
 const size_t ETHER_ADDR_LEN = 6;


@@ -46,13 +44,13 @@ u_short    ether_type;                     /* IP? ARP? RARP? etc */
 
 }
 
 
 }
 

-extern "C" PLUGIN * GetPlugin();

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

-PLUGIN * GetPlugin()
+extern "C" STG::Plugin* GetPlugin()

 {
 {

-return pcc.GetPlugin();
+    static PCAP_CAP plugin;
+    return &plugin;

 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------


@@ -66,7 +64,7 @@ PCAP_CAP::PCAP_CAP()
     : nonstop(false),
       isRunning(false),
       traffCnt(NULL),
     : nonstop(false),
       isRunning(false),
       traffCnt(NULL),

-      logger(GetPluginLogger(GetStgLogger(), "pcap_cap"))
+      logger(STG::PluginLogger::get("pcap_cap"))

 {
 }
 //-----------------------------------------------------------------------------
 {
 }
 //-----------------------------------------------------------------------------


@@ -292,7 +290,7 @@ const ETH * eth = reinterpret_cast<const ETH *>(packet);
 if (eth->ether_type != 0x8)
     return;
 
 if (eth->ether_type != 0x8)
     return;
 

-RAW_PACKET ip;
+STG::RawPacket ip;

 memcpy(&ip.rawPacket, packet + 14, sizeof(ip.rawPacket));
 memcpy(&ip.rawPacket, packet + 14, sizeof(ip.rawPacket));

-traffCnt->Process(ip);
+traffCnt->process(ip);

 }
 }