status code return, added ldns_resolver_send_pkt for prebuilt packets (but with some...

diff --git a/ldns/resolver.h b/ldns/resolver.h
index e02f9c30bd6ffe5883bf7ffd82b88199ee7b49c8..d21fac77ca5776f701ff7a35ceec2d90d44cdee2 100644 (file)
--- a/ldns/resolver.h
+++ b/ldns/resolver.h
@@ -190,6 +190,7 @@ ldns_pkt * ldns_resolver_search(ldns_resolver *, ldns_rdf*, ldns_rr_type, ldns_r
 
 /**
  * \brief Send the query for *name as-is 
+ * \param[out] **answer, a pointer to a ldns_pkt pointer (initialized by this function)
  * \param[in] *r operate using this resolver
  * \param[in] *name query for this name
  * \param[in] *type query for this type (may be 0, defaults to A)
@@ -197,7 +198,15 @@ ldns_pkt * ldns_resolver_search(ldns_resolver *, ldns_rdf*, ldns_rr_type, ldns_r
  * \param[in] flags the query flags
  * \return ldns_pkt* a packet with the reply from the nameserver
  */
-ldns_pkt * ldns_resolver_send(ldns_resolver *, ldns_rdf*, ldns_rr_type, ldns_rr_class, uint16_t);
+ldns_status ldns_resolver_send(ldns_pkt **answer, ldns_resolver *, ldns_rdf*, ldns_rr_type, ldns_rr_class, uint16_t);
+
+/**
+ * \brief Send the given packet to a nameserver
+ * \param[out] **answer, a pointer to a ldns_pkt pointer (initialized by this function)
+ * \param[in] *r operate using this resolver
+ * \param[in] *query_pkt query
+ */
+ldns_status ldns_resolver_send_pkt(ldns_pkt **answer, ldns_resolver *, ldns_pkt *query_pkt);
 
 /**
  * Send a qeury to a nameserver

diff --git a/resolver.c b/resolver.c
index 939e9c651f453e470aaceb6fe80d38f475b23206..22f341856e03cdda565c78dbd7bcfe844e3ba2a8 100644 (file)
--- a/resolver.c
+++ b/resolver.c
@@ -590,32 +590,53 @@ ldns_resolver_query(ldns_resolver *r, ldns_rdf *name, ldns_rr_type type, ldns_rr
 {
        ldns_rdf *newname;
        ldns_pkt *pkt;
+       ldns_status status;
 
        if (!ldns_resolver_defnames(r)) {
-               return ldns_resolver_send(r, name, type, class, flags);
+               status = ldns_resolver_send(&pkt, r, name, type, class, flags);
+               return pkt;
        }
        if (!ldns_resolver_domain(r)) {
                /* _defnames is set, but the domain is not....?? */
-               return ldns_resolver_send(r, name, type, class, flags);
+               status - ldns_resolver_send(&pkt, r, name, type, class, flags);
+               return pkt;
        }
 
        newname = ldns_dname_cat(name, ldns_resolver_domain(r));
        if (!newname) {
                return NULL;
        }
-       pkt = ldns_resolver_send(r, newname, type, class, flags);
+       status = ldns_resolver_send(&pkt, r, newname, type, class, flags);
        ldns_rdf_free(newname);
        return pkt;
 }
 
-ldns_pkt *
-ldns_resolver_send(ldns_resolver *r, ldns_rdf *name, ldns_rr_type type, ldns_rr_class class,
+ldns_status
+ldns_resolver_send_pkt(ldns_pkt **answer, ldns_resolver *r, ldns_pkt *query_pkt)
+{
+       uint8_t  retries;
+       ldns_pkt *answer_pkt = NULL;
+
+       /* return NULL on error */
+       for (retries = ldns_resolver_retry(r); retries > 0; retries--) {
+               answer_pkt = ldns_send(r, query_pkt);
+               if (answer_pkt) {
+                       break;
+               }
+       }
+       
+       *answer = answer_pkt;
+       return LDNS_STATUS_OK;
+}
+
+/* TODO: other error codes than _ERR */
+ldns_status
+ldns_resolver_send(ldns_pkt **answer, ldns_resolver *r, ldns_rdf *name, ldns_rr_type type, ldns_rr_class class,
                uint16_t flags)
 {
        ldns_pkt *query_pkt;
        ldns_pkt *answer_pkt;
        uint16_t id;
-       uint8_t  retries;
        
        ldns_status status;
 
@@ -635,18 +656,18 @@ ldns_resolver_send(ldns_resolver *r, ldns_rdf *name, ldns_rr_type type, ldns_rr_
        }
        if (0 == ldns_resolver_nameserver_count(r)) {
                dprintf("%s", "resolver has no nameservers\n");
-               return NULL;
+               return LDNS_STATUS_ERR;
        }
        if (ldns_rdf_get_type(name) != LDNS_RDF_TYPE_DNAME) {
                dprintf("%s", "query type is not correct type\n");
-               return NULL;
+               return LDNS_STATUS_ERR;
        }
        /* prepare a question pkt from the parameters
         * and then send this */
        query_pkt = ldns_pkt_query_new(ldns_rdf_deep_clone(name), type, class, flags);
        if (!query_pkt) {
                dprintf("%s", "Failed to generate pkt\n");
-               return NULL;
+               return LDNS_STATUS_ERR;
        }
 
        /* transfer the udp_edns_size from the resolver to the packet */
@@ -687,20 +708,16 @@ ldns_resolver_send(ldns_resolver *r, ldns_rdf *name, ldns_rr_type type, ldns_rr_
                /* TODO: no print and feedback to caller */
                if (status != LDNS_STATUS_OK) {
                        dprintf("error creating tsig: %u\n", status);
-                       return NULL;
-               }
-       }
-       /* return NULL on error */
-       for (retries = ldns_resolver_retry(r); retries > 0; retries--) {
-               answer_pkt = ldns_send(r, query_pkt);
-               if (answer_pkt) {
-                       break;
+                       return LDNS_STATUS_ERR;
                }
        }
-       
+
+       status = ldns_resolver_send_pkt(&answer_pkt, r, query_pkt);
+
        ldns_pkt_free(query_pkt);
        
-       return answer_pkt;
+       *answer = answer_pkt;
+       return LDNS_STATUS_OK;
 }
 
 int