interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rm a few more leftover ldns references

This commit is contained in:
Willem Toorop 2015-06-11 12:04:59 +02:00
parent e820452aaa
commit fd385454b4
3 changed files with 2 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rr-iter.h
View File

@ -70,7 +70,7 @@ uint8_t *priv_getdns_owner_if_or_as_decompressed(
static inline gldns_pkt_section static inline gldns_pkt_section
priv_getdns_rr_iter_section(priv_getdns_rr_iter *i) priv_getdns_rr_iter_section(priv_getdns_rr_iter *i)
{ {
return i->n < GLDNS_QDCOUNT(i->pkt) ? LDNS_SECTION_QUESTION return i->n < GLDNS_QDCOUNT(i->pkt) ? GLDNS_SECTION_QUESTION
: i->n < GLDNS_QDCOUNT(i->pkt) : i->n < GLDNS_QDCOUNT(i->pkt)
+ GLDNS_ANCOUNT(i->pkt) ? GLDNS_SECTION_ANSWER + GLDNS_ANCOUNT(i->pkt) ? GLDNS_SECTION_ANSWER
: i->n < GLDNS_QDCOUNT(i->pkt) : i->n < GLDNS_QDCOUNT(i->pkt)

31
src/util-internal.c
View File

@ -178,35 +178,6 @@ sockaddr_to_dict(struct getdns_context *context, struct sockaddr_storage *addres
return GETDNS_RETURN_GOOD; return GETDNS_RETURN_GOOD;
} }
/* helper to convert an rr_list to getdns_list.
returns a list of objects where each object
is a result from create_dict_from_rr */
struct getdns_list *
create_list_from_rr_list(struct getdns_context *context, ldns_rr_list * rr_list)
{
size_t i = 0;
size_t idx = 0;
int r = GETDNS_RETURN_GOOD;
struct getdns_list *result = getdns_list_create_with_context(context);
struct getdns_dict *rrdict;
for (i = 0; i < ldns_rr_list_rr_count(rr_list) && r == GETDNS_RETURN_GOOD;
++i) {
ldns_rr *rr = ldns_rr_list_rr(rr_list, i);
r = priv_getdns_create_dict_from_rr(context, rr, &rrdict);
if (r != GETDNS_RETURN_GOOD)
break; /* Could not create, do not destroy */
r = getdns_list_add_item(result, &idx);
if (r == GETDNS_RETURN_GOOD)
r = getdns_list_set_dict(result, idx, rrdict);
getdns_dict_destroy(rrdict);
}
if (r != GETDNS_RETURN_GOOD) {
getdns_list_destroy(result);
result = NULL;
}
return result;
}
getdns_dict * getdns_dict *
priv_getdns_rr_iter2rr_dict(getdns_context *context, priv_getdns_rr_iter *i) priv_getdns_rr_iter2rr_dict(getdns_context *context, priv_getdns_rr_iter *i)
{ {
@ -768,7 +739,7 @@ create_getdns_response(getdns_dns_req *completed_request)
ninsecure++; ninsecure++;
if (dnssec_return_status && netreq->bogus) if (dnssec_return_status && netreq->bogus)
nbogus++; nbogus++;
else if (LDNS_RCODE_NOERROR == else if (GLDNS_RCODE_NOERROR ==
GLDNS_RCODE_WIRE(netreq->response)) GLDNS_RCODE_WIRE(netreq->response))
nanswers++; nanswers++;

11
src/util-internal.h
View File

@ -38,7 +38,6 @@
#ifndef UTIL_INTERNAL_H #ifndef UTIL_INTERNAL_H
#define UTIL_INTERNAL_H #define UTIL_INTERNAL_H
#include <ldns/ldns.h>
#include "context.h" #include "context.h"
#include "rr-iter.h" #include "rr-iter.h"
@ -143,16 +142,6 @@ getdns_return_t validate_dname(const char* dname);
*/ */
getdns_return_t validate_extensions(struct getdns_dict * extensions); getdns_return_t validate_extensions(struct getdns_dict * extensions);
/**
* helper to convert an rr_list to getdns_list
* @param context initialized getdns_context
* @param rr_list ldns rr list to be converted
* @return a list of objects where each object is a result from create_dict_from_rr
*/
struct getdns_list *
create_list_from_rr_list(struct getdns_context *context, ldns_rr_list * rr_list);
#define DEBUG_ON(...) do { \ #define DEBUG_ON(...) do { \
struct timeval tv; \ struct timeval tv; \
struct tm tm; \ struct tm tm; \