Index: CONTRIBUTORS
===================================================================
RCS file: /surf1/CVS/squid/CONTRIBUTORS,v
retrieving revision 1.6
retrieving revision 1.7
diff -w -c -r1.6 -r1.7
*** CONTRIBUTORS	1996/08/19 23:09:42	1.6
--- CONTRIBUTORS	1996/08/21 05:56:15	1.7
***************
*** 28,33 ****
--- 28,34 ----
  	Tony Lorimer <tlorimer@au.mdis.com>
  	Igor Vinokurov <igor@cs.ibank.ru>
  	Russell Street <r.street@auckland.ac.nz>
+ 	Cord Beermann <webadm@cc.fh-lippe.de>
  
  
  Development of this caching software is funded by the National Science
Index: ChangeLog
===================================================================
RCS file: /surf1/CVS/squid/ChangeLog,v
retrieving revision 1.57
retrieving revision 1.59
diff -w -c -r1.57 -r1.59
*** ChangeLog	1996/08/19 23:08:54	1.57
--- ChangeLog	1996/08/21 05:59:25	1.59
***************
*** 1,3 ****
--- 1,12 ----
+ Changes to squid-1.1.alpha11:
+ 
+ 	- Fixed sscanf() bug in storeDirClean()
+ 	- Fixed coredump in squid_error_entry() on Config.errHtmlText.
+ 	- Added redirector stats entry to cachemgr.cgi.
+ 	- Call ipcache_purgelru() during an idle timeout.
+ 	- Changed fqdnFromAddr() to copy inet_ntoa() result into a 
+ 	  static buffer.
+ 
  Changes to squid-1.1.alpha10:
  
  	- Fixed directory increment bug in storeDirClean().
