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

merged upstream/master

Browse source
This commit is contained in:
csoler 2018-07-05 17:41:30 +02:00
commit 0c45217fc0
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
22 changed files with 710 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libresapi/src/api/PeersHandler.cpp
View file

@ -727,6 +727,11 @@ void PeersHandler::handleWildcard(Request &req, Response &resp)
peerDetails.localPort );
if (!peerDetails.dyndns.empty())
mRsPeers->setDynDNS(peerDetails.id, peerDetails.dyndns);
for(auto&& ipr : peerDetails.ipAddressList)
mRsPeers->addPeerLocator(
peerDetails.id,
RsUrl(ipr.substr(0, ipr.find(' '))) );
}
}
while(false);

4
libresapi/src/libresapi.pro
View file

@ -9,10 +9,6 @@ DESTDIR = lib
!include(use_libresapi.pri):error("Including")
# when rapidjson is mainstream on all distribs, we will not need the sources anymore
# in the meantime, they are part of the RS directory so that it is always possible to find them
INCLUDEPATH += ../../rapidjson-1.1.0
INCLUDEPATH += ../../libretroshare/src
libresapilocalserver {