Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove multiprocessing from PacketVerifier, tune tests.
[csit.git]
/
resources
/
traffic_scripts
/
ipv6_ns.py
diff --git
a/resources/traffic_scripts/ipv6_ns.py
b/resources/traffic_scripts/ipv6_ns.py
index
dd1adad
..
cfdca41
100755
(executable)
--- a/
resources/traffic_scripts/ipv6_ns.py
+++ b/
resources/traffic_scripts/ipv6_ns.py
@@
-49,18
+49,15
@@
def main():
# receive ICMPv6 neighbor advertisement message
ether = rxq.recv(2, sent_packets)
if ether is None:
# receive ICMPv6 neighbor advertisement message
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(ICMPv6ND_NA):
raise RuntimeError('Unexpected packet with no IPv6 received {0}'.format(
ether.__repr__()))
ipv6 = ether['IPv6']
if not ipv6.haslayer(ICMPv6ND_NA):
- rxq._proc.terminate()
raise RuntimeError(
'Unexpected packet with no ICMPv6 ND-NA received {0}'.format(
ipv6.__repr__()))
raise RuntimeError(
'Unexpected packet with no ICMPv6 ND-NA received {0}'.format(
ipv6.__repr__()))
@@
-69,12
+66,10
@@
def main():
# verify target address
if icmpv6_na.tgt != dst_ip:
# verify target address
if icmpv6_na.tgt != dst_ip:
- rxq._proc.terminate()
raise RuntimeError('Invalid target address {0} should be {1}'.format(
icmpv6_na.tgt, dst_ip))
if not icmpv6_na.haslayer(ICMPv6NDOptDstLLAddr):
raise RuntimeError('Invalid target address {0} should be {1}'.format(
icmpv6_na.tgt, dst_ip))
if not icmpv6_na.haslayer(ICMPv6NDOptDstLLAddr):
- rxq._proc.terminate()
raise RuntimeError(
'Missing Destination Link-Layer Address option in ICMPv6 ' +
'Neighbor Advertisement {0}'.format(icmpv6_na.__repr__()))
raise RuntimeError(
'Missing Destination Link-Layer Address option in ICMPv6 ' +
'Neighbor Advertisement {0}'.format(icmpv6_na.__repr__()))
@@
-84,7
+79,6
@@
def main():
# verify destination link-layer address field
if dst_ll_addr.lladdr != dst_mac:
# verify destination link-layer address field
if dst_ll_addr.lladdr != dst_mac:
- rxq._proc.terminate()
raise RuntimeError('Invalid lladdr {0} should be {1}'.format(
dst_ll_addr.lladdr, dst_mac))
raise RuntimeError('Invalid lladdr {0} should be {1}'.format(
dst_ll_addr.lladdr, dst_mac))
@@
-93,11
+87,9
@@
def main():
del icmpv6_na.cksum
tmp = ICMPv6ND_NA(str(icmpv6_na))
if tmp.cksum != cksum:
del icmpv6_na.cksum
tmp = ICMPv6ND_NA(str(icmpv6_na))
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__":