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

supressed deadlock in ftController due to calling ftServer from ftcontroller itself

Browse source
This commit is contained in:
mr-alice 2016-11-02 20:51:42 +01:00
parent 02f442a400
commit d2118c5329
3 changed files with 507 additions and 507 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/ft/ftserver.h
View file

@ -219,7 +219,7 @@ public:
/*************** Data Transfer Interface ***********************/
/***************************************************************/
public:
virtual bool activateTunnels(const RsFileHash& hash,TransferRequestFlags flags,bool onoff);
virtual bool activateTunnels(const RsFileHash& hash,uint32_t default_encryption_policy,TransferRequestFlags flags,bool onoff);
virtual bool sendData(const RsPeerId& peerId, const RsFileHash& hash, uint64_t size, uint64_t offset, uint32_t chunksize, void *data);
virtual bool sendDataRequest(const RsPeerId& peerId, const RsFileHash& hash, uint64_t size, uint64_t offset, uint32_t chunksize);