Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Return a port from bindToPort() in IpSecService"

Browse Source
This commit is contained in:
Benedict Wong
2017-10-24 16:31:21 +00:00
committed by Gerrit Code Review
parent 5aa4dafa58 f186d6703e
commit 9305fb7ea1
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/IpSecService.java
View File

@@ -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 * and re-binding, during which the system could *technically* hand that port out to someone
* else. * 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--) { for (int i = MAX_PORT_BIND_ATTEMPTS; i > 0; i--) {
try { try {
FileDescriptor probeSocket = Os.socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); FileDescriptor probeSocket = Os.socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
@@ -763,7 +763,7 @@ public class IpSecService extends IIpSecService.Stub {
Os.close(probeSocket); Os.close(probeSocket);
Log.v(TAG, "Binding to port " + port); Log.v(TAG, "Binding to port " + port);
Os.bind(sockFd, INADDR_ANY, port); Os.bind(sockFd, INADDR_ANY, port);
return; return port;
} catch (ErrnoException e) { } catch (ErrnoException e) {
// Someone miraculously claimed the port just after we closed probeSocket. // Someone miraculously claimed the port just after we closed probeSocket.
if (e.errno == OsConstants.EADDRINUSE) { if (e.errno == OsConstants.EADDRINUSE) {
@@ -803,7 +803,7 @@ public class IpSecService extends IIpSecService.Stub {
Log.v(TAG, "Binding to port " + port); Log.v(TAG, "Binding to port " + port);
Os.bind(sockFd, INADDR_ANY, port); Os.bind(sockFd, INADDR_ANY, port);
} else { } else {
bindToRandomPort(sockFd); port = bindToRandomPort(sockFd);
} }
// This code is common to both the unspecified and specified port cases // This code is common to both the unspecified and specified port cases
Os.setsockoptInt( Os.setsockoptInt(

2
tests/net/java/com/android/server/IpSecServiceTest.java
View File

@@ -21,6 +21,7 @@ import static android.system.OsConstants.EADDRINUSE;
import static android.system.OsConstants.IPPROTO_UDP; import static android.system.OsConstants.IPPROTO_UDP;
import static android.system.OsConstants.SOCK_DGRAM; import static android.system.OsConstants.SOCK_DGRAM;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
@@ -174,6 +175,7 @@ public class IpSecServiceTest {
mIpSecService.openUdpEncapsulationSocket(0, new Binder()); mIpSecService.openUdpEncapsulationSocket(0, new Binder());
assertNotNull(udpEncapResp); assertNotNull(udpEncapResp);
assertEquals(IpSecManager.Status.OK, udpEncapResp.status); assertEquals(IpSecManager.Status.OK, udpEncapResp.status);
assertNotEquals(0, udpEncapResp.port);
mIpSecService.closeUdpEncapsulationSocket(udpEncapResp.resourceId); mIpSecService.closeUdpEncapsulationSocket(udpEncapResp.resourceId);
udpEncapResp.fileDescriptor.close(); udpEncapResp.fileDescriptor.close();
} }