updating to squid-1.0.1

diff --git a/src/squid.h b/src/squid.h
index 773043927d5dbcf4a8e83bbab6326d5703d9ae39..d0ead64acf5c6784b79177c8845278b01469dd88 100644 (file)
--- a/src/squid.h
+++ b/src/squid.h
@@ -1,60 +1,126 @@
-
-/* $Id: squid.h,v 1.21 1996/05/03 22:56:31 wessels Exp $ */
+/*
+ * $Id: squid.h,v 1.22 1996/07/08 22:42:53 wessels Exp $
+ *
+ * AUTHOR: Duane Wessels
+ *
+ * SQUID Internet Object Cache  http://www.nlanr.net/Squid/
+ * --------------------------------------------------------
+ *
+ *  Squid is the result of efforts by numerous individuals from the
+ *  Internet community.  Development is led by Duane Wessels of the
+ *  National Laboratory for Applied Network Research and funded by
+ *  the National Science Foundation.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *  
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  
+ */
 
 #include "config.h"
-#include "autoconf.h"
-#include "version.h"
 
 #if SQUID_FD_SETSIZE > 256
 #define FD_SETSIZE SQUID_FD_SETSIZE
 #endif
 
+#if HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#if HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#if HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#if HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#if HAVE_CTYPE_H
 #include <ctype.h>
+#endif
+#if HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#if HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
+#if HAVE_GRP_H
 #include <grp.h>
-#ifndef _SQUID_FREEBSD_                /* "Obsolete" Markus Stumpf <maex@Space.NET> */
+#endif
+#if HAVE_MALLOC_H && !defined(_SQUID_FREEBSD_) && !defined(_SQUID_NEXT_)
 #include <malloc.h>
 #endif
+#if HAVE_MEMORY_H
 #include <memory.h>
+#endif
+#if HAVE_NETDB_H && !defined(_SQUID_NETDB_H_)  /* protect NEXTSTEP */
+#define _SQUID_NETDB_H_
 #include <netdb.h>
+#endif
+#if HAVE_PWD_H
 #include <pwd.h>
+#endif
+#if HAVE_SIGNAL_H
 #include <signal.h>
+#endif
+#if HAVE_TIME_H
 #include <time.h>
+#endif
+#if HAVE_SYS_PARAM_H
 #include <sys/param.h>
+#endif
+#if HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
+#if HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>      /* needs sys/time.h above it */
+#endif
+#if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#if HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
+#if HAVE_ARPA_INET_H
 #include <arpa/inet.h>
+#endif
+#if HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
+#if HAVE_SYS_UN_H
 #include <sys/un.h>
+#endif
+#if HAVE_SYS_WAIT_H
 #include <sys/wait.h>
-
+#endif
+#if HAVE_LIBC_H
+#include <libc.h>
+#endif
 #ifdef HAVE_SYS_SYSCALL_H
 #include <sys/syscall.h>
 #endif
-
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
-
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
-
 #if HAVE_BSTRING_H
 #include <bstring.h>
 #endif
-
 #ifdef HAVE_CRYPT_H
 #include <crypt.h>
 #endif
-
 #if HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
@@ -76,10 +142,40 @@
 #define SQUIDHOSTNAMELEN MAXHOSTNAMELEN
 #endif
 
+#ifndef INADDR_NONE
+#define INADDR_NONE -1
+#endif
+
+#if !defined(HAVE_RUSAGE) && defined(_SQUID_HPUX_)
+#define HAVE_RUSAGE
+#define getrusage(a, b)  syscall(SYS_GETRUSAGE, a, b)
+#endif
+
+#if !defined(HAVE_GETPAGESIZE) && defined(_SQUID_HPUX_)
+#define HAVE_GETPAGESIZE
+#define getpagesize( )   sysconf(_SC_PAGE_SIZE)
+#endif
+
 #ifndef BUFSIZ
 #define BUFSIZ  4096           /* make reasonable guess */
 #endif
 
+#ifndef SA_RESTART
+#define SA_RESTART 0
+#endif
+#ifndef SA_NODEFER
+#define SA_NODEFER 0
+#endif
+
+#ifndef SA_RESETHAND
+#ifdef SA_ONESHOT
+#define SA_RESETHAND SA_ONESHOT
+#else
+#define SA_RESETHAND 0
+#define HAVE_SIGACTION 0
+#endif /* SA_ONESHOT */
+#endif /* SA_RESETHAND */
+
 typedef struct sentry StoreEntry;
 typedef struct mem_hdr *mem_ptr;
 typedef struct _edge edge;
@@ -101,6 +197,9 @@ typedef unsigned long u_num32;
 
 #include "GNUregex.h"
 #include "ansihelp.h"
+
+typedef void (*SIH) _PARAMS((int, void *));    /* swap in */
+
 #include "cache_cf.h"
 #include "comm.h"
 #include "debug.h"
@@ -121,28 +220,50 @@ typedef unsigned long u_num32;
 #include "stmem.h"
 #include "store.h"
 #include "tools.h"
-#include "ttl.h"
-#include "storetoString.h"
 #include "http.h"
 #include "ftp.h"
 #include "gopher.h"
-#include "wais.h"
-#include "ssl.h"
-#include "objcache.h"
-#include "send-announce.h"
 #include "acl.h"
 #include "util.h"
 #include "background.h"
 
+#if !HAVE_TEMPNAM
+#include "tempnam.h"
+#endif
+
+extern void serverConnectionsClose _PARAMS((void));
+extern void shut_down _PARAMS((int));
+
+
 extern time_t squid_starttime; /* main.c */
 extern time_t next_cleaning;   /* main.c */
 extern int catch_signals;      /* main.c */
 extern int do_reuse;           /* main.c */
-extern int theAsciiConnection; /* main.c */
-extern int theUdpConnection;   /* main.c */
+extern int theHttpConnection;  /* main.c */
+extern int theInIcpConnection; /* main.c */
+extern int theOutIcpConnection;        /* main.c */
 extern int shutdown_pending;   /* main.c */
 extern int reread_pending;     /* main.c */
 extern int opt_unlink_on_reload;       /* main.c */
+extern int opt_reload_hit_only;        /* main.c */
+extern int opt_dns_tests;      /* main.c */
+extern int opt_foreground_rebuild;     /* main.c */
 extern int vhost_mode;         /* main.c */
-extern char *version_string;   /* main.c */
-extern char *appname;          /* main.c */
+extern char version_string[];  /* main.c */
+extern char appname[];         /* main.c */
+extern struct in_addr local_addr;      /* main.c */
+extern char localhost[];
+
+
+/* Prototypes and definitions which don't really deserve a seaprate
+   include file */
+
+#define  CONNECT_PORT        443
+
+extern int objcacheStart _PARAMS((int, char *, StoreEntry *));
+extern void send_announce _PARAMS((void));
+extern int sslStart _PARAMS((int fd, char *, request_t *, char *, int *sz));
+extern char *storeToString _PARAMS((StoreEntry *));
+extern time_t ttlSet _PARAMS((StoreEntry *));
+extern void ttlAddToList _PARAMS((char *, time_t, int, time_t));
+extern int waisStart _PARAMS((int, char *, method_t, char *, StoreEntry *));