X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=GPL%2Ftraffic_scripts%2Fnat.py;h=994157ae81141d0fa7ab23edbf6a414811958bed;hp=43715fb383e6b3a4ca75096272927852117d3f63;hb=b67b82c15d7d0da402df180b0aaab3daa4cfc76c;hpb=a4ba3f4e9d2124050502b8dc5c53acbdebd39e11 diff --git a/GPL/traffic_scripts/nat.py b/GPL/traffic_scripts/nat.py index 43715fb383..994157ae81 100644 --- a/GPL/traffic_scripts/nat.py +++ b/GPL/traffic_scripts/nat.py @@ -30,7 +30,7 @@ import sys import ipaddress from scapy.layers.inet import IP, TCP, UDP -from scapy.layers.inet6 import IPv6, ICMPv6ND_NS, ICMPv6MLReport2 +from scapy.layers.inet6 import IPv6, ICMPv6ND_NS, ICMPv6MLReport2, ICMPv6ND_RA from scapy.layers.l2 import Ether from scapy.packet import Raw @@ -136,9 +136,16 @@ def main(): if ether.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 ether.haslayer(ICMPv6MLReport2): + # read another packet in the queue if the current one is + # ICMPv6MLReport2 + continue + elif ether.haslayer(ICMPv6ND_RA): + # read another packet in the queue if the current one is + # ICMPv6ND_RA + continue + + break if rx_dst_mac != ether[Ether].dst or rx_src_mac != ether[Ether].src: raise RuntimeError(f"Matching packet unsuccessful: {ether!r}") @@ -202,9 +209,12 @@ def main(): # read another packet in the queue if the current one is # ICMPv6MLReport2 continue - else: - # otherwise process the current packet - break + elif ether.haslayer(ICMPv6ND_RA): + # read another packet in the queue if the current one is + # ICMPv6ND_RA + continue + + break if ether[Ether].dst != tx_src_mac or ether[Ether].src != tx_dst_mac: raise RuntimeError(f"Matching packet unsuccessful: {ether!r}")