Ticket 37. WriteTime() changed to WriteString() and formatTime() added

[stg.git] / projects / stargazer / plugins / capture / cap_nf / cap_nf.cpp

diff --git a/projects/stargazer/plugins/capture/cap_nf/cap_nf.cpp b/projects/stargazer/plugins/capture/cap_nf/cap_nf.cpp
index 41ad9faed1ab4d769ba4359e11c3fac673cb642f..ce42d911ad728d5845af8a37c34078e126ce820b 100644 (file)
--- a/projects/stargazer/plugins/capture/cap_nf/cap_nf.cpp
+++ b/projects/stargazer/plugins/capture/cap_nf/cap_nf.cpp
@@ -39,7 +39,7 @@ $Author: faust $
 
 #include <vector>
 
 
 #include <vector>
 

-#include "stg/common.h" 
+#include "stg/common.h"

 #include "stg/raw_ip_packet.h"
 #include "stg/traffcounter.h"
 #include "stg/plugin_creator.h"
 #include "stg/raw_ip_packet.h"
 #include "stg/traffcounter.h"
 #include "stg/plugin_creator.h"


@@ -59,9 +59,6 @@ return cnc.GetPlugin();
 
 NF_CAP::NF_CAP()
     : traffCnt(NULL),
 
 NF_CAP::NF_CAP()
     : traffCnt(NULL),

-      settings(),
-      tidTCP(),
-      tidUDP(),

       runningTCP(false),
       runningUDP(false),
       stoppedTCP(true),
       runningTCP(false),
       runningUDP(false),
       stoppedTCP(true),


@@ -70,7 +67,6 @@ NF_CAP::NF_CAP()
       portU(0),
       sockTCP(-1),
       sockUDP(-1),
       portU(0),
       sockTCP(-1),
       sockUDP(-1),

-      errorStr(),

       logger(GetPluginLogger(GetStgLogger(), "cap_nf"))
 {
 }
       logger(GetPluginLogger(GetStgLogger(), "cap_nf"))
 {
 }


@@ -84,7 +80,7 @@ int NF_CAP::ParseSettings()
 std::vector<PARAM_VALUE>::iterator it;
 for (it = settings.moduleParams.begin(); it != settings.moduleParams.end(); ++it)
     {
 std::vector<PARAM_VALUE>::iterator it;
 for (it = settings.moduleParams.begin(); it != settings.moduleParams.end(); ++it)
     {

-    if (it->param == "TCPPort")
+    if (it->param == "TCPPort" && !it->value.empty())

         {
         if (str2x(it->value[0], portT))
             {
         {
         if (str2x(it->value[0], portT))
             {


@@ -94,7 +90,7 @@ for (it = settings.moduleParams.begin(); it != settings.moduleParams.end(); ++it
             }
         continue;
         }
             }
         continue;
         }

-    if (it->param == "UDPPort")
+    if (it->param == "UDPPort" && !it->value.empty())

         {
         if (str2x(it->value[0], portU))
             {
         {
         if (str2x(it->value[0], portU))
             {


@@ -123,7 +119,7 @@ if (portU > 0)
         runningUDP = false;
         CloseUDP();
         errorStr = "Cannot create UDP thread";
         runningUDP = false;
         CloseUDP();
         errorStr = "Cannot create UDP thread";

-       logger("Cannot create UDP thread.");
+        logger("Cannot create UDP thread.");

         printfd(__FILE__, "Error: Cannot create UDP thread\n");
         return -1;
         }
         printfd(__FILE__, "Error: Cannot create UDP thread\n");
         return -1;
         }


@@ -139,7 +135,7 @@ if (portT > 0)
         {
         runningTCP = false;
         CloseTCP();
         {
         runningTCP = false;
         CloseTCP();

-       logger("Cannot create TCP thread.");
+        logger("Cannot create TCP thread.");

         errorStr = "Cannot create TCP thread";
         printfd(__FILE__, "Error: Cannot create TCP thread\n");
         return -1;
         errorStr = "Cannot create TCP thread";
         printfd(__FILE__, "Error: Cannot create TCP thread\n");
         return -1;


@@ -168,7 +164,7 @@ if (portU && !stoppedUDP)
         if (pthread_kill(tidUDP, SIGUSR1))
             {
             errorStr = "Error sending signal to UDP thread";
         if (pthread_kill(tidUDP, SIGUSR1))
             {
             errorStr = "Error sending signal to UDP thread";

-           logger("Error sending sugnal to UDP thread.");
+            logger("Error sending sugnal to UDP thread.");

             printfd(__FILE__, "Error: Error sending signal to UDP thread\n");
             return -1;
             }
             printfd(__FILE__, "Error: Error sending signal to UDP thread\n");
             return -1;
             }


@@ -193,12 +189,12 @@ if (portT && !stoppedTCP)
         if (pthread_kill(tidTCP, SIGUSR1))
             {
             errorStr = "Error sending signal to TCP thread";
         if (pthread_kill(tidTCP, SIGUSR1))
             {
             errorStr = "Error sending signal to TCP thread";

-           logger("Error sending signal to TCP thread.");
+            logger("Error sending signal to TCP thread.");

             printfd(__FILE__, "Error: Error sending signal to TCP thread\n");
             return -1;
             }
         printfd(__FILE__, "TCP thread NOT stopped\n");
             printfd(__FILE__, "Error: Error sending signal to TCP thread\n");
             return -1;
             }
         printfd(__FILE__, "TCP thread NOT stopped\n");

-       logger("Cannot stop TCP thread.");
+        logger("Cannot stop TCP thread.");

         }
     }
 return 0;
         }
     }
 return 0;


@@ -283,10 +279,10 @@ while (cap->runningUDP)
         break;
 
     if (res < 0)
         break;
 
     if (res < 0)

-       {
-       cap->logger("recvfrom error: %s", strerror(errno));
-       continue;
-       }
+        {
+        cap->logger("recvfrom error: %s", strerror(errno));
+        continue;
+        }

 
     if (res == 0) // EOF
         {
 
     if (res == 0) // EOF
         {


@@ -334,7 +330,7 @@ while (cap->runningTCP)
     if (sd <= 0)
         {
         if (sd < 0)
     if (sd <= 0)
         {
         if (sd < 0)

-           cap->logger("accept error: %s", strerror(errno));
+            cap->logger("accept error: %s", strerror(errno));

         continue;
         }
 
         continue;
         }