X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=GPL%2Ftraffic_scripts%2FPacketVerifier.py;h=974906e439c637a2b363e7779d49f3ec949cbfb0;hb=a5e623b3cd749ab86627b733c7c2c99c58588e90;hp=e05084d66c4109bd911e0c9c0906dc5156337b03;hpb=caedfd9b1eda24472fe1fcd7b49cfa1c5b71fd4f;p=csit.git

diff --git a/GPL/traffic_scripts/PacketVerifier.py b/GPL/traffic_scripts/PacketVerifier.py
index e05084d66c..974906e439 100644
--- a/GPL/traffic_scripts/PacketVerifier.py
+++ b/GPL/traffic_scripts/PacketVerifier.py
@@ -1,9 +1,19 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
+# Copyright (c) 2021 Cisco and/or its affiliates.
+#
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
+#
+# Licensed under the Apache License 2.0 or
+# GNU General Public License v2.0 or later;  you may not use this file
+# except in compliance with one of these Licenses. You
+# may obtain a copy of the Licenses at:
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+#
+# Note: If this file is linked with Scapy, which is GPLv2+, your use of it
+# must be under GPLv2+.  If at any point in the future it is no longer linked
+# with Scapy (or other GPLv2+ licensed software), you are free to choose
+# Apache 2.
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -66,6 +76,7 @@
 
 import os
 import select
+import time
 
 from scapy.all import ETH_P_IP, ETH_P_IPV6, ETH_P_ALL, ETH_P_ARP
 from scapy.config import conf
@@ -322,9 +333,10 @@ def create_gratuitous_arp_request(src_mac, src_ip):
 
 def auto_pad(packet):
     """Pads zeroes at the end of the packet if the total packet length is less
-    then 64 bytes in case of IPv4 or 78 bytes in case of IPv6.
+    then 60 bytes in case of IPv4 or 78 bytes in case of IPv6.
     """
-    min_len = 78 if packet.haslayer(IPv6) else 64
+    # TODO: add document explaining deduction of FCS part
+    min_len = 78 if packet.haslayer(IPv6) else 60
     pad_layer = Raw if packet.haslayer(Raw) \
         else Padding if packet.haslayer(Padding) else None
     if pad_layer: