X-Git-Url: https://git.distorted.org.uk/~mdw/fwd/blobdiff_plain/ee599f5566c155b4decd9c77bfa4d6212f20891e..096c89c34505cadba1fc6e7a5367273d5c5bea47:/socket.c diff --git a/socket.c b/socket.c index bbc1f9e..a1a9a55 100644 --- a/socket.c +++ b/socket.c @@ -1,107 +1,30 @@ /* -*-c-*- * - * $Id: socket.c,v 1.11 2003/11/29 20:36:07 mdw Exp $ - * * Socket source and target definitions * * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * - * This file is part of the `fw' port forwarder. + * This file is part of the `fwd' port forwarder. * - * `fw' is free software; you can redistribute it and/or modify + * `fwd' is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * - * `fw' is distributed in the hope that it will be useful, + * + * `fwd' 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 General Public License for more details. - * + * * You should have received a copy of the GNU General Public License - * along with `fw'; if not, write to the Free Software Foundation, + * along with `fwd'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/*----- Revision history --------------------------------------------------* - * - * $Log: socket.c,v $ - * Revision 1.11 2003/11/29 20:36:07 mdw - * Privileged outgoing connections. - * - * Revision 1.10 2003/11/25 14:08:23 mdw - * Debianization. Socket target options. Internet binding. - * - * Revision 1.9 2002/02/23 00:08:00 mdw - * Fix stupid bugs from the listen(2) change. - * - * Revision 1.8 2002/02/22 23:44:44 mdw - * Call @xfree@ rather than @free@. Add option to change the listen(2) - * parameter. - * - * Revision 1.7 2001/06/22 19:37:00 mdw - * New @conn_init@ interface. - * - * Revision 1.6 2001/02/03 20:30:03 mdw - * Support re-reading config files on SIGHUP. - * - * Revision 1.5 2000/03/23 23:20:42 mdw - * Remove listener even if connection option isn't SOCKOPT_LIMITED. - * - * Revision 1.4 1999/12/22 15:44:25 mdw - * Fix log message. - * - * Revision 1.3 1999/10/22 22:48:36 mdw - * New connection options: unlimited concurrent connections, and one-shot - * listening sockets. - * - * Revision 1.2 1999/07/27 18:30:53 mdw - * Various minor portability fixes. - * - * Revision 1.1 1999/07/26 23:33:32 mdw - * New sources and targets. - * - */ - -/*----- Header files ------------------------------------------------------*/ - -#include "config.h" - -#include -#include -#include -#include -#include -#include - -#include -#include - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#include "addr.h" -#include "conf.h" -#include "endpt.h" -#include "fw.h" -#include "scan.h" -#include "socket.h" -#include "target.h" - -#include "inet.h" -#include "un.h" +#include "fwd.h" /*----- Data structures ---------------------------------------------------*/ @@ -111,9 +34,10 @@ typedef struct ssource_opts { unsigned opt; unsigned conn; unsigned listen; + unsigned naccept; } ssource_opts; -static ssource_opts ssgo = { 256, 0, 5 }; +static ssource_opts ssgo = { 256, 0, 5, 1 }; #define SOCKOPT_LIMIT 0u #define SOCKOPT_NOLIMIT 1u @@ -301,7 +225,7 @@ void starget_connected(int fd, void *p) e->e.in = e->e.out = r; e->e.f &= ~EPF_PENDING; if (e->e.other) - endpt_join(&e->e, e->e.other); + endpt_join(&e->e, e->e.other, 0); } } @@ -367,6 +291,26 @@ static int ssource_option(source *s, scanner *sc) CONF_ACCEPT; } + if (strcmp(sc->d.buf, "accept") == 0 || + strcmp(sc->d.buf, "accept-count") == 0) { + token(sc); + if (sc->t == '=') + token(sc); + if (sc->t != CTOK_WORD) + error(sc, "parse error, expected `unlimited' or number"); + else if (isdigit((unsigned char)sc->d.buf[0])) { + sso->naccept = atoi(sc->d.buf); + if (sso->naccept == 0) + error(sc, "argument of `accept-count' must be positive"); + } else { + sso->naccept = 0; + conf_enum(sc, "unlimited,infinite", + ENUM_ABBREV, "`accept-count' option"); + } + token(sc); + CONF_ACCEPT; + } + if (strcmp(sc->d.buf, "logging") == 0 || strcmp(sc->d.buf, "log") == 0) { addr_opts *ao = ss ? ss->ao : &gsao; @@ -439,66 +383,79 @@ static void ss_accept(int fd, unsigned mode, void *p) ssept *e; endpt *ee; reffd *r; + int acceptp = 1; + unsigned i = 0; - /* --- Make the file descriptor --- */ - - { - int opt = 1; - if ((r = ss->a->ops->accept(fd, ss->ao, ss->s.desc)) == 0) - return; - setsockopt(r->fd, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(opt)); - fdflags(r->fd, O_NONBLOCK, O_NONBLOCK, FD_CLOEXEC, FD_CLOEXEC); - } + while (acceptp) { - /* --- Make an endpoint --- */ + /* --- Make the file descriptor --- */ - e = CREATE(ssept); - e->e.ops = &ssept_ops; - e->e.other = 0; - e->e.f = EPF_FILE; - e->e.t = 0; - e->e.in = e->e.out = r; - e->s = ss; - REFFD_INC(r); + { + int opt = 1; + if ((r = ss->a->ops->accept(fd, ss->ao, ss->s.desc)) == 0) + return; + setsockopt(r->fd, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(opt)); + fdflags(r->fd, O_NONBLOCK, O_NONBLOCK, FD_CLOEXEC, FD_CLOEXEC); + } - /* --- Obtain the target endpoint and let rip --- */ + /* --- Make an endpoint --- */ - if ((ee = ss->t->ops->create(ss->t, ss->s.desc)) == 0) { - REFFD_DEC(r); - REFFD_DEC(r); - DESTROY(e); - return; - } - fw_inc(); + e = CREATE(ssept); + e->e.ops = &ssept_ops; + e->e.other = 0; + e->e.f = EPF_FILE; + e->e.t = 0; + e->e.in = e->e.out = r; + e->s = ss; + REFFD_INC(r); - /* --- Remove the listening socket if necessary --- */ + /* --- Obtain the target endpoint and let rip --- */ - switch (ss->o.opt) { - case SOCKOPT_LIMIT: - ss->o.conn--; - if (!ss->o.conn) { - if (!(ss->ao->f & ADDRF_NOLOG)) - fw_log(-1, "[%s] maximum connections reached", ss->s.desc); + if ((ee = ss->t->ops->create(ss->t, ss->s.desc)) == 0) { + REFFD_DEC(r); + REFFD_DEC(r); + DESTROY(e); + return; + } + fw_inc(); + + /* --- Note that we've done one --- */ + + i++; + if (i >= ss->o.naccept) + acceptp = 0; + + /* --- Remove the listening socket if necessary --- */ + + switch (ss->o.opt) { + case SOCKOPT_LIMIT: + ss->o.conn--; + if (!ss->o.conn) { + if (!(ss->ao->f & ADDRF_NOLOG)) + fw_log(-1, "[%s] maximum connections reached", ss->s.desc); + sel_rmfile(&ss->r); + close(ss->r.fd); + if (ss->a->ops->unbind) + ss->a->ops->unbind(ss->a); + acceptp = 0; + } + break; + case SOCKOPT_NOLIMIT: + break; + case SOCKOPT_ONESHOT: sel_rmfile(&ss->r); close(ss->r.fd); if (ss->a->ops->unbind) ss->a->ops->unbind(ss->a); - } - break; - case SOCKOPT_NOLIMIT: - break; - case SOCKOPT_ONESHOT: - sel_rmfile(&ss->r); - close(ss->r.fd); - if (ss->a->ops->unbind) - ss->a->ops->unbind(ss->a); - ssource_destroy(&ss->s); - break; - } + ssource_destroy(&ss->s); + acceptp = 0; + break; + } - /* --- Let everything else happen --- */ + /* --- Let everything else happen --- */ - endpt_join(&e->e, ee); + endpt_join(&e->e, ee, ss->s.desc); + } } /* --- @ss_listen@ --- * @@ -673,9 +630,10 @@ static target *starget_read(scanner *sc) st->a = getaddr(sc, ADDR_DEST); if (st->a->ops->inittargopts) st->ao = st->a->ops->inittargopts(); - else + else { st->ao = CREATE(addr_opts); - *st->ao = gtao; + *st->ao = gtao; + } dstr_puts(&d, "socket."); st->a->ops->print(st->a, ADDR_DEST, &d); st->t.desc = xstrdup(d.buf);