1 files changed, 6 insertions, 2 deletions

diff --git a/libopie2/opienet/opcap.cpp b/libopie2/opienet/opcap.cpp
index 4d786f5..7463320 100644
--- a/libopie2/opienet/opcap.cpp
+++ b/libopie2/opienet/opcap.cpp
@@ -721,14 +721,18 @@ OWaveLanManagementPacket::OWaveLanManagementPacket( const unsigned char* end, co
                 :QObject( parent, "802.11 Management" ), _header( data ),
                 _body( (const struct ieee_802_11_mgmt_body*) (data+1) )
 {
     odebug << "OWaveLanManagementPacket::OWaveLanManagementPacket(): decoding frame..." << oendl;
     odebug << "Detected subtype is " << managementType() << oendl;
 
-    // grab tagged values
-    const unsigned char* ptr = (const unsigned char*) (_body+1);
+    // Grab tagged values.
+    // Beacons contain a 12 byte long fixed parameters set before the tagged parameters come,
+    // Other management frames don't - which is why we have to inspect the subtype here.
+
+    const unsigned char* ptr = managementType() == "Beacon" ?  (const unsigned char*) (_body+1) : (const unsigned char*) (_header+1);
+    
     while (ptr < end)
     {
         switch ( *ptr )
         {
             case E_SSID: new OWaveLanManagementSSID( end, (struct ssid_t*) ptr, this ); break;
             case E_FH: new OWaveLanManagementFH( end, (struct fh_t*) ptr, this ); break;