Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Move script code to main function
[csit.git]
/
resources
/
traffic_scripts
/
ipv4_sweep_ping.py
diff --git
a/resources/traffic_scripts/ipv4_sweep_ping.py
b/resources/traffic_scripts/ipv4_sweep_ping.py
index
5005345
..
f7ce5cd
100755
(executable)
--- a/
resources/traffic_scripts/ipv4_sweep_ping.py
+++ b/
resources/traffic_scripts/ipv4_sweep_ping.py
@@
-83,7
+83,7
@@
def main():
if icmpv4.id != echo_id or icmpv4.seq != echo_seq:
raise RuntimeError(
if icmpv4.id != echo_id or icmpv4.seq != echo_seq:
raise RuntimeError(
- 'Invalid ICMP echo reply received ID {0} seq {1} should be '
+
+ 'Invalid ICMP echo reply received ID {0} seq {1} should be '
\
'ID {2} seq {3}, {0}'.format(icmpv4.id, icmpv4.seq, echo_id,
echo_seq))
'ID {2} seq {3}, {0}'.format(icmpv4.id, icmpv4.seq, echo_id,
echo_seq))
@@
-93,8
+93,11
@@
def main():
if tmp.chksum != chksum:
raise RuntimeError(
'Invalid checksum {0} should be {1}'.format(chksum, tmp.chksum))
if tmp.chksum != chksum:
raise RuntimeError(
'Invalid checksum {0} should be {1}'.format(chksum, tmp.chksum))
- recv_payload_len = ipv4.len - 20 - 8
- load = tmp['Raw'].load[0:recv_payload_len]
+
+ if 'Raw' in icmpv4:
+ load = icmpv4['Raw'].load
+ else:
+ load = []
if load != data[0:echo_seq]:
raise RuntimeError(
'Received ICMP payload does not match sent payload')
if load != data[0:echo_seq]:
raise RuntimeError(
'Received ICMP payload does not match sent payload')