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

Merge "VPN: correct the netmask for IPv4."

Browse Source
This commit is contained in:
Chia-chi Yeh
2011-06-30 23:02:29 -07:00
committed by Android (Google) Code Review
parent 5093d3ee99 9c0835fd72
commit ac813bda73
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/jni/com_android_server_connectivity_Vpn.cpp
View File

@@ -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;
}