Implemented IpV6Packet and added raw-data constructor to INet6Address

[senf.git] / Packets / IpV4Packet.hh

diff --git a/Packets/IpV4Packet.hh b/Packets/IpV4Packet.hh
index 0f9e296..b801426 100644 (file)
--- a/Packets/IpV4Packet.hh
+++ b/Packets/IpV4Packet.hh
@@ -32,8 +32,8 @@
 //#include "IpV4Packet.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
 
-namespace satcom {
-namespace pkf {
+namespace senf {
+
     
     template <class Iterator=nil, class IpV4Packet=nil>
     struct Parse_IpV4 : public ParserBase<Iterator,IpV4Packet>
@@ -75,16 +75,18 @@ namespace pkf {
         Parse_32bit    destination() const { return Parse_32bit   (this->i() + 16 ); }
     };
 
-    struct IpV4Types {
+    struct IpTypes {
+       // See http://www.iana.org/assignments/protocol-numbers
+       // Also used by IPv6
         typedef boost::uint16_t key_t;
     };
 
     class IpV4Packet
         : public Packet, 
           public Parse_IpV4<Packet::iterator,IpV4Packet>, 
-          public PacketRegistryMixin<IpV4Types,IpV4Packet>
+          public PacketRegistryMixin<IpTypes,IpV4Packet>
     {
-        using PacketRegistryMixin<IpV4Types,IpV4Packet>::registerInterpreter;
+        using PacketRegistryMixin<IpTypes,IpV4Packet>::registerInterpreter;
     public:
         ///////////////////////////////////////////////////////////////////////////
         // Types
@@ -103,7 +105,7 @@ namespace pkf {
 
         friend class Packet;
     };
-}}
+}
 
 
 ///////////////////////////////hh.e////////////////////////////////////////
@@ -115,5 +117,5 @@ namespace pkf {
 \f
 // Local Variables:
 // mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
 // End: