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

Merge "VPN: add MTU support."

Browse Source
This commit is contained in:
Chia-chi Yeh
2011-06-13 15:08:43 -07:00
committed by Android (Google) Code Review
parent 716a38adcb 3663227a8b
commit 26cfe80fe1
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/java/com/android/server/connectivity/Vpn.java
View File

@@ -126,6 +126,7 @@ public class Vpn extends INetworkManagementEventObserver.Stub {
// Unpack the config.
// TODO: move constants into VpnBuilder.
int mtu = config.getInt("mtu", -1);
String session = config.getString("session");
String addresses = config.getString("addresses");
String routes = config.getString("routes");
@@ -133,7 +134,7 @@ public class Vpn extends INetworkManagementEventObserver.Stub {
// Create and configure the interface.
ParcelFileDescriptor descriptor =
ParcelFileDescriptor.adoptFd(nativeEstablish(addresses, routes));
ParcelFileDescriptor.adoptFd(nativeEstablish(mtu, addresses, routes));
// Replace the interface and abort if it fails.
try {
@@ -251,7 +252,7 @@ public class Vpn extends INetworkManagementEventObserver.Stub {
}
}
private native int nativeEstablish(String addresses, String routes);
private native int nativeEstablish(int mtu, String addresses, String routes);
private native String nativeGetName(int fd);
private native void nativeReset(String name);
private native int nativeCheck(String name);