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

Remove ldns 1.6.17 function

This commit is contained in:
Neel Goyal 2014-02-06 12:16:16 -05:00
parent 24e56217f8
commit d1a4c0e35b
1 changed files with 48 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/rr-dict.c
View File

@ -610,6 +610,31 @@ priv_getdns_equip_dict_with_txt_rdfs(struct getdns_dict* rdata, ldns_rr* rr,
return r; return r;
} }
/* heavily borrowed/copied from ldns 1.6.17 */
static
getdns_return_t getdns_rdf_hip_get_alg_hit_pk(ldns_rdf *rdf, uint8_t* alg,
struct getdns_bindata* hit,
struct getdns_bindata* pk)
{
uint8_t *data;
size_t rdf_size;
if ((rdf_size = ldns_rdf_size(rdf)) < 6) {
return GETDNS_RETURN_GENERIC_ERROR;
}
data = ldns_rdf_data(rdf);
hit->size = data[0];
*alg = data[1];
pk->size = ldns_read_uint16(data + 2);
hit->data = data + 4;
pk->data = data + 4 + hit->size;
if (hit->size == 0 || pk->size == 0 ||
rdf_size < (size_t) hit->size + pk->size + 4) {
return GETDNS_RETURN_GENERIC_ERROR;
}
return GETDNS_RETURN_GOOD;
}
static getdns_return_t static getdns_return_t
priv_getdns_equip_dict_with_hip_rdfs(struct getdns_dict* rdata, ldns_rr* rr, priv_getdns_equip_dict_with_hip_rdfs(struct getdns_dict* rdata, ldns_rr* rr,
const struct rr_def* def, const struct rr_def* def,
@ -623,9 +648,8 @@ priv_getdns_equip_dict_with_hip_rdfs(struct getdns_dict* rdata, ldns_rr* rr,
/* first rdf contains the key data */ /* first rdf contains the key data */
ldns_rdf* rdf = ldns_rr_rdf(rr, 0); ldns_rdf* rdf = ldns_rr_rdf(rr, 0);
/* ask LDNS to parse it for us */ /* ask LDNS to parse it for us */
ldns_status s = ldns_rdf_hip_get_alg_hit_pk(rdf, &alg, &hit_size, r = getdns_rdf_hip_get_alg_hit_pk(rdf, &alg, &hit_data, &key_data);
&(hit_data.data), &key_size, &(key_data.data)); if (r != GETDNS_RETURN_GOOD) {
if (s != LDNS_STATUS_OK) {
return GETDNS_RETURN_GENERIC_ERROR; return GETDNS_RETURN_GENERIC_ERROR;
} }
hit_data.size = hit_size; hit_data.size = hit_size;
@ -665,6 +689,21 @@ priv_getdns_equip_dict_with_hip_rdfs(struct getdns_dict* rdata, ldns_rr* rr,
return r; return r;
} }
static getdns_return_t
priv_getdns_equip_dict_with_apl_rdfs(struct getdns_dict* rdata, ldns_rr* rr,
const struct rr_def* def,
struct getdns_context* context) {
return GETDNS_RETURN_GOOD;
}
static getdns_return_t
priv_getdns_equip_dict_with_spf_rdfs(struct getdns_dict* rdata, ldns_rr* rr,
const struct rr_def* def,
struct getdns_context* context) {
return GETDNS_RETURN_GOOD;
}
static getdns_return_t static getdns_return_t
priv_getdns_equip_dict_with_rdfs(struct getdns_dict *rdata, ldns_rr *rr, priv_getdns_equip_dict_with_rdfs(struct getdns_dict *rdata, ldns_rr *rr,
struct getdns_context* context) struct getdns_context* context)
@ -680,10 +719,16 @@ priv_getdns_equip_dict_with_rdfs(struct getdns_dict *rdata, ldns_rr *rr,
def = rr_def_lookup(ldns_rr_get_type(rr)); def = rr_def_lookup(ldns_rr_get_type(rr));
/* specialty handlers */ /* specialty handlers */
/* TODO: convert generic one into function w/ similar signature and store in the
* def? */
if (def->rdata == txt_rdata) { if (def->rdata == txt_rdata) {
return priv_getdns_equip_dict_with_txt_rdfs(rdata, rr, def, context); return priv_getdns_equip_dict_with_txt_rdfs(rdata, rr, def, context);
} else if (def->rdata == hip_rdata) { } else if (def->rdata == hip_rdata) {
return priv_getdns_equip_dict_with_hip_rdfs(rdata, rr, def, context); return priv_getdns_equip_dict_with_hip_rdfs(rdata, rr, def, context);
} else if (def->rdata == apl_rdata) {
return priv_getdns_equip_dict_with_apl_rdfs(rdata, rr, def, context);
} else if (def->rdata == spf_rdata) {
return priv_getdns_equip_dict_with_spf_rdfs(rdata, rr, def, context);
} }
/* generic */ /* generic */
for (i = 0; i < ldns_rr_rd_count(rr) && r == GETDNS_RETURN_GOOD; i++) { for (i = 0; i < ldns_rr_rd_count(rr) && r == GETDNS_RETURN_GOOD; i++) {