From 7be7f4596a77c83ce368c7825d1ca09a244b5f28 Mon Sep 17 00:00:00 2001 From: Nathan Harold Date: Thu, 26 Apr 2018 11:47:14 -0700 Subject: [PATCH] [DO NOT MERGE] Use INetd Constant for IpSec Interface Prefix Convert to using a constant in INetd to ensure that there is a consistent tunnel prefix between Java and native code. Bug: 74560705 Test: atest FramworksNetTest; atest CtsNetTestCases Change-Id: Ida233aac2e6c6b26567463964e0ebac9d52eff1e --- services/core/java/com/android/server/IpSecService.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/IpSecService.java b/services/core/java/com/android/server/IpSecService.java index 33ca02fecb..60f1877d37 100644 --- a/services/core/java/com/android/server/IpSecService.java +++ b/services/core/java/com/android/server/IpSecService.java @@ -107,7 +107,6 @@ public class IpSecService extends IIpSecService.Stub { static final int FREE_PORT_MIN = 1024; // ports 1-1023 are reserved static final int PORT_MAX = 0xFFFF; // ports are an unsigned 16-bit integer - static final String TUNNEL_INTERFACE_PREFIX = "ipsec"; /* Binder context for this service */ private final Context mContext; @@ -1270,7 +1269,7 @@ public class IpSecService extends IIpSecService.Stub { final int resourceId = mNextResourceId++; final int ikey = reserveNetId(); final int okey = reserveNetId(); - String intfName = String.format("%s%d", TUNNEL_INTERFACE_PREFIX, resourceId); + String intfName = String.format("%s%d", INetd.IPSEC_INTERFACE_PREFIX, resourceId); try { // Calls to netd: