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

Put hip server data in wire format

This commit is contained in:
Neel Goyal 2014-02-06 11:10:09 -05:00
parent f750f758ff
commit 24e56217f8
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/rr-dict.c
View File

@ -630,14 +630,14 @@ priv_getdns_equip_dict_with_hip_rdfs(struct getdns_dict* rdata, ldns_rr* rr,
} }
hit_data.size = hit_size; hit_data.size = hit_size;
key_data.size = key_size; key_data.size = key_size;
r = getdns_dict_set_int(rdata, def->rdata[0].name, alg); r = getdns_dict_set_int(rdata, def->rdata[0].name, alg);
r |= getdns_dict_set_bindata(rdata, def->rdata[1].name, &hit_data); r |= getdns_dict_set_bindata(rdata, def->rdata[1].name, &hit_data);
r |= getdns_dict_set_bindata(rdata, def->rdata[2].name, &key_data); r |= getdns_dict_set_bindata(rdata, def->rdata[2].name, &key_data);
if (r != GETDNS_RETURN_GOOD) { if (r != GETDNS_RETURN_GOOD) {
return r; return r;
} }
if (ldns_rr_rd_count(rr) > 1) { if (ldns_rr_rd_count(rr) > 1) {
/* servers */ /* servers */
size_t i; size_t i;
@ -648,15 +648,9 @@ priv_getdns_equip_dict_with_hip_rdfs(struct getdns_dict* rdata, ldns_rr* rr,
} }
for (i = 1; i < ldns_rr_rd_count(rr) && r == GETDNS_RETURN_GOOD; ++i) { for (i = 1; i < ldns_rr_rd_count(rr) && r == GETDNS_RETURN_GOOD; ++i) {
ldns_rdf* server_rdf = ldns_rr_rdf(rr, i); ldns_rdf* server_rdf = ldns_rr_rdf(rr, i);
char* name = ldns_rdf2str(server_rdf); server_data.size = ldns_rdf_size(server_rdf);
if (name == NULL) { server_data.data = ldns_rdf_data(server_rdf);
r = GETDNS_RETURN_MEMORY_ERROR;
break;
}
server_data.size = strlen(name) + 1;
server_data.data = (uint8_t*)name;
r = getdns_list_set_bindata(servers, i - 1, &server_data); r = getdns_list_set_bindata(servers, i - 1, &server_data);
free(name);
} }
if (r != GETDNS_RETURN_GOOD) { if (r != GETDNS_RETURN_GOOD) {
getdns_list_destroy(servers); getdns_list_destroy(servers);
@ -667,7 +661,7 @@ priv_getdns_equip_dict_with_hip_rdfs(struct getdns_dict* rdata, ldns_rr* rr,
} }
} }
} }
return r; return r;
} }