diff options
| author |   Paolo Abeni <pabeni@redhat.com> | 2023-03-02 11:10:43 +0100 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2023-03-02 11:10:43 +0100 |
| commit | 044c8bf78db818b8c726eb47c560e05fbc71e128 (patch) | |
| tree | 2382dff9f8e1db214b122dab9113e18772b8dd6c /tools | |
| parent | net: tls: avoid hanging tasks on the tx_lock (diff) | |
| parent | netfilter: nft_quota: copy content when cloning expression (diff) | |
| download | linux-rng-044c8bf78db818b8c726eb47c560e05fbc71e128.tar.xz linux-rng-044c8bf78db818b8c726eb47c560e05fbc71e128.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains Netfilter fixes for net:
1) Fix bogus error report in selftests/netfilter/nft_nat.sh,
from Hangbin Liu.
2) Initialize last and quota expressions from template when
expr_ops::clone is called, otherwise, states are not restored
accordingly when loading a dynamic set with elements using
these two expressions.
* git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf:
netfilter: nft_quota: copy content when cloning expression
netfilter: nft_last: copy content when cloning expression
selftests: nft_nat: ensuring the listening side is up before starting the client
====================
Link: https://lore.kernel.org/r/20230301222021.154670-1-pablo@netfilter.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/testing/selftests/netfilter/nft_nat.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/testing/selftests/netfilter/nft_nat.sh b/tools/testing/selftests/netfilter/nft_nat.sh index 924ecb3f1f73..dd40d9f6f259 100755 --- a/tools/testing/selftests/netfilter/nft_nat.sh +++ b/tools/testing/selftests/netfilter/nft_nat.sh @@ -404,6 +404,8 @@ EOF echo SERVER-$family | ip netns exec "$ns1" timeout 5 socat -u STDIN TCP-LISTEN:2000 & sc_s=$! + sleep 1 + result=$(ip netns exec "$ns0" timeout 1 socat TCP:$daddr:2000 STDOUT) if [ "$result" = "SERVER-inet" ];then |