LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Move to renamed NDK symbol AFileDescriptor_getFd" into sc-dev

Browse Source
This commit is contained in:
Orion Hodson
2021-05-11 14:31:42 +00:00
committed by Android (Google) Code Review
parent 1df16c6f8f a1a2ccb8d7
commit 276e973b32
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
framework/jni/android_net_NetworkUtils.cpp
View File

@@ -64,7 +64,7 @@ static void android_net_utils_attachDropAllBPFFilter(JNIEnv *env, jobject clazz,
filter_code, filter_code,
}; };
int fd = AFileDescriptor_getFD(env, javaFd); int fd = AFileDescriptor_getFd(env, javaFd);
if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &filter, sizeof(filter)) != 0) { if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &filter, sizeof(filter)) != 0) {
jniThrowExceptionFmt(env, "java/net/SocketException", jniThrowExceptionFmt(env, "java/net/SocketException",
"setsockopt(SO_ATTACH_FILTER): %s", strerror(errno)); "setsockopt(SO_ATTACH_FILTER): %s", strerror(errno));
@@ -74,7 +74,7 @@ static void android_net_utils_attachDropAllBPFFilter(JNIEnv *env, jobject clazz,
static void android_net_utils_detachBPFFilter(JNIEnv *env, jobject clazz, jobject javaFd) static void android_net_utils_detachBPFFilter(JNIEnv *env, jobject clazz, jobject javaFd)
{ {
int optval_ignored = 0; int optval_ignored = 0;
int fd = AFileDescriptor_getFD(env, javaFd); int fd = AFileDescriptor_getFd(env, javaFd);
if (setsockopt(fd, SOL_SOCKET, SO_DETACH_FILTER, &optval_ignored, sizeof(optval_ignored)) != if (setsockopt(fd, SOL_SOCKET, SO_DETACH_FILTER, &optval_ignored, sizeof(optval_ignored)) !=
0) { 0) {
jniThrowExceptionFmt(env, "java/net/SocketException", jniThrowExceptionFmt(env, "java/net/SocketException",
@@ -107,7 +107,7 @@ static jboolean android_net_utils_bindProcessToNetworkForHostResolution(JNIEnv *
static jint android_net_utils_bindSocketToNetworkHandle(JNIEnv *env, jobject thiz, jobject javaFd, static jint android_net_utils_bindSocketToNetworkHandle(JNIEnv *env, jobject thiz, jobject javaFd,
jlong netHandle) { jlong netHandle) {
return android_setsocknetwork(netHandle, AFileDescriptor_getFD(env, javaFd)); return android_setsocknetwork(netHandle, AFileDescriptor_getFd(env, javaFd));
} }
static bool checkLenAndCopy(JNIEnv* env, const jbyteArray& addr, int len, void* dst) static bool checkLenAndCopy(JNIEnv* env, const jbyteArray& addr, int len, void* dst)
@@ -156,7 +156,7 @@ static jobject android_net_utils_resNetworkSend(JNIEnv *env, jobject thiz, jlong
} }
static jobject android_net_utils_resNetworkResult(JNIEnv *env, jobject thiz, jobject javaFd) { static jobject android_net_utils_resNetworkResult(JNIEnv *env, jobject thiz, jobject javaFd) {
int fd = AFileDescriptor_getFD(env, javaFd); int fd = AFileDescriptor_getFd(env, javaFd);
int rcode; int rcode;
uint8_t buf[MAXPACKETSIZE] = {0}; uint8_t buf[MAXPACKETSIZE] = {0};
@@ -182,7 +182,7 @@ static jobject android_net_utils_resNetworkResult(JNIEnv *env, jobject thiz, job
} }
static void android_net_utils_resNetworkCancel(JNIEnv *env, jobject thiz, jobject javaFd) { static void android_net_utils_resNetworkCancel(JNIEnv *env, jobject thiz, jobject javaFd) {
int fd = AFileDescriptor_getFD(env, javaFd); int fd = AFileDescriptor_getFd(env, javaFd);
android_res_cancel(fd); android_res_cancel(fd);
jniSetFileDescriptorOfFD(env, javaFd, -1); jniSetFileDescriptorOfFD(env, javaFd, -1);
} }
@@ -210,7 +210,7 @@ static jobject android_net_utils_getTcpRepairWindow(JNIEnv *env, jobject thiz, j
return NULL; return NULL;
} }
int fd = AFileDescriptor_getFD(env, javaFd); int fd = AFileDescriptor_getFd(env, javaFd);
struct tcp_repair_window trw = {}; struct tcp_repair_window trw = {};
socklen_t size = sizeof(trw); socklen_t size = sizeof(trw);