commit 3663227a8be5c6c05bf4adadc378fd69b7ae814c
author Chia-chi Yeh <chiachi@android.com> Mon Jun 13 15:05:37 2011 -0700
committer Chia-chi Yeh <chiachi@android.com> Mon Jun 13 15:05:37 2011 -0700
tree d358db75f7ea6f012725347b577e7772743f84fe
parent 36673698078cb47e777418cadc4115a65bc5947d

VPN: add MTU support.

Change-Id: Ia2f06ae1fcf065bde7dafd212b84b37a34f1a47e

services/jni/com_android_server_connectivity_Vpn.cpp

diff --git a/services/jni/com_android_server_connectivity_Vpn.cpp b/services/jni/com_android_server_connectivity_Vpn.cpp
index cff710e..a968cd2 100644
--- a/services/jni/com_android_server_connectivity_Vpn.cpp
+++ b/services/jni/com_android_server_connectivity_Vpn.cpp
@@ -59,7 +59,7 @@
 #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 @@
         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 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 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},