diff options
| -rw-r--r-- | services/java/com/android/server/connectivity/Vpn.java | 5 | ||||
| -rw-r--r-- | services/jni/com_android_server_connectivity_Vpn.cpp | 15 |
2 files changed, 14 insertions, 6 deletions
diff --git a/services/java/com/android/server/connectivity/Vpn.java b/services/java/com/android/server/connectivity/Vpn.java index 36d2a4069e32..ab85b1464bc8 100644 --- a/services/java/com/android/server/connectivity/Vpn.java +++ b/services/java/com/android/server/connectivity/Vpn.java @@ -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); diff --git a/services/jni/com_android_server_connectivity_Vpn.cpp b/services/jni/com_android_server_connectivity_Vpn.cpp index cff710eb2b57..a968cd2133b7 100644 --- a/services/jni/com_android_server_connectivity_Vpn.cpp +++ b/services/jni/com_android_server_connectivity_Vpn.cpp @@ -59,7 +59,7 @@ static inline in6_addr *as_in6_addr(sockaddr_storage *ss) { #define SYSTEM_ERROR -1 #define BAD_ARGUMENT -2 -static int create_interface(char *name, int *index) +static int create_interface(int mtu, char *name, int *index) { int tun = open("/dev/tun", O_RDWR); int inet4 = socket(AF_INET, SOCK_DGRAM, 0); @@ -81,6 +81,13 @@ static int create_interface(char *name, int *index) goto error; } + // Set MTU if it is specified. + ifr4.ifr_mtu = mtu; + if (mtu > 0 && ioctl(inet4, SIOCSIFMTU, &ifr4)) { + LOGE("Cannot set MTU on %s: %s", ifr4.ifr_name, strerror(errno)); + goto error; + } + // Get interface index. if (ioctl(inet4, SIOGIFINDEX, &ifr4)) { LOGE("Cannot get index of %s: %s", ifr4.ifr_name, strerror(errno)); @@ -323,11 +330,11 @@ static void throwException(JNIEnv *env, int error, const char *message) } static jint establish(JNIEnv *env, jobject thiz, - jstring jAddresses, jstring jRoutes) + jint mtu, jstring jAddresses, jstring jRoutes) { char name[IFNAMSIZ]; int index; - int tun = create_interface(name, &index); + int tun = create_interface(mtu, name, &index); if (tun < 0) { throwException(env, tun, "Cannot create interface"); return -1; @@ -428,7 +435,7 @@ static void protect(JNIEnv *env, jobject thiz, jint fd, jstring jName) //------------------------------------------------------------------------------ static JNINativeMethod gMethods[] = { - {"nativeEstablish", "(Ljava/lang/String;Ljava/lang/String;)I", (void *)establish}, + {"nativeEstablish", "(ILjava/lang/String;Ljava/lang/String;)I", (void *)establish}, {"nativeGetName", "(I)Ljava/lang/String;", (void *)getName}, {"nativeReset", "(Ljava/lang/String;)V", (void *)reset}, {"nativeCheck", "(Ljava/lang/String;)I", (void *)check}, |