Merge "Add control flags in asynchronous DNS query API" am: c04f9f731a am: f4a9829a18 (cf0026e9) · Commits · e / os / android_frameworks_base

native/android/net.c

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -84,26 +84,28 @@ int android_getaddrinfofornetwork(net_handle_t network,
	return android_getaddrinfofornet(node, service, hints, netid, 0, res);		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;		unsigned netid;
	if (!getnetidfromhandle(network, &netid)) {		if (!getnetidfromhandle(network, &netid)) {
	return -ENONET;		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) {		int android_res_nresult(int fd, int rcode, uint8_t answer, size_t anslen) {
	return resNetworkResult(fd, rcode, answer, 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;		unsigned netid;
	if (!getnetidfromhandle(network, &netid)) {		if (!getnetidfromhandle(network, &netid)) {
	return -ENONET;		return -ENONET;
	}		}

	return resNetworkSend(netid, msg, msglen);		return resNetworkSend(netid, msg, msglen, flags);
	}		}

	void android_res_cancel(int nsend_fd) {		void android_res_cancel(int nsend_fd) {