From 89ada2df2841db06ac71ea3a62ec6af0ea112a08 Mon Sep 17 00:00:00 2001
From: Robert James Kaes <rjkaes@users.sourceforge.net>
Date: Wed, 24 Apr 2002 16:45:45 +0000
Subject: Moved bind_address inside the config structure.

---
 src/grammar.y   | 4 ++--
 src/tinyproxy.c | 3 +--
 src/tinyproxy.h | 5 ++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/grammar.y b/src/grammar.y
index c8e42f6..15f3252 100644
--- a/src/grammar.y
+++ b/src/grammar.y
@@ -1,4 +1,4 @@
-/* $Id: grammar.y,v 1.9 2002-04-22 19:33:01 rjkaes Exp $
+/* $Id: grammar.y,v 1.10 2002-04-24 16:45:45 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
@@ -155,7 +155,7 @@ statement
         | KW_BIND NUMERIC_ADDRESS
           {
 		  log_message(LOG_INFO, "Binding outgoing connections to %s", $2);
-	          bind_address = $2;
+	          config.bind_address = $2;
           }
 	;
 
diff --git a/src/tinyproxy.c b/src/tinyproxy.c
index 6f9d9a5..0f0bf7b 100644
--- a/src/tinyproxy.c
+++ b/src/tinyproxy.c
@@ -1,4 +1,4 @@
-/* $Id: tinyproxy.c,v 1.28 2002-04-22 19:34:20 rjkaes Exp $
+/* $Id: tinyproxy.c,v 1.29 2002-04-24 16:45:45 rjkaes Exp $
  *
  * The initialise routine. Basically sets up all the initial stuff (logfile,
  * listening socket, config options, etc.) and then sits there and loops
@@ -45,7 +45,6 @@ extern FILE *yyin;
 struct config_s config;
 float load = 0.00;
 bool_t log_rotation_request = FALSE;
-char* bind_address = NULL;
 bool_t processed_config_file = FALSE;
 
 /*
diff --git a/src/tinyproxy.h b/src/tinyproxy.h
index 797c066..df0cf3d 100644
--- a/src/tinyproxy.h
+++ b/src/tinyproxy.h
@@ -1,4 +1,4 @@
-/* $Id: tinyproxy.h,v 1.29 2002-04-22 19:34:20 rjkaes Exp $
+/* $Id: tinyproxy.h,v 1.30 2002-04-24 16:45:45 rjkaes Exp $
  *
  * See 'tinyproxy.c' for a detailed description.
  *
@@ -213,13 +213,12 @@ struct config_s {
 #endif				/* UPSTREAM_SUPPORT */
 	char *pidpath;
 	unsigned int idletimeout;
-
+	char* bind_address;
 };
 
 /* Global Structures used in the program */
 extern struct config_s config;
 extern bool_t log_rotation_request;
-extern char* bind_address;
 extern bool_t processed_config_file;
 
 #endif
-- 
cgit v1.2.3