LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Return a port from bindToPort() in IpSecService

Browse Source 
When binding to a random port, the port number was not being
returned, so the user is incorrectly receiving a port of zero.
Return the port number that was ultimately bound.

Bug: 67662580
Test: Ran CTS test on aosp_angler-eng
Change-Id: I22f4e5cdc83d43dc453788889990feb34e451bd3
This commit is contained in:
Benedict Wong
2017-10-10 20:44:28 -07:00
parent 87d6fc04b2
commit c423cc8311
1 changed files with 3 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(