X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/5feb52afba684ae49cc96f66fd62fc190c251b92..e11cc637d79ffc9117d637489da7f75db7193bc4:/conn.c

diff --git a/conn.c b/conn.c
index 476cff9..7de477b 100644
--- a/conn.c
+++ b/conn.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: conn.c,v 1.3 1999/05/23 12:12:37 mdw Exp $
+ * $Id: conn.c,v 1.10 2004/04/08 01:36:11 mdw Exp $
  *
  * Nonblocking connect handling
  *
  * (c) 1999 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of the mLib utilities library.
  *
@@ -15,33 +15,18 @@
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- * 
+ *
  * mLib is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Library General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Library General Public
  * License along with mLib; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: conn.c,v $
- * Revision 1.3  1999/05/23 12:12:37  mdw
- * Interface change to make the `conn' selector useful for generic stream
- * sockets rather than just IPv4 ones.
- *
- * Revision 1.2  1999/05/15 10:33:32  mdw
- * Fix copyright notices.
- *
- * Revision 1.1  1999/05/14 21:01:14  mdw
- * Integrated `select' handling bits from the background resolver project.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include <errno.h>
@@ -80,19 +65,43 @@ static void conn_connect(int fd, unsigned mode, void *p)
 
   conn *c = p;
   char buf[PATH_MAX + 8]; /* Big enough */
-  int sinsz;
+  size_t sinsz;
 
   sinsz = sizeof(buf);
+  sel_rmfile(&c->writer);
   if (getpeername(fd, (struct sockaddr *)buf, &sinsz) < 0) {
     int err;
-    int errsz = sizeof(err);
+    size_t errsz = sizeof(err);
     if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &err, &errsz) == 0)
       errno = err;
-    c->func(-1, c->p);
     close(fd);
+    c->func(-1, c->p);
   } else
     c->func(fd, c->p);
-  sel_rmfile(&c->writer);
+}
+
+/* --- @conn_fd@ --- *
+ *
+ * Arguments:	@conn *c@ = pointer to connection block
+ *		@sel_state *s@ = pointer to select state to attach to
+ *		@int fd@ = file descriptor of socket
+ *		@void (*func)(int fd, void *p) = handler function
+ *		@void *p@ = argument for the handler function
+ *
+ * Returns:	---
+ *
+ * Use:		Sets up a nonblocking connect job.  The socket should have a
+ *		connect pending for it already.
+ */
+
+void conn_fd(conn *c, sel_state *s, int fd,
+	     void (*func)(int /*fd*/, void */*p*/),
+	     void *p)
+{
+  c->func = func;
+  c->p = p;
+  sel_initfile(s, &c->writer, fd, SEL_WRITE, conn_connect, c);
+  sel_addfile(&c->writer);
 }
 
 /* --- @conn_init@ --- *
@@ -105,7 +114,7 @@ static void conn_connect(int fd, unsigned mode, void *p)
  *		@void (*func)(int fd, void *p) = handler function
  *		@void *p@ = argument for the handler function
  *
- * Returns:	---
+ * Returns:	Zero on success, nonzero on failure.
  *
  * Use:		Sets up a nonblocking connect job.  The socket should already
  *		be bound if you care about that sort of thing.  When the
@@ -116,34 +125,27 @@ static void conn_connect(int fd, unsigned mode, void *p)
  *		In either case, the select job is then removed.
  */
 
-void conn_init(conn *c, sel_state *s, int fd,
-	       struct sockaddr *dst, int dsz,
-	       void (*func)(int /*fd*/, void */*p*/),
-	       void *p)
+int conn_init(conn *c, sel_state *s, int fd,
+	      struct sockaddr *dst, int dsz,
+	      void (*func)(int /*fd*/, void */*p*/),
+	      void *p)
 {
   int f;
 
-  if ((f = fcntl(fd, F_GETFL)) < 0 ||
-      fcntl(fd, F_SETFL, f | O_NONBLOCK))
+  if ((f = fcntl(fd, F_GETFL)) < 0 || fcntl(fd, F_SETFL, f | O_NONBLOCK))
     goto fail;
 
-  if (connect(fd, dst, dsz) < 0) {
-    if (errno != EINPROGRESS)
-      goto fail;
-    c->func = func;
-    c->p = p;
-    sel_initfile(s, &c->writer, fd, SEL_WRITE, conn_connect, c);
-    sel_addfile(&c->writer);
-  } else
+  if (!connect(fd, dst, dsz))
     func(fd, p);
-
-  return;
-
-  /* --- Something went pear-shaped --- */
+  else if (errno != EINPROGRESS)
+    goto fail;
+  else
+    conn_fd(c, s, fd, func, p);
+  return (0);
 
 fail:
   close(fd);
-  func(-1, p);
+  return (-1);
 }
 
 /* --- @conn_kill@ --- *