From 52c15029d16ccefbad8a080924df64b07d97cd0f Mon Sep 17 00:00:00 2001
From: Robert James Kaes <rjkaes@users.sourceforge.net>
Date: Thu, 23 May 2002 18:27:19 +0000
Subject: Moved all the system header includes into the common.h file.
---
src/tinyproxy.h | 169 ++------------------------------------------------------
1 file changed, 5 insertions(+), 164 deletions(-)
diff --git a/src/tinyproxy.h b/src/tinyproxy.h
index df0cf3d..6e9f18a 100644
--- a/src/tinyproxy.h
+++ b/src/tinyproxy.h
@@ -1,4 +1,4 @@
-/* $Id: tinyproxy.h,v 1.30 2002-04-24 16:45:45 rjkaes Exp $
+/* $Id: tinyproxy.h,v 1.31 2002-05-23 18:27:19 rjkaes Exp $
*
* See 'tinyproxy.c' for a detailed description.
*
@@ -19,174 +19,12 @@
#ifndef TINYPROXY_TINYPROXY_H
#define TINYPROXY_TINYPROXY_H
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-/*
- * Include standard headers which are used through-out tinyproxy
- */
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDDEF_H
-# include <stddef.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-
-#ifdef HAVE_SYS_IOCTL_H
-# include <sys/ioctl.h>
-#endif
-#ifdef HAVE_SYS_SELECT_H
-# include <sys/select.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# ifdef HAVE_TIME_H
-# include <time.h>
-# endif
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# ifdef HAVE_TIME_H
-# include <time.h>
-# endif
-# endif
-#endif
-
-#ifdef HAVE_SYS_RESOURCE_H
-# include <sys/resource.h>
-#endif
-#ifdef HAVE_SYS_UIO_H
-# include <sys/uio.h>
-#endif
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#endif
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#endif
-#ifdef HAVE_ASSERT_H
-# include <assert.h>
-#endif
-#ifdef HAVE_CTYPE_H
-# include <ctype.h>
-#endif
-#ifdef HAVE_ERRNO_H
-# include <errno.h>
-#endif
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
-#ifdef HAVE_GRP_H
-# include <grp.h>
-#endif
-#ifdef HAVE_MEMORY_H
-# include <memory.h>
-#endif
-#ifdef HAVE_NETDB_H
-# include <netdb.h>
-#endif
-#ifdef HAVE_PTHREAD_H
-# include <pthread.h>
-#else
-# ifdef HAVE_PTHREADS_H
-# include <pthreads.h>
-# endif
-#endif
-#ifdef HAVE_PWD_H
-# include <pwd.h>
-#endif
-#ifdef HAVE_SIGNAL_H
-# include <signal.h>
-#endif
-#ifdef HAVE_STDARG_H
-# include <stdarg.h>
-#endif
-#ifdef HAVE_STDIO_H
-# include <stdio.h>
-#endif
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#else
-# ifdef HAVE_MALLOC_H
-# include <malloc.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_SYSEXITS_H
-# include <sysexits.h>
-#endif
-#ifdef HAVE_SYSLOG_H
-# include <syslog.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#ifdef HAVE_VFORK_H
-# include <vfork.h>
-#endif
-#ifdef HAVE_WCHAR_H
-# include <wchar.h>
-#endif
-#ifdef HAVE_WCTYPE_H
-# include <wctype.h>
-#endif
-
-/*
- * If MSG_NOSIGNAL is not defined, define it to be zero so that it doesn't
- * cause any problems.
- */
-#ifndef MSG_NOSIGNAL
-# define MSG_NOSIGNAL (0)
-#endif
-
-#ifndef SHUT_RD /* these three Posix.1g names are quite new */
-# define SHUT_RD 0 /* shutdown for reading */
-# define SHUT_WR 1 /* shutdown for writing */
-# define SHUT_RDWR 2 /* shutdown for reading and writing */
-#endif
+#include "common.h"
/* Global variables for the main controls of the program */
#define MAXBUFFSIZE ((size_t)(1024 * 96)) /* Max size of buffer */
-#define MAXLISTEN 1024 /* Max number of connections */
#define MAX_IDLE_TIME (60 * 10) /* 10 minutes of no activity */
-/* Useful function macros */
-#define min(a,b) ((a) < (b) ? (a) : (b))
-#define max(a,b) ((a) > (b) ? (a) : (b))
-
-/* Make a new type: bool_t */
-typedef enum {
- FALSE = 0,
- TRUE = 1
-} bool_t;
-
struct config_s {
FILE *logf;
char *logf_name;
@@ -214,6 +52,9 @@ struct config_s {
char *pidpath;
unsigned int idletimeout;
char* bind_address;
+
+ char* dnsserver_location;
+ char* dnsserver_socket;
};
/* Global Structures used in the program */
--
cgit v1.2.3