commit ac813bda73e65da2113a0829cc80e30820c20b7a
author Chia-chi Yeh <chiachi@android.com> Thu Jun 30 23:02:29 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 30 23:02:29 2011 -0700
tree f25aa8e226bde5c68088f768c7d20f75f0a99b29
parent 5093d3ee994473d971eaf3f2ecf3a85ad47975d4
parent 9c0835fd7262c50cf6a91380df1654daffe2c977

Merge "VPN: correct the netmask for IPv4."

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 a0ea92b..62d7636 100644
--- a/services/jni/com_android_server_connectivity_Vpn.cpp
+++ b/services/jni/com_android_server_connectivity_Vpn.cpp
@@ -244,7 +244,7 @@
                 break;
             }
 
-            in_addr_t mask = prefix ? (~0 << (32 - prefix)) : 1;
+            in_addr_t mask = prefix ? (~0 << (32 - prefix)) : 0x80000000;
             *as_in_addr(&rt4.rt_genmask) = htonl(mask);
             if (ioctl(inet4, SIOCADDRT, &rt4) && errno != EEXIST) {
                 count = (errno == EINVAL) ? BAD_ARGUMENT : SYSTEM_ERROR;
@@ -394,7 +394,7 @@
     }
     count = set_routes(name, routes);
     if (count < 0) {
-        throwException(env, count, "Cannot set address");
+        throwException(env, count, "Cannot set route");
         count = -1;
     }