Fix compilation issues for XML RPC interface

[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 11a96ef1ef281ffffa6621d6ba67707aec3d7e92..0e0204da761145b8e50a710c582cd77a7de8454d 100644 (file)
--- a/projects/stargazer/plugins/capture/cap_nf/cap_nf.cpp
+++ b/projects/stargazer/plugins/capture/cap_nf/cap_nf.cpp
@@ -37,6 +37,8 @@ $Author: faust $
 #include <cerrno>
 #include <cstring>
 
 #include <cerrno>
 #include <cstring>
 

+#include <vector>
+

 #include "common.h" 
 #include "cap_nf.h"
 #include "raw_ip_packet.h"
 #include "common.h" 
 #include "cap_nf.h"
 #include "raw_ip_packet.h"


@@ -61,7 +63,7 @@ private:
     NF_CAP * nf;
 } cnc;
 
     NF_CAP * nf;
 } cnc;
 

-BASE_PLUGIN * GetPlugin()
+PLUGIN * GetPlugin()

 {
 return cnc.GetCapturer();
 }
 {
 return cnc.GetCapturer();
 }


@@ -87,7 +89,7 @@ NF_CAP::~NF_CAP()
 
 int NF_CAP::ParseSettings()
 {
 
 int NF_CAP::ParseSettings()
 {

-vector<PARAM_VALUE>::iterator it;
+std::vector<PARAM_VALUE>::iterator it;

 for (it = settings.moduleParams.begin(); it != settings.moduleParams.end(); ++it)
     {
     if (it->param == "TCPPort")
 for (it = settings.moduleParams.begin(); it != settings.moduleParams.end(); ++it)
     {
     if (it->param == "TCPPort")


@@ -398,14 +400,14 @@ for (int i = 0; i < packets; ++i)
     *(uint32_t *)(ip.pckt + 16) = data->dstAddr;
     *(uint16_t *)(ip.pckt + 20) = data->srcPort;
     *(uint16_t *)(ip.pckt + 22) = data->dstPort;*/
     *(uint32_t *)(ip.pckt + 16) = data->dstAddr;
     *(uint16_t *)(ip.pckt + 20) = data->srcPort;
     *(uint16_t *)(ip.pckt + 22) = data->dstPort;*/

-    ip.ipHeader.ip_v = 4;
-    ip.ipHeader.ip_hl = 5;
-    ip.ipHeader.ip_p = data->proto;
+    ip.header.ipHeader.ip_v = 4;
+    ip.header.ipHeader.ip_hl = 5;
+    ip.header.ipHeader.ip_p = data->proto;

     ip.dataLen = ntohl(data->octets);
     ip.dataLen = ntohl(data->octets);

-    ip.ipHeader.ip_src.s_addr = data->srcAddr;
-    ip.ipHeader.ip_dst.s_addr = data->dstAddr;
-    ip.sPort = data->srcPort;
-    ip.dPort = data->dstPort;
+    ip.header.ipHeader.ip_src.s_addr = data->srcAddr;
+    ip.header.ipHeader.ip_dst.s_addr = data->dstAddr;
+    ip.header.sPort = data->srcPort;
+    ip.header.dPort = data->dstPort;

 
     traffCnt->Process(ip);
     }
 
     traffCnt->Process(ip);
     }