Fix compilation issues on FreeBSD4

[stg.git] / stglibs / pinger.lib / pinger.h

diff --git a/stglibs/pinger.lib/pinger.h b/stglibs/pinger.lib/pinger.h
index 4349eb07ab929165c803efabe7753b8f19752311..b1b777813fc617f0710ae51799a76b3c80a2f804 100644 (file)
--- a/stglibs/pinger.lib/pinger.h
+++ b/stglibs/pinger.lib/pinger.h
@@ -7,9 +7,8 @@
 #ifndef PINGER_H
 #define PINGER_H
 
 #ifndef PINGER_H
 #define PINGER_H
 

-#include <time.h>
+#include <ctime>

 #include <string>
 #include <string>

-#include <vector>

 #include <list>
 #include <map>
 
 #include <list>
 #include <map>
 


@@ -28,9 +27,7 @@
 #include <arpa/inet.h>
 #endif
 
 #include <arpa/inet.h>
 #endif
 

-#include "os_int.h"
-
-using namespace std;
+#include "stg/os_int.h"

 
 //-----------------------------------------------------------------------------
 struct ICMP_HDR
 
 //-----------------------------------------------------------------------------
 struct ICMP_HDR


@@ -94,15 +91,22 @@ public:
     int     Stop();
     void    AddIP(uint32_t ip);
     void    DelIP(uint32_t ip);
     int     Stop();
     void    AddIP(uint32_t ip);
     void    DelIP(uint32_t ip);

-    int     GetPingIPNum();
-    void    GetAllIP(vector<PING_IP_TIME> * ipTime);
+    int     GetPingIPNum() const;

     void    PrintAllIP();
     void    PrintAllIP();

-    int     GetIPTime(uint32_t ip, time_t * t);
-    void    SetDelayTime(time_t delay);
-    time_t  GetDelayTime();
-    string  GetStrError();
+    int     GetIPTime(uint32_t ip, time_t * t) const;
+    void    SetDelayTime(time_t d) { delay = d; }
+    time_t  GetDelayTime() const { return delay; }
+    const std::string & GetStrError() const { return errorStr; }

 
 private:
 
 private:

+    uint16_t    PingCheckSum(void * data, int len);
+    int         SendPing(uint32_t ip);
+    uint32_t    RecvPing();
+    void        RealAddIP();
+    void        RealDelIP();
+
+    static void * RunSendPing(void * d);
+    static void * RunRecvPing(void * d);

 
     int         delay;
     bool        nonstop;
 
     int         delay;
     bool        nonstop;


@@ -116,24 +120,13 @@ private:
     PING_MESSAGE pmSend;
     uint32_t    pid;
 
     PING_MESSAGE pmSend;
     uint32_t    pid;
 

-    uint16_t    PingCheckSum(void * data, int len);
-    int         SendPing(uint32_t ip);
-    uint32_t    RecvPing();
-    void        RealAddIP();
-    void        RealDelIP();
-
-    static void * RunSendPing(void * d);
-    static void * RunRecvPing(void * d);
-
-    string      errorStr;
+    std::string errorStr;

 
 

-    multimap<uint32_t, time_t>   pingIP;
-    list<uint32_t>          ipToAdd;
-    list<uint32_t>          ipToDel;
+    std::multimap<uint32_t, time_t> pingIP;
+    std::list<uint32_t>          ipToAdd;
+    std::list<uint32_t>          ipToDel;

 
 

-    pthread_mutex_t mutex;
+    mutable pthread_mutex_t mutex;

 };
 //-----------------------------------------------------------------------------
 #endif
 };
 //-----------------------------------------------------------------------------
 #endif

-
-