Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1661 from G10h4ck/short_invites_fixup

Browse Source 
Fix setting port when adding from short invite with dyndns
This commit is contained in:
csoler 2019-10-03 09:40:28 +02:00 committed by GitHub
commit 423f20231c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libretroshare/src/pqi/p3peermgr.cc
View File

@ -1147,7 +1147,18 @@ bool p3PeerMgrIMPL::addSslOnlyFriend(
/* At this point if we got info about the peer just update with the new /* At this point if we got info about the peer just update with the new
* values. */ * values. */
if(!dt.name.empty()) pstate.name = dt.name; if(!dt.name.empty()) pstate.name = dt.name;
if(!dt.dyndns.empty()) pstate.dyndns = dt.dyndns; if(!dt.dyndns.empty())
{
pstate.dyndns = dt.dyndns;
if(dt.extPort)
{
/* If there is no IPv4 address available yet add a placeholder to
* not loose the port, because the address is invalid. */
if(!sockaddr_storage_isValidNet(pstate.serveraddr))
sockaddr_storage_inet_pton(pstate.serveraddr, "192.0.2.0");
sockaddr_storage_setport(pstate.serveraddr, dt.extPort);
}
}
pstate.hiddenNode = dt.isHiddenNode; pstate.hiddenNode = dt.isHiddenNode;
if(!dt.hiddenNodeAddress.empty()) if(!dt.hiddenNodeAddress.empty())
pstate.hiddenDomain = dt.hiddenNodeAddress; pstate.hiddenDomain = dt.hiddenNodeAddress;