Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81632553 authored by Benedict Wong's avatar Benedict Wong Committed by android-build-merger
Browse files

Merge "Return a port from bindToPort() in IpSecService" am: 9305fb7e am: d6ab173f 

am: a18f8400

Change-Id: I0d1c17c3740983ab0cbc24c2cd0d3a530b56ca99
parents 2e55451c a18f8400

services/core/java/com/android/server/IpSecService.java

+3 −3
Original line number Diff line number Diff line
@@ -754,7 +754,7 @@ public class IpSecService extends IIpSecService.Stub { 
     * and re-binding, during which the system could *technically* hand that port out to someone

     * else.

     */

    private void bindToRandomPort(FileDescriptor sockFd) throws IOException {

    private int bindToRandomPort(FileDescriptor sockFd) throws IOException {

        for (int i = MAX_PORT_BIND_ATTEMPTS; i > 0; i--) {

            try {

                FileDescriptor probeSocket = Os.socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
@@ -763,7 +763,7 @@ public class IpSecService extends IIpSecService.Stub { 
                Os.close(probeSocket);

                Log.v(TAG, "Binding to port " + port);

                Os.bind(sockFd, INADDR_ANY, port);

                return;

                return port;

            } catch (ErrnoException e) {

                // Someone miraculously claimed the port just after we closed probeSocket.

                if (e.errno == OsConstants.EADDRINUSE) {
@@ -803,7 +803,7 @@ public class IpSecService extends IIpSecService.Stub { 
                Log.v(TAG, "Binding to port " + port);

                Os.bind(sockFd, INADDR_ANY, port);

            } else {

                bindToRandomPort(sockFd);

                port = bindToRandomPort(sockFd);

            }

            // This code is common to both the unspecified and specified port cases

            Os.setsockoptInt(

tests/net/java/com/android/server/IpSecServiceTest.java

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.system.OsConstants.EADDRINUSE; 
import static android.system.OsConstants.IPPROTO_UDP;

import static android.system.OsConstants.SOCK_DGRAM;

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNotEquals;

import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.fail;

import static org.mockito.Mockito.mock;
@@ -174,6 +175,7 @@ public class IpSecServiceTest { 
                mIpSecService.openUdpEncapsulationSocket(0, new Binder());

        assertNotNull(udpEncapResp);

        assertEquals(IpSecManager.Status.OK, udpEncapResp.status);

        assertNotEquals(0, udpEncapResp.port);

        mIpSecService.closeUdpEncapsulationSocket(udpEncapResp.resourceId);

        udpEncapResp.fileDescriptor.close();

    }