Move definition of "struct config_s" from main.h to conf.h

Michael

1 files changed, 0 insertions, 76 deletions

diff --git a/src/main.h b/src/main.h
index c07482c..f3864e4 100644
--- a/src/main.h
+++ b/src/main.h
@@ -23,87 +23,11 @@
 #define __MAIN_H__
 
 #include "common.h"
-#include "hashmap.h"
-#include "vector.h"
 
 /* Global variables for the main controls of the program */
 #define MAXBUFFSIZE     ((size_t)(1024 * 96))   /* Max size of buffer */
 #define MAX_IDLE_TIME   (60 * 10)       /* 10 minutes of no activity */
 
-/*
- * Hold all the configuration time information.
- */
-struct config_s {
-        char *logf_name;
-        char *config_file;
-        unsigned int syslog;    /* boolean */
-        int port;
-        char *stathost;
-        unsigned int godaemon;  /* boolean */
-        unsigned int quit;      /* boolean */
-        char *user;
-        char *group;
-        char *ipAddr;
-#ifdef FILTER_ENABLE
-        char *filter;
-        unsigned int filter_url;        /* boolean */
-        unsigned int filter_extended;   /* boolean */
-        unsigned int filter_casesensitive;      /* boolean */
-#endif                          /* FILTER_ENABLE */
-#ifdef XTINYPROXY_ENABLE
-        unsigned int add_xtinyproxy; /* boolean */
-#endif
-#ifdef REVERSE_SUPPORT
-        struct reversepath *reversepath_list;
-        unsigned int reverseonly;       /* boolean */
-        unsigned int reversemagic;      /* boolean */
-        char *reversebaseurl;
-#endif
-#ifdef UPSTREAM_SUPPORT
-        struct upstream *upstream_list;
-#endif                          /* UPSTREAM_SUPPORT */
-        char *pidpath;
-        unsigned int idletimeout;
-        char *bind_address;
-        unsigned int bindsame;
-
-        /*
-         * The configured name to use in the HTTP "Via" header field.
-         */
-        char *via_proxy_name;
-
-        unsigned int disable_viaheader; /* boolean */
-
-        /*
-         * Error page support.  Map error numbers to file paths.
-         */
-        hashmap_t errorpages;
-
-        /*
-         * Error page to be displayed if appropriate page cannot be located
-         * in the errorpages structure.
-         */
-        char *errorpage_undef;
-
-        /*
-         * The HTML statistics page.
-         */
-        char *statpage;
-
-        vector_t access_list;
-
-        /*
-         * Store the list of port allowed by CONNECT.
-         */
-        vector_t connect_ports;
-
-        /*
-         * Map of headers which should be let through when the
-         * anonymous feature is turned on.
-         */
-        hashmap_t anonymous_map;
-};
-
 /* Global Structures used in the program */
 extern struct config_s config;
 extern unsigned int received_sighup;    /* boolean */