FMR fixes

diff --git a/src/neighbors.cc b/src/neighbors.cc
index fbc3567dfcc542fd7394a35483741ed34599181b..bd211cc862c55cd5b0dfcf46132a4cfdaf8927dd 100644 (file)
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: neighbors.cc,v 1.74 1996/10/28 07:44:24 wessels Exp $
+ * $Id: neighbors.cc,v 1.75 1996/10/30 09:28:02 wessels Exp $
  *
  * DEBUG: section 15    Neighbor Routines
  * AUTHOR: Harvest Derived
@@ -697,8 +697,10 @@ neighborsUdpAck(int fd, char *url, icp_common_t * header, struct sockaddr_in *fr
                debug(15, 0, "95%% of replies from '%s' are UDP_DENIED\n", e->host);
                debug(15, 0, "Disabling '%s', please check your configuration.\n", e->host);
                neighborRemove(e);
+               e = NULL;
+           } else {
+               neighborCountIgnored(e, opcode);
            }
-           neighborCountIgnored(e, opcode);
        }
     } else if (opcode == ICP_OP_RELOADING) {
        if (e)

diff --git a/src/store.cc b/src/store.cc
index 35d9af8f17469b69a45ba0f2f9d89b6e88a42e75..9618247b26dc38bbce9c840f4791b9456334a44e 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store.cc,v 1.143 1996/10/29 02:40:36 wessels Exp $
+ * $Id: store.cc,v 1.144 1996/10/30 09:28:04 wessels Exp $
  *
  * DEBUG: section 20    Storeage Manager
  * AUTHOR: Harvest Derived
@@ -1840,16 +1840,16 @@ storeGetMemSpace(int size)
            n_expired++;
            storeRelease(e);
        } else if (storeCheckPurgeMem(e)) {
+           debug(20, 3, "storeGetMemSpace: Adding '%s'\n", e->url);
            *(list + list_count) = e;
            list_count++;
        } else if (!storeEntryLocked(e)) {
+           debug(20, 3, "storeGetMemSpace: Adding '%s'\n", e->url);
            *(list + list_count) = e;
            list_count++;
        } else {
            n_locked++;
-           continue;
        }
-       debug(20, 3, "storeGetMemSpace: Adding '%s'\n", e->url);
     }
     debug(20, 5, "storeGetMemSpace: Sorting LRU_list: %7d items\n", list_count);
     qsort((char *) list,