From f128ce74b099a6ae43801f4109575feeea328de4 Mon Sep 17 00:00:00 2001
Message-Id: <f128ce74b099a6ae43801f4109575feeea328de4.1714050211.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Sun, 12 Oct 2003 14:47:10 +0000
Subject: [PATCH] New interface for messing with preconnected sockets.
Organization: Straylight/Edgeware

From: mdw <mdw>

---
 conn.c | 50 ++++++++++++++++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/conn.c b/conn.c
index 081b6fc..e734f30 100644
--- a/conn.c
+++ b/conn.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: conn.c,v 1.7 2002/01/13 13:28:44 mdw Exp $
+ * $Id: conn.c,v 1.8 2003/10/12 14:47:10 mdw Exp $
  *
  * Nonblocking connect handling
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: conn.c,v $
+ * Revision 1.8  2003/10/12 14:47:10  mdw
+ * New interface for messing with preconnected sockets.
+ *
  * Revision 1.7  2002/01/13 13:28:44  mdw
  * Rearrange @conn_init@ to be a bit more comprehensible.
  *
@@ -112,6 +115,30 @@ static void conn_connect(int fd, unsigned mode, void *p)
     c->func(fd, c->p);
 }
 
+/* --- @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@ --- *
  *
  * Arguments:	@conn *c@ = pointer to connection block
@@ -140,27 +167,18 @@ int conn_init(conn *c, sel_state *s, int fd,
 {
   int f;
 
-  if ((f = fcntl(fd, F_GETFL)) < 0 ||
-      fcntl(fd, F_SETFL, f | O_NONBLOCK))
-    goto fail;
+  if ((f = fcntl(fd, F_GETFL)) < 0 || fcntl(fd, F_SETFL, f | O_NONBLOCK)) {
+    close(fd);
+    return (-1);
+  }
 
   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
+    conn_fd(c, s, fd, func, p);
   return (0);
-
-  /* --- Something went pear-shaped --- */
-
-fail:
-  close(fd);
-  return (-1);
 }
 
 /* --- @conn_kill@ --- *
-- 
[mdw]