aboutsummaryrefslogtreecommitdiffstats
path: root/GPL/traffic_scripts/lisp/lispgpe_check.py
diff options
context:
space:
mode:
authorpmikus <pmikus@cisco.com>2021-06-10 08:51:19 +0000
committerPeter Mikus <pmikus@cisco.com>2021-06-10 10:23:18 +0000
commite16906eaa7e50dfd3bbf16542d1ea3656d45862c (patch)
tree5cdc5bda778948fd69e7444ba5898aa91c086093 /GPL/traffic_scripts/lisp/lispgpe_check.py
parentdb359de3ff4ecd93c8d30ed52d996380ae22acda (diff)
FIX: Add ICMPv6MLReport2 masking
Signed-off-by: pmikus <pmikus@cisco.com> Change-Id: I1183a0ffd13c6926b3963b78630954bb6356133b (cherry picked from commit 8b25b4e89bdba964f2a3d602b8c47f551a084724) (cherry picked from commit aa02a041d8a6099f870d21bb5949bd741733df80)
Diffstat (limited to 'GPL/traffic_scripts/lisp/lispgpe_check.py')
-rw-r--r--GPL/traffic_scripts/lisp/lispgpe_check.py31
1 files changed, 23 insertions, 8 deletions
diff --git a/GPL/traffic_scripts/lisp/lispgpe_check.py b/GPL/traffic_scripts/lisp/lispgpe_check.py
index 41bc0964e6..79d2ccfab6 100644
--- a/GPL/traffic_scripts/lisp/lispgpe_check.py
+++ b/GPL/traffic_scripts/lisp/lispgpe_check.py
@@ -35,7 +35,7 @@ from scapy.all import bind_layers, Packet
from scapy.fields import FlagsField, BitField, XBitField, IntField
from scapy.layers.inet import ICMP, IP, UDP
from scapy.layers.inet6 import ICMPv6EchoRequest
-from scapy.layers.inet6 import IPv6
+from scapy.layers.inet6 import IPv6, ICMPv6ND_NS, ICMPv6MLReport2, ICMPv6ND_RA
from scapy.layers.l2 import Ether
from scapy.packet import Raw
@@ -156,13 +156,28 @@ def main():
sent_packets.append(pkt_raw)
txq.send(pkt_raw)
- if tx_if == rx_if:
- ether = rxq.recv(2, ignore=sent_packets)
- else:
- ether = rxq.recv(2)
-
- if ether is None:
- raise RuntimeError(u"ICMP echo Rx timeout")
+ while True:
+ if tx_if == rx_if:
+ ether = rxq.recv(2, ignore=sent_packets)
+ else:
+ ether = rxq.recv(2)
+
+ if ether is None:
+ raise RuntimeError(u"ICMP echo Rx timeout")
+
+ if ether.haslayer(ICMPv6ND_NS):
+ # read another packet in the queue if the current one is ICMPv6ND_NS
+ continue
+ if ether.haslayer(ICMPv6ND_RA):
+ # read another packet in the queue if the current one is ICMPv6ND_RA
+ continue
+ elif ether.haslayer(ICMPv6MLReport2):
+ # read another packet in the queue if the current one is
+ # ICMPv6MLReport2
+ continue
+
+ # otherwise process the current packet
+ break
if rx_dst_mac == ether[Ether].dst and rx_src_mac == ether[Ether].src:
print(u"MAC addresses match.")