mirror/xdp-project-bpf-examples
1
0
Fork 0
mirror of https://github.com/xdp-project/bpf-examples.git synced 2024-05-06 15:54:53 +00:00
Code Issues Projects Releases Wiki Activity

lib/testenv: Don't get iface MAC address before we need it

Browse Source 
Resolves a race condition where the MAC can change

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
This commit is contained in:
Toke Høiland-Jørgensen
2020-10-06 17:13:44 +02:00
parent cbaa0704ab
commit e08a4e085d
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/testenv/testenv.sh
View File

@@ -238,14 +238,12 @@ setup()
ip netns add "$NS" ip netns add "$NS"
ip link add dev "$NS" type veth peer name veth0 netns "$NS" ip link add dev "$NS" type veth peer name veth0 netns "$NS"
OUTSIDE_MAC=$(iface_macaddr "$NS")
INSIDE_MAC=$(iface_macaddr veth0 "$NS")
set_sysctls $NS set_sysctls $NS
ip link set dev "$NS" up ip link set dev "$NS" up
ip addr add dev "$NS" "${OUTSIDE_IP6}/${IP6_PREFIX_SIZE}" ip addr add dev "$NS" "${OUTSIDE_IP6}/${IP6_PREFIX_SIZE}"
ethtool -K "$NS" rxvlan off txvlan off ethtool -K "$NS" rxvlan off txvlan off
# Prevent neighbour queries on the link # Prevent neighbour queries on the link
INSIDE_MAC=$(iface_macaddr veth0 "$NS")
ip neigh add "$INSIDE_IP6" lladdr "$INSIDE_MAC" dev "$NS" nud permanent ip neigh add "$INSIDE_IP6" lladdr "$INSIDE_MAC" dev "$NS" nud permanent
set_sysctls veth0 "$NS" set_sysctls veth0 "$NS"
@@ -254,6 +252,7 @@ setup()
ip -n "$NS" addr add dev veth0 "${INSIDE_IP6}/${IP6_PREFIX_SIZE}" ip -n "$NS" addr add dev veth0 "${INSIDE_IP6}/${IP6_PREFIX_SIZE}"
ip netns exec "$NS" ethtool -K veth0 rxvlan off txvlan off ip netns exec "$NS" ethtool -K veth0 rxvlan off txvlan off
# Prevent neighbour queries on the link # Prevent neighbour queries on the link
OUTSIDE_MAC=$(iface_macaddr "$NS")
ip -n "$NS" neigh add "$OUTSIDE_IP6" lladdr "$OUTSIDE_MAC" dev veth0 nud permanent ip -n "$NS" neigh add "$OUTSIDE_IP6" lladdr "$OUTSIDE_MAC" dev veth0 nud permanent
# Add route for whole test subnet, to make it easier to communicate between # Add route for whole test subnet, to make it easier to communicate between
# namespaces # namespaces