squid_1_0_7 changes

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index e207559d5ad56f7f7afecae5a1336b6a0ce78fc3..33539558751d0a6e644230dd9711432a2d5df2b3 100644 (file)
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -27,6 +27,7 @@ and ideas to make this software available.
        Alexander B. Demenshin <aldem@barnet.kharkov.ua>
        Tony Lorimer <tlorimer@au.mdis.com>
        Igor Vinokurov <igor@cs.ibank.ru>
+       Russell Street <r.street@auckland.ac.nz>
 
 
 Development of this caching software is funded by the National Science

diff --git a/ChangeLog b/ChangeLog
index f9c1e6d2c03eb43351d6050fa1959c3315785111..086a69f7b6544657b8a35d05ef1f3800f487af70 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Changes to squid-1.1.alpha9:
+
+       - Fixed parsing of redirected URLs.
+       - Changed URL redirection to pass in client address, ident, and method.
+       - Fixed NULL pointer coredump in log_append().
+       - Don't swap negative-cache objects to disk (storeCheckSwappable())
+       - Only purge MemObject if entry is swapped to disk.
+       - Includes all squid-1.0 changes up to squid-1.0.7
+
 Changes to squid-1.1.alpha8:
 
        - Removed all references to hierarchy.log.
@@ -80,6 +89,15 @@ Changes to squid-1.1.alpha2:
        - Added support for RFC931/ident
 
 ==============================================================================
+Changes to squid-1.0.7 (August 14, 1996):
+
+       - Added "store_clean" routines to periodically remove orphaned
+         swap files.
+       - Increased StoreEntry->method_t from 3 to 4 bits, probably fixes
+         storeGenerate*Key() coredumps.
+       - Added debugging to examine_select().
+       - Added peer address to debugging for Ignored ICP packets.
+
 Changes to squid-1.0.6 (August 12, 1996):
 
        - Fixed coredump in icpStateFree() for bad requests.

diff --git a/configure b/configure
index 3a9e485feff85b73156bcbd26c0114148a5b7897..561387e127add81667fe5431a03e1684cb767ee0 100755 (executable)
--- a/configure
+++ b/configure
@@ -517,7 +517,7 @@ fi
 
 
 
-# From configure.in Revision: 1.24 
+# From configure.in Revision: 1.25 
 ac_aux_dir=
 for ac_dir in aux $srcdir/aux; do
   if test -f $ac_dir/install-sh; then
@@ -579,10 +579,6 @@ fi
 if test -z "$CACHE_ICP_PORT"; then
        CACHE_ICP_PORT="3130"
 fi
-if test -z "$CACHE_FTP_PORT"; then
-       CACHE_FTP_PORT="3132"
-fi
-
 
 
 
@@ -733,7 +729,7 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 737 "configure"
+#line 733 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
@@ -747,7 +743,7 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 751 "configure"
+#line 747 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
@@ -1045,7 +1041,7 @@ if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1049 "configure"
+#line 1045 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -1085,7 +1081,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1089 "configure"
+#line 1085 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1120,7 +1116,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1124 "configure"
+#line 1120 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1157,7 +1153,7 @@ else
   ac_cv_c_cross=yes
 else
 cat > conftest.$ac_ext <<EOF
-#line 1161 "configure"
+#line 1157 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
@@ -1179,7 +1175,7 @@ if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1183 "configure"
+#line 1179 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1201,7 +1197,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1205 "configure"
+#line 1201 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1219,7 +1215,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1223 "configure"
+#line 1219 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1240,7 +1236,7 @@ if test "$cross_compiling" = yes; then
   :
 else
 cat > conftest.$ac_ext <<EOF
-#line 1244 "configure"
+#line 1240 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1323,7 +1319,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1327 "configure"
+#line 1323 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
@@ -1354,7 +1350,7 @@ done
 
 echo $ac_n "checking for tm->tm_gmtoff""... $ac_c" 1>&6
 cat > conftest.$ac_ext <<EOF
-#line 1358 "configure"
+#line 1354 "configure"
 #include "confdefs.h"
 #include <time.h>
 #include <sys/time.h>
@@ -1380,7 +1376,7 @@ rm -f conftest*
 
 echo $ac_n "checking for extended mallinfo""... $ac_c" 1>&6
 cat > conftest.$ac_ext <<EOF
-#line 1384 "configure"
+#line 1380 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <malloc.h>
@@ -1412,7 +1408,7 @@ else
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
 cat > conftest.$ac_ext <<EOF
-#line 1416 "configure"
+#line 1412 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1446,7 +1442,7 @@ else
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
 cat > conftest.$ac_ext <<EOF
