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: GSO tests
[csit.git]
/
GPL
/
traffic_scripts
/
geneve_tunnel.py
diff --git
a/GPL/traffic_scripts/geneve_tunnel.py
b/GPL/traffic_scripts/geneve_tunnel.py
index
4cd728b
..
19dae6d
100644
(file)
--- a/
GPL/traffic_scripts/geneve_tunnel.py
+++ b/
GPL/traffic_scripts/geneve_tunnel.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
#
@@
-30,7
+30,7
@@
import sys
from ipaddress import ip_address
from scapy.contrib.geneve import GENEVE
from scapy.layers.inet import IP, UDP
from ipaddress import ip_address
from scapy.contrib.geneve import GENEVE
from scapy.layers.inet import IP, UDP
-from scapy.layers.inet6 import IPv6, ICMPv6ND_NS
+from scapy.layers.inet6 import IPv6, 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
@@
-280,14
+280,18
@@
def main():
if rx_pkt_recv.haslayer(ICMPv6ND_NS):
# read another packet in the queue if the current one is ICMPv6ND_NS
continue
if rx_pkt_recv.haslayer(ICMPv6ND_NS):
# read another packet in the queue if the current one is ICMPv6ND_NS
continue
- else:
- # otherwise process the current packet
- break
+ elif rx_pkt_recv.haslayer(ICMPv6MLReport2):
+ # read another packet in the queue if the current one is
+ # ICMPv6MLReport2
+ continue
+
+ # otherwise process the current packet
+ break
check_geneve(
rx_pkt_recv, ip_layer, rx_src_mac, rx_dst_mac, geneve_tunnel_mac,
check_geneve(
rx_pkt_recv, ip_layer, rx_src_mac, rx_dst_mac, geneve_tunnel_mac,
- rx_
src
_mac, tun_local_ip, tun_remote_ip, str(src_ip), str(dst_ip),
- geneve_udp_dport,
tun_vni
+ rx_
dst
_mac, tun_local_ip, tun_remote_ip, str(src_ip), str(dst_ip),
+ geneve_udp_dport,
int(tun_vni)
)
rx_inner_ip_pkt = IP(
)
rx_inner_ip_pkt = IP(
@@
-333,6
+337,10
@@
def main():
if tx_pkt_recv.haslayer(ICMPv6ND_NS):
# read another packet in the queue if the current one is ICMPv6ND_NS
continue
if tx_pkt_recv.haslayer(ICMPv6ND_NS):
# read another packet in the queue if the current one is ICMPv6ND_NS
continue
+ elif tx_pkt_recv.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