netfilter: nf_ct_helper: don't discard helper if it is actually the same
authorFlorian Westphal <fw@strlen.de>
Tue, 12 Feb 2013 05:59:53 +0000 (05:59 +0000)
committerPablo Neira Ayuso <pablo@gnumonks.org>
Tue, 12 Feb 2013 22:20:46 +0000 (23:20 +0100)
commit6e2f0aa8cf8892868bf2c19349cb5d7c407f690d
tree9cf81b07af02e67f2efd036b5100a0dd36036a20
parent442fad9423b78319e0019a7f5047eddf3317afbc
netfilter: nf_ct_helper: don't discard helper if it is actually the same

commit (32f5376 netfilter: nf_ct_helper: disable automatic helper
re-assignment of different type) broke transparent proxy scenarios.

For example, initial helper lookup might yield "ftp" (dport 21),
while re-lookup after REDIRECT yields "ftp-2121".

This causes the autoassign code to toss the ftp helper, even
though these are just different instances of the same helper.

Change the test to check for the helper function address instead
of the helper address, as suggested by Pablo.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@gnumonks.org>
net/netfilter/nf_conntrack_helper.c