From: g0dil <g0dil@270642c3-0616-0410-b53a-bc976706d245>
Date: Tue, 27 Jan 2009 20:03:02 +0000 (+0000)
Subject: Packets: Add some more packet diagrams
X-Git-Url: http://g0dil.de/git?a=commitdiff_plain;h=6165e70feef7199dc3fe96a881d055f6a2999b00;p=senf.git

Packets: Add some more packet diagrams

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1081 270642c3-0616-0410-b53a-bc976706d245
---

diff --git a/Packets/80211Bundle/WLANPacket.hh b/Packets/80211Bundle/WLANPacket.hh
index 3138826..6649150 100644
--- a/Packets/80211Bundle/WLANPacket.hh
+++ b/Packets/80211Bundle/WLANPacket.hh
@@ -41,9 +41,8 @@ namespace senf
     #   include SENF_FIXED_PARSER()
         
         SENF_PARSER_PRIVATE_BITFIELD ( subtype, 4,  unsigned                );
-        SENF_PARSER_SKIP_BITS        (          4                           ); //skip type and version
         //jump to fist address field
-        SENF_PARSER_SKIP             ( 3                                    );
+        SENF_PARSER_SKIP_BITS        (          28                          );
         SENF_PARSER_FIELD            ( destinationAddress, MACAddressParser );
         SENF_PARSER_FIELD            ( sourceAddress,      MACAddressParser );
         SENF_PARSER_FIELD            ( bssid,              MACAddressParser );
@@ -74,9 +73,8 @@ namespace senf
     #   include SENF_PARSER()
         
         SENF_PARSER_PRIVATE_BITFIELD ( subtype,  4,  unsigned            );
-        SENF_PARSER_SKIP_BITS        (           4                       ); //skip type and version
         //jump to fist address field
-        SENF_PARSER_SKIP             ( 3, 3                              );
+        SENF_PARSER_SKIP_BITS        (          28                       );
         SENF_PARSER_FIELD            ( receiverAddress, MACAddressParser );
 
         //only RTS frame contains a source address field
@@ -101,14 +99,12 @@ namespace senf
     #   include SENF_PARSER()
         SENF_PARSER_PRIVATE_BITFIELD ( subtype,  4,  unsigned  );
         //jump to 'toDS' and 'fromDS' bits
-        //skip type and version
-        SENF_PARSER_SKIP_BITS        ( 4                       );
-        //skip other flags
-        SENF_PARSER_SKIP_BITS        ( 6                       );
+        //skip type, version and other flags
+        SENF_PARSER_SKIP_BITS        ( 10                      );
         //needed in data frames due to the variable address fields
         SENF_PARSER_PRIVATE_BITFIELD ( dsBits,  2,  unsigned   );
         //skip duration field
-        SENF_PARSER_SKIP             ( 2, 0                    );
+        SENF_PARSER_SKIP             ( 2, 2                    );
 
         SENF_PARSER_PRIVATE_FIELD    ( addr1, MACAddressParser );
         SENF_PARSER_PRIVATE_FIELD    ( addr2, MACAddressParser );
@@ -206,6 +202,7 @@ namespace senf
 
         \par Fields:
             \ref WLANPacketParser
+	    \image html WLANPacket.png
 
         \ingroup protocolbundle_80211
      */
diff --git a/Packets/80221Bundle/MIHPacket.hh b/Packets/80221Bundle/MIHPacket.hh
index 0b970ff..9c7f103 100644
--- a/Packets/80221Bundle/MIHPacket.hh
+++ b/Packets/80221Bundle/MIHPacket.hh
@@ -138,6 +138,7 @@ namespace senf {
 
         \par Fields:
             \ref MIHPacketParser
+            \image html MIHPacket.png
         
         \ingroup protocolbundle_80221
      */
diff --git a/Packets/SConscript b/Packets/SConscript
index 5755ab5..86f6a4b 100644
--- a/Packets/SConscript
+++ b/Packets/SConscript
@@ -42,6 +42,9 @@ SENFSCons.Doxygen(env, extra_sources = [
                 PKGDRAWPACKETS = "MLDv2ListenerReportParser"),
     env.PkgDraw("DefaultBundle/MLDv2AddressRecord.png", "DefaultBundle/ICMPv6TypePacket.hh",
                 PKGDRAWPACKETS = "MLDv2AddressRecordParser"),
+    env.PkgDraw("80221Bundle/MIHPacket.hh",
+                PKGDRAWPACKETS = "MIHPacketParser"),
+    env.PkgDraw("80211Bundle/WLANPacket.hh"),
 ])
 SENFSCons.InstallIncludeFiles(env, includes)