summaryrefslogtreecommitdiff
path: root/native/android/net.c
diff options
context:
space:
mode:
authorLuke Huang <huangluke@google.com>2019-01-09 06:01:03 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-01-09 06:01:03 -0800
commitcf0026e9fb85edce9c15c4cd6c9fb371df20fb53 (patch)
treef96f331b591115adec77e335f4e4bf9fb656eaba /native/android/net.c
parentdb24f2f8c81468da13cfc12aaf0ba599c64e911f (diff)
parentf9f10f804488def7ae2ceba3f345b89fc1c1fda1 (diff)
Merge "Add control flags in asynchronous DNS query API" am: c04f9f731a am: f4a9829a18
am: f9f10f8044 Change-Id: Idfbe46d0a0b6db28856093942a55dc47c6bef1cf
Diffstat (limited to 'native/android/net.c')
-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) {