-#line 1450 "configure"
+#line 1446 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1480,7 +1476,7 @@ if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1484 "configure"
+#line 1480 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() { return 0; }
@@ -1512,7 +1508,7 @@ if eval "test \"`echo '$''{'ac_cv_func_alloca'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1516 "configure"
+#line 1512 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -1571,7 +1567,7 @@ if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1575 "configure"
+#line 1571 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -1600,7 +1596,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1604 "configure"
+#line 1600 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1654,7 +1650,7 @@ else
   ac_cv_c_stack_direction=0
 else
 cat > conftest.$ac_ext <<EOF
-#line 1658 "configure"
+#line 1654 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -1699,7 +1695,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1703 "configure"
+#line 1699 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1739,7 +1735,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1743 "configure"
+#line 1739 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1779,7 +1775,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmalloc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1783 "configure"
+#line 1779 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1813,7 +1809,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1817 "configure"
+#line 1813 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1853,7 +1849,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lbsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1857 "configure"
+#line 1853 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1894,7 +1890,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l44bsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1898 "configure"
+#line 1894 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1928,7 +1924,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1932 "configure"
+#line 1928 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1963,7 +1959,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcrypt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1967 "configure"
+#line 1963 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -2000,7 +1996,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-labi  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2004 "configure"
+#line 2000 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -2034,7 +2030,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix4  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2038 "configure"
+#line 2034 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -2141,7 +2137,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2145 "configure"
+#line 2141 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2191,7 +2187,7 @@ if test "$cross_compiling" = yes; then
   SQUID_FD_SETSIZE=256
 else
 cat > conftest.$ac_ext <<EOF
-#line 2195 "configure"
+#line 2191 "configure"
 #include "confdefs.h"
 
 #include <unistd.h>
@@ -2261,7 +2257,7 @@ if test "$cross_compiling" = yes; then
   SQUID_UDP_SO_SNDBUF=8192
 else
 cat > conftest.$ac_ext <<EOF
-#line 2265 "configure"
+#line 2261 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2297,7 +2293,7 @@ if test "$cross_compiling" = yes; then
   SQUID_UDP_SO_RCVBUF=8192
 else
 cat > conftest.$ac_ext <<EOF
-#line 2301 "configure"
+#line 2297 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2333,7 +2329,7 @@ if test "$cross_compiling" = yes; then
   SQUID_TCP_SO_SNDBUF=8192
 else
 cat > conftest.$ac_ext <<EOF
-#line 2337 "configure"
+#line 2333 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2369,7 +2365,7 @@ if test "$cross_compiling" = yes; then
   SQUID_TCP_SO_RCVBUF=8192
 else
 cat > conftest.$ac_ext <<EOF
-#line 2373 "configure"
+#line 2369 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2402,7 +2398,7 @@ EOF
 
 echo $ac_n "checking if sys_errlist is already defined""... $ac_c" 1>&6
 cat > conftest.$ac_ext <<EOF
-#line 2406 "configure"
+#line 2402 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() { return 0; }
@@ -2575,7 +2571,6 @@ s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
 s%@CACHE_HTTP_PORT@%$CACHE_HTTP_PORT%g
 s%@CACHE_ICP_PORT@%$CACHE_ICP_PORT%g
-s%@CACHE_FTP_PORT@%$CACHE_FTP_PORT%g
 s%@CC@%$CC%g
 s%@CPP@%$CPP%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g

diff --git a/configure.in b/configure.in
index 5899003789acf48ac4511026f61af4232d9764ae..0a2d56730647c1a0f075d070cac596540b0c239f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,13 +3,13 @@ dnl  Configuration input file for Squid
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.25 1996/08/12 23:37:21 wessels Exp $
+dnl  $Id: configure.in,v 1.26 1996/08/14 22:57:01 wessels Exp $
 dnl
 dnl
 dnl
 AC_INIT(src/main.c)
 AC_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.25 $)dnl
