diff options
| author | Florian Westphal | 2014-04-28 21:09:50 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso | 2014-04-29 20:56:22 +0200 |
| commit | f768e5bdefe1ec9adbf7a116dfb156b73cacb582 (patch) | |
| tree | 1d49bc5b3184cc71d34090a4b056e3b9a9427fb9 /net/netfilter/nf_nat_core.c | |
| parent | netfilter: nfnetlink_acct: Adding quota support to accounting framework (diff) | |
| download | kernel-qcow2-linux-f768e5bdefe1ec9adbf7a116dfb156b73cacb582.tar.gz kernel-qcow2-linux-f768e5bdefe1ec9adbf7a116dfb156b73cacb582.tar.xz kernel-qcow2-linux-f768e5bdefe1ec9adbf7a116dfb156b73cacb582.zip | |
netfilter: add helper for adding nat extension
Reduce copy-past a bit by adding a common helper.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nf_nat_core.c')
| -rw-r--r-- | net/netfilter/nf_nat_core.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c index 52ca952b802c..09096a670c45 100644 --- a/net/netfilter/nf_nat_core.c +++ b/net/netfilter/nf_nat_core.c @@ -358,6 +358,19 @@ out: rcu_read_unlock(); } +struct nf_conn_nat *nf_ct_nat_ext_add(struct nf_conn *ct) +{ + struct nf_conn_nat *nat = nfct_nat(ct); + if (nat) + return nat; + + if (!nf_ct_is_confirmed(ct)) + nat = nf_ct_ext_add(ct, NF_CT_EXT_NAT, GFP_ATOMIC); + + return nat; +} +EXPORT_SYMBOL_GPL(nf_ct_nat_ext_add); + unsigned int nf_nat_setup_info(struct nf_conn *ct, const struct nf_nat_range *range, @@ -368,14 +381,9 @@ nf_nat_setup_info(struct nf_conn *ct, struct nf_conn_nat *nat; /* nat helper or nfctnetlink also setup binding */ - nat = nfct_nat(ct); - if (!nat) { - nat = nf_ct_ext_add(ct, NF_CT_EXT_NAT, GFP_ATOMIC); - if (nat == NULL) { - pr_debug("failed to add NAT extension\n"); - return NF_ACCEPT; - } - } + nat = nf_ct_nat_ext_add(ct); + if (nat == NULL) + return NF_ACCEPT; NF_CT_ASSERT(maniptype == NF_NAT_MANIP_SRC || maniptype == NF_NAT_MANIP_DST); |