mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r15950) -Fix (r15946): mingw compilation

release/1.0
glx 2009-04-04 03:45:02 +00:00
parent a779611665
commit 5eed35ef54
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/network/core/address.cpp
View File

@ -120,13 +120,13 @@ bool NetworkAddress::IsInNetmask(char *netmask)
uint32 *mask; uint32 *mask;
switch (this->address.ss_family) { switch (this->address.ss_family) {
case AF_INET: case AF_INET:
ip = &((struct sockaddr_in*)&this->address)->sin_addr.s_addr; ip = (uint32*)&((struct sockaddr_in*)&this->address)->sin_addr.s_addr;
mask = &((struct sockaddr_in*)&mask_address.address)->sin_addr.s_addr; mask = (uint32*)&((struct sockaddr_in*)&mask_address.address)->sin_addr.s_addr;
break; break;
case AF_INET6: case AF_INET6:
ip = ((struct sockaddr_in6*)&this->address)->sin6_addr.s6_addr32; ip = (uint32*)((struct sockaddr_in6*)&this->address)->sin6_addr.s6_addr32;
mask = ((struct sockaddr_in6*)&mask_address.address)->sin6_addr.s6_addr32; mask = (uint32*)((struct sockaddr_in6*)&mask_address.address)->sin6_addr.s6_addr32;
break; break;
default: default:
@ -134,7 +134,7 @@ bool NetworkAddress::IsInNetmask(char *netmask)
} }
while (cidr > 0) { while (cidr > 0) {
uint32 msk = cidr >= 32 ? -1 : htonl(-(1 << (32 - cidr))); uint32 msk = cidr >= 32 ? (uint32)-1 : htonl(-(1 << (32 - cidr)));
if ((*mask & msk) != (*ip & msk)) return false; if ((*mask & msk) != (*ip & msk)) return false;
cidr -= 32; cidr -= 32;