Remove extra debug.

[stg.git] / projects / stargazer / plugins / capture / divert_freebsd / divert_cap.cpp

diff --git a/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp b/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp
index c50b497447d2a3a3cb08e011a1fb602695e85950..289846869a4bb2d4b8e2116e548ff08a065120f7 100644 (file)
--- a/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp
+++ b/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp
@@ -22,6 +22,22 @@
 $Revision: 1.13 $
 $Date: 2010/09/10 06:43:03 $
 */
 $Revision: 1.13 $
 $Date: 2010/09/10 06:43:03 $
 */

+
+#include "divert_cap.h"
+
+#include "stg/traffcounter.h"
+#include "stg/raw_ip_packet.h"
+#include "stg/common.h"
+
+#include <algorithm>
+#include <vector>
+
+#include <cstdio>
+#include <cstring>
+#include <cerrno>
+#include <cstdlib>
+#include <csignal>
+

 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>


@@ -34,20 +50,6 @@ $Date: 2010/09/10 06:43:03 $
 #include <fcntl.h>
 #include <unistd.h>
 
 #include <fcntl.h>
 #include <unistd.h>
 

-#include <cstdio>
-#include <cstring>
-#include <cerrno>
-#include <cstdlib>
-#include <csignal>
-
-#include <algorithm>
-#include <vector>
-
-#include "stg/common.h"
-#include "stg/traffcounter.h"
-#include "stg/plugin_creator.h"
-#include "divert_cap.h"
-

 #define BUFF_LEN (16384) /* max mtu -> lo=16436  TODO why?*/
 
 //-----------------------------------------------------------------------------
 #define BUFF_LEN (16384) /* max mtu -> lo=16436  TODO why?*/
 
 //-----------------------------------------------------------------------------


@@ -62,32 +64,27 @@ DIVERT_DATA cddiv;  //capture data
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-PLUGIN_CREATOR<DIVERT_CAP> dcc;
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-PLUGIN * GetPlugin()
+
+extern "C" STG::Plugin* GetPlugin()

 {
 {

-return dcc.GetPlugin();
+    static DIVERT_CAP plugin;
+    return &plugin;

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

-const std::string DIVERT_CAP::GetVersion() const
+std::string DIVERT_CAP::GetVersion() const

 {
 {

-return "Divert_cap v.1.0";
+return "cap_divert v.1.0";

 }
 //-----------------------------------------------------------------------------
 DIVERT_CAP::DIVERT_CAP()
 }
 //-----------------------------------------------------------------------------
 DIVERT_CAP::DIVERT_CAP()

-    : settings(),
-      port(0),
+    : port(0),

       disableForwarding(false),
       disableForwarding(false),

-      errorStr(),
-      thread(),

       nonstop(false),
       isRunning(false),
       traffCnt(NULL),
       nonstop(false),
       isRunning(false),
       traffCnt(NULL),

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

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


@@ -105,14 +102,15 @@ if (DivertCapOpen() < 0)
 
 nonstop = true;
 
 
 nonstop = true;
 

-if (pthread_create(&thread, NULL, Run, this) == 0)
+if (pthread_create(&thread, NULL, Run, this))

     {
     {

-    return 0;
+    errorStr = "Cannot create thread.";
+    logger("Cannot create thread.");
+    printfd(__FILE__, "Cannot create thread\n");
+    return -1;

     }
 
     }
 

-errorStr = "Cannot create thread.";
-printfd(__FILE__, "Cannot create thread\n");
-return -1;
+return 0;

 }
 //-----------------------------------------------------------------------------
 int DIVERT_CAP::Stop()
 }
 //-----------------------------------------------------------------------------
 int DIVERT_CAP::Stop()


@@ -141,6 +139,7 @@ if (isRunning)
     if (pthread_kill(thread, SIGINT))
         {
         errorStr = "Cannot kill thread.";
     if (pthread_kill(thread, SIGINT))
         {
         errorStr = "Cannot kill thread.";

+        logger("Cannot send signal to thread.");

         printfd(__FILE__, "Cannot kill thread\n");
         return -1;
         }
         printfd(__FILE__, "Cannot kill thread\n");
         return -1;
         }


