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

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

Merge "ip-up-vpn: Handle the case where INTERNAL_NETMASK4 is empty."

parents 7370642d f459d324

cmds/ip-up-vpn/ip-up-vpn.c

+6 −4
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ static const char *env(const char *name) { 


static int set_address(struct sockaddr *sa, const char *address) {

    sa->sa_family = AF_INET;

    errno = EINVAL;

    return inet_pton(AF_INET, address, &((struct sockaddr_in *)sa)->sin_addr);

}
@@ -124,11 +125,12 @@ int main(int argc, char **argv) 
        }



        /* Set the netmask. */

        if (!set_address(&ifr.ifr_netmask, env("INTERNAL_NETMASK4")) ||

                ioctl(s, SIOCSIFNETMASK, &ifr)) {

        if (set_address(&ifr.ifr_netmask, env("INTERNAL_NETMASK4"))) {

            if (ioctl(s, SIOCSIFNETMASK, &ifr)) {

                LOGE("Cannot set netmask: %s", strerror(errno));

                return 1;

            }

        }



        /* TODO: Send few packets to trigger phase 2? */