Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-02 19:26:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Modifications to fix some networking/endian issues on PPC OSX.

Browse source 
* added sockaddr_clear() function to zero network addresses before use.
* used this function in p3connmgr.
* added htonll() and ntohll() functions to rsnet.h with compile-time ENDIAN checking
* use htonll() and ntohll() in serialiser.
* added net_test.cc to check network/endian/inet_addr issues.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@328 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-02-03 12:07:59 +00:00
parent cea158b77d
commit 31136da7cc
10 changed files with 374 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

45
libretroshare/src/pqi/p3connmgr.cc
View file

@ -66,22 +66,15 @@ p3ConnectMgr::p3ConnectMgr(p3AuthMgr *am)
peerConnectAddress::peerConnectAddress()
:type(0), ts(0)
{
addr.sin_family = AF_INET;
addr.sin_addr.s_addr = 0;
addr.sin_port = 0;
sockaddr_clear(&addr);
}
peerAddrInfo::peerAddrInfo()
:found(false), type(0), ts(0)
{
laddr.sin_family = AF_INET;
laddr.sin_addr.s_addr = 0;
laddr.sin_port = 0;
raddr.sin_family = AF_INET;
raddr.sin_addr.s_addr = 0;
raddr.sin_port = 0;
sockaddr_clear(&laddr);
sockaddr_clear(&raddr);
}
peerConnectState::peerConnectState()
@ -94,17 +87,9 @@ peerConnectState::peerConnectState()
//lc_timestamp(0), lr_timestamp(0),
//nc_timestamp(0), nc_timeintvl(0)
{
lastaddr.sin_family = AF_INET;
lastaddr.sin_addr.s_addr = 0;
lastaddr.sin_port = 0;
localaddr.sin_family = AF_INET;
localaddr.sin_addr.s_addr = 0;
localaddr.sin_port = 0;
serveraddr.sin_family = AF_INET;
serveraddr.sin_addr.s_addr = 0;
serveraddr.sin_port = 0;
sockaddr_clear(&lastaddr);
sockaddr_clear(&localaddr);
sockaddr_clear(&serveraddr);
return;
}
@ -1698,6 +1683,9 @@ bool p3ConnectMgr::getDHTEnabled()
bool p3ConnectMgr::checkNetAddress()
{
std::cerr << "p3ConnectMgr::checkNetAddress()";
std::cerr << std::endl;
std::list<std::string> addrs = getLocalInterfaces();
std::list<std::string>::iterator it;
@ -1706,8 +1694,13 @@ bool p3ConnectMgr::checkNetAddress()
bool found = false;
for(it = addrs.begin(); (!found) && (it != addrs.end()); it++)
{
std::cerr << "p3ConnectMgr::checkNetAddress() Local Interface: " << *it;
std::cerr << std::endl;
if ((*it) == inet_ntoa(ownState.localaddr.sin_addr))
{
std::cerr << "p3ConnectMgr::checkNetAddress() Matches Existing Address! FOUND = true";
std::cerr << std::endl;
found = true;
}
}
@ -1720,6 +1713,11 @@ bool p3ConnectMgr::checkNetAddress()
if (!found)
{
ownState.localaddr.sin_addr = getPreferredInterface();
std::cerr << "p3ConnectMgr::checkNetAddress() Local Address Not Found: Using Preferred Interface: ";
std::cerr << inet_ntoa(ownState.localaddr.sin_addr);
std::cerr << std::endl;
}
if ((isPrivateNet(&(ownState.localaddr.sin_addr))) ||
(isLoopbackNet(&(ownState.localaddr.sin_addr))))
@ -1754,6 +1752,11 @@ bool p3ConnectMgr::checkNetAddress()
ownState.localaddr.sin_family = AF_INET;
ownState.serveraddr.sin_family = AF_INET;
ownState.lastaddr.sin_family = AF_INET;
std::cerr << "p3ConnectMgr::checkNetAddress() Final Local Address: ";
std::cerr << inet_ntoa(ownState.localaddr.sin_addr);
std::cerr << ":" << ntohs(ownState.localaddr.sin_port);
std::cerr << std::endl;
return 1;
}