+AC_REVISION($Revision: 1.26 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AC_CONFIG_AUX_DIR(aux)
 
@@ -30,14 +30,10 @@ fi
 if test -z "$CACHE_ICP_PORT"; then
        CACHE_ICP_PORT="3130"
 fi
-if test -z "$CACHE_FTP_PORT"; then
-       CACHE_FTP_PORT="3132"
-fi
 
 dnl Subsitutions
 AC_SUBST(CACHE_HTTP_PORT)
 AC_SUBST(CACHE_ICP_PORT)
-AC_SUBST(CACHE_FTP_PORT)
 
 AC_DEFINE_UNQUOTED(CONFIG_HOST_TYPE, "$host")
 

diff --git a/include/version.h b/include/version.h
index 0e00cb1c36f938b12c43ff5448451cf9410ebbce..7f53d12b47005ff86909e37711deed5c511af403 100644 (file)
--- a/include/version.h
+++ b/include/version.h
@@ -1,7 +1,7 @@
-/* $Id: version.h,v 1.26 1996/08/12 23:27:26 wessels Exp $
+/* $Id: version.h,v 1.27 1996/08/14 22:57:03 wessels Exp $
  *
  *  SQUID_VERSION - String for version id of this distribution
  */
 #ifndef SQUID_VERSION
-#define SQUID_VERSION  "1.1.alpha8"
+#define SQUID_VERSION  "1.1.alpha9"
 #endif

diff --git a/src/Makefile.in b/src/Makefile.in
index 4ac58f42ff39a2c465c69c3216e07816ccea93b9..5c018f0ed833b46143eadac3afbbc902cc1bb5ee 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.32 1996/07/27 07:07:41 wessels Exp $
+#  $Id: Makefile.in,v 1.33 1996/08/14 22:57:08 wessels Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -58,9 +58,8 @@ OBJS          = acl.o async_io.o background.o cache_cf.o errorpage.o \
                fdstat.o filemap.o ftp.o fqdncache.o gopher.o \
                hash.o http.o icp.o ident.o ipcache.o \
                main.o mime.o neighbors.o objcache.o \
-               proto.o redirect.o send-announce.o ssl.o stack.o \
-               stat.o stmem.o \
-               store.o storetoString.o tools.o ttl.o \
+               proto.o send-announce.o ssl.o stack.o stat.o stmem.o \
+               store.o store_clean.o storetoString.o tools.o ttl.o \
                url.o wais.o $(XTRA_OBJS)
 
 DEFAULTS        = \

diff --git a/src/comm.cc b/src/comm.cc
index b340bb2ad7075aba1f7e74d166baa18b63b79c4f..1e83a9b941fb546b1f136b03d1bc0e772ef30b1e 100644 (file)
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm.cc,v 1.52 1996/08/12 23:37:22 wessels Exp $
+ * $Id: comm.cc,v 1.53 1996/08/14 22:57:09 wessels Exp $
  *
  * DEBUG: section 5     Socket Functions
  * AUTHOR: Harvest Derived
@@ -1088,6 +1088,8 @@ static int examine_select(readfds, writefds, exceptfds)
            if (num < 0) {
                f = &fd_table[fd];
                debug(5, 0, "WARNING: FD %d has handlers, but it's invalid.\n", fd);
+               debug(5, 0, "FD %d is a %s\n", fd, fdstatTypeStr[fdstatGetType(fd)]);
+               debug(5, 0, "--> %s\n", fd_note(fd, NULL));
                debug(5, 0, "lifetm:%p tmout:%p read:%p write:%p expt:%p\n",
                    f->lifetime_handler,
                    f->timeout_handler,

diff --git a/src/main.cc b/src/main.cc
index e75c195feb7728ad812d6ec7eb0969d87b05e361..fb7f662effa944d1d97ea20620c6dec532f4fc05 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: main.cc,v 1.58 1996/08/12 23:37:24 wessels Exp $
+ * $Id: main.cc,v 1.59 1996/08/14 22:57:11 wessels Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -476,6 +476,7 @@ int main(argc, argv)
     int errcount = 0;
     int n;                     /* # of GC'd objects */
     time_t last_maintain = 0;
+    time_t last_dirclean = 0;
     time_t last_announce = 0;
     time_t loop_delay;
 
@@ -542,6 +543,13 @@ int main(argc, argv)
            storeMaintainSwapSpace();
            last_maintain = squid_curtime;
        }
+       if (squid_curtime - last_dirclean > 15
+           && store_rebuilding == STORE_NOT_REBUILDING) {
+           /* clean a cache directory every 15 seconds */
+           /* 15 * 16 * 256 = 17 hrs */
+           storeDirClean();
+           last_dirclean = squid_curtime;
+       }
        if (rotate_pending) {
            ftpServerClose();
            _db_rotate_log();   /* cache.log */

diff --git a/src/neighbors.cc b/src/neighbors.cc
index 47e2095e53e04cc201a1b7a1d70425cbdbb96ad6..c90df274509ff4e74ea7462c9d7050b9b1b3d2d4 100644 (file)
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: neighbors.cc,v 1.40 1996/07/27 07:07:43 wessels Exp $
+ * $Id: neighbors.cc,v 1.41 1996/08/14 22:57:12 wessels Exp $
  *
  * DEBUG: section 15    Neighbor Routines
  * AUTHOR: Harvest Derived
@@ -584,7 +584,7 @@ void neighborsUdpAck(fd, url, header, from, entry, data, data_sz)
     if (header->opcode == ICP_OP_SECHO) {
        /* Received source-ping reply */
        if (e) {
-           debug(15, 1, "neighborsUdpAck: Ignoring SECHO from %s\n", e->host);
+           debug(15, 1, "Ignoring SECHO from neighbor %s\n", e->host);
        } else {
            /* if we reach here, source-ping reply is the first 'parent',
             * so fetch directly from the source */
@@ -623,7 +623,8 @@ void neighborsUdpAck(fd, url, header, from, entry, data, data_sz)
        }
     } else if (header->opcode == ICP_OP_HIT) {
        if (e == NULL) {
-           debug(15, 1, "neighborsUdpAck: Ignoring HIT from non-neighbor\n");
+           debug(15, 1, "Ignoring HIT from non-neighbor %s\n",
+               inet_ntoa(from->sin_addr));
        } else {
            hierarchyNote(entry->mem_obj->request,
                e->type == EDGE_SIBLING ? HIER_SIBLING_HIT : HIER_PARENT_HIT,
@@ -636,7 +637,8 @@ void neighborsUdpAck(fd, url, header, from, entry, data, data_sz)
        }
     } else if (header->opcode == ICP_OP_DECHO) {
        if (e == NULL) {
-           debug(15, 1, "neighborsUdpAck: Ignoring DECHO from non-neighbor\n");
+           debug(15, 1, "Ignoring DECHO from non-neighbor %s\n",
+               inet_ntoa(from->sin_addr));
        } else if (e->type == EDGE_SIBLING) {
            fatal_dump("neighborsUdpAck: Found non-ICP cache as SIBLING\n");
        } else {
@@ -648,7 +650,8 @@ void neighborsUdpAck(fd, url, header, from, entry, data, data_sz)
        }
     } else if (header->opcode == ICP_OP_MISS) {
        if (e == NULL) {
-           debug(15, 1, "neighborsUdpAck: Ignoring MISS from non-neighbor\n");
+           debug(15, 1, "Ignoring MISS from non-neighbor %s\n",
+               inet_ntoa(from->sin_addr));
        } else if (e->type == EDGE_PARENT) {
            w_rtt = tvSubMsec(mem->start_ping, current_time) / e->weight;
            if (mem->w_rtt == 0 || w_rtt < mem->w_rtt) {
@@ -658,7 +661,8 @@ void neighborsUdpAck(fd, url, header, from, entry, data, data_sz)
        }
     } else if (header->opcode == ICP_OP_DENIED) {
        if (e == NULL) {
-           debug(15, 1, "neighborsUdpAck: Ignoring DENIED from non-neighbor\n");
+           debug(15, 1, "Ignoring DENIED from non-neighbor %s\n",
+               inet_ntoa(from->sin_addr));
        } else if (e->stats.pings_acked > 100) {
            if (100 * e->stats.counts[ICP_OP_DENIED] / e->stats.pings_acked > 95) {
                debug(15, 0, "95%% of replies from '%s' are UDP_DENIED\n", e->host);

diff --git a/src/squid.h b/src/squid.h
index 74a8dc3f8d968dc414bedd40966b1a8b8d3099cc..8970801f069137b1cb4e0b83206d2587329a1f4e 100644 (file)
--- a/src/squid.h
+++ b/src/squid.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: squid.h,v 1.35 1996/07/26 16:59:06 wessels Exp $
+ * $Id: squid.h,v 1.36 1996/08/14 22:57:13 wessels Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -289,3 +289,4 @@ extern char *storeToString _PARAMS((StoreEntry *));
 extern void ttlSet _PARAMS((StoreEntry *));
 extern void ttlAddToList _PARAMS((char *, time_t, int, time_t));
 extern int waisStart _PARAMS((int, char *, method_t, char *, StoreEntry *));
+extern void storeDirClean _PARAMS((void));

diff --git a/src/store.cc b/src/store.cc
index 801d75dfb65149b43a80b5b946787bd5ce678924..0bc22705792ee2527b2d2cb7656895d58da515b9 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: store.cc,v 1.80 1996/08/14 21:57:08 wessels Exp $
+ * $Id: store.cc,v 1.81 1996/08/14 22:57:16 wessels Exp $
  *
  * DEBUG: section 20    Storeage Manager
  * AUTHOR: Harvest Derived
@@ -133,8 +133,6 @@
 #define REBUILD_TIMESTAMP_DELTA_MAX 2
 #define MAX_SWAP_FILE          (1<<21)
 #define SWAP_BUF               DISK_PAGE_SIZE
-#define SWAP_DIRECTORIES_L1    16
-#define SWAP_DIRECTORIES_L2    256
 
 #define WITH_MEMOBJ    1
 #define WITHOUT_MEMOBJ 0