From: Josh Hunt <johunt@akamai.com>
To: jengelh@inai.de, netfilter-devel@vger.kernel.org
Cc: Josh Hunt <johunt@akamai.com>
Subject: [PATCH v2 3/6] netfilter: tarpit: Move XTTARPIT_RESET to its own function
Date: Sun,  8 Jul 2012 11:11:22 -0700	[thread overview]
Message-ID: <1341771085-5771-4-git-send-email-johunt@akamai.com> (raw)
In-Reply-To: <1341771085-5771-1-git-send-email-johunt@akamai.com>
Moves XTTARPIT_RESET into its own function.
Signed-off-by: Josh Hunt <johunt@akamai.com>
---
 extensions/xt_TARPIT.c |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/extensions/xt_TARPIT.c b/extensions/xt_TARPIT.c
index 6c75184..5d8af70 100644
--- a/extensions/xt_TARPIT.c
+++ b/extensions/xt_TARPIT.c
@@ -133,6 +133,19 @@ static bool xttarpit_honeypot(struct tcphdr *oth, struct tcphdr *tcph,
 	return true;
 }
 
+static bool xttarpit_reset(struct tcphdr *oth, struct tcphdr *tcph)
+{
+
+	tcph->window  = 0;
+	tcph->ack     = false;
+	tcph->syn     = false;
+	tcph->rst     = true;
+	tcph->seq     = oth->ack_seq;
+	tcph->ack_seq = oth->seq;
+
+	return true;
+}
+
 static void tarpit_tcp(struct sk_buff *oldskb, unsigned int hook,
     unsigned int mode)
 {
@@ -205,12 +218,8 @@ static void tarpit_tcp(struct sk_buff *oldskb, unsigned int hook,
 		if (!xttarpit_honeypot(oth, tcph, payload))
 			return;
 	} else if (mode == XTTARPIT_RESET) {
-		tcph->window  = 0;
-		tcph->ack     = false;
-		tcph->syn     = false;
-		tcph->rst     = true;
-		tcph->seq     = oth->ack_seq;
-		tcph->ack_seq = oth->seq;
+		if (!xttarpit_reset(oth, tcph))
+			return;
 	}
 
 	/* Adjust TCP checksum */
-- 
1.7.0.4
next prev parent reply	other threads:[~2012-07-08 18:11 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-08 18:11 [PATCH v2 0/6] IPv6 tarpit support Josh Hunt
2012-07-08 18:11 ` [PATCH v2 1/6] netfilter: tarpit: Move XTTARPIT_TARPIT mode processing to its own function Josh Hunt
2012-07-08 18:11 ` [PATCH v2 2/6] netfilter: tarpit: Move XTTARPIT_HONEYPOT mode into " Josh Hunt
2012-07-08 18:11 ` Josh Hunt [this message]
2012-07-08 18:11 ` [PATCH v2 4/6] netfilter: tarpit: Make tarpit code generic Josh Hunt
2012-07-08 18:11 ` [PATCH v2 5/6] netfilter: tarpit: Add IPv6 support Josh Hunt
2012-07-08 19:36   ` Jan Engelhardt
2012-07-09 14:02     ` Josh Hunt
2012-07-09 16:58       ` Jan Engelhardt
2012-07-09 17:28         ` Josh Hunt
2012-07-09 18:46           ` Jan Engelhardt
2012-07-09 19:05             ` Josh Hunt
2012-07-09 20:22             ` Maciej Żenczykowski
2012-07-08 18:11 ` [PATCH v2 6/6] netfilter: tarpit: Enable IPv6 userspace support Josh Hunt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox
  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):
  git send-email \
    --in-reply-to=1341771085-5771-4-git-send-email-johunt@akamai.com \
    --to=johunt@akamai.com \
    --cc=jengelh@inai.de \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY
  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
  Be sure your reply has a Subject: header at the top and a blank line
  before the message body.
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).