Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
FIX: Add ICMPv6MLReport2 masking
[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
faa9d76
..
966fa60
100644
(file)
--- a/
GPL/traffic_scripts/send_icmp_wait_for_reply.py
+++ b/
GPL/traffic_scripts/send_icmp_wait_for_reply.py
@@
-1,6
+1,6
@@
#!/usr/bin/env python3
#!/usr/bin/env python3
-# Copyright (c) 202
0
Cisco and/or its affiliates.
+# Copyright (c) 202
1
Cisco and/or its affiliates.
#
# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
#
#
# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
#
@@
-14,7
+14,8
@@
#
# Note: If this file is linked with Scapy, which is GPLv2+, your use of it
# must be under GPLv2+. If at any point in the future it is no longer linked
#
# Note: If this file is linked with Scapy, which is GPLv2+, your use of it
# must be under GPLv2+. If at any point in the future it is no longer linked
-# with Scapy (or other GPLv2+ licensed software), you are free to choose Apache 2.
+# with Scapy (or other GPLv2+ licensed software), you are free to choose
+# Apache 2.
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
@@
-28,8
+29,8
@@
import sys
import ipaddress
from scapy.layers.inet import ICMP, IP
import ipaddress
from scapy.layers.inet import ICMP, IP
-from scapy.layers.inet6 import I
Pv6, I
CMPv6EchoRequest, ICMPv6EchoReply,\
- ICMPv6ND_NS
+from scapy.layers.inet6 import ICMPv6EchoRequest, ICMPv6EchoReply,\
+ ICMPv6ND_NS
, ICMPv6MLReport2
from scapy.layers.l2 import Ether
from scapy.packet import Raw
from scapy.layers.l2 import Ether
from scapy.packet import Raw
@@
-125,6
+126,10
@@
def main():
elif icmp_reply.haslayer(ICMPv6ND_NS):
# read another packet in the queue in case of ICMPv6ND_NS packet
continue
elif icmp_reply.haslayer(ICMPv6ND_NS):
# read another packet in the queue in case of ICMPv6ND_NS packet
continue
+ elif icmp_reply.haslayer(ICMPv6MLReport2):
+ # read another packet in the queue if the current one is
+ # ICMPv6MLReport2
+ continue
else:
# otherwise process the current packet
break
else:
# otherwise process the current packet
break