Changeset ec240f3789e4102e71fe1246fbff2af5f6fb3dc2

Timestamp:

03/16/09 19:44:52 (4 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1237232692 +0000

git-parent:

[5b175f1d6f70b127b0df3c66d53fff4ec99c769b]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1237232692 +0000

Message:

make ping cognizant of generation gaps on checks, fixes #107

Files:

• src/modules/ping_icmp.c (modified) (5 diffs)

src/modules/ping_icmp.c

@@ -45 +45 @@
-struct ping_payload {
-  uuid_t checkid;
+  u_int32_t generation;    
-  struct timeval whence;
-  int    check_no;
@@ -154 +155 @@
-  } from;
-  unsigned int from_len;
-;
+
-  struct icmp *icp;
-  struct ping_payload *payload;
@@ -193 +194 @@
-    }
-    check = noit_poller_lookup(payload->checkid);
+    /* make sure this check is from this generation! */
-    if(!check) {
-      char uuid_str[37];
@@ -198 +200 @@
-      noitLT(nlerr, now,
-             "ping_icmp response for unknown check '%s'\n", uuid_str);
+      continue;
+    }
+    if(check->generation != payload->generation) {
+      noitLT(nldeb, now,
+             "ping_icmp response in generation gap\n");
-      continue;
-    }
@@ -427 +434 @@
-
-    uuid_copy(payload->checkid, check->checkid);
+    payload->generation = check->generation;
-    payload->check_no = ci->check_no;
-    payload->check_pack_no = i;