diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2011-06-30 23:02:29 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-30 23:02:29 -0700 |
| commit | ac813bda73e65da2113a0829cc80e30820c20b7a (patch) | |
| tree | f25aa8e226bde5c68088f768c7d20f75f0a99b29 | |
| parent | 5093d3ee994473d971eaf3f2ecf3a85ad47975d4 (diff) | |
| parent | 9c0835fd7262c50cf6a91380df1654daffe2c977 (diff) | |
| download | frameworks_base-ac813bda73e65da2113a0829cc80e30820c20b7a.zip frameworks_base-ac813bda73e65da2113a0829cc80e30820c20b7a.tar.gz frameworks_base-ac813bda73e65da2113a0829cc80e30820c20b7a.tar.bz2 | |
Merge "VPN: correct the netmask for IPv4."
| -rw-r--r-- | services/jni/com_android_server_connectivity_Vpn.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ static int set_routes(const char *name, const char *routes) 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 @@ static jint setRoutes(JNIEnv *env, jobject thiz, jstring jName, } count = set_routes(name, routes); if (count < 0) { - throwException(env, count, "Cannot set address"); + throwException(env, count, "Cannot set route"); count = -1; } |