Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-02 21:35:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request #2287 from csoler/v0.6-BugFixing_8

Browse source 
Added early check of ExtAddrFinder and notify about its results
This commit is contained in:
csoler 2021-02-08 09:45:31 +01:00 • committed by GitHub
commit d9721746c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 262 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libretroshare/src/retroshare/rsgossipdiscovery.h
View file

@ -47,8 +47,8 @@ extern std::shared_ptr<RsGossipDiscovery> rsGossipDiscovery;
*/
enum class RsGossipDiscoveryEventType: uint32_t {
UNKNOWN = 0x00,
PEER_INVITE_RECEIVED = 0x01
UNKNOWN = 0x00,
FRIEND_PEER_INFO_RECEIVED = 0x01,
};
struct RsGossipDiscoveryEvent : RsEvent
@ -57,7 +57,8 @@ struct RsGossipDiscoveryEvent : RsEvent
virtual ~RsGossipDiscoveryEvent() override {}
RsGossipDiscoveryEventType mGossipDiscoveryEventType;
std::string mInvite;
RsPeerId mFromId;
RsPeerId mAboutId;
/// @see RsSerializable
virtual void serial_process( RsGenericSerializer::SerializeJob j,
@ -65,8 +66,9 @@ struct RsGossipDiscoveryEvent : RsEvent
{
RsEvent::serial_process(j,ctx);
RS_SERIAL_PROCESS(mGossipDiscoveryEventType);
RS_SERIAL_PROCESS(mInvite);
}
RS_SERIAL_PROCESS(mFromId);
RS_SERIAL_PROCESS(mAboutId);
}
};
class RsGossipDiscovery