Changeset 5793

Timestamp:

08/14/10 00:31:58 (3 years ago)

Author:

kosma

Message:

Ethernet.py: add 802.1Q support in load_raw()

Location:

umpa/branches/protocols

Files:

• tests/a_unit/test_protocols/test_ethernet.py (modified) (1 diff)
• umit/umpa/protocols/Ethernet.py (modified) (1 diff)

umpa/branches/protocols/tests/a_unit/test_protocols/test_ethernet.py

@@ -53 +53 @@
         py.test.raises(UMPAAttributeException, "eth.tpid = 999999")
         py.test.raises(UMPAAttributeException, "eth.tpid = -1")
+
+    def test_load_raw(self):
+        buf = "\x00\x11\x22\x33\x44\x55\xAA\xBB\xCC\xDD\xEE\xFF\x12\x34ABC"
+        eth = Ethernet()
+        buf = eth.load_raw(buf)
+        assert eth.src == "aa:bb:cc:dd:ee:ff"
+        assert eth.dst == "00:11:22:33:44:55"
+        assert eth.vlan == False
+        assert eth._type == 0x1234
+        assert buf == "ABC"
+
+        buf = "\x00\x11\x22\x33\x44\x55\xAA\xBB\xCC\xDD\xEE\xFF\x81\x00\x56\x66\xbe\xefXYZ"
+        eth = Ethernet()
+        buf = eth.load_raw(buf)
+        print eth._type
+        assert eth.src == "aa:bb:cc:dd:ee:ff"
+        assert eth.dst == "00:11:22:33:44:55"
+        assert eth.vlan == True
+        assert eth.tpid == 0x8100
+        assert eth._type == 0xbeef
+        assert eth.vid == 0x666
+        assert eth.cfi == 1
+        assert eth.pcp == 2
+        assert buf == "XYZ"

umpa/branches/protocols/umit/umpa/protocols/Ethernet.py

@@ -308 +308 @@
         self._type = fields[12]
 
+        # interpret 802.1Q header if present
+        if self._type == _consts.ETHERTYPE_VLAN:
+            fields = struct.unpack('!HH', buffer[header_size:header_size+4])
+            header_size += 4
+            self.vlan = True
+            self.tpid = self._type
+            self._type = fields[1]
+            self.vid = fields[0] & 0xfff
+            self.cfi = (fields[0]>>12) & 1
+            self.pcp = (fields[0]>>13) & 0x7
+        else:
+            self.vlan = False
+
         return buffer[header_size:]