Index: src/cache_cf.c
===================================================================
RCS file: /surf1/CVS/squid/src/cache_cf.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -w -c -r1.68 -r1.69
*** cache_cf.c	1996/08/19 22:44:50	1.68
--- cache_cf.c	1996/08/20 15:43:41	1.69
***************
*** 1,5 ****
  /*
!  * $Id: cache_cf.c,v 1.68 1996/08/19 22:44:50 wessels Exp $
   *
   * DEBUG: section 3     Configuration File Parsing
   * AUTHOR: Harvest Derived
--- 1,5 ----
  /*
!  * $Id: cache_cf.c,v 1.69 1996/08/20 15:43:41 wessels Exp $
   *
   * DEBUG: section 3     Configuration File Parsing
   * AUTHOR: Harvest Derived
***************
*** 1440,1445 ****
--- 1440,1447 ----
      httpd_accel_mode = Config.Accel.prefix ? 1 : 0;
      sprintf(ForwardedBy, "Forwarded: by http://%s:%d/",
  	getMyHostname(), Config.Port.http);
+     if (Config.errHtmlText == NULL)
+ 	Config.errHtmlText = xstrdup("");
  
  #if !ALLOW_HOT_CACHE
      if (!httpd_accel_mode || Config.Accel.withProxy) {
Index: src/cachemgr.c
===================================================================
RCS file: /surf1/CVS/squid/src/cachemgr.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -w -c -r1.13 -r1.14
*** cachemgr.c	1996/07/25 07:10:29	1.13
--- cachemgr.c	1996/08/20 15:45:46	1.14
***************
*** 1,6 ****
  
  /*
!  * $Id: cachemgr.c,v 1.13 1996/07/25 07:10:29 wessels Exp $
   *
   * DEBUG: Section 0     CGI Cache Manager
   * AUTHOR: Harvest Derived
--- 1,6 ----
  
  /*
!  * $Id: cachemgr.c,v 1.14 1996/08/20 15:45:46 wessels Exp $
   *
   * DEBUG: Section 0     CGI Cache Manager
   * AUTHOR: Harvest Derived
***************
*** 218,223 ****
--- 218,224 ----
      STATS_I,
      STATS_F,
      STATS_D,
+     STATS_R,
      STATS_O,
      STATS_VM,
      STATS_U,
***************
*** 242,247 ****
--- 243,249 ----
      "stats/ipcache",
      "stats/fqdncache",
      "stats/dns",
+     "stats/redirector",
      "stats/objects",
      "stats/vm_objects",
      "stats/utilization",
***************
*** 322,327 ****
--- 324,330 ----
      printf("<OPTION VALUE=\"stats/ipcache\">IP Cache Contents\n");
      printf("<OPTION VALUE=\"stats/fqdncache\">FQDN Cache Contents\n");
      printf("<OPTION VALUE=\"stats/dns\">DNS Server Statistics\n");
+     printf("<OPTION VALUE=\"stats/redirector\">Redirector Statistics\n");
      printf("<OPTION VALUE=\"shutdown\">Shutdown Cache (password required)\n");
      printf("<OPTION VALUE=\"refresh\">Refresh Object (URL required)\n");
  #ifdef REMOVE_OBJECT
***************
*** 609,614 ****
--- 612,620 ----
      } else if (!strcmp(operation, "stats/dns") ||
  	!strcmp(operation, "DNS Server Stats")) {
  	op = STATS_D;
+     } else if (!strcmp(operation, "stats/redirector") ||
+       !strcmp(operation, "Redirection Server Stats")) {
+       op = STATS_R;
      } else if (!strcmp(operation, "stats/vm_objects") ||
  	!strcmp(operation, "VM_Objects")) {
  	op = STATS_VM;
***************
*** 649,654 ****
--- 655,661 ----
      case STATS_I:
      case STATS_F:
      case STATS_D:
+     case STATS_R:
      case STATS_O:
      case STATS_VM:
      case STATS_U:
***************
*** 702,707 ****
--- 709,715 ----
      printf("<OPTION VALUE=\"stats/ipcache\">IP Cache Contents\n");
      printf("<OPTION VALUE=\"stats/fqdncache\">FQDN Cache Contents\n");
      printf("<OPTION VALUE=\"stats/dns\">DNS Server Statistics\n");
+     printf("<OPTION VALUE=\"stats/redirector\">Redirector Statistics\n");
      printf("</SELECT>");
      printf("<INPUT TYPE=\"hidden\" NAME=\"host\" VALUE=\"%s\">\n", hostname);
      printf("<INPUT TYPE=\"hidden\" NAME=\"port\" VALUE=\"%d\">\n", portnum);
***************
*** 742,747 ****
--- 750,756 ----
      case STATS_I:
      case STATS_F:
      case STATS_D:
+     case STATS_R:
      case STATS_O:
      case STATS_VM:
      case STATS_IO:
***************
*** 811,816 ****
--- 820,826 ----
  		case STATS_I:
  		case STATS_F:
  		case STATS_D:
+ 		case STATS_R:
  		case STATS_IO:
  		case STATS_HDRS:
  		case STATS_FDS:
Index: src/client_side.c
===================================================================
RCS file: /surf1/CVS/squid/src/client_side.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -w -c -r1.8 -r1.9
*** client_side.c	1996/08/19 22:46:00	1.8
--- client_side.c	1996/08/20 15:44:17	1.9
***************
*** 1,6 ****
  
  /*
!  * $Id: client_side.c,v 1.8 1996/08/19 22:46:00 wessels Exp $
   *
   * DEBUG: section 33    Client-side Routines
   * AUTHOR: Duane Wessels
--- 1,6 ----
  
  /*
!  * $Id: client_side.c,v 1.9 1996/08/20 15:44:17 wessels Exp $
   *
   * DEBUG: section 33    Client-side Routines
   * AUTHOR: Duane Wessels
***************
*** 113,119 ****
      requestUnlink(icpState->aclChecklist->request);
      safe_free(icpState->aclChecklist);
      icpState->aclHandler = NULL;
!     (*handler) (icpState, answer);
  }
  
  void clientAccessCheckDone(icpState, answer)
--- 113,119 ----
      requestUnlink(icpState->aclChecklist->request);
      safe_free(icpState->aclChecklist);
      icpState->aclHandler = NULL;
!     handler(icpState, answer);
  }
  
  void clientAccessCheckDone(icpState, answer)
Index: src/fqdncache.c
===================================================================
RCS file: /surf1/CVS/squid/src/fqdncache.c,v
retrieving revision 1.8
retrieving revision 1.10
diff -w -c -r1.8 -r1.10
*** fqdncache.c	1996/08/14 21:54:48	1.8
--- fqdncache.c	1996/08/21 05:59:20	1.10
***************
*** 1,6 ****
  
  /*
!  * $Id: fqdncache.c,v 1.8 1996/08/14 21:54:48 wessels Exp $
   *
   * DEBUG: section 35    FQDN Cache
   * AUTHOR: Harvest Derived
--- 1,6 ----
  
  /*
!  * $Id: fqdncache.c,v 1.10 1996/08/21 05:59:20 wessels Exp $
   *
   * DEBUG: section 35    FQDN Cache
   * AUTHOR: Harvest Derived
***************
*** 1029,1035 ****
       struct in_addr addr;
  {
      char *n;
      if ((n = fqdncache_gethostbyaddr(addr, 0)))
  	return n;
!     return inet_ntoa(addr);
  }
--- 1029,1037 ----
       struct in_addr addr;
  {
      char *n;
+     static char buf[32];
      if ((n = fqdncache_gethostbyaddr(addr, 0)))
  	return n;
!     strncpy(buf, inet_ntoa(addr), 31);
!     return buf;
  }
Index: src/ipcache.c
===================================================================
RCS file: /surf1/CVS/squid/src/ipcache.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -w -c -r1.39 -r1.40
*** ipcache.c	1996/08/19 22:44:53	1.39
--- ipcache.c	1996/08/21 05:50:08	1.40
***************
*** 1,5 ****
  /*
!  * $Id: ipcache.c,v 1.39 1996/08/19 22:44:53 wessels Exp $
   *
   * DEBUG: section 14    IP Cache
   * AUTHOR: Harvest Derived
--- 1,5 ----
  /*
!  * $Id: ipcache.c,v 1.40 1996/08/21 05:50:08 wessels Exp $
   *
   * DEBUG: section 14    IP Cache
   * AUTHOR: Harvest Derived
***************
*** 145,151 ****
  static int ipcache_compareLastRef _PARAMS((ipcache_entry **, ipcache_entry **));
  static int ipcache_dnsHandleRead _PARAMS((int, dnsserver_t *));
  static int ipcache_parsebuffer _PARAMS((char *buf, unsigned int offset, dnsserver_t *));
- static int ipcache_purgelru _PARAMS((void));
  static void ipcache_release _PARAMS((ipcache_entry *));
  static ipcache_entry *ipcache_GetFirst _PARAMS((void));
  static ipcache_entry *ipcache_GetNext _PARAMS((void));
--- 145,150 ----
***************
*** 315,321 ****
  }
  
  /* finds the LRU and deletes */
