Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e8fbe2a authored by Patrick McHardy's avatar Patrick McHardy
Browse files

[NETFILTER]: nf_conntrack: add tuplehash l3num/protonum accessors 



Add accessors for l3num and protonum and get rid of some overly long
expressions.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 5f7da4d2

include/net/netfilter/nf_conntrack.h

+10 −0
Original line number Diff line number Diff line
@@ -140,6 +140,16 @@ nf_ct_tuplehash_to_ctrack(const struct nf_conntrack_tuple_hash *hash) 
			    tuplehash[hash->tuple.dst.dir]);

}



static inline u_int16_t nf_ct_l3num(const struct nf_conn *ct)

{

	return ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num;

}



static inline u_int8_t nf_ct_protonum(const struct nf_conn *ct)

{

	return ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.protonum;

}



/* get master conntrack via master expectation */

#define master_ct(conntr) (conntr->master)

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c

+4 −9
Original line number Diff line number Diff line
@@ -106,21 +106,16 @@ static int ct_seq_show(struct seq_file *s, void *v) 
	/* we only want to print DIR_ORIGINAL */

	if (NF_CT_DIRECTION(hash))

		return 0;

	if (ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num != AF_INET)

	if (nf_ct_l3num(ct) != AF_INET)

		return 0;



	l3proto = __nf_ct_l3proto_find(ct->tuplehash[IP_CT_DIR_ORIGINAL]

				       .tuple.src.l3num);

	l3proto = __nf_ct_l3proto_find(nf_ct_l3num(ct));

	NF_CT_ASSERT(l3proto);

	l4proto = __nf_ct_l4proto_find(ct->tuplehash[IP_CT_DIR_ORIGINAL]

				       .tuple.src.l3num,

				       ct->tuplehash[IP_CT_DIR_ORIGINAL]

				       .tuple.dst.protonum);

	l4proto = __nf_ct_l4proto_find(nf_ct_l3num(ct), nf_ct_protonum(ct));

	NF_CT_ASSERT(l4proto);



	if (seq_printf(s, "%-8s %u %ld ",

		      l4proto->name,

		      ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.protonum,

		      l4proto->name, nf_ct_protonum(ct),

		      timer_pending(&ct->timeout)

		      ? (long)(ct->timeout.expires - jiffies)/HZ : 0) != 0)

		return -ENOSPC;

net/netfilter/nf_conntrack_amanda.c

+2 −2
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ static int amanda_help(struct sk_buff *skb, 
	char pbuf[sizeof("65535")], *tmp;

	u_int16_t len;

	__be16 port;

	int family = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num;

	int ret = NF_ACCEPT;

	typeof(nf_nat_amanda_hook) nf_nat_amanda;
@@ -148,7 +147,8 @@ static int amanda_help(struct sk_buff *skb, 
			goto out;

		}

		tuple = &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple;

		nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT, family,

		nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT,

				  nf_ct_l3num(ct),

				  &tuple->src.u3, &tuple->dst.u3,

				  IPPROTO_TCP, NULL, &port);

net/netfilter/nf_conntrack_core.c

+1 −2
Original line number Diff line number Diff line
@@ -194,8 +194,7 @@ destroy_conntrack(struct nf_conntrack *nfct) 
	 * destroy_conntrack() MUST NOT be called with a write lock

	 * to nf_conntrack_lock!!! -HW */

	rcu_read_lock();

	l4proto = __nf_ct_l4proto_find(ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.l3num,

				       ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.protonum);

	l4proto = __nf_ct_l4proto_find(nf_ct_l3num(ct), nf_ct_protonum(ct));

	if (l4proto && l4proto->destroy)

		l4proto->destroy(ct);

net/netfilter/nf_conntrack_ftp.c

+2 −2
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ static int help(struct sk_buff *skb, 


	/* Initialize IP/IPv6 addr to expected address (it's not mentioned

	   in EPSV responses) */

	cmd.l3num = ct->tuplehash[dir].tuple.src.l3num;

	cmd.l3num = nf_ct_l3num(ct);

	memcpy(cmd.u3.all, &ct->tuplehash[dir].tuple.src.u3.all,

	       sizeof(cmd.u3.all));
@@ -453,7 +453,7 @@ static int help(struct sk_buff *skb, 
	daddr = &ct->tuplehash[!dir].tuple.dst.u3;



	/* Update the ftp info */

	if ((cmd.l3num == ct->tuplehash[dir].tuple.src.l3num) &&

	if ((cmd.l3num == nf_ct_l3num(ct)) &&

	    memcmp(&cmd.u3.all, &ct->tuplehash[dir].tuple.src.u3.all,

		     sizeof(cmd.u3.all))) {

		/* Enrico Scholz's passive FTP to partially RNAT'd ftp