From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Tue, 3 Nov 2015 10:27:27 +0000 (+0100)
Subject: IO: Fix the previous bugfix
X-Git-Tag: v1.6.0~27^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3aed0a6ff7b2b811a535202fd787281d2ac33409;p=thirdparty%2Fbird.git

IO: Fix the previous bugfix

I should check it after making some trivial changes. The original patch
from Alexander has it right.
---

diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index 726f1e49e..b636e7997 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -1309,16 +1309,6 @@ sk_passive_connected(sock *s, int type)
     return 0;
   }
 
-  if (fd >= FD_SETSIZE)
-  {
-    /* FIXME: Call err_hook instead ? */
-    log(L_ERR "SOCK: Incoming connection from %I%J (port %d) %s",
-	t->daddr, ipa_is_link_local(t->daddr) ? t->iface : NULL,
-	t->dport, "rejected due to FD_SETSIZE limit");
-    close(fd);
-    return 1;
-  }
-
   sock *t = sk_new(s->pool);
   t->type = type;
   t->fd = fd;
@@ -1338,6 +1328,18 @@ sk_passive_connected(sock *s, int type)
       log(L_WARN "SOCK: Cannot get remote IP address for TCP<");
   }
 
+  if (fd >= FD_SETSIZE)
+  {
+    /* FIXME: Call err_hook instead ? */
+    log(L_ERR "SOCK: Incoming connection from %I%J (port %d) %s",
+	t->daddr, ipa_is_link_local(t->daddr) ? t->iface : NULL,
+	t->dport, "rejected due to FD_SETSIZE limit");
+    close(fd);
+    t->fd = -1;
+    rfree(t);
+    return 1;
+  }
+
   if (sk_setup(t) < 0)
   {
     /* FIXME: Call err_hook instead ? */