joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Add a method to create a TAP interface without bringing it up. am: 333d5e52f5

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1987455

Change-Id: I38b1ab96f413ead1938631cce25814dceaa2ef07
This commit is contained in:
Lorenzo Colitti 2022-03-18 02:51:39 +00:00 • committed by Automerger Merge Worker
commit bfd75772cd
3 changed files with 33 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

3
framework/src/android/net/ITestNetworkManager.aidl
View file

@ -29,8 +29,7 @@ import android.os.ParcelFileDescriptor;
*/
interface ITestNetworkManager
{
TestNetworkInterface createTunInterface(in LinkAddress[] linkAddrs);
TestNetworkInterface createTapInterface();
TestNetworkInterface createInterface(boolean isTun, boolean bringUp, in LinkAddress[] addrs);
void setupTestNetwork(in String iface, in LinkProperties lp, in boolean isMetered,
in int[] administratorUids, in IBinder binder);

27
framework/src/android/net/TestNetworkManager.java
View file

@ -49,6 +49,11 @@ public class TestNetworkManager {
@NonNull private final ITestNetworkManager mService;
private static final boolean TAP = false;
private static final boolean TUN = true;
private static final boolean BRING_UP = true;
private static final LinkAddress[] NO_ADDRS = new LinkAddress[0];
/** @hide */
public TestNetworkManager(@NonNull ITestNetworkManager service) {
mService = Objects.requireNonNull(service, "missing ITestNetworkManager");
@ -155,7 +160,7 @@ public class TestNetworkManager {
public TestNetworkInterface createTunInterface(@NonNull Collection<LinkAddress> linkAddrs) {
try {
final LinkAddress[] arr = new LinkAddress[linkAddrs.size()];
return mService.createTunInterface(linkAddrs.toArray(arr));
return mService.createInterface(TUN, BRING_UP, linkAddrs.toArray(arr));
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
@ -173,10 +178,28 @@ public class TestNetworkManager {
@NonNull
public TestNetworkInterface createTapInterface() {
try {
return mService.createTapInterface();
return mService.createInterface(TAP, BRING_UP, NO_ADDRS);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}
/**
* Create a tap interface for testing purposes
*
* @param bringUp whether to bring up the interface before returning it.
*
* @return A ParcelFileDescriptor of the underlying TAP interface. Close this to tear down the
* TAP interface.
* @hide
*/
@RequiresPermission(Manifest.permission.MANAGE_TEST_NETWORKS)
@NonNull
public TestNetworkInterface createTapInterface(boolean bringUp) {
try {
return mService.createInterface(TAP, bringUp, NO_ADDRS);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}
}

32
service/src/com/android/server/TestNetworkService.java
View file

@ -99,12 +99,14 @@ class TestNetworkService extends ITestNetworkManager.Stub {
}
/**
* Create a TUN or TAP interface with the given interface name and link addresses
* Create a TUN or TAP interface with the specified parameters.
*
* <p>This method will return the FileDescriptor to the interface. Close it to tear down the
* interface.
*/
private TestNetworkInterface createInterface(boolean isTun, LinkAddress[] linkAddrs) {
@Override
public TestNetworkInterface createInterface(boolean isTun, boolean bringUp,
LinkAddress[] linkAddrs) {
enforceTestNetworkPermissions(mContext);
Objects.requireNonNull(linkAddrs, "missing linkAddrs");
@ -122,7 +124,9 @@ class TestNetworkService extends ITestNetworkManager.Stub {
addr.getPrefixLength());
}
NetdUtils.setInterfaceUp(mNetd, iface);
if (bringUp) {
NetdUtils.setInterfaceUp(mNetd, iface);
}
return new TestNetworkInterface(tunIntf, iface);
} catch (RemoteException e) {
@ -132,28 +136,6 @@ class TestNetworkService extends ITestNetworkManager.Stub {
}
}
/**
* Create a TUN interface with the given interface name and link addresses
*
* <p>This method will return the FileDescriptor to the TUN interface. Close it to tear down the
* TUN interface.
*/
@Override
public TestNetworkInterface createTunInterface(@NonNull LinkAddress[] linkAddrs) {
return createInterface(true, linkAddrs);
}
/**
* Create a TAP interface with the given interface name
*
* <p>This method will return the FileDescriptor to the TAP interface. Close it to tear down the
* TAP interface.
*/
@Override
public TestNetworkInterface createTapInterface() {
return createInterface(false, new LinkAddress[0]);
}
// Tracker for TestNetworkAgents
@GuardedBy("mTestNetworkTracker")
@NonNull