Changeset 3476154bc836934aa71aaecb12a5a2443a6fc26d

Timestamp:

08/09/12 16:34:25 (10 months ago)

Author:

Theo Schlossnagle <jesus@lethargy.org>

git-committer:

Theo Schlossnagle <jesus@lethargy.org> 1344530065 -0700

git-parent:

[a36e20f834b280d8a64b7271e670e7ccf3b39e90], [666f9c351646125cb4a68c692457e6fdf7432534]

git-author:

Theo Schlossnagle <jesus@lethargy.org> 1344530065 -0700

Message:

Merge pull request #100 from pamaddox/master

Updated to use target_ip in noit_check skiplist

Files:

• src/noit_check.c (modified) (7 diffs)

src/noit_check.c

@@ -114 +114 @@
-  return 0;
-}
+static int
+noit_check_add_to_list(noit_check_t *new_check) {
+  if(!(new_check->flags & NP_TRANSIENT)) {
+    /* This remove could fail -- no big deal */
+    noit_skiplist_remove(&polls_by_name, new_check, NULL);
+
+    /* This insert could fail.. which means we have a conflict on
+     * target`name.  That should result in the check being disabled. */
+    if(!noit_skiplist_insert(&polls_by_name, new_check)) {
+      noitL(noit_stderr, "Check %s`%s disabled due to naming conflict\n",
+            new_check->target, new_check->name);
+      new_check->flags |= NP_DISABLED;
+    }
+  }
+  return 1;
+}
-
-u_int64_t noit_check_completion_count() {
@@ -191 +207 @@
-  if(ac->period < bc->period) return -1;
-  if(ac->period == bc->period) return 0;
+  return 1;
+}
+static int __check_target_ip_compare(const void *a, const void *b) {
+  const noit_check_t *ac = a;
+  const noit_check_t *bc = b;
+  int rv;
+  if (ac->target_ip == NULL) return 1;
+  if (bc->target_ip == NULL) return -1;
+  if((rv = strcmp(ac->target_ip, bc->target_ip)) != 0) return rv;
+  if (ac->name == NULL) return 1;
+  if (bc->name == NULL) return -1;
+  if((rv = strcmp(ac->name, bc->name)) != 0) return rv;
-  return 1;
-}
@@ -525 +553 @@
-  noit_skiplist_set_compare(&polls_by_name, __check_name_compare,
-                            __check_name_compare);
+  noit_skiplist_add_index(&polls_by_name, __check_target_ip_compare,
+                            __check_target_ip_compare);
-  noit_skiplist_init(&watchlist);
-  noit_skiplist_set_compare(&watchlist, __watchlist_compare,
@@ -710 +740 @@
-  int8_t family;
-  int rv, failed = 0;
+  char old_target_ip[INET6_ADDRSTRLEN];
-  union {
-    struct in_addr addr4;
-    struct in6_addr addr6;
-  } a;
+
+  memset(old_target_ip, 0, INET6_ADDRSTRLEN);
+  strlcpy(old_target_ip, new_check->target_ip, sizeof(old_target_ip));
-
-  family = NOIT_CHECK_PREFER_V6(new_check) ? AF_INET6 : AF_INET;
@@ -741 +775 @@
-      noitL(noit_error, "inet_ntop failed [%s] -> %d\n", ip_str, errno);
-    }
+  if ((failed == 0) && (new_check->name != NULL) && (strcmp(old_target_ip, new_check->target_ip) != 0)) {
+    noit_check_add_to_list(new_check);
+  }
-  return failed;
-}
@@ -834 +871 @@
-  new_check->flags = (new_check->flags & ~mask) | flags;
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-  noit_check_log_check(new_check);
-  return 0;
@@ -1013 +1039 @@
-  int count = 0;
-  noit_check_t pivot;
+  noit_skiplist *tlist;
-  noit_skiplist_node *next;
+  noit_skiplist_node *sn;
+
+  sn = noit_skiplist_getlist(polls_by_name.index);
+  tlist = sn->data;
-
-  memset(&pivot, 0, sizeof(pivot));
-pivot.target = (char *)target
+strlcpy(pivot.target_ip, (char*)target, sizeof(pivot.target_ip))
-  pivot.name = "";
-
+
+
-  while(next && next->data) {
-    noit_check_t *check = next->data;
-
+_ip
-    count += f(check,closure);
-    noit_skiplist_next(&polls_by_name, &next);