Changed FlagsField to 32 bit. Cleaned up imports

scapy/contrib/eigrp.py

@@ -168,6 +168,11 @@ class EigrpIP6Field(StrField, IP6Field, EigrpIPField):
     def getfield(self, pkt, s):
         return EigrpIPField.getfield(self, pkt, s)
 
+class ThreeBytesField(X3BytesField, ByteField):
+    def i2repr(self, pkt, x):
+        return ByteField.i2repr(self, pkt, x)
+
+
 class EIGRPGeneric(Packet):
     name = "EIGRP Generic TLV"
     fields_desc = [ XShortField("type", 0x0000),

scapy/contrib/vxlan.py

-# Virtual eXtensible Local Area Network (VXLAN)
-# https://tools.ietf.org/html/draft-mahalingam-dutt-dcops-vxlan-06
+# RFC 7348 - Virtual eXtensible Local Area Network (VXLAN):
+# A Framework for Overlaying Virtualized Layer 2 Networks over Layer 3 Networks
+# http://tools.ietf.org/html/rfc7348
 
 # scapy.contrib.description = VXLAN
 # scapy.contrib.status = loads
 
-from scapy.packet import *
-from scapy.fields import *
+from scapy.packet import Packet, bind_layers
+from scapy.layers.l2 import Ether
+from scapy.layers.inet import UDP
+from scapy.fields import FlagsField, XByteField
+from scapy.contrib.eigrp import ThreeBytesField
+
+_VXLAN_FLAGS = ['R' for i in range(0, 24)] + ['R', 'R', 'R', 'I', 'R', 'R', 'R', 'R', 'R'] 
+
 
 class VXLAN(Packet):
     name = "VXLAN"
-    fields_desc = [ FlagsField("flags", 0x08, 8, ['R', 'R', 'R', 'I', 'R', 'R', 'R', 'R']),
-                    X3BytesField("reserved1", 0x000000),
+    fields_desc = [FlagsField("flags", 0x08000000, 32, _VXLAN_FLAGS),
                    ThreeBytesField("vni", 0),
-                    XByteField("reserved2", 0x00)]
+                   XByteField("reserved", 0x00)]
 
     def mysummary(self):
         return self.sprintf("VXLAN (vni=%VXLAN.vni%)")

scapy/contrib/vxlan.utscapy

@@ -2,7 +2,7 @@
 * Tests for the Scapy VXLAN layer
 
 = Build a VXLAN packet with VNI of 42
-str(UDP(sport=1024, dport=4789, len=None, chksum=None)/VXLAN(flags=0x08, vni=42)) == "\x04\x00\x12\xb5\x00\x10\x00\x00\x08\x00\x00\x00\x00\x00\x2a\x00"
+str(UDP(sport=1024, dport=4789, len=None, chksum=None)/VXLAN(flags=0x08000000, vni=42)) == "\x04\x00\x12\xb5\x00\x10\x00\x00\x08\x00\x00\x00\x00\x00\x2a\x00"
 
 = Verify VXLAN Ethernet Binding
 str(VXLAN(vni=23)/Ether(dst="11:11:11:11:11:11", src="11:11:11:11:11:11", type=0x800)) == "\x08\x00\x00\x00\x00\x00\x17\x00\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11\x11\x08\x00"

scapy/fields.py

@@ -275,9 +275,6 @@ class X3BytesField(XByteField):
     def getfield(self, pkt, s):
         return  s[3:], self.m2i(pkt, struct.unpack(self.fmt, "\x00"+s[:3])[0])
 
-class ThreeBytesField(X3BytesField, ByteField):
-    def i2repr(self, pkt, x):
-        return ByteField.i2repr(self, pkt, x)
 
 class ShortField(Field):
     def __init__(self, name, default):