Merge "Following commit for asynchronous DNS query API" am: a89f04a742 am: b010078e40

am: 0c1ffb0f9b

Change-Id: Ia7922edb119c12f185684682fd4d097337125248
This commit is contained in:
Luke Huang
2018-12-19 01:42:53 -08:00
committed by android-build-merger

View File

@@ -84,8 +84,7 @@ int android_getaddrinfofornetwork(net_handle_t network,
return android_getaddrinfofornet(node, service, hints, netid, 0, res);
}
int android_res_nquery(net_handle_t network,
const char *dname, int ns_class, int ns_type) {
int android_res_nquery(net_handle_t network, const char *dname, int ns_class, int ns_type) {
unsigned netid;
if (!getnetidfromhandle(network, &netid)) {
return -ENONET;
@@ -94,12 +93,11 @@ int android_res_nquery(net_handle_t network,
return resNetworkQuery(netid, dname, ns_class, ns_type);
}
int android_res_nresult(int fd, int *rcode, unsigned char *answer, int anslen) {
int android_res_nresult(int fd, int *rcode, uint8_t *answer, size_t anslen) {
return resNetworkResult(fd, rcode, answer, anslen);
}
int android_res_nsend(net_handle_t network,
const unsigned char *msg, int msglen) {
int android_res_nsend(net_handle_t network, const uint8_t *msg, size_t msglen) {
unsigned netid;
if (!getnetidfromhandle(network, &netid)) {
return -ENONET;