d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid calling bits2mask4() when bits is -1.

Browse Source
This commit is contained in:
brian 2001-08-15 12:07:39 +00:00
parent 0d5ee817d4
commit 7ff7ff405e
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
usr.sbin/ppp/ncpaddr.c
View File

@ -718,7 +718,7 @@ ncprange_getsa(const struct ncprange *range, struct sockaddr_storage *host,
if (mask4) {
mask4->sin_family = AF_INET;
mask4->sin_len = sizeof(*host4);
mask4->sin_addr = bits2mask4(range->ncprange_ip4width);
mask4->sin_addr = range->ncprange_ip4mask;
}
break;
@ -933,14 +933,13 @@ ncprange_aton(struct ncprange *range, struct ncp *ncp, const char *data)
if (range->ncprange_ip4addr.s_addr == INADDR_ANY) {
range->ncprange_ip4mask.s_addr = INADDR_ANY;
range->ncprange_ip4width = 0;
} else if (data[len] == '\0') {
} else if (bits == -1) {
range->ncprange_ip4mask.s_addr = INADDR_BROADCAST;
range->ncprange_ip4width = 32;
} else if (bits > 32) {
log_Printf(LogWARN, "ncprange_aton: bad mask width.\n");
return 0;
} else {
if (bits > 32) {
log_Printf(LogWARN, "ncprange_aton: bad mask width.\n");
return 0;
}
range->ncprange_ip4mask = bits2mask4(bits);
range->ncprange_ip4width = bits;
}