Changeset 9761c2f27f1d8476cd82892ad939edc6df00ab20 for src

Timestamp:

01/07/11 15:55:57 (8 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[ae6a9eb3d143c05a62c9a1bd8044e92029015036]

git-author:

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

Message:

fixes #339

Files:

• src/modules/dns.c (modified) (4 diffs)
• src/modules/dns.xml (modified) (1 diff)

src/modules/dns.c

@@ -220 +220 @@
-static int dns_interpolate_inaddr_arpa(char *buff, int len, const char *ip) {
-  const char *b, *e;
-
+
+
-  int il;
+  struct {
+    struct in_addr addr;
+    struct in6_addr addr6;
+  } a;
-  /* This function takes a dot delimited string as input and
-   * reverses the parts split on dot.
-   */
+  if (dns_pton(AF_INET, ip, &a.addr) > 0) {
+    dns_a4todn(&a.addr, 0, dn, sizeof(dn));
+    dns_dntop(dn,buff,len);
+    return strlen(buff);
+  }
+  else if (dns_pton(AF_INET6, ip, &a.addr6) > 0) {
+    dns_a6todn(&a.addr6, 0, dn, sizeof(dn));
+    dns_dntop(dn,buff,len);
+    return strlen(buff);
+  }
+
+  o = buff;
-  il = strlen(ip);
-  if(len <= il) {
@@ -246 +263 @@
-  assert((o - buff) == il);
-  return o - buff;
+}
+static int dns_interpolate_reverse_ip(char *buff, int len, const char *ip) {
+#define IN4ADDRARPA_LEN 13 // strlen(".in-addr.arpa");
+#define IN6ADDRARPA_LEN 9 // strlen(".ip6.arpa");
+  dns_interpolate_inaddr_arpa(buff,len,ip);
+  if(len > IN4ADDRARPA_LEN &&
+     !strcmp(buff+len-IN4ADDRARPA_LEN, ".in-addr.arpa"))
+    buff[len-IN4ADDRARPA_LEN] = '\0';
+  else if((len > IN6ADDRARPA_LEN) &&
+          !strcmp(buff+len-IN6ADDRARPA_LEN, ".ip6.arpa"))
+    buff[len-IN6ADDRARPA_LEN] = '\0';
+  return strlen(buff);
-}
-
@@ -267 +296 @@
-  noit_check_interpolate_register_oper_fn("inaddrarpa",
-                                          dns_interpolate_inaddr_arpa);
+  noit_check_interpolate_register_oper_fn("reverseip",
+                                          dns_interpolate_reverse_ip);
-
-  if (dns_init(NULL, 0) < 0 || (pctx = dns_new(NULL)) == NULL) {
@@ -595 +626 @@
-     *   nameserver to NULL
-     *   rtype to PTR
-.in-addr.arpa
+
-     */
-    nameserver = NULL;
-    rtype = "PTR";
-.in-addr.arpa
+
-  }
-  else {

src/modules/dns.xml

@@ -22 +22 @@
-    <parameter name="query"
-               required="required"
-.in-addr.arpa
+
-               allowed=".+">The query to send.  If the name of the check is in-addr.arpa, the reverse IP octet notation of in-addr.arpa syntax is synthesized by default.  Otherwise the default query is the name of the check itself.</parameter>
-    <parameter name="want_sort"