Traffic scripts: Fix docstrings

[csit.git] / GPL / traffic_scripts / send_icmp_wait_for_reply.py

diff --git a/GPL/traffic_scripts/send_icmp_wait_for_reply.py b/GPL/traffic_scripts/send_icmp_wait_for_reply.py
index fefa60f..ea82a81 100644 (file)
--- a/GPL/traffic_scripts/send_icmp_wait_for_reply.py
+++ b/GPL/traffic_scripts/send_icmp_wait_for_reply.py
@@ -30,7 +30,7 @@ import ipaddress
 
 from scapy.layers.inet import ICMP, IP
 from scapy.layers.inet6 import ICMPv6EchoRequest, ICMPv6EchoReply,\
-    ICMPv6ND_NS, ICMPv6MLReport2
+    ICMPv6ND_NS, ICMPv6MLReport2, ICMPv6ND_RA
 from scapy.layers.l2 import Ether
 from scapy.packet import Raw
 
@@ -45,7 +45,6 @@ def valid_ipv4(ip_address):
     :type ip_address: str
     :returns: True if IP address is correct.
     :rtype: bool
-    :raises AttributeError, AddressValueError: If IP address is not valid.
     """
     try:
         ipaddress.IPv4Address(ip_address)
@@ -61,7 +60,6 @@ def valid_ipv6(ip_address):
     :type ip_address: str
     :returns: True if IP address is correct.
     :rtype: bool
-    :raises AttributeError, AddressValueError: If IP address is not valid.
     """
     try:
         ipaddress.IPv6Address(ip_address)
@@ -130,9 +128,12 @@ def main():
                 # read another packet in the queue if the current one is
                 # ICMPv6MLReport2
                 continue
-            else:
-                # otherwise process the current packet
-                break
+            elif icmp_reply.haslayer(ICMPv6ND_RA):
+                # read another packet in the queue if the current one is
+                # ICMPv6ND_RA
+                continue
+
+            break
 
         if icmp_reply[ip_layer][icmp_resp].type == icmp_type:
             if icmp_reply[ip_layer].src == dst_ip and \