From fe84f59ff0d0abc182d3f79e9351db016016fba2 Mon Sep 17 00:00:00 2001 From: Chiachang Wang Date: Thu, 2 Nov 2023 07:56:29 +0000 Subject: [PATCH] Rename method connectSocketToNetlink to connectToKernel Address leftover comments in aosp/2354202. Bug: 265877161 Test: atest FrameworksNetTests NetworkStackTests Change-Id: I77f36b890265e9af6f5ab866d5e0071363bb3d0f --- .../connectivity/AutomaticOnOffKeepaliveTracker.java | 2 +- .../com/android/net/module/util/ip/NetlinkMonitor.java | 2 +- .../android/net/module/util/netlink/InetDiagMessage.java | 8 ++++---- .../com/android/net/module/util/netlink/NetlinkUtils.java | 4 ++-- .../android/net/module/util/netlink/NetlinkUtilsTest.java | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/service/src/com/android/server/connectivity/AutomaticOnOffKeepaliveTracker.java b/service/src/com/android/server/connectivity/AutomaticOnOffKeepaliveTracker.java index cda8d06231..bba132fe30 100644 --- a/service/src/com/android/server/connectivity/AutomaticOnOffKeepaliveTracker.java +++ b/service/src/com/android/server/connectivity/AutomaticOnOffKeepaliveTracker.java @@ -900,7 +900,7 @@ public class AutomaticOnOffKeepaliveTracker { public FileDescriptor createConnectedNetlinkSocket() throws ErrnoException, SocketException { final FileDescriptor fd = NetlinkUtils.createNetLinkInetDiagSocket(); - NetlinkUtils.connectSocketToNetlink(fd); + NetlinkUtils.connectToKernel(fd); Os.setsockoptTimeval(fd, SOL_SOCKET, SO_SNDTIMEO, StructTimeval.fromMillis(IO_TIMEOUT_MS)); return fd; diff --git a/staticlibs/device/com/android/net/module/util/ip/NetlinkMonitor.java b/staticlibs/device/com/android/net/module/util/ip/NetlinkMonitor.java index f882483da8..15a46337a3 100644 --- a/staticlibs/device/com/android/net/module/util/ip/NetlinkMonitor.java +++ b/staticlibs/device/com/android/net/module/util/ip/NetlinkMonitor.java @@ -109,7 +109,7 @@ public class NetlinkMonitor extends PacketReader { } } Os.bind(fd, makeNetlinkSocketAddress(0, mBindGroups)); - NetlinkUtils.connectSocketToNetlink(fd); + NetlinkUtils.connectToKernel(fd); if (DBG) { final SocketAddress nlAddr = Os.getsockname(fd); diff --git a/staticlibs/device/com/android/net/module/util/netlink/InetDiagMessage.java b/staticlibs/device/com/android/net/module/util/netlink/InetDiagMessage.java index f8b47164a6..4f76577caa 100644 --- a/staticlibs/device/com/android/net/module/util/netlink/InetDiagMessage.java +++ b/staticlibs/device/com/android/net/module/util/netlink/InetDiagMessage.java @@ -33,7 +33,7 @@ import static com.android.net.module.util.netlink.NetlinkConstants.stringForProt import static com.android.net.module.util.netlink.NetlinkUtils.DEFAULT_RECV_BUFSIZE; import static com.android.net.module.util.netlink.NetlinkUtils.IO_TIMEOUT_MS; import static com.android.net.module.util.netlink.NetlinkUtils.TCP_ALIVE_STATE_FILTER; -import static com.android.net.module.util.netlink.NetlinkUtils.connectSocketToNetlink; +import static com.android.net.module.util.netlink.NetlinkUtils.connectToKernel; import static com.android.net.module.util.netlink.StructNlMsgHdr.NLM_F_DUMP; import static com.android.net.module.util.netlink.StructNlMsgHdr.NLM_F_REQUEST; @@ -266,7 +266,7 @@ public class InetDiagMessage extends NetlinkMessage { FileDescriptor fd = null; try { fd = NetlinkUtils.netlinkSocketForProto(NETLINK_INET_DIAG); - NetlinkUtils.connectSocketToNetlink(fd); + connectToKernel(fd); uid = lookupUid(protocol, local, remote, fd); } catch (ErrnoException | SocketException | IllegalArgumentException | InterruptedIOException e) { @@ -426,8 +426,8 @@ public class InetDiagMessage extends NetlinkMessage { try { dumpFd = NetlinkUtils.createNetLinkInetDiagSocket(); destroyFd = NetlinkUtils.createNetLinkInetDiagSocket(); - connectSocketToNetlink(dumpFd); - connectSocketToNetlink(destroyFd); + connectToKernel(dumpFd); + connectToKernel(destroyFd); for (int family : List.of(AF_INET, AF_INET6)) { try { diff --git a/staticlibs/device/com/android/net/module/util/netlink/NetlinkUtils.java b/staticlibs/device/com/android/net/module/util/netlink/NetlinkUtils.java index 33bd36d875..f1f30d37f3 100644 --- a/staticlibs/device/com/android/net/module/util/netlink/NetlinkUtils.java +++ b/staticlibs/device/com/android/net/module/util/netlink/NetlinkUtils.java @@ -153,7 +153,7 @@ public class NetlinkUtils { final FileDescriptor fd = netlinkSocketForProto(nlProto); try { - connectSocketToNetlink(fd); + connectToKernel(fd); sendMessage(fd, msg, 0, msg.length, IO_TIMEOUT_MS); receiveNetlinkAck(fd); } catch (InterruptedIOException e) { @@ -244,7 +244,7 @@ public class NetlinkUtils { * @throws ErrnoException if the {@code fd} could not connect to kernel successfully * @throws SocketException if there is an error accessing a socket. */ - public static void connectSocketToNetlink(FileDescriptor fd) + public static void connectToKernel(@NonNull FileDescriptor fd) throws ErrnoException, SocketException { Os.connect(fd, makeNetlinkSocketAddress(0, 0)); } diff --git a/staticlibs/tests/unit/src/com/android/net/module/util/netlink/NetlinkUtilsTest.java b/staticlibs/tests/unit/src/com/android/net/module/util/netlink/NetlinkUtilsTest.java index 5e9b004ef8..5a231fc523 100644 --- a/staticlibs/tests/unit/src/com/android/net/module/util/netlink/NetlinkUtilsTest.java +++ b/staticlibs/tests/unit/src/com/android/net/module/util/netlink/NetlinkUtilsTest.java @@ -68,7 +68,7 @@ public class NetlinkUtilsTest { final FileDescriptor fd = NetlinkUtils.netlinkSocketForProto(NETLINK_ROUTE); assertNotNull(fd); - NetlinkUtils.connectSocketToNetlink(fd); + NetlinkUtils.connectToKernel(fd); final NetlinkSocketAddress localAddr = (NetlinkSocketAddress) Os.getsockname(fd); assertNotNull(localAddr); @@ -153,7 +153,7 @@ public class NetlinkUtilsTest { final FileDescriptor fd = NetlinkUtils.netlinkSocketForProto(NETLINK_ROUTE); assertNotNull(fd); - NetlinkUtils.connectSocketToNetlink(fd); + NetlinkUtils.connectToKernel(fd); final NetlinkSocketAddress localAddr = (NetlinkSocketAddress) Os.getsockname(fd); assertNotNull(localAddr);