From: mdw Date: Fri, 22 Feb 2002 23:45:20 +0000 (+0000) Subject: Add option to change the listen(2) parameter. Receive `fw'-specific X-Git-Tag: 1.2.6~7 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/fwd/commitdiff_plain/8c0a939ecd6c4b75271c65281e53ce78c37a57fe Add option to change the listen(2) parameter. Receive `fw'-specific code from `conf.c'. --- diff --git a/fw.c b/fw.c index a53d515..c2c345c 100644 --- a/fw.c +++ b/fw.c @@ -1,6 +1,6 @@ /* -*-c-*- * - * $Id: fw.c,v 1.12 2002/01/13 14:49:17 mdw Exp $ + * $Id: fw.c,v 1.13 2002/02/22 23:45:20 mdw Exp $ * * Port forwarding thingy * @@ -29,6 +29,10 @@ /*----- Revision history --------------------------------------------------* * * $Log: fw.c,v $ + * Revision 1.13 2002/02/22 23:45:20 mdw + * Add option to change the listen(2) parameter. Receive `fw'-specific + * code from `conf.c'. + * * Revision 1.12 2002/01/13 14:49:17 mdw * Track @dstr_vputf@ change. * @@ -103,8 +107,10 @@ #include "endpt.h" #include "exec.h" #include "fattr.h" +#include "file.h" #include "fw.h" #include "scan.h" +#include "socket.h" #include "source.h" /*----- Global variables --------------------------------------------------*/ @@ -126,7 +132,179 @@ static conffile *conffiles = 0; /* List of configuration files */ #define FW_QUIET 2u #define FW_SET 4u -/*----- Main code ---------------------------------------------------------*/ +/*----- Configuration parsing ---------------------------------------------*/ + +/* --- @parse@ --- * + * + * Arguments: @scanner *sc@ = pointer to scanner definition + * + * Returns: --- + * + * Use: Parses a configuration file from the scanner. + */ + +static source_ops *sources[] = + { &xsource_ops, &fsource_ops, &ssource_ops, 0 }; +static target_ops *targets[] = + { &xtarget_ops, &ftarget_ops, &starget_ops, 0 }; + +void parse(scanner *sc) +{ + token(sc); + + for (;;) { + if (sc->t == CTOK_EOF) + break; + if (sc->t != CTOK_WORD) + error(sc, "parse error, keyword expected"); + + /* --- Handle a forwarding request --- */ + + if (strcmp(sc->d.buf, "forward") == 0 || + strcmp(sc->d.buf, "fw") == 0 || + strcmp(sc->d.buf, "from") == 0) { + source *s; + target *t; + + token(sc); + + /* --- Read a source description --- */ + + { + source_ops **sops; + + /* --- Try to find a source type which understands --- */ + + s = 0; + for (sops = sources; *sops; sops++) { + if ((s = (*sops)->read(sc)) != 0) + goto found_source; + } + error(sc, "unknown source name `%s'", sc->d.buf); + + /* --- Read any source-specific options --- */ + + found_source: + if (sc->t == '{') { + token(sc); + while (sc->t == CTOK_WORD) { + if (!s->ops->option || !s->ops->option(s, sc)) { + error(sc, "unknown %s source option `%s'", + s->ops->name, sc->d.buf); + } + if (sc->t == ';') + token(sc); + } + if (sc->t != '}') + error(sc, "parse error, missing `}'"); + token(sc); + } + } + + /* --- Read a destination description --- */ + + if (sc->t == CTOK_WORD && (strcmp(sc->d.buf, "to") == 0 || + strcmp(sc->d.buf, "->") == 0)) + token(sc); + + { + target_ops **tops; + + /* --- Try to find a target which understands --- */ + + t = 0; + for (tops = targets; *tops; tops++) { + if ((t = (*tops)->read(sc)) != 0) + goto found_target; + } + error(sc, "unknown target name `%s'", sc->d.buf); + + /* --- Read any target-specific options --- */ + + found_target: + if (sc->t == '{') { + token(sc); + while (sc->t == CTOK_WORD) { + if (!t->ops->option || !t->ops->option(t, sc)) { + error(sc, "unknown %s target option `%s'", + t->ops->name, sc->d.buf); + } + if (sc->t == ';') + token(sc); + } + if (sc->t != '}') + error(sc, "parse error, `}' expected"); + token(sc); + } + } + + /* --- Combine the source and target --- */ + + s->ops->attach(s, sc, t); + } + + /* --- Include configuration from a file --- * + * + * Slightly tricky. Scan the optional semicolon from the including + * stream, not the included one. + */ + + else if (strcmp(sc->d.buf, "include") == 0) { + FILE *fp; + dstr d = DSTR_INIT; + + token(sc); + conf_name(sc, '/', &d); + if ((fp = fopen(d.buf, "r")) == 0) + error(sc, "can't include `%s': %s", d.buf, strerror(errno)); + if (sc->t == ';') + token(sc); + pushback(sc); + scan_push(sc, scan_file(fp, d.buf, 0)); + token(sc); + dstr_destroy(&d); + continue; /* Don't parse a trailing `;' */ + } + + /* --- Other configuration is handled elsewhere --- */ + + else { + + /* --- First try among the sources --- */ + + { + source_ops **sops; + + for (sops = sources; *sops; sops++) { + if ((*sops)->option && (*sops)->option(0, sc)) + goto found_option; + } + } + + /* --- Then try among the targets --- */ + + { + target_ops **tops; + + for (tops = targets; *tops; tops++) { + if ((*tops)->option && (*tops)->option(0, sc)) + goto found_option; + } + } + + /* --- Nobody wants the option --- */ + + error(sc, "unknown global option or prefix `%s'", sc->d.buf); + + found_option:; + } + + if (sc->t == ';') + token(sc); + } +} + +/*----- General utility functions -----------------------------------------*/ /* --- @fw_log@ --- * * @@ -269,10 +447,12 @@ static void fw_reload(int n, void *p) else scan_add(&sc, scan_file(fp, cf->name, 0)); } - conf_parse(&sc); + parse(&sc); fw_log(-1, "... reload completed OK"); } +/*----- Startup and options parsing ---------------------------------------*/ + /* --- Standard GNU help options --- */ static void version(FILE *fp) @@ -411,8 +591,11 @@ Exec options\n\ \n\ Socket options\n\ socket.conn [=] number|unlimited|one-shot\n\ + socket.listen [=] number\n\ socket.logging [=] yes|no\n\ +\n\ socket.inet.[allow|deny] [from] address [/ address]\n\ +\n\ socket.unix.fattr.*\n\ "); } @@ -593,7 +776,7 @@ int main(int argc, char *argv[]) /* --- Parse the configuration now gathered --- */ - conf_parse(&sc); + parse(&sc); /* --- Set up some signal handlers --- * *