Changeset de645be52b417be48be0d95ec39f045439782fb6

Timestamp:

09/16/11 20:32:07 (2 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1316205127 -0400

git-parent:

[9eca23b16e66b798a03d5fbbd442b9f8c639c63e], [16b1bdd1a6ac2cff3a9d3145c7d31de06255c661]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1316205127 -0400

Message:

Merge branch 'dns_resolve_rtype' of https://github.com/gdusbabek/reconnoiter into dns_resolve_rtype

Files:

• src/modules/check_test.c (modified) (4 diffs)
• src/noit_check.c (modified) (6 diffs)
• src/noit_check.h (modified) (3 diffs)
• src/noit_check_rest.c (modified) (3 diffs)

src/modules/check_test.c

@@ -97 +97 @@
-noit_fire_check(xmlNodePtr attr, xmlNodePtr config, const char **error) {
-  char *target = NULL, *name = NULL, *module = NULL, *filterset = NULL;
-
+
+
-  noit_module_t *m;
-  noit_check_t *c = NULL;
@@ -116 +117 @@
-      timeout = atoi(timeout_str);
-      free(timeout_str);
-
+
+
-  }
-  m = noit_module_lookup(module);
@@ -139 +141 @@
-    goto error;
-  }
+  flags |= noit_calc_rtype_flag(resolve_rtype);
-  c = calloc(1, sizeof(*c));
-  noit_check_update(c, target, name, filterset,
-NP_TRANSIENT
+flags
-  c->module = strdup(module);
-  uuid_generate(c->checkid);
@@ -157 +160 @@
-  if(module) xmlFree(module);
-  if(filterset) xmlFree(filterset);
+  if (resolve_rtype) xmlFree(resolve_rtype);
-  return c;
-}

src/noit_check.c

@@ -107 +107 @@
-}
-int
+noit_calc_rtype_flag(char *resolve_rtype) {
+  int flags = 0;
+  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;
+  return flags;
+}
+int
-noit_check_max_initial_stutter() {
-  int stutter;
@@ -150 +159 @@
-    char filterset[256] = "";
-    char oncheck[1024] = "";
+    char resolve_rtype[16] = "";
-    int no_period = 0;
-    int no_oncheck = 0;
@@ -183 +193 @@
-    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 +230 @@
-    if(busted) flags |= (NP_UNCONFIG|NP_DISABLED);
-    else if(disabled) flags |= NP_DISABLED;
+
+    flags |= noit_calc_rtype_flag(resolve_rtype);
-
-    if(noit_hash_retrieve(&polls, (char *)uuid, UUID_SIZE,
@@ -569 +584 @@
-  } 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 +638 @@
-  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
-
+#define NP_PREFER_IPV6   0x00004000
+#define NP_SINGLE_RESOLVE 0x00008000
+
+#define PREFER_IPV4 "prefer-ipv4"
+#define PREFER_IPV6 "prefer-ipv6"
+#define FORCE_IPV4  "force-ipv4"
+#define FORCE_IPV6  "force-ipv6"
+
-#define NP_UNKNOWN '0'             /* stats_t.{available,state} */
-#define NP_AVAILABLE 'A'           /* stats_t.available */
@@ -156 +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))
+#define NOIT_CHECK_PREFER_V6(a) ((a)->flags & NP_PREFER_IPV6)
+#define NOIT_CHECK_SINGLE_RESOLVE(a) ((a)->flags & NP_SINGLE_RESOLVE)
-
-API_EXPORT(void) noit_poller_init();
@@ -245 +255 @@
-API_EXPORT(const char *)
-  noit_check_state_string(int16_t state);
+API_EXPORT(int)
+  noit_calc_rtype_flag(char *resolve_rtype);
-API_EXPORT(int)
-  noit_stats_snprint_metric_value(char *b, int l, metric_t *m);

src/noit_check_rest.c

@@ -197 +197 @@
-  SHOW_ATTR(attr,node,module);
-  SHOW_ATTR(attr,node,target);
+  SHOW_ATTR(attr,node,resolve_rtype);
-  SHOW_ATTR(attr,node,period);
-  SHOW_ATTR(attr,node,timeout);
@@ -283 +284 @@
-          }
-          target = 1;
+        }
+        else CHECK_N_SET(resolve_rtype) {
+          xmlChar *tmp;
+          noit_boolean invalid;
+          tmp = xmlNodeGetContent(an);
+          invalid = strcmp((char *)tmp, PREFER_IPV4) &&
+                    strcmp((char *)tmp, PREFER_IPV6) &&
+                    strcmp((char *)tmp, FORCE_IPV4) &&
+                    strcmp((char *)tmp, FORCE_IPV6);
+          xmlFree(tmp);
+          if(invalid) {
+            *error = "invalid reslove_rtype";
+            return 0;
+          }
-        }
-        else CHECK_N_SET(period) {
@@ -356 +371 @@
-    ATTR2PROP(name);
-    ATTR2PROP(target);
+    ATTR2PROP(resolve_rtype);
-    ATTR2PROP(module);
-    ATTR2PROP(period);