X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/97f65b001294338abed02a7b132d6be6517b3f1d..759ef658680949d37f3bb3589804e85fae0596f7:/conn.c diff --git a/conn.c b/conn.c index 6ce7769..1478fad 100644 --- a/conn.c +++ b/conn.c @@ -1,10 +1,10 @@ /* -*-c-*- * - * $Id: conn.c,v 1.1 1999/05/14 21:01:14 mdw Exp $ + * $Id: conn.c,v 1.9 2003/10/12 14:54:00 mdw Exp $ * * Nonblocking connect handling * - * (c) 1999 Mark Wooding + * (c) 1999 Straylight/Edgeware */ /*----- Licensing notice --------------------------------------------------* @@ -30,6 +30,36 @@ /*----- Revision history --------------------------------------------------* * * $Log: conn.c,v $ + * Revision 1.9 2003/10/12 14:54:00 mdw + * Finish the work. + * + * 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. + * + * Revision 1.6 2001/06/22 19:35:20 mdw + * Interface change to @conn_init@ -- return error rather than calling the + * function. This reduces the number of different environments the + * callback has to cope with, and the old behaviour is easily simulatable + * with the new, while simulating the new behaviour was awkward and + * painful. + * + * Revision 1.5 2000/10/08 11:17:26 mdw + * (conn_connect): Change sizes to be @size_t@. + * + * Revision 1.4 1999/07/26 23:21:02 mdw + * Bug fix: remove the selector before doing the callback, in case client + * adds a writer for the connected socket. + * + * 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. + * * Revision 1.1 1999/05/14 21:01:14 mdw * Integrated `select' handling bits from the background resolver project. * @@ -38,14 +68,13 @@ /*----- Header files ------------------------------------------------------*/ #include +#include #include #include #include #include - #include -#include #include #include @@ -68,108 +97,93 @@ 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; - int sinsz; + char buf[PATH_MAX + 8]; /* Big enough */ + size_t sinsz; - sinsz = sizeof(sin); - if (getpeername(fd, (struct sockaddr *)&sin, &sinsz) < 0) { + sinsz = sizeof(buf); + sel_rmfile(&c->writer); + if (getpeername(fd, (struct sockaddr *)buf, &sinsz) < 0) { int err; - int errsz = sizeof(err); + size_t errsz = sizeof(err); if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &err, &errsz) == 0) errno = err; - c->func(-1, c->p); close(fd); + c->func(-1, c->p); } else c->func(fd, c->p); - sel_rmfile(&c->writer); } -/* --- @conn_init@ --- * +/* --- @conn_fd@ --- * * * 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 * @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 have a + * connect pending for it already. */ -void conn_init(conn *c, sel_state *s, - unsigned long saddr, - unsigned short sport, - unsigned long daddr, - unsigned long dport, - void (*func)(int /*fd*/, void */*p*/), - void *p) +void conn_fd(conn *c, sel_state *s, int fd, + void (*func)(int /*fd*/, void */*p*/), + void *p) { - int fd; - - /* --- Make a socket to do the connecting with --- */ - - c->writer.fd = -1; - if ((fd = socket(PF_INET, SOCK_STREAM, 0)) < 0) - 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; - } + c->func = func; + c->p = p; + sel_initfile(s, &c->writer, fd, SEL_WRITE, conn_connect, c); + sel_addfile(&c->writer); +} - /* --- 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); - } +/* --- @conn_init@ --- * + * + * Arguments: @conn *c@ = pointer to connection block + * @sel_state *s@ = pointer to select state to attach to + * @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: 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 + * 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. + */ - /* --- Everything is set up now --- */ +int conn_init(conn *c, sel_state *s, int fd, + struct sockaddr *dst, int dsz, + void (*func)(int /*fd*/, void */*p*/), + void *p) +{ + int f; - return; + if ((f = fcntl(fd, F_GETFL)) < 0 || fcntl(fd, F_SETFL, f | O_NONBLOCK)) + goto fail; - /* --- Something went pear-shaped --- */ + if (!connect(fd, dst, dsz)) + func(fd, p); + else if (errno != EINPROGRESS) + goto fail; + else + conn_fd(c, s, fd, func, p); + return (0); -fail_close: - close(fd); fail: - func(-1, p); + close(fd); + return (-1); } /* --- @conn_kill@ --- *