Code cleanup for mod_auth_ao

[stg.git] / include / raw_ip_packet.h

diff --git a/include/raw_ip_packet.h b/include/raw_ip_packet.h
index bca44b3d64fd79d9b925997f9cc922b1be04843f..a1bdda7170205d76cc3fbc1eef6ac114ad26134b 100644 (file)
--- a/include/raw_ip_packet.h
+++ b/include/raw_ip_packet.h
@@ -1,7 +1,7 @@
 #ifndef RAW_IP_PACKET_H
 #define RAW_IP_PACKET_H
 
 #ifndef RAW_IP_PACKET_H
 #define RAW_IP_PACKET_H
 

-#ifdef FREE_BSD
+#if defined(FREE_BSD) || defined(FREE_BSD5)

 #include <netinet/in_systm.h> // n_long in netinet/ip.h
 #endif
 
 #include <netinet/in_systm.h> // n_long in netinet/ip.h
 #endif
 


@@ -46,7 +46,7 @@ bool        operator<(const RAW_PACKET & rvalue) const;
 
 union
     {
 
 union
     {

-    uint8_t     pckt[pcktSize];         // îÁÞÁÌÏ ÐÁËÅÔÁ ÚÁÈ×ÁÞÅÎÎÏÇÏ ÉÚ ÓÅÔÉ
+    uint8_t pckt[pcktSize]; // Packet header as a raw data

     struct
         {
         struct ip   ipHeader;
     struct
         {
         struct ip   ipHeader;


@@ -55,7 +55,7 @@ union
         uint16_t    dPort;
         } header __attribute__ ((packed));
     };
         uint16_t    dPort;
         } header __attribute__ ((packed));
     };

-int32_t     dataLen;                // äÌÉÎÁ IP ÐÁËÅÔÁ. åÓÌÉ -1, ÔÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÄÌÉÎÕ ÉÚ ÚÁÇÏÌÏ×ËÁ ÓÁÍÏÇÏ ÐÁËÅÔÁ.
+int32_t dataLen; // IP packet length. Set to -1 to use length field from the header

 };
 //-----------------------------------------------------------------------------
 inline uint16_t RAW_PACKET::GetIPVersion() const
 };
 //-----------------------------------------------------------------------------
 inline uint16_t RAW_PACKET::GetIPVersion() const


@@ -128,26 +128,6 @@ if (header.ipHeader.ip_p != rvalue.header.ipHeader.ip_p)
 
 return true;
 }
 
 return true;
 }

-/*//-----------------------------------------------------------------------------
-inline bool operator==(const RAW_PACKET & lhs, const RAW_PACKET & rhs) 
-{
-if (lhs.GetSrcIP() != rhs.GetSrcIP())
-    return false;
-
-if (lhs.GetDstIP() != rhs.GetDstIP())
-    return false;
-
-if (lhs.GetSrcPort() != rhs.GetSrcPort())
-    return false;
-
-if (lhs.GetDstPort() != rhs.GetDstPort())
-    return false;
-
-if (lhs.GetProto() != rhs.GetProto())
-    return false;
-
-return true;
-}*/

 //-----------------------------------------------------------------------------
 inline bool RAW_PACKET::operator<(const RAW_PACKET & rvalue) const
 {
 //-----------------------------------------------------------------------------
 inline bool RAW_PACKET::operator<(const RAW_PACKET & rvalue) const
 {


@@ -184,33 +164,5 @@ if (header.ipHeader.ip_p < rvalue.header.ipHeader.ip_p)
 return false;
 }
 //-----------------------------------------------------------------------------
 return false;
 }
 //-----------------------------------------------------------------------------

-/*inline bool operator<(const RAW_PACKET & lhs, const RAW_PACKET & rhs)
-{
-if (lhs.GetSrcIP() < rhs.GetSrcIP()) 
-    return true;
-if (lhs.GetSrcIP() > rhs.GetSrcIP()) 
-    return false;
-
-if (lhs.GetDstIP() < rhs.GetDstIP()) 
-    return true;
-if (lhs.GetDstIP() > rhs.GetDstIP()) 
-    return false;
-
-if (lhs.GetSrcPort() < rhs.GetSrcPort()) 
-    return true;
-if (lhs.GetSrcPort() > rhs.GetSrcPort()) 
-    return false;
-
-if (lhs.GetDstPort() < rhs.GetDstPort()) 
-    return true;
-if (lhs.GetDstPort() > rhs.GetDstPort()) 
-    return false;
-
-if (lhs.GetProto() < rhs.GetProto()) 
-    return true;
-
-return false;
-}*/
-//-----------------------------------------------------------------------------

 
 #endif
 
 #endif