X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=GPL%2Ftraffic_scripts%2Fsrv6_encap.py;h=9c4ea257a0530b83ad649e0ad358944a1923adee;hb=5f1007cce8831017fd2be1f38a6ad023c349019a;hp=9db95386591589a08a7abe6a30958303d9f4bed0;hpb=79f5ba9bf7656972dd988508eff9465562dde42c;p=csit.git

diff --git a/GPL/traffic_scripts/srv6_encap.py b/GPL/traffic_scripts/srv6_encap.py
index 9db9538659..9c4ea257a0 100644
--- a/GPL/traffic_scripts/srv6_encap.py
+++ b/GPL/traffic_scripts/srv6_encap.py
@@ -1,11 +1,21 @@
 #!/usr/bin/env python3
 
-# 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,
@@ -18,7 +28,7 @@
 import sys
 
 from scapy.layers.inet6 import IPv6, ICMPv6ND_NS, IPv6ExtHdrSegmentRouting,\
-    ipv6nh
+    ipv6nh, ICMPv6MLReport2, ICMPv6ND_RA
 from scapy.layers.l2 import Ether
 from scapy.packet import Raw
 
@@ -245,9 +255,17 @@ def main():
         if rx_pkt_recv.haslayer(ICMPv6ND_NS):
             # read another packet in the queue if the current one is ICMPv6ND_NS
             continue
-        else:
-            # otherwise process the current packet
-            break
+        elif rx_pkt_recv.haslayer(ICMPv6MLReport2):
+            # read another packet in the queue if the current one is
+            # ICMPv6MLReport2
+            continue
+        elif rx_pkt_recv.haslayer(ICMPv6ND_RA):
+            # read another packet in the queue if the current one is
+            # ICMPv6ND_RA
+            continue
+
+        # otherwise process the current packet
+        break
 
     check_srv6(
         rx_pkt_recv, rx_src_mac, rx_dst_mac, src_ip, dst_ip, dir0_srcsid,
@@ -260,20 +278,20 @@ def main():
         ip_pkt[Raw].load += (b"\0" * (size_limit - 14 - len(ip_pkt)))
 
     rx_pkt_send = (
-            Ether(src=rx_dst_mac, dst=rx_src_mac) /
-            IPv6(src=dir1_srcsid, dst=dir1_dstsid1) /
-            IPv6ExtHdrSegmentRouting(
-                segleft=1 if dir1_dstsid3 == u"None" else 2,
-                lastentry=1 if dir1_dstsid3 == u"None" else 2,
-                addresses=[dir1_dstsid2, dir1_dstsid1]
-                if dir1_dstsid3 == u"None"
-                else [dir1_dstsid3, dir1_dstsid2, dir1_dstsid1]
-            ) /
-            ip_pkt
+        Ether(src=rx_dst_mac, dst=rx_src_mac) /
+        IPv6(src=dir1_srcsid, dst=dir1_dstsid1) /
+        IPv6ExtHdrSegmentRouting(
+            segleft=1 if dir1_dstsid3 == u"None" else 2,
+            lastentry=1 if dir1_dstsid3 == u"None" else 2,
+            addresses=[dir1_dstsid2, dir1_dstsid1]
+            if dir1_dstsid3 == u"None"
+            else [dir1_dstsid3, dir1_dstsid2, dir1_dstsid1]
+        ) /
+        ip_pkt
     ) if dir1_dstsid2 != u"None" else (
-            Ether(src=rx_dst_mac, dst=rx_src_mac) /
-            IPv6(src=dir1_srcsid, dst=dir1_dstsid1) /
-            ip_pkt
+        Ether(src=rx_dst_mac, dst=rx_src_mac) /
+        IPv6(src=dir1_srcsid, dst=dir1_dstsid1) /
+        ip_pkt
     )
     rx_txq.send(rx_pkt_send)
 
@@ -286,9 +304,17 @@ def main():
         if tx_pkt_recv.haslayer(ICMPv6ND_NS):
             # read another packet in the queue if the current one is ICMPv6ND_NS
             continue
-        else:
-            # otherwise process the current packet
-            break
+        elif tx_pkt_recv.haslayer(ICMPv6MLReport2):
+            # read another packet in the queue if the current one is
+            # ICMPv6MLReport2
+            continue
+        elif tx_pkt_recv.haslayer(ICMPv6ND_RA):
+            # read another packet in the queue if the current one is
+            # ICMPv6ND_RA
+            continue
+
+        # otherwise process the current packet
+        break
 
     if decap == u"True":
         check_ip(tx_pkt_recv, tx_dst_mac, tx_src_mac, dst_ip, src_ip)