netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: pwouters@redhat.com, fweimer@redhat.com
Subject: [PATCH conntrackd 6/8] conntrackd: simplify branch in tcp_accept()
Date: Tue, 18 Aug 2015 19:28:37 +0200	[thread overview]
Message-ID: <1439918919-6937-7-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1439918919-6937-1-git-send-email-pablo@netfilter.org>

The same code is executed regardless the reason why accept() has failed.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 src/tcp.c |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/tcp.c b/src/tcp.c
index af27c46..c8f2544 100644
--- a/src/tcp.c
+++ b/src/tcp.c
@@ -247,13 +247,11 @@ int tcp_accept(struct tcp_sock *m)
 	/* the other peer wants to connect ... */
 	ret = accept(m->fd, NULL, NULL);
 	if (ret == -1) {
-		if (errno != EAGAIN) {
-			/* unexpected error. Give us another try. */
-			m->state = TCP_SERVER_ACCEPTING;
-		} else {
-			/* waiting for new connections. */
-			m->state = TCP_SERVER_ACCEPTING;
-		}
+		/* unexpected error: Give us another try. Or we have hit
+ 		 * -EAGAIN, in that case we remain in the accepting connections
+		 * state.
+		 */
+		m->state = TCP_SERVER_ACCEPTING;
 	} else {
 		/* the peer finally got connected. */
 		if (fcntl(ret, F_SETFL, O_NONBLOCK) == -1) {
-- 
1.7.10.4


  parent reply	other threads:[~2015-08-18 17:22 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-18 17:28 [PATCH conntrackd 0/8] unsorted fixes Pablo Neira Ayuso
2015-08-18 17:28 ` [PATCH conntrackd 1/8] conntrackd: fix sanitization of expection attribute in the wire format Pablo Neira Ayuso
2015-08-18 17:28 ` [PATCH conntrackd 2/8] conntrackd: NTA_MAX is also an invalid attribute Pablo Neira Ayuso
2015-08-18 17:28 ` [PATCH conntrackd 3/8] conntrackd: fix leak in fork_process_new() Pablo Neira Ayuso
2015-08-18 17:28 ` [PATCH conntrackd 4/8] conntrackd: fix descriptor leak in do_local_request() Pablo Neira Ayuso
2015-08-18 17:28 ` [PATCH conntrackd 5/8] conntrackd: fix error handling in nfq_queue_cb() Pablo Neira Ayuso
2015-08-18 17:28 ` Pablo Neira Ayuso [this message]
2015-08-18 17:28 ` [PATCH conntrackd 7/8] conntrackd: use strncpy to set up the cache name Pablo Neira Ayuso
2015-08-18 17:28 ` [PATCH conntrackd 8/8] conntrackd: missing break in expectation message parser function Pablo Neira Ayuso

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=1439918919-6937-7-git-send-email-pablo@netfilter.org \
    --to=pablo@netfilter.org \
    --cc=fweimer@redhat.com \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=pwouters@redhat.com \
    /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).