Change header file guard names.

[mLib] / conn.h

diff --git a/conn.h b/conn.h
index 09fb723ee71a190d073506f60581a72f8233187b..58a96a8e185315ef6009f08b38fac632948bb674 100644 (file)
--- a/conn.h
+++ b/conn.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: conn.h,v 1.2 1999/05/15 10:33:32 mdw Exp $
+ * $Id: conn.h,v 1.5 1999/12/10 23:42:04 mdw Exp $
  *
  * Nonblocking connect handling
  *
@@ -30,6 +30,16 @@
 /*----- 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.
  *
@@ -38,8 +48,8 @@
  *
  */
 
-#ifndef CONN_H
-#define CONN_H
+#ifndef MLIB_CONN_H
+#define MLIB_CONN_H
 
 #ifdef __cplusplus
   extern "C" {
@@ -47,7 +57,10 @@
 
 /*----- Header files ------------------------------------------------------*/
 
-#ifndef SEL_H
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#ifndef MLIB_SEL_H
 #  include "sel.h"
 #endif
 
@@ -67,29 +80,25 @@ typedef struct conn {
  *
  * Arguments:  @conn *c@ = pointer to connection block
  *             @sel_state *s@ = pointer to select state to attach to
- *             @unsigned long saddr@ = source IP address
- *             @unsigned short sport@ = source port
- *             @unsigned long daddr@ = destination IP address
- *             @unsigned short dport@ = destination port
+ *             @int fd@ = file descriptor of socket to connect
+ *             @struct sockaddr *dst@ = destination address
+ *             @int dsz@ = size of destination address
  *             @void (*func)(int fd, void *p) = handler function
  *             @void *p@ = argument for the handler function
  *
  * Returns:    ---
  *
- * Use:                Sets up a nonblocking connect job.  The source address and
- *             port can be zero if you don't care.  When the connection
- *             completes, the handler function is called with the connected
- *             socket as an argument.  If the connect fails rather than
- *             completes, the handler is informed of this by being passed a
- *             negative file descriptor.  In either case, the select job is
- *             then removed.
+ * Use:                Sets up a nonblocking connect job.  The socket should already
+ *             be bound if you care about that sort of thing.  When the
+ *             connection completes, the handler function is called with the
+ *             connected socket as an argument.  If the connect fails rather
+ *             than completes, the socket is closed, and the handler is
+ *             informed of this by being passed a negative file descriptor.
+ *             In either case, the select job is then removed.
  */
 
-extern void conn_init(conn */*c*/, sel_state */*s*/,
-                     unsigned long /*saddr*/,
-                     unsigned short /*sport*/,
-                     unsigned long /*daddr*/,
-                     unsigned long /*dport*/,
+extern void conn_init(conn */*c*/, sel_state */*s*/, int /*fd*/,
+                     struct sockaddr */*dst*/, int /*dsz*/,
                      void (*/*func*/)(int /*fd*/, void */*p*/),
                      void */*p*/);