diff options
| author | Robert James Kaes <rjkaes@users.sourceforge.net> | 2002-04-12 16:59:37 +0000 |
|---|---|---|
| committer | Robert James Kaes <rjkaes@users.sourceforge.net> | 2002-04-12 16:59:37 +0000 |
| commit | 660e4d5687a92fd44ce5c23a4e3d68a786867551 (patch) | |
| tree | 35ea8590ee94aff847ed1be782bca92d0d3c9adc | |
| parent | eb1230e841f93f7a5fcf4103045aef4a76164b81 (diff) | |
| download | tinyproxy-660e4d5687a92fd44ce5c23a4e3d68a786867551.tar.gz tinyproxy-660e4d5687a92fd44ce5c23a4e3d68a786867551.zip | |
Added the support code to process a ConnectPort configuration directive.
| -rw-r--r-- | src/grammar.y | 5 | ||||
| -rw-r--r-- | src/scanner.l | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/grammar.y b/src/grammar.y index eabb5e5..5cf245c 100644 --- a/src/grammar.y +++ b/src/grammar.y @@ -1,4 +1,4 @@ -/* $Id: grammar.y,v 1.7 2002-04-02 17:17:30 rjkaes Exp $ +/* $Id: grammar.y,v 1.8 2002-04-12 16:59:37 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 @@ -24,6 +24,7 @@ #include "acl.h" #include "anonymous.h" #include "log.h" +#include "reqs.h" #include "thread.h" void yyerror(char *s); @@ -46,6 +47,7 @@ int yylex(void); %token KW_USER KW_GROUP %token KW_ANONYMOUS KW_FILTER KW_XTINYPROXY %token KW_TUNNEL KW_UPSTREAM +%token KW_CONNECTPORT %token KW_ALLOW KW_DENY /* yes/no switches */ @@ -145,6 +147,7 @@ statement | KW_ALLOW network_address { insert_acl($2, ACL_ALLOW); } | KW_DENY network_address { insert_acl($2, ACL_DENY); } | KW_LOGLEVEL loglevels { set_log_level($2); } + | KW_CONNECTPORT NUMBER { add_connect_port_allowed($2); } ; loglevels diff --git a/src/scanner.l b/src/scanner.l index ebe0c49..96e8dee 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -1,4 +1,4 @@ -/* $Id: scanner.l,v 1.8 2002-04-10 17:29:18 rjkaes Exp $ +/* $Id: scanner.l,v 1.9 2002-04-12 16:59:37 rjkaes Exp $ * * This builds the scanner for the tinyproxy configuration file. This * file needs to stay in sync with grammar.y. If someone knows lex and yacc @@ -49,6 +49,7 @@ static struct keyword keywords[] = { { "upstream", KW_UPSTREAM }, { "allow", KW_ALLOW }, { "deny", KW_DENY }, + { "connectport", KW_CONNECTPORT }, /* loglevel and the settings */ { "loglevel", KW_LOGLEVEL }, |