luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Patrick McHardy <kaber@trash.net>
This commit is contained in:
Patrick McHardy 2008-04-14 11:15:52 +02:00
parent 5f7da4d26d
commit 5e8fbe2ac8
16 changed files with 64 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/net/netfilter/nf_conntrack.h
View File

@ -140,6 +140,16 @@ nf_ct_tuplehash_to_ctrack(const struct nf_conntrack_tuple_hash *hash)
tuplehash[hash->tuple.dst.dir]); 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 */ /* get master conntrack via master expectation */
#define master_ct(conntr) (conntr->master) #define master_ct(conntr) (conntr->master)

13
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
View File

@ -106,21 +106,16 @@ static int ct_seq_show(struct seq_file *s, void *v)
/* we only want to print DIR_ORIGINAL */ /* we only want to print DIR_ORIGINAL */
if (NF_CT_DIRECTION(hash)) if (NF_CT_DIRECTION(hash))
return 0; return 0;
if (ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num != AF_INET) if (nf_ct_l3num(ct) != AF_INET)
return 0; return 0;
l3proto = __nf_ct_l3proto_find(ct->tuplehash[IP_CT_DIR_ORIGINAL] l3proto = __nf_ct_l3proto_find(nf_ct_l3num(ct));
.tuple.src.l3num);
NF_CT_ASSERT(l3proto); NF_CT_ASSERT(l3proto);
l4proto = __nf_ct_l4proto_find(ct->tuplehash[IP_CT_DIR_ORIGINAL] l4proto = __nf_ct_l4proto_find(nf_ct_l3num(ct), nf_ct_protonum(ct));
.tuple.src.l3num,
ct->tuplehash[IP_CT_DIR_ORIGINAL]
.tuple.dst.protonum);
NF_CT_ASSERT(l4proto); NF_CT_ASSERT(l4proto);
if (seq_printf(s, "%-8s %u %ld ", if (seq_printf(s, "%-8s %u %ld ",
l4proto->name, l4proto->name, nf_ct_protonum(ct),
ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.protonum,
timer_pending(&ct->timeout) timer_pending(&ct->timeout)
? (long)(ct->timeout.expires - jiffies)/HZ : 0) != 0) ? (long)(ct->timeout.expires - jiffies)/HZ : 0) != 0)
return -ENOSPC; return -ENOSPC;

4
net/netfilter/nf_conntrack_amanda.c
View File

@ -91,7 +91,6 @@ static int amanda_help(struct sk_buff *skb,
char pbuf[sizeof("65535")], *tmp; char pbuf[sizeof("65535")], *tmp;
u_int16_t len; u_int16_t len;
__be16 port; __be16 port;
int family = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num;
int ret = NF_ACCEPT; int ret = NF_ACCEPT;
typeof(nf_nat_amanda_hook) nf_nat_amanda; typeof(nf_nat_amanda_hook) nf_nat_amanda;
@ -148,7 +147,8 @@ static int amanda_help(struct sk_buff *skb,
goto out; goto out;
} }
tuple = &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple; 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, &tuple->src.u3, &tuple->dst.u3,
IPPROTO_TCP, NULL, &port); IPPROTO_TCP, NULL, &port);

3
net/netfilter/nf_conntrack_core.c
View File

@ -194,8 +194,7 @@ destroy_conntrack(struct nf_conntrack *nfct)
* destroy_conntrack() MUST NOT be called with a write lock * destroy_conntrack() MUST NOT be called with a write lock
* to nf_conntrack_lock!!! -HW */ * to nf_conntrack_lock!!! -HW */
rcu_read_lock(); rcu_read_lock();
l4proto = __nf_ct_l4proto_find(ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.l3num, l4proto = __nf_ct_l4proto_find(nf_ct_l3num(ct), nf_ct_protonum(ct));
ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.protonum);
if (l4proto && l4proto->destroy) if (l4proto && l4proto->destroy)
l4proto->destroy(ct); l4proto->destroy(ct);

4
net/netfilter/nf_conntrack_ftp.c
View File

