commit 022db680633b483ec5fab4f6b0722981482b3a02
author Tomasz Wasilczyk <twasilczyk@google.com> Mon Jun 17 13:55:51 2024 -0700
committer Tomasz Wasilczyk <twasilczyk@google.com> Thu Jun 27 12:04:34 2024 -0700
tree 565f28e290cc010c726599d4a6ecbb7a0f2b13b8
parent 1d46f58320055b7aad551b92827bf3405258f25e

RpcServer: let system allocate vsock ports

This greatly improves stability with concurrent test execution

Bug: 285204695
Test: atest --host binder_sdk_test
Change-Id: Ib7b76df693288033e55fa27786bf6efb21d0ebf0

libs/binder/RpcServer.cpp

diff --git a/libs/binder/RpcServer.cpp b/libs/binder/RpcServer.cpp
index d9e926a..b8742af 100644
--- a/libs/binder/RpcServer.cpp
+++ b/libs/binder/RpcServer.cpp
@@ -71,8 +71,23 @@
     return setupSocketServer(UnixSocketAddress(path));
 }
 
-status_t RpcServer::setupVsockServer(unsigned int bindCid, unsigned int port) {
-    return setupSocketServer(VsockSocketAddress(bindCid, port));
+status_t RpcServer::setupVsockServer(unsigned bindCid, unsigned port, unsigned* assignedPort) {
+    auto status = setupSocketServer(VsockSocketAddress(bindCid, port));
+    if (status != OK) return status;
+
+    if (assignedPort == nullptr) return OK;
+    sockaddr_vm addr;
+    socklen_t len = sizeof(addr);
+    if (0 != getsockname(mServer.fd.get(), reinterpret_cast<sockaddr*>(&addr), &len)) {
+        status = -errno;
+        ALOGE("setupVsockServer: Failed to getsockname: %s", strerror(-status));
+        return status;
+    }
+
+    LOG_ALWAYS_FATAL_IF(len != sizeof(addr), "Wrong socket type: len %zu vs len %zu",
+                        static_cast<size_t>(len), sizeof(addr));
+    *assignedPort = addr.svm_port;
+    return OK;
 }
 
 status_t RpcServer::setupInetServer(const char* address, unsigned int port,