From aa2acc61e4126a31b725b3efdaaa0646350d183d Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 30 Jul 2005 17:44:07 -0700 Subject: [PATCH] --- yaml --- r: 5527 b: refs/heads/master c: 1f494c0e040b001cf844280910d04ba7ebdc2898 h: refs/heads/master i: 5525: f48909d9aa8d39af8bc69ec606fb21c6141476f0 5523: 00a3334f7e1360451c71ffcdd4c3ba8d19d074c1 5519: 7b5133f2d25eec6103c9835ae5d5b402432d10b8 v: v3 --- [refs] | 2 +- trunk/net/ipv4/netfilter/ip_conntrack_core.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a68dcb8aadf7..45e027eee34b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1b04c081e3fb0a08ac108737e4efa9f4830c916 +refs/heads/master: 1f494c0e040b001cf844280910d04ba7ebdc2898 diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_core.c b/trunk/net/ipv4/netfilter/ip_conntrack_core.c index 86f04e41dd8e..a7f0c821a9b2 100644 --- a/trunk/net/ipv4/netfilter/ip_conntrack_core.c +++ b/trunk/net/ipv4/netfilter/ip_conntrack_core.c @@ -512,6 +512,11 @@ init_conntrack(const struct ip_conntrack_tuple *tuple, conntrack->master = exp->master; #ifdef CONFIG_IP_NF_CONNTRACK_MARK conntrack->mark = exp->master->mark; +#endif +#if defined(CONFIG_IP_NF_TARGET_MASQUERADE) || \ + defined(CONFIG_IP_NF_TARGET_MASQUERADE_MODULE) + /* this is ugly, but there is no other place where to put it */ + conntrack->nat.masq_index = exp->master->nat.masq_index; #endif nf_conntrack_get(&conntrack->master->ct_general); CONNTRACK_STAT_INC(expect_new);