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

Update udp-discovery-cpp and android openssl

Browse source
This commit is contained in:
Gioacchino Mazzurco 2019-08-29 15:50:26 +02:00
parent 2d7b855983
commit 9f04e1c9c2
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051
4 changed files with 87 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libretroshare/src/services/broadcastdiscoveryservice.cc
View file

@ -100,12 +100,12 @@ BroadcastDiscoveryService::BroadcastDiscoveryService(
mUdcParameters.set_port(port);
mUdcParameters.set_application_id(appId);
mUdcEndpoint.Start(mUdcParameters, "");
mUdcPeer.Start(mUdcParameters, "");
updatePublishedData();
}
BroadcastDiscoveryService::~BroadcastDiscoveryService()
{ mUdcEndpoint.Stop(true); }
{ mUdcPeer.Stop(true); }
std::vector<RsBroadcastDiscoveryResult>
BroadcastDiscoveryService::getDiscoveredPeers()
@ -123,7 +123,7 @@ void BroadcastDiscoveryService::updatePublishedData()
{
RsPeerDetails od;
mRsPeers.getPeerDetails(mRsPeers.getOwnId(), od);
mUdcEndpoint.SetUserData(
mUdcPeer.SetUserData(
BroadcastDiscoveryPack::fromPeerDetails(od).serializeToString());
}
@ -134,7 +134,7 @@ void BroadcastDiscoveryService::data_tick()
if( mUdcParameters.can_discover() &&
!mRsPeers.isHiddenNode(mRsPeers.getOwnId()) )
{
auto currentEndpoints = mUdcEndpoint.ListDiscovered();
auto currentEndpoints = mUdcPeer.ListDiscovered();
std::map<UDC::IpPort, std::string> currentMap;
std::map<UDC::IpPort, std::string> updateMap;

7
libretroshare/src/services/broadcastdiscoveryservice.h
View file

@ -22,10 +22,11 @@
#include <cstdint>
#include <map>
#include <iostream>
#include <endpoint.hpp>
#include <memory>
#include <forward_list>
#include <udp_discovery_peer.hpp>
#include "retroshare/rsbroadcastdiscovery.h"
#include "util/rsthreads.h"
@ -52,8 +53,8 @@ protected:
void updatePublishedData();
UDC::EndpointParameters mUdcParameters;
UDC::Endpoint mUdcEndpoint;
UDC::PeerParameters mUdcParameters;
UDC::Peer mUdcPeer;
std::map<UDC::IpPort, std::string> mDiscoveredData;
RsMutex mDiscoveredDataMutex;