Added note about waiting rscriptd until message queue becomes empty

[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 5c7ec36432b7a81cf63185bb4143272df12f4b70..f6e7731a434c96d097f0b17470b05b6e63eb8d81 100644 (file)
--- a/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp
+++ b/projects/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp
@@ -22,26 +22,30 @@
 $Revision: 1.13 $
 $Date: 2010/09/10 06:43:03 $
 */
 $Revision: 1.13 $
 $Date: 2010/09/10 06:43:03 $
 */

-#include <stdio.h>

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

-#include <string.h>

 
 #include <sys/uio.h>
 #include <sys/time.h>
 #include <sys/ioctl.h>
 #include <sys/poll.h>
 
 
 #include <sys/uio.h>
 #include <sys/time.h>
 #include <sys/ioctl.h>
 #include <sys/poll.h>
 

-#include <errno.h>

 #include <fcntl.h>
 #include <fcntl.h>

-#include <stdlib.h>
-#include <signal.h>

 #include <unistd.h>
 
 #include <unistd.h>
 

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

 #include "divert_cap.h"
 #include "divert_cap.h"

-#include "traffcounter.h"

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


@@ -274,10 +278,10 @@ int DIVERT_CAP::ParseSettings()
 {
 int p;
 PARAM_VALUE pv;
 {
 int p;
 PARAM_VALUE pv;

-vector<PARAM_VALUE>::const_iterator pvi;
+std::vector<PARAM_VALUE>::const_iterator pvi;

 
 pv.param = "Port";
 
 pv.param = "Port";

-pvi = find(settings.moduleParams.begin(), settings.moduleParams.end(), pv);
+pvi = std::find(settings.moduleParams.begin(), settings.moduleParams.end(), pv);

 if (pvi == settings.moduleParams.end())
     {
     port = 15701;
 if (pvi == settings.moduleParams.end())
     {
     port = 15701;