X-Git-Url: https://git.distorted.org.uk/~mdw/mLib/blobdiff_plain/5feb52afba684ae49cc96f66fd62fc190c251b92..c9bb3f9e38564a6bce4b4d1bd9b3086c78ef3351:/conn.c

diff --git a/conn.c b/conn.c
index 476cff9..081b6fc 100644
--- a/conn.c
+++ b/conn.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: conn.c,v 1.3 1999/05/23 12:12:37 mdw Exp $
+ * $Id: conn.c,v 1.7 2002/01/13 13:28:44 mdw Exp $
  *
  * Nonblocking connect handling
  *
@@ -30,6 +30,23 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: conn.c,v $
+ * Revision 1.7  2002/01/13 13:28:44  mdw
+ * Rearrange @conn_init@ to be a bit more comprehensible.
+ *
+ * Revision 1.6  2001/06/22 19:35:20  mdw
+ * Interface change to @conn_init@ -- return error rather than calling the
+ * function.  This reduces the number of different environments the
+ * callback has to cope with, and the old behaviour is easily simulatable
+ * with the new, while simulating the new behaviour was awkward and
+ * painful.
+ *
+ * Revision 1.5  2000/10/08 11:17:26  mdw
+ * (conn_connect): Change sizes to be @size_t@.
+ *
+ * Revision 1.4  1999/07/26 23:21:02  mdw
+ * Bug fix: remove the selector before doing the callback, in case client
+ * adds a writer for the connected socket.
+ *
  * 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.
@@ -80,19 +97,19 @@ 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_init@ --- *
@@ -105,7 +122,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,10 +133,10 @@ 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;
 
@@ -127,23 +144,23 @@ void conn_init(conn *c, sel_state *s, int fd,
       fcntl(fd, F_SETFL, f | O_NONBLOCK))
     goto fail;
 
-  if (connect(fd, dst, dsz) < 0) {
-    if (errno != EINPROGRESS)
-      goto fail;
+  if (!connect(fd, dst, dsz))
+    func(fd, p);
+  else if (errno != EINPROGRESS)
+    goto fail;
+  else {
     c->func = func;
     c->p = p;
     sel_initfile(s, &c->writer, fd, SEL_WRITE, conn_connect, c);
     sel_addfile(&c->writer);
-  } else
-    func(fd, p);
-
-  return;
+  }
+  return (0);
 
   /* --- Something went pear-shaped --- */
 
 fail:
   close(fd);
-  func(-1, p);
+  return (-1);
 }
 
 /* --- @conn_kill@ --- *