From: Florian Westphal <fw@strlen.de>
Date: Tue, 12 Feb 2013 05:59:53 +0000 (+0000)
Subject: netfilter: nf_ct_helper: don't discard helper if it is actually the same
X-Git-Tag: v3.9-rc1~139^2~29^2~8^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e2f0aa8cf8892868bf2c19349cb5d7c407f690d;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed