diff options
| author | Robert James Kaes <rjkaes@users.sourceforge.net> | 2003-05-29 19:44:00 +0000 |
|---|---|---|
| committer | Robert James Kaes <rjkaes@users.sourceforge.net> | 2003-05-29 19:44:00 +0000 |
| commit | 4a377a712d5a17d1cd2c5e46f8c0873824a2448f (patch) | |
| tree | d2af5dc84bb057f96fe7df741b9232d2ae620056 /src/grammar.y | |
| parent | 2e9f27769d94974c875207e92fd219e6cd29fda8 (diff) | |
| download | tinyproxy-4a377a712d5a17d1cd2c5e46f8c0873824a2448f.tar.gz tinyproxy-4a377a712d5a17d1cd2c5e46f8c0873824a2448f.zip | |
Improved the upstream proxy support by making the upstream proxy
server configurable based on the destination host. [Code written by
Peter da Silva]
Diffstat (limited to 'src/grammar.y')
| -rw-r--r-- | src/grammar.y | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/src/grammar.y b/src/grammar.y index 7be9368..404f450 100644 --- a/src/grammar.y +++ b/src/grammar.y @@ -1,4 +1,4 @@ -/* $Id: grammar.y,v 1.20 2003-03-13 21:42:46 rjkaes Exp $ +/* $Id: grammar.y,v 1.21 2003-05-29 19:43:58 rjkaes Exp $ * * This is the grammar for tinyproxy's configuration file. It needs to be * in sync with scanner.l. If you know more about yacc and lex than I do @@ -171,12 +171,27 @@ statement | KW_UPSTREAM unique_address ':' NUMBER { #ifdef UPSTREAM_SUPPORT - config.upstream_name = $2; - config.upstream_port = $4; + upstream_add($2, $4, NULL); #else log_message(LOG_WARNING, "Upstream proxy support was not compiled in."); #endif } + | KW_UPSTREAM unique_address ':' NUMBER STRING + { +#ifdef UPSTREAM_SUPPORT + upstream_add($2, $4, $5); +#else + log_message(LOG_WARNING, "Upstream proxy support was not compiled in."); +#endif + } + | KW_NO KW_UPSTREAM STRING + { +#ifdef UPSTREAM_SUPPORT + upstream_add(NULL, 0, $3); +#else + log_message(LOG_WARNING, "Upstream proxy support was not compiled in."); +#endif + } | KW_LISTEN NUMERIC_ADDRESS { log_message(LOG_INFO, "Establishing listening socket on IP %s", $2); |