commit 969778916bb381eb6aa20a0f104918d003d8e691
author Motomu Utsumi <motomuman@google.com> Mon May 15 04:46:08 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon May 15 04:46:08 2023 +0000
tree 4b72979d4b7b367f4a241132a37a7ed8be85157c
parent 80777defaf2e660db6433e5b72de58f98a524382
parent b73b5e5183dde337f6a8f0b2939c3e07d7bc9db8

Close sockets from ConnectivityService#setFirewallChainEnabled am: b73b5e5183

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/net/+/23207736

Change-Id: Ib29d2174c03d822f788de06a25ac9e4103d0bc08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

common/device/com/android/net/module/util/netlink/InetDiagMessage.java

diff --git a/common/device/com/android/net/module/util/netlink/InetDiagMessage.java b/common/device/com/android/net/module/util/netlink/InetDiagMessage.java
index d462c53..e69a844 100644
--- a/common/device/com/android/net/module/util/netlink/InetDiagMessage.java
+++ b/common/device/com/android/net/module/util/netlink/InetDiagMessage.java
@@ -468,6 +468,23 @@
                         && !isAdbSocket(diagMsg));
     }
 
+    /**
+     * Close tcp sockets that match the following condition
+     *  1. TCP status is one of TCP_ESTABLISHED, TCP_SYN_SENT, and TCP_SYN_RECV
+     *  2. Owner uid of socket is in the targetUids
+     *  3. Socket is not loopback
+     *  4. Socket is not adb socket
+     *
+     * @param ownerUids target uids to close sockets
+     */
+    public static void destroyLiveTcpSocketsByOwnerUids(Set<Integer> ownerUids)
+            throws SocketException, InterruptedIOException, ErrnoException {
+        destroySockets(IPPROTO_TCP, TCP_ALIVE_STATE_FILTER,
+                (diagMsg) -> ownerUids.contains(diagMsg.inetDiagMsg.idiag_uid)
+                        && !isLoopback(diagMsg)
+                        && !isAdbSocket(diagMsg));
+    }
+
     @Override
     public String toString() {
         return "InetDiagMessage{ "