! static int ipcache_purgelru()
  {
      ipcache_entry *i = NULL;
      int local_ip_count = 0;
--- 314,320 ----
  }
  
  /* finds the LRU and deletes */
! int ipcache_purgelru()
  {
      ipcache_entry *i = NULL;
      int local_ip_count = 0;
***************
*** 1058,1064 ****
  	if (i->status == IP_PENDING || i->status == IP_DISPATCHED)
  	    ttl = 0;
  	else
! 	    ttl = (i->ttl - squid_curtime + i->timestamp);
  	storeAppendPrintf(sentry, " {%-32.32s %c %6d %d",
  	    i->name,
  	    ipcache_status_char[i->status],
--- 1057,1063 ----
  	if (i->status == IP_PENDING || i->status == IP_DISPATCHED)
  	    ttl = 0;
  	else
! 	    ttl = (i->ttl + i->timestamp - squid_curtime);
  	storeAppendPrintf(sentry, " {%-32.32s %c %6d %d",
  	    i->name,
  	    ipcache_status_char[i->status],
Index: src/ipcache.h
===================================================================
RCS file: /surf1/CVS/squid/src/ipcache.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -w -c -r1.11 -r1.12
*** ipcache.h	1996/07/12 17:40:10	1.11
--- ipcache.h	1996/08/21 05:50:09	1.12
***************
*** 1,5 ****
  /*
!  * $Id: ipcache.h,v 1.11 1996/07/12 17:40:10 wessels Exp $
   *
   * AUTHOR: Harvest Derived
   *
--- 1,5 ----
  /*
!  * $Id: ipcache.h,v 1.12 1996/08/21 05:50:09 wessels Exp $
   *
   * AUTHOR: Harvest Derived
   *
***************
*** 141,146 ****
--- 141,147 ----
  extern void ipcacheShutdownServers _PARAMS((void));
  extern void ipcacheOpenServers _PARAMS((void));
  extern void ipcacheReleaseInvalid _PARAMS((char *));
+ extern int ipcache_purgelru _PARAMS((void));
  
  extern char *dns_error_message;
  
Index: src/main.c
===================================================================
RCS file: /surf1/CVS/squid/src/main.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -w -c -r1.60 -r1.61
*** main.c	1996/08/19 22:44:54	1.60
--- main.c	1996/08/21 05:47:03	1.61
***************
*** 1,5 ****
  /*
!  * $Id: main.c,v 1.60 1996/08/19 22:44:54 wessels Exp $
   *
   * DEBUG: section 1     Startup and Main Loop
   * AUTHOR: Harvest Derived
--- 1,5 ----
  /*
!  * $Id: main.c,v 1.61 1996/08/21 05:47:03 wessels Exp $
   *
   * DEBUG: section 1     Startup and Main Loop
   * AUTHOR: Harvest Derived
***************
*** 586,591 ****
--- 586,592 ----
  		    send_announce();
  		last_announce = squid_curtime;
  	    }
+ 	    ipcache_purgelru();
  	    /* house keeping */
  	    break;
  	case COMM_SHUTDOWN:
Index: src/redirect.c
===================================================================
RCS file: /surf1/CVS/squid/src/redirect.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -w -c -r1.10 -r1.11
*** redirect.c	1996/08/19 22:46:01	1.10
--- redirect.c	1996/08/20 15:44:18	1.11
***************
*** 1,5 ****
  /*
!  * $Id: redirect.c,v 1.10 1996/08/19 22:46:01 wessels Exp $
   *
   * DEBUG: section 29    Redirector
   * AUTHOR: Duane Wessels
--- 1,5 ----
  /*
!  * $Id: redirect.c,v 1.11 1996/08/20 15:44:18 wessels Exp $
   *
   * DEBUG: section 29    Redirector
   * AUTHOR: Duane Wessels
***************
*** 305,311 ****
      if (!icpState)
  	fatal_dump("redirectStart: NULL icpState");
      if (Config.Program.redirect == NULL) {
! 	(*handler) (data, NULL);
  	return;
      }
      r = xcalloc(1, sizeof(redirectStateData));
--- 305,311 ----
      if (!icpState)
  	fatal_dump("redirectStart: NULL icpState");
      if (Config.Program.redirect == NULL) {
! 	handler(data, NULL);
  	return;
      }
      r = xcalloc(1, sizeof(redirectStateData));
Index: src/store.c
===================================================================
RCS file: /surf1/CVS/squid/src/store.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -w -c -r1.84 -r1.85
*** store.c	1996/08/19 23:09:25	1.84
--- store.c	1996/08/20 15:44:19	1.85
***************
*** 1,5 ****
  /*
!  * $Id: store.c,v 1.84 1996/08/19 23:09:25 wessels Exp $
   *
   * DEBUG: section 20    Storeage Manager
   * AUTHOR: Harvest Derived
--- 1,5 ----
  /*
!  * $Id: store.c,v 1.85 1996/08/20 15:44:19 wessels Exp $
   *
   * DEBUG: section 20    Storeage Manager
   * AUTHOR: Harvest Derived
***************
*** 501,512 ****
       SIH handler;
       void *data;
  {
-     int swap_in_stat = 0;
      int status = 0;
- 
      e->lock_count++;
      debug(20, 3, "storeLockObject: locks %d: '%s'\n", e->lock_count, e->key);
- 
      if (e->mem_status != NOT_IN_MEMORY)
  	/* ok, its either IN_MEMORY or SWAPPING_IN */
  	debug(20, 5, "storeLockObject: OK: mem_status is %s\n", memStatusStr[e->mem_status]);
--- 501,509 ----
***************
*** 519,545 ****
      else
  	fatal_dump(storeDescribeStatus(e));
      e->lastref = squid_curtime;
- 
      /* If the object is NOT_IN_MEMORY, fault it in. */
      if ((e->mem_status == NOT_IN_MEMORY) && (e->swap_status == SWAP_OK)) {
  	/* object is in disk and no swapping daemon running. Bring it in. */
! 	if ((swap_in_stat = storeSwapInStart(e, handler, data)) < 0) {
! 	    /*
! 	     * We couldn't find or couldn't open object's swapfile.
  	     * So, return a -1 here, indicating that we will treat
  	     * the reference like a MISS_TTL, force a keychange and
  	     storeRelease.  */
  	    e->lock_count--;
  	}
- 	status = swap_in_stat;
      } else if (e->mem_status == IN_MEMORY && handler) {
  	/* its already in memory, so call the handler */
! 	(*handler) (0, data);
      } else if (handler) {
  	/* The object is probably in state SWAPPING_IN, not much we can do.
  	 * Instead of returning failure here, we should have a list of complete
  	 * handlers which we could append to... */
! 	(*handler) (1, data);
      }
      return status;
  }
--- 516,539 ----
      else
  	fatal_dump(storeDescribeStatus(e));
      e->lastref = squid_curtime;
      /* If the object is NOT_IN_MEMORY, fault it in. */
      if ((e->mem_status == NOT_IN_MEMORY) && (e->swap_status == SWAP_OK)) {
  	/* object is in disk and no swapping daemon running. Bring it in. */
! 	if ((status = storeSwapInStart(e, handler, data)) < 0) {
! 	    /* We couldn't find or couldn't open object's swapfile.
  	     * So, return a -1 here, indicating that we will treat
  	     * the reference like a MISS_TTL, force a keychange and
  	     storeRelease.  */
  	    e->lock_count--;
  	}
      } else if (e->mem_status == IN_MEMORY && handler) {
  	/* its already in memory, so call the handler */
! 	handler(0, data);
      } else if (handler) {
  	/* The object is probably in state SWAPPING_IN, not much we can do.
  	 * Instead of returning failure here, we should have a list of complete
  	 * handlers which we could append to... */
! 	handler(1, data);
      }
      return status;
  }
***************
*** 2632,2637 ****
--- 2626,2632 ----
      for (j = 0; j < ncache_dirs; j++) {
  	for (i = 0; i < SWAP_DIRECTORIES_L1; i++) {
  	    sprintf(name, "%s/%02X", swappath(j), i);
+ 	    debug(20, 1, "Making directories in %s\n", name);
  	    if (mkdir(name, 0755) < 0) {
  		if (errno != EEXIST) {
  		    sprintf(tmp_error_buf,
Index: src/store_clean.c
===================================================================
RCS file: /surf1/CVS/squid/src/store_clean.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -w -c -r1.6 -r1.7
*** store_clean.c	1996/08/19 23:09:26	1.6
--- store_clean.c	1996/08/20 15:42:50	1.7
***************
*** 1,6 ****
  
  /*
!  * $Id: store_clean.c,v 1.6 1996/08/19 23:09:26 wessels Exp $
   *
   * DEBUG: section 36    Cache Directory Cleanup
   * AUTHOR: Duane Wessels
--- 1,6 ----
  
  /*
!  * $Id: store_clean.c,v 1.7 1996/08/20 15:42:50 wessels Exp $
   *
   * DEBUG: section 36    Cache Directory Cleanup
   * AUTHOR: Duane Wessels
***************
*** 79,85 ****
  	fatal_dump(NULL);
      }
      while ((de = readdir(dp)) && k < 20) {
! 	if (sscanf(de->d_name, "%d", &fileno) != 1)
  	    continue;
  	if (file_map_bit_test(fileno))
  	    continue;
--- 79,85 ----
  	fatal_dump(NULL);
      }
      while ((de = readdir(dp)) && k < 20) {
! 	if (sscanf(de->d_name, "%X", &fileno) != 1)
  	    continue;
  	if (file_map_bit_test(fileno))
  	    continue;