From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Thu, 13 May 2010 16:29:00 +0000 (+0200)
Subject: Rehash NTP source table after removing source
X-Git-Tag: 1.25-pre1~81
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5fb0a9d53b371f6d419fcbeb83251421cb3a42e5;p=thirdparty%2Fchrony.git

Rehash NTP source table after removing source

This is needed to avoid breaking a probe sequence and losing another
source. It is costly, but it's not expected to happen frequently.
---

diff --git a/ntp_sources.c b/ntp_sources.c
index 00f8e3e4..3750ef29 100644
--- a/ntp_sources.c
+++ b/ntp_sources.c
@@ -295,19 +295,41 @@ NSR_AddUnresolvedSource(char *name, int port, NTP_Source_Type type, SourceParame
 NSR_Status
 NSR_RemoveSource(NTP_Remote_Address *remote_addr)
 {
-  int slot, found;
+  int i, slot, found;
+  SourceRecord temp_records[N_RECORDS];
 
   assert(initialised);
 
   find_slot(remote_addr, &slot, &found);
   if (!found) {
     return NSR_NoSuchSource;
-  } else {
-    n_sources--;
-    records[slot].remote_addr = NULL;
-    NCR_DestroyInstance(records[slot].data);
-    return NSR_Success;
   }
+
+  n_sources--;
+  records[slot].remote_addr = NULL;
+  NCR_DestroyInstance(records[slot].data);
+
+  /* Rehash the table to make sure there are no broken probe sequences.
+     This is costly, but it's not expected to happen frequently. */
+
+  memcpy(temp_records, records, sizeof (records));
+
+  for (i = 0; i < N_RECORDS; i++) {
+    records[i].remote_addr = NULL;
+  }
+  
+  for (i = 0; i < N_RECORDS; i++) {
+    if (!temp_records[i].remote_addr)
+      continue;
+
+    find_slot(temp_records[i].remote_addr, &slot, &found);
+    assert(!found);
+
+    records[slot].remote_addr = temp_records[i].remote_addr;
+    records[slot].data = temp_records[i].data;
+  }
+
+  return NSR_Success;
 }
 
 /* ================================================== */