@@ -158,18 +157,18 @@ pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
 DIVERT_CAP * dc = static_cast<DIVERT_CAP *>(d);
 dc->isRunning = true;
 
 DIVERT_CAP * dc = static_cast<DIVERT_CAP *>(d);
 dc->isRunning = true;
 

-char buffer[64];
+char buffer[STG::packetSize + 14];

 while (dc->nonstop)
     {
 while (dc->nonstop)
     {

-    RAW_PACKET rp;
-    dc->DivertCapRead(buffer, 64, NULL);
+    STG::RawPacket rp;
+    dc->DivertCapRead(buffer, sizeof(buffer), NULL);

 
     if (buffer[12] != 0x8)
         continue;
 
 
     if (buffer[12] != 0x8)
         continue;
 

-    memcpy(rp.rawPacket.pckt, &buffer[14], pcktSize);
+    memcpy(&rp.rawPacket, &buffer[14], STG::packetSize);

 
 

-    dc->traffCnt->Process(rp);
+    dc->traffCnt->process(rp);

     }
 
 dc->isRunning = false;
     }
 
 dc->isRunning = false;


@@ -198,6 +197,7 @@ cddiv.sock = socket(PF_INET, SOCK_RAW, IPPROTO_DIVERT);
 if (cddiv.sock < 0)
     {
     errorStr = "Create divert socket error.";
 if (cddiv.sock < 0)
     {
     errorStr = "Create divert socket error.";

+    logger("Cannot create a socket: %s", strerror(errno));

     printfd(__FILE__, "Cannot create divert socket\n");
     return -1;
     }
     printfd(__FILE__, "Cannot create divert socket\n");
     return -1;
     }


@@ -215,6 +215,7 @@ ret = bind(cddiv.sock, (struct sockaddr *)&divAddr, sizeof(divAddr));
 if (ret < 0)
     {
     errorStr = "Bind divert socket error.";
 if (ret < 0)
     {
     errorStr = "Bind divert socket error.";

+    logger("Cannot bind the scoket: %s", strerror(errno));

     printfd(__FILE__, "Cannot bind divert socket\n");
     return -1;
     }
     printfd(__FILE__, "Cannot bind divert socket\n");
     return -1;
     }


@@ -253,7 +254,15 @@ if ((bytes = recvfrom (cddiv.sock, buf, BUFF_LEN,
         *iface = cddiv.iface;
 
     if (!disableForwarding)
         *iface = cddiv.iface;
 
     if (!disableForwarding)

-        sendto(cddiv.sock, buf, bytes, 0, (struct sockaddr*)&divertaddr, divertaddrSize);
+        {
+        if (sendto(cddiv.sock, buf, bytes, 0, (struct sockaddr*)&divertaddr, divertaddrSize) < 0)
+            logger("sendto error: %s", strerror(errno));
+        }
+    }
+else
+    {
+    if (bytes < 0)
+        logger("recvfrom error: %s", strerror(errno));

     }
 
 return 0;
     }
 
 return 0;


@@ -268,12 +277,12 @@ return 0;
 int DIVERT_CAP::ParseSettings()
 {
 int p;
 int DIVERT_CAP::ParseSettings()
 {
 int p;

-PARAM_VALUE pv;
-std::vector<PARAM_VALUE>::const_iterator pvi;
+STG::ParamValue pv;
+std::vector<STG::ParamValue>::const_iterator pvi;

 
 pv.param = "Port";
 pvi = std::find(settings.moduleParams.begin(), settings.moduleParams.end(), pv);
 
 pv.param = "Port";
 pvi = std::find(settings.moduleParams.begin(), settings.moduleParams.end(), pv);

-if (pvi == settings.moduleParams.end())
+if (pvi == settings.moduleParams.end() || pvi->value.empty())

     {
     p = 15701;
     }
     {
     p = 15701;
     }


@@ -289,7 +298,7 @@ port = p;
 bool d = false;
 pv.param = "DisableForwarding";
 pvi = std::find(settings.moduleParams.begin(), settings.moduleParams.end(), pv);
 bool d = false;
 pv.param = "DisableForwarding";
 pvi = std::find(settings.moduleParams.begin(), settings.moduleParams.end(), pv);

-if (pvi == settings.moduleParams.end())
+if (pvi == settings.moduleParams.end() || pvi->value.empty())

     {
     disableForwarding = false;
     }
     {
     disableForwarding = false;
     }