From 89dad8c982eb8f2b5554b3d8b9ed966e7edf67e0 Mon Sep 17 00:00:00 2001
From: g0dil <g0dil@wiback.org>
Date: Tue, 27 Jan 2009 20:03:02 +0000
Subject: [PATCH] Packets: Add some more packet diagrams
---
Packets/80211Bundle/WLANPacket.hh | 15 ++++++---------
Packets/80221Bundle/MIHPacket.hh | 1 +
Packets/SConscript | 3 +++
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/Packets/80211Bundle/WLANPacket.hh b/Packets/80211Bundle/WLANPacket.hh
index 313882619..664915005 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 0b970fff1..9c7f10388 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 5755ab52a..86f6a4b87 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)
--
GitLab