ugly functions can be put in the examples, not need to clutter the

lib with this

diff --git a/examples/ldns-update.c b/examples/ldns-update.c
index 93cb15e0ce4e26692eb5629e0815dfed26c0c984..0b6d0d5e2fb333ed334582c4dd662e64a8675237 100644 (file)
--- a/examples/ldns-update.c
+++ b/examples/ldns-update.c
@@ -11,6 +11,124 @@
 #include <strings.h>
 #include <ldns/dns.h>
 
+/* dynamic update stuff */
+ldns_resolver *
+ldns_update_resolver_new(const char *fqdn, const char *zone,
+    ldns_rr_class class, uint16_t port, ldns_tsig_credentials *tsig_cred, ldns_rdf **zone_rdf)
+{
+        ldns_resolver   *r1, *r2;
+        ldns_pkt        *query = NULL, *resp;
+        ldns_rr_list    *nslist, *iplist;
+        ldns_rdf        *soa_zone, *soa_mname, *ns_name;
+        size_t          i;
+        ldns_status     s;
+
+        if (class == 0) {
+                class = LDNS_RR_CLASS_IN;
+        }
+
+        if (port == 0) {
+                port = LDNS_PORT;
+        }
+
+        /* First, get data from /etc/resolv.conf */
+        s = ldns_resolver_new_frm_file(&r1, NULL);
+        if (s != LDNS_STATUS_OK) {
+                return NULL;
+        }
+
+        r2 = ldns_resolver_new();
+        if (!r2) {
+                goto bad;
+        }
+        ldns_resolver_set_port(r2, port);
+
+        /* TSIG key data available? Copy into the resolver. */
+        if (tsig_cred) {
+                ldns_resolver_set_tsig_algorithm(r2, ldns_tsig_algorithm(tsig_cred));
+                ldns_resolver_set_tsig_keyname(r2, ldns_tsig_keyname_clone(tsig_cred));
+                /*
+                 * XXX Weird that ldns_resolver_deep_free() will free()
+                 * keyname but not hmac key data?
+                 */
+                ldns_resolver_set_tsig_keydata(r2, ldns_tsig_keydata_clone(tsig_cred));
+        }
+
+        /* Now get SOA zone, mname, NS, and construct r2. [RFC2136 4.3] */
+
+        /* Explicit 'zone' or no? */
+        if (zone) {
+                soa_zone = ldns_dname_new_frm_str(zone);
+                if (ldns_update_soa_mname(soa_zone, r1, class, &soa_mname)
+                    != LDNS_STATUS_OK)
+                        goto bad;
+        } else {
+                if (ldns_update_soa_zone_mname(fqdn, r1, class, &soa_zone,
+                        &soa_mname) != LDNS_STATUS_OK)
+                        goto bad;
+        }
+
+        /* Pass zone_rdf on upwards. */
+        *zone_rdf = ldns_rdf_clone(soa_zone);
+
+        /* NS */
+        query = ldns_pkt_query_new(soa_zone, LDNS_RR_TYPE_NS, class, LDNS_RD);
+        if (!query)
+                goto bad;
+        soa_zone = NULL;
+
+        ldns_pkt_set_random_id(query);
+
+        if (ldns_resolver_send_pkt(&resp, r1, query) != LDNS_STATUS_OK) {
+                dprintf("%s", "NS query failed!\n");
+                goto bad;
+        }
+        ldns_pkt_free(query);
+        if (!resp)
+                goto bad;
+
+        /* Match SOA MNAME to NS list, adding it first */
+        nslist = ldns_pkt_answer(resp);
+        for (i = 0; i < ldns_rr_list_rr_count(nslist); i++) {
+                ns_name = ldns_rr_rdf(ldns_rr_list_rr(nslist, i), 0);
+                if (!ns_name)
+                        continue;
+                if (ldns_rdf_compare(soa_mname, ns_name) == 0) {
+                        /* Match */
+                        iplist = ldns_get_rr_list_addr_by_name(r1, ns_name, class, 0);
+                        (void) ldns_resolver_push_nameserver_rr_list(r2, iplist);
+                        break;
+                }
+        }
+
+        /* Then all the other NSs. XXX Randomize? */
+        for (i = 0; i < ldns_rr_list_rr_count(nslist); i++) {
+                ns_name = ldns_rr_rdf(ldns_rr_list_rr(nslist, i), 0);
+                if (!ns_name)
+                        continue;
+                if (ldns_rdf_compare(soa_mname, ns_name) != 0) {
+                        /* No match, add it now. */
+                        iplist = ldns_get_rr_list_addr_by_name(r1, ns_name, class, 0);
+                        (void) ldns_resolver_push_nameserver_rr_list(r2, iplist);
+                }
+        }
+
+        ldns_resolver_set_random(r2, false);
+        ldns_pkt_free(resp);
+        ldns_resolver_deep_free(r1);
+        return r2;
+
+  bad:
+        if (r1)
+                ldns_resolver_deep_free(r1);
+        if (r2)
+                ldns_resolver_deep_free(r2);
+        if (query)
+                ldns_pkt_free(query);
+        if (resp)
+                ldns_pkt_free(resp);
+        return NULL;
+}
 
 void
 usage(FILE *fp, char *prog) {
@@ -30,7 +148,7 @@ main(int argc, char **argv)
        ldns_tsig_credentials   tsig_cr, *tsig_cred;
        int             c = 2;
        uint16_t        defttl = 300;
-       uint16_t        port = 53;
+       uint16_t        port = 5353;
        
        prog = strdup(argv[0]);
 

diff --git a/higher.c b/higher.c
index 9f0d40bc0ddcbfaa08c6c21903cea0d11bda9448..f1c0c33783f4c44478b99a4e94172b7ec8076282 100644 (file)
--- a/higher.c
+++ b/higher.c
@@ -304,8 +304,7 @@ ldns_update_send_simple_addr(const char *fqdn, const char *zone,
                return LDNS_STATUS_ERR;
 
        /* Create resolver */
-       res = ldns_update_resolver_new(fqdn, zone, 0, p, tsig_cred,
-           &zone_rdf);
+       res = ldns_update_resolver_new(fqdn, zone, 0, p, tsig_cred, &zone_rdf);
        if (!res || !zone_rdf)
                goto cleanup;
 

diff --git a/ldns/resolver.h b/ldns/resolver.h
index f8a3c2333c0864f7f1ddac081e130139e137887f..586f437a9f159f63acd5e1f90f7264114b39bbc9 100644 (file)
--- a/ldns/resolver.h
+++ b/ldns/resolver.h
@@ -635,17 +635,4 @@ ldns_pkt *ldns_axfr_last_pkt(const ldns_resolver *res);
  */
 void ldns_resolver_nameservers_randomize(ldns_resolver *r);
 
-/**
- * Create a resolver suitable for use with UPDATE. [RFC2136 4.3]
- * SOA MNAME is used as the "primary master".
- * \param[in] fqdn FQDN of a host in a zone
- * \param[in] zone zone name, if explicitly given, otherwise use SOA
- * \param[in] clas zone class
- * \param[in] p use p as port number 
- * \param[in] tsig_cred TSIG credentials
- * \param[out] zone_rdf returns zone/owner rdf from the 'fqdn' SOA MNAME query
- * \return the new resolver
- */
-ldns_resolver * ldns_update_resolver_new(const char *fqdn, const char *zone, ldns_rr_class clas, uint16_t p, ldns_tsig_credentials *tsig_cred, ldns_rdf **zone_rdf);
-
 #endif  /* LDNS_RESOLVER_H */

diff --git a/resolver.c b/resolver.c
index 030c6ce91a62cb18dac28e370a94d050f00e0d3b..741cd265b46c1b09fb6f1db9cfc40204a5829cba 100644 (file)
--- a/resolver.c
+++ b/resolver.c
@@ -1018,124 +1018,3 @@ ldns_resolver_nameservers_randomize(ldns_resolver *r)
        }
        ldns_resolver_set_nameservers(r, ns);
 }
