Skip to content

Commit 64daf39

Browse files
Florian Westphalgregkh
authored andcommitted
selftests: netfilter: nft_tproxy.sh: adjust to socat changes
[ Upstream commit 6111954 ] Like e65d8b6 ("selftests: drv-net: adjust to socat changes") we need to add shut-none for this test too. The extra 0-packet can trigger a second (unexpected) reply from the server. Fixes: 7e37e0e ("selftests: netfilter: nft_tproxy.sh: add tcp tests") Reported-by: Jakub Kicinski <kuba@kernel.org> Closes: https://lore.kernel.org/netdev/20260408152432.24b8ad0d@kernel.org/ Suggested-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Florian Westphal <fw@strlen.de> Link: https://patch.msgid.link/20260409224506.27072-1-fw@strlen.de Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 4c727c6 commit 64daf39

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

tools/testing/selftests/net/netfilter/nft_tproxy_udp.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,13 @@ table inet filter {
190190
}
191191
EOF
192192

193-
timeout "$timeout" ip netns exec "$nsrouter" socat -u "$socat_ipproto" udp-listen:12345,fork,ip-transparent,reuseport udp:"$ns1_ip_port",ip-transparent,reuseport,bind="$ns2_ip_port" 2>/dev/null &
193+
timeout "$timeout" ip netns exec "$nsrouter" socat -u "$socat_ipproto" udp-listen:12345,fork,ip-transparent,reuseport,shut-none udp:"$ns1_ip_port",ip-transparent,reuseport,bind="$ns2_ip_port",shut-none 2>/dev/null &
194194
local tproxy_pid=$!
195195

196-
timeout "$timeout" ip netns exec "$ns2" socat "$socat_ipproto" udp-listen:8080,fork SYSTEM:"echo PONG_NS2" 2>/dev/null &
196+
timeout "$timeout" ip netns exec "$ns2" socat "$socat_ipproto" udp-listen:8080,fork,shut-none SYSTEM:"echo PONG_NS2" 2>/dev/null &
197197
local server2_pid=$!
198198

199-
timeout "$timeout" ip netns exec "$ns3" socat "$socat_ipproto" udp-listen:8080,fork SYSTEM:"echo PONG_NS3" 2>/dev/null &
199+
timeout "$timeout" ip netns exec "$ns3" socat "$socat_ipproto" udp-listen:8080,fork,shut-none SYSTEM:"echo PONG_NS3" 2>/dev/null &
200200
local server3_pid=$!
201201

202202
busywait "$BUSYWAIT_TIMEOUT" listener_ready "$nsrouter" 12345 "-u"
@@ -205,7 +205,7 @@ EOF
205205

206206
local result
207207
# request from ns1 to ns2 (forwarded traffic)
208-
result=$(echo I_M_PROXIED | ip netns exec "$ns1" socat -t 2 -T 2 STDIO udp:"$ns2_ip_port",sourceport=18888)
208+
result=$(echo I_M_PROXIED | ip netns exec "$ns1" socat -t 2 -T 2 STDIO udp:"$ns2_ip_port",sourceport=18888,shut-none)
209209
if [ "$result" == "$expect_ns1_ns2" ] ;then
210210
echo "PASS: tproxy test $testname: ns1 got reply \"$result\" connecting to ns2"
211211
else
@@ -214,7 +214,7 @@ EOF
214214
fi
215215

216216
# request from ns1 to ns3 (forwarded traffic)
217-
result=$(echo I_M_PROXIED | ip netns exec "$ns1" socat -t 2 -T 2 STDIO udp:"$ns3_ip_port")
217+
result=$(echo I_M_PROXIED | ip netns exec "$ns1" socat -t 2 -T 2 STDIO udp:"$ns3_ip_port",shut-none)
218218
if [ "$result" = "$expect_ns1_ns3" ] ;then
219219
echo "PASS: tproxy test $testname: ns1 got reply \"$result\" connecting to ns3"
220220
else
@@ -223,7 +223,7 @@ EOF
223223
fi
224224

225225
# request from nsrouter to ns2 (localy originated traffic)
226-
result=$(echo I_M_PROXIED | ip netns exec "$nsrouter" socat -t 2 -T 2 STDIO udp:"$ns2_ip_port")
226+
result=$(echo I_M_PROXIED | ip netns exec "$nsrouter" socat -t 2 -T 2 STDIO udp:"$ns2_ip_port",shut-none)
227227
if [ "$result" == "$expect_nsrouter_ns2" ] ;then
228228
echo "PASS: tproxy test $testname: nsrouter got reply \"$result\" connecting to ns2"
229229
else
@@ -232,7 +232,7 @@ EOF
232232
fi
233233

234234
# request from nsrouter to ns3 (localy originated traffic)
235-
result=$(echo I_M_PROXIED | ip netns exec "$nsrouter" socat -t 2 -T 2 STDIO udp:"$ns3_ip_port")
235+
result=$(echo I_M_PROXIED | ip netns exec "$nsrouter" socat -t 2 -T 2 STDIO udp:"$ns3_ip_port",shut-none)
236236
if [ "$result" = "$expect_nsrouter_ns3" ] ;then
237237
echo "PASS: tproxy test $testname: nsrouter got reply \"$result\" connecting to ns3"
238238
else

0 commit comments

Comments
 (0)