commit 8ac55250ce835c31b9ac7c4b222549f38a793314
author Christian Dickmann <christian.dickmann@gmail.com> Mon Oct 08 22:53:49 2012 -0700
committer Christian Dickmann <christian.dickmann@gmail.com> Mon Oct 08 22:53:49 2012 -0700
tree d74cd0b22e69473953ab276c182f079c29023c33
parent 8b59b4b3f39e61d6c5f4bcde42415adf20408dc4

Set CFI to 0 in Dot1Q header. CFI = 1 has a special meaning and may lead to drops

tests/pktact.py

diff --git a/tests/pktact.py b/tests/pktact.py
index 01d2f02..b62c02d 100644
--- a/tests/pktact.py
+++ b/tests/pktact.py
@@ -2636,7 +2636,7 @@
         testPacket("Basic MAC matching with VLAN tag present",
             self.createMatch(dl_dst=parse_mac(dl_dst), dl_src=parse_mac(dl_src)),
             scapy.Ether(dst=dl_dst, src=dl_src)/ \
-                scapy.Dot1Q(prio=5, id=1, vlan=1000)/ \
+                scapy.Dot1Q(prio=5, vlan=1000)/ \
                 scapy.IP(),
             self.RESULT_MATCH
         )
@@ -2644,7 +2644,7 @@
             self.createMatch(dl_dst=parse_mac(dl_dst), dl_src=parse_mac(dl_src),
                              dl_type=0x800),
             scapy.Ether(dst=dl_dst, src=dl_src)/ \
-                scapy.Dot1Q(prio=5, id=1, vlan=1000)/ \
+                scapy.Dot1Q(prio=5, vlan=1000)/ \
                 scapy.IP(),
             self.RESULT_MATCH
         )
@@ -2652,7 +2652,7 @@
             self.createMatch(dl_dst=parse_mac(dl_dst), dl_src=parse_mac(dl_src),
                              dl_type=0x801),
             scapy.Ether(dst=dl_dst, src=dl_src)/ \
-                scapy.Dot1Q(prio=5, id=1, vlan=1000)/ \
+                scapy.Dot1Q(prio=5, vlan=1000)/ \
                 scapy.IP(),
             self.RESULT_NOMATCH
         )
@@ -2660,7 +2660,7 @@
             self.createMatch(dl_dst=parse_mac(dl_dst), dl_src=parse_mac(dl_src),
                              dl_type=0x8100),
             scapy.Ether(dst=dl_dst, src=dl_src)/ \
-                scapy.Dot1Q(prio=5, id=1, vlan=1000)/ \
+                scapy.Dot1Q(prio=5, vlan=1000)/ \
                 scapy.IP(),
             self.RESULT_NOMATCH
         )
@@ -2668,8 +2668,8 @@
             self.createMatch(dl_dst=parse_mac(dl_dst), dl_src=parse_mac(dl_src),
                              dl_type=0x800),
             scapy.Ether(dst=dl_dst, src=dl_src)/ \
-                scapy.Dot1Q(prio=5, id=1, vlan=1000)/ \
-                scapy.Dot1Q(prio=3, id=1, vlan=1005)/ \
+                scapy.Dot1Q(prio=5, vlan=1000)/ \
+                scapy.Dot1Q(prio=3, vlan=1005)/ \
                 scapy.IP(),
             self.RESULT_NOMATCH
         )
@@ -2677,8 +2677,8 @@
             self.createMatch(dl_dst=parse_mac(dl_dst), dl_src=parse_mac(dl_src),
                              dl_type=0x8100),
             scapy.Ether(dst=dl_dst, src=dl_src)/ \
-                scapy.Dot1Q(prio=5, id=1, vlan=1000)/ \
-                scapy.Dot1Q(prio=3, id=1, vlan=1005)/ \
+                scapy.Dot1Q(prio=5, vlan=1000)/ \
+                scapy.Dot1Q(prio=3, vlan=1005)/ \
                 scapy.IP(),
             self.RESULT_MATCH
         )
@@ -2687,7 +2687,7 @@
                              dl_type=0x0800,
                              nw_src=parse_ip(ip_src), nw_dst=parse_ip(ip_dst)),
             scapy.Ether(dst=dl_dst, src=dl_src)/ \
-                scapy.Dot1Q(prio=5, id=1, vlan=1000)/ \
+                scapy.Dot1Q(prio=5, vlan=1000)/ \
                 scapy.IP(src=ip_src, dst=ip_dst),
             self.RESULT_MATCH
         )