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

diff --git a/conn.h b/conn.h
index e70595c..81f381e 100644
--- a/conn.h
+++ b/conn.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: conn.h,v 1.3 1999/05/23 12:12:46 mdw Exp $
+ * $Id: conn.h,v 1.8 2004/04/08 01:36:11 mdw Exp $
  *
  * Nonblocking connect handling
  *
@@ -27,23 +27,8 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: conn.h,v $
- * 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 CONN_H
-#define CONN_H
+#ifndef MLIB_CONN_H
+#define MLIB_CONN_H
 
 #ifdef __cplusplus
   extern "C" {
@@ -54,7 +39,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#ifndef SEL_H
+#ifndef MLIB_SEL_H
 #  include "sel.h"
 #endif
 
@@ -65,12 +50,29 @@
 typedef struct conn {
   sel_file writer;			/* Select listener */
   void (*func)(int /*fd*/, void */*p*/); /* Handler function */
-  int dsz;				/* Size of destination address */
   void *p;				/* Argument for handler function */
 } 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
@@ -81,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
@@ -92,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@ --- *
  *