Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-19 11:54:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

added net_test1.cc - unit tests for pqinetwork.cc

Browse source 
modified pqinetwork.cc - isPrivateNet() and sameNet()


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@501 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
vinnyx 2008-04-15 10:05:33 +00:00
parent a20ff44567
commit 786e1ff65c
2 changed files with 284 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
libretroshare/src/pqi/pqinetwork.cc
View file

@ -508,7 +508,7 @@ bool isPrivateNet(struct in_addr *addr)
bool ret = false;
std::ostringstream out;
in_addr_t taddr = inet_netof(*addr);
in_addr_t taddr = htonl(addr->s_addr);
out << "isPrivateNet(" << inet_ntoa(*addr) << ") ? ";
out << std::endl;
@ -528,10 +528,14 @@ bool isPrivateNet(struct in_addr *addr)
addr2.s_addr = htonl(inet_network("169.254.0.0"));
out << "\t(" << inet_ntoa(addr2) << ")" << std::endl;
if ((taddr == htonl(inet_network("10.0.0.0"))) ||
(taddr == htonl(inet_network("172.16.0.0"))) ||
(taddr == htonl(inet_network("192.168.0.0"))) ||
(taddr == htonl(inet_network("169.254.0.0"))))
// 10.0.0.0/8
// 172.16.0.0/12
// 192.168.0.0/16
// 169.254.0.0/16
if ((taddr>>24 == 10) ||
(taddr>>20 == (172<<4 | 16>>4)) ||
(taddr>>16 == (192<<8 | 168)) ||
(taddr>>16 == (169<<8 | 254)))
{
out << " True" << std::endl;
ret = true;
@ -648,6 +652,16 @@ bool sameNet(struct in_addr *addr, struct in_addr *addr2)
std::cerr << " (" << inet_ntoa(addrnet);
std::cerr << " =?= " << inet_ntoa(addrnet2);
std::cerr << ")" << std::endl;
in_addr_t address1 = htonl(addr->s_addr);
in_addr_t address2 = htonl(addr2->s_addr);
// handle case for private net: 172.16.0.0/12
if (address1>>20 == (172<<4 | 16>>4))
{
return (address1>>20 == address2>>20);
}
return (inet_netof(*addr) == inet_netof(*addr2));
}