Ticket #30: patch-radiotap-scapy.diff

scapy.py

@@ -6269 +6269 @@
-            return self.sprintf("802.1q (%Dot1Q.type%) vlan %Dot1Q.vlan%")
-
-
+class RadioTapByteField(ByteField):
+    def __init__(self, name, default, bitset):
+        ByteField.__init__(self, name, default)
+        self.bitset = bitset
+        
+    def getfield(self, pkt, s):
+        if pkt[RadioTap].bitmap & (1 << self.bitset):
+            pkt.l += 1
+            return ByteField.getfield(self, pkt, s)
+        else:
+            return s,None
+
+class RadioTapShortField(LEShortField):
+    def __init__(self, name, default, bitset):
+        LEShortField.__init__(self, name, default)
+        self.bitset = bitset
+        
+    def getfield(self, pkt, s):
+        if (pkt.l+1) % 2: 
+            delta=(pkt.l+2)/2*2 - pkt.l - 1 # alignement
+            pkt.l += delta
+            s = s[delta:]
+        if pkt[RadioTap].bitmap & (1 << self.bitset):
+            pkt.l += 2
+            return LEShortField.getfield(self, pkt, s)
+        else:
+            return s,None
+
+_radiotap_channel_type = {
+    0x4001: "802.11a",
+    0xa000: "802.11b",
+    0xc000: "802.11g (pure)",
+    0x5001: "802.11a (turbo)",
+    0xd000: "802.11g (pure, turbo)",
+    0x9004: "802.11g (turbo)",
+    0x8008: "FHSS"
+}
+
+class RadioTapChannelField(RadioTapShortField):
+    def i2repr(self, pkt, val):
+        if val == 0:
+            return 'N/A'
+        else:
+            return '%d / %0.3f GHz' % ((val-2407)/5.0, val/1000.0)
+
+class RadioTapChannelTypeField(BitEnumField):
+    length=16
+    def __init__(self, name, default, bitset):
+        BitEnumField.__init__(self, name, default, self.length, _radiotap_channel_type)
+        self.bitset = bitset
+        
+    def getfield(self, pkt, s):
+        if pkt[RadioTap].bitmap & (1 << self.bitset):
+            pkt.l += self.length/8
+            return BitEnumField.getfield(self, pkt, s)
+        else:
+            return s,None
+
+class RadioTapIntField(XIntField):
+    def __init__(self, name, default, bitset):
+        XIntField.__init__(self, name, default)
+        self.bitset = bitset
+        
+    def getfield(self, pkt, s):
+        if (pkt.l+1) % 4: 
+            delta=(pkt.l+4)/4*4 - pkt.l - 1 # alignement
+            pkt.l += delta
+            s = s[delta:]
+        if pkt[RadioTap].bitmap & (1 << self.bitset):
+            pkt.l += 4
+            return XIntField.getfield(self, pkt, s)
+        else:
+            return s,None
+
+class RadioTapLongField(XLongField):
+    def __init__(self, name, default, bitset):
+        XLongField.__init__(self, name, default)
+        self.bitset = bitset
+        
+    def getfield(self, pkt, s):
+        if pkt[RadioTap].bitmap & (1 << self.bitset):
+            pkt.l += 8
+            return XLongField.getfield(self, pkt, s)
+        else:
+            return s,None
+
+_radiotap_flags = {
+    0x1: "CFP",
+    0x2: "Preamble",
+    0x3: "WEP",
+    0x4: "Frag",
+    0x5: "FCS",
+    0x6: "pad"
+}
+
+class RadioTapFlagsField(BitEnumField):
+    def __init__(self, name, default, bitset):
+        BitEnumField.__init__(self, name, default, 8, _radiotap_flags)
+        self.bitset = bitset
+        
+    def getfield(self, pkt, s):
+        if pkt[RadioTap].bitmap & (1 << self.bitset):
+            return BitEnumField.getfield(self, pkt, s)
+        else:
+            return s,None
+
+class RadioTapRateField(RadioTapByteField):
+    def i2repr(self, pkt, x):
+        if x is None:
+            return '0'
+        return '%d Mb/s' % (x*0.512)
+
+_radiotap_msg  = {
+    0x00: "TSFT",
+    0x01: "Flags",
+    0x02: "Rate",
+    0x03: "Channel",
+    0x04: "FrequencyHop",
+    0x05: "SignalPower",
+    0x06: "NoisePower",
+    0x07: "Quality",
+    0x08: "Transmit",
+    0x09: "TransmitDB",
+    0x0a: "TransmitDBM",
+    0x0b: "AntennaId",
+    0x0c: "PowerAntennaDB",
+    0x0d: "NoisePowerDB",
+    0x0e: "FCS",
+    0x1f: "Extension",
+}
+
+class RadioTapBitmapField(LEIntField):
+    def __init__(self, name, d):
+        LEIntField.__init__(self, name, 0)
+        self.d=d
+
+    def i2repr(self, pkt, x):
+        n=0
+        s=[]
+        while n < 32:
+            if x & (1 << n) and _radiotap_msg.has_key(n):
+                s.append(_radiotap_msg[n])
+            n   += 1
+        return '+'.join(s)
+
+class RadioTapLenPadding(StrLenField):
+    def getfield(self, pkt, x):
+        pkt.l = pkt[RadioTap].len - pkt.l - 8 - 1 # 8 is the header's length
+        return StrLenField.getfield(self, pkt, x)
+
+## /usr/src/linux/include/net/ieee80211_radiotap.h
+## http://madwifi.org/wiki/DevDocs/RadiotapHeader
+class RadioTap(Packet):
+    name = "RadioTap"
+    l=0 # this will represent the length used by fields
+    fields_desc = [ ByteField('version', 0),
+                    ByteField('padding', 0),
+                    LenField('len', None, '@H'),
+                    ## variable headers
+                    RadioTapBitmapField('bitmap', _radiotap_msg),
+                    RadioTapLongField('timestamp', 0, 0),
+                    RadioTapFlagsField('flags', 0, 1),
+                    RadioTapRateField('rate', 0, 2),
+                    RadioTapChannelField('channel', 11, 3),
+                    RadioTapChannelTypeField('chantype', 11, 3),
+                    RadioTapShortField('hop', 0, 4),
+                    RadioTapByteField('signal', 0, 5),
+                    RadioTapByteField('noise', 0, 6),
+                    RadioTapShortField('quality', 0, 7),
+                    RadioTapShortField('tx', 0, 8),
+                    RadioTapShortField('txDB', 0, 9),
+                    RadioTapByteField('txDBM', 0, 10),
+                    RadioTapByteField('antennaID', 0, 11),
+                    RadioTapByteField('powerAntennaDB', 0, 12),
+                    RadioTapByteField('noisepowerDB', 0, 13),
+                    RadioTapIntField('fcs', 0, 14),
+                    RadioTapLenPadding('padding', '', 'l') ]
+
-class STP(Packet):
-    name = "Spanning Tree Protocol"
-    fields_desc = [ ShortField("proto", 0),
@@ -8656 +8834 @@
-layer_bonds = [ ( Dot3,   LLC,      { } ),
-                ( GPRS,   IP,       { } ),
-                ( PrismHeader, Dot11, { }),
+                ( RadioTap,    Dot11, { }),
-                ( Dot11,  LLC,      { "type" : 2 } ),
-                ( PPP,    IP,       { "proto" : 0x0021 } ),
-                ( Ether,  LLC,      { "type" : 0x007a } ),
@@ -8842 +9021 @@
-            101 : IP,
-            801 : Dot11,
-            802 : PrismHeader,
+            803 : RadioTap,
-            105 : Dot11,
-            113 : CookedLinux,
-            119 : PrismHeader, # for atheros
+            127 : RadioTap,
-            144 : CookedLinux, # called LINUX_IRDA, similar to CookedLinux
-            783 : IrLAPHead,
-            0xB1E70073L : HCI_Hdr, # I invented this one
@@ -8855 +9036 @@
-               IP  : 101,
-               Dot11  : 801,
-               PrismHeader : 802,
+               RadioTap    : 803,
+               RadioTap    : 127,
-               Dot11 : 105,
-               CookedLinux : 113,
-               CookedLinux : 144,