Makes conversion in followup patch simpler.
Signed-off-by: Florian Westphal <fw@xxxxxxxxx>
---
net/netfilter/nf_nat_core.c | 46 +++++++++++++++++++++++--------------
1 file changed, 29 insertions(+), 17 deletions(-)
diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c
index 7981be526f26..bd5ac4ff03f9 100644
--- a/net/netfilter/nf_nat_core.c
+++ b/net/netfilter/nf_nat_core.c
@@ -709,6 +709,32 @@ static bool in_vrf_postrouting(const struct nf_hook_state *state)
return false;
}
+static unsigned int nf_nat_inet_run_hooks(const struct nf_hook_state *state,
+ struct sk_buff *skb,
+ struct nf_conn *ct,
+ struct nf_nat_lookup_hook_priv *lpriv)
+{
+ enum nf_nat_manip_type maniptype = HOOK2MANIP(state->hook);
+ struct nf_hook_entries *e = rcu_dereference(lpriv->entries);
+ unsigned int ret;
+ int i;
+
+ if (!e)
+ goto null_bind;
+
+ for (i = 0; i < e->num_hook_entries; i++) {
+ ret = e->hooks[i].hook(e->hooks[i].priv, skb, state);
+ if (ret != NF_ACCEPT)
+ return ret;
+
+ if (nf_nat_initialized(ct, maniptype))
+ return NF_ACCEPT;
+ }
+
+null_bind:
+ return nf_nat_alloc_null_binding(ct, state->hook);
+}
+
unsigned int
nf_nat_inet_fn(void *priv, struct sk_buff *skb,
const struct nf_hook_state *state)
@@ -740,23 +766,9 @@ nf_nat_inet_fn(void *priv, struct sk_buff *skb,
*/
if (!nf_nat_initialized(ct, maniptype)) {
struct nf_nat_lookup_hook_priv *lpriv = priv;
- struct nf_hook_entries *e = rcu_dereference(lpriv->entries);
unsigned int ret;
- int i;
-
- if (!e)
- goto null_bind;
-
- for (i = 0; i < e->num_hook_entries; i++) {
- ret = e->hooks[i].hook(e->hooks[i].priv, skb,
- state);
- if (ret != NF_ACCEPT)
- return ret;
- if (nf_nat_initialized(ct, maniptype))
- goto do_nat;
- }
-null_bind:
- ret = nf_nat_alloc_null_binding(ct, state->hook);
+
+ ret = nf_nat_inet_run_hooks(state, skb, ct, lpriv);
if (ret != NF_ACCEPT)
return ret;
} else {
@@ -775,7 +787,7 @@ nf_nat_inet_fn(void *priv, struct sk_buff *skb,
if (nf_nat_oif_changed(state->hook, ctinfo, nat, state->out))
goto oif_changed;
}
-do_nat:
+
return nf_nat_packet(ct, ctinfo, state->hook, skb);
oif_changed:
--
2.35.1
