Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
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
966fa60
..
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,\
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
from scapy.layers.l2 import Ether
from scapy.packet import Raw
@@
-38,33
+38,31
@@
from .PacketVerifier import RxQueue, TxQueue
from .TrafficScriptArg import TrafficScriptArg
from .TrafficScriptArg import TrafficScriptArg
-def valid_ipv4(ip):
- """Check
if IP address has the correct IPv4 address format
.
+def valid_ipv4(ip
_address
):
+ """Check
IPv4 address
.
- :param ip: IP address.
- :type ip: str
- :return: True in case of correct IPv4 address format,
- otherwise return False.
+ :param ip_address: IPv4 address to check.
+ :type ip_address: str
+ :returns: True if IP address is correct.
:rtype: bool
"""
try:
:rtype: bool
"""
try:
- ipaddress.IPv4Address(ip)
+ ipaddress.IPv4Address(ip
_address
)
return True
except (AttributeError, ipaddress.AddressValueError):
return False
return True
except (AttributeError, ipaddress.AddressValueError):
return False
-def valid_ipv6(ip):
- """Check
if IP address has the correct IPv6 address format
.
+def valid_ipv6(ip
_address
):
+ """Check
IPv6 address
.
- :param ip: IP address.
- :type ip: str
- :return: True in case of correct IPv6 address format,
- otherwise return False.
+ :param ip_address: IPv6 address to check.
+ :type ip_address: str
+ :returns: True if IP address is correct.
:rtype: bool
"""
try:
:rtype: bool
"""
try:
- ipaddress.IPv6Address(ip)
+ ipaddress.IPv6Address(ip
_address
)
return True
except (AttributeError, ipaddress.AddressValueError):
return False
return True
except (AttributeError, ipaddress.AddressValueError):
return False
@@
-105,9
+103,9
@@
def main():
raise ValueError(u"IP not in correct format")
icmp_request = (
raise ValueError(u"IP not in correct format")
icmp_request = (
-
Ether(src=src_mac, dst=dst_mac) /
-
ip_layer(src=src_ip, dst=dst_ip) /
-
icmp_req()
+ Ether(src=src_mac, dst=dst_mac) /
+ ip_layer(src=src_ip, dst=dst_ip) /
+ icmp_req()
)
# Send created packet on the interface
)
# Send created packet on the interface
@@
-130,9
+128,12
@@
def main():
# read another packet in the queue if the current one is
# ICMPv6MLReport2
continue
# 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 \
if icmp_reply[ip_layer][icmp_resp].type == icmp_type:
if icmp_reply[ip_layer].src == dst_ip and \