joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Add method to get socket cookie from socket FileDescriptor

Browse source 
aosp/3502915 use this method from ConnectivityService to get socket
cookie that is required for closing QUIC connection.

Bug: 311792075
Test: m, boot
Change-Id: I17d8a4dd24cfb84e9b008b8eb87eedec67b29020
This commit is contained in:
Motomu Utsumi 2025-02-20 11:57:39 +09:00 • committed by Maciej Żenczykowski
commit b9b8828bf5
2 changed files with 26 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
framework/jni/android_net_NetworkUtils.cpp
View file

@ -23,9 +23,9 @@
#include <netinet/in.h>
#include <string.h>
#include <DnsProxydProtocol.h> // NETID_USE_LOCAL_NAMESERVERS
#include <bpf/BpfClassic.h>
#include <bpf/KernelUtils.h>
#include <DnsProxydProtocol.h> // NETID_USE_LOCAL_NAMESERVERS
#include <nativehelper/JNIPlatformHelp.h>
#include <nativehelper/ScopedPrimitiveArray.h>
#include <utils/Log.h>
@ -259,6 +259,21 @@ static jboolean android_net_utils_isKernelX86(JNIEnv *env, jclass clazz) {
return bpf::isX86();
}
static jlong android_net_utils_getSocketCookie(JNIEnv *env, jclass clazz,
jobject javaFd) {
int sock = AFileDescriptor_getFd(env, javaFd);
uint64_t cookie = 0;
socklen_t cookie_len = sizeof(cookie);
if (getsockopt(sock, SOL_SOCKET, SO_COOKIE, &cookie, &cookie_len)) {
// Failure is almost certainly either EBADF or ENOTSOCK
jniThrowErrnoException(env, "getSocketCookie", errno);
} else if (cookie_len != sizeof(cookie)) {
// This probably cannot actually happen, but...
jniThrowErrnoException(env, "getSocketCookie", 523); // EBADCOOKIE
}
return static_cast<jlong>(cookie);
}
// ----------------------------------------------------------------------------
/*
@ -283,6 +298,7 @@ static const JNINativeMethod gNetworkUtilMethods[] = {
(void*) android_net_utils_setsockoptBytes},
{ "isKernel64Bit", "()Z", (void*) android_net_utils_isKernel64Bit },
{ "isKernelX86", "()Z", (void*) android_net_utils_isKernelX86 },
{ "getSocketCookie", "(Ljava/io/FileDescriptor;)J", (void*) android_net_utils_getSocketCookie },
};
// clang-format on

9
framework/src/android/net/NetworkUtils.java
View file

@ -443,4 +443,13 @@ public class NetworkUtils {
/** Returns whether the Linux Kernel is x86 */
public static native boolean isKernelX86();
/**
* Returns socket cookie.
*
* @param fd The socket file descriptor
* @return The socket cookie.
* @throws ErrnoException if retrieving the socket cookie fails.
*/
public static native long getSocketCookie(FileDescriptor fd) throws ErrnoException;
}