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

Massive commit - changing from sockaddr_in => sockaddr_storage.

Browse source 
In preparation for making RS support IPv6.

NB: This breaks the build of retroshare-gui, as the
sockaddr_storage_xxx fns are only defined as prototypes for now.

All the aux libraries like udp / stun / tcponudp / dht have still to be converted.

These changes will probably break various things and need to be tested thoroughly.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6735 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2013-09-13 14:35:19 +00:00
parent fd071161bf
commit 6290d8fed9
66 changed files with 1182 additions and 1046 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libretroshare/src/rsserver/rsinit.cc
View file

@ -2568,16 +2568,18 @@ int RsServer::StartupRetroShare()
if (RsInitConfig::forceLocalAddr)
{
struct sockaddr_in laddr;
struct sockaddr_storage laddr;
/* clean sockaddr before setting values (MaxOSX) */
sockaddr_clear(&laddr);
sockaddr_storage_clear(laddr);
laddr.sin_family = AF_INET;
laddr.sin_port = htons(RsInitConfig::port);
struct sockaddr_in *lap = (struct sockaddr_in *) &laddr;
lap->sin_family = AF_INET;
lap->sin_port = htons(RsInitConfig::port);
// universal
laddr.sin_addr.s_addr = inet_addr(RsInitConfig::inet.c_str());
lap->sin_addr.s_addr = inet_addr(RsInitConfig::inet.c_str());
mPeerMgr->setLocalAddress(ownId, laddr);
}