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

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

Browse Source
This commit is contained in:
Chia-chi Yeh
2011-09-22 17:25:27 -07:00
committed by Android (Google) Code Review
parent 7370642dd8 f459d324bf
commit 1dc43b5cc5
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmds/ip-up-vpn/ip-up-vpn.c
View File

@@ -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,10 +125,11 @@ int main(int argc, char **argv)
}
/* Set the netmask. */
if (!set_address(&ifr.ifr_netmask, env("INTERNAL_NETMASK4")) ||
ioctl(s, SIOCSIFNETMASK, &ifr)) {
LOGE("Cannot set netmask: %s", strerror(errno));
return 1;
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? */