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

Merge "Rename method connectSocketToNetlink to connectToKernel" into main am: 95cf7f9550

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2814219

Change-Id: Ia91ee62afa4a8c45128f17aa49f9af3222ad415d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chiachang Wang 2023-11-06 06:06:35 +00:00 • committed by Automerger Merge Worker
commit 6470a60987
5 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
service/src/com/android/server/connectivity/AutomaticOnOffKeepaliveTracker.java
View file

@ -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;

2
staticlibs/device/com/android/net/module/util/ip/NetlinkMonitor.java
View file

@ -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);

8
staticlibs/device/com/android/net/module/util/netlink/InetDiagMessage.java
View file

@ -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 {

4
staticlibs/device/com/android/net/module/util/netlink/NetlinkUtils.java
View file

@ -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));
}

4
staticlibs/tests/unit/src/com/android/net/module/util/netlink/NetlinkUtilsTest.java
View file

@ -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);