Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac813bda authored by Chia-chi Yeh's avatar Chia-chi Yeh Committed by Android (Google) Code Review
Browse files

Merge "VPN: correct the netmask for IPv4."

parents 5093d3ee 9c0835fd

services/jni/com_android_server_connectivity_Vpn.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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;

    }