commit 6508ea05f07f28f542fc8164da83d4bf6e50f300
author Rich Lane <rich.lane@bigswitch.com> Fri Oct 12 15:27:11 2012 -0700
committer Rich Lane <rich.lane@bigswitch.com> Fri Oct 12 15:27:11 2012 -0700
tree 3f81fa37c1276ba92fde01b31a259896a40de677
parent bbd4cf94b02b2392fda3cc3e537a5efb92552db5

fix LLC control field in pktact tests

The 0x12 value that was being used meant there needed to be an extra 1 byte
information field. A strict LLC parser could drop a packet that was too short
to include that field.

tests/pktact.py

diff --git a/tests/pktact.py b/tests/pktact.py
index d033f2d..7c41556 100644
--- a/tests/pktact.py
+++ b/tests/pktact.py
@@ -2387,19 +2387,19 @@
             testPacketEthSrcDstTypeMatch(title, llc, is_snap_ip)
 
         testPacket("LLC - No SNAP - No Payload",
-            scapy.LLC(dsap=0x33, ssap=0x44, ctrl=0x12),
+            scapy.LLC(dsap=0x33, ssap=0x44, ctrl=0x03),
             IS_NOT_SNAP_IP,
         )
         testPacket("LLC - No SNAP - Small Payload",
-            scapy.LLC(dsap=0x33, ssap=0x44, ctrl=0x12) / ("S" * 10),
+            scapy.LLC(dsap=0x33, ssap=0x44, ctrl=0x03) / ("S" * 10),
             IS_NOT_SNAP_IP,
         )
         testPacket("LLC - No SNAP - Max -1 Payload",
-            scapy.LLC(dsap=0x33, ssap=0x44, ctrl=0x12) / ("S" * (1500 - 3 - 1)),
+            scapy.LLC(dsap=0x33, ssap=0x44, ctrl=0x03) / ("S" * (1500 - 3 - 1)),
             IS_NOT_SNAP_IP,
         )
         testPacket("LLC - No SNAP - Max Payload",
-            scapy.LLC(dsap=0x33, ssap=0x44, ctrl=0x12) / ("S" * (1500 - 3)),
+            scapy.LLC(dsap=0x33, ssap=0x44, ctrl=0x03) / ("S" * (1500 - 3)),
             IS_NOT_SNAP_IP,
         )
         testPacket("LLC - SNAP - Small bogus payload",
@@ -2488,19 +2488,23 @@
             testPacketEthTypeNotEth(title, llc, is_snap)
         
         testPacket("LLC - No SNAP - No Payload",
-            scapy.LLC(dsap=0x33, ssap=0x44, ctrl=0x12),
+            scapy.LLC(dsap=0x33, ssap=0x44, ctrl=0x03),
+            IS_NOT_SNAP,
+        )
+        testPacket("LLC (with information field) - No SNAP - No Payload",
+            scapy.LLC(dsap=0x33, ssap=0x44, ctrl=0x12) / "S",
             IS_NOT_SNAP,
         )
         testPacket("LLC - No SNAP - Small Payload",
-            scapy.LLC(dsap=0x33, ssap=0x44, ctrl=0x12) / ("S" * 10),
+            scapy.LLC(dsap=0x33, ssap=0x44, ctrl=0x03) / ("S" * 10),
             IS_NOT_SNAP,
         )
         testPacket("LLC - No SNAP - Max -1 Payload",
-            scapy.LLC(dsap=0x33, ssap=0x44, ctrl=0x12) / ("S" * (1500 - 3 - 1)),
+            scapy.LLC(dsap=0x33, ssap=0x44, ctrl=0x03) / ("S" * (1500 - 3 - 1)),
             IS_NOT_SNAP,
         )
         testPacket("LLC - No SNAP - Max Payload",
-            scapy.LLC(dsap=0x33, ssap=0x44, ctrl=0x12) / ("S" * (1500 - 3)),
+            scapy.LLC(dsap=0x33, ssap=0x44, ctrl=0x03) / ("S" * (1500 - 3)),
             IS_NOT_SNAP,
         )
         testPacket("LLC - SNAP - Non-default OUI",