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
/
icmpv6_echo.py
diff --git
a/resources/traffic_scripts/icmpv6_echo.py
b/resources/traffic_scripts/icmpv6_echo.py
index
c3c8d5a
..
09198ab
100755
(executable)
--- a/
resources/traffic_scripts/icmpv6_echo.py
+++ b/
resources/traffic_scripts/icmpv6_echo.py
@@
-58,18
+58,15
@@
def main():
# receive ICMPv6 echo reply
ether = rxq.recv(2, sent_packets)
if ether is None:
# receive ICMPv6 echo reply
ether = rxq.recv(2, sent_packets)
if ether is None:
- rxq._proc.terminate()
raise RuntimeError('ICMPv6 echo reply Rx timeout')
if not ether.haslayer(IPv6):
raise RuntimeError('ICMPv6 echo reply Rx timeout')
if not ether.haslayer(IPv6):
- rxq._proc.terminate()
raise RuntimeError('Unexpected packet with no IPv6 received {0}'.format(
ether.__repr__()))
ipv6 = ether['IPv6']
if not ipv6.haslayer(ICMPv6EchoReply):
raise RuntimeError('Unexpected packet with no IPv6 received {0}'.format(
ether.__repr__()))
ipv6 = ether['IPv6']
if not ipv6.haslayer(ICMPv6EchoReply):
- rxq._proc.terminate()
raise RuntimeError(
'Unexpected packet with no IPv6 ICMP received {0}'.format(
ipv6.__repr__()))
raise RuntimeError(
'Unexpected packet with no IPv6 ICMP received {0}'.format(
ipv6.__repr__()))
@@
-78,9
+75,8
@@
def main():
# check identifier and sequence number
if icmpv6.id != echo_id or icmpv6.seq != echo_seq:
# check identifier and sequence number
if icmpv6.id != echo_id or icmpv6.seq != echo_seq:
- rxq._proc.terminate()
raise RuntimeError(
raise RuntimeError(
- 'Invalid ICMPv6 echo reply received ID {0} seq {1} should be '
+
+ 'Invalid ICMPv6 echo reply received ID {0} seq {1} should be '
\
'ID {2} seq {3}'.format(icmpv6.id, icmpv6.seq, echo_id, echo_seq))
# verify checksum
'ID {2} seq {3}'.format(icmpv6.id, icmpv6.seq, echo_id, echo_seq))
# verify checksum
@@
-88,11
+84,9
@@
def main():
del icmpv6.cksum
tmp = ICMPv6EchoReply(str(icmpv6))
if tmp.cksum != cksum:
del icmpv6.cksum
tmp = ICMPv6EchoReply(str(icmpv6))
if tmp.cksum != cksum:
- rxq._proc.terminate()
raise RuntimeError(
'Invalid checksum {0} should be {1}'.format(cksum, tmp.cksum))
raise RuntimeError(
'Invalid checksum {0} should be {1}'.format(cksum, tmp.cksum))
- rxq._proc.terminate()
sys.exit(0)
if __name__ == "__main__":
sys.exit(0)
if __name__ == "__main__":