netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 2/2 nf-next] netfilter: ftp: Remove the useless codes
@ 2016-09-01 10:59 fgao
  2016-09-07  8:48 ` Pablo Neira Ayuso
  0 siblings, 1 reply; 2+ messages in thread
From: fgao @ 2016-09-01 10:59 UTC (permalink / raw)
  To: pablo, kadlec, netfilter-devel, coreteam; +Cc: gfree.wind, Gao Feng

From: Gao Feng <fgao@ikuai8.com>

There are some debug codes which are commented out in find_pattern by #if 0.
Now clean them.

Signed-off-by: Gao Feng <fgao@ikuai8.com>
---
 v2: Splite the original patch to two commits
 v1: Initial patch

 net/netfilter/nf_conntrack_ftp.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c
index d49a2d4..77f05ac 100644
--- a/net/netfilter/nf_conntrack_ftp.c
+++ b/net/netfilter/nf_conntrack_ftp.c
@@ -310,16 +310,6 @@ static int find_pattern(const char *data, size_t dlen,
 	}
 
 	if (strncasecmp(data, pattern, plen) != 0) {
-#if 0
-		size_t i;
-
-		pr_debug("ftp: string mismatch\n");
-		for (i = 0; i < plen; i++) {
-			pr_debug("ftp:char %u `%c'(%u) vs `%c'(%u)\n",
-				 i, data[i], data[i],
-				 pattern[i], pattern[i]);
-		}
-#endif
 		return 0;
 	}
 
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH v2 2/2 nf-next] netfilter: ftp: Remove the useless codes
  2016-09-01 10:59 [PATCH v2 2/2 nf-next] netfilter: ftp: Remove the useless codes fgao
@ 2016-09-07  8:48 ` Pablo Neira Ayuso
  0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2016-09-07  8:48 UTC (permalink / raw)
  To: fgao; +Cc: kadlec, netfilter-devel, coreteam, gfree.wind

On Thu, Sep 01, 2016 at 06:59:02PM +0800, fgao@ikuai8.com wrote:
> From: Gao Feng <fgao@ikuai8.com>
> 
> There are some debug codes which are commented out in find_pattern by #if 0.
> Now clean them.

Also applied, thanks.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-09-07  8:49 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-01 10:59 [PATCH v2 2/2 nf-next] netfilter: ftp: Remove the useless codes fgao
2016-09-07  8:48 ` Pablo Neira Ayuso

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).