Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-10 18:15:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Restored p3disc functionality.

Browse source 
* Bugfix in correctly adding ipList.
 * restored setLocal/Ext calls from peer.
 * Added extra debugging in p3disc.
 * Cleaned up debugging in p3connmgr.
 * switched off debugging in rsdiscitems.
 * reorder ipList (most recent first).
 * removed DEBUG switches in libretroshare.pro



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3252 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2010-07-04 15:16:52 +00:00
parent 6f219d4fef
commit 8b2cb688a8
6 changed files with 276 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

32
libretroshare/src/tests/pqi/pqiipset_test.cc
View file

@ -68,6 +68,20 @@ bool test_addr_list()
addr.mSeenTime = time(NULL) - i;
list.updateIpAddressList(addr);
if (i < 100 + 4)
{
/* check that was added to the back */
CHECK(list.mAddrs.back().mSeenTime == addr.mSeenTime);
CHECK(list.mAddrs.back().mAddr.sin_addr.s_addr == addr.mAddr.sin_addr.s_addr);
CHECK(list.mAddrs.back().mAddr.sin_port == addr.mAddr.sin_port);
}
else
{
/* check that wasn't added to the back */
CHECK(list.mAddrs.back().mSeenTime != addr.mSeenTime);
CHECK(list.mAddrs.back().mAddr.sin_addr.s_addr != addr.mAddr.sin_addr.s_addr);
}
}
/* print out the list */
@ -97,19 +111,19 @@ bool test_addr_list()
}
/* make sure it more recent than the previous ones */
for(int i = 100; i > 89; i--)
for(int i = 99; i > 89; i--)
{
addr.mSeenTime = time(NULL) - i;
list.updateIpAddressList(addr);
/* check that was added to the back */
CHECK(list.mAddrs.back().mSeenTime == addr.mSeenTime);
CHECK(list.mAddrs.back().mAddr.sin_addr.s_addr == addr.mAddr.sin_addr.s_addr);
CHECK(list.mAddrs.back().mAddr.sin_port == addr.mAddr.sin_port);
/* check that was added to the front */
CHECK(list.mAddrs.front().mSeenTime == addr.mSeenTime);
CHECK(list.mAddrs.front().mAddr.sin_addr.s_addr == addr.mAddr.sin_addr.s_addr);
CHECK(list.mAddrs.front().mAddr.sin_port == addr.mAddr.sin_port);
}
/* print out the list */
std::cerr << "IpAddressList (last item to be 192.168.2.200:8812)";
std::cerr << "IpAddressList (first item to be 192.168.2.200:8812)";
std::cerr << std::endl;
list.printIpAddressList(std::cerr);
std::cerr << std::endl;
@ -124,9 +138,9 @@ bool test_addr_list()
list.updateIpAddressList(addr);
/* check that was added to the back */
CHECK(list.mAddrs.back().mSeenTime == addr.mSeenTime);
CHECK(list.mAddrs.back().mAddr.sin_addr.s_addr == addr.mAddr.sin_addr.s_addr);
CHECK(list.mAddrs.back().mAddr.sin_port == addr.mAddr.sin_port);
CHECK(list.mAddrs.front().mSeenTime == addr.mSeenTime);
CHECK(list.mAddrs.front().mAddr.sin_addr.s_addr == addr.mAddr.sin_addr.s_addr);
CHECK(list.mAddrs.front().mAddr.sin_port == addr.mAddr.sin_port);
}