From 1f9085cef2c9fb9642c3ffad331a9edc423abf76 Mon Sep 17 00:00:00 2001
From: Robert James Kaes <rjkaes@users.sourceforge.net>
Date: Thu, 23 May 2002 18:24:02 +0000
Subject: Added the "DNSserverLocation" and "DNSserverSocket" directives for
use with the "dnsserver" resolver.
---
src/grammar.y | 5 ++++-
src/scanner.l | 4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/grammar.y b/src/grammar.y
index 15f3252..dc45022 100644
--- a/src/grammar.y
+++ b/src/grammar.y
@@ -1,4 +1,4 @@
-/* $Id: grammar.y,v 1.10 2002-04-24 16:45:45 rjkaes Exp $
+/* $Id: grammar.y,v 1.11 2002-05-23 18:24:02 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
@@ -49,6 +49,7 @@ int yylex(void);
%token KW_TUNNEL KW_UPSTREAM
%token KW_CONNECTPORT KW_BIND
%token KW_ALLOW KW_DENY
+%token KW_DNSSERVER_LOCATION KW_DNSSERVER_SOCKET
/* yes/no switches */
%token KW_YES KW_NO
@@ -157,6 +158,8 @@ statement
log_message(LOG_INFO, "Binding outgoing connections to %s", $2);
config.bind_address = $2;
}
+ | KW_DNSSERVER_LOCATION string { config.dnsserver_location = $2; }
+ | KW_DNSSERVER_SOCKET string { config.dnsserver_socket = $2; }
;
loglevels
diff --git a/src/scanner.l b/src/scanner.l
index 0b9bf2b..8f0ca04 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -1,4 +1,4 @@
-/* $Id: scanner.l,v 1.10 2002-04-22 19:33:01 rjkaes Exp $
+/* $Id: scanner.l,v 1.11 2002-05-23 18:24:02 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
@@ -51,6 +51,8 @@ static struct keyword keywords[] = {
{ "deny", KW_DENY },
{ "connectport", KW_CONNECTPORT },
{ "bind", KW_BIND },
+ { "dnsserverlocation", KW_DNSSERVER_LOCATION },
+ { "dnsserversocket", KW_DNSSERVER_SOCKET },
/* loglevel and the settings */
{ "loglevel", KW_LOGLEVEL },
--
cgit v1.2.3