X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2F80221Bundle%2FMIHPacket.hh;h=9c7f1038866900196a39b30a05ff6e68c8ba2854;hb=2265e2dcc8c6fc6a35f63d68119a795974cf2ee7;hp=b84bbe9a605b99eb16457625e9f42666315fe815;hpb=bd67664cb4ea1b36c9bb52a622e02341e4f0131f;p=senf.git

diff --git a/Packets/80221Bundle/MIHPacket.hh b/Packets/80221Bundle/MIHPacket.hh
index b84bbe9..9c7f103 100644
--- a/Packets/80221Bundle/MIHPacket.hh
+++ b/Packets/80221Bundle/MIHPacket.hh
@@ -28,21 +28,73 @@
 
 // Custom includes
 #include "../../Packets/Packets.hh"
+#include "../../Socket/Protocols/Raw/MACAddress.hh"
+#include "../../Socket/Protocols/INet/INet4Address.hh"
+#include "../../Socket/Protocols/INet/INet6Address.hh"
 #include "TLVPacket.hh"
+#include <boost/function_output_iterator.hpp>
+#include <boost/iterator/filter_iterator.hpp>
+
 
 //#include "MIHPacket.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
 
 namespace senf {
 
-    struct MIHF_IdParser : public senf::PacketParserBase
+    // the maximum length of a MIHF_ID is 253 octets (see F.3.11 in 802.21)
+    // we could set maxLengthValue in INIT, but for the most MIHF_IDs the default
+    // maximum length of 127 should be enough.
+    // The user must call mihPacket->src_mihfId().maxLengthValue( 127) before 
+    // setting longer MIHF_IDs
+    class MIHFId_TLVParser : public BaseTLVPacketParser
     {
-    #   include SENF_FIXED_PARSER()        
+    #   include SENF_PARSER()        
+        SENF_PARSER_INHERIT  ( BaseTLVPacketParser );
+        SENF_PARSER_SKIP     ( length(), 0         );
+        SENF_PARSER_FINALIZE ( MIHFId_TLVParser    );
                 
-        SENF_PARSER_FINALIZE ( MIHF_IdParser );
+        std::string asString() const;
+        void setString(std::string const &id);
+        
+        senf::MACAddress asMACAddress() const;
+        void setMACAddress(senf::MACAddress const &mac);
+
+        senf::INet4Address asINet4Address() const;
+        void setINet4Address(senf::INet4Address const &addr);
+        
+        senf::INet6Address asINet6Address() const;
+        void setINet6Address(senf::INet6Address const &addr);
+
+    private:
+        template <class OutputIterator>
+        struct binaryNAIEncoder {
+            binaryNAIEncoder(OutputIterator &i) : i_(i) {}
+            void operator()(const boost::uint8_t &v) const {
+                *i_++ = '\\'; 
+                *i_++ = v;
+            }
+            OutputIterator &i_;
+        };
+        template <class OutputIterator>
+        static boost::function_output_iterator<binaryNAIEncoder<OutputIterator> > getNAIEncodedOutputIterator(OutputIterator i) {
+            return boost::make_function_output_iterator(binaryNAIEncoder<OutputIterator>(i));
+        }
+        
+        struct binaryNAIDecoder {
+            binaryNAIDecoder() : readNextByte_(true) {}
+            bool operator()(const boost::uint8_t &v) { 
+                readNextByte_ = readNextByte_ ? false : true;
+                return readNextByte_;
+            }
+            bool readNextByte_;
+        };
+        template <class Iterator>
+        static boost::filter_iterator<binaryNAIDecoder, Iterator> getNAIDecodedIterator(Iterator begin, Iterator end) {
+            return boost::make_filter_iterator<binaryNAIDecoder>(begin, end);
+        }
     };
 
-    struct MIHPacketParser : public senf::PacketParserBase
+    struct MIHPacketParser : public PacketParserBase
     {
     #   include SENF_PARSER()
         
@@ -64,25 +116,32 @@ namespace senf {
         SENF_PARSER_FIELD_RO  ( payloadLength, UInt16Parser );
         
         // Source MIHF Id
-        SENF_PARSER_PRIVATE_FIELD ( source_type,    UInt8Parser            );
-        SENF_PARSER_PRIVATE_FIELD ( source_length,  DynamicTLVLengthParser );
-        SENF_PARSER_FIELD         ( source_mihf_id, MIHF_IdParser          );
-
+        SENF_PARSER_FIELD ( src_mihfId, MIHFId_TLVParser );
         // Destination MIHF Id
-        SENF_PARSER_PRIVATE_FIELD ( destination_type,    UInt8Parser            );
-        SENF_PARSER_PRIVATE_FIELD ( destination_length,  DynamicTLVLengthParser );
-        SENF_PARSER_FIELD         ( destination_mihf_id, MIHF_IdParser          );
+        SENF_PARSER_FIELD ( dst_mihfId, MIHFId_TLVParser );
         
         SENF_PARSER_FINALIZE ( MIHPacketParser );
         
         SENF_PARSER_INIT() {
             version_() = 1;
-            source_type() = 1;
-            destination_type() = 2;
+            src_mihfId().type() = 1;
+            dst_mihfId().type() = 2;
         }
+        
+        friend class MIHPacketType;
     };
     
-    
+    /** \brief MIH packet
+
+        \par Packet type (typedef):
+            \ref MIHPacket
+
+        \par Fields:
+            \ref MIHPacketParser
+            \image html MIHPacket.png
+        
+        \ingroup protocolbundle_80221
+     */
     struct MIHPacketType
         : public PacketTypeBase,
           public PacketTypeMixin<MIHPacketType>
@@ -96,10 +155,39 @@ namespace senf {
         using mixin::initSize;
 
         static void dump(packet p, std::ostream &os);
-//        static void finalize(packet p);
+        static void finalize(packet p);
+        static factory_t nextPacketType(packet p);
     };
 
     typedef ConcretePacket<MIHPacketType> MIHPacket;
+    
+    
+    struct MIHPayloadPacketParser : public PacketParserBase
+    {
+    #   include SENF_PARSER()
+        SENF_PARSER_LIST ( tlv_list, packetSize(), GenericTLVPacketParser );
+        
+        SENF_PARSER_FINALIZE ( MIHPayloadPacketParser );
+    };
+    
+    struct MIHPayloadPacketType
+        : public PacketTypeBase,
+          public PacketTypeMixin<MIHPayloadPacketType>
+    {
+        typedef PacketTypeMixin<MIHPayloadPacketType> mixin;
+        typedef ConcretePacket<MIHPayloadPacketType> packet;
+        typedef MIHPayloadPacketParser parser;
+
+        using mixin::nextPacketRange;
+        using mixin::init;
+        using mixin::initSize;
+
+        static void dump(packet p, std::ostream &os);
+    };
+        
+    typedef ConcretePacket<MIHPayloadPacketType> MIHPayloadPacket;
+            
+
 }