Added the "DNSserverLocation" and "DNSserverSocket" directives for use
with the "dnsserver" resolver.
This commit is contained in:
		
							parent
							
								
									09b1b9b925
								
							
						
					
					
						commit
						1f9085cef2
					
				@ -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
 | 
					 * 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
 | 
					 * 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_TUNNEL KW_UPSTREAM
 | 
				
			||||||
%token KW_CONNECTPORT KW_BIND
 | 
					%token KW_CONNECTPORT KW_BIND
 | 
				
			||||||
%token KW_ALLOW KW_DENY
 | 
					%token KW_ALLOW KW_DENY
 | 
				
			||||||
 | 
					%token KW_DNSSERVER_LOCATION KW_DNSSERVER_SOCKET
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* yes/no switches */
 | 
					/* yes/no switches */
 | 
				
			||||||
%token KW_YES KW_NO
 | 
					%token KW_YES KW_NO
 | 
				
			||||||
@ -157,6 +158,8 @@ statement
 | 
				
			|||||||
		  log_message(LOG_INFO, "Binding outgoing connections to %s", $2);
 | 
							  log_message(LOG_INFO, "Binding outgoing connections to %s", $2);
 | 
				
			||||||
	          config.bind_address = $2;
 | 
						          config.bind_address = $2;
 | 
				
			||||||
          }
 | 
					          }
 | 
				
			||||||
 | 
					        | KW_DNSSERVER_LOCATION string  { config.dnsserver_location = $2; }
 | 
				
			||||||
 | 
					        | KW_DNSSERVER_SOCKET string    { config.dnsserver_socket = $2; }
 | 
				
			||||||
	;
 | 
						;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
loglevels
 | 
					loglevels
 | 
				
			||||||
 | 
				
			|||||||
@ -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
 | 
					 * 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
 | 
					 * 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 },
 | 
					        { "deny",                KW_DENY },
 | 
				
			||||||
        { "connectport",         KW_CONNECTPORT },
 | 
					        { "connectport",         KW_CONNECTPORT },
 | 
				
			||||||
        { "bind",                KW_BIND },
 | 
					        { "bind",                KW_BIND },
 | 
				
			||||||
 | 
					        { "dnsserverlocation",   KW_DNSSERVER_LOCATION },
 | 
				
			||||||
 | 
					        { "dnsserversocket",     KW_DNSSERVER_SOCKET },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        /* loglevel and the settings */
 | 
					        /* loglevel and the settings */
 | 
				
			||||||
        { "loglevel",            KW_LOGLEVEL },
 | 
					        { "loglevel",            KW_LOGLEVEL },
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user