/* -*-c-*-
*
- * $Id: conn.c,v 1.2 1999/05/15 10:33:32 mdw Exp $
+ * $Id: conn.c,v 1.3 1999/05/23 12:12:37 mdw Exp $
*
* Nonblocking connect handling
*
/*----- Revision history --------------------------------------------------*
*
* $Log: conn.c,v $
+ * 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.
+ *
* Revision 1.2 1999/05/15 10:33:32 mdw
* Fix copyright notices.
*
/*----- Header files ------------------------------------------------------*/
#include <errno.h>
+#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
-
#include <sys/socket.h>
-#include <netinet/in.h>
#include <unistd.h>
#include <fcntl.h>
static void conn_connect(int fd, unsigned mode, void *p)
{
+#ifndef PATH_MAX
+# define PATH_MAX 1024
+#endif
+
conn *c = p;
- struct sockaddr_in sin;
+ char buf[PATH_MAX + 8]; /* Big enough */
int sinsz;
- sinsz = sizeof(sin);
- if (getpeername(fd, (struct sockaddr *)&sin, &sinsz) < 0) {
+ sinsz = sizeof(buf);
+ if (getpeername(fd, (struct sockaddr *)buf, &sinsz) < 0) {
int err;
int errsz = sizeof(err);
if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &err, &errsz) == 0)
*
* 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.
+ * 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.
*/
-void conn_init(conn *c, sel_state *s,
- unsigned long saddr,
- unsigned short sport,
- unsigned long daddr,
- unsigned long dport,
+void conn_init(conn *c, sel_state *s, int fd,
+ struct sockaddr *dst, int dsz,
void (*func)(int /*fd*/, void */*p*/),
void *p)
{
- int fd;
+ int f;
- /* --- Make a socket to do the connecting with --- */
-
- c->writer.fd = -1;
- if ((fd = socket(PF_INET, SOCK_STREAM, 0)) < 0)
+ if ((f = fcntl(fd, F_GETFL)) < 0 ||
+ fcntl(fd, F_SETFL, f | O_NONBLOCK))
goto fail;
- /* --- Make the socket nonblocking --- */
-
- {
- int f;
-
- if ((f = fcntl(fd, F_GETFL)) < 0 ||
- fcntl(fd, F_SETFL, f | O_NONBLOCK))
- goto fail_close;
- }
-
- /* --- Set up the source address and bind it to the socket --- */
-
- {
- struct sockaddr_in sin;
-
- memset(&sin, 0, sizeof(sin));
- sin.sin_family = AF_INET;
- sin.sin_addr.s_addr = saddr;
- sin.sin_port = sport;
- if (bind(fd, (struct sockaddr *)&sin, sizeof(sin)) < 0)
- goto fail_close;
- }
-
- /* --- Finally, set up the destination and try the connect --- */
-
- {
- struct sockaddr_in sin;
-
- memset(&sin, 0, sizeof(sin));
- sin.sin_family = AF_INET;
- sin.sin_addr.s_addr = daddr;
- sin.sin_port = dport;
- if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
- if (errno != EINPROGRESS)
- goto fail_close;
- 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);
- }
-
- /* --- Everything is set up now --- */
+ if (connect(fd, dst, dsz) < 0) {
+ if (errno != EINPROGRESS)
+ goto fail;
+ 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;
/* --- Something went pear-shaped --- */
-fail_close:
- close(fd);
fail:
+ close(fd);
func(-1, p);
}
/* -*-c-*-
*
- * $Id: conn.h,v 1.2 1999/05/15 10:33:32 mdw Exp $
+ * $Id: conn.h,v 1.3 1999/05/23 12:12:46 mdw Exp $
*
* Nonblocking connect handling
*
/*----- 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.
*
/*----- Header files ------------------------------------------------------*/
+#include <sys/types.h>
+#include <sys/socket.h>
+
#ifndef SEL_H
# include "sel.h"
#endif
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;
*
* 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*/);
~mdw / mLib / commitdiff