From 25c6470ca8f86ba764c26a0ae13a92f32eade682 Mon Sep 17 00:00:00 2001
From: "William R. Dieter" <william.r.dieter@intel.com>
Date: Mon, 28 Aug 2017 14:33:51 -0700
Subject: [PATCH] Fix ordering of bit fields in the Dot11QoS QoS Control field
Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
---
scapy/layers/dot11.py | 6 +++---
test/regression.uts | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/scapy/layers/dot11.py b/scapy/layers/dot11.py
index 383af082..69b82799 100644
--- a/scapy/layers/dot11.py
+++ b/scapy/layers/dot11.py
@@ -178,10 +178,10 @@ class Dot11(Packet):
class Dot11QoS(Packet):
name = "802.11 QoS"
- fields_desc = [ BitField("TID",None,4),
- BitField("EOSP",None,1),
+ fields_desc = [ BitField("Reserved",None,1),
BitField("Ack Policy",None,2),
- BitField("Reserved",None,1),
+ BitField("EOSP",None,1),
+ BitField("TID",None,4),
ByteField("TXOP",None) ]
def guess_payload_class(self, payload):
if isinstance(self.underlayer, Dot11):
diff --git a/test/regression.uts b/test/regression.uts
index 0ddcc9d2..f68beb0f 100644
--- a/test/regression.uts
+++ b/test/regression.uts
@@ -8611,8 +8611,8 @@ Dot11 in p and p.addr3 == "00:00:00:00:00:00"
p.mysummary() == '802.11 Management 0 00:00:00:00:00:00 > 00:00:00:00:00:00'
= Dot11QoS - build
-s = str(Dot11(type=2, subtype=8)/Dot11QoS())
-s == b'\x88\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
+s = str(Dot11(type=2, subtype=8)/Dot11QoS(TID=4))
+s == b'\x88\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00'
= Dot11QoS - dissection
p = Dot11(s)
--
GitLab