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

Merge branch 'csoler/v0.6-FT' into jsonapi

Browse source 
Needed to exopse JSON API for file search
This commit is contained in:
Gioacchino Mazzurco 2018-08-25 16:14:42 +02:00
commit 31f0a42b86
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051
3 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -96,7 +96,7 @@ public:
uint16_t serviceId() const { return RS_SERVICE_TYPE_FILE_TRANSFER ; }
virtual bool handleTunnelRequest(const RsFileHash& hash,const RsPeerId& peer_id) ;
virtual void receiveTurtleData(const RsTurtleGenericTunnelItem *item,const RsFileHash& hash,const RsPeerId& virtual_peer_id,RsTurtleGenericTunnelItem::Direction direction) ;
//virtual void receiveSearchResult(RsTurtleSearchResultItem *item);// TODO
virtual void receiveSearchResult(RsTurtleFTSearchResultItem *item);
virtual RsItem *create_item(uint16_t service,uint8_t item_type) const ;
virtual RsServiceSerializer *serializer() { return this ; }