X-Git-Url: https://git.distorted.org.uk/~mdw/mLib/blobdiff_plain/c6e0eaf00cd09a4e5237e70d8351049ec91d7653..04924ac3cbcf3fc05e1e36c98b99ae479cbfed8e:/conn.h?ds=sidebyside

diff --git a/conn.h b/conn.h
index 58a96a8..bee4fce 100644
--- a/conn.h
+++ b/conn.h
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: conn.h,v 1.5 1999/12/10 23:42:04 mdw Exp $
+ * $Id: conn.h,v 1.8 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,39 +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.h,v $
- * Revision 1.5  1999/12/10 23:42:04  mdw
- * Change header file guard names.
- *
- * Revision 1.4  1999/05/26 21:08:01  mdw
- * Remove redundant structure member.
- *
- * Revision 1.3  1999/05/23 12:12:46  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.
- *
- */
-
 #ifndef MLIB_CONN_H
 #define MLIB_CONN_H
 
@@ -76,6 +55,24 @@ typedef struct conn {
 
 /*----- Functions provided ------------------------------------------------*/
 
+/* --- @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*/);
+
 /* --- @conn_init@ --- *
  *
  * Arguments:	@conn *c@ = pointer to connection block
@@ -86,7 +83,7 @@ typedef struct conn {
  *		@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
@@ -97,10 +94,10 @@ typedef struct conn {
  *		In either case, the select job is then removed.
  */
 
-extern void conn_init(conn */*c*/, sel_state */*s*/, int /*fd*/,
-		      struct sockaddr */*dst*/, int /*dsz*/,
-		      void (*/*func*/)(int /*fd*/, void */*p*/),
-		      void */*p*/);
+extern int conn_init(conn */*c*/, sel_state */*s*/, int /*fd*/,
+		     struct sockaddr */*dst*/, int /*dsz*/,
+		     void (*/*func*/)(int /*fd*/, void */*p*/),
+		     void */*p*/);
 
 /* --- @conn_kill@ --- *
  *