-
-/* dynamic update stuff */
-ldns_resolver *
-ldns_update_resolver_new(const char *fqdn, const char *zone,
-    ldns_rr_class class, uint16_t port, ldns_tsig_credentials *tsig_cred, ldns_rdf **zone_rdf)
-{
-       ldns_resolver   *r1, *r2;
-       ldns_pkt        *query = NULL, *resp;
-       ldns_rr_list    *nslist, *iplist;
-       ldns_rdf        *soa_zone, *soa_mname, *ns_name;
-       size_t          i;
-       ldns_status     s;
-
-       if (class == 0) {
-               class = LDNS_RR_CLASS_IN;
-       }
-
-       if (port == 0) {
-               port = LDNS_PORT;
-       }
-
-       /* First, get data from /etc/resolv.conf */
-        s = ldns_resolver_new_frm_file(&r1, NULL);
-       if (s != LDNS_STATUS_OK) {
-               return NULL;
-       }
-
-       r2 = ldns_resolver_new();
-       if (!r2) {
-               goto bad;
-       }
-       ldns_resolver_set_port(r2, port);
-       ldns_resolver_set_port(r1, port);
-
-       /* TSIG key data available? Copy into the resolver. */
-       if (tsig_cred) {
-               ldns_resolver_set_tsig_algorithm(r2, ldns_tsig_algorithm(tsig_cred));
-               ldns_resolver_set_tsig_keyname(r2, ldns_tsig_keyname_clone(tsig_cred));
-               /*
-                * XXX Weird that ldns_resolver_deep_free() will free()
-                * keyname but not hmac key data?
-                */
-               ldns_resolver_set_tsig_keydata(r2, ldns_tsig_keydata_clone(tsig_cred));
-       }
-       
-       /* Now get SOA zone, mname, NS, and construct r2. [RFC2136 4.3] */
-
-       /* Explicit 'zone' or no? */
-       if (zone) {
-               soa_zone = ldns_dname_new_frm_str(zone);
-               if (ldns_update_soa_mname(soa_zone, r1, class, &soa_mname)
-                   != LDNS_STATUS_OK)
-                       goto bad;
-       } else {
-               if (ldns_update_soa_zone_mname(fqdn, r1, class, &soa_zone,
-                       &soa_mname) != LDNS_STATUS_OK)
-                       goto bad;
-       }
-       
-       /* Pass zone_rdf on upwards. */
-       *zone_rdf = ldns_rdf_clone(soa_zone);
-       
-       /* NS */
-       query = ldns_pkt_query_new(soa_zone, LDNS_RR_TYPE_NS, class, LDNS_RD);
-       if (!query)
-               goto bad;
-       soa_zone = NULL;
-
-       ldns_pkt_set_random_id(query);
-       
-       if (ldns_resolver_send_pkt(&resp, r1, query) != LDNS_STATUS_OK) {
-               dprintf("%s", "NS query failed!\n");
-               goto bad;
-       }
-       ldns_pkt_free(query);
-       if (!resp)
-               goto bad;
-
-       /* Match SOA MNAME to NS list, adding it first */
-       nslist = ldns_pkt_answer(resp);
-       for (i = 0; i < ldns_rr_list_rr_count(nslist); i++) {
-               ns_name = ldns_rr_rdf(ldns_rr_list_rr(nslist, i), 0);
-               if (!ns_name)
-                       continue;
-               if (ldns_rdf_compare(soa_mname, ns_name) == 0) {
-                       /* Match */
-                       iplist = ldns_get_rr_list_addr_by_name(r1, ns_name, class, 0);
-                       (void) ldns_resolver_push_nameserver_rr_list(r2, iplist);
-                       break;
-               }
-       }
-
-       /* Then all the other NSs. XXX Randomize? */
-       for (i = 0; i < ldns_rr_list_rr_count(nslist); i++) {
-               ns_name = ldns_rr_rdf(ldns_rr_list_rr(nslist, i), 0);
-               if (!ns_name)
-                       continue;
-               if (ldns_rdf_compare(soa_mname, ns_name) != 0) {
-                       /* No match, add it now. */
-                       iplist = ldns_get_rr_list_addr_by_name(r1, ns_name, class, 0);
-                       (void) ldns_resolver_push_nameserver_rr_list(r2, iplist);
-               }
-       }
-
-       /* Cleanup and return. */
-       ldns_resolver_set_random(r2, false);
-       ldns_pkt_free(resp);
-       ldns_resolver_deep_free(r1);
-       return r2;
-       
-  bad:
-       if (r1)
-               ldns_resolver_deep_free(r1);
-       if (r2)
-               ldns_resolver_deep_free(r2);
-       if (query)
-               ldns_pkt_free(query);
-       if (resp)
-               ldns_pkt_free(resp);
-       return NULL;
-}