diff options
Diffstat (limited to 'GPL/traffic_scripts/nat.py')
-rw-r--r-- | GPL/traffic_scripts/nat.py | 47 |
1 files changed, 22 insertions, 25 deletions
diff --git a/GPL/traffic_scripts/nat.py b/GPL/traffic_scripts/nat.py index d9f0330641..3722d6b8db 100644 --- a/GPL/traffic_scripts/nat.py +++ b/GPL/traffic_scripts/nat.py @@ -27,31 +27,14 @@ import sys -import ipaddress - from scapy.layers.inet import IP, TCP, UDP -from scapy.layers.inet6 import IPv6, ICMPv6ND_NS +from scapy.layers.inet6 import IPv6, ICMPv6ND_NS, ICMPv6MLReport2, ICMPv6ND_RA from scapy.layers.l2 import Ether from scapy.packet import Raw from .PacketVerifier import RxQueue, TxQueue from .TrafficScriptArg import TrafficScriptArg - - -def valid_ipv4(ip): - try: - ipaddress.IPv4Address(ip) - return True - except (AttributeError, ipaddress.AddressValueError): - return False - - -def valid_ipv6(ip): - try: - ipaddress.IPv6Address(ip) - return True - except (AttributeError, ipaddress.AddressValueError): - return False +from .ValidIp import valid_ipv4, valid_ipv6 def main(): @@ -120,9 +103,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}") @@ -182,9 +172,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 ether[Ether].dst != tx_src_mac or ether[Ether].src != tx_dst_mac: raise RuntimeError(f"Matching packet unsuccessful: {ether!r}") |