@ -406,7 +406,7 @@ static int help(struct sk_buff *skb,
/* Initialize IP/IPv6 addr to expected address (it's not mentioned /* Initialize IP/IPv6 addr to expected address (it's not mentioned
in EPSV responses) */ 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, memcpy(cmd.u3.all, &ct->tuplehash[dir].tuple.src.u3.all,
sizeof(cmd.u3.all)); sizeof(cmd.u3.all));
@ -453,7 +453,7 @@ static int help(struct sk_buff *skb,
daddr = &ct->tuplehash[!dir].tuple.dst.u3; daddr = &ct->tuplehash[!dir].tuple.dst.u3;
/* Update the ftp info */ /* 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, memcmp(&cmd.u3.all, &ct->tuplehash[dir].tuple.src.u3.all,
sizeof(cmd.u3.all))) { sizeof(cmd.u3.all))) {
/* Enrico Scholz's passive FTP to partially RNAT'd ftp /* Enrico Scholz's passive FTP to partially RNAT'd ftp

39
net/netfilter/nf_conntrack_h323_main.c
View File

@ -218,7 +218,6 @@ static int get_h245_addr(struct nf_conn *ct, const unsigned char *data,
union nf_inet_addr *addr, __be16 *port) union nf_inet_addr *addr, __be16 *port)
{ {
const unsigned char *p; const unsigned char *p;
int family = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num;
int len; int len;
if (taddr->choice != eH245_TransportAddress_unicastAddress) if (taddr->choice != eH245_TransportAddress_unicastAddress)
@ -226,13 +225,13 @@ static int get_h245_addr(struct nf_conn *ct, const unsigned char *data,
switch (taddr->unicastAddress.choice) { switch (taddr->unicastAddress.choice) {
case eUnicastAddress_iPAddress: case eUnicastAddress_iPAddress:
if (family != AF_INET) if (nf_ct_l3num(ct) != AF_INET)
return 0; return 0;
p = data + taddr->unicastAddress.iPAddress.network; p = data + taddr->unicastAddress.iPAddress.network;
len = 4; len = 4;
break; break;
case eUnicastAddress_iP6Address: case eUnicastAddress_iP6Address:
if (family != AF_INET6) if (nf_ct_l3num(ct) != AF_INET6)
return 0; return 0;
p = data + taddr->unicastAddress.iP6Address.network; p = data + taddr->unicastAddress.iP6Address.network;
len = 16; len = 16;
@ -277,8 +276,7 @@ static int expect_rtp_rtcp(struct sk_buff *skb, struct nf_conn *ct,
/* Create expect for RTP */ /* Create expect for RTP */
if ((rtp_exp = nf_ct_expect_alloc(ct)) == NULL) if ((rtp_exp = nf_ct_expect_alloc(ct)) == NULL)
return -1; return -1;
nf_ct_expect_init(rtp_exp, NF_CT_EXPECT_CLASS_DEFAULT, nf_ct_expect_init(rtp_exp, NF_CT_EXPECT_CLASS_DEFAULT, nf_ct_l3num(ct),
ct->tuplehash[!dir].tuple.src.l3num,
&ct->tuplehash[!dir].tuple.src.u3, &ct->tuplehash[!dir].tuple.src.u3,
&ct->tuplehash[!dir].tuple.dst.u3, &ct->tuplehash[!dir].tuple.dst.u3,
IPPROTO_UDP, NULL, &rtp_port); IPPROTO_UDP, NULL, &rtp_port);
@ -288,8 +286,7 @@ static int expect_rtp_rtcp(struct sk_buff *skb, struct nf_conn *ct,
nf_ct_expect_put(rtp_exp); nf_ct_expect_put(rtp_exp);
return -1; return -1;
} }
nf_ct_expect_init(rtcp_exp, NF_CT_EXPECT_CLASS_DEFAULT, nf_ct_expect_init(rtcp_exp, NF_CT_EXPECT_CLASS_DEFAULT, nf_ct_l3num(ct),
ct->tuplehash[!dir].tuple.src.l3num,
&ct->tuplehash[!dir].tuple.src.u3, &ct->tuplehash[!dir].tuple.src.u3,
&ct->tuplehash[!dir].tuple.dst.u3, &ct->tuplehash[!dir].tuple.dst.u3,
IPPROTO_UDP, NULL, &rtcp_port); IPPROTO_UDP, NULL, &rtcp_port);
@ -346,8 +343,7 @@ static int expect_t120(struct sk_buff *skb,
/* Create expect for T.120 connections */ /* Create expect for T.120 connections */
if ((exp = nf_ct_expect_alloc(ct)) == NULL) if ((exp = nf_ct_expect_alloc(ct)) == NULL)
return -1; return -1;
nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT, nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT, nf_ct_l3num(ct),
ct->tuplehash[!dir].tuple.src.l3num,
&ct->tuplehash[!dir].tuple.src.u3, &ct->tuplehash[!dir].tuple.src.u3,
&ct->tuplehash[!dir].tuple.dst.u3, &ct->tuplehash[!dir].tuple.dst.u3,
IPPROTO_TCP, NULL, &port); IPPROTO_TCP, NULL, &port);
@ -634,18 +630,17 @@ int get_h225_addr(struct nf_conn *ct, unsigned char *data,
union nf_inet_addr *addr, __be16 *port) union nf_inet_addr *addr, __be16 *port)
{ {
const unsigned char *p; const unsigned char *p;
int family = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num;
int len; int len;
switch (taddr->choice) { switch (taddr->choice) {
case eTransportAddress_ipAddress: case eTransportAddress_ipAddress:
if (family != AF_INET) if (nf_ct_l3num(ct) != AF_INET)
return 0; return 0;
p = data + taddr->ipAddress.ip; p = data + taddr->ipAddress.ip;
len = 4; len = 4;
break; break;
case eTransportAddress_ip6Address: case eTransportAddress_ip6Address:
if (family != AF_INET6) if (nf_ct_l3num(ct) != AF_INET6)
return 0; return 0;
p = data + taddr->ip6Address.ip; p = data + taddr->ip6Address.ip;
len = 16; len = 16;
@ -683,8 +678,7 @@ static int expect_h245(struct sk_buff *skb, struct nf_conn *ct,
/* Create expect for h245 connection */ /* Create expect for h245 connection */
if ((exp = nf_ct_expect_alloc(ct)) == NULL) if ((exp = nf_ct_expect_alloc(ct)) == NULL)
return -1; return -1;
nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT, nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT, nf_ct_l3num(ct),
ct->tuplehash[!dir].tuple.src.l3num,
&ct->tuplehash[!dir].tuple.src.u3, &ct->tuplehash[!dir].tuple.src.u3,
&ct->tuplehash[!dir].tuple.dst.u3, &ct->tuplehash[!dir].tuple.dst.u3,
IPPROTO_TCP, NULL, &port); IPPROTO_TCP, NULL, &port);
@ -792,7 +786,7 @@ static int expect_callforwarding(struct sk_buff *skb,
* we don't need to track the second call */ * we don't need to track the second call */
if (callforward_filter && if (callforward_filter &&
callforward_do_filter(&addr, &ct->tuplehash[!dir].tuple.src.u3, callforward_do_filter(&addr, &ct->tuplehash[!dir].tuple.src.u3,
ct->tuplehash[!dir].tuple.src.l3num)) { nf_ct_l3num(ct))) {
pr_debug("nf_ct_q931: Call Forwarding not tracked\n"); pr_debug("nf_ct_q931: Call Forwarding not tracked\n");
return 0; return 0;
} }
@ -800,8 +794,7 @@ static int expect_callforwarding(struct sk_buff *skb,
/* Create expect for the second call leg */ /* Create expect for the second call leg */
if ((exp = nf_ct_expect_alloc(ct)) == NULL) if ((exp = nf_ct_expect_alloc(ct)) == NULL)
return -1; return -1;
nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT, nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT, nf_ct_l3num(ct),
ct->tuplehash[!dir].tuple.src.l3num,
&ct->tuplehash[!dir].tuple.src.u3, &addr, &ct->tuplehash[!dir].tuple.src.u3, &addr,
IPPROTO_TCP, NULL, &port); IPPROTO_TCP, NULL, &port);
exp->helper = nf_conntrack_helper_q931; exp->helper = nf_conntrack_helper_q931;
@ -1272,8 +1265,7 @@ static int expect_q931(struct sk_buff *skb, struct nf_conn *ct,
/* Create expect for Q.931 */ /* Create expect for Q.931 */
if ((exp = nf_ct_expect_alloc(ct)) == NULL) if ((exp = nf_ct_expect_alloc(ct)) == NULL)
return -1; return -1;
nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT, nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT, nf_ct_l3num(ct),
ct->tuplehash[!dir].tuple.src.l3num,
gkrouted_only ? /* only accept calls from GK? */ gkrouted_only ? /* only accept calls from GK? */
&ct->tuplehash[!dir].tuple.src.u3 : NULL, &ct->tuplehash[!dir].tuple.src.u3 : NULL,
&ct->tuplehash[!dir].tuple.dst.u3, &ct->tuplehash[!dir].tuple.dst.u3,
@ -1344,8 +1336,7 @@ static int process_gcf(struct sk_buff *skb, struct nf_conn *ct,
/* Need new expect */ /* Need new expect */
if ((exp = nf_ct_expect_alloc(ct)) == NULL) if ((exp = nf_ct_expect_alloc(ct)) == NULL)
return -1; return -1;
nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT, nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT, nf_ct_l3num(ct),
ct->tuplehash[!dir].tuple.src.l3num,
&ct->tuplehash[!dir].tuple.src.u3, &addr, &ct->tuplehash[!dir].tuple.src.u3, &addr,
IPPROTO_UDP, NULL, &port); IPPROTO_UDP, NULL, &port);
exp->helper = nf_conntrack_helper_ras; exp->helper = nf_conntrack_helper_ras;
@ -1549,8 +1540,7 @@ static int process_acf(struct sk_buff *skb, struct nf_conn *ct,
/* Need new expect */ /* Need new expect */
if ((exp = nf_ct_expect_alloc(ct)) == NULL) if ((exp = nf_ct_expect_alloc(ct)) == NULL)
return -1; return -1;
nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT, nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT, nf_ct_l3num(ct),
ct->tuplehash[!dir].tuple.src.l3num,
&ct->tuplehash[!dir].tuple.src.u3, &addr, &ct->tuplehash[!dir].tuple.src.u3, &addr,
IPPROTO_TCP, NULL, &port); IPPROTO_TCP, NULL, &port);
exp->flags = NF_CT_EXPECT_PERMANENT; exp->flags = NF_CT_EXPECT_PERMANENT;
@ -1603,8 +1593,7 @@ static int process_lcf(struct sk_buff *skb, struct nf_conn *ct,
/* Need new expect for call signal */ /* Need new expect for call signal */
if ((exp = nf_ct_expect_alloc(ct)) == NULL) if ((exp = nf_ct_expect_alloc(ct)) == NULL)
return -1; return -1;
nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT, nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT, nf_ct_l3num(ct),
ct->tuplehash[!dir].tuple.src.l3num,
&ct->tuplehash[!dir].tuple.src.u3, &addr, &ct->tuplehash[!dir].tuple.src.u3, &addr,
IPPROTO_TCP, NULL, &port); IPPROTO_TCP, NULL, &port);
exp->flags = NF_CT_EXPECT_PERMANENT; exp->flags = NF_CT_EXPECT_PERMANENT;

19
net/netfilter/nf_conntrack_netlink.c
View File

@ -145,10 +145,11 @@ ctnetlink_dump_timeout(struct sk_buff *skb, const struct nf_conn *ct)
static inline int static inline int
ctnetlink_dump_protoinfo(struct sk_buff *skb, const struct nf_conn *ct) ctnetlink_dump_protoinfo(struct sk_buff *skb, const struct nf_conn *ct)
{ {
struct nf_conntrack_l4proto *l4proto = nf_ct_l4proto_find_get(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num, ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.protonum); struct nf_conntrack_l4proto *l4proto;
struct nlattr *nest_proto; struct nlattr *nest_proto;
int ret; int ret;
l4proto = nf_ct_l4proto_find_get(nf_ct_l3num(ct), nf_ct_protonum(ct));
if (!l4proto->to_nlattr) { if (!l4proto->to_nlattr) {
nf_ct_l4proto_put(l4proto); nf_ct_l4proto_put(l4proto);
return 0; return 0;
@ -368,8 +369,7 @@ ctnetlink_fill_info(struct sk_buff *skb, u32 pid, u32 seq,
nfmsg = NLMSG_DATA(nlh); nfmsg = NLMSG_DATA(nlh);
nlh->nlmsg_flags = (nowait && pid) ? NLM_F_MULTI : 0; nlh->nlmsg_flags = (nowait && pid) ? NLM_F_MULTI : 0;
nfmsg->nfgen_family = nfmsg->nfgen_family = nf_ct_l3num(ct);
ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num;
nfmsg->version = NFNETLINK_V0; nfmsg->version = NFNETLINK_V0;
nfmsg->res_id = 0; nfmsg->res_id = 0;
@ -454,7 +454,7 @@ static int ctnetlink_conntrack_event(struct notifier_block *this,
nfmsg = NLMSG_DATA(nlh); nfmsg = NLMSG_DATA(nlh);
nlh->nlmsg_flags = flags; nlh->nlmsg_flags = flags;
nfmsg->nfgen_family = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num; nfmsg->nfgen_family = nf_ct_l3num(ct);
nfmsg->version = NFNETLINK_V0; nfmsg->version = NFNETLINK_V0;
nfmsg->res_id = 0; nfmsg->res_id = 0;
@ -535,8 +535,6 @@ static int ctnetlink_done(struct netlink_callback *cb)
return 0; return 0;
} }
#define L3PROTO(ct) (ct)->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num
static int static int
ctnetlink_dump_table(struct sk_buff *skb, struct netlink_callback *cb) ctnetlink_dump_table(struct sk_buff *skb, struct netlink_callback *cb)
{ {
@ -558,7 +556,7 @@ ctnetlink_dump_table(struct sk_buff *skb, struct netlink_callback *cb)
/* Dump entries of a given L3 protocol number. /* Dump entries of a given L3 protocol number.
* If it is not specified, ie. l3proto == 0, * If it is not specified, ie. l3proto == 0,
* then dump everything. */ * then dump everything. */
if (l3proto && L3PROTO(ct) != l3proto) if (l3proto && nf_ct_l3num(ct) != l3proto)
continue; continue;
if (cb->args[1]) { if (cb->args[1]) {
if (ct != last) if (ct != last)
@ -704,7 +702,7 @@ static int nfnetlink_parse_nat_proto(struct nlattr *attr,
if (err < 0) if (err < 0)
return err; return err;
npt = nf_nat_proto_find_get(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.protonum); npt = nf_nat_proto_find_get(nf_ct_protonum(ct));
if (npt->nlattr_to_range) if (npt->nlattr_to_range)
err = npt->nlattr_to_range(tb, range); err = npt->nlattr_to_range(tb, range);
nf_nat_proto_put(npt); nf_nat_proto_put(npt);
@ -1001,14 +999,11 @@ ctnetlink_change_protoinfo(struct nf_conn *ct, struct nlattr *cda[])
{ {
struct nlattr *tb[CTA_PROTOINFO_MAX+1], *attr = cda[CTA_PROTOINFO]; struct nlattr *tb[CTA_PROTOINFO_MAX+1], *attr = cda[CTA_PROTOINFO];
struct nf_conntrack_l4proto *l4proto; struct nf_conntrack_l4proto *l4proto;
u_int16_t npt = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.protonum;
u_int16_t l3num = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num;
int err = 0; int err = 0;
nla_parse_nested(tb, CTA_PROTOINFO_MAX, attr, NULL); nla_parse_nested(tb, CTA_PROTOINFO_MAX, attr, NULL);
l4proto = nf_ct_l4proto_find_get(l3num, npt); l4proto = nf_ct_l4proto_find_get(nf_ct_l3num(ct), nf_ct_protonum(ct));
if (l4proto->from_nlattr) if (l4proto->from_nlattr)
err = l4proto->from_nlattr(tb, ct); err = l4proto->from_nlattr(tb, ct);
nf_ct_l4proto_put(l4proto); nf_ct_l4proto_put(l4proto);

4
net/netfilter/nf_conntrack_pptp.c
View File

@ -209,7 +209,7 @@ static int exp_gre(struct nf_conn *ct, __be16 callid, __be16 peer_callid)
/* original direction, PNS->PAC */ /* original direction, PNS->PAC */
dir = IP_CT_DIR_ORIGINAL; dir = IP_CT_DIR_ORIGINAL;
nf_ct_expect_init(exp_orig, NF_CT_EXPECT_CLASS_DEFAULT, nf_ct_expect_init(exp_orig, NF_CT_EXPECT_CLASS_DEFAULT,
ct->tuplehash[dir].tuple.src.l3num, nf_ct_l3num(ct),
&ct->tuplehash[dir].tuple.src.u3, &ct->tuplehash[dir].tuple.src.u3,
&ct->tuplehash[dir].tuple.dst.u3, &ct->tuplehash[dir].tuple.dst.u3,
IPPROTO_GRE, &peer_callid, &callid); IPPROTO_GRE, &peer_callid, &callid);
@ -218,7 +218,7 @@ static int exp_gre(struct nf_conn *ct, __be16 callid, __be16 peer_callid)
/* reply direction, PAC->PNS */ /* reply direction, PAC->PNS */
dir = IP_CT_DIR_REPLY; dir = IP_CT_DIR_REPLY;
nf_ct_expect_init(exp_reply, NF_CT_EXPECT_CLASS_DEFAULT, nf_ct_expect_init(exp_reply, NF_CT_EXPECT_CLASS_DEFAULT,
ct->tuplehash[dir].tuple.src.l3num, nf_ct_l3num(ct),
&ct->tuplehash[dir].tuple.src.u3, &ct->tuplehash[dir].tuple.src.u3,
&ct->tuplehash[dir].tuple.dst.u3, &ct->tuplehash[dir].tuple.dst.u3,
IPPROTO_GRE, &callid, &peer_callid); IPPROTO_GRE, &callid, &peer_callid);

9
net/netfilter/nf_conntrack_proto.c
View File

@ -146,18 +146,15 @@ EXPORT_SYMBOL_GPL(nf_ct_l3proto_module_put);
static int kill_l3proto(struct nf_conn *i, void *data) static int kill_l3proto(struct nf_conn *i, void *data)
{ {
return (i->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num == return nf_ct_l3num(i) == ((struct nf_conntrack_l3proto *)data)->l3proto;
((struct nf_conntrack_l3proto *)data)->l3proto);
} }
static int kill_l4proto(struct nf_conn *i, void *data) static int kill_l4proto(struct nf_conn *i, void *data)
{ {
struct nf_conntrack_l4proto *l4proto; struct nf_conntrack_l4proto *l4proto;
l4proto = (struct nf_conntrack_l4proto *)data; l4proto = (struct nf_conntrack_l4proto *)data;
return (i->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.protonum == return nf_ct_protonum(i) == l4proto->l4proto &&
l4proto->l4proto) && nf_ct_l3num(i) == l4proto->l3proto;
(i->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num ==
l4proto->l3proto);
} }
static int nf_ct_l3proto_register_sysctl(struct nf_conntrack_l3proto *l3proto) static int nf_ct_l3proto_register_sysctl(struct nf_conntrack_l3proto *l3proto)

3
net/netfilter/nf_conntrack_proto_dccp.c
View File

@ -418,7 +418,6 @@ static int dccp_invert_tuple(struct nf_conntrack_tuple *inv,
static int dccp_new(struct nf_conn *ct, const struct sk_buff *skb, static int dccp_new(struct nf_conn *ct, const struct sk_buff *skb,
unsigned int dataoff) unsigned int dataoff)
{ {
int pf = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num;
struct dccp_hdr _dh, *dh; struct dccp_hdr _dh, *dh;
const char *msg; const char *msg;
u_int8_t state; u_int8_t state;
@ -447,7 +446,7 @@ static int dccp_new(struct nf_conn *ct, const struct sk_buff *skb,
out_invalid: out_invalid:
if (LOG_INVALID(IPPROTO_DCCP)) if (LOG_INVALID(IPPROTO_DCCP))
nf_log_packet(pf, 0, skb, NULL, NULL, NULL, msg); nf_log_packet(nf_ct_l3num(ct), 0, skb, NULL, NULL, NULL, msg);
return 0; return 0;
} }

3
net/netfilter/nf_conntrack_sane.c
View File

@ -72,7 +72,6 @@ static int help(struct sk_buff *skb,
struct nf_conntrack_tuple *tuple; struct nf_conntrack_tuple *tuple;
struct sane_request *req; struct sane_request *req;
struct sane_reply_net_start *reply; struct sane_reply_net_start *reply;
int family = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num;
ct_sane_info = &nfct_help(ct)->help.ct_sane_info; ct_sane_info = &nfct_help(ct)->help.ct_sane_info;
/* Until there's been traffic both ways, don't look in packets. */ /* Until there's been traffic both ways, don't look in packets. */
@ -143,7 +142,7 @@ static int help(struct sk_buff *skb,
} }
tuple = &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple; 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, &tuple->src.u3, &tuple->dst.u3,
IPPROTO_TCP, NULL, &reply->port); IPPROTO_TCP, NULL, &reply->port);

20
net/netfilter/nf_conntrack_sip.c
View File

@ -142,11 +142,10 @@ static int parse_addr(const struct nf_conn *ct, const char *cp,
const char *limit) const char *limit)
{ {
const char *end; const char *end;
int family = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num;
int ret = 0; int ret = 0;
memset(addr, 0, sizeof(*addr)); memset(addr, 0, sizeof(*addr));
switch (family) { switch (nf_ct_l3num(ct)) {
case AF_INET: case AF_INET:
ret = in4_pton(cp, limit - cp, (u8 *)&addr->ip, -1, &end); ret = in4_pton(cp, limit - cp, (u8 *)&addr->ip, -1, &end);
break; break;
@ -740,7 +739,6 @@ static int set_expected_rtp_rtcp(struct sk_buff *skb,
enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo); enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);
union nf_inet_addr *saddr; union nf_inet_addr *saddr;
struct nf_conntrack_tuple tuple; struct nf_conntrack_tuple tuple;
int family = ct->tuplehash[!dir].tuple.src.l3num;
int direct_rtp = 0, skip_expect = 0, ret = NF_DROP; int direct_rtp = 0, skip_expect = 0, ret = NF_DROP;
u_int16_t base_port; u_int16_t base_port;
__be16 rtp_port, rtcp_port; __be16 rtp_port, rtcp_port;
@ -770,7 +768,7 @@ static int set_expected_rtp_rtcp(struct sk_buff *skb,
memset(&tuple, 0, sizeof(tuple)); memset(&tuple, 0, sizeof(tuple));
if (saddr) if (saddr)
tuple.src.u3 = *saddr; tuple.src.u3 = *saddr;
tuple.src.l3num = family; tuple.src.l3num = nf_ct_l3num(ct);
tuple.dst.protonum = IPPROTO_UDP; tuple.dst.protonum = IPPROTO_UDP;
tuple.dst.u3 = *daddr; tuple.dst.u3 = *daddr;
tuple.dst.u.udp.port = port; tuple.dst.u.udp.port = port;
@ -815,13 +813,13 @@ static int set_expected_rtp_rtcp(struct sk_buff *skb,
rtp_exp = nf_ct_expect_alloc(ct); rtp_exp = nf_ct_expect_alloc(ct);
if (rtp_exp == NULL) if (rtp_exp == NULL)
goto err1; goto err1;
nf_ct_expect_init(rtp_exp, class, family, saddr, daddr, nf_ct_expect_init(rtp_exp, class, nf_ct_l3num(ct), saddr, daddr,
IPPROTO_UDP, NULL, &rtp_port); IPPROTO_UDP, NULL, &rtp_port);
rtcp_exp = nf_ct_expect_alloc(ct); rtcp_exp = nf_ct_expect_alloc(ct);
if (rtcp_exp == NULL) if (rtcp_exp == NULL)
goto err2; goto err2;
nf_ct_expect_init(rtcp_exp, class, family, saddr, daddr, nf_ct_expect_init(rtcp_exp, class, nf_ct_l3num(ct), saddr, daddr,
IPPROTO_UDP, NULL, &rtcp_port); IPPROTO_UDP, NULL, &rtcp_port);
nf_nat_sdp_media = rcu_dereference(nf_nat_sdp_media_hook); nf_nat_sdp_media = rcu_dereference(nf_nat_sdp_media_hook);
@ -871,7 +869,6 @@ static int process_sdp(struct sk_buff *skb,
{ {
enum ip_conntrack_info ctinfo; enum ip_conntrack_info ctinfo;
struct nf_conn *ct = nf_ct_get(skb, &ctinfo); struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
int family = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num;
unsigned int matchoff, matchlen; unsigned int matchoff, matchlen;
unsigned int mediaoff, medialen; unsigned int mediaoff, medialen;
unsigned int sdpoff; unsigned int sdpoff;
@ -886,8 +883,8 @@ static int process_sdp(struct sk_buff *skb,
typeof(nf_nat_sdp_session_hook) nf_nat_sdp_session; typeof(nf_nat_sdp_session_hook) nf_nat_sdp_session;
nf_nat_sdp_addr = rcu_dereference(nf_nat_sdp_addr_hook); nf_nat_sdp_addr = rcu_dereference(nf_nat_sdp_addr_hook);
c_hdr = family == AF_INET ? SDP_HDR_CONNECTION_IP4 : c_hdr = nf_ct_l3num(ct) == AF_INET ? SDP_HDR_CONNECTION_IP4 :
SDP_HDR_CONNECTION_IP6; SDP_HDR_CONNECTION_IP6;
/* Find beginning of session description */ /* Find beginning of session description */
if (ct_sip_get_sdp_header(ct, *dptr, 0, *datalen, if (ct_sip_get_sdp_header(ct, *dptr, 0, *datalen,
@ -1034,7 +1031,6 @@ static int process_register_request(struct sk_buff *skb,
struct nf_conn *ct = nf_ct_get(skb, &ctinfo); struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
struct nf_conn_help *help = nfct_help(ct); struct nf_conn_help *help = nfct_help(ct);
enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo); enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);
int family = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num;
unsigned int matchoff, matchlen; unsigned int matchoff, matchlen;
struct nf_conntrack_expect *exp; struct nf_conntrack_expect *exp;
union nf_inet_addr *saddr, daddr; union nf_inet_addr *saddr, daddr;
@ -1089,8 +1085,8 @@ static int process_register_request(struct sk_buff *skb,
if (sip_direct_signalling) if (sip_direct_signalling)
saddr = &ct->tuplehash[!dir].tuple.src.u3; saddr = &ct->tuplehash[!dir].tuple.src.u3;
nf_ct_expect_init(exp, SIP_EXPECT_SIGNALLING, family, saddr, &daddr, nf_ct_expect_init(exp, SIP_EXPECT_SIGNALLING, nf_ct_l3num(ct),
IPPROTO_UDP, NULL, &port); saddr, &daddr, IPPROTO_UDP, NULL, &port);
exp->timeout.expires = sip_timeout * HZ; exp->timeout.expires = sip_timeout * HZ;
exp->helper = nfct_help(ct)->helper; exp->helper = nfct_help(ct)->helper;
exp->flags = NF_CT_EXPECT_PERMANENT | NF_CT_EXPECT_INACTIVE; exp->flags = NF_CT_EXPECT_PERMANENT | NF_CT_EXPECT_INACTIVE;

15
net/netfilter/nf_conntrack_standalone.c
View File

@ -127,21 +127,14 @@ static int ct_seq_show(struct seq_file *s, void *v)
if (NF_CT_DIRECTION(hash)) if (NF_CT_DIRECTION(hash))
return 0; return 0;
l3proto = __nf_ct_l3proto_find(ct->tuplehash[IP_CT_DIR_ORIGINAL] l3proto = __nf_ct_l3proto_find(nf_ct_l3num(ct));
.tuple.src.l3num);
NF_CT_ASSERT(l3proto); NF_CT_ASSERT(l3proto);
l4proto = __nf_ct_l4proto_find(ct->tuplehash[IP_CT_DIR_ORIGINAL] l4proto = __nf_ct_l4proto_find(nf_ct_l3num(ct), nf_ct_protonum(ct));
.tuple.src.l3num,
ct->tuplehash[IP_CT_DIR_ORIGINAL]
.tuple.dst.protonum);
NF_CT_ASSERT(l4proto); NF_CT_ASSERT(l4proto);
if (seq_printf(s, "%-8s %u %-8s %u %ld ", if (seq_printf(s, "%-8s %u %-8s %u %ld ",
l3proto->name, l3proto->name, nf_ct_l3num(ct),
ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num, l4proto->name, nf_ct_protonum(ct),
l4proto->name,
ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.protonum,
timer_pending(&ct->timeout) timer_pending(&ct->timeout)
? (long)(ct->timeout.expires - jiffies)/HZ : 0) != 0) ? (long)(ct->timeout.expires - jiffies)/HZ : 0) != 0)
return -ENOSPC; return -ENOSPC;

4
net/netfilter/nf_conntrack_tftp.c
View File

@ -44,7 +44,6 @@ static int tftp_help(struct sk_buff *skb,
struct nf_conntrack_expect *exp; struct nf_conntrack_expect *exp;
struct nf_conntrack_tuple *tuple; struct nf_conntrack_tuple *tuple;
unsigned int ret = NF_ACCEPT; unsigned int ret = NF_ACCEPT;
int family = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num;
typeof(nf_nat_tftp_hook) nf_nat_tftp; typeof(nf_nat_tftp_hook) nf_nat_tftp;
tfh = skb_header_pointer(skb, protoff + sizeof(struct udphdr), tfh = skb_header_pointer(skb, protoff + sizeof(struct udphdr),
@ -63,7 +62,8 @@ static int tftp_help(struct sk_buff *skb,
if (exp == NULL) if (exp == NULL)
return NF_DROP; return NF_DROP;
tuple = &ct->tuplehash[IP_CT_DIR_REPLY].tuple; tuple = &ct->tuplehash[IP_CT_DIR_REPLY].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, &tuple->src.u3, &tuple->dst.u3,
IPPROTO_UDP, NULL, &tuple->dst.u.udp.port); IPPROTO_UDP, NULL, &tuple->dst.u.udp.port);

4
net/netfilter/xt_connlimit.c
View File

@ -72,9 +72,7 @@ connlimit_iphash6(const union nf_inet_addr *addr,
static inline bool already_closed(const struct nf_conn *conn) static inline bool already_closed(const struct nf_conn *conn)
{ {
u_int16_t proto = conn->tuplehash[0].tuple.dst.protonum; if (nf_ct_protonum(conn) == IPPROTO_TCP)
if (proto == IPPROTO_TCP)
return conn->proto.tcp.state == TCP_CONNTRACK_TIME_WAIT; return conn->proto.tcp.state == TCP_CONNTRACK_TIME_WAIT;
else else
return 0; return 0;

4
net/netfilter/xt_conntrack.c
View File

@ -65,7 +65,7 @@ conntrack_mt_v0(const struct sk_buff *skb, const struct net_device *in,
} }
if (sinfo->flags & XT_CONNTRACK_PROTO && if (sinfo->flags & XT_CONNTRACK_PROTO &&
FWINV(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.protonum != FWINV(nf_ct_protonum(ct) !=
sinfo->tuple[IP_CT_DIR_ORIGINAL].dst.protonum, sinfo->tuple[IP_CT_DIR_ORIGINAL].dst.protonum,
XT_CONNTRACK_PROTO)) XT_CONNTRACK_PROTO))
return false; return false;
@ -174,7 +174,7 @@ ct_proto_port_check(const struct xt_conntrack_mtinfo1 *info,
tuple = &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple; tuple = &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple;
if ((info->match_flags & XT_CONNTRACK_PROTO) && if ((info->match_flags & XT_CONNTRACK_PROTO) &&
(tuple->dst.protonum == info->l4proto) ^ (nf_ct_protonum(ct) == info->l4proto) ^
!(info->invert_flags & XT_CONNTRACK_PROTO)) !(info->invert_flags & XT_CONNTRACK_PROTO))
return false; return false;