netfilter: xt_socket: use sock_gen_put()
TCP listener refactoring, part 7 : Use sock_gen_put() instead of xt_socket_put_sk() for future SYN_RECV support. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
parent
1255ce5f10
commit
1a8bf6eeef
1 changed files with 2 additions and 11 deletions
|
@ -35,15 +35,6 @@
|
||||||
#include <net/netfilter/nf_conntrack.h>
|
#include <net/netfilter/nf_conntrack.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static void
|
|
||||||
xt_socket_put_sk(struct sock *sk)
|
|
||||||
{
|
|
||||||
if (sk->sk_state == TCP_TIME_WAIT)
|
|
||||||
inet_twsk_put(inet_twsk(sk));
|
|
||||||
else
|
|
||||||
sock_put(sk);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
extract_icmp4_fields(const struct sk_buff *skb,
|
extract_icmp4_fields(const struct sk_buff *skb,
|
||||||
u8 *protocol,
|
u8 *protocol,
|
||||||
|
@ -216,7 +207,7 @@ socket_match(const struct sk_buff *skb, struct xt_action_param *par,
|
||||||
inet_twsk(sk)->tw_transparent));
|
inet_twsk(sk)->tw_transparent));
|
||||||
|
|
||||||
if (sk != skb->sk)
|
if (sk != skb->sk)
|
||||||
xt_socket_put_sk(sk);
|
sock_gen_put(sk);
|
||||||
|
|
||||||
if (wildcard || !transparent)
|
if (wildcard || !transparent)
|
||||||
sk = NULL;
|
sk = NULL;
|
||||||
|
@ -381,7 +372,7 @@ socket_mt6_v1_v2(const struct sk_buff *skb, struct xt_action_param *par)
|
||||||
inet_twsk(sk)->tw_transparent));
|
inet_twsk(sk)->tw_transparent));
|
||||||
|
|
||||||
if (sk != skb->sk)
|
if (sk != skb->sk)
|
||||||
xt_socket_put_sk(sk);
|
sock_gen_put(sk);
|
||||||
|
|
||||||
if (wildcard || !transparent)
|
if (wildcard || !transparent)
|
||||||
sk = NULL;
|
sk = NULL;
|
||||||
|
|
Loading…
Add table
Reference in a new issue