Changeset 212da6e4b6f6b0af9ea0a9ceba106f42a1ea04df

Timestamp:

09/14/11 15:59:49 (2 years ago)

Author:

gdusbabek <gdusbabek@gmail.com>

git-committer:

gdusbabek <gdusbabek@gmail.com> 1316015989 -0500

git-parent:

[a33aa52dc08eb296a042f396243bde78cf840b99]

git-author:

gdusbabek <gdusbabek@gmail.com> 1315949729 -0500

Message:

apply resolve_rtype to check flags

Files:

• src/modules/check_test.c (modified) (4 diffs)
• src/noit_check.c (modified) (5 diffs)
• src/noit_check.h (modified) (2 diffs)
• src/noit_check_rest.c (modified) (1 diff)

src/modules/check_test.c

@@ -96 +96 @@
-noit_check_t *
-noit_fire_check(xmlNodePtr attr, xmlNodePtr config, const char **error) {
-
+, *resolve_rtype = NULL
-  int timeout = 0;
-  noit_module_t *m;
@@ -116 +116 @@
-      timeout = atoi(timeout_str);
-      free(timeout_str);
-
+
+
-  }
-  m = noit_module_lookup(module);
@@ -137 +138 @@
-    goto error;
-  }
+  int flags = NP_TRANSIENT;
+  flags |= strcmp(resolve_rtype, PREFER_IPV6) == 0 || strcmp(resolve_rtype, FORCE_IPV6) == 0 ? NP_PREFER_IPV6 : 0;
+  flags |= strcmp(resolve_rtype, FORCE_IPV4) == 0 || strcmp(resolve_rtype, FORCE_IPV6) == 0 ? NP_SINGLE_RESOLVE : 0;
-  c = calloc(1, sizeof(*c));
-  noit_check_update(c, target, name, filterset,
-NP_TRANSIENT
+flags
-  c->module = strdup(module);
-  uuid_generate(c->checkid);
@@ -155 +159 @@
-  if(module) xmlFree(module);
-  if(filterset) xmlFree(filterset);
+  if (resolve_rtype) xmlFree(resolve_rtype);
-  return c;
-}

src/noit_check.c

@@ -150 +150 @@
-    char filterset[256] = "";
-    char oncheck[1024] = "";
+    char resolve_rtype[16] = "";
-    int no_period = 0;
-    int no_oncheck = 0;
@@ -183 +184 @@
-    if(!INHERIT(stringbuf, filterset, filterset, sizeof(filterset)))
-      filterset[0] = '\0';
+    
+    if (!INHERIT(stringbuf, resolve_rtype, resolve_rtype, sizeof(resolve_rtype)))
+      strlcpy(resolve_rtype, PREFER_IPV4, sizeof(resolve_rtype));
-
-    if(!MYATTR(stringbuf, name, name, sizeof(name)))
@@ -217 +221 @@
-    if(busted) flags |= (NP_UNCONFIG|NP_DISABLED);
-    else if(disabled) flags |= NP_DISABLED;
+
+    flags |= strcmp(resolve_rtype, PREFER_IPV6) == 0 || strcmp(resolve_rtype, FORCE_IPV6) == 0 ? NP_PREFER_IPV6 : 0;
+    flags |= strcmp(resolve_rtype, FORCE_IPV4) == 0 || strcmp(resolve_rtype, FORCE_IPV6) == 0 ? NP_SINGLE_RESOLVE : 0;
-
-    if(noit_hash_retrieve(&polls, (char *)uuid, UUID_SIZE,
@@ -569 +576 @@
-  } a;
-
-
-
+
-  rv = inet_pton(family, ip_str, &a);
-
-AF_INET6
+ && !NOIT_CHECK_SINGLE_RESOLVE(new_check)
+family == AF_INET ? AF_INET6 : AF_INET
-    rv = inet_pton(family, ip_str, &a);
-    if(rv != 1) {
@@ -624 +630 @@
-  if(new_check->target) free(new_check->target);
-  new_check->target = strdup(target);
+
+  // apply resolution flags to check.
+  if (flags & NP_PREFER_IPV6)
+    new_check->flags |= NP_PREFER_IPV6;
+  else
+    new_check->flags &= ~NP_PREFER_IPV6;
+  if (flags & NP_SINGLE_RESOLVE)
+    new_check->flags |= NP_SINGLE_RESOLVE;
+  else
+    new_check->flags &= ~NP_SINGLE_RESOLVE;
-
-  if(noit_check_set_ip(new_check, target)) {

src/noit_check.h

@@ -73 +73 @@
-#define NP_SUPPRESS_METRICS 0x00002000
-
-      
-TRY_OTHER
-
-NP_
-NP_
-NP_
-NP_
+V6
+SINGLE
+
+
+
+
+
-
-#define NP_UNKNOWN '0'             /* stats_t.{available,state} */
@@ -164 +164 @@
-/* It is resolved if it is resolved or never needed to be resolved */
-#define NOIT_CHECK_RESOLVED(a) (((a)->flags & NP_RESOLVED) || (((a)->flags & NP_RESOLVE) == 0))
-4(a) (((a)->flags & NP_PREFER_IP) == 0
-TRY_OTHER_RESOLVE(a) ((a)->flags & NP_TRY_OTHER
+6(a) (((a)->flags & NP_PREFER_IPV6) == NP_PREFER_IPV6
+SINGLE_RESOLVE(a) (((a)->flags & NP_SINGLE_RESOLVE) == NP_SINGLE
-
-API_EXPORT(void) noit_poller_init();

src/noit_check_rest.c

@@ -289 +289 @@
-          noit_boolean invalid;
-          tmp = xmlNodeGetContent(an);
-NP_PREFER_IPV4) && strcmp((char *)tmp, NP_PREFER_IPV6) && strcmp((char *)tmp, NP_FORCE_IPV4) && strcmp((char *)tmp, NP_
+PREFER_IPV4) && strcmp((char *)tmp,PREFER_IPV6) && strcmp((char *)tmp, FORCE_IPV4) && strcmp((char *)tmp, 
-          xmlFree(tmp);
-          if(invalid) {