summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 2019-01-09 14:03:33 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-01-09 14:03:33 +0000
commit1ef5e35e348cf00845a79f2bfe82207a3c784f96 (patch)
treeb38eb8ed5c0860c5c8d4b6a698324dd70a6467a4
parent06e5b6d363592c04c587df0c9c5b8053d9665a3b (diff)
parentcf0026e9fb85edce9c15c4cd6c9fb371df20fb53 (diff)
Merge "Merge "Add control flags in asynchronous DNS query API" am: c04f9f731a am: f4a9829a18 am: f9f10f8044"
-rw-r--r--native/android/net.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/native/android/net.c b/native/android/net.c
index 4cac371f313b..a8104fc23041 100644
--- a/native/android/net.c
+++ b/native/android/net.c
@@ -84,26 +84,28 @@ 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, enum ResNsendFlags flags) {
unsigned netid;
if (!getnetidfromhandle(network, &netid)) {
return -ENONET;
}
- return resNetworkQuery(netid, dname, ns_class, ns_type);
+ return resNetworkQuery(netid, dname, ns_class, ns_type, flags);
}
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 uint8_t *msg, size_t msglen) {
+int android_res_nsend(net_handle_t network, const uint8_t *msg, size_t msglen,
+ enum ResNsendFlags flags) {
unsigned netid;
if (!getnetidfromhandle(network, &netid)) {
return -ENONET;
}
- return resNetworkSend(netid, msg, msglen);
+ return resNetworkSend(netid, msg, msglen, flags);
}
void android_res_cancel(int nsend_fd) {