Changeset a33aa52dc08eb296a042f396243bde78cf840b99

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:

[1f3d77e42e6c55977e550e9ba33cd3ebe2228a1b]

git-author:

gdusbabek <gdusbabek@gmail.com> 1315924790 -0500

Message:

validate resolve_rtype and show in xml

Files:

• src/noit_check.h (modified) (1 diff)
• src/noit_check_rest.c (modified) (4 diffs)

src/noit_check.h

@@ -76 +76 @@
-#define NP_TRY_OTHER_RESOLVE 0x00008000
-
+#define NP_PREFER_IPV4 "prefer-ipv4"
+#define NP_PREFER_IPV6 "prefer-ipv6"
+#define NP_FORCE_IPV4  "force-ipv4"
+#define NP_FORCE_IPV6  "force-ipv6"
+
-#define NP_UNKNOWN '0'             /* stats_t.{available,state} */
-#define NP_AVAILABLE 'A'           /* stats_t.available */

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);
@@ -246 +247 @@
-                              const char **error) {
-  xmlNodePtr root, tl, an;
-
+resolve_rtype=0, 
-  *a = *c = NULL;
-  root = xmlDocGetRootElement(doc);
@@ -283 +284 @@
-          }
-          target = 1;
+        }
+        else CHECK_N_SET(resolve_rtype) {
+          xmlChar *tmp;
+          noit_boolean invalid;
+          tmp = xmlNodeGetContent(an);
+          invalid = strcmp((char *)tmp, NP_PREFER_IPV4) && strcmp((char *)tmp, NP_PREFER_IPV6) && strcmp((char *)tmp, NP_FORCE_IPV4) && strcmp((char *)tmp, NP_FORCE_IPV6);
+          xmlFree(tmp);
+          if(invalid) {
+            *error = "invalid reslove_rtype";
+            return 0;
+          }
+          resolve_rtype = 1;
-        }
-        else CHECK_N_SET(period) {
@@ -356 +369 @@
-    ATTR2PROP(name);
-    ATTR2PROP(target);
+    ATTR2PROP(resolve_rtype);
-    ATTR2PROP(module);
-    ATTR